fix 68341 add mnemonics to account settings, patch by Stefan Borggraefe, r=neil.parkwaycc, sr=bienvenu, a=asa

mailnews/base/prefs/resources/content/AccountManager.xul

@@ -50,11 +50,14 @@
       </tree>
       
       <button label="&addAccountButton.label;" oncommand="onAddAccount(event);" id="addAccountButton"
-              prefstring="mail.disable_new_account_addition"/>
+              prefstring="mail.disable_new_account_addition"
+              accesskey="&addAccountButton.accesskey;"/>
       <button label="&setDefaultButton.label;" oncommand="onSetDefault(event);" disabled="true" id="setDefaultButton"
-              prefstring="mail.disable_button.set_default_account"/>
+              prefstring="mail.disable_button.set_default_account"
+              accesskey="&setDefaultButton.accesskey;"/>
       <button disabled="true" label="&removeButton.label;" oncommand="onRemoveAccount(event);" id="removeButton"
-              prefstring="mail.disable_button.delete_account"/>
+              prefstring="mail.disable_button.delete_account"
+              accesskey="&removeButton.accesskey;"/>
     </vbox>
   
     <iframe id="contentFrame" name="contentFrame" flex="1"/>

mailnews/base/prefs/resources/content/SmtpServerList.xul

@@ -49,13 +49,17 @@
 
   <vbox>
     <button id="addButton"
-       oncommand="onAdd(event);" label="&smtpListAdd.label;"/>
+            oncommand="onAdd(event);" label="&smtpListAdd.label;"
+            accesskey="&smtpListAdd.accesskey;"/>
     <button id="editButton" disabled="true"
-       oncommand="onEdit(event);" label="&smtpListEdit.label;"/>
+            oncommand="onEdit(event);" label="&smtpListEdit.label;"
+            accesskey="&smtpListEdit.accesskey;"/>
     <button id="deleteButton" disabled="true"
-       oncommand="onDelete(event);" label="&smtpListDelete.label;"/>
+            oncommand="onDelete(event);" label="&smtpListDelete.label;"
+            accesskey="&smtpListDelete.accesskey;"/>
     <button id="setDefaultButton" disabled="true"
-       oncommand="onSetDefault(event);" label="&smtpListSetDefault.label;"/>
+            oncommand="onSetDefault(event);" label="&smtpListSetDefault.label;"
+            accesskey="&smtpListSetDefault.accesskey;"/>
   </vbox>
 </hbox>
 

mailnews/base/prefs/resources/content/am-addressing.xul

@@ -53,6 +53,7 @@ Contributors:
     <caption label="&compositionGroupTitle.label;"/>
     <hbox align="center">
       <checkbox wsm_persist="true" id="identity.composeHtml" label="&useHtml.label;"
+                accesskey="&useHtml.accesskey;"
                 prefattribute="value"
                 prefstring="mail.identity.%identitykey%.compose_html"/>
     </hbox>
@@ -66,24 +67,24 @@ Contributors:
                 prefstring="mail.identity.%identitykey%.auto_quote"/>
     </hbox>
     <hbox class="indent" align="center" id="thenBox">
-      <label value="&then.label;" accesskey="&then.accesskey;" control="quoteList"/>
+      <label value="&then.label;" accesskey="&then.accesskey;" control="identity.replyOnTop"/>
       <menulist wsm_persist="true" id="identity.replyOnTop" oncommand="quoteEnabling();"
                 pref="true" preftype="int" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.reply_on_top">
         <menupopup>
-          <menuitem value="1" label="&aboveQuote.label;" accesskey="&aboveQuote.accesskey;"/>
-          <menuitem value="0" label="&belowQuote.label;" accesskey="&belowQuote.accesskey;"/>
-          <menuitem value="2" label="&selectAndQuote.label;" accesskey="&selectAndQuote.accesskey;"/>
+          <menuitem value="1" label="&aboveQuote.label;"/>
+          <menuitem value="0" label="&belowQuote.label;"/>
+          <menuitem value="2" label="&selectAndQuote.label;"/>
         </menupopup>
       </menulist>        
     </hbox>
     <hbox class="indent" align="center" id="placeBox">
-      <label value="&place.label;" accesskey="&place.accesskey;" control="sigPosList"/>
+      <label value="&place.label;" accesskey="&place.accesskey;" control="identity.sig_bottom"/>
       <menulist wsm_persist="true" id="identity.sig_bottom" genericattr="true"
                 pref="true" preftype="bool" prefattribute="value">
         <menupopup>
-          <menuitem value="true" label="&belowText.label;" accesskey="&belowText.accesskey;"/>
-          <menuitem value="false" label="&aboveText.label;" accesskey="&aboveText.accesskey;"/>
+          <menuitem value="true" label="&belowText.label;"/>
+          <menuitem value="false" label="&aboveText.label;"/>
         </menupopup>
       </menulist>
     </hbox>
@@ -95,13 +96,16 @@ Contributors:
     <description>&addressingText.label;</description>
     <radiogroup class="indent" id="ldapAutocomplete" wsm_persist="true" oncommand="enabling();">
       <observes element="identity.overrideGlobalPref" attribute="disabled"/>
-      <radio id="useGlobalPref" value="0" label="&useGlobal.label;"/>
-      <radio id="directories" value="1" label="&directories.label;"/>
+      <radio id="useGlobalPref" value="0" label="&useGlobal.label;"
+             accesskey="&useGlobal.accesskey;"/>
+      <radio id="directories" value="1" label="&directories.label;"
+             accesskey="&directories.accesskey;"/>
       <hbox class="indent">
         <menulist id="directoriesList" wsm_persist="true" style="min-width: 16em;">
           <menupopup onpopupshowing="createDirectoriesList(false);" id="directoriesListPopup"/>
         </menulist>
-        <button id="editButton" label="&editDirectories.label;" oncommand="onEditDirectories();"/>
+        <button id="editButton" label="&editDirectories.label;"
+                accesskey="&editDirectories.accesskey;" oncommand="onEditDirectories();"/>
       </hbox>
     </radiogroup>      
   </groupbox>

mailnews/base/prefs/resources/content/am-copies.xul

@@ -46,6 +46,7 @@
 
     <hbox align="center">
       <checkbox wsm_persist="true" id="identity.doFcc" label="&fccMailFolder.label;" 
+                accesskey="&fccMailFolder.accesskey;"
                 prefattribute="value"
                 prefstring="mail.identity.%identitykey%.fcc"
                 oncommand="setupFccItems();"/>
@@ -60,6 +61,7 @@
           <row align="center">
             <radio id="fcc_selectAccount" 
                    value="0" label="&sentFolderOn.label;"
+                   accesskey="&sentFolderOn.accesskey;"
                    oncommand="setPickersState('msgFccAccountPicker', 'msgFccFolderPicker', event)" 
                    observes="broadcaster_doFcc"/>
   	    <menulist id="msgFccAccountPicker"
@@ -68,7 +70,8 @@
           </row> 
           <row align="center">
             <radio id="fcc_selectFolder" 
-	           value="1" label="&otherFolder.label;"
+                   value="1" label="&sentInOtherFolder.label;"
+                   accesskey="&sentInOtherFolder.accesskey;"
                    oncommand="setPickersState('msgFccFolderPicker', 'msgFccAccountPicker', event)" 
                    observes="broadcaster_doFcc"/>
   	    <menulist id="msgFccFolderPicker" 
@@ -81,6 +84,8 @@
 
     <hbox align="center">
       <checkbox wsm_persist="true" id="identity.doBcc" label="&bccAddress.label;"
+                accesskey="&bccAddress.accesskey;"
+                control="identity.doBccList"
                 oncommand="setupBccTextbox();"
                 prefattribute="value" 
                 prefstring="mail.identity.%identitykey%.doBcc"/>
@@ -108,7 +113,8 @@
           <row align="center">
             <radio id="draft_selectAccount" 
                    oncommand="setPickersState('msgDraftsAccountPicker', 'msgDraftsFolderPicker', event)"
-                   value="0" label="&draftsFolderOn.label;"/>
+                   value="0" label="&draftsFolderOn.label;"
+                   accesskey="&draftsFolderOn.accesskey;"/>
  	    <menulist id="msgDraftsAccountPicker" 
 	              oncommand="noteSelectionChange('draft_selectAccount')"
                       flex="1"/>
@@ -116,7 +122,8 @@
           <row align="center">
             <radio id="draft_selectFolder" 
                    oncommand="setPickersState('msgDraftsFolderPicker', 'msgDraftsAccountPicker', event)"
-                   value="1" label="&otherFolder.label;"/>
+                   value="1" label="&draftInOtherFolder.label;"
+                   accesskey="&draftInOtherFolder.accesskey;"/>
   	    <menulist id="msgDraftsFolderPicker"
                       oncommand="noteSelectionChange('draft_selectFolder')" 
                       flex="1"/>
@@ -138,7 +145,8 @@
           <row align="center">
             <radio id="tmpl_selectAccount" 
                    oncommand="setPickersState('msgStationeryAccountPicker', 'msgStationeryFolderPicker', event)"
-                   value="0" label="&templatesFolderOn.label;"/>
+                   value="0" label="&templatesFolderOn.label;"
+                   accesskey="&templatesFolderOn.accesskey;"/>
   	    <menulist id="msgStationeryAccountPicker"
                       oncommand="noteSelectionChange('tmpl_selectAccount')" 
                       flex="1"/>
@@ -146,7 +154,8 @@
           <row align="center">
             <radio id="tmpl_selectFolder" 
                    oncommand="setPickersState('msgStationeryFolderPicker', 'msgStationeryAccountPicker', event)"
-                  value="1" label="&otherFolder.label;"/>
+                   value="1" label="&templateInOtherFolder.label;"
+                   accesskey="&templateInOtherFolder.accesskey;"/>
             <menulist id="msgStationeryFolderPicker"
                       oncommand="noteSelectionChange('tmpl_selectFolder')" 
                       flex="1"/>
@@ -156,6 +165,7 @@
     </radiogroup>
     <hbox align="center">
       <checkbox wsm_persist="true" id="identity.showSaveMsgDlg" label="&saveMessageDlg.label;"
+                accesskey="&saveMessageDlg.accesskey;"
                 prefattribute="value"
                 prefstring="mail.identity.%identitykey%.showSaveMsgDlg"/>
     </hbox>

mailnews/base/prefs/resources/content/am-main.xul

@@ -17,7 +17,8 @@
     
     <description>&accountSettingsDesc.label;</description>
     <hbox align="center">
-      <label value="&accountName.label;" control="server.prettyName"/>
+      <label value="&accountName.label;" control="server.prettyName"
+             accesskey="&accountName.accesskey;"/>
       <textbox wsm_persist="true" size="30" id="server.prettyName"
                prefstring="mail.server.%serverkey%.name"/>
     </hbox>
@@ -35,22 +36,26 @@
         </columns>
         <rows>
           <row align="center">
-            <label value="&name.label;" control="identity.fullName"/>
+            <label value="&name.label;" control="identity.fullName"
+                   accesskey="&name.accesskey;"/>
             <textbox wsm_persist="true" id="identity.fullName" size="30"
                      prefstring="mail.identity.%identitykey%.fullName"/>
           </row>
           <row align="center">
-            <label value="&email.label;" control="identity.email"/>
+            <label value="&email.label;" control="identity.email"
+                   accesskey="&email.accesskey;"/>
             <textbox wsm_persist="true" id="identity.email" 
                      prefstring="mail.identity.%identitykey%.useremail" class="uri-element"/>
           </row>
           <row align="center">
-            <label value="&replyTo.label;" control="identity.replyTo"/>
+            <label value="&replyTo.label;" control="identity.replyTo"
+                   accesskey="&replyTo.accesskey;"/>
             <textbox wsm_persist="true" id="identity.replyTo"
                      prefstring="mail.identity.%identitykey%.reply_to" class="uri-element"/>
           </row>
           <row align="center">
-            <label value="&organization.label;" control="identity.organization"/>
+            <label value="&organization.label;" control="identity.organization"
+                   accesskey="&organization.accesskey;"/>
             <textbox wsm_persist="true" id="identity.organization"
                      prefstring="mail.identity.%identitykey%.organization"/>
           </row>
@@ -61,6 +66,7 @@
 
       <hbox align="center">
         <checkbox wsm_persist="true" id="identity.attachSignature" label="&signature.label;" flex="1"
+                  accesskey="&signature.accesskey;"
                   oncommand="setupSignatureItems();"
                   prefattribute="value"
                   prefstring="mail.identity.%identitykey%.attach_signature"/>
@@ -70,7 +76,8 @@
         <textbox wsm_persist="true" id="identity.signature" datatype="nsILocalFile" flex="1" name="identity.signature"
                  observes="broadcaster_attachSignature"
                  prefstring="mail.identity.%identitykey%.sig_file" class="uri-element"/>
-        <button class="push" name="browse" label="&choose.label;"  
+        <button class="push" name="browse" label="&choose.label;"
+                accesskey="&choose.accesskey;" 
                 oncommand="selectFile()"
                 observes="broadcaster_attachSignature"
                 wsm_persist="true" id="identity.sigbrowsebutton"
@@ -79,10 +86,12 @@
 
       <hbox align="center">
         <checkbox wsm_persist="true" id="identity.attachVCard" label="&attachVCard.label;" flex="1"
+                  accesskey="&attachVCard.accesskey;"
                   prefattribute="value"
                   prefstring="mail.identity.%identitykey%.attach_vcard"/>
         <button class="push" name="editVCard" label="&editVCard.label;"  
-                  oncommand="editVCard()"/>
+                accesskey="&editVCard.accesskey;"
+                oncommand="editVCard()"/>
         <label hidden="true" wsm_persist="true" id="identity.escapedVCard"
                   pref="true" preftype="string" prefattribute="value"
                   prefstring="mail.identity.%identitykey%.escapedVCard"/>

mailnews/base/prefs/resources/content/am-server-advanced.xul

@@ -46,7 +46,8 @@
       <description style="width: 20em; ">&smtpDesc.label;</description>
       <separator class="thin"/>
       <hbox align="center">
-        <label value="&smtpName.label;" control="smtpServerList"/>
+        <label value="&smtpName.label;" control="smtpServerList"
+               accesskey="&smtpName.accesskey;"/>
         <menulist datasources="rdf:smtp"
                   containment="http://home.netscape.com/NC-rdf#child"
                   ref="NC:smtpservers" amsa_persist="true"
@@ -72,21 +73,26 @@
     <!-- IMAP Tab -->
     <vbox id="imapTabPanel">
       <hbox>
-        <label value="&serverDirectory.label;"/>
+        <label value="&serverDirectory.label;"
+               accesskey="&serverDirectory.accesskey;"
+               control="serverDirectory"/>
         <textbox amsa_persist="true" id="serverDirectory"/>
       </hbox>
 
       <checkbox amsa_persist="true" id="usingSubscription"
-                label="&usingSubscription.label;"/>
+                label="&usingSubscription.label;"
+                accesskey="&usingSubscription.accesskey;"/>
 
       <checkbox amsa_persist="true" id="dualUseFolders"
-                label="&dualUseFolders.label;"/>
+                label="&dualUseFolders.label;"
+                accesskey="&dualUseFolders.accesskey;"/>
 
       <separator class="groove"/>
       <row>
         <hbox align="center">
           <label control="maximumConnectionsNumber"
-                 value="&maximumConnectionsNumber.label;"/>
+                 value="&maximumConnectionsNumber.label;"
+                 accesskey="&maximumConnectionsNumber.accesskey;"/>
           <textbox amsa_persist="true" size="3" id="maximumConnectionsNumber"/>
         </hbox>
       </row>
@@ -102,20 +108,20 @@
         <rows>
           <row>
             <separator class="indent"/>
-            <label control="personalNamespace"
-                   value="&personalNamespace.label;"/>
+            <label control="personalNamespace" value="&personalNamespace.label;"
+                   accesskey="&personalNamespace.accesskey;"/>
             <textbox amsa_persist="true" id="personalNamespace" />
           </row>
           <row>
             <separator class="indent"/>
-            <label control="publicNamespace"
-                   value="&publicNamespace.label;"/>
+            <label control="publicNamespace" value="&publicNamespace.label;"
+                   accesskey="&publicNamespace.accesskey;"/>
             <textbox amsa_persist="true" id="publicNamespace"/>
           </row>
           <row>
             <separator class="indent"/>
-            <label control="otherUsersNamespace"
-                   value="&otherUsersNamespace.label;"/>
+            <label control="otherUsersNamespace" value="&otherUsersNamespace.label;"
+                   accesskey="&otherUsersNamespace.accesskey;"/>
             <textbox amsa_persist="true" id="otherUsersNamespace"/>
           </row>
         </rows>
@@ -129,7 +135,8 @@
           <row>
             <separator class="indent"/>
             <checkbox amsa_persist="true" id="overrideNamespaces"
-                      label="&overrideNamespaces.label;"/>
+                      label="&overrideNamespaces.label;"
+                      accesskey="&overrideNamespaces.accesskey;"/>
           </row>
         </rows>
       </grid>

mailnews/base/prefs/resources/content/am-server.js

@@ -116,7 +116,7 @@ function onAdvanced()
     serverSettings.serverDirectory = document.getElementById("imap.serverDirectory").getAttribute("value");
     serverSettings.otherUsersNamespace = document.getElementById("imap.otherUsersNamespace").getAttribute("value");
     serverSettings.overrideNamespaces = document.getElementById("imap.overrideNamespaces").checked;
-}
+  }
 
   dump("Opening dialog..\n");
   window.openDialog("chrome://messenger/content/am-server-advanced.xul",

mailnews/base/prefs/resources/content/am-server.xul

@@ -57,13 +57,15 @@ Contributors:
       </row>
       <row align="center">
         <hbox>
-            <label value="&serverName.label;"/>
+            <label value="&serverName.label;" accesskey="&serverName.accesskey;"
+                   control="server.realHostName"/>
         </hbox>
         <hbox align="center">
             <label id="fixedServerName" collapsed="true" use="server.realHostName"/>
             <textbox wsm_persist="true" size="20" id="server.realHostName"
                      prefstring="mail.server.%serverkey%.realhostname" class="uri-element"/>
-            <label hidefor="movemail" value="&port.label;"/>
+            <label hidefor="movemail" value="&port.label;"
+                   accesskey="&port.accesskey;" control="server.port"/>
             <label id="fixedServerPort" hidefor="movemail" 
                    collapsed="true" use="server.port"/>
             <textbox wsm_persist="true" size="3" id="server.port"
@@ -75,7 +77,9 @@ Contributors:
       </row>
       <row align="center">
         <hbox align="center" hidefor="nntp">
-            <label value="&userName.label;"/>
+            <label value="&userName.label;"
+                   accesskey="&userName.accesskey;"
+                   control="server.realUsername"/>
         </hbox>
         <hbox align="center" hidefor="nntp">
             <label id="fixedUserName" collapsed="true" use="server.realUsername"/>
@@ -93,15 +97,18 @@ Contributors:
   <vbox flex="1">
   <checkbox wsm_persist="true" id="server.isSecure"
             label="&isSecure.label;" oncommand="secureSelect();"
+            accesskey="&isSecure.accesskey;"
             prefattribute="value"
             prefstring="mail.server.%serverkey%.isSecure"/>
   <checkbox wsm_persist="true" id="server.useSecAuth"
             label="&useSecAuth.label;" hidefor="nntp,movemail"
+            accesskey="&useSecAuth.accesskey;"
             prefattribute="value"
             prefstring="mail.server.%serverkey%.useSecAuth"/>
   <checkbox wsm_persist="true"
             id="server.loginAtStartUp" hidefor="nntp"
             label="&loginAtStartup.label;"
+            accesskey="&loginAtStartup.accesskey;"
             prefattribute="value"
             prefstring="mail.server.%serverkey%.login_at_startup"/>
 <!--
@@ -110,6 +117,7 @@ Contributors:
 -->
   <hbox align="center">
     <checkbox wsm_persist="true" id="server.doBiff" label="&biffStart.label;"
+              accesskey="&biffStart.accesskey;"
               oncommand="setupBiffUI();"
               prefattribute="value"
               prefstring="mail.server.%serverkey%.check_new_mail"/>
@@ -123,16 +131,19 @@ Contributors:
   <vbox align="start" hidefor="imap,nntp,movemail">
     <checkbox wsm_persist="true" id="server.downloadOnBiff"
               label="&downloadOnBiff.label;" prefattribute="value"
+              accesskey="&downloadOnBiff.accesskey;"
               prefstring="mail.server.%serverkey%.download_on_biff"/>
 
     <checkbox wsm_persist="true" id="pop3.leaveMessagesOnServer"
               label="&leaveOnServer.label;" oncommand="setupMailOnServerUI();"
+              accesskey="&leaveOnServer.accesskey;"
               prefattribute="value"
               prefstring="mail.server.%serverkey%.leave_on_server"/>
 
     <hbox align="center">
       <checkbox wsm_persist="true" id="pop3.deleteByAgeFromServer" class="indent"
                 label="&deleteByAgeFromServer.label;" oncommand="setupAgeMsgOnServerUI();"
+                accesskey="&deleteByAgeFromServer.accesskey;"
                 prefattribute="value"
                 prefstring="mail.server.%serverkey%.delete_by_age_from_server"/>
       <textbox wsm_persist="true" id="pop3.numDaysToLeaveOnServer" size="3" 
@@ -143,12 +154,15 @@ Contributors:
 
     <checkbox wsm_persist="true" id="pop3.deleteMailLeftOnServer" class="indent"
               label="&deleteOnServer.label;"
+              accesskey="&deleteOnServer.accesskey;"
               prefattribute="value"
               prefstring="mail.server.%serverkey%.delete_mail_left_on_server"/>
   </vbox>
   <!-- IMAP -->
   <hbox align="center" id="imap.deleteModel.box" hidefor="pop3,nntp,movemail">
-    <label value="&deleteMessagePrefix.label;"/>
+    <label value="&deleteMessagePrefix.label;"
+           accesskey="&deleteMessagePrefix.accesskey;"
+           control="imap.deleteModel"/>/>
     <menulist wsm_persist="true" id="imap.deleteModel" prefstring="mail.server.%serverkey%.delete_model">
       <menupopup>
         <menuitem value="1" label="&modelMoveToTrash.label;"/>
@@ -180,6 +194,7 @@ Contributors:
   <hbox hidefor="pop3,imap,movemail" align="center">
     <checkbox wsm_persist="true" id="nntp.notifyOn"
               label="&maxMessagesStart.label;"
+              accesskey="&maxMessagesStart.accesskey;"
               oncommand="setupNotifyUI();"
               prefattribute="value"
               prefstring="mail.server.%serverkey%.notify.on"/>
@@ -192,6 +207,7 @@ Contributors:
   </hbox>
   <checkbox hidefor="pop3,imap,movemail" wsm_persist="true" id="nntp.pushAuth"
             label="&alwaysAuthenticate.label;"
+            accesskey="&alwaysAuthenticate.accesskey;"
             prefattribute="value"
             prefstring="mail.server.%serverkey%.always_authenticate"/>
 
@@ -214,14 +230,17 @@ Contributors:
     <vbox flex="1">
       <checkbox hidefor="pop3,nntp,movemail" wsm_persist="true" id="imap.cleanupInboxOnExit"
                 label="&expungeOnExit.label;"
+                accesskey="&expungeOnExit.accesskey;"
                 prefattribute="value"
                 prefstring="mail.server.%serverkey%.cleanup_inbox_on_exit"/>
       <checkbox hidefor="nntp" wsm_persist="true" id="server.emptyTrashOnExit" 
                 label="&emptyTrashOnExit.label;"
+                accesskey="&emptyTrashOnExit.accesskey;"
                 prefattribute="value"
                 prefstring="mail.server.%serverkey%.empty_trash_on_exit"/>
     </vbox>
     <button label="&advancedButton.label;"
+            accesskey="&advancedButton.accesskey;"
             oncommand="onAdvanced();"
             wsm_persist="true" id="server.advancedbutton" 
             prefstring="mail.server.%serverkey%.advanced.disable"/>
@@ -229,7 +248,8 @@ Contributors:
   </hbox>
 
   <vbox hidefor="imap,pop3,movemail">
-    <label value="&newsrcFilePath.label;" control="nntp.newsrcFilePath"/>
+    <label value="&newsrcFilePath.label;" control="nntp.newsrcFilePath"
+           accesskey="&newsrcFilePath.accesskey;"/>
     <textbox wsm_persist="true" id="nntp.newsrcFilePath"
                datatype="nsIFileSpec"
                prefstring="mail.server.%serverkey%.newsrc.file" class="uri-element"/>
@@ -240,7 +260,8 @@ Contributors:
 
   <separator class="thin"/>
   <vbox>
-    <label value="&localPath.label;" control="server.localPath"/>
+    <label value="&localPath.label;" control="server.localPath"
+           accesskey="&localPath.accesskey;"/>
     <textbox wsm_persist="true" id="server.localPath"
              datatype="nsIFileSpec"
              class="uri-element"

mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul

@@ -19,7 +19,8 @@
     </columns>
     <rows>
       <row align="center">
-        <label value="&accountName.label;" control="server.prettyName"/>
+        <label value="&accountName.label;" control="server.prettyName"
+               accesskey="&accountName.accesskey;"/>
         <textbox wsm_persist="true" size="30" id="server.prettyName"
                  prefstring="mail.server.%serverkey%.name"/>
       </row>
@@ -27,7 +28,8 @@
   </grid>
   <spacer flex="1"/>
   <vbox>
-    <label value="&localPath.label;"/>
+    <label value="&localPath.label;" control="server.localPath"
+           accesskey="&localPath.accesskey;"/>
     <textbox wsm_persist="true" size="60" id="server.localPath" datatype="nsIFileSpec"
              prefstring="mail.server.%serverkey%.directory" class="uri-element"/>
   </vbox>

mailnews/base/prefs/resources/content/am-smtp.xul

@@ -26,6 +26,7 @@
   <hbox>
     <spacer flex="1"/>
     <button label="&advanced.label;" oncommand="onAdvanced(event);"
+            accesskey="&advanced.accesskey;"
             wsm_persist="true" id="smtp.advancedbutton" 
             prefstring="mail.smtpserver.%serverkey%.advanced.disable"/>
   </hbox>

mailnews/base/prefs/resources/content/smtpEditOverlay.xul

@@ -33,12 +33,13 @@
 
   <vbox id="smtpServerEditor">
     <hbox align = "center">
-          <label value="&serverName.label;"/>
+          <label value="&serverName.label;" accesskey="&serverName.accesskey;" control="smtp.hostname"/>
           <textbox id="smtp.hostname" flex="1"
                    preftype="string"
                    class="uri-element"
                    prefstring="mail.smtpserver.%serverkey%.hostname"/>
-            <label value="&serverPort.label;"/>
+            <label value="&serverPort.label;" accesskey="&serverPort.accesskey;"
+                   control="smtp.port"/>
             <textbox id="smtp.port" size="5"
                      preftype="int"
                      prefstring="mail.smtpserver.%serverkey%.port"/>
@@ -51,13 +52,15 @@
       <label hidden="true" id="smtp.authMethod"/>
       <hbox align="center">
       <checkbox id="smtp.useUsername" label="&alwaysUseUsername.label;"
+                accesskey="&alwaysUseUsername.accesskey;"
                 oncommand="onUseUsername(event.target,true);"
                 prefattribute="value"
                 prefstring="mail.smtpserver.%serverkey%.use_username"/>
       </hbox>                
-      <vbox style="margin-left: 2em">
+      <vbox class="indent">
         <hbox align="center">
-          <label id="smtpusernamelabel" value="&userName.label;"/>
+          <label id="smtpusernamelabel" value="&userName.label;"
+                 accesskey="&userName.accesskey;" control="smtp.username"/>
           <textbox id="smtp.username" flex="1"
                    preftype="string"
                    prefstring="mail.smtpserver.%serverkey%.username"/>
@@ -71,13 +74,17 @@
        <label value="&isSecure.label;"/>
      </hbox>
      <radiogroup id="smtp.trySSL"
-                prefstring="mail.smtpserver.%serverkey%.try_ssl"
-                oncommand="selectProtocol(0);">
-       <hbox style="margin-left: 2em">
-         <radio value="0" label="&neverSecure.label;" id="smtp.neverSecure"/>
-         <radio value="1" label="&sometimesSecure.label;" id="smtp.sometimesSecure"/>
-         <radio value="2" label="&alwaysSecure.label;" id="smtp.alwaysSecure"/>
-        <radio value="3" label="&alwaysSmtpS.label;" id="smtp.alwaysSmtpS"/>
+                 prefstring="mail.smtpserver.%serverkey%.try_ssl"
+                 oncommand="selectProtocol(0);">
+       <hbox class="indent">
+         <radio value="0" id="smtp.neverSecure"
+                label="&neverSecure.label;" accesskey="&neverSecure.accesskey;"/>
+         <radio value="1" id="smtp.sometimesSecure"
+                label="&sometimesSecure.label;" accesskey="&sometimesSecure.accesskey;"/>
+         <radio value="2" id="smtp.alwaysSecure"
+                label="&alwaysSecure.label;" accesskey="&alwaysSecure.accesskey;"/>
+         <radio value="3" id="smtp.alwaysSmtpS"
+                label="&alwaysSmtpS.label;" accesskey="&alwaysSmtpS.accesskey;"/>
        </hbox>
      </radiogroup>
   </vbox>

mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd

@@ -3,11 +3,13 @@
 <!ENTITY accountManagerTitle.label "Mail &amp; Newsgroups Account Settings">
 
 <!ENTITY addAccountButton.label "Add Account...">
+<!ENTITY addAccountButton.accesskey "A">
 <!ENTITY setDefaultButton.label "Set as Default">
+<!ENTITY setDefaultButton.accesskey "f">
 <!ENTITY duplicateButton.label "Duplicate">
 <!ENTITY removeButton.label "Remove Account">
+<!ENTITY removeButton.accesskey "R">
 
-<!ENTITY nameCol.label "Name">
 <!ENTITY duplicate.label "Duplicate">
 
 <!-- AccountManager.xul -->

mailnews/base/prefs/resources/locale/en-US/SmtpServerList.dtd

@@ -1,6 +0,0 @@
-<!ENTITY smtpListTitle.label "Advanced Outgoing Server (SMTP) Settings">
-<!ENTITY smtpListDesc.label "Although you can specify more than one outgoing server (SMTP), this is recommended only for advanced users. Setting up multiple SMTP servers can cause errors when sending messages.">
-<!ENTITY smtpListAdd.label  "Add...">
-<!ENTITY smtpListEdit.label "Edit...">
-<!ENTITY smtpListDelete.label "Delete">
-<!ENTITY smtpListSetDefault.label "Set Default">

mailnews/base/prefs/resources/locale/en-US/am-addressing.dtd

@@ -5,29 +5,28 @@
 <!ENTITY addressingText.label      "When looking up addresses:">
 <!-- LOCALIZATION NOTE (override.label) : do not translate "LDAP" in below line -->
 <!ENTITY useGlobal.label           "Use my global LDAP server preferences for this account">
+<!ENTITY useGlobal.accesskey       "U">
 <!ENTITY editDirectories.label     "Edit Directories...">
+<!ENTITY editDirectories.accesskey "E">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
 <!ENTITY directories.label         "Use a different LDAP server:">
+<!ENTITY directories.accesskey     "d">
 
 <!-- am-addressing.xul -->
 
 <!ENTITY compositionGroupTitle.label "Composition">
 <!-- LOCALIZATION NOTE (useHtml.label) : do not translate "html" in below line -->
-<!ENTITY useHtml.label "Compose messages in HTML format">
+<!ENTITY useHtml.label                        "Compose messages in HTML format">
+<!ENTITY useHtml.accesskey                    "C">
 <!ENTITY autoQuote.label                      "Automatically quote the original message when replying">
-<!ENTITY autoQuote.accesskey                  "A">
+<!ENTITY autoQuote.accesskey                  "q">
 <!-- LOCALIZATION NOTE (then.label): This will concatenate with the 4 strings that follow. -->
 <!ENTITY then.label                           "Then,">
 <!ENTITY then.accesskey                       "t">
 <!ENTITY aboveQuote.label                     "start my reply above the quote">
-<!ENTITY aboveQuote.accesskey                 "v">
 <!ENTITY belowQuote.label                     "start my reply below the quote">
-<!ENTITY belowQuote.accesskey                 "b">
 <!ENTITY selectAndQuote.label                 "select the quote">
-<!ENTITY selectAndQuote.accesskey             "e">
 <!ENTITY place.label                          "and place my signature">
 <!ENTITY place.accesskey                      "p">
 <!ENTITY belowText.label                      "below the quote (recommended)">
-<!ENTITY belowText.accesskey                  "b">
 <!ENTITY aboveText.label                      "below my reply (above the quote)">
-<!ENTITY aboveText.accesskey                  "v">

mailnews/base/prefs/resources/locale/en-US/am-advanced.dtd

@@ -1,16 +1,9 @@
 <!-- extracted from am-advanced.xul -->
 
-<!ENTITY advancedSettings.label "Advanced Settings">
 <!-- LOCALIZATION NOTE (smtpServer.label): do not translate "SMTP" in below line -->
 <!ENTITY smtpServer.label "Outgoing Server (SMTP) Settings">
 <!-- LOCALIZATION NOTE (smtpDesc.label): do not translate "SMTP" in below line -->
 <!ENTITY smtpDesc.label "Only one outgoing server (SMTP) needs to be specified, even if you have several mail accounts. Enter the name of the server for outgoing messages.">
-
-<!ENTITY smtpAlwaysUseName.label "Use name and password">
-<!ENTITY smtpSavePassword.label "Save my password">
-<!ENTITY smtpHostname.label "Server Name:">
-<!ENTITY smtpUsername.label "User Name:">
-<!-- LOCALIZATION NOTE (smtpUseSecure.label): do not translate "SSL" in below line -->
-<!ENTITY smtpUseSecure.label "Use secure connection (SSL)">
 <!ENTITY advanced.label "Advanced...">
+<!ENTITY advanced.accesskey "v">
 

mailnews/base/prefs/resources/locale/en-US/am-copies.dtd

@@ -3,20 +3,31 @@
 <!ENTITY copyAndFolderTitle.label "Copies &amp; Folders">
 <!ENTITY sendingPrefix.label "When sending messages, automatically: ">
 <!ENTITY fccMailFolder.label "Place a copy in:">
+<!ENTITY fccMailFolder.accesskey "P">
 <!ENTITY chooseFolderButton.label "Choose Folder...">
 <!-- LOCALIZATION NOTE (bccAddress.label): do not translate "Bcc" in below line -->
 <!ENTITY bccAddress.label "Bcc these email addresses:">
+<!ENTITY bccAddress.accesskey "B">
 <!ENTITY specialFolderTitle.label "Special Folders">
 <!ENTITY draftMailFolder.label "Keep message drafts in:">
 <!ENTITY templateMailFolder.label "Keep message templates in:">
 <!ENTITY saveMessageDlg.label "Show confirmation dialog when messages are saved">
+<!ENTITY saveMessageDlg.accesskey "S">
 <!-- LOCALIZATION NOTE (sentFolderOn.label): do not translate "Sent" in below line. see bug #64199 -->
 <!ENTITY sentFolderOn.label "&quot;Sent&quot; Folder on:">
+<!ENTITY sentFolderOn.accesskey "e">
+<!ENTITY sentInOtherFolder.label "Other:">
+<!ENTITY sentInOtherFolder.accesskey "O">
 <!-- LOCALIZATION NOTE (draftsFolderOn.label): do not translate "Drafts" in below line. see bug #64199 -->
 <!ENTITY draftsFolderOn.label "&quot;Drafts&quot; Folder on:">
+<!ENTITY draftsFolderOn.accesskey "D">
+<!ENTITY draftInOtherFolder.label "Other:">
+<!ENTITY draftInOtherFolder.accesskey "t">
 <!-- LOCALIZATION NOTE (templatesFolderOn.label): do not translate "Templates" in below line. see bug #23625 -->
 <!ENTITY templatesFolderOn.label "&quot;Templates&quot; Folder on:">
-<!ENTITY otherFolder.label "Other:">
+<!ENTITY templatesFolderOn.accesskey "m">
+<!ENTITY templateInOtherFolder.label "Other:">
+<!ENTITY templateInOtherFolder.accesskey "r">
 <!ENTITY specialFoldersTitle.label "Drafts and Templates">
 <!ENTITY keepDrafts.label "Keep message drafts in:">
 <!ENTITY keepTempltes.label "Keep message templates in:">

mailnews/base/prefs/resources/locale/en-US/am-main.dtd

@@ -3,20 +3,26 @@
 <!ENTITY accountTitle.label "Account Settings">
 <!ENTITY accountSettingsDesc.label "The following information is needed before you can send messages. If you do not know the information requested, please contact your system administrator or Internet Service Provider.">
 <!ENTITY accountName.label "Account Name:">
+<!ENTITY accountName.accesskey "N">
 <!ENTITY accountNameDesc.label "The account name is used to identify each account">
 <!ENTITY identityTitle.label "Identity">
 <!ENTITY identityDesc.label "Each account has an identity, which is the information that other people see when they read your messages.">
 <!ENTITY name.label "Your Name:">
+<!ENTITY name.accesskey "Y">
 <!ENTITY email.label "Email Address:">
+<!ENTITY email.accesskey "E">
 <!ENTITY replyTo.label "Reply-to Address:">
+<!ENTITY replyTo.accesskey "s">
 <!ENTITY organization.label "Organization:">
+<!ENTITY organization.accesskey "O">
 <!ENTITY signature.label "Attach this signature:">
+<!ENTITY signature.accesskey "t">
 <!ENTITY edit.label "Edit...">
 <!ENTITY choose.label "Choose...">
+<!ENTITY choose.accesskey "C">
 <!ENTITY editVCard.label "Edit Card...">
-<!ENTITY sampleSig1.label "Sample Signature 1">
-<!ENTITY sampleSig2.label "Sample Signature 2">
-<!ENTITY sampleSig3.label "Sample Signature 3">
+<!ENTITY editVCard.accesskey "d">
 <!-- LOCALIZATION NOTE (attachVCard.label) : do not translate "vCard" in below line -->
 <!ENTITY attachVCard.label "Attach my vCard to messages">
-<!ENTITY advancedButton.label "Advanced...">
+<!ENTITY attachVCard.accesskey "v">
+

mailnews/base/prefs/resources/locale/en-US/am-server-advanced.dtd

@@ -2,16 +2,25 @@
 <!-- LOCALIZATION NOTE (smtpDesc.label): DONT_TRANSLATE "SMTP" -->
 <!ENTITY smtpDesc.label "When sending messages from this identity, always use the following outgoing server (SMTP):">
 <!ENTITY smtpName.label "Server:">
+<!ENTITY smtpName.accesskey "S">
 <!ENTITY smtpDefaultServer.label "Always use default server">
 <!-- LOCALIZATION NOTE (serverDirectory.label): DONT_TRANSLATE "IMAP" -->
 <!ENTITY imapAdvanced.label "Advanced IMAP Server Settings">
 <!ENTITY serverDirectory.label "IMAP server directory:">
+<!ENTITY serverDirectory.accesskey "d">
 <!ENTITY usingSubscription.label "Show only subscribed folders">
+<!ENTITY usingSubscription.accesskey "w">
 <!ENTITY dualUseFolders.label "Server supports folders that contain sub-folders and messages">
+<!ENTITY dualUseFolders.accesskey "f">
 <!ENTITY maximumConnectionsNumber.label "Maximum number of server connections to cache">
+<!ENTITY maximumConnectionsNumber.accesskey "M">
 <!-- LOCALIZATION NOTE (namespaceDesc.label): DONT_TRANSLATE "IMAP" -->
 <!ENTITY namespaceDesc.label "These preferences specify the namespaces on your IMAP server">
 <!ENTITY personalNamespace.label "Personal namespace:">
-<!ENTITY publicNamespace.label   "Public (shared):">
-<!ENTITY otherUsersNamespace.label    "Other Users:">
+<!ENTITY personalNamespace.accesskey "P">
+<!ENTITY publicNamespace.label "Public (shared):">
+<!ENTITY publicNamespace.accesskey "u">
+<!ENTITY otherUsersNamespace.label "Other Users:">
+<!ENTITY otherUsersNamespace.accesskey "O">
 <!ENTITY overrideNamespaces.label "Allow server to override these namespaces">
+<!ENTITY overrideNamespaces.accesskey "A">

mailnews/base/prefs/resources/locale/en-US/am-server-top.dtd

@@ -10,8 +10,11 @@
 <!ENTITY webmail.label "WebMail account">
 <!ENTITY serverType.label "Server Type:">
 <!ENTITY serverName.label "Server Name:">
+<!ENTITY serverName.accesskey "S">
 <!ENTITY userName.label "User Name:">
+<!ENTITY userName.accesskey "N">
 <!ENTITY port.label "Port:">
+<!ENTITY port.accesskey "P">
 <!ENTITY serverPortDefault.label "Default:">
 <!ENTITY savePassword.label "Save password">
 <!-- LOCALIZATION NOTE (biffStart.label) : translate below 2 line with grammer dependency
@@ -20,38 +23,53 @@
                 biffEnd.label   "minutes for new messages Check"
 -->
 <!ENTITY biffStart.label "Check for new messages every ">
+<!ENTITY biffStart.accesskey "k">
 <!ENTITY biffEnd.label "minutes">
 <!ENTITY isSecure.label "Use secure connection (SSL)">
+<!ENTITY isSecure.accesskey "U">
 <!ENTITY useSecAuth.label "Use secure authentication">
+<!ENTITY useSecAuth.accesskey "i">
 <!ENTITY leaveOnServer.label "Leave messages on server">
+<!ENTITY leaveOnServer.accesskey "g">
 <!ENTITY deleteByAgeFromServer.label "For at most">
+<!ENTITY deleteByAgeFromServer.accesskey "o">
 <!ENTITY daysEnd.label "days">
 <!ENTITY deleteOnServer.label "Until I delete or move them from Inbox">
+<!ENTITY deleteOnServer.accesskey "d">
 <!ENTITY downloadOnBiff.label "Automatically download new messages">
+<!ENTITY downloadOnBiff.accesskey "m">
 <!ENTITY hostname.label "Server Hostname">
 <!ENTITY username.label "Your Login Name">
 <!-- LOCALIZATION NOTE (popServerTitle.label) : do not translate "POP" in below line -->
 <!ENTITY popServerTitle.label "POP Server Information">
 <!ENTITY deleteMessagePrefix.label "When I delete a message:">
+<!ENTITY deleteMessagePrefix.accesskey "W">
 <!ENTITY modelMoveToTrash.label "Move it to the Trash folder">
 <!ENTITY modelMarkDeleted.label "Mark it as deleted">
 <!ENTITY modelDeleteImmediately.label "Remove it immediately">
 <!-- LOCALIZATION NOTE (expungeOnExit.label) : do not translate two of "&quot;" in below line -->
 <!ENTITY expungeOnExit.label "Clean up (&quot;Expunge&quot;) Inbox on Exit">
+<!ENTITY expungeOnExit.accesskey "E">
 <!ENTITY emptyTrashOnExit.label "Empty Trash on Exit">
+<!ENTITY emptyTrashOnExit.accesskey "x">
 <!ENTITY loginAtStartup.label "Check for new messages at startup"> 
+<!ENTITY loginAtStartup.accesskey "C">
 <!-- LOCALIZATION NOTE (maxMessagesStart.label) : translate below 2 lines with grammar dependency 
     maxMessengerStart.label will be followed by maxMessagesEnd.label with the number
 	 of messages between them
 -->
 <!ENTITY maxMessagesStart.label "Ask me before downloading more than">
+<!ENTITY maxMessagesStart.accesskey "m">
 <!-- LOCALIZATION NOTE (maxMessagesEnd.label) : see note for maxMessagesStart.label -->
 <!ENTITY maxMessagesEnd.label "messages">
 <!ENTITY alwaysAuthenticate.label "Always request authentication when connecting to this server">
+<!ENTITY alwaysAuthenticate.accesskey "w">
 <!ENTITY newsrcFilePath.label "newsrc file:">
+<!ENTITY newsrcFilePath.accesskey "f">
 <!ENTITY localPath.label "Local directory:">
+<!ENTITY localPath.accesskey "L">
 <!ENTITY abbreviate.label "Show newsgroup names in the Mail Folder pane as:">
 <!ENTITY abbreviateOn.label "Full names (For example, 'netscape.public.mozilla.mail-news')">
 <!ENTITY abbreviateOff.label "Abbreviate names (For example, 'n.p.m.mail-news')">
 <!ENTITY advancedButton.label "Advanced...">
-
+<!ENTITY advancedButton.accesskey "v">

mailnews/base/prefs/resources/locale/en-US/am-serverwithnoidentities.dtd

@@ -1,4 +1,6 @@
 <!ENTITY accountTitle.label "Account Settings">
 <!ENTITY accountSettingsDesc.label "The following is a special account.  There are no identities associated with it.">
 <!ENTITY accountName.label "Account Name:">
+<!ENTITY accountName.accesskey "N">
 <!ENTITY localPath.label "Local directory:">
+<!ENTITY localPath.accesskey "L">

mailnews/base/prefs/resources/locale/en-US/smtpEditOverlay.dtd

@@ -1,12 +1,19 @@
 <!ENTITY serverName.label "Server Name:">
+<!ENTITY serverName.accesskey "S">
 <!ENTITY serverPort.label "Port:">
+<!ENTITY serverPort.accesskey "P">
 <!ENTITY alwaysUseUsername.label "Use name and password">
+<!ENTITY alwaysUseUsername.accesskey "U">
 <!ENTITY userName.label "User Name:">
-<!ENTITY savePassword.label "Save my password">
+<!ENTITY userName.accesskey "m">
 <!ENTITY isSecure.label "Use secure connection:">
 <!ENTITY neverSecure.label "No">
+<!ENTITY neverSecure.accesskey "N">
 <!ENTITY sometimesSecure.label "TLS, if available">
+<!ENTITY sometimesSecure.accesskey "a">
 <!ENTITY alwaysSecure.label "TLS">
+<!ENTITY alwaysSecure.accesskey "T">
 <!ENTITY alwaysSmtpS.label "SSL">
+<!ENTITY alwaysSmtpS.accesskey "L">
 <!ENTITY smtpEditTitle.label "SMTP Server">
 <!ENTITY serverPortDefault.label "Default:">

mailnews/extensions/mdn/resources/content/am-mdn.xul

@@ -40,13 +40,16 @@ Rights Reserved.
       <radiogroup id="identity.use_custom_prefs" wsm_persist="true" genericattr="true" 
                   preftype="bool" prefstring="mail.identity.%identitykey%.use_custom_prefs" 
                   oncommand="EnableDisableCustomSettings();">
-        <radio id="identity.select_global_prefs" value="false" label="&useGlobalPrefs.label;"/>
-        <radio id="identity.select_custom_prefs" value="true" label="&useCustomPrefs.label;"/> 
+        <radio id="identity.select_global_prefs" value="false" label="&useGlobalPrefs.label;"
+               accesskey="&useGlobalPrefs.accesskey;"/>
+        <radio id="identity.select_custom_prefs" value="true" label="&useCustomPrefs.label;"
+               accesskey="&useCustomPrefs.accesskey;"/>
       </radiogroup>
     </hbox>
 
     <vbox id="returnReceiptSettings" class="indent">
       <checkbox id="identity.request_return_receipt_on" label="&requestReceipt.label;"
+                accesskey="&requestReceipt.accesskey;"
                 wsm_persist="true" genericattr="true" iscontrolcontainer="true"
                 preftype="bool" prefstring="mail.identity.%identitykey%.request_return_receipt_on"/>
 
@@ -54,8 +57,10 @@ Rights Reserved.
         <description id="receiptArriveLabel">&receiptArrive.label;</description>
         <radiogroup id="server.incorporate_return_receipt" wsm_persist="true" genericattr="true" 
                     preftype="int" prefstring="mail.server.%serverkey%.incorporate_return_receipt">
-          <radio id="leave_in_inbox" value="0" label="&leaveIt.label;"/>
-          <radio id="move_to_sent" value="1" label="&moveToSent.label;"/> 
+          <radio id="leave_in_inbox" value="0" label="&leaveIt.label;"
+                 accesskey="&leaveIt.accesskey;"/>
+          <radio id="move_to_sent" value="1" label="&moveToSent.label;"
+                 accesskey="&moveToSent.accesskey;"/>
         </radiogroup>
       </vbox>
 
@@ -64,8 +69,10 @@ Rights Reserved.
         <radiogroup id="server.mdn_report_enabled" wsm_persist="true" genericattr="true" 
                     preftype="bool" prefstring="mail.server.%serverkey%.mdn_report_enabled" 
                     oncommand="EnableDisableAllowedReceipts();">
-          <radio id="never_return" value="false" label="&never.label;"/>
-          <radio id="return_some" value="true" label="&returnSome.label;"/> 
+          <radio id="never_return" value="false" label="&never.label;"
+                 accesskey="&never.accesskey;"/>
+          <radio id="return_some" value="true" label="&returnSome.label;"
+                 accesskey="&returnSome.accesskey;"/>
         </radiogroup>
 
         <hbox id="receiptSendIf" class="indent">
@@ -73,7 +80,8 @@ Rights Reserved.
             <columns><column/><column/></columns>
             <rows>
               <row align="center">
-                <label id="notInToCcLabel">&notInToCc.label;</label>
+                <label id="notInToCcLabel" value="&notInToCc.label;"
+                       accesskey="&notInToCc.accesskey;" control="server.mdn_not_in_to_cc"/>
                 <menulist id="server.mdn_not_in_to_cc" wsm_persist="true" genericattr="true" 
                           preftype="int" prefstring="mail.server.%serverkey%.mdn_not_in_to_cc">
                   <menupopup>
@@ -84,7 +92,8 @@ Rights Reserved.
                 </menulist>
               </row>
               <row align="center">
-                <label id="outsideDomainLabel">&outsideDomain.label;</label>
+                <label id="outsideDomainLabel" value="&outsideDomain.label;"
+                       accesskey="&outsideDomain.accesskey;" control="server.mdn_outside_domain"/>
                 <menulist id="server.mdn_outside_domain" wsm_persist="true" genericattr="true" 
                           preftype="int" prefstring="mail.server.%serverkey%.mdn_outside_domain">
                   <menupopup>
@@ -95,7 +104,8 @@ Rights Reserved.
                 </menulist>
               </row>
               <row align="center">
-                <label id="otherCasesLabel">&otherCases.label;</label>
+                <label id="otherCasesLabel" value="&otherCases.label;"
+                       accesskey="&otherCases.accesskey;" control="server.mdn_other"/>
                 <menulist id="server.mdn_other" wsm_persist="true" genericattr="true" 
                           preftype="int" prefstring="mail.server.%serverkey%.mdn_other">
                   <menupopup>

mailnews/extensions/mdn/resources/locale/en-US/am-mdn.dtd

@@ -1,21 +0,0 @@
-<!ENTITY pane.title                   "Return Receipts">
-<!ENTITY useGlobalPrefs.label         "Use my global return receipt preferences for this account">
-<!ENTITY useCustomPrefs.label         "Customize return receipts for this account">
-<!ENTITY requestReceipt.label         "When sending messages, always request a return receipt">
-<!ENTITY receiptArrive.label          "When a receipt arrives:">
-<!ENTITY leaveIt.label                "Leave it in my Inbox">
-<!ENTITY leaveIt.accesskey            "i">
-<!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
-<!ENTITY moveToSent.label             "Move it to my &quot;Sent&quot; folder">
-<!ENTITY moveToSent.accesskey         "m">
-<!ENTITY requestMDN.label             "When I receive a request for a return receipt:">
-<!ENTITY returnSome.label             "Allow return receipts for some messages">
-<!ENTITY returnSome.accesskey         "r">
-<!ENTITY never.label                  "Never send a return receipt">
-<!ENTITY never.accesskey              "n">
-<!ENTITY notInToCc.label              "If I'm not in the To or Cc of the message:">
-<!ENTITY outsideDomain.label          "If the sender is outside my domain:">
-<!ENTITY otherCases.label             "In all other cases:">
-<!ENTITY askMe.label                  "Ask me">
-<!ENTITY alwaysSend.label             "Always send">
-<!ENTITY neverSend.label              "Never send">

mailnews/extensions/smime/resources/content/am-smime.xul

@@ -53,17 +53,20 @@ Contributors:
              readonly="true" disabled="true"/>
 
       <button id="signingCertSelectButton"
-              label="&certificate.button;"
+              label="&digitalSign.certificate.button;"
+              accesskey="&digitalSign.certificate.accesskey;"
               oncommand="smimeSelectCert('identity.signing_cert_name')"/>
  
       <button id="signingCertClearButton"
-              label="&certificate_clear.button;"
+              label="&digitalSign.certificate_clear.button;"
+              accesskey="&digitalSign.certificate_clear.accesskey;"
               oncommand="smimeClearCert('identity.signing_cert_name')"/>
     </hbox>
     
     <separator class="thin"/>
 
-    <checkbox id="identity.sign_mail" wsm_persist="true" label="&signMessage.label;"/>
+    <checkbox id="identity.sign_mail" wsm_persist="true"
+              label="&signMessage.label;" accesskey="&signMessage.accesskey;"/>
   </groupbox>
 
   <groupbox id="encryption.titlebox">
@@ -76,11 +79,13 @@ Contributors:
                readonly="true" disabled="true"/>
 
       <button id="encryptionCertSelectButton"
-              label="&certificate.button;"
+              label="&encryption.certificate.button;"
+              accesskey="&encryption.certificate.accesskey;"
               oncommand="smimeSelectCert('identity.encryption_cert_name')"/>
       
       <button id="encryptionCertClearButton"
-              label="&certificate_clear.button;"
+              label="&encryption.certificate_clear.button;"
+              accesskey="&encryption.certificate_clear.accesskey;"
               oncommand="smimeClearCert('identity.encryption_cert_name')"/>
     </hbox>
 
@@ -90,10 +95,10 @@ Contributors:
 
     <radiogroup id="encryptionChoices">
       <radio id="encrypt_mail_never" wsm_persist="true" value="0"
-             label="&neverEncrypt.label;"/>
+             label="&neverEncrypt.label;" accesskey="&neverEncrypt.accesskey;"/>
 
       <radio id="encrypt_mail_always" wsm_persist="true" value="2"
-              label="&alwaysEncryptMessage.label;"/>
+             label="&alwaysEncryptMessage.label;" accesskey="&alwaysEncryptMessage.accesskey;"/>
     </radiogroup>
   </groupbox>    
 </page>

mailnews/extensions/smime/resources/locale/en-US/am-smime.dtd

@@ -1,14 +0,0 @@
-<!ENTITY securityTitle.label "Security">
-<!ENTITY securityHeading.label "To send and receive signed or encrypted messages, you should specify both a digital signing certificate and an encryption certificate.">
-<!ENTITY encryptionGroupTitle.label "Encryption">
-<!ENTITY encryptionChoiceLabel.label "Default encryption setting when sending messages:">
-<!ENTITY neverEncrypt.label "Never (do not use encryption)">
-<!ENTITY alwaysEncryptMessage.label "Required (can't send message unless all recipients have certificates)">
-<!ENTITY encryptionCert.message "Use this certificate to encrypt &amp; decrypt messages sent to you:">
-<!ENTITY encryptionCert.notselected "No certificate set">
-<!ENTITY certificate.button "Select...">
-<!ENTITY certificate_clear.button "Clear">
-<!ENTITY signingGroupTitle.label "Digital Signing">
-<!ENTITY signMessage.label "Digitally sign messages (by default)">
-<!ENTITY signingCert.message "Use this certificate to digitally sign messages you send:">
-<!ENTITY signingCert.notselected "No certificate set">