diff --git a/mailnews/addrbook/resources/content/abCardViewOverlay.js b/mailnews/addrbook/resources/content/abCardViewOverlay.js
index e20da3f8822..35332fad6b7 100644
--- a/mailnews/addrbook/resources/content/abCardViewOverlay.js
+++ b/mailnews/addrbook/resources/content/abCardViewOverlay.js
@@ -135,6 +135,25 @@ function GetCurrentPrefs()
dump("failed to get the mail.addr_book.displayName.lastnamefirst pref\n");
}
}
+
+ // check "Show Name As" menu item based on pref
+ var menuitemID;
+ switch ( cvPrefs.nameColumn )
+ {
+ case 2:
+ menuitemID = 'firstLastCmd';
+ break;
+ case 1:
+ menuitemID = 'lastFirstCmd';
+ break;
+ case 0:
+ default:
+ menuitemID = 'displayNameCmd';
+ break;
+ }
+ menuitem = top.document.getElementById(menuitemID);
+ if ( menuitem )
+ menuitem.setAttribute('checked', 'true');
}
diff --git a/mailnews/addrbook/resources/content/abSelectAddressesDialog.js b/mailnews/addrbook/resources/content/abSelectAddressesDialog.js
index 8101a7ac943..e5ee8d01f26 100644
--- a/mailnews/addrbook/resources/content/abSelectAddressesDialog.js
+++ b/mailnews/addrbook/resources/content/abSelectAddressesDialog.js
@@ -177,3 +177,4 @@ function RemoveSelectedFromBucket()
}
}
}
+
diff --git a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
index 5e29189d098..a430ee590ac 100644
--- a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
+++ b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
@@ -58,9 +58,9 @@ Rights Reserved.
-
+
-
+
@@ -100,8 +100,8 @@ Rights Reserved.
-
-
+
+
@@ -117,8 +117,6 @@ Rights Reserved.
-
-
diff --git a/mailnews/addrbook/resources/locale/en-US/abSelectAddressesDialog.dtd b/mailnews/addrbook/resources/locale/en-US/abSelectAddressesDialog.dtd
index 884562c2001..042c8c3be8a 100644
--- a/mailnews/addrbook/resources/locale/en-US/abSelectAddressesDialog.dtd
+++ b/mailnews/addrbook/resources/locale/en-US/abSelectAddressesDialog.dtd
@@ -30,11 +30,7 @@ Rights Reserved.
-
-
-
-