Bug 1015779 - XUL Remove whitespace in mail/ r=mconley
authorJosiah Bruner <josiah@programmer.net>
Sun, 25 May 2014 18:29:46 -0400
changeset 19336 7e23a0acc5e86e2f19560950dbcbd1c735f038fa
parent 19335 f5bcaef84129bb5de37d646d1102283dbbbc7be4
child 19337 09f077f965ef2f5de45a563f594096b101c4bf5e
push idunknown
push userunknown
push dateunknown
reviewersmconley
bugs1015779
Bug 1015779 - XUL Remove whitespace in mail/ r=mconley
mail/base/content/ABSearchDialog.xul
mail/base/content/SearchDialog.xul
mail/base/content/aboutDialog.xul
mail/base/content/extraCustomizeItems.xul
mail/base/content/hiddenWindow.xul
mail/base/content/mailWindowOverlay.xul
mail/base/content/msgPrintEngine.xul
mail/base/content/newTagDialog.xul
mail/base/content/safeMode.xul
mail/base/content/sanitize.xul
mail/base/content/subscribe.xul
mail/base/content/utilityOverlay.xul
mail/components/activity/content/activity.xul
mail/components/addrbook/content/abCardOverlay.xul
mail/components/addrbook/content/abMailListDialog.xul
mail/components/addrbook/content/addressbook.xul
mail/components/compose/content/editorOverlay.xul
mail/components/compose/content/messengercompose.xul
mail/components/migration/content/migration.xul
mail/components/preferences/advanced.xul
mail/components/preferences/colors.xul
mail/components/preferences/compose.xul
mail/components/preferences/connection.xul
mail/components/preferences/dsn.xul
mail/components/preferences/receipts.xul
mail/components/preferences/security.xul
mail/extensions/mailviews/content/mailViewSetup.xul
mail/extensions/smime/content/msgReadSMIMEOverlay.xul
mail/test/resources/mozmill/mozmill/extension/content/dxwindow.xul
mail/test/resources/mozmill/mozmill/extension/content/mozmill.xul
mail/test/resources/mozmill/mozmill/extension/content/overlay.xul
mail/test/resources/mozmill/mozmill/extension/content/overlay_tb.xul
mail/test/resources/mozmill/mozmill/extension/content/prefs.xul
mail/test/resources/mozmill/mozmill/extension/content/test/test.xul
mail/test/resources/mozmill/mozmill/extension/content/testwindow.xul
--- a/mail/base/content/ABSearchDialog.xul
+++ b/mail/base/content/ABSearchDialog.xul
@@ -88,77 +88,77 @@
               onkeypress="AbResultsPaneKeyPress(event);"
               onselect="this.view.selectionChanged();"
               sortCol="GeneratedName"
               persist="sortCol">
 
           <treecols id="abResultsTreeCols">
           <!-- these column ids must match up to the mork column names, except for GeneratedName and ChatName, see nsIAddrDatabase.idl -->
           <treecol id="GeneratedName"
-                   persist="hidden ordinal width sortDirection" flex="1" 
+                   persist="hidden ordinal width sortDirection" flex="1"
                    label="&GeneratedName.label;" primary="true"/>
           <splitter class="tree-splitter"/>
           <treecol id="PrimaryEmail"
                    persist="hidden ordinal width sortDirection"  flex="1" label="&PrimaryEmail.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="ChatName"
                    hidden="true"
                    persist="hidden ordinal width sortDirection" flex="1" label="&ChatName.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="Company"
                    persist="hidden ordinal width sortDirection" flex="1" label="&Company.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="NickName"
-                   persist="hidden ordinal width sortDirection" 
+                   persist="hidden ordinal width sortDirection"
                    hidden="true"
                    flex="1" label="&NickName.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="SecondEmail"
-                   persist="hidden ordinal width sortDirection" 
+                   persist="hidden ordinal width sortDirection"
                    hidden="true"
                    flex="1" label="&SecondEmail.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="Department"
-                   persist="hidden ordinal width sortDirection"  
+                   persist="hidden ordinal width sortDirection"
                    hidden="true"
                    flex="1" label="&Department.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="JobTitle"
-                   persist="hidden ordinal width sortDirection" 
+                   persist="hidden ordinal width sortDirection"
                    hidden="true"
                    flex="1" label="&JobTitle.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="CellularNumber"
-                   persist="hidden ordinal width sortDirection" 
+                   persist="hidden ordinal width sortDirection"
                    hidden="true"
                    flex="1" label="&CellularNumber.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="PagerNumber"
-                   persist="hidden ordinal width sortDirection" 
+                   persist="hidden ordinal width sortDirection"
                    hidden="true"
                    flex="1" label="&PagerNumber.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="FaxNumber"
-                   persist="hidden ordinal width sortDirection" 
+                   persist="hidden ordinal width sortDirection"
                    hidden="true"
                    flex="1" label="&FaxNumber.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="HomePhone"
-                   persist="hidden ordinal width sortDirection" 
+                   persist="hidden ordinal width sortDirection"
                    hidden="true"
                    flex="1" label="&HomePhone.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="WorkPhone"
                    persist="hidden ordinal width sortDirection"
                    flex="1" label="&WorkPhone.label;"/>
 
           <!-- LOCALIZATION NOTE: _PhoneticName may be enabled for Japanese builds. -->
           <!--
             <treecol id="_PhoneticName"
-                     persist="hidden ordinal width sortDirection" 
+                     persist="hidden ordinal width sortDirection"
                      hidden="true"
                      flex="1" label="&_PhoneticName.label;"/>
             <splitter class="tree-splitter"/>
            -->
 
           </treecols>
           <treechildren ondraggesture="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
         </tree>
--- a/mail/base/content/SearchDialog.xul
+++ b/mail/base/content/SearchDialog.xul
@@ -64,17 +64,17 @@
            oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
 #else
       <key id="cmd_shiftDelete" keycode="VK_DELETE"
            oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
 #endif
   </keyset>
 
   <dummy class="usesMailWidgets"/>
-    
+
     <vbox id="searchTerms" flex="3" persist="height">
       <vbox>
          <hbox align="center">
          <label value="&searchHeading.label;" accesskey="&searchHeading.accesskey;"
                 control="searchableFolders"/>
          <menulist id="searchableFolders" flex="2" class="folderMenuItem"
                    displayformat="verbose">
            <menupopup class="searchPopup menulist-menupopup"
@@ -126,21 +126,21 @@
             <splitter class="tree-splitter"/>
             <treecol id="subjectCol" persist="hidden ordinal width" flex="7" ignoreincolumnpicker="true"
                      label="&subjectColumn.label;" tooltiptext="&subjectColumn2.tooltip;"/>
             <splitter class="tree-splitter"/>
             <treecol id="junkStatusCol" persist="hidden ordinal width" fixed="true" cycler="true"
                      class="treecol-image junkStatusHeader"
                      label="&junkStatusColumn.label;" tooltiptext="&junkStatusColumn2.tooltip;"/>
             <splitter class="tree-splitter"/>
-            <treecol id="senderCol" persist="hidden swappedhidden ordinal width" flex="4" 
+            <treecol id="senderCol" persist="hidden swappedhidden ordinal width" flex="4"
                      hidden="false" swappedhidden="true"
                      label="&fromColumn.label;" tooltiptext="&fromColumn2.tooltip;"/>
             <splitter class="tree-splitter"/>
-            <treecol id="recipientCol" persist="hidden swappedhidden ordinal width" flex="4" 
+            <treecol id="recipientCol" persist="hidden swappedhidden ordinal width" flex="4"
                      hidden="true" swappedhidden="false"
                      label="&recipientColumn.label;" tooltiptext="&recipientColumn2.tooltip;"/>
             <splitter class="tree-splitter"/>
             <treecol id="unreadButtonColHeader" persist="hidden ordinal" fixed="true" cycler="true"
                      class="treecol-image readColumnHeader"
                      label="&readColumn.label;" tooltiptext="&readColumn2.tooltip;"/>
             <splitter class="tree-splitter"/>
             <treecol id="dateCol" persist="hidden ordinal width" flex="2"
@@ -172,32 +172,32 @@
                      label="&locationColumn.label;" tooltiptext="&locationColumn2.tooltip;"/>
             <splitter class="tree-splitter"/>
             <treecol id="idCol" persist="hidden ordinal width" flex="1" hidden="true"
                      label="&idColumn.label;" tooltiptext="&idColumn2.tooltip;"/>
           </treecols>
           <treechildren ondraggesture="ThreadPaneOnDragStart(event);"/>
         </tree>
       </vbox>
-      <hbox align="start"> 
+      <hbox align="start">
         <button label="&openButton.label;" id="openButton" command="cmd_open" accesskey="&openButton.accesskey;"/>
         <button id="fileMessageButton" type="menu" label="&moveButton.label;"
                 accesskey="&moveButton.accesskey;"
                 observes="file_message_button">
           <menupopup type="folder" showFileHereLabel="true" mode="filing"
                      oncommand="MoveMessageInSearch(event.target)"/>
         </button>
 
       <button label="&deleteButton.label;" id="deleteButton" command="button_delete" accesskey="&deleteButton.accesskey;"/>
       <button label="&openInFolder.label;" id="openInFolderButton" command="open_in_folder_button" accesskey="&openInFolder.accesskey;" />
       <button label="&saveAsVFButton.label;" id="saveAsVFButton" command="saveas_vf_button" accesskey="&saveAsVFButton.accesskey;" />
       <spacer flex="1" />
-    </hbox>      
+    </hbox>
   </vbox>
 
-  <statusbar class="chromeclass-status" id="status-bar"> 
-    <statusbarpanel id="statusText" crop="right" flex="1"/>   
+  <statusbar class="chromeclass-status" id="status-bar">
+    <statusbarpanel id="statusText" crop="right" flex="1"/>
     <statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel">
       <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
     </statusbarpanel>
-  </statusbar> 
+  </statusbar>
 
 </window>
--- a/mail/base/content/aboutDialog.xul
+++ b/mail/base/content/aboutDialog.xul
@@ -1,9 +1,9 @@
-<?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
+<?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/aboutDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
@@ -123,17 +123,17 @@
         <label class="text-link bottom-link" onclick="openAboutTab('about:rights');">&bottomLinks.rights;</label>
         <label class="text-link bottom-link" onclick="openURL('https://www.mozilla.org/en-US/thunderbird/legal/privacy/');">&bottomLinks.privacy;</label>
       </hbox>
       <description id="trademark">
         <label class="trademark-label">&trademarkInfo.part1;</label>
      </description>
     </vbox>
   </vbox>
-  
+
   <keyset id="mainKeyset">
     <key keycode="VK_ESCAPE" oncommand="window.close();"/>
 #ifdef XP_MACOSX
     <key id="key_close" modifiers="accel" key="&cmdCloseMac.commandKey;"
          oncommand="window.close();"/>
 #endif
   </keyset>
 </window>
--- a/mail/base/content/extraCustomizeItems.xul
+++ b/mail/base/content/extraCustomizeItems.xul
@@ -24,17 +24,17 @@
 
   <toolbarpalette id="MailToolbarPalette">
     <!-- gloda search widget; provides global (message) searching.  -->
     <toolbaritem id="gloda-search" insertafter="button-stop"
                  title="&glodaSearch.title;"
                  align="center"
                  flex="1"
                  class="chromeclass-toolbar-additional">
-        <textbox id="searchInput" 
+        <textbox id="searchInput"
                  flex="1"
                  type="glodacomplete"
                  searchbutton="true"
                  autocompletesearch="gloda"
                  autocompletepopup="PopupGlodaAutocomplete"
                  autocompletesearchparam="global"
                  enablehistory="false"
                  timeout="200"
--- a/mail/base/content/hiddenWindow.xul
+++ b/mail/base/content/hiddenWindow.xul
@@ -1,9 +1,9 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #ifdef XP_MACOSX
 
 <!-- Overlays from messenger.xul.  -->
@@ -27,17 +27,17 @@
 <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
 <script type="application/javascript" src="chrome://messenger/content/shareglue.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
 <script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
 <script type="application/javascript" src="chrome://messenger/content/searchBar.js"/>
 <script type="application/javascript" src="chrome://messenger/content/hiddenWindow.js"/>
-    
+
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
 </stringbundleset>
 
   <!-- keys are appended from the overlay -->
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -217,17 +217,17 @@
   <command id="cmd_nextMsg" oncommand="goDoCommand('cmd_nextMsg')" disabled="true"/>
   <command id="cmd_nextUnreadMsg" oncommand="goDoCommand('cmd_nextUnreadMsg')" disabled="true"/>
   <command id="cmd_nextFlaggedMsg" oncommand="goDoCommand('cmd_nextFlaggedMsg')" disabled="true"/>
   <command id="cmd_nextUnreadThread" oncommand="goDoCommand('cmd_nextUnreadThread')" disabled="true"/>
   <command id="cmd_previousMsg" oncommand="goDoCommand('cmd_previousMsg')" disabled="true"/>
   <command id="cmd_previousUnreadMsg" oncommand="goDoCommand('cmd_previousUnreadMsg')" disabled="true"/>
   <command id="cmd_previousFlaggedMsg" oncommand="goDoCommand('cmd_previousFlaggedMsg')" disabled="true"/>
   <command id="cmd_goStartPage" oncommand="goDoCommand('cmd_goStartPage');"/>
-  <command id="cmd_undoCloseTab" oncommand="goDoCommand('cmd_undoCloseTab');"/> 
+  <command id="cmd_undoCloseTab" oncommand="goDoCommand('cmd_undoCloseTab');"/>
   <command id="cmd_goForward" oncommand="goDoCommand('cmd_goForward')" disabled="true"/>
   <command id="cmd_goBack" oncommand="goDoCommand('cmd_goBack')" disabled="true"/>
   <command id="cmd_chat" oncommand="goDoCommand('cmd_chat')" disabled="true"/>
 </commandset>
 
 <commandset id="mailMessageMenuItems"
             commandupdater="true"
             events="create-menu-message"
@@ -403,17 +403,17 @@
   <key id="key_nextUnreadThread" key="&nextUnreadThread.key;"        oncommand="goDoCommand('cmd_nextUnreadThread')"/>
   <key id="key_previousMsg" key="&prevMsgCmd.key;"                   oncommand="goDoCommand('cmd_previousMsg')"/>
   <key id="key_previousUnreadMsg" key="&prevUnreadMsgCmd.key;"       oncommand="goDoCommand('cmd_previousUnreadMsg')"/>
   <key id="key_archive" key="&archiveMsgCmd.key;"                    oncommand="goDoCommand('cmd_archive')"/>
   <key id="key_goForward" key="&goForwardCmd.commandKey;"            oncommand="goDoCommand('cmd_goForward')"/>
   <key id="key_goBack" key="&goBackCmd.commandKey;"                  oncommand="goDoCommand('cmd_goBack')"/>
   <key id="key_goChat" key="&goChatCmd.key;"                         oncommand="goDoCommand('cmd_chat')" modifiers="accel,shift"/>
   <key id="key_goStartPage" keycode="VK_HOME"                        oncommand="goDoCommand('cmd_goStartPage')" modifiers="alt"/>
-  <key id="key_undoCloseTab" key="&undoCloseTabCmd.commandkey;"      oncommand="goDoCommand('cmd_undoCloseTab')" modifiers="accel, shift"/> 
+  <key id="key_undoCloseTab" key="&undoCloseTabCmd.commandkey;"      oncommand="goDoCommand('cmd_undoCloseTab')" modifiers="accel, shift"/>
   <key id="key_reply" key="&replyMsgCmd.key;"                        oncommand="goDoCommand('cmd_reply')" modifiers="accel"/>
   <key id="key_replyall" key="&replyToAllMsgCmd.key;"                oncommand="goDoCommand('cmd_replyall')" modifiers="accel, shift"/>
   <key id="key_replylist" key="&replyToListMsgCmd.key;"              oncommand="goDoCommand('cmd_replylist')" modifiers="accel, shift"/>
   <key id="key_forward" key="&forwardMsgCmd.key;"                    oncommand="goDoCommand('cmd_forward')" modifiers="accel"/>
   <key id="key_editAsNew" key="&editAsNewMsgCmd.key;"                oncommand="goDoCommand('cmd_editAsNew')" modifiers="accel"/>
   <key id="key_watchThread" key="&watchThreadMenu.key;"              oncommand="goDoCommand('cmd_watchThread')" />
   <key id="key_killThread" key="&killThreadMenu.key;"                oncommand="goDoCommand('cmd_killThread')" />
   <key id="key_killSubthread" key="&killSubthreadMenu.key;"          oncommand="goDoCommand('cmd_killSubthread')" modifiers="shift" />
@@ -2214,19 +2214,19 @@
           <menuseparator id="fileMenuAfterSubscribeSeparator"/>
           <menuitem id="menu_deleteFolder" label="&deleteFolder.label;"
                  accesskey="&deleteFolder.accesskey;"
                  command="cmd_deleteFolder"/>
           <menuitem id="menu_renameFolder" label="&renameFolder.label;"
                  accesskey="&renameFolder.accesskey;"
                  key="key_renameFolder"
                  command="cmd_renameFolder"/>
-          <menuitem id="menu_compactFolder" 
-                    label="&compactFolders.label;" 
-                    accesskey="&compactFolders.accesskey;" 
+          <menuitem id="menu_compactFolder"
+                    label="&compactFolders.label;"
+                    accesskey="&compactFolders.accesskey;"
                     command="cmd_compactFolder"/>
           <menuitem id="menu_emptyTrash" label="&emptyTrashCmd.label;"
                  accesskey="&emptyTrashCmd.accesskey;"
                  command="cmd_emptyTrash"/>
           <menuseparator id="trashMenuSeparator"/>
           <menu id="offlineMenuItem" label="&offlineMenu.label;" accesskey="&offlineMenu.accesskey;">
             <menupopup id="menu_OfflinePopup">
               <menuitem id="goOfflineMenuItem" type="checkbox" label="&offlineGoOfflineCmd.label;"
@@ -2471,20 +2471,20 @@
                         accesskey="&bodySanitized.accesskey;"
                         oncommand="MsgBodySanitized()"/>
               <menuitem id="bodyAsPlaintext" type="radio" name="bodyPlaintextVsHTMLPref" label="&bodyAsPlaintext.label;"
                         accesskey="&bodyAsPlaintext.accesskey;" oncommand="MsgBodyAsPlaintext()"/>
               <menuitem id="bodyAllParts" type="radio" name="bodyPlaintextVsHTMLPref" label="&bodyAllParts.label;"
                         accesskey="&bodyAllParts.accesskey;" oncommand="MsgBodyAllParts()"/>
             </menupopup>
           </menu>
-          <menu id="viewFeedSummary" 
-                label="&bodyMenuFeed.label;" 
+          <menu id="viewFeedSummary"
+                label="&bodyMenuFeed.label;"
                 accesskey="&bodyMenuFeed.accesskey;">
-            <menupopup id="viewFeedSummaryPopupMenu" 
+            <menupopup id="viewFeedSummaryPopupMenu"
                        onpopupshowing="InitViewBodyMenu()">
               <menuitem id="bodyFeedGlobalWebPage"
                         type="radio"
                         name="viewFeedSummaryGroup"
                         label="&viewFeedWebPage.label;"
                         accesskey="&viewFeedWebPage.accesskey;"
                         oncommand="FeedMessageHandler.onSelectPref = 0"/>
               <menuitem id="bodyFeedGlobalSummary"
@@ -2495,32 +2495,32 @@
                         oncommand="FeedMessageHandler.onSelectPref = 1"/>
               <menuitem id="bodyFeedPerFolderPref"
                         type="radio"
                         name="viewFeedSummaryGroup"
                         label="&viewFeedSummaryFeedPropsPref.label;"
                         accesskey="&viewFeedSummaryFeedPropsPref.accesskey;"
                         oncommand="FeedMessageHandler.onSelectPref = 2"/>
               <menuseparator id="viewFeedSummarySeparator"/>
-              <menuitem id="bodyFeedSummaryAllowHTML" 
-                        type="radio" 
+              <menuitem id="bodyFeedSummaryAllowHTML"
+                        type="radio"
                         name="viewFeedBodyHTMLGroup"
-                        label="&bodyAllowHTML.label;" 
+                        label="&bodyAllowHTML.label;"
                         accesskey="&bodyAllowHTML.accesskey;"
                         oncommand="MsgFeedBodyRenderPrefs(false, 0, 0)"/>
-              <menuitem id="bodyFeedSummarySanitized" 
-                        type="radio" 
+              <menuitem id="bodyFeedSummarySanitized"
+                        type="radio"
                         name="viewFeedBodyHTMLGroup"
-                        label="&bodySanitized.label;" 
+                        label="&bodySanitized.label;"
                         accesskey="&bodySanitized.accesskey;"
                         oncommand="MsgFeedBodyRenderPrefs(false, 3, gDisallow_classes_no_html)"/>
-              <menuitem id="bodyFeedSummaryAsPlaintext" 
-                        type="radio" 
+              <menuitem id="bodyFeedSummaryAsPlaintext"
+                        type="radio"
                         name="viewFeedBodyHTMLGroup"
-                        label="&bodyAsPlaintext.label;" 
+                        label="&bodyAsPlaintext.label;"
                         accesskey="&bodyAsPlaintext.accesskey;"
                         oncommand="MsgFeedBodyRenderPrefs(true, 1, gDisallow_classes_no_html)"/>
             </menupopup>
           </menu>
           <menuitem id="viewAttachmentsInlineMenuitem" label="&viewAttachmentsInlineCmd.label;" accesskey="&viewAttachmentsInlineCmd.accesskey;"
             oncommand="ToggleInlineAttachment(event.target)" type="checkbox" checked="true"/>
           <menuseparator id="viewAfterAttachmentsSeparator"/>
           <menu id="viewFullZoomMenu" label="&fullZoom.label;" accesskey="&fullZoom.accesskey;"
@@ -2559,19 +2559,19 @@
           <menu id="goNextMenu" label="&nextMenu.label;" accesskey="&nextMenu.accesskey;">
             <menupopup id="menu_GoNextPopup">
               <menuitem id="menu_nextMsg" label="&nextMsgCmd.label;" accesskey="&nextMsgCmd.accesskey;" command="cmd_nextMsg"
                         key="key_nextMsg"/>
               <menuitem id="menu_nextUnreadMsg" label="&nextUnreadMsgCmd.label;" accesskey="&nextUnreadMsgCmd.accesskey;" command="cmd_nextUnreadMsg"
                         key="key_nextUnreadMsg"/>
               <menuitem id="menu_nextFlaggedMsg" label="&nextStarredMsgCmd.label;" accesskey="&nextStarredMsgCmd.accesskey;" command="cmd_nextFlaggedMsg"/>
               <menuseparator id="goNextAfterFlaggedSeparator"/>
-              <menuitem id="menu_nextUnreadThread" 
-                        label="&nextUnreadThread.label;" 
-                        accesskey="&nextUnreadThread.accesskey;" 
+              <menuitem id="menu_nextUnreadThread"
+                        label="&nextUnreadThread.label;"
+                        accesskey="&nextUnreadThread.accesskey;"
                         command="cmd_nextUnreadThread"
                         key="key_nextUnreadThread"/>
             </menupopup>
           </menu>
           <menu id="goPreviousMenu" label="&prevMenu.label;" accesskey="&prevMenu.accesskey;">
             <menupopup id="menu_GoPreviousPopup">
               <menuitem id="menu_prevMsg" label="&prevMsgCmd.label;" accesskey="&prevMsgCmd.accesskey;" command="cmd_previousMsg"
                         key="key_previousMsg"/>
@@ -2599,26 +2599,26 @@
             <menupopup id="menu_GoFolderPopup"
                        type="folder"
                        showFileHereLabel="true"
                        showRecent="true"
                        recentLabel="&contextMoveCopyMsgRecentMenu.label;"
                        recentAccessKey="&contextMoveCopyMsgRecentMenu.accesskey;"/>
           </menu>
           <menuseparator id="goFolderSeparator"/>
-          
+
           <menu id="goRecentlyClosedTabs"
                 label="&goRecentlyClosedTabs.label;"
                 accesskey="&goRecentlyClosedTabs.accesskey;"
                 observes="cmd_undoCloseTab">
             <menupopup id="menu_GoRecentlyClosedTabsPopup"
                        onpopupshowing="return InitRecentlyClosedTabsPopup(this)" />
           </menu>
           <menuseparator id="goRecentlyClosedTabsSeparator"/>
-               
+
           <menuitem id="goStartPage"
                     label="&startPageCmd.label;"
                     accesskey="&startPageCmd.accesskey;"
                     command="cmd_goStartPage"
                     key="key_goStartPage"/>
         </menupopup>
         </menu>
 
@@ -2672,35 +2672,35 @@
             <menuitem id="openMessageWindowMenuitem" label="&openMessageWindowCmd.label;"
                       command="cmd_openMessage"
                       accesskey="&openMessageWindowCmd.accesskey;"
                       key="key_openMessage"/>
             <menuitem id="openConversationMenuitem" label="&openConversationCmd.label;"
                       command="cmd_openConversation"
                       accesskey="&openConversationCmd.accesskey;"
                       key="key_openConversation"/>
-            <menu id="openFeedMessage" 
+            <menu id="openFeedMessage"
                   label="&openFeedMessage1.label;"
                   accesskey="&openFeedMessage1.accesskey;">
               <menupopup id="menu_openFeedMessage">
                 <menuitem id="menu_openFeedWebPage"
                           type="radio"
-                          name="openFeedGroup" 
+                          name="openFeedGroup"
                           label="&openFeedWebPage.label;"
                           accesskey="&openFeedWebPage.accesskey;"
                           oncommand="FeedMessageHandler.onOpenPref = 0"/>
                 <menuitem id="menu_openFeedSummary"
                           type="radio"
-                          name="openFeedGroup" 
+                          name="openFeedGroup"
                           label="&openFeedSummary.label;"
                           accesskey="&openFeedSummary.accesskey;"
                           oncommand="FeedMessageHandler.onOpenPref = 1"/>
-                <menuitem id="menu_openFeedWebPageInMessagePane" 
+                <menuitem id="menu_openFeedWebPageInMessagePane"
                           type="radio"
-                          name="openFeedGroup" 
+                          name="openFeedGroup"
                           label="&openFeedWebPageInMP.label;"
                           accesskey="&openFeedWebPageInMP.accesskey;"
                           oncommand="FeedMessageHandler.onOpenPref = 2"/>
               </menupopup>
             </menu>
             <menuseparator id="messageAfterOpenMsgSeparator"/>
             <menu id="msgAttachmentMenu"
                   label="&openAttachmentListCmd.label;"
--- a/mail/base/content/msgPrintEngine.xul
+++ b/mail/base/content/msgPrintEngine.xul
@@ -1,9 +1,9 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 <!--
    - This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
--- a/mail/base/content/newTagDialog.xul
+++ b/mail/base/content/newTagDialog.xul
@@ -12,17 +12,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&newTagDialog.title;"
         onload="onLoad();"
         ondialogaccept="return onOKNewTag();">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
-  
+
   <script type="application/javascript" src="chrome://messenger/content/newTagDialog.js"/>
   <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
   <hbox>
     <textbox id="name" oninput="doEnabling();"/>
     <colorpicker class="small-margin" type="button" id="tagColorPicker" palettename="standard"/>
   </hbox>
   <separator/>
 </dialog>
--- a/mail/base/content/safeMode.xul
+++ b/mail/base/content/safeMode.xul
@@ -44,11 +44,11 @@
 
   <separator class="thin"/>
 
   <label value="&safeModeDescription2.label;"/>
   <vbox id="tasks">
     <checkbox id="disableAddons" label="&disableAddons.label;" accesskey="&disableAddons.accesskey;"/>
     <checkbox id="resetToolbars" label="&resetToolbars.label;" accesskey="&resetToolbars.accesskey;"/>
   </vbox>
-     
+
   <separator class="thin"/>
 </dialog>
--- a/mail/base/content/sanitize.xul
+++ b/mail/base/content/sanitize.xul
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="chrome://messenger/skin/sanitizeDialog.css"?>
- 
+
 <?xml-stylesheet href="chrome://messenger/content/sanitizeDialog.css"?>
 
 <!DOCTYPE prefwindow [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   <!ENTITY % sanitizeDTD SYSTEM "chrome://messenger/locale/sanitize.dtd">
   %brandDTD;
   %sanitizeDTD;
 ]>
@@ -33,17 +33,17 @@
 
     <script type="application/javascript"
             src="chrome://messenger/content/sanitizeDialog.js"/>
 
     <preferences id="sanitizePreferences">
       <preference id="privacy.cpd.cookies" name="privacy.cpd.cookies" type="bool"/>
       <preference id="privacy.cpd.cache"   name="privacy.cpd.cache"   type="bool"/>
     </preferences>
-    
+
     <preferences id="nonItemPreferences">
       <preference id="privacy.sanitize.timeSpan"
                   name="privacy.sanitize.timeSpan"
                   type="int"/>
     </preferences>
 
     <hbox id="SanitizeDurationBox" align="center">
       <label value="&clearTimeDuration.label;"
--- a/mail/base/content/subscribe.xul
+++ b/mail/base/content/subscribe.xul
@@ -1,9 +1,9 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/subscribe.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 
@@ -13,51 +13,51 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&subscribeDialog.title;"
         style="width: 44em; height: 33em;"
         persist="width height screenX screenY"
         onload="SubscribeOnLoad()"
         onunload="SubscribeOnUnload()"
         windowtype="mailnews:subscribe"
         ondialogaccept="return subscribeOK();"
-        ondialogcancel="return subscribeCancel();">   
-     
+        ondialogcancel="return subscribeCancel();">
+
 <stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
 <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
 <script type="application/javascript" src="chrome://messenger/content/subscribe.js"/>
 
   <grid flex="1" style="width: 40em; height: 25em;">
     <columns>
       <column flex="1"/>
       <column/>
     </columns>
-  
+
     <rows>
       <row>
         <grid flex="1">
           <columns>
             <column/>
             <column flex="1"/>
           </columns>
-          
+
           <rows>
             <row>
               <hbox pack="end" align="center">
                 <label value="&server.label;" accesskey="&server.accesskey;" control="serverMenu"/>
               </hbox>
               <menulist id="serverMenu" flex="1" class="folderMenuItem">
                 <menupopup type="folder" mode="subscribe" expandFolders="false"
                            oncommand="onServerClick(event.target._folder);"/>
               </menulist>
             </row>
             <row align="center">
-              <label value="&namefield.label;" accesskey="&namefield.accesskey;" 
+              <label value="&namefield.label;" accesskey="&namefield.accesskey;"
                      id="namefieldlabel" control="namefield"/>
               <textbox id="namefield" flex="1" type="search" timeout="300"
                        aria-controls="subscribeTree"
                        oncommand="Search();"/>
             </row>
           </rows>
         </grid>
         <spacer/>
@@ -88,24 +88,24 @@
                           flex="1"
                           hidecolumnpicker="true"
                           seltype="multiple"
                           datasources="rdf:null"
                           flags="dont-build-content"
                           disableKeyNavigation="true"
                           statedatasource="rdf:null"
                           onkeypress="onSubscribeTreeKeyPress(event);"
-                          onclick="SubscribeOnClick(event);"> 
+                          onclick="SubscribeOnClick(event);">
                       <template>
                         <rule>
                           <conditions>
-                            <content uri="?container"/> 
+                            <content uri="?container"/>
                               <member container="?container" child="?member"/>
                             </conditions>
-              
+
                             <bindings>
                               <binding subject="?member"
                                       predicate="http://home.netscape.com/NC-rdf#LeafName"
                                       object="?LeafName"/>
                               <binding subject="?member"
                                       predicate="http://home.netscape.com/NC-rdf#ServerType"
                                       object="?ServerType"/>
                               <binding subject="?member"
@@ -127,69 +127,69 @@
                                               properties="ServerType-?ServerType Subscribable-?Subscribable"/>
                                     <treecell value="?Subscribed" properties="Subscribed-?Subscribed Subscribable-?Subscribable"/>
                                   </treerow>
                                 </treeitem>
                               </treechildren>
                             </action>
                         </rule>
                       </template>
-    
+
                       <treecols id="theSubscribeColumns">
                         <treecol id="nameColumn" primary="true"
                                  sort="?LeafName" flex="10" hideheader="true"/>
                         <splitter class="tree-splitter"/>
                         <treecol id="subscribedColumn" type="checkbox"
                                  sort="?Subscribed" flex="1" hideheader="true"/>
                       </treecols>
                     </tree>
                   </hbox>
-                  
+
                   <hbox id="searchview">
-                    <tree id="searchTree" flex="1" 
+                    <tree id="searchTree" flex="1"
                            disableKeyNavigation="true"
                            hidecolumnpicker="true"
                            onkeypress="onSearchTreeKeyPress(event);"
-                           onclick="SearchOnClick(event);"> 
+                           onclick="SearchOnClick(event);">
                       <treecols>
                         <treecol id="nameColumn2" primary="true"
                         sort="?LeafName" flex="10" hideheader="true"/>
                         <splitter class="tree-splitter"/>
                         <treecol id="subscribedColumn2"
                          sort="?Subscribed" flex="1" hideheader="true"/>
                       </treecols>
                       <treechildren id="searchTreeBody"/>
                     </tree>
                   </hbox>
                 </deck>
 
                 <vbox>
                   <button id="subscribe" label="&subscribeButton.label;"
-                          accesskey="&subscribeButton.accesskey;" 
+                          accesskey="&subscribeButton.accesskey;"
                           oncommand="SetSubscribeState(true)"/>
                   <button id="unsubscribe" label="&unsubscribeButton.label;"
-                          accesskey="&unsubscribeButton.accesskey;" 
+                          accesskey="&unsubscribeButton.accesskey;"
                           oncommand="SetSubscribeState(false)"/>
                   <button id="refreshButton" label="&refreshButton.label;"
-                          accesskey="&refreshButton.accesskey;" 
+                          accesskey="&refreshButton.accesskey;"
                           oncommand="Refresh()"/>
                   <button id="stopButton" label="&stopButton.label;"
-                          accesskey="&stopButton.accesskey;" 
+                          accesskey="&stopButton.accesskey;"
                           oncommand="Stop()" disabled="true"/>
                   <spacer flex="1"/>
                 </vbox>
-                
-              </hbox> 
+
+              </hbox>
             </tabpanel>
           </tabpanels>
         </tabbox>
       </row>
       <row>
         <hbox id="statusContainerBox" >
-           <statusbarpanel id="statusText" crop="right" flex="1"/> 
+           <statusbarpanel id="statusText" crop="right" flex="1"/>
            <statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel">
              <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
            </statusbarpanel>
          </hbox>
          <hbox/>
       </row>
     </rows>
   </grid>
--- a/mail/base/content/utilityOverlay.xul
+++ b/mail/base/content/utilityOverlay.xul
@@ -11,17 +11,17 @@
 <!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
 %utilityDTD;
 
 ]>
 
 <overlay id="utilityOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  
+
   <!-- File Menu -->
   <menu id="menu_File" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;"/>
   <menu id="menu_New" label="&newMenu.label;" accesskey="&newMenu.accesskey;"/>
   <menuitem id="menu_close" label="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" command="cmd_close"/>
 
   <!-- quit -->
   <menupopup id="menu_FilePopup">
     <menuseparator id="menu_FileQuitSeparator"/>
@@ -50,17 +50,17 @@
   <menuitem id="menu_cut" label="&cutCmd.label;" key="key_cut" accesskey="&cutCmd.accesskey;" command="cmd_cut"/>
   <menuitem id="menu_copy" label="&copyCmd.label;" key="key_copy" accesskey="&copyCmd.accesskey;" command="cmd_copy"/>
   <menuitem id="menu_paste" label="&pasteCmd.label;" key="key_paste" accesskey="&pasteCmd.accesskey;" command="cmd_paste"/>
   <menuitem id="menu_delete" label="&deleteCmd.label;" key="key_delete" accesskey="&deleteCmd.accesskey;" command="cmd_delete"/>
   <menuitem id="menu_selectAll" label="&selectAllCmd.label;" key="key_selectAll" accesskey="&selectAllCmd.accesskey;" command="cmd_selectAll"/>
 
   <menu id="menu_Toolbars" label="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;"/>
 
-  <menuitem id="menu_showTaskbar" label="&showTaskbarCmd.label;" accesskey="&showTaskbarCmd.accesskey;" 
+  <menuitem id="menu_showTaskbar" label="&showTaskbarCmd.label;" accesskey="&showTaskbarCmd.accesskey;"
             oncommand="goToggleToolbar('status-bar', 'menu_showTaskbar')"  checked="true"/>
 
   <!-- These key nodes are here only for show. The real bindings come from
        XBL, in platformHTMLBindings.xml. See bugs 57078 and 71779. -->
 
   <key id="key_close"  key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
 #ifdef XP_UNIX
   <key id="key_quit" command="cmd_quit" modifiers="accel" key="&quitApplicationCmd.key;" />
@@ -98,26 +98,26 @@
   <command id="cmd_undo" oncommand="goDoCommand('cmd_undo')" disabled="true"/>
   <command id="cmd_redo" oncommand="goDoCommand('cmd_redo')" disabled="true"/>
   <command id="cmd_cut" oncommand="goDoCommand('cmd_cut')" disabled="true"/>
   <command id="cmd_copy" oncommand="goDoCommand('cmd_copy')" disabled="true"/>
   <command id="cmd_paste"  oncommand="goDoCommand('cmd_paste')" disabled="true"/>
   <command id="cmd_delete" oncommand="goDoCommand('cmd_delete')" valueDefault="&deleteCmd.label;"
            valueDefaultAccessKey="&deleteCmd.accesskey;" disabled="true"/>
   <command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')" disabled="true"/>
-        
+
   <!-- Not needed yet, window will need this: -->
   <!-- broadcaster id="cmd_preferences"/ -->
 
 #ifndef XP_MACOSX
   <menuitem id="menu_preferences"
 #ifdef XP_UNIX
 
             label="&preferencesCmdUnix.label;"
-            accesskey="&preferencesCmdUnix.accesskey;"/>  
+            accesskey="&preferencesCmdUnix.accesskey;"/>
 #else
             label="&preferencesCmd2.label;"
             accesskey="&preferencesCmd2.accesskey;"/>
 #endif
 #endif
 
   <!-- View Menu -->
   <menu id="menu_View" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;"/>
--- a/mail/components/activity/content/activity.xul
+++ b/mail/components/activity/content/activity.xul
@@ -28,26 +28,26 @@
         orient="vertical" title="&activity.title;"
         statictitle="&activity.title;"
         width="&window.width2;" height="&window.height;"
         screenX="10" screenY="10"
         persist="width height screenX screenY sizemode"
         onload="activityObject.startup();"
         onunload="activityObject.shutdown();"
         onclose="return closeWindow(false);">
-      
+
   <script type="application/javascript"
           src="chrome://messenger/content/activity.js"/>
   <script type="application/javascript"
           src="chrome://global/content/contentAreaUtils.js"/>
   <script type="application/javascript"
           src="chrome://global/content/nsDragAndDrop.js"/>
   <script type="application/javascript"
           src="chrome://global/content/globalOverlay.js"/>
-  
+
   <stringbundleset id="activitySet">
     <stringbundle id="brandStrings"
                   src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="activityStrings"
                   src="chrome://messenger/locale/activity.properties"/>
   </stringbundleset>
 
   <!-- Use this commandset for command which do not depend on focus or
@@ -74,23 +74,23 @@
     <key id="key_close2" key="&cmd.close2.commandkey;"
          oncommand="closeWindow(true);" modifiers="accel"/>
 #endif
     <key keycode="VK_ESCAPE" oncommand="closeWindow(true);"/>
 
     <key id="key_selectAllActivities" key="&selectAllCmd.key;" modifiers="accel"
          command="cmd_selectAllActivities"/>
   </keyset>
-  
+
   <vbox id="contextMenuPalette" hidden="true">
     <menuitem id="menuitem_selectAll" label="&selectAllCmd.label;"
               accesskey="&selectAllCmd.accesskey;"
               command="cmd_selectAllActivities"/>
   </vbox>
-  
+
 
   <richlistbox id="activityView" class="activityview" seltype="multiple"
                flex="1" onkeypress="activityObject.processKeyEvent(event)">
   </richlistbox>
 
   <windowdragbox id="search" align="center">
     <button id="clearListButton" command="cmd_clearList"
             label="&cmd.clearList.label;"
--- a/mail/components/addrbook/content/abCardOverlay.xul
+++ b/mail/components/addrbook/content/abCardOverlay.xul
@@ -1,9 +1,9 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/cardDialog.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abCardOverlay.dtd">
 
--- a/mail/components/addrbook/content/abMailListDialog.xul
+++ b/mail/components/addrbook/content/abMailListDialog.xul
@@ -1,9 +1,9 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/cardDialog.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
@@ -72,13 +72,13 @@
                    completedefaultindex="true" forcecomplete="true"
                    minresultsforpopup="3"
                    ontextentered="awRecipientTextCommand(param, this)"
                    onkeypress="handleKeyPress(this, event);"
                    onkeydown="awRecipientKeyDown(event, this);"
                    onclick="awNotAnEmptyArea(event);">
             <image onclick="this.parentNode.select();" class="person-icon"/>
           </textbox>
-        </listcell>            
+        </listcell>
       </listitem>
     </listbox>
   </vbox>
 </dialog>
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -1,15 +1,15 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-<?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?>
 
 #ifdef XP_MACOSX
 <?xul-overlay href="chrome://messenger/content/macMenuOverlay.xul"?>
 #endif
 <?xul-overlay href="chrome://messenger/content/baseMenuOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % abMainWindowDTD SYSTEM "chrome://messenger/locale/addressbook/abMainWindow.dtd" >
@@ -313,22 +313,22 @@
                 <menuseparator id="menu_FileCloseSeparator"/>
                 <menuitem id="menu_close"
                           label="&closeCmd.label;"
                           key="key_close"
                           accesskey="&closeCmd.accesskey;"
                           oncommand="AbClose()"/>
             </menupopup>
         </menu>
-        
+
         <menu id="menu_Edit" label="&editMenu.label;"
               accesskey="&editMenu.accesskey;">
           <menupopup id="menu_EditPopup">
-            <menuitem id="menu_undo" 
-                      label="&undoCmd.label;" 
+            <menuitem id="menu_undo"
+                      label="&undoCmd.label;"
                       key="key_undo"
                       accesskey="&undoCmd.accesskey;"
                       command="cmd_undo"/>
             <menuitem id="menu_redo"
                       label="&redoCmd.label;"
                       key="key_redo"
                       accesskey="&redoCmd.accesskey;"
                       command="cmd_redo"/>
@@ -372,17 +372,17 @@
             <menuitem label="&swapFirstNameLastNameCmd.label;"
                       accesskey="&swapFirstNameLastNameCmd.accesskey;"
                       hidden="&hideSwapFnLnUI;"
                       oncommand="AbSwapFirstNameLastName()"/>
             <menuitem id="menu_properties"
                       label="&propertiesCmd2.label;"
                       accesskey="&propertiesCmd2.accesskey;"
                       key="key_properties"
-                      command="cmd_properties"/>            
+                      command="cmd_properties"/>
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
         <menuseparator id="prefSep"/>
         <menuitem id="menu_preferences" label="&preferencesCmdUnix.label;" accesskey="&preferencesCmdUnix.accesskey;"
                   command="cmd_preferences"/>
 #endif
 #endif
           </menupopup>
@@ -439,35 +439,35 @@
                                   id="displayNameCmd"
                                   label="&displayNameCmd.label;"
                                   accesskey="&displayNameCmd.accesskey;"
                                   oncommand="SetNameColumn('displayNameCmd')"/>
                     </menupopup>
                 </menu>
                 <menu id="sortMenu" label="&sortMenu.label;" accesskey="&sortMenu.accesskey;">
                     <menupopup id="sortMenuPopup" onpopupshowing="InitViewSortByMenu()">
-                        <menuitem label="&GeneratedName.label;" 
+                        <menuitem label="&GeneratedName.label;"
                                   id="cmd_SortByGeneratedName"
                                   accesskey="&GeneratedName.accesskey;"
                                   oncommand="SortResultPane('GeneratedName');" name="sortas" type="radio" checked="true"/>
                         <menuitem label="&PrimaryEmail.label;"
                                   id="cmd_SortByPrimaryEmail"
                                   accesskey="&PrimaryEmail.accesskey;"
                                   oncommand="SortResultPane('PrimaryEmail');" name="sortas" type="radio" checked="true"/>
                         <menuitem label="&ChatName.label;"
                                   id="cmd_SortByChatName"
                                   accesskey="&ChatName.accesskey;"
                                   oncommand="SortResultPane('ChatName');" name="sortas" type="radio" checked="true"/>
                         <menuitem label="&Company.label;"
                                   id="cmd_SortByCompany"
                                   accesskey="&Company.accesskey;"
                                   oncommand="SortResultPane('Company');" name="sortas" type="radio" checked="true"/>
                         <!-- LOCALIZATION NOTE:
-                        Fields for phonetic are disabled as default and can be enabled by 
-                        editing "mail.addr_book.show_phonetic_fields"    
+                        Fields for phonetic are disabled as default and can be enabled by
+                        editing "mail.addr_book.show_phonetic_fields"
                         -->
                         <menuitem label="&_PhoneticName.label;"
                                   id="cmd_SortBy_PhoneticName"
                                   hidden="true"
                                   accesskey="&_PhoneticName.accesskey;"
                                   oncommand="SortResultPane('_PhoneticName');" name="sortas" type="radio" checked="true"/>
                         <menuitem label="&NickName.label;"
                                   id="cmd_SortByNickName"
@@ -506,21 +506,21 @@
                                   accesskey="&WorkPhone.accesskey;"
                                   oncommand="SortResultPane('WorkPhone');" name="sortas" type="radio" checked="true"/>
                         <menuseparator/>
                         <menuitem id="sortAscending" type="radio" name="sortdirection" label="&sortAscending.label;" accesskey="&sortAscending.accesskey;" oncommand="AbSortAscending()"/>
                         <menuitem id="sortDescending" type="radio" name="sortdirection" label="&sortDescending.label;" accesskey="&sortDescending.accesskey;" oncommand="AbSortDescending()"/>
                     </menupopup>
                 </menu>
             </menupopup>
-        </menu>   
-    
+        </menu>
+
         <menu id="tasksMenu" label="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;">
           <menupopup id="taskPopup">
-        
+
 
         <!-- Moving the messengerCmd menu item item to the Window menu on the Mac -->
 #ifndef XP_MACOSX
             <menuitem id="tasksMenuMail" accesskey="&messengerCmd.accesskey;"
                       label="&messengerCmd.label;" key="key_mail"
                       oncommand="toMessengerWindow();"/>
             <menuseparator/>
 #endif
@@ -549,17 +549,17 @@
 #include ../../../../mozilla/toolkit/content/macWindowMenu.inc
 #endif
 
       <!-- Help -->
       <menu id="helpMenu"/>
     </menubar>
    </toolbaritem>
   </toolbar>
-  
+
   <toolbarpalette id="AddressBookToolbarPalette">
       <toolbarbutton class="toolbarbutton-1" id="button-newcard"
                      label="&newContactButton.label;" oncommand="AbNewCard();"
                      tooltiptext="&newContactButton.tooltip;"/>
       <toolbarbutton class="toolbarbutton-1" id="button-newlist" label="&newlistButton.label;" tooltiptext="&newlistButton.tooltip;" command="cmd_newlist"/>
       <toolbarbutton class="toolbarbutton-1" id="button-editcard"
                      label="&editButton2.label;"
                      tooltiptext="&editButton2.tooltip;"
@@ -573,17 +573,17 @@
 
       <toolbaritem id="search-container" title="&searchItem.title;"
                    align="center" flex="1"
                    class="chromeclass-toolbar-additional">
         <textbox id="peopleSearchInput" flex="1" timeout="800"
                  type="search"
                  placeholder="&SearchNameOrEmail.label;"
                  oncommand="onEnterInSearchBar();"/>
-      </toolbaritem>     
+      </toolbaritem>
   </toolbarpalette>
   <!-- toolbar -->
   <toolbar id="ab-bar2" class="toolbar-primary chromeclass-toolbar"
            toolbarname="&showAbToolbarCmd.label;"
            accesskey="&showAbToolbarCmd.accesskey;"
            fullscreentoolbar="true" mode="full"
            customizable="true"
            context="toolbar-context-menu"
@@ -616,34 +616,34 @@
         <treecols>
           <treecol id="DirCol" flex="1" primary="true" hideheader="true"
                    crop="center" persist="width" ignoreincolumnpicker="true"/>
         </treecols>
         <treechildren/>
       </tree>
     </vbox>
 
-    <splitter id="dirTree-splitter" collapse="before" persist="state"/> 
-    
+    <splitter id="dirTree-splitter" collapse="before" persist="state"/>
+
     <vbox flex="1" minwidth="100">
 
       <!-- results pane -->
       <tree id="abResultsTree" flex="1" enableColumnDrag="true" class="plain"
             context="abResultsTreeContext"
             onclick="AbResultsPaneOnClick(event);"
             onkeypress="AbResultsPaneKeyPress(event);"
             onselect="this.view.selectionChanged(); document.commandDispatcher.updateCommands('addrbook-select');"
             sortCol="GeneratedName"
             minheight="100" height="100"
             persist="height sortCol">
 
         <treecols id="abResultsTreeCols">
           <!-- these column ids must match up to the mork column names, except for GeneratedName and ChatName, see nsIAddrDatabase.idl -->
           <treecol id="GeneratedName"
-                   persist="hidden ordinal width sortDirection" flex="1" 
+                   persist="hidden ordinal width sortDirection" flex="1"
                    label="&GeneratedName.label;" primary="true"/>
           <splitter class="tree-splitter"/>
           <treecol id="PrimaryEmail"
                    persist="hidden ordinal width sortDirection" flex="1"
                    label="&PrimaryEmail.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="ChatName"
                    persist="hidden ordinal width sortDirection" flex="1"
@@ -653,87 +653,87 @@
                    persist="hidden ordinal width sortDirection" flex="1"
                    label="&Company.label;"/>
           <splitter class="tree-splitter"/>
           <treecol id="NickName"
                    persist="hidden ordinal width sortDirection" flex="1"
                    label="&NickName.label;" hidden="true"/>
           <splitter class="tree-splitter"/>
           <treecol id="SecondEmail"
-                   persist="hidden ordinal width sortDirection" flex="1" 
+                   persist="hidden ordinal width sortDirection" flex="1"
                    label="&SecondEmail.label;" hidden="true"/>
           <splitter class="tree-splitter"/>
           <treecol id="Department"
-                   persist="hidden ordinal width sortDirection" flex="1"  
+                   persist="hidden ordinal width sortDirection" flex="1"
                    label="&Department.label;" hidden="true"/>
           <splitter class="tree-splitter"/>
           <treecol id="JobTitle"
-                   persist="hidden ordinal width sortDirection" flex="1" 
+                   persist="hidden ordinal width sortDirection" flex="1"
                    label="&JobTitle.label;" hidden="true"/>
           <splitter class="tree-splitter"/>
           <treecol id="CellularNumber"
-                   persist="hidden ordinal width sortDirection" flex="1" 
+                   persist="hidden ordinal width sortDirection" flex="1"
                    label="&CellularNumber.label;" hidden="true"/>
           <splitter class="tree-splitter"/>
           <treecol id="PagerNumber"
-                   persist="hidden ordinal width sortDirection" flex="1" 
+                   persist="hidden ordinal width sortDirection" flex="1"
                    label="&PagerNumber.label;" hidden="true"/>
           <splitter class="tree-splitter"/>
           <treecol id="FaxNumber"
-                   persist="hidden ordinal width sortDirection" flex="1" 
+                   persist="hidden ordinal width sortDirection" flex="1"
                    label="&FaxNumber.label;" hidden="true"/>
           <splitter class="tree-splitter"/>
           <treecol id="HomePhone"
-                   persist="hidden ordinal width sortDirection" flex="1" 
+                   persist="hidden ordinal width sortDirection" flex="1"
                    label="&HomePhone.label;" hidden="true"/>
           <splitter class="tree-splitter"/>
           <treecol id="WorkPhone"
                    persist="hidden ordinal width sortDirection" flex="1"
                    label="&WorkPhone.label;"/>
-    
+
           <!-- LOCALIZATION NOTE: _PhoneticName may be enabled for Japanese builds. -->
           <!--
           <treecol id="_PhoneticName"
-                   persist="hidden ordinal width sortDirection" flex="1" 
+                   persist="hidden ordinal width sortDirection" flex="1"
                    label="&_PhoneticName.label;" hiddenbydefault="true"/>
           <splitter class="tree-splitter"/>
           -->
         </treecols>
 
         <treechildren ondraggesture="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
       </tree>
-      
+
       <splitter id="results-splitter" collapse="after" persist="state"/>
-      
+
       <!-- card view -->
-      <hbox id="CardViewOuterBox" flex="1" minheight="100" height="200" persist="height"> 
+      <hbox id="CardViewOuterBox" flex="1" minheight="100" height="200" persist="height">
         <vbox id="CardViewBox" flex="1">
           <vbox id="CardViewInnerBox" collapsed="true" flex="1">
             <description id="CardTitle"/>
             <hbox flex="1">
               <vbox id="cvbPhoto" class="cardViewGroup" align="center">
                 <image id="cvPhoto" style="max-width: 10ch; max-height: 10ch;"/>
               </vbox>
               <vbox flex="1">
                 <vbox id="cvbContact" class="cardViewGroup">
-                  <description class="CardViewHeading" id="cvhContact">&contact.heading;</description>          
+                  <description class="CardViewHeading" id="cvhContact">&contact.heading;</description>
                   <description class="CardViewLink" id="cvListNameBox">
                     <html:p><html:a href="" id="cvListName"/></html:p>
                   </description>
                   <description class="CardViewText" id="cvDisplayName"/>
                   <description class="CardViewText" id="cvNickname"/>
                   <description class="CardViewLink" id="cvEmail1Box">
                     <html:a href="" id="cvEmail1"/>
                   </description>
                   <description class="CardViewLink" id="cvEmail2Box">
                     <html:a href="" id="cvEmail2"/>
                   </description>
                 </vbox>
                 <vbox id="cvbHome" class="cardViewGroup">
-                  <description class="CardViewHeading" id="cvhHome">&home.heading;</description>          
+                  <description class="CardViewHeading" id="cvhHome">&home.heading;</description>
                   <hbox>
                     <vbox flex="1">
                       <description class="CardViewText" id="cvHomeAddress"/>
                       <description class="CardViewText" id="cvHomeAddress2"/>
                       <description class="CardViewText" id="cvHomeCityStZip"/>
                       <description class="CardViewText" id="cvHomeCountry"/>
                     </vbox>
                     <vbox id="cvbHomeMapItBox" pack="end">
@@ -748,17 +748,17 @@
                   <description class="CardViewHeading" id="cvhOther">&other.heading;</description>
                   <description class="CardViewText" id="cvBirthday"/>
                   <description class="CardViewText" id="cvCustom1"/>
                   <description class="CardViewText" id="cvCustom2"/>
                   <description class="CardViewText" id="cvCustom3"/>
                   <description class="CardViewText" id="cvCustom4"/>
                   <description class="CardViewText" id="cvNotes" style="white-space: pre-wrap;"/>
                   <hbox>
-                    <image id="cvBuddyIcon"/> 
+                    <image id="cvBuddyIcon"/>
                   </hbox>
                 </vbox>
                 <vbox id="cvbChat" class="cardViewGroup">
                   <description class="CardViewHeading" id="cvhChat">&chat.heading;</description>
                   <description class="CardViewText" id="cvGtalk"/>
                   <description class="CardViewText" id="cvAIM"/>
                   <description class="CardViewText" id="cvYahoo"/>
                   <description class="CardViewText" id="cvSkype"/>
@@ -772,17 +772,17 @@
                 <vbox id="cvbDescription" class="cardViewGroup">
                   <description class="CardViewHeading" id="cvhDescription">&description.heading;</description>
                   <description class="CardViewText" id="cvDescription"/>
                 </vbox>
                 <vbox id="cvbAddresses" class="cardViewGroup">
                   <description class="CardViewHeading" id="cvhAddresses">&addresses.heading;</description>
                 </vbox>
               </vbox>
-      
+
               <spacer width="20"/>
 
               <vbox flex="1">
                 <vbox id="cvbPhone" class="cardViewGroup">
                   <description class="CardViewHeading" id="cvhPhone">&phone.heading;</description>
                   <description class="CardViewText" id="cvPhWork"/>
                   <description class="CardViewText" id="cvPhHome"/>
                   <description class="CardViewText" id="cvPhFax"/>
@@ -816,13 +816,13 @@
       </hbox>
     </vbox>
   </hbox>
   <panel id="customizeToolbarSheetPopup" noautohide="true">
     <iframe id="customizeToolbarSheetIFrame"
             style="&dialog.dimensions;"
             hidden="true"/>
   </panel>
-  
+
   <statusbar id="status-bar" class="chromeclass-status">
-    <statusbarpanel id="statusText" flex="1" value="&statusText.label;"/>            
-  </statusbar>  
+    <statusbarpanel id="statusText" flex="1" value="&statusText.label;"/>
+  </statusbar>
 </window>
--- a/mail/components/compose/content/editorOverlay.xul
+++ b/mail/components/compose/content/editorOverlay.xul
@@ -1,9 +1,9 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/messengercompose/editorOverlay.css" type="text/css"?>
 <!DOCTYPE overlay [
 <!ENTITY % editorOverlayDTD SYSTEM "chrome://editor/locale/editorOverlay.dtd">
 %editorOverlayDTD;
@@ -154,17 +154,17 @@
     <command id="cmd_absPos"          state=""        oncommand="goDoCommand('cmd_absPos')"/>
     <command id="cmd_increaseZIndex"  state=""        oncommand="goDoCommand('cmd_increaseZIndex')"/>
     <command id="cmd_decreaseZIndex"  state=""        oncommand="goDoCommand('cmd_decreaseZIndex')"/>
 
     <command id="cmd_advancedProperties"              oncommand="goDoCommand('cmd_advancedProperties')"/>
 
     <command id="cmd_increaseFont"                    oncommand="goDoCommand('cmd_increaseFont')"/>
     <command id="cmd_decreaseFont"                    oncommand="goDoCommand('cmd_decreaseFont')"/>
-    
+
     <command id="cmd_removeStyles"                    oncommand="goDoCommand('cmd_removeStyles')"/>
     <command id="cmd_removeLinks"                     oncommand="goDoCommand('cmd_removeLinks')"/>
     <command id="cmd_removeNamedAnchors"              oncommand="goDoCommand('cmd_removeNamedAnchors')"/>
   </commandset>
 
   <!-- commands updated only when the menu gets created -->
   <commandset id="composerListMenuItems"
           commandupdater="true"
@@ -260,17 +260,17 @@
       <menuseparator id="insertMenuSeparator"/>
       <menuitem id="insertBreakAll" accesskey="&insertBreakAllCmd.accesskey;"   observes="cmd_insertBreakAll"   label="&insertBreakAllCmd.label;"/>
     </menupopup>
   </menu>
 
   <!-- Format Menu -->
   <menupopup id="formatMenuPopup" onpopupshowing="EditorInitFormatMenu()">
     <!-- Font face submenu -->
-    <menu id="fontFaceMenu" label="&fontfaceMenu.label;" accesskey="&fontfaceMenu.accesskey;" 
+    <menu id="fontFaceMenu" label="&fontfaceMenu.label;" accesskey="&fontfaceMenu.accesskey;"
           position="1">
       <menupopup id="fontFaceMenuPopup"
                  oncommand="if (event.target.localName == 'menuitem')
                               doStatefulCommand('cmd_fontFace', event.target.getAttribute('value'));"
                  onpopupshowing="initFontFaceMenu(this);">
         <menuitem id="menu_fontFaceVarWidth"
                   label="&fontVarWidth.label;"
                   accesskey="&fontVarWidth.accesskey;"
@@ -380,17 +380,17 @@
                   oncommand="EditorSetFontSize('xx-large')"
                   type="radio"
                   name="2"
                   observes="cmd_renderedHTMLEnabler"/>
       </menupopup>
     </menu>
 
     <!-- Font style submenu -->
-    <menu id="fontStyleMenu" label="&fontStyleMenu.label;" 
+    <menu id="fontStyleMenu" label="&fontStyleMenu.label;"
           accesskey="&fontStyleMenu.accesskey;"
           position="3">
     <menupopup id="fontStyleMenuPopup" onpopupshowing="initFontStyleMenu(this)">
       <menuitem id="menu_styleBold"
                 label="&styleBoldCmd.label;"
                 accesskey="&styleBoldCmd.accesskey;"
                 observes="cmd_bold"
                 type="checkbox"
@@ -474,17 +474,17 @@
                 accesskey="&styleVar.accesskey;"
                 observes="cmd_var"
                 type="checkbox"/>
     </menupopup>
     </menu>
 
     <!-- Note: "cmd_fontColor" only monitors color state, it doesn't execute the command
          (We should use "cmd_fontColorState" and "cmd_backgroundColorState" ?) -->
-    <menuitem id="fontColor" label="&formatFontColor.label;" 
+    <menuitem id="fontColor" label="&formatFontColor.label;"
           accesskey="&formatFontColor.accesskey;"
           observes="cmd_fontColor"
           oncommand="EditorSelectColor('Text', null);"
           position="4"/>
     <menuseparator id="removeSep" position="5"/>
 
     <!-- label and accesskey set at runtime from strings -->
     <menuitem id="removeStylesMenuitem" key="removestyleskb"
@@ -1018,27 +1018,27 @@
   <!-- alignment buttons -->
   <toolbarbutton id="align-left-button"
                  class="formatting-button"
                  tooltiptext="&alignLeftButton.tooltip;"
                  type="radio"
                  group="align"
                  autoCheck="false"
                  oncommand="doStatefulCommand('cmd_align', 'left')">
-    <observes element="cmd_align" attribute="state" 
+    <observes element="cmd_align" attribute="state"
               onbroadcast="onStateButtonUpdate(this.parentNode, 'cmd_align', 'left')" />
   </toolbarbutton>
   <toolbarbutton id="align-center-button"
                  class="formatting-button"
                  tooltiptext="&alignCenterButton.tooltip;"
                  type="radio"
                  group="align"
                  autoCheck="false"
                  oncommand="doStatefulCommand('cmd_align', 'center')">
-    <observes element="cmd_align" attribute="state" 
+    <observes element="cmd_align" attribute="state"
               onbroadcast="onStateButtonUpdate(this.parentNode, 'cmd_align', 'center')"/>
   </toolbarbutton>
   <toolbarbutton id="align-right-button"
                  class="formatting-button"
                  tooltiptext="&alignRightButton.tooltip;"
                  type="radio"
                  group="align"
                  autoCheck="false"
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -799,17 +799,17 @@
                    tooltiptext="&printButton.tooltip;"/>
 #else
     <toolbarbutton id="button-print"
                    class="toolbarbutton-1"
                    label="&printButton.label;"
                    command="cmd_print"
                    tooltiptext="&printButton.tooltip;"
                    type="menu-button">
-      <menupopup id="button-printPopup" 
+      <menupopup id="button-printPopup"
                  onpopupshowing="goUpdateCommand('cmd_printpreview');">
         <menuitem id="button-printMenu"
                   label="&printCmd.label;"
                   accesskey="&printCmd.accesskey;"
                   command="cmd_print"
                   default="true"/>
         <menuitem id="button-printPreviewMenu"
                   label="&printPreviewCmd.label;"
--- a/mail/components/migration/content/migration.xul
+++ b/mail/components/migration/content/migration.xul
@@ -1,41 +1,41 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/migration/migration.dtd" >
- 
+
 <wizard id="migrationWizard"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&migrationWizard.title;"
         onload="MigrationWizard.init()"
         onunload="MigrationWizard.uninit()"
         style="width: 40em;"
         branded="true"
         buttons="accept,cancel">
 
   <script type="application/javascript" src="chrome://messenger/content/migration/migration.js"/>
-  
+
   <stringbundle id="bundle" src="chrome://messenger/locale/migration/migration.properties"/>
-  
+
   <wizardpage id="importSource" pageid="importSource" next="selectProfile"
               label="&importSource.title;"
               onpageadvanced="MigrationWizard.onImportSourcePageAdvanced();">
 #ifdef XP_WIN
     <label control="importSourceGroup">&importFromWin.label;</label>
 #else
     <label control="importSourceGroup">&importFromNonWin.label;</label>
 #endif
-    
+
     <radiogroup id="importSourceGroup">
- 
+
       <radio id="seamonkey" label="&importFromSeamonkey3.label;"
              accesskey="&importFromSeamonkey3.accesskey;"/>
 
 #ifdef XP_WIN
       <radio id="oexpress"  label="&importFromOExpress.label;"  accesskey="&importFromOExpress.accesskey;"/>
       <radio id="outlook"   label="&importFromOutlook.label;"   accesskey="&importFromOutlook.accesskey;"/>
 #endif
 
@@ -43,17 +43,17 @@
 #ifdef XP_MACOSX
       <radio id="eudora"    label="&importFromEudora.label;"    accesskey="&importFromEudora.accesskey;"/>
 #endif
 #endif
 
 #ifdef XP_WIN
       <radio id="eudora"    label="&importFromEudora.label;"    accesskey="&importFromEudora.accesskey;"/>
 #endif
-      
+
       <radio id="nothing"   label="&importFromNothing.label;"   accesskey="&importFromNothing.accesskey;" hidden="true"/>
     </radiogroup>
   </wizardpage>
 
   <wizardpage id="selectProfile" pageid="selectProfile" label="&selectProfile.title;"
               next="importItems"
               onpageshow="return MigrationWizard.onSelectProfilePageShow();"
               onpagerewound="return MigrationWizard.onSelectProfilePageRewound();"
@@ -62,38 +62,38 @@
     <radiogroup id="profiles" align="left"/>
   </wizardpage>
 
   <wizardpage id="importItems" pageid="importItems" label="&importItems.title;"
               next="migrating"
               onpageshow="return MigrationWizard.onImportItemsPageShow();"
               onpagerewound="return MigrationWizard.onImportItemsPageAdvanced();"
               onpageadvanced="return MigrationWizard.onImportItemsPageAdvanced();"
-              oncommand="MigrationWizard.onImportItemCommand();"> 
+              oncommand="MigrationWizard.onImportItemCommand();">
     <description>&importItems.label;</description>
-    
+
     <vbox id="dataSources" style="overflow: auto; -moz-appearance: listbox" align="left" flex="1"/>
   </wizardpage>
 
   <wizardpage id="migrating" pageid="migrating" label="&migrating.title;"
               next="done"
               onpageshow="MigrationWizard.onMigratingPageShow();">
-   
-    <description>&migrating.label;</description>    
-    <separator class="thin"/> 
+
+    <description>&migrating.label;</description>
+    <separator class="thin"/>
     <vbox id="migratingItems" class="indent" style="overflow: auto;" flex="1" align="left"/>
-    <separator class="thin"/> 
+    <separator class="thin"/>
 
     <hbox>
       <progressmeter class="progressmeter-statusbar" id="progressBar"  flex="1" mode="normal" value="0"/>
     </hbox>
 
   </wizardpage>
 
   <wizardpage id="done" pageid="done" label="&done.title;"
               onpageshow="MigrationWizard.onDonePageShow();">
     <description>&done.label;</description>
-    
-    <separator class="thin"/>    
+
+    <separator class="thin"/>
     <vbox id="doneItems" class="indent" style="overflow: auto;" align="left"/>
   </wizardpage>
 </wizard>
 
--- a/mail/components/preferences/advanced.xul
+++ b/mail/components/preferences/advanced.xul
@@ -37,18 +37,18 @@
 
       <preference id="general.autoScroll"
                   name="general.autoScroll"
                   type="bool"/>
       <preference id="general.smoothScroll"
                   name="general.smoothScroll"
                   type="bool"/>
 
-      <preference id="mailnews.database.global.indexer.enabled" 
-                  name="mailnews.database.global.indexer.enabled" 
+      <preference id="mailnews.database.global.indexer.enabled"
+                  name="mailnews.database.global.indexer.enabled"
                   type="bool"/>
 
       <preference id="toolkit.telemetry.enabled"
                   name="toolkit.telemetry.enabled"
                   onchange="gAdvancedPane.telemetryEnabledChanged(event);"
                   type="bool"/>
       <preference id="toolkit.telemetry.prompted"
                   name="toolkit.telemetry.prompted"
@@ -88,17 +88,17 @@
       <preference id="mailnews.mark_message_read.auto"
                   name="mailnews.mark_message_read.auto" type="bool"/>
       <preference id="mailnews.mark_message_read.delay"
                   name="mailnews.mark_message_read.delay" type="bool"
                   onchange="gAdvancedPane.updateMarkAsReadTextbox(this.value);"/>
       <preference id="mailnews.mark_message_read.delay.interval"
                   name="mailnews.mark_message_read.delay.interval" type="int"/>
       <preference id="mail.openMessageBehavior" name="mail.openMessageBehavior" type="int"/>
-      <preference id="mail.close_message_window.on_delete" 
+      <preference id="mail.close_message_window.on_delete"
                   name="mail.close_message_window.on_delete" type="bool"/>
       <!-- Network tab -->
       <preference id="mail.prompt_purge_threshhold"
                   name="mail.prompt_purge_threshhold" type="bool"/>
       <preference id="mail.purge_threshhold_mb"
                   name="mail.purge_threshhold_mb" type="int"/>
       <preference id="browser.cache.disk.capacity"
                   name="browser.cache.disk.capacity" type="int"/>
@@ -386,18 +386,18 @@ type="int"/>
             </radiogroup>
 
 	        <hbox>
 	          <button id="showUpdateHistory"
 	                  label="&updateHistory.label;"
 	                  accesskey="&updateHistory.accesskey;"
 	                  preference="app.update.disable_button.showUpdateHistory"
 	                  oncommand="gAdvancedPane.showUpdates();"/>
-	        </hbox>            
-          </groupbox>          
+	        </hbox>
+          </groupbox>
 
 #ifdef MOZ_MAINTENANCE_SERVICE
 		  <separator/>
           <checkbox id="useService"
                     label="&useService.label;"
                     accesskey="&useService.accesskey;"
                     preference="app.update.service.enabled"/>
 #endif
--- a/mail/components/preferences/colors.xul
+++ b/mail/components/preferences/colors.xul
@@ -74,14 +74,14 @@
         <separator class="thin"/>
         <hbox align="center">
           <checkbox id="browserUnderlineAnchors" label="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
                     preference="browser.underline_anchors"/>
         </hbox>
       </groupbox>
     </hbox>
     <hbox>
-      <checkbox id="useDocumentColors" 
+      <checkbox id="useDocumentColors"
                 label="&allowPagesToUse.label;" accesskey="&allowPagesToUse.accesskey;"
                 preference="browser.display.use_document_colors" flex="1"/>
     </hbox>
   </prefpane>
 </prefwindow>
--- a/mail/components/preferences/compose.xul
+++ b/mail/components/preferences/compose.xul
@@ -7,32 +7,32 @@
 <!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % composeDTD SYSTEM "chrome://messenger/locale/preferences/compose.dtd">
 <!ENTITY % editorOverlayDTD SYSTEM "chrome://editor/locale/editorOverlay.dtd">
 %brandDTD;
 %composeDTD;
 %editorOverlayDTD;
 ]>
-  
+
 <overlay id="ComposePaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <prefpane id="paneCompose" onpaneload="gComposePane.init();">
     <script type="application/javascript" src="chrome://messenger/content/preferences/compose.js"/>
     <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
     <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
 
     <stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
     <stringbundle id="regionBundle" src="chrome://global/locale/regionNames.properties"/>
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
     <preferences id="composePreferences">
       <preference id="mail.preferences.compose.selectedTabIndex" name="mail.preferences.compose.selectedTabIndex" type="int"/>
-      <preference id="mail.forward_message_mode" name="mail.forward_message_mode" type="int"/>     
+      <preference id="mail.forward_message_mode" name="mail.forward_message_mode" type="int"/>
       <preference id="mail.forward_add_extension" name="mail.forward_add_extension" type="bool"/>
       <preference id="mail.SpellCheckBeforeSend" name="mail.SpellCheckBeforeSend" type="bool"/>
       <preference id="mail.spellcheck.inline" name="mail.spellcheck.inline" type="bool"/>
       <preference id="mail.warn_on_send_accel_key" name="mail.warn_on_send_accel_key" type="bool"/>
       <preference id="mail.compose.autosave" name="mail.compose.autosave" type="bool"/>
       <preference id="mail.compose.autosaveinterval" name="mail.compose.autosaveinterval" type="int"/>
       <preference id="mail.enable_autocomplete" name="mail.enable_autocomplete" type="bool"/>
       <preference id="ldap_2.autoComplete.useDirectory"
@@ -121,17 +121,17 @@
                   <menuitem value="tt" label="&fontFixedWidth.label;"/>
                   <menuseparator/>
                   <menuitem value="Helvetica, Arial, sans-serif" label="&fontHelvetica.label;"/>
                   <menuitem value="Times New Roman, Times, serif" label="&fontTimes.label;"/>
                   <menuitem value="Courier New, Courier, monospace" label="&fontCourier.label;"/>
                   <menuseparator/>
                 </menupopup>
               </menulist>
-              
+
               <label control="fontSizeSelect" value="&size.label;" accesskey="&size.accesskey;"/>
               <menulist id="fontSizeSelect" preference="msgcompose.font_size">
                 <menupopup>
                   <menuitem value="x-small" label="&size-x-smallCmd.label;"/>
                   <menuitem value="small"   label="&size-smallCmd.label;"/>
                   <menuitem value="medium"  label="&size-mediumCmd.label;"/>
                   <menuitem value="large"   label="&size-largeCmd.label;"/>
                   <menuitem value="x-large" label="&size-x-largeCmd.label;"/>
@@ -148,49 +148,49 @@
               <separator orient="vertical" class="thin"/>
               <label control="backgroundColorButton" value="&bgColor.label;" accesskey="&bgColor.accesskey;"/>
               <colorpicker type="button" id="backgroundColorButton" preference="msgcompose.background_color"/>
               <spacer flex="1"/>
               <button label="&restoreHTMLDefaults.label;" accesskey="&restoreHTMLDefaults.accesskey;"
                       oncommand="gComposePane.restoreHTMLDefaults();"/>
             </hbox>
           </groupbox>
-  
+
           <hbox align="center">
             <description flex="1">&sendOptionsDescription.label;</description>
-            <button label="&sendOptions.label;" 
+            <button label="&sendOptions.label;"
                     accesskey="&sendOptions.accesskey;"
                     oncommand="gComposePane.sendOptionsDialog();"/>
-          </hbox>      
+          </hbox>
          </tabpanel>
 
          <tabpanel orient="vertical">
            <groupbox>
               <!-- Address Autocomplete -->
               <caption label="&addressingTitle.label;"/>
 
               <description>&autocompleteText.label;</description>
 
               <hbox align="center">
                 <checkbox id="addressingAutocomplete" label="&addressingEnable.label;"
                           preference="mail.enable_autocomplete"
                           accesskey="&addressingEnable.accesskey;"/>
               </hbox>
-    
+
               <hbox align="center">
-                <checkbox id="autocompleteLDAP" label="&directories.label;" 
-                          preference="ldap_2.autoComplete.useDirectory" 
+                <checkbox id="autocompleteLDAP" label="&directories.label;"
+                          preference="ldap_2.autoComplete.useDirectory"
                           accesskey="&directories.accesskey;"/>
                 <menulist id="directoriesList" flex="1" aria-labelledby="autocompleteLDAP"
                           preference="ldap_2.autoComplete.directoryServer">
                   <menupopup id="directoriesListPopup" class="addrbooksPopup"
                              none="&directoriesNone.label;"
                              remoteonly="true" value="dirPrefId"/>
                 </menulist>
-                <button id="editButton" label="&editDirectories.label;" 
+                <button id="editButton" label="&editDirectories.label;"
                         oncommand="gComposePane.editDirectories();"
                         preference="pref.ldap.disable_button.edit_directories"
                         accesskey="&editDirectories.accesskey;"/>
               </hbox>
             </groupbox>
 
             <separator class="thin"/>
 
@@ -233,12 +233,12 @@
             <hbox>
               <label id="downloadDictionaries" class="text-link"
                      onclick="if (event.button == 0) { openDictionaryList('tab'); }"
                      value="&downloadDictionaries.label;"/>
               <spacer flex="1"/>
             </hbox>
          </tabpanel>
        </tabpanels>
-    </tabbox>  
+    </tabbox>
     <separator/>
   </prefpane>
 </overlay>
--- a/mail/components/preferences/connection.xul
+++ b/mail/components/preferences/connection.xul
@@ -114,17 +114,17 @@
               <spacer/>
               <radiogroup id="networkProxySOCKSVersion" orient="horizontal"
                           preference="network.proxy.socks_version">
                 <radio id="networkProxySOCKSVersion4" value="4" label="&socks4.label;" accesskey="&socks4.accesskey;" />
                 <radio id="networkProxySOCKSVersion5" value="5" label="&socks5.label;" accesskey="&socks5.accesskey;" />
               </radiogroup>
             </row>
 
-            <row align="center"> 
+            <row align="center">
               <hbox align="center" pack="end">
                 <label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/>
               </hbox>
               <textbox id="networkProxyNone" class="uri-element"
                        preference="network.proxy.no_proxies_on"/>
             </row>
             <row>
               <spacer/>
@@ -133,15 +133,15 @@
           </rows>
         </grid>
         <radio value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"/>
         <hbox class="indent" flex="1" align="center">
           <textbox id="networkProxyAutoconfigURL" flex="1" class="uri-element"
                    preference="network.proxy.autoconfig_url"
                    oninput="gConnectionsDialog.updateReloadButton();"/>
           <button id="autoReload" label="&reload.label;" accesskey="&reload.accesskey;"
-                  oncommand="gConnectionsDialog.reloadPAC();" 
+                  oncommand="gConnectionsDialog.reloadPAC();"
                   preference="pref.advanced.proxies.disable_button.reload"/>
         </hbox>
       </radiogroup>
     </groupbox>
   </prefpane>
 </prefwindow>
--- a/mail/components/preferences/dsn.xul
+++ b/mail/components/preferences/dsn.xul
@@ -13,17 +13,17 @@
 ]>
 
 <prefwindow id="DSNDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             dlgbuttons="accept,cancel"
             title="&dialog.title;">
 
   <script type="application/javascript" src="chrome://messenger/content/preferences/dsn.js"/>
-        
+
   <prefpane id="DSNDialogPane" onpaneload="onInit();">
     <preferences id="DSNPreferences">
       <preference id="mail.dsn.request_on_success_on"
                   name="mail.dsn.request_on_success_on"
                   type="bool"/>
 
       <preference id="mail.dsn.request_on_failure_on"
                   name="mail.dsn.request_on_failure_on"
@@ -40,17 +40,17 @@
       <preference id="mail.dsn.always_request_on"
                   name="mail.dsn.always_request_on"
                   type="bool"/>
 
       <preference id="mail.dsn.ret_full_on"
                   name="mail.dsn.ret_full_on"
                   type="bool"/>
     </preferences>
-  
+
     <description>&optionTitle.label;</description>
 
     <!-- When this checkbox is checked, DSN request is sent with SUCCESS option -->
     <checkbox id="request_on_success_on"
               label="&requestOnSucess.label;"
               preference="mail.dsn.request_on_success_on"
               accesskey="&requestOnSucess.accesskey;"
               oncommand="EnableDisableAllowedDSNRequests(this)"/>
@@ -79,17 +79,17 @@
     <separator class="thin"/>
     <separator class="groove"/>
     <separator class="thin"/>
 
     <checkbox id="always_request_on"
               label="&requestAlways.label;"
               preference="mail.dsn.always_request_on"
               accesskey="&requestAlways.accesskey;"/>
-      
+
     <separator class="thin"/>
     <separator class="groove"/>
     <separator class="thin"/>
 
     <label value="&RET_FailureMessage.label;" control="ret_full_on"/>
     <radiogroup id="ret_full_on" preference="mail.dsn.ret_full_on" orient="horizontal">
       <radio value="true" label="&RET_FULL.label;" accesskey="&RET_FULL.accesskey;" />
       <radio value="false" label="&RET_HDRS.label;" accesskey="&RET_HDRS.accesskey;" />
--- a/mail/components/preferences/receipts.xul
+++ b/mail/components/preferences/receipts.xul
@@ -22,43 +22,43 @@
 
   <prefpane id="ReturnReceiptsDialogPane">
     <preferences id="ReturnReceiptsPreferences">
       <preference id="mail.receipt.request_return_receipt_on" name="mail.receipt.request_return_receipt_on" type="bool"/>
       <preference id="mail.incorporate.return_receipt" name="mail.incorporate.return_receipt" type="int"/>
       <preference id="mail.mdn.report.enabled"     name="mail.mdn.report.enabled" type="bool"/>
       <preference id="mail.mdn.report.not_in_to_cc" name="mail.mdn.report.not_in_to_cc" type="int"/>
       <preference id="mail.mdn.report.outside_domain" name="mail.mdn.report.outside_domain" type="int"/>
-      <preference id="mail.mdn.report.other" name="mail.mdn.report.other" type="int"/>          
+      <preference id="mail.mdn.report.other" name="mail.mdn.report.other" type="int"/>
     </preferences>
-  
+
     <vbox id="returnReceiptSettings" align="start">
       <checkbox id="alwaysRequest" label="&requestReceipt.label;"
                 preference="mail.receipt.request_return_receipt_on"
                 accesskey="&requestReceipt.accesskey;"/>
     </vbox>
 
     <separator class="thin"/>
     <separator class="groove"/>
     <separator class="thin"/>
 
     <label control="receiptFolder">&receiptArrive.label;</label>
     <radiogroup id="receiptFolder" class="indent" preference="mail.incorporate.return_receipt">
       <radio value="0" label="&leaveIt.label;" accesskey="&leaveIt.accesskey;"/>
-      <radio value="1" label="&moveToSent.label;" accesskey="&moveToSent.accesskey;"/> 
+      <radio value="1" label="&moveToSent.label;" accesskey="&moveToSent.accesskey;"/>
     </radiogroup>
 
     <separator class="thin"/>
     <separator class="groove"/>
     <separator class="thin"/>
 
     <label control="receiptSend">&requestMDN.label;</label>
     <radiogroup id="receiptSend" class="indent" preference="mail.mdn.report.enabled" oncommand="EnableDisableAllowedReceipts();">
       <radio value="false" label="&never.label;" accesskey="&never.accesskey;"/>
-      <radio value="true" label="&returnSome.label;" accesskey="&returnSome.accesskey;"/> 
+      <radio value="true" label="&returnSome.label;" accesskey="&returnSome.accesskey;"/>
 
       <grid class="indent">
         <columns>
           <column/>
           <column/>
         </columns>
         <rows>
           <row align="center">
--- a/mail/components/preferences/security.xul
+++ b/mail/components/preferences/security.xul
@@ -8,48 +8,48 @@
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % securityDTD SYSTEM "chrome://messenger/locale/preferences/security.dtd">
 %brandDTD;
 %securityDTD;
 ]>
 
 <overlay id="SecurityPaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-           
+
   <prefpane id="paneSecurity" onpaneload="gSecurityPane.init();">
     <script type="application/javascript" src="chrome://messenger/content/preferences/security.js"/>
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
     <stringbundle id="bundleMasterPwPreferences" src="chrome://mozapps/locale/preferences/preferences.properties"/>
 
     <preferences id="securityPreferences">
       <preference id="mail.preferences.security.selectedTabIndex"
                   name="mail.preferences.security.selectedTabIndex" type="int"/>
-      <preference id="mail.spam.manualMark" 
-                  name="mail.spam.manualMark" 
+      <preference id="mail.spam.manualMark"
+                  name="mail.spam.manualMark"
                   type="bool"/>
       <preference id="mail.spam.manualMarkMode"
                   name="mail.spam.manualMarkMode"
                   type="int"/>
       <preference id="mail.spam.markAsReadOnSpam"
                   name="mail.spam.markAsReadOnSpam"
                   type="bool"/>
-      <preference id="mail.spam.logging.enabled" 
-                  name="mail.spam.logging.enabled" 
+      <preference id="mail.spam.logging.enabled"
+                  name="mail.spam.logging.enabled"
                   type="bool"/>
       <preference id="mail.phishing.detection.enabled"
                   name="mail.phishing.detection.enabled"
                   type="bool"
                   onchange="gSecurityPane.reloadMessageInOpener();"/>
       <preference id="browser.safebrowsing.enabled"
                   name="browser.safebrowsing.enabled"
                   type="bool"/>
       <preference id="mailnews.downloadToTempFile"
                   name="mailnews.downloadToTempFile"
-                  type="bool"/>                   
+                  type="bool"/>
       <preference id="pref.privacy.disable_button.view_passwords"
                   name="pref.privacy.disable_button.view_passwords"
                   type="bool"/>
     </preferences>
 
     <tabbox id="securityPrefs" flex="1" onselect="gSecurityPane.tabSelectionChanged();">
       <tabs id="securityPrefsTabs">
         <tab id="junkTab" label="&itemJunk.label;"/>
@@ -58,17 +58,17 @@
         <tab id="passwordsTab" label="&itemPasswords.label;"/>
       </tabs>
 
       <tabpanels id="securityPrefsPanels" flex="1">
         <tabpanel orient="vertical">
           <description>&junkMail.intro;</description>
           <separator class="thin"/>
 
-          <checkbox id="manualMark" 
+          <checkbox id="manualMark"
                     preference="mail.spam.manualMark"
                     oncommand="gSecurityPane.updateManualMarkMode(this.checked);"
                     label="&manualMark.label;" accesskey="&manualMark.accesskey;"/>
 
           <radiogroup id="manualMarkMode" class="indent"
                       preference="mail.spam.manualMarkMode" aria-labelledby="manualMark">
             <radio id="manualMarkMode0" value="0" label="&manualMarkModeMove.label;"
                    accesskey="&manualMarkModeMove.accesskey;"/>
@@ -81,52 +81,52 @@
                     preference="mail.spam.markAsReadOnSpam"/>
 
           <hbox align="start">
             <checkbox id="enableJunkLogging" label="&enableAdaptiveJunkLogging.label;"
                       oncommand="gSecurityPane.updateJunkLogButton(this.checked);"
                       preference="mail.spam.logging.enabled"
                       accesskey="&enableAdaptiveJunkLogging.accesskey;"/>
             <spacer flex="1"/>
-            <button id="openJunkLogButton" label="&openJunkLog.label;" accesskey="&openJunkLog.accesskey;" 
+            <button id="openJunkLogButton" label="&openJunkLog.label;" accesskey="&openJunkLog.accesskey;"
                     oncommand="gSecurityPane.openJunkLog();"/>
           </hbox>
           <hbox align="start">
             <spacer flex="1"/>
-            <button label="&resetTrainingData.label;" accesskey="&resetTrainingData.accesskey;" 
+            <button label="&resetTrainingData.label;" accesskey="&resetTrainingData.accesskey;"
                     oncommand="gSecurityPane.resetTrainingData()"/>
-          </hbox>          
+          </hbox>
         </tabpanel>
-        
-        <!-- Phishing Detector --> 
+
+        <!-- Phishing Detector -->
         <tabpanel orient="vertical">
           <description>&phishingDetector1.intro;</description>
           <separator class="thin"/>
           <checkbox id="enablePhishingDetector"
                     label="&enablePhishingDetector1.label;" accesskey="&enablePhishingDetector1.accesskey;"
                     preference="mail.phishing.detection.enabled"/>
-<!--          
+<!--
           <checkbox id="useDownloadedList" class="indent" label="&useDownloadedList.label;"
-                    accesskey="&useDownloadedList.accesskey;" 
+                    accesskey="&useDownloadedList.accesskey;"
                     preference="browser.safebrowsing.enabled"/>
--->                    
+-->
         </tabpanel>
 
-        <!-- Anti Virus --> 
+        <!-- Anti Virus -->
         <tabpanel orient="vertical">
           <description>&antiVirus.intro;</description>
           <separator class="thin"/>
           <checkbox id="enableAntiVirusQuaruntine"
                     label="&antiVirus.label;" accesskey="&antiVirus.accesskey;"
                     preference="mailnews.downloadToTempFile"/>
 
         </tabpanel>
-        
+
         <!-- Password -->
-        <tabpanel orient="vertical"> 
+        <tabpanel orient="vertical">
           <description>&savedPasswords.intro;</description>
           <hbox>
             <spacer flex="1"/>
             <button label="&savedPasswords.label;" accesskey="&savedPasswords.accesskey;"
                     oncommand="gSecurityPane.showPasswords();"
                     preference="pref.privacy.disable_button.view_passwords"/>
           </hbox>
           <!-- XXX button to do a showExceptions()? -->
--- a/mail/extensions/mailviews/content/mailViewSetup.xul
+++ b/mail/extensions/mailviews/content/mailViewSetup.xul
@@ -26,17 +26,17 @@
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   </stringbundleset>
 
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/javascript" src="chrome://messenger/content/mailViewSetup.js"/>
 
   <dummy class="usesMailWidgets"/>
-    
+
   <vbox flex="1">
     <separator class="thin"/>
     <vbox>
        <hbox align="center">
          <label value="&mailViewHeading.label;" accesskey="&mailViewHeading.accesskey;" control="name"/>
          <textbox tabindex="0" id="name" oninput="doEnabling();"/>
       </hbox>
     </vbox>
--- a/mail/extensions/smime/content/msgReadSMIMEOverlay.xul
+++ b/mail/extensions/smime/content/msgReadSMIMEOverlay.xul
@@ -1,9 +1,9 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSMIMEOverlay.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
--- a/mail/test/resources/mozmill/mozmill/extension/content/dxwindow.xul
+++ b/mail/test/resources/mozmill/mozmill/extension/content/dxwindow.xul
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
- 
+
 <prefwindow id="mozmill-dxwindow"
      title="DOM Explorer"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- 
+
 <prefpane id="dxwindow" label="DOM Explorer">
 
   <hbox id="dxtarget" align="center">
   </hbox>
 </prefpane>
- 
+
 </prefwindow>
\ No newline at end of file
--- a/mail/test/resources/mozmill/mozmill/extension/content/mozmill.xul
+++ b/mail/test/resources/mozmill/mozmill/extension/content/mozmill.xul
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ***** BEGIN LICENSE BLOCK *****
   -   Version: MPL 1.1/GPL 2.0/LGPL 2.1
   -
   - The contents of this file are subject to the Mozilla Public License Version
   - 1.1 (the "License"); you may not use this file except in compliance with
   - the License. You may obtain a copy of the License at
   - http://www.mozilla.org/MPL/
-  - 
+  -
   - Software distributed under the License is distributed on an "AS IS" basis,
   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
   - for the specific language governing rights and limitations under the
   - License.
   -
   - The Original Code is MozMill.
   -
   - The Initial Developer of the Original Code is
@@ -27,20 +27,20 @@
   - in which case the provisions of the GPL or the LGPL are applicable instead
   - of those above. If you wish to allow use of your version of this file only
   - under the terms of either the GPL or the LGPL, and not to allow others to
   - use your version of this file under the terms of the MPL, indicate your
   - decision by deleting the provisions above and replace them with the notice
   - and other provisions required by the GPL or the LGPL. If you do not delete
   - the provisions above, a recipient may use your version of this file under
   - the terms of any one of the MPL, the GPL or the LGPL.
-  - 
+  -
   - *****  END LICENSE BLOCK ***** -->
 <?xml-stylesheet href="chrome://mozmill/skin/chrome.css" type="text/css"?>
-<window id="mozmill-window" 
+<window id="mozmill-window"
         title="MozMill IDE"
         windowtype="mozmill:ide"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         persist="width height screenX screenY">
 
    <script type="application/x-javascript" src="chrome://mozmill/content/chrome.js"/>
    <tooltip id="mozmill-tooltip" onpopupshowing="return fillTooltip(document.tooltipNode);"/>
--- a/mail/test/resources/mozmill/mozmill/extension/content/overlay.xul
+++ b/mail/test/resources/mozmill/mozmill/extension/content/overlay.xul
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://mozmill/skin/overlay.css" type="text/css"?>
 <!DOCTYPE overlay SYSTEM "chrome://mozmill/locale/overlay.dtd">
 <overlay id="mozmill-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script src="chrome://mozmill/content/overlay.js"/>
-  
+
   <keyset>
     <key id="open-mozmill" modifiers="accel shift" key="m" oncommand="MozMill.onMenuItemCommand(event);"/>
   </keyset>
-  
+
   <menupopup id="menu_ToolsPopup">
-    <menuitem key="open-mozmill" id="mozmill-mozmill" label="&mozmill;" 
+    <menuitem key="open-mozmill" id="mozmill-mozmill" label="&mozmill;"
               oncommand="MozMill.onMenuItemCommand(event);"/>
   </menupopup>
 </overlay>
--- a/mail/test/resources/mozmill/mozmill/extension/content/overlay_tb.xul
+++ b/mail/test/resources/mozmill/mozmill/extension/content/overlay_tb.xul
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://mozmill/skin/overlay.css" type="text/css"?>
 <!DOCTYPE overlay SYSTEM "chrome://mozmill/locale/overlay.dtd">
 <overlay id="mozmill-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script src="overlay.js"/>
 
   <menupopup id="taskPopup">
-    <menuitem id="mozmill-mozmill" label="&mozmill;" 
+    <menuitem id="mozmill-mozmill" label="&mozmill;"
               oncommand="MozMill.onMenuItemCommand(event);"/>
   </menupopup>
 </overlay>
--- a/mail/test/resources/mozmill/mozmill/extension/content/prefs.xul
+++ b/mail/test/resources/mozmill/mozmill/extension/content/prefs.xul
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
- 
+
 <prefwindow id="mozmill-prefs"
      title="MozMill Preferences"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- 
+
 <prefpane id="mozpref" label="MozMill Preferences">
   <preferences>
     <preference id="pref1" name="stockwatcher2.symbol" type="string"/>
   </preferences>
- 
+
   <hbox align="center">
     <label control="symbol" value="All kinds of preferences go in here."/>
   </hbox>
 </prefpane>
- 
+
 </prefwindow>
\ No newline at end of file
--- a/mail/test/resources/mozmill/mozmill/extension/content/test/test.xul
+++ b/mail/test/resources/mozmill/mozmill/extension/content/test/test.xul
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="test.css" type="text/css"?>
 
-<window id="testingonly" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
+<window id="testingonly"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="Testing And Debugging Window">
 
   <script src="test.js"/>
 
   <vbox id="testCollection">
     <hbox id="item1"
           ondragstart="dragStart(event)">
     </hbox>
--- a/mail/test/resources/mozmill/mozmill/extension/content/testwindow.xul
+++ b/mail/test/resources/mozmill/mozmill/extension/content/testwindow.xul
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 
-<window id="testingonly" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
+<window id="testingonly"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="Testing And Debugging Window">
 
   <!-- Test Scripts -->
   <script src="js/mozmill.js"/>
   <script type="application/x-javascript;version=1.7" src="js/mm/testresults.js"/>
   <script src="js/tests/test_resultsFactory.js"/>
 
   <vbox id="testCollection" flex="1">
 
     <!-- Add more hboxes with items to test -->
     <hbox id="testItem1">
-      <button id="testResultFactory" 
+      <button id="testResultFactory"
               label="Test Result Factory and Result Object"
               oncommand="runResultFactoryTests();"/>
       <label id="testResultFactory-Status" value="Results" disabled="true"/>
     </hbox>
     <hbox id="testItem2">
       <button id="testObserver"
               label = "test observers"
               oncommand="goObservers();"/>