diff --git a/mozilla/mailnews/addrbook/resources/content/addressbook.js b/mozilla/mailnews/addrbook/resources/content/addressbook.js
index b39f3fac18b..4fa92093930 100644
--- a/mozilla/mailnews/addrbook/resources/content/addressbook.js
+++ b/mozilla/mailnews/addrbook/resources/content/addressbook.js
@@ -25,6 +25,38 @@ function OnLoadAddressBook()
 function CommandUpdate_AddressBook()
 {
 	dump("CommandUpdate_AddressBook\n");
+	
+	// get selection info from dir pane
+	var tree = document.getElementById('dirTree');
+	var oneAddressBookSelected = false;
+	if ( tree && tree.selectedItems && (tree.selectedItems.length == 1) )
+		oneAddressBookSelected = true;
+	dump("oneAddressBookSelected = " + oneAddressBookSelected + "\n");
+		
+	// get selection info from results pane
+	var selectedAddresses = GetSelectedAddresses();
+	var oneOrMoreAddressesSelected = false;
+	if ( selectedAddresses )
+		oneOrMoreAddressesSelected = true;
+	
+	// set commands to enabled / disabled
+	SetCommandEnabled('cmd_PrintCard', oneOrMoreAddressesSelected);
+	SetCommandEnabled('cmd_SortByName', oneAddressBookSelected);
+	SetCommandEnabled('cmd_SortByEmail', oneAddressBookSelected);
+	SetCommandEnabled('cmd_SortByPhone', oneAddressBookSelected);
+}
+
+function SetCommandEnabled(id, enabled)
+{
+	var node = document.getElementById(id);
+
+	if ( node )
+	{
+		if ( enabled )
+			node.removeAttribute("disabled");
+		else
+			node.setAttribute('disabled', 'true');
+	}
 }
 
 
diff --git a/mozilla/mailnews/addrbook/resources/content/addressbook.xul b/mozilla/mailnews/addrbook/resources/content/addressbook.xul
index 99aa2a2ad5c..c70dfa96998 100644
--- a/mozilla/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mozilla/mailnews/addrbook/resources/content/addressbook.xul
@@ -44,8 +44,20 @@ Rights Reserved.
 <!--
 <html:script language="JavaScript" src="resource:/res/samples/DumpDOM.js"/>
 -->
-<broadcaster id="CommandUpdate_AddressBook" onchange="CommandUpdate_AddressBook()"/>
-<broadcaster id="cmd_NewMessage"/>
+<broadcasterset id="broadcasterset">
+	//<broadcaster id="CommandUpdate_AddressBook" onchange="CommandUpdate_AddressBook()"/>
+	<broadcaster id="cmd_PrintCard" oncommand="AbPrintCard()"/>
+	<broadcaster id="cmd_Close" oncommand="AbClose()"/>
+</broadcasterset>
+
+<keyset id="keyset">
+	<key id="key_PrintCard" disabled="true" command="true" key="P" observes="cmd_PrintCard" />
+	
+	<!-- temporary -->
+	<key id="key_Close" command="true" key="w" observes="cmd_Close" />
+	<!--key id="key_Quit" command="true" key="Q" observes="cmd_Quit" /-->
+</keyset>
+
 
   <toolbox>
   <menubar>
@@ -67,10 +79,12 @@ Rights Reserved.
 			<menuseparator/>
 			<menuitem id="pageSetup"/>
 			<menuitem value="&printPreviewCmd.label;" oncommand="AbPrintPreview()"/>
-			<menuitem value="&printCardViewCmd.label;" oncommand="AbPrintCard()"/>
+			<menuitem value="&printCardViewCmd.label;" key="key_PrintCard" observes="cmd_PrintCard"/>
 			<menuitem value="&printAddressBook.label;" oncommand="AbPrintAddressBook()"/>
 			<menuseparator/>
-			<menuitem value="&closeCmd.label;" oncommand="AbClose()"/>
+			<menuitem value="&closeCmd.label;"
+					  key="key_Close"
+					  observes="cmd_Close"/>
 			</menupopup>
 		</menu>
 		
@@ -105,11 +119,20 @@ Rights Reserved.
 			</menu>
 			<menu value="&sortMenu.label;">
 			    <menupopup>
-				<menuitem value="&sortByNameCmd.label;" oncommand="AbSortByName()"/>
-				<menuitem value="&sortByEmailCmd.label;" oncommand="AbSortByEmail()"/>
+				<menuitem value="&sortByNameCmd.label;"
+						  id="cmd_SortByName"
+						  disabled="true"
+						  oncommand="top.SortResultPane('NameColumn', 'http://home.netscape.com/NC-rdf#DisplayName')"/>
+				<menuitem value="&sortByEmailCmd.label;"
+						  id="cmd_SortByEmail"
+						  disabled="true"
+						  oncommand="top.SortResultPane('EmailColumn', 'http://home.netscape.com/NC-rdf#PrimaryEmail')"/>
 				<menuitem value="&sortByOrganizationCmd.label;" oncommand="AbSortByOrganization()"/>
 				<menuitem value="&sortByNicknameCmd.label;" oncommand="AbSortByNickname()"/>
-				<menuitem value="&sortByPhoneCmd.label;" oncommand="AbSortByPhoneNumber()"/>
+				<menuitem value="&sortByPhoneCmd.label;"
+						  id="cmd_SortByPhone"
+						  disabled="true"
+						  oncommand="top.SortResultPane('WorkPhoneColumn', 'http://home.netscape.com/NC-rdf#WorkPhone')"/>
 				<menuitem value="&sortByCityCmd.label;" oncommand="AbSortByCity()"/>
 				<menuseparator/>
 				<menuitem value="&sortAscendingCmd.label;" oncommand="AbSortAscending()"/>
diff --git a/mozilla/mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd b/mozilla/mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd
index a12cd91ffbd..78043071aba 100644
--- a/mozilla/mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd
+++ b/mozilla/mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd
@@ -56,12 +56,12 @@ Rights Reserved.
 <!ENTITY showAbToolbarCmd.label					".Address Book Toolbar">  
 <!ENTITY showCardPane.label						".Card Pane">  
 <!ENTITY showTaskbar.label						".Taskbar">  
-<!ENTITY sortMenu.label						".Sort"> 
-<!ENTITY sortByNameCmd.label					".by Name">  
-<!ENTITY sortByEmailCmd.label					".by Email">  
+<!ENTITY sortMenu.label						"Sort"> 
+<!ENTITY sortByNameCmd.label					"by Name">  
+<!ENTITY sortByEmailCmd.label					"by Email">  
 <!ENTITY sortByOrganizationCmd.label			".by Organization">  
 <!ENTITY sortByNicknameCmd.label				".by Nickname">  
-<!ENTITY sortByPhoneCmd.label					".by Phone Number">  
+<!ENTITY sortByPhoneCmd.label					"by Phone Number">  
 <!ENTITY sortByCityCmd.label					".by City">  
 <!ENTITY sortAscendingCmd.label					".Ascending">  
 <!ENTITY sortDescendingCmd.label				".Descending">  
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
index a12cd91ffbd..78043071aba 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -56,12 +56,12 @@ Rights Reserved.
 <!ENTITY showAbToolbarCmd.label					".Address Book Toolbar">  
 <!ENTITY showCardPane.label						".Card Pane">  
 <!ENTITY showTaskbar.label						".Taskbar">  
-<!ENTITY sortMenu.label						".Sort"> 
-<!ENTITY sortByNameCmd.label					".by Name">  
-<!ENTITY sortByEmailCmd.label					".by Email">  
+<!ENTITY sortMenu.label						"Sort"> 
+<!ENTITY sortByNameCmd.label					"by Name">  
+<!ENTITY sortByEmailCmd.label					"by Email">  
 <!ENTITY sortByOrganizationCmd.label			".by Organization">  
 <!ENTITY sortByNicknameCmd.label				".by Nickname">  
-<!ENTITY sortByPhoneCmd.label					".by Phone Number">  
+<!ENTITY sortByPhoneCmd.label					"by Phone Number">  
 <!ENTITY sortByCityCmd.label					".by City">  
 <!ENTITY sortAscendingCmd.label					".Ascending">  
 <!ENTITY sortDescendingCmd.label				".Descending">