diff --git a/mail/components/prefwindow/content/nsPrefWindow.js b/mail/components/prefwindow/content/nsPrefWindow.js
index 560fea4896d4..fdd309bd50bd 100644
--- a/mail/components/prefwindow/content/nsPrefWindow.js
+++ b/mail/components/prefwindow/content/nsPrefWindow.js
@@ -183,7 +183,7 @@ nsPrefWindow.prototype =
           {
             for( var pageTag in this.wsm.dataManager.pageData )
               {
-                var pageData = this.wsm.dataManager.getPageData( pageTag );
+                var pageData = this.wsm.dataManager.getPageData( pageTag );
                 if ("initialized" in pageData && pageData.initialized && "elementIDs" in pageData)
                   {
                 for( var elementID in pageData.elementIDs )
@@ -294,7 +294,7 @@ nsPrefWindow.prototype =
           {
             var header = document.getElementById("header");
             header.setAttribute("title",
-                                window.frames[this.contentFrame].document.documentElement.getAttribute("headertitle"));
+                                window.frames[this.contentFrame].document.documentElement.getAttribute("headertitle"));
             var pageData = this.wsm.dataManager.getPageData(aPageTag); 
             if(!('initialized' in pageData))
               {
@@ -336,7 +336,7 @@ nsPrefWindow.prototype =
                     root.localname = prefElements[i].localName;
                   }
               }      
-            this.wsm.setPageData( aPageTag );  // do not set extra elements, accept hard coded defaults
+            this.wsm.setPageData( aPageTag );  // do not set extra elements, accept hard coded defaults
             
             if( 'Startup' in window.frames[ this.contentFrame ])
               {
diff --git a/mail/components/prefwindow/jar.mn b/mail/components/prefwindow/jar.mn
index a0cb707cd736..d4f8666130c4 100644
--- a/mail/components/prefwindow/jar.mn
+++ b/mail/components/prefwindow/jar.mn
@@ -1,43 +1,43 @@
-messenger.jar:
-+   content/messenger/messengercompose/pref-composing_messages.xul     (content/pref-composing_messages.xul)
-    content/messenger/messengercompose/pref-sendOptions.xul            (content/pref-sendOptions.xul)
-+   content/messenger/pref-viewing_messages.xul                        (content/pref-viewing_messages.xul)
-*+  content/messenger/pref-mailnews.xul                                (content/pref-mailnews.xul)
-+   content/messenger/pref-mailnews.js                                 (content/pref-mailnews.js)
-*+  content/messenger/pref-advanced.xul                                (content/pref-advanced.xul)
-*+  content/messenger/pref-advanced.js                                 (content/pref-advanced.js)
-
-comm.jar:
-+   content/communicator/pref/pref.xul                                 (content/pref.xul)
-*+  content/communicator/pref/nsPrefWindow.js                          (content/nsPrefWindow.js)
-*+  content/communicator/pref/pref-themes.xul                          (content/pref-themes.xul)
-*+  content/communicator/pref/pref-themes.js                           (content/pref-themes.js)
-*   content/communicator/pref/pref-extensions.xul                      (content/pref-extensions.xul)
-*   content/communicator/pref/pref-extensions.js                       (content/pref-extensions.js)
-*+  content/communicator/pref/pref-fonts.xul                           (content/pref-fonts.xul)
-*+  content/communicator/pref/pref-fonts.js                            (content/pref-fonts.js)
-*   content/communicator/pref/pref-calibrate-screen.xul                (content/pref-calibrate-screen.xul)
-
-en-US.jar:
-+   locale/en-US/communicator/pref/prefutilities.properties            (locale/prefutilities.properties)
-+   locale/en-US/communicator/pref/pref-fonts.dtd                      (locale/pref-fonts.dtd)
-+   locale/en-US/communicator/pref/pref-themes.dtd                     (locale/pref-themes.dtd)
-+   locale/en-US/messenger/messengercompose/pref-composing_messages.dtd (locale/pref-composing_messages.dtd)
-    locale/en-US/messenger/messengercompose/pref-sendOptions.dtd       (locale/pref-sendOptions.dtd)
-+   locale/en-US/messenger/pref-mailnews.dtd                           (locale/pref-mailnews.dtd)
-*+  locale/en-US/messenger/mailPrefsOverlay.dtd                        (locale/mailPrefsOverlay.dtd)
-+   locale/en-US/messenger/pref-viewing_messages.dtd                   (locale/pref-viewing_messages.dtd)
-+   locale/en-US/messenger/AccountManager.dtd                          (locale/AccountManager.dtd)
-+   locale/en-US/messenger/pref-advanced.dtd                           (locale/pref-advanced.dtd)
-+   locale/en-US/communicator/pref/pref-themes.dtd                     (locale/pref-themes.dtd)
-+   locale/en-US/communicator/pref/pref-extensions.dtd                 (locale/pref-extensions.dtd)
-+   locale/en-US/mozapps/downloads/pref-downloads.dtd                  (locale/pref-downloads.dtd)
-
-en-win.jar:
-+   locale/en-US/messenger-mapi/pref-mailnewsOverlay.dtd               (locale/pref-mailnewsOverlay.dtd)
-
-classic.jar:
-+   skin/classic/communicator/pref/pref.css                            (skin/pref.css)
-    skin/classic/messenger/icons/mail-options.png                      (skin/mail-options.png)
-    skin/classic/messenger/icons/mailPaneConfig.png                    (skin/mailPaneConfig.png)
-
+messenger.jar:
++   content/messenger/messengercompose/pref-composing_messages.xul     (content/pref-composing_messages.xul)
+    content/messenger/messengercompose/pref-sendOptions.xul            (content/pref-sendOptions.xul)
++   content/messenger/pref-viewing_messages.xul                        (content/pref-viewing_messages.xul)
+*+  content/messenger/pref-mailnews.xul                                (content/pref-mailnews.xul)
++   content/messenger/pref-mailnews.js                                 (content/pref-mailnews.js)
+*+  content/messenger/pref-advanced.xul                                (content/pref-advanced.xul)
+*+  content/messenger/pref-advanced.js                                 (content/pref-advanced.js)
+
+comm.jar:
++   content/communicator/pref/pref.xul                                 (content/pref.xul)
+*+  content/communicator/pref/nsPrefWindow.js                          (content/nsPrefWindow.js)
+*+  content/communicator/pref/pref-themes.xul                          (content/pref-themes.xul)
+*+  content/communicator/pref/pref-themes.js                           (content/pref-themes.js)
+*   content/communicator/pref/pref-extensions.xul                      (content/pref-extensions.xul)
+*   content/communicator/pref/pref-extensions.js                       (content/pref-extensions.js)
+*+  content/communicator/pref/pref-fonts.xul                           (content/pref-fonts.xul)
+*+  content/communicator/pref/pref-fonts.js                            (content/pref-fonts.js)
+*   content/communicator/pref/pref-calibrate-screen.xul                (content/pref-calibrate-screen.xul)
+
+en-US.jar:
++   locale/en-US/communicator/pref/prefutilities.properties            (locale/prefutilities.properties)
++   locale/en-US/communicator/pref/pref-fonts.dtd                      (locale/pref-fonts.dtd)
++   locale/en-US/communicator/pref/pref-themes.dtd                     (locale/pref-themes.dtd)
++   locale/en-US/messenger/messengercompose/pref-composing_messages.dtd (locale/pref-composing_messages.dtd)
+    locale/en-US/messenger/messengercompose/pref-sendOptions.dtd       (locale/pref-sendOptions.dtd)
++   locale/en-US/messenger/pref-mailnews.dtd                           (locale/pref-mailnews.dtd)
+*+  locale/en-US/messenger/mailPrefsOverlay.dtd                        (locale/mailPrefsOverlay.dtd)
++   locale/en-US/messenger/pref-viewing_messages.dtd                   (locale/pref-viewing_messages.dtd)
++   locale/en-US/messenger/AccountManager.dtd                          (locale/AccountManager.dtd)
++   locale/en-US/messenger/pref-advanced.dtd                           (locale/pref-advanced.dtd)
++   locale/en-US/communicator/pref/pref-themes.dtd                     (locale/pref-themes.dtd)
++   locale/en-US/communicator/pref/pref-extensions.dtd                 (locale/pref-extensions.dtd)
++   locale/en-US/mozapps/downloads/pref-downloads.dtd                  (locale/pref-downloads.dtd)
+
+en-win.jar:
++   locale/en-US/messenger-mapi/pref-mailnewsOverlay.dtd               (locale/pref-mailnewsOverlay.dtd)
+
+classic.jar:
++   skin/classic/communicator/pref/pref.css                            (skin/pref.css)
+    skin/classic/messenger/icons/mail-options.png                      (skin/mail-options.png)
+    skin/classic/messenger/icons/mailPaneConfig.png                    (skin/mailPaneConfig.png)
+
diff --git a/mail/components/prefwindow/locale/mailPrefsOverlay.dtd b/mail/components/prefwindow/locale/mailPrefsOverlay.dtd
index 51775ace55eb..6ee72045c0e5 100644
--- a/mail/components/prefwindow/locale/mailPrefsOverlay.dtd
+++ b/mail/components/prefwindow/locale/mailPrefsOverlay.dtd
@@ -7,7 +7,7 @@
 
 <!ENTITY mailonly.label "General">
 <!ENTITY viewingMessages.label "Display">
-<!ENTITY composingMessages.label "Composition">
+<!ENTITY composingMessages.label "Composition">
 <!ENTITY attachments.label "Attachments">
 <!ENTITY fonts.label "Fonts">
 <!ENTITY themes.label "Themes">
diff --git a/mail/components/prefwindow/locale/pref-downloads.dtd b/mail/components/prefwindow/locale/pref-downloads.dtd
index 8edd75b61f37..638e5bdc5025 100755
--- a/mail/components/prefwindow/locale/pref-downloads.dtd
+++ b/mail/components/prefwindow/locale/pref-downloads.dtd
@@ -1,27 +1,27 @@
-<!ENTITY lHeader                      "Attachments">
-
-<!ENTITY askOnSave.label              "Attachment Folder">
-<!ENTITY alwaysAsk.label              "Ask me where to save every attachment">
-<!ENTITY neverAsk.label               "Save all attachments to this folder:">
-<!ENTITY desktop.label                "Desktop">
-<!ENTITY downloads.label              "My Downloads">
-<!ENTITY choose.label                 "Other...">
-<!ENTITY showFolder.label             "Show Folder">
-
-<!ENTITY downloadManagerWindow.label  "Download Manager">
-<!ENTITY showWhenStarting.label       "Show Download Manager window when a download begins.">
-<!ENTITY closeWhenDone.label          "Close the Download Manager when all downloads are complete.">
-
-<!ENTITY fileTypes.label              "File Types">
-<!-- XXX this text string could improve --> 
-<!ENTITY fileTypesDescription.label   "Automatically perform the associated action with each of the following file types:">
-<!ENTITY fileTypeColName.label        "File Type">
-<!ENTITY fileHandlerColName.label     "Application">
-<!ENTITY editFileHandler.label        "Change Action...">
-<!ENTITY editFileHandler.accesskey    "a">
-<!ENTITY removeFileHandler.label      "Remove">
-<!ENTITY removeFileHandler.accesskey  "r">
-
-<!ENTITY plugins.label                "Plug-Ins...">
-<!ENTITY plugins.accesskey            "p">
-
+<!ENTITY lHeader                      "Attachments">
+
+<!ENTITY askOnSave.label              "Attachment Folder">
+<!ENTITY alwaysAsk.label              "Ask me where to save every attachment">
+<!ENTITY neverAsk.label               "Save all attachments to this folder:">
+<!ENTITY desktop.label                "Desktop">
+<!ENTITY downloads.label              "My Downloads">
+<!ENTITY choose.label                 "Other...">
+<!ENTITY showFolder.label             "Show Folder">
+
+<!ENTITY downloadManagerWindow.label  "Download Manager">
+<!ENTITY showWhenStarting.label       "Show Download Manager window when a download begins.">
+<!ENTITY closeWhenDone.label          "Close the Download Manager when all downloads are complete.">
+
+<!ENTITY fileTypes.label              "File Types">
+<!-- XXX this text string could improve --> 
+<!ENTITY fileTypesDescription.label   "Automatically perform the associated action with each of the following file types:">
+<!ENTITY fileTypeColName.label        "File Type">
+<!ENTITY fileHandlerColName.label     "Application">
+<!ENTITY editFileHandler.label        "Change Action...">
+<!ENTITY editFileHandler.accesskey    "a">
+<!ENTITY removeFileHandler.label      "Remove">
+<!ENTITY removeFileHandler.accesskey  "r">
+
+<!ENTITY plugins.label                "Plug-Ins...">
+<!ENTITY plugins.accesskey            "p">
+
diff --git a/mail/components/prefwindow/locale/pref-mailnewsOverlay.dtd b/mail/components/prefwindow/locale/pref-mailnewsOverlay.dtd
index 8f2bc638de8a..c3b096590fca 100755
--- a/mail/components/prefwindow/locale/pref-mailnewsOverlay.dtd
+++ b/mail/components/prefwindow/locale/pref-mailnewsOverlay.dtd
@@ -1,5 +1,5 @@
 <!ENTITY enableMapiTitle.label        "When sending mail from other applications">
 <!ENTITY enableMapi.label             "Use &vendorShortName; as the default mail application">
 <!ENTITY enableMapi.accesskey         "u">
-<!ENTITY enableNews.label             "Use &vendorShortName; as the default news application">
-<!ENTITY enableNews.accesskey         "n">
+<!ENTITY enableNews.label             "Use &vendorShortName; as the default news application">
+<!ENTITY enableNews.accesskey         "n">