Bug 650798 - Contacts sidebar: Missing accelerator keys on context menu. r+ui-review=bwinton

mail/components/addrbook/content/abContactsPanel.xul

@@ -68,12 +68,22 @@
   <script type="application/javascript" src="chrome://messenger/content/addressbook/abContactsPanel.js"/>
 
   <menupopup id="cardProperties">
-    <menuitem label="&deleteAddrBookCard.label;" oncommand="AbDelete();"/>
-    <menuitem label="&addrBookCardProperties.label;" oncommand="AbEditSelectedCard();"/>
+    <menuitem label="&deleteAddrBookCard.label;"
+              accesskey="&deleteAddrBookCard.accesskey;"
+              oncommand="AbDelete();"/>
+    <menuitem label="&addrBookCardProperties.label;"
+              accesskey="&addrBookCardProperties.accesskey;"
+              oncommand="AbEditSelectedCard();"/>
     <menuseparator/>
-    <menuitem label="&addtoToFieldMenu.label;" oncommand="addSelectedAddresses('addr_to');"/>
-    <menuitem label="&addtoCcFieldMenu.label;" oncommand="addSelectedAddresses('addr_cc');"/>
-    <menuitem label="&addtoBccFieldMenu.label;" oncommand="addSelectedAddresses('addr_bcc');"/>
+    <menuitem label="&addtoToFieldMenu.label;"
+              accesskey="&addtoToFieldMenu.accesskey;"
+              oncommand="addSelectedAddresses('addr_to');"/>
+    <menuitem label="&addtoCcFieldMenu.label;"
+              accesskey="&addtoCcFieldMenu.accesskey;"
+              oncommand="addSelectedAddresses('addr_cc');"/>
+    <menuitem label="&addtoBccFieldMenu.label;"
+              accesskey="&addtoBccFieldMenu.accesskey;"
+              oncommand="addSelectedAddresses('addr_bcc');"/>
   </menupopup>
 
   <vbox id="results_box" flex="1">

mail/locales/en-US/chrome/messenger/addressbook/abContactsPanel.dtd

@@ -5,14 +5,19 @@
 <!ENTITY SearchNameOrEmail.label            "Name or Email">
 
 <!ENTITY deleteAddrBookCard.label           "Delete">
+<!ENTITY deleteAddrBookCard.accesskey       "D">
 <!ENTITY addrBookCardProperties.label       "Properties">
+<!ENTITY addrBookCardProperties.accesskey   "P">
 <!ENTITY addtoToFieldMenu.label             "Add to To field">
+<!ENTITY addtoToFieldMenu.accesskey         "A">
 <!ENTITY addtoCcFieldMenu.label             "Add to Cc field">
+<!ENTITY addtoCcFieldMenu.accesskey         "C">
 <!ENTITY addtoBccFieldMenu.label            "Add to Bcc field">
+<!ENTITY addtoBccFieldMenu.accesskey        "B">
 
 <!ENTITY toButton.label                     "Add to To:">
 <!ENTITY toButton.accesskey                 "A">
 <!ENTITY ccButton.label                     "Add to Cc:">
-<!ENTITY ccButton.accesskey                 "d">
+<!ENTITY ccButton.accesskey                 "C">
 <!ENTITY bccButton.label                    "Add to Bcc:">
 <!ENTITY bccButton.accesskey                "B">

mail/locales/en-US/chrome/messenger/messengercompose/messengercompose.dtd

@@ -218,7 +218,7 @@
 <!ENTITY subject.accesskey "S">
 <!-- LOCALIZATION NOTE attachments.accesskey This access key should correspond
      to the strings in attachmentCount in composeMsgs.properties -->
-<!ENTITY attachments.accesskey "c">
+<!ENTITY attachments.accesskey "m">
 
 <!-- Format Toolbar, imported from editorAppShell.xul -->
 <!ENTITY SmileButton.tooltip "Insert a smiley face">