diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
index 95057829ef0..898566d2a7d 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -62,7 +62,7 @@
   </script>
   
   <groupbox>
-    <caption label="&generalSettings.label;"/>
+    <caption label="&generalSettings.caption;"/>
     
     <hbox align="center">
       <checkbox id="mailnewsConfirmMoveFoldersToTrash" label="&confirmMove.label;"
@@ -88,7 +88,7 @@
   </groupbox>
 
   <groupbox>
-    <caption label="&messengerStartPage.label;"/>
+    <caption label="&messengerStartPage.caption;"/>
       <hbox align="center">
         <checkbox id="mailnewsStartPageEnabled" label="&enableStartPage.label;"
                   prefstring="mailnews.start_page.enabled" oncommand="StartPageCheck();"
@@ -114,7 +114,7 @@
 
   <!-- toolbar buttons customization -->
   <groupbox flex="1" orient="horizontal">
-    <caption label="&toolbarIntro.label;"/>
+    <caption label="&toolbarIntro.caption;"/>
     <vbox>
       <checkbox id="fileButton"
                 label="&fileButton.label;" accesskey="&fileButton.accesskey;"
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-notifications.xul b/mozilla/mailnews/base/prefs/resources/content/pref-notifications.xul
index 917508e8791..3d181a3bb7b 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-notifications.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-notifications.xul
@@ -60,8 +60,9 @@
   </script>
   
   <groupbox id="newMessagesArrivePrefs">
-    <caption id="newMessagesArriveCaption" label="&newMessagesArrive.label;"/>
+    <caption label="&notifications.caption;"/>
 
+    <label value="&newMessagesArrive.label;"/>
     <vbox align="start">
       <checkbox id="newMailNotificationAlert" label="&showAnimatedAlert.label;"
                 prefstring="mail.biff.show_alert"
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul b/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
index e9bbc1535a9..bf9f0ade16c 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
@@ -56,7 +56,7 @@
 
 
   <groupbox>
-    <caption label="&pref.receipts.caption;"/>
+    <caption label="&prefReceipts.caption;"/>
 
     <vbox id="returnReceiptSettings" align="start">
       <checkbox id="alwaysRequest" label="&requestReceipt.label;"
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
index e270bedcb92..3a98762662e 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@@ -34,7 +34,7 @@
   </script>
 
   <groupbox align="start">
-    <caption label="&generalMessageDisplay.label;"/>
+    <caption label="&generalMessageDisplay.caption;"/>
     <label value="&openingMessages.label;"/>
     <hbox class="indent" align="center">
       <radiogroup id="reuseMessageWindow" orient="horizontal"
@@ -66,7 +66,7 @@
   </groupbox>
 
   <groupbox>
-    <caption label="&displayPlainText.label;"/>
+    <caption label="&displayPlainText.caption;"/>
     <label value="&plainTextFont.label;"/>
     <hbox class="indent" align="center">
       <radiogroup id="mailFixedWidthMessages" orient="horizontal"
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
index 578983beab0..91da10e0fe0 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
@@ -1,20 +1,23 @@
-
-<!ENTITY enbJsCheckMailNews.label     "Mail &amp; Newsgroups">
-<!ENTITY enbJsCheckMailNews.accesskey "M">
+<!-- These are added to the Advanced - Scripts & Plug-ins panel -->
+<!ENTITY enbJsCheckMailNews.label         "Mail &amp; Newsgroups">
+<!ENTITY enbJsCheckMailNews.accesskey     "M">
 <!ENTITY enbPluginCheckMailNews.label     "Mail &amp; Newsgroups">
 <!ENTITY enbPluginCheckMailNews.accesskey "a">
 
-<!ENTITY mail.label "Mail &amp; Newsgroups">
-<!ENTITY mail.accesskey "M">
-<!ENTITY addressbook.label "Address Book">
-<!ENTITY addressbook.accesskey "A">
-<!ENTITY viewingMessages.label "Message Display">
-<!ENTITY notifications.label "Notifications">
-<!ENTITY address.label "Addressing">
-<!ENTITY composingMessages.label "Composition">
-<!ENTITY format.label "Send Format">
-<!ENTITY return.label "Return Receipts">
-<!ENTITY disk.label "Disk Space">
-<!ENTITY labels.label "Labels">
-<!ENTITY characterEncoding.label "Character Encoding">
-<!ENTITY offline.label "Offline &amp; Disk Space">
+<!-- These are added to the Window menu -->
+<!ENTITY mail.label                       "Mail &amp; Newsgroups">
+<!ENTITY mail.accesskey                   "M">
+<!ENTITY addressbook.label                "Address Book">
+<!ENTITY addressbook.accesskey            "A">
+
+<!-- These are added to Preferences dialog -->
+<!ENTITY viewingMessages.label            "Message Display">
+<!ENTITY notifications.label              "Notifications">
+<!ENTITY address.label                    "Addressing">
+<!ENTITY composingMessages.label          "Composition">
+<!ENTITY format.label                     "Send Format">
+<!ENTITY return.label                     "Return Receipts">
+<!ENTITY disk.label                       "Disk Space">
+<!ENTITY labels.label                     "Labels">
+<!ENTITY characterEncoding.label          "Character Encoding">
+<!ENTITY offline.label                    "Offline &amp; Disk Space">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
index a9f4cd2abfb..de858344656 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
@@ -36,7 +36,7 @@
  ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY pref.mailnews.title              "Mail &amp; Newsgroups">
-<!ENTITY generalSettings.label            "General Settings">
+<!ENTITY generalSettings.caption          "General Settings">
 <!ENTITY confirmMove.label                "Confirm when moving folders to the Trash">
 <!ENTITY confirmMove.accesskey            "C">
 <!ENTITY useMessenger.label               "Use Mail from MAPI-based applications">
@@ -44,8 +44,8 @@
 <!ENTITY autounzip.label                  "Automatically expand zip files when saving attachments">
 <!ENTITY autounzip.accesskey              "A">
 <!ENTITY preserveThreading.label          "Preserve threading when sorting messages">
-<!ENTITY preserveThreading.accesskey      "t">
-<!ENTITY messengerStartPage.label         "Mail Start Page">
+<!ENTITY preserveThreading.accesskey      "v">
+<!ENTITY messengerStartPage.caption       "Mail Start Page">
 <!ENTITY enableStartPage.label            "When Mail launches, show the Start Page in the message area">
 <!ENTITY enableStartPage.accesskey        "W">
 <!ENTITY location.label                   "Location:">
@@ -54,7 +54,7 @@
 <!ENTITY useDefault.accesskey             "D">
 <!ENTITY rememberLastMsg.label            "Remember the last selected message">
 <!ENTITY rememberLastMsg.accesskey        "e">
-<!ENTITY toolbarIntro.label               "Select the buttons you want to see in the toolbar">
+<!ENTITY toolbarIntro.caption             "Select the buttons you want to see in the toolbar">
 <!ENTITY fileButton.label                 "File">
 <!ENTITY fileButton.accesskey             "F">
 <!ENTITY nextButton.label                 "Next">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-notifications.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-notifications.dtd
index b8bb4fd025e..ee27bde9414 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-notifications.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-notifications.dtd
@@ -36,6 +36,7 @@
  ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY pref.notifications.title         "Notifications">
+<!ENTITY notifications.caption            "Notifications">
 <!ENTITY newMessagesArrive.label          "When new messages arrive:">
 <!ENTITY playSound.label                  "Play a sound">
 <!ENTITY playSound.accesskey              "P">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
index 3b2bab310b3..4d74282c4d7 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
@@ -37,19 +37,17 @@
 
 <!-- LOCALIZATION NOTE pref-receipts.dtd: UI for Mail/News Return Receipts prefs -->
 <!ENTITY pref.receipts.title          "Return Receipts">
-<!ENTITY pref.receipts.caption        "Return Receipts">
+<!ENTITY prefReceipts.caption         "Return Receipts">
 <!ENTITY requestReceipt.label         "When sending messages, always request a return receipt">
 <!ENTITY requestReceipt.accesskey     "W">
-<!-- LOCALIZATION NOTE dsn.label: don't translate "DSN"  -->
 <!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 leaveIt.accesskey            "L">
 <!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         "e">
+<!ENTITY returnSome.accesskey         "A">
 <!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:">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
index 100160c688f..6189e900d53 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
@@ -49,7 +49,7 @@
 <!ENTITY smaller.label                    "Smaller">
 <!ENTITY color.label                      "Color:">
 <!ENTITY color.accesskey                  "C">
-<!ENTITY displayPlainText.label           "When displaying plain text messages">
+<!ENTITY displayPlainText.caption         "Plain text messages">
 <!ENTITY plainTextFont.label              "Use the following font width:">
 <!ENTITY displayQuoted.label              "Settings for quoted messages:">
 <!ENTITY fixedWidth.label                 "Fixed">
@@ -63,7 +63,7 @@
 <!-- LOCALIZATION NOTE : (convertEmoticons.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
 <!ENTITY convertEmoticons.label           "Display emoticons as graphics">
 <!ENTITY convertEmoticons.accesskey       "D">
-<!ENTITY generalMessageDisplay.label      "General">
+<!ENTITY generalMessageDisplay.caption    "General">
 <!-- LOCALIZATION NOTE (markMessagesRead.label): This will concatenate with
      "xxx seconds before marking a message as read", using a number and
      (seconds.label). -->