Bug 1280817 - Trailing spaces and eol cleanup for xul files. r=Ratty a=Ratty
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 25 Jun 2016 16:49:45 +0200
changeset 25316 ab935927594271a74dfd772eb7b35eca340855f0
parent 25315 b82327300d15299ca9694cb3d390adbfcbe88263
child 25317 029c606ce0cc94ce2cc3ce4fedad9fd25f42841f
push id1725
push userclokep@gmail.com
push dateMon, 19 Sep 2016 17:35:08 +0000
treeherdercomm-beta@6ead1abf3817 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRatty, Ratty
bugs1280817
Bug 1280817 - Trailing spaces and eol cleanup for xul files. r=Ratty a=Ratty
suite/browser/hiddenWindow.xul
suite/browser/linkToolbarOverlay.xul
suite/browser/mailNavigatorOverlay.xul
suite/browser/metadata.xul
suite/browser/navigator.xul
suite/browser/navigatorOverlay.xul
suite/browser/webDeveloperOverlay.xul
suite/common/bookmarks/bookmarksManager.xul
suite/common/defaultClientDialog.xul
suite/common/directory/directory.xul
suite/common/helpEditorOverlay.xul
suite/common/mac/platformCommunicatorOverlay.xul
suite/common/openLocation.xul
suite/common/permissions/permissionsManager.xul
suite/common/places/tests/chrome/test_bug549192.xul
suite/common/places/tests/chrome/test_bug549491.xul
suite/common/pref/pref-content.xul
suite/common/pref/pref-fonts.xul
suite/common/pref/pref-history.xul
suite/common/pref/pref-http.xul
suite/common/pref/pref-images.xul
suite/common/pref/pref-languages-add.xul
suite/common/pref/pref-locationbar.xul
suite/common/pref/pref-navigator.xul
suite/common/pref/pref-offlineapps.xul
suite/common/pref/pref-passwords.xul
suite/common/pref/pref-popups.xul
suite/common/pref/pref-proxies-advanced.xul
suite/common/pref/pref-scripts.xul
suite/common/pref/pref-smartupdate.xul
suite/common/pref/preferences.xul
suite/common/profile/profileSelection.xul
suite/common/safeMode.xul
suite/common/sidebar/customize.xul
suite/common/sidebar/preview.xul
suite/common/sidebar/sidebarOverlay.xul
suite/common/tasksOverlay.xul
suite/common/unix/platformCommunicatorOverlay.xul
suite/common/utilityOverlay.xul
suite/common/win/platformCommunicatorOverlay.xul
suite/debugQA/content/debugQANavigatorOverlay.xul
suite/debugQA/content/debugQAPrefsOverlay.xul
suite/debugQA/content/pref-debug.xul
suite/debugQA/content/pref-debug1.xul
suite/debugQA/content/pref-debug2.xul
suite/mailnews/addrbook/abCardOverlay.xul
suite/mailnews/addrbook/abEditListDialog.xul
suite/mailnews/addrbook/abMailListDialog.xul
suite/mailnews/addrbook/abSelectAddressesDialog.xul
suite/mailnews/addrbook/addressbook-panel.xul
suite/mailnews/addrbook/addressbook.xul
suite/mailnews/compose/addressingWidgetOverlay.xul
suite/mailnews/compose/mailComposeExtrasOverlay.xul
suite/mailnews/compose/prefs/pref-composing_messages.xul
suite/mailnews/mac/platformMailnewsOverlay.xul
suite/mailnews/mailEditorOverlay.xul
suite/mailnews/mailOverlay.xul
suite/mailnews/mailTasksOverlay.xul
suite/mailnews/mailViewSetup.xul
suite/mailnews/mailWindowOverlay.xul
suite/mailnews/messageWindow.xul
suite/mailnews/msgFolderPickerOverlay.xul
suite/mailnews/msgHdrViewOverlay.xul
suite/mailnews/msgPrintEngine.xul
suite/mailnews/msgSelectOffline.xul
suite/mailnews/prefs/pref-mailnews.xul
suite/mailnews/prefs/pref-offline.xul
suite/mailnews/prefs/pref-tags.xul
suite/mailnews/search/ABSearchDialog.xul
suite/mailnews/subscribe.xul
suite/mailnews/threadPane.xul
suite/mailnews/unix/platformMailnewsOverlay.xul
suite/mailnews/win/platformMailnewsOverlay.xul
suite/security/prefs/pref-certs.xul
suite/security/prefs/pref-ssl.xul
--- a/suite/browser/hiddenWindow.xul
+++ b/suite/browser/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/. -->
 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 
 <!-- hiddenwindow is a "minimal" XUL window intended for creating the,
@@ -24,17 +24,17 @@
 %brandDTD;
 <!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
 %navigatorDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   title="hidden"
-  titlemodifier="&mainWindow.titlemodifier;" 
+  titlemodifier="&mainWindow.titlemodifier;"
   titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
   onload="hiddenWindowStartup();"
   onunload="Shutdown();">
 
   <stringbundleset id="stringbundleset"/>
 
   <!-- keys are appended from the overlay -->
   <keyset id="navKeys"/>
--- a/suite/browser/linkToolbarOverlay.xul
+++ b/suite/browser/linkToolbarOverlay.xul
@@ -1,18 +1,18 @@
 <?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://navigator/skin/linkToolbar.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://navigator/skin/linkToolbar.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <!DOCTYPE overlay SYSTEM "chrome://navigator/locale/linkToolbar.dtd">
 
-<overlay id="linkToolbarOverlay" 
+<overlay id="linkToolbarOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:rdf="http://www.mozilla.org/rdf">
 
   <!-- classes -->
   <script type="application/javascript" src="chrome://navigator/content/linkToolbarHandler.js" />
   <script type="application/javascript" src="chrome://navigator/content/linkToolbarItem.js" />
 
   <!-- functions -->
@@ -64,70 +64,70 @@
       <toolbarbutton id="link-top" class="bookmark-item"
           label="&topButton.label;" disabled="true"/>
 
       <toolbarbutton id="link-up" class="bookmark-item"
           label="&upButton.label;" disabled="true"/>
 
       <toolbarseparator />
 
-      <toolbarbutton id="link-first" class="bookmark-item" 
+      <toolbarbutton id="link-first" class="bookmark-item"
           label="&firstButton.label;" disabled="true"/>
 
-      <toolbarbutton id="link-prev" class="bookmark-item" 
+      <toolbarbutton id="link-prev" class="bookmark-item"
           label="&prevButton.label;" disabled="true"/>
 
-      <toolbarbutton id="link-next" class="bookmark-item" 
+      <toolbarbutton id="link-next" class="bookmark-item"
           label="&nextButton.label;" disabled="true"/>
 
-      <toolbarbutton id="link-last" class="bookmark-item" 
+      <toolbarbutton id="link-last" class="bookmark-item"
           label="&lastButton.label;" disabled="true"/>
 
       <toolbarseparator />
 
-      <toolbarbutton id="document-menu" class="bookmark-item" 
+      <toolbarbutton id="document-menu" class="bookmark-item"
           type="menu"
           container="true"
           label="&documentButton.label;" disabled="true">
         <menupopup id="document-menu-popup">
 
-          <menuitem id="link-toc" label="&tocButton.label;" disabled="true" 
+          <menuitem id="link-toc" label="&tocButton.label;" disabled="true"
               class="menuitem-iconic bookmark-item"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
-          <menu id="link-chapter" label="&chapterButton.label;" disabled="true" 
+          <menu id="link-chapter" label="&chapterButton.label;" disabled="true"
               class="menu-iconic bookmark-item" container="true"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
             <menupopup id="link-chapter-popup" />
           </menu>
-          <menu id="link-section" label="&sectionButton.label;" disabled="true"  
+          <menu id="link-section" label="&sectionButton.label;" disabled="true"
               class="menu-iconic bookmark-item" container="true"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
             <menupopup id="link-section-popup" />
           </menu>
-          <menu id="link-subsection" label="&subSectionButton.label;" disabled="true"  
+          <menu id="link-subsection" label="&subSectionButton.label;" disabled="true"
               class="menu-iconic bookmark-item" container="true"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
             <menupopup id="link-subsection-popup" />
           </menu>
-          <menu id="link-appendix" label="&appendixButton.label;" disabled="true"  
+          <menu id="link-appendix" label="&appendixButton.label;" disabled="true"
               class="menu-iconic bookmark-item" container="true"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
             <menupopup id="link-appendix-popup" />
           </menu>
-          <menuitem id="link-glossary" label="&glossaryButton.label;" disabled="true" 
+          <menuitem id="link-glossary" label="&glossaryButton.label;" disabled="true"
               class="menuitem-iconic bookmark-item"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
-          <menuitem id="link-index" label="&indexButton.label;" disabled="true" 
+          <menuitem id="link-index" label="&indexButton.label;" disabled="true"
               class="menuitem-iconic bookmark-item"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
 
         </menupopup>
       </toolbarbutton>
 
-      <toolbarbutton id="more-menu" class="bookmark-item" 
+      <toolbarbutton id="more-menu" class="bookmark-item"
           type="menu"
           container="true"
           label="&moreButton.label;" disabled="true">
         <menupopup id="more-menu-popup">
 
           <menuitem id="link-help" label="&helpButton.label;" disabled="true"
               class="menuitem-iconic bookmark-item"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
@@ -135,31 +135,31 @@
               class="menuitem-iconic bookmark-item"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
 
           <menuseparator />
 
           <menuitem id="link-author" label="&authorButton.label;" disabled="true"
               class="menuitem-iconic bookmark-item"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
-          <menuitem id="link-copyright" label="&copyrightButton.label;" disabled="true" 
+          <menuitem id="link-copyright" label="&copyrightButton.label;" disabled="true"
               class="menuitem-iconic bookmark-item"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
 
           <menuseparator />
 
-          <menu id="link-bookmark" label="&bookmarkButton.label;" disabled="true"  
+          <menu id="link-bookmark" label="&bookmarkButton.label;" disabled="true"
               class="menu-iconic bookmark-item" container="true"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
             <menupopup id="link-bookmark-popup" />
           </menu>
 
           <menuseparator />
 
-          <menu id="link-alternate" label="&alternateButton.label;" disabled="true"  
+          <menu id="link-alternate" label="&alternateButton.label;" disabled="true"
               class="menu-iconic bookmark-item" container="true"
               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
             <menupopup id="link-alternate-popup" />
           </menu>
 
           <menuseparator collapsed="true" id="misc-separator" />
 
         </menupopup>
--- a/suite/browser/mailNavigatorOverlay.xul
+++ b/suite/browser/mailNavigatorOverlay.xul
@@ -19,29 +19,29 @@
     <command id="cmd_newMessage" oncommand="goOpenNewMessage();"/>
     <command id="cmd_newCard" oncommand="openNewCardDialog()"/>
     <command id="cmd_sendPage" oncommand="sendPage();"/>
     <command id="Browser:SendLink" oncommand="sendLink();"/>
   </commandset>
   <keyset id="tasksKeys">
     <key id="key_newMessage" key="&newMessageCmd.key;" command="cmd_newMessage" modifiers="accel"/>
   </keyset>
-         
+
   <!-- navigator specific UI items -->
   <menupopup id="menu_NewPopup">
     <menuitem id="menu_newCard"
               label="&newContactCmd.label;"
               accesskey="&newContactCmd.accesskey;"
               command="cmd_newCard"
               insertafter="navBeginGlobalNewItems"/>
     <menuitem id="menu_newMessage"
               label="&newMessageCmd.label;"
               accesskey="&newMessageCmd.accesskey;"
               command="cmd_newMessage"
-              key="key_newMessage"           
+              key="key_newMessage"
               insertafter="navBeginGlobalNewItems"/>
   </menupopup>
 
   <menupopup id="menu_FilePopup">
     <menuitem id="menu_sendPage"
               label="&sendPage.label;"
               accesskey="&sendPage.accesskey;"
               command="cmd_sendPage"
@@ -84,11 +84,11 @@
       <menuitem id="context-sendframe"
                 insertafter="context-saveframe"
                 label="&contextSendFrame.label;"
                 accesskey="&contextSendFrame.accesskey;"
                 oncommand="sendPage(gContextMenu.target.ownerDocument);"/>
     </menupopup>
     </menu>
   </menupopup>
-  
+
 </overlay>
 
--- a/suite/browser/metadata.xul
+++ b/suite/browser/metadata.xul
@@ -1,39 +1,39 @@
-<?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://navigator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://navigator/skin/pageInfo.css" type="text/css"?>
 
 <!DOCTYPE dialog [
   <!ENTITY % metadataDTD SYSTEM "chrome://navigator/locale/metadata.dtd" >
   %metadataDTD;
 ]>
- 
+
 <dialog id="metadata"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&caption.label;"
         onload="onLoad()"
         minwidth="350"
         buttons="none"
         persist="screenX screenY"
         screenX="24" screenY="24">
 
   <script type="application/javascript" src="chrome://navigator/content/metadata.js"/>
 
   <stringbundle src="chrome://navigator/locale/metadata.properties" id="bundle_metadata"/>
   <stringbundle src="chrome://global/locale/languageNames.properties" id="bundle_languages"/>
   <stringbundle src="chrome://global/locale/regionNames.properties" id="bundle_regions"/>
 
   <label id="no-properties" value="&no-properties.label;"/>
-  
+
   <vbox id="link-sec">
     <label value="&link-sec.label;"/>
     <separator class="groove"/>
     <grid>
       <columns>
         <column/>
         <column/>
         <column flex="1"/>
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -1,9 +1,9 @@
-<?xml version="1.0"?> <!-- -*- Mode: HTML; indent-tabs-mode: nil -*- --> 
+<?xml version="1.0"?> <!-- -*- Mode: HTML; indent-tabs-mode: nil -*- -->
 
 <!-- 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://navigator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/content/places/places.css" type="text/css"?>
@@ -23,27 +23,27 @@
 ]>
 
 <window id="main-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup()" onunload="Shutdown()"
         onclose="return WindowIsClosing();"
         contenttitlesetting="true"
-        title="&mainWindow.title;" 
-        titlemodifier="&mainWindow.titlemodifier;" 
+        title="&mainWindow.title;"
+        titlemodifier="&mainWindow.titlemodifier;"
         titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
         titleprivate="&mainWindow.titleprivate;"
         toggletoolbar="true"
         lightweightthemes="true"
         lightweightthemesfooter="status-bar"
         windowtype="navigator:browser"
         macanimationtype="document"
         drawtitle="true"
-        persist="screenX screenY width height sizemode"> 
+        persist="screenX screenY width height sizemode">
 
   <!-- Generic Utility -->
   <script type="application/javascript" src="chrome://global/content/nsUserSettings.js"/>
   <script type="application/javascript" src="chrome://global/content/nsClipboard.js"/>
   <script type="application/javascript" src="chrome://global/content/viewSourceUtils.js"/>
 
   <!-- Content Area -->
   <script type="application/javascript" src="chrome://navigator/content/nsBrowserStatusHandler.js"/>
@@ -180,17 +180,17 @@
              mode="icons" iconsize="small"
              defaultmode="icons" defaulticonsize="small"
              context="toolbar-context-menu">
       <toolbaritem id="menubar-items" class="menubar-items" align="center">
         <menubar id="main-menubar"/>
       </toolbaritem>
     </toolbar>
 
-    <toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar" persist="collapsed" 
+    <toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar" persist="collapsed"
              grippytooltiptext="&navigationToolbar.tooltip;"
              fullscreentoolbar="true" customizable="true"
              toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
              defaultset="back-button,forward-button,reload-button,stop-button,nav-bar-inner,search-button-container,print-button,throbber-box,window-controls"
              context="toolbar-context-menu">
 
       <hbox id="window-controls" hidden="true" fullscreencontrol="true">
         <toolbarbutton id="minimize-button"
@@ -494,17 +494,17 @@
                     autocompletepopup="PopupAutoComplete"
                     onbookmarkgroup="PlacesCommandHook.bookmarkCurrentPages();"
                     oncontentclick="return contentAreaClick(event);"
                     oncommand="BrowserOnCommand(event);"/>
         <!-- The oncommand listener above lets us fix bugs like 401575 which
              require error page UI to do privileged things, without letting
              error pages have any privilege themselves. -->
       </hbox>
-    </vbox>  
+    </vbox>
   </hbox>
 
   <panel id="customizeToolbarSheetPopup"/>
 
   <statusbar id="status-bar" class="chromeclass-status">
     <statusbarpanel id="component-bar"/>
     <statusbarpanel id="statusbar-display" label="&statusText.label;" flex="1"/>
     <statusbarpanel class="statusbarpanel-progress" id="statusbar-progresspanel" collapsed="true">
@@ -514,10 +514,10 @@
                     oncommand="StatusbarViewPopupManager()"
                     tooltiptext="&popupIcon.tooltiptext;"
                     context="popupBlockerMenu"/>
     <statusbarpanel class="statusbarpanel-iconic" id="offline-status"/>
     <statusbarpanel class="statusbarpanel-backgroundbox"
                     id="security-button" dir="reverse"
                     context="security-context-menu"
                     oncommand="BrowserPageInfo(null, 'securityTab')"/>
-  </statusbar> 
+  </statusbar>
 </window>
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -82,17 +82,17 @@
     <!-- View Menu -->
     <key id="key_reload"  key="&reloadCmd.commandkey;" oncommand="BrowserReload();" modifiers="accel"/>
     <key key="&reloadCmd.commandkey;" oncommand="BrowserReloadSkipCache();" modifiers="accel,shift"/>
     <key id="key_viewSource" key="&pageSourceCmd.commandkey;" command="View:PageSource" modifiers="accel"/>
     <key id="key_viewInfo"   key="&pageInfoCmd.commandkey;"   command="View:PageInfo"   modifiers="accel"/>
     <key id="key_viewNextSidebarPanel" keycode="VK_PAGE_DOWN"  oncommand="SidebarGetRelativePanel(1);"  modifiers="alt" />
     <key id="key_viewPrevSidebarPanel" keycode="VK_PAGE_UP"  oncommand="SidebarGetRelativePanel(-1);"  modifiers="alt" />
 
-    <!-- Search Menu -->  
+    <!-- Search Menu -->
     <keyset id="findKeys"/>
     <key id="key_findTypeText"/>
     <key id="key_findTypeLinks"/>
 
     <!-- Go Menu -->
     <key keycode="VK_BACK" command="cmd_handleBackspace"/>
     <key keycode="VK_BACK" command="cmd_handleShiftBackspace" modifiers="shift"/>
 
@@ -105,17 +105,17 @@
     <key id="searchInternetKb" key="&searchInternet.commandKey;" modifiers="accel,shift" command="Browser:SearchInternet"/>
 
     <!-- Misc -->
     <!-- the amazing fishcam, suppress warning by ',' at the beginning of modifiers, see bug 496322 -->
     <key key="f" modifiers=",control,alt" oncommand="loadURI('http://www.fishcam.com/');"/>
     <key id="goUpKb" keycode="VK_UP" command="Browser:Up" modifiers="alt"/>
     <key id="key_gotoHistory"  key="&history.commandKey;"        oncommand="toHistory();" modifiers="accel"/>
     <keyset id="viewZoomKeys"/>
-    <keyset id="navigationKeys"/>  
+    <keyset id="navigationKeys"/>
     <keyset id="tasksKeys"/>
     <key id="key_sanitize" command="Tools:Sanitize" keycode="VK_DELETE" modifiers="accel,shift"/>
   </keyset>
 
   <commandset id="commands">
     <command id="cmd_newNavigatorTab" oncommand="BrowserOpenTab();"/>
     <command id="cmd_newNavigator"/>
     <command id="cmd_newPrivateWindow"/>
@@ -157,17 +157,17 @@
     <command id="cmd_copyLink"/>
     <command id="cmd_copyImage"/>
 
     <!-- View Menu -->
     <command id="View:PageSource" oncommand="BrowserViewSource(gBrowser.selectedBrowser);" observes="isImage"/>
     <command id="View:PageInfo"   oncommand="BrowserPageInfo();"/>
     <command id="View:FullScreen" oncommand="BrowserFullScreen();"/>
     <command id="cmd_SwitchDocumentDirection" oncommand="SwitchDocumentDirection(window.content);" />
- 
+
     <!-- Search Menu -->
     <command id="cmd_find"
              oncommand="BrowserFind();"
              observes="isImage"/>
     <command id="cmd_findNext"
              oncommand="BrowserFindAgain(false);"
              observes="isImage"/>
     <command id="cmd_findPrev"
@@ -190,17 +190,17 @@
              oncommand="PlacesCommandHook.bookmarkCurrentPages();"
              disabled="true"/>
     <command id="Browser:ManageBookmark"
              label="&manBookmarksCmd.label;" accesskey="&manBookmarksCmd.accesskey;"
              oncommand="PlacesCommandHook.showBookmarksManager('AllBookmarks');"/>
     <command id="feedsMenu" disabled="true"/>
     <commandset id="placesCommands"/>
 
-    <!-- Go Menu -->  
+    <!-- Go Menu -->
     <command id="Browser:Home"    oncommand="BrowserHome(event);"/>
     <command id="Browser:Back"    oncommand="BrowserBack();"    observes="canGoBack"/>
     <command id="Browser:Forward" oncommand="BrowserForward();" observes="canGoForward"/>
     <command id="Browser:Up"      oncommand="BrowserUp();"      observes="canGoUp"/>
     <commandset id="viewZoomCommands"/>
     <commandset id="tasksCommands"/>
 
     <!-- Tools Menu -->
@@ -279,24 +279,24 @@
         <menuitem id="menu_paste"/>
         <menuitem id="menu_delete"/>
         <menuseparator/>
         <menuitem id="menu_selectAll"/>
         <menuseparator/>
         <menuitem id="menu_find" label="&findOnCmd.label;"/>
         <menuitem id="menu_findNext"/>
         <menuitem id="menu_findPrev"/>
-        <menuseparator/> 
+        <menuseparator/>
         <menuitem id="menu_findTypeLinks"/>
         <menuitem id="menu_findTypeText"/>
 
         <menuseparator id="textfieldDirection-separator" hidden="true"/>
         <menuitem id="textfieldDirection-swap" hidden="true"/>
 
-        <menuseparator id="menu_PrefsSeparator"/> 
+        <menuseparator id="menu_PrefsSeparator"/>
         <menuitem id="menu_preferences" oncommand="goPreferences('navigator_pane')"/>
       </menupopup>
     </menu>
 
     <menu id="menu_View">
       <menupopup id="menu_View_Popup" onpopupshowing="EnableCharsetMenu();">
         <menu label="&toolbarsCmd.label;" accesskey="&toolbarsCmd.accesskey;" id="menu_Toolbars">
           <menupopup id="view_toolbars_popup"
@@ -317,17 +317,17 @@
                       observes="cmd_viewtaskbar"/>
             <menuitem id="menuitem_componentbarCmd"
                       label="&componentbarCmd.label;"
                       accesskey="&componentbarCmd.accesskey;"
                       class="menuitem-iconic"
                       type="checkbox"
                       observes="cmd_viewcomponentbar"/>
           </menupopup>
-        </menu>   
+        </menu>
         <menuitem id="menuitem_fullScreen"
                   label="&fullScreenCmd.label;"
                   accesskey="&fullScreenCmd.accesskey;"
                   key="key_fullScreen"
                   command="View:FullScreen"/>
         <menuseparator />
         <menuitem id="menuitem-stop"
                   label="&stopCmd.label;"
--- a/suite/browser/webDeveloperOverlay.xul
+++ b/suite/browser/webDeveloperOverlay.xul
@@ -155,16 +155,16 @@
         <hbox class="gclitoolbar-complete-node"/>
       </stack>
       <toolbarbutton id="developer-toolbar-toolbox-button"
                      class="developer-toolbar-button"
                      label="&devToolboxMenuItem.label;"
                      observes="devtoolsMenuBroadcaster_DevToolbox"
                      tooltiptext="&devToolbarToolsButton.tooltip;"
                      _defaultTooltipText="&devToolbarToolsButton.tooltip;"/>
-    
+
       <toolbarbutton id="developer-toolbar-closebutton"
                      class="close-icon"
                      oncommand="DeveloperToolbar.hide();"
                      tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
     </toolbar>
   </window>
 </overlay>
--- a/suite/common/bookmarks/bookmarksManager.xul
+++ b/suite/common/bookmarks/bookmarksManager.xul
@@ -78,26 +78,26 @@
              oncommand="PlacesOrganizer.back();"/>
     <command id="OrganizerCommand:Forward"
              oncommand="PlacesOrganizer.forward();"/>
   </commandset>
 
 
   <keyset id="placesOrganizerKeyset">
     <!-- Instantiation Keys -->
-    <key id="placesKey_close" key="&cmd.close.key;" modifiers="accel" 
+    <key id="placesKey_close" key="&cmd.close.key;" modifiers="accel"
          oncommand="close();"/>
 
     <!-- Command Keys -->
     <key id="placesKey_find:all"
-         command="OrganizerCommand_find:all" 
+         command="OrganizerCommand_find:all"
          key="&cmd.find.key;"
          modifiers="accel"/>
     <key id="placesKey_find:current"
-         command="OrganizerCommand_find:current" 
+         command="OrganizerCommand_find:current"
          key="&cmd.find.key;"
          modifiers="accel,shift"/>
 
     <!-- Back/Forward Keys Support -->
     <key id="placesKey_goBackKb"
          keycode="VK_LEFT"
          command="OrganizerCommand:Back"
          modifiers="accel"/>
@@ -137,19 +137,19 @@
                       label="&cmd.new_folder.label;"
                       accesskey="&cmd.new_folder.accesskey;"/>
             <menuitem id="newseparator"
                       command="placesCmd_new:separator"
                       label="&cmd.new_separator.label;"
                       accesskey="&cmd.new_separator.accesskey;"/>
             <menuseparator id="fileNewSeparator"/>
             <menuitem id="orgClose"
-                      key="placesKey_close" 
+                      key="placesKey_close"
                       label="&file.close.label;"
-                      accesskey="&file.close.accesskey;" 
+                      accesskey="&file.close.accesskey;"
                       oncommand="close();"/>
           </menupopup>
         </menu>
 
         <menu id="menu_Edit">
           <menupopup id="menu_EditPopup">
             <menuitem id="menu_undo"/>
             <menuitem id="menu_redo"/>
@@ -186,24 +186,24 @@
               <menupopup onpopupshowing="ViewMenu.fillWithColumns(event, null, null, 'checkbox', null);"
                          oncommand="ViewMenu.showHideColumn(event.target); event.stopPropagation();"/>
             </menu>
 
             <menu id="viewSort" label="&view.sort.label;"
                   accesskey="&view.sort.accesskey;">
               <menupopup onpopupshowing="ViewMenu.populateSortMenu(event);"
                          oncommand="ViewMenu.setSortColumn(event.target.column, null); event.stopPropagation();">
-                <menuitem id="viewUnsorted" type="radio" name="columns" 
+                <menuitem id="viewUnsorted" type="radio" name="columns"
                           label="&view.unsorted.label;" accesskey="&view.unsorted.accesskey;"
                           oncommand="ViewMenu.setSortColumn(null, null);"/>
                 <menuseparator id="directionSeparator"/>
-                <menuitem id="viewSortAscending" type="radio" name="direction" 
+                <menuitem id="viewSortAscending" type="radio" name="direction"
                           label="&view.sortAscending.label;" accesskey="&view.sortAscending.accesskey;"
                           oncommand="ViewMenu.setSortColumn(null, 'ascending'); event.stopPropagation();"/>
-                <menuitem id="viewSortDescending" type="radio" name="direction" 
+                <menuitem id="viewSortDescending" type="radio" name="direction"
                           label="&view.sortDescending.label;" accesskey="&view.sortDescending.accesskey;"
                           oncommand="ViewMenu.setSortColumn(null, 'descending'); event.stopPropagation();"/>
               </menupopup>
             </menu>
           </menupopup>
         </menu>
 
         <!-- tasks menu filled from tasksOverlay -->
--- a/suite/common/defaultClientDialog.xul
+++ b/suite/common/defaultClientDialog.xul
@@ -15,19 +15,19 @@
 
 <dialog xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="defaultClientDialog"
         buttons="accept,cancel"
         onload="onLoad();"
         ondialogaccept="return onAccept();"
         title="&defaultClient.title;">
-  
+
   <script type="application/javascript" src="chrome://communicator/content/defaultClientDialog.js"/>
-  
+
   <description>&defaultClient.intro;</description>
   <listbox rows="4" id="defaultList">
     <listitem value="BROWSER" type="checkbox" label="&browser.label;"/>
     <listitem value="MAIL" type="checkbox" label="&email.label;"/>
     <listitem value="NEWS" type="checkbox" label="&newsgroups.label;"/>
     <listitem value="RSS" type="checkbox" label="&feeds.label;"/>
   </listbox>
 
--- a/suite/common/directory/directory.xul
+++ b/suite/common/directory/directory.xul
@@ -65,10 +65,10 @@
 
   <splitter id="main-splitter" collapse="after" hidden="true">
     <grippy/>
   </splitter>
 
   <vbox id="logbox" flex="1" collapsed="true" persist="height collapsed" hidden="true">
      <iframe id="output-iframe" type="content" flex="1" src="chrome://communicator/content/directory/directory.html"/>
   </vbox>
-  
+
 </page>
--- a/suite/common/helpEditorOverlay.xul
+++ b/suite/common/helpEditorOverlay.xul
@@ -9,17 +9,17 @@
   <script type="application/javascript" src="chrome://help/content/contextHelp.js"/>
   <script type="application/javascript">
   <![CDATA[
     setHelpFileURI('chrome://communicator/locale/help/suitehelp.rdf');
 
     function doPublishDialogHelpButton()
     {
      var selTab = document.getElementById('tabBox').selectedTab;
-     
+
      if (selTab.id == "PublishTab")
        openHelp('comp-doc-publish-publishtab');
      else
        openHelp('comp-doc-publish-settingstab');
     }
     ]]>
   </script>
 
@@ -37,17 +37,17 @@
 
   <dialog id="publishDlg"
     buttons="accept,cancel,help"
     ondialoghelp="doPublishDialogHelpButton();"/>
 
   <dialog id="publishProgressDlg"
     buttons="cancel,help"
     ondialoghelp="openHelp('comp-doc-publish-troubleshooting');"/>
-    
+
   <dialog id="publishSettingsDlg"
     buttons="accept,cancel,help"
     ondialoghelp="openHelp('comp-doc-publish-site-settings');"/>
 
   <dialog id="tableDlg"
     buttons="accept,extra1,cancel,help"
     ondialoghelp="openHelp('table_properties');"/>
 
--- a/suite/common/mac/platformCommunicatorOverlay.xul
+++ b/suite/common/mac/platformCommunicatorOverlay.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/. -->
 
 <!-- mac version of platformCommunicatorOverlay.xul -->
 
 <!DOCTYPE overlay [
 
@@ -36,17 +36,17 @@
     <menuitem id="menu_mac_hide_app" label="&hideThisAppCmd.label;"
               key="key_hideThisApp"/>
     <menuitem id="menu_mac_hide_others" label="&hideOtherAppsCmd.label;"
               key="key_hideOtherApps"/>
     <menuitem id="menu_mac_show_all" label="&showAllAppsCmd.label;"/>
     <menuitem id="menu_FileQuitItem" label="&quitApplicationCmd.label;"
               key="key_quit" command="cmd_quit"/>
   </menupopup>
-  <key id="key_quit"  key="&quitApplicationCmd.key;" command="cmd_quit" 
+  <key id="key_quit"  key="&quitApplicationCmd.key;" command="cmd_quit"
        modifiers="&quitApplicationCmd.modifiers;"/>
 
   <!-- Edit Menu -->
   <key id="key_redo"   key="&redoCmd.key;" command="cmd_redo" modifiers="shift, accel"/>
   <!-- Select All Key -->
   <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
 
   <keyset id="findKeys">
@@ -87,17 +87,17 @@
 
   <key id="showHideSidebar" key="&showHideSidebarCmd.key;" modifiers="accel,alt"/>
 
   <key id="key_toggleDirectoryPane" key="&toggleDirectoryPaneCmd.key;" modifiers="accel,alt"/>
 
   <key id="key_toggleFolderPane" key="&toggleFolderPaneCmd.key;" modifiers="accel,alt"/>
 
   <!-- Tasks Commands -->
-  <commandset id="tasksCommands"> 
+  <commandset id="tasksCommands">
     <command id="cmd_minimizeWindow" oncommand="window.minimize();"/>
     <command id="cmd_zoomWindow" oncommand="ZoomCurrentWindow();"/>
   </commandset>
 
   <!-- Tasks Keys -->
   <keyset id="tasksKeys">
     <key id="key_minimizeWindow"
          command="cmd_minimizeWindow"
@@ -139,9 +139,9 @@
     <hbox id="titlebar-content">
       <spacer id="titlebar-spacer" flex="1"/>
       <hbox id="titlebar-buttonbox-container">
         <hbox id="titlebar-buttonbox"/>
       </hbox>
     </hbox>
   </vbox>
 
-</overlay>    
+</overlay>
--- a/suite/common/openLocation.xul
+++ b/suite/common/openLocation.xul
@@ -1,38 +1,38 @@
-<?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://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE dialog [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
   <!ENTITY % openDialogDTD SYSTEM "chrome://communicator/locale/openLocation.dtd" >
   %openDialogDTD;
-]>            
- 
+]>
+
 <dialog id="openLocation"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&caption.label;"
         onload="onLoad()"
         ondialogaccept="return accept();"
         buttonlabelaccept="&open.label;"
         style="width: 40em;"
         persist="screenX screenY"
         screenX="24" screenY="24">
-              
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>  
+
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/javascript" src="chrome://communicator/content/openLocation.js"/>
   <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
   <script type="application/javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
-  
+
   <stringbundle id="openLocationBundle" src="chrome://communicator/locale/openLocation.properties"/>
 
   <hbox>
     <separator orient="vertical" class="thin"/>
     <vbox flex="1">
       <label id="enterLabel"
              value="&enter.label;"
              control="dialog.input"
@@ -64,11 +64,11 @@
             <menuitem value="4" id="newPrivate" label="&newPrivate.label;"/>
             <menuseparator/>
             <menuitem value="2" id="editWindow" label="&editNewWindow.label;"/>
           </menupopup>
         </menulist>
         <spacer flex="1"/>
       </hbox>
     </vbox>
-  </hbox> 
+  </hbox>
 
 </dialog>
--- a/suite/common/permissions/permissionsManager.xul
+++ b/suite/common/permissions/permissionsManager.xul
@@ -1,15 +1,15 @@
 <?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://communicator/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/permissionsManager.dtd" >
 
 <dialog id="permissionsManager"
         buttons="accept,cancel,help"
         windowtype="exceptions"
         title="&windowtitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/suite/common/places/tests/chrome/test_bug549192.xul
+++ b/suite/common/places/tests/chrome/test_bug549192.xul
@@ -53,17 +53,17 @@
       waitForClearHistory(continue_test);
     }
 
     function continue_test() {
 
       // Add some visits.
       let vtime = Date.now() * 1000;
       const ttype = PlacesUtils.history.TRANSITION_TYPED;
-      
+
       addVisits(
         [{ uri: Services.io.newURI("http://example.tld/", null, null),
            visitDate: vtime, transition: ttype },
          { uri: Services.io.newURI("http://example2.tld/", null, null),
            visitDate: vtime++, transition: ttype },
          { uri: Services.io.newURI("http://example3.tld/", null, null),
            visitDate: vtime++, transition: ttype }],
          function() {
--- a/suite/common/places/tests/chrome/test_bug549491.xul
+++ b/suite/common/places/tests/chrome/test_bug549491.xul
@@ -54,17 +54,17 @@
     function runTest() {
       // The mochitest page is added to history.
       waitForClearHistory(continue_test);
     }
 
     function continue_test() {
       addVisits(
         {uri: Services.io.newURI("http://example.tld/", null, null),
-         visitDate: Date.now() * 1000, 
+         visitDate: Date.now() * 1000,
          transition: PlacesUtils.history.TRANSITION_TYPED},
         function() {
           // Make a history query.
           let query = PlacesUtils.history.getNewQuery();
           let opts = PlacesUtils.history.getNewQueryOptions();
           let queryURI = PlacesUtils.history.queriesToQueryString([query], 1, opts);
 
           // Setup the places tree contents.
--- a/suite/common/pref/pref-content.xul
+++ b/suite/common/pref/pref-content.xul
@@ -118,17 +118,17 @@
                 accesskey="&siteSpecific.accesskey;"
                 preference="browser.zoom.siteSpecific"/>
       <checkbox id="enableAutomaticImageResizing"
                 label="&enableAutomaticImageResizing.label;"
                 accesskey="&enableAutomaticImageResizing.accesskey;"
                 preference="browser.enable_automatic_image_resizing"/>
     </groupbox>
 
-    <vbox class="box-padded" align="start"> 
+    <vbox class="box-padded" align="start">
       <checkbox id="allowHWAccel"
                 label="&allowHWAccel.label;"
                 accesskey="&allowHWAccel.accesskey;"
                 preference="layers.acceleration.disabled"/>
       <checkbox id="blockAutoRefresh"
                 label="&blockAutoRefresh.label;"
                 accesskey="&blockAutoRefresh.accesskey;"
                 preference="accessibility.blockautorefresh"/>
--- a/suite/common/pref/pref-fonts.xul
+++ b/suite/common/pref/pref-fonts.xul
@@ -14,17 +14,17 @@
                   type="wstring"/>
       <preference id="browser.display.use_document_fonts"
                   name="browser.display.use_document_fonts"
                   type="int"/>
       <preference id="browser.display.languageList"
                   name="browser.display.languageList"
                   type="wstring"/>
     </preferences>
- 
+
     <groupbox>
       <caption align="center">
         <label value="&language.label;"
                accesskey="&language.accesskey;"
                control="selectLangs"/>
         <menulist id="selectLangs" preference="font.language.group"
                   onsyncfrompreference="document.getElementById('fonts_pane').ReadFontLanguageGroup();">
           <menupopup>
--- a/suite/common/pref/pref-history.xul
+++ b/suite/common/pref/pref-history.xul
@@ -1,17 +1,17 @@
-<?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/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/pref-history.dtd" >
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-      
+
   <prefpane id="history_pane"
             label="&pref.history.title;"
             script="chrome://communicator/content/pref/pref-history.js">
     <preferences id="history_preferences">
       <preference id="places.history.enabled"
                   name="places.history.enabled"
                   type="bool"/>
       <preference id="pref.browser.history.disable_button.clear_hist"
--- a/suite/common/pref/pref-http.xul
+++ b/suite/common/pref/pref-http.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/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/pref-http.dtd">
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <prefpane id="http_pane"
             label="&pref.http.title;"
@@ -39,39 +39,39 @@
         <caption label="&prefDirect.label;"/>
         <vbox class="indent" align="start">
           <radiogroup id="httpVersion"
                       preference="network.http.version">
             <radio value="1.0"
                    label="&prefEnableHTTP10.label;"
                    accesskey="&prefEnableHTTP10.accesskey;"/>
             <radio value="1.1"
-                   label="&prefEnableHTTP11.label;" 
+                   label="&prefEnableHTTP11.label;"
                    accesskey="&prefEnableHTTP11.accesskey;"/>
           </radiogroup>
 
           <separator class="thin"/>
 
           <checkbox id="enablePipelining"
                     label="&prefEnablePipelining.label;"
                     accesskey="&prefEnablePipelining.accesskey;"
                     preference="network.http.pipelining"/>
         </vbox>
       </groupbox>
 
       <groupbox flex="1">
         <caption label="&prefProxy.label;"/>
         <vbox class="indent" align="start">
-          <radiogroup id="httpVersionProxy" 
+          <radiogroup id="httpVersionProxy"
                       preference="network.http.proxy.version">
             <radio value="1.0"
                    label="&prefEnableHTTP10.label;"
                    accesskey="&prefEnableHTTP10Proxy.accesskey;"/>
             <radio value="1.1"
-                   label="&prefEnableHTTP11.label;" 
+                   label="&prefEnableHTTP11.label;"
                    accesskey="&prefEnableHTTP11Proxy.accesskey;"/>
           </radiogroup>
 
           <separator class="thin"/>
 
           <checkbox id="enablePipeliningProxy"
                     label="&prefEnablePipelining.label;"
                     accesskey="&prefEnablePipeliningProxy.accesskey;"
--- a/suite/common/pref/pref-images.xul
+++ b/suite/common/pref/pref-images.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/. -->
 <!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % prefImagesDTD SYSTEM "chrome://communicator/locale/pref/pref-images.dtd" >
--- a/suite/common/pref/pref-languages-add.xul
+++ b/suite/common/pref/pref-languages-add.xul
@@ -26,29 +26,29 @@
                   name="intl.accept_languages"
                   type="wstring"/>
     </preferences>
 
     <stringbundleset id="langAddBundleset">
       <stringbundle id="prefLangAddBundle"
                     src="chrome://communicator/locale/pref/pref-languages.properties"/>
     </stringbundleset>
- 
+
     <description style="width: 1px;">&languages.customize.prefAddLangDescript;</description>
     <separator class="thin"/>
     <description style="width: 1px;">&languages.customize.available.label;</description>
- 
+
     <listbox id="availableLanguages"
              flex="1"
              seltype="multiple"
              preference="intl.accept_languages"
              ondblclick="HandleDoubleClick();"
              onsynctopreference="return WriteAddedLanguages(this);"/>
 
     <hbox align="center">
-      <label value="&languages.customize.others.label;" 
-             accesskey="&languages.customize.others.accesskey;" 
+      <label value="&languages.customize.others.label;"
+             accesskey="&languages.customize.others.accesskey;"
              control="otherLanguages"/>
       <textbox id="otherLanguages" size="12" flex="1"/>
       <label value="&languages.customize.others.examples;" control="otherLanguages"/>
     </hbox>
   </prefpane>
 </prefwindow>
--- a/suite/common/pref/pref-locationbar.xul
+++ b/suite/common/pref/pref-locationbar.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/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/pref-locationbar.dtd">
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
--- a/suite/common/pref/pref-navigator.xul
+++ b/suite/common/pref/pref-navigator.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/. -->
 
 <!DOCTYPE overlay [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
   <!ENTITY % navigatorDTD SYSTEM "chrome://communicator/locale/pref/pref-navigator.dtd"> %navigatorDTD;
@@ -46,17 +46,17 @@
                   name="pref.browser.homepage.disable_button.current_group"
                   type="bool"/>
       <preference id="pref.browser.homepage.disable_button.default_page"
                   name="pref.browser.homepage.disable_button.default_page"
                   type="bool"/>
     </preferences>
 
     <hbox id="pref-nav-platform-extensions">
-      <!-- navigator startup / new window / new tab behaviour -->  
+      <!-- navigator startup / new window / new tab behaviour -->
       <groupbox flex="1">
         <caption align="center">
           <label value="&navRadio.label;" accesskey="&navRadio.accesskey;" control="selectDisplayOn"/>
           <menulist id="selectDisplayOn" oncommand="SwitchPage(this.selectedIndex);">
             <menupopup>
               <menuitem label="&navStartPageMenu.label;"/>
               <menuitem label="&newWinPageMenu.label;"/>
               <menuitem label="&newTabPageMenu.label;"/>
--- a/suite/common/pref/pref-offlineapps.xul
+++ b/suite/common/pref/pref-offlineapps.xul
@@ -66,16 +66,16 @@
                    aria-labelledby="offlineAppsListLabel"
                    onselect="OfflineAppSelected(this);">
           </listbox>
         </vbox>
         <vbox pack="end">
           <button id="offlineAppsListRemove"
                   disabled="true"
                   label="&offlineAppsListRemove.label;"
-                  accesskey="&offlineAppsListRemove.accesskey;" 
+                  accesskey="&offlineAppsListRemove.accesskey;"
                   oncommand="RemoveOfflineApp();"/>
         </vbox>
       </hbox>
     </groupbox>
 
   </prefpane>
 </overlay>
--- a/suite/common/pref/pref-passwords.xul
+++ b/suite/common/pref/pref-passwords.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/. -->
 <!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % prefPasswordsDTD SYSTEM "chrome://communicator/locale/pref/pref-passwords.dtd">
--- a/suite/common/pref/pref-popups.xul
+++ b/suite/common/pref/pref-popups.xul
@@ -54,21 +54,21 @@
       <preference id="privacy.popups.default_whitelist"
                   name="privacy.popups.default_whitelist"
                   type="string"/>
     </preferences>
 
     <groupbox id="popupsArea">
       <caption label="&pref.popups.caption;"/>
 
-      <hbox>      
+      <hbox>
         <checkbox id="popupPolicy"
                   label="&popupBlock.label;"
                   accesskey="&popupBlock.accesskey;"
-                  preference="dom.disable_open_during_load"/>   
+                  preference="dom.disable_open_during_load"/>
         <spacer flex="1"/>
         <button id="exceptionsButton"
                 label="&viewPermissions.label;"
                 accesskey="&viewPermissions.accesskey;"
                 preference="pref.advanced.popups.disable_button.view_popups"
                 oncommand="toDataManager('|permissions');"/>
       </hbox>
       <separator class="thin"/>
--- a/suite/common/pref/pref-proxies-advanced.xul
+++ b/suite/common/pref/pref-proxies-advanced.xul
@@ -180,17 +180,17 @@
                accesskey="&socks4.accesskey;"/>
         <radio id="networkProxySOCKSVersion5"
                value="5"
                label="&socks5.label;"
                accesskey="&socks5.accesskey;"/>
       </radiogroup>
 
       <hbox align="left">
-        <checkbox id="networkProxySOCKSRemoteDNS" 
+        <checkbox id="networkProxySOCKSRemoteDNS"
                   label="&socksRemoteDNS.label;"
                   accesskey="&socksRemoteDNS.accesskey;"
                   preference="network.proxy.socks_remote_dns"/>
       </hbox>
 
     </groupbox>
   </prefpane>
 </prefwindow>
--- a/suite/common/pref/pref-scripts.xul
+++ b/suite/common/pref/pref-scripts.xul
@@ -106,11 +106,11 @@
                 preference="plugin.default.state"
                 onsyncfrompreference="return document.getElementById(this.getAttribute('preference')).value == 2;"
                 onsynctopreference="return this.checked ? 2 : 1;"/>
       <checkbox id="warnPluginsRequired"
                 label="&warnPluginsRequired.label;"
                 accesskey="&warnPluginsRequired.accesskey;"
                 preference="plugins.hide_infobar_for_missing_plugin"/>
     </groupbox>
-    
+
   </prefpane>
 </overlay>
--- a/suite/common/pref/pref-smartupdate.xul
+++ b/suite/common/pref/pref-smartupdate.xul
@@ -1,20 +1,20 @@
-<?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/. -->
 
 <!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % prefSmartUpdateDTD SYSTEM "chrome://communicator/locale/pref/pref-smartupdate.dtd">
 %prefSmartUpdateDTD;
 ]>
- 
+
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <prefpane id="smartupdate_pane"
             label="&pref.smartUpdate.title;"
             script="chrome://communicator/content/pref/pref-smartupdate.js">
 
     <preferences id="smartupdate_preferences">
       <preference id="xpinstall.enabled"
                   name="xpinstall.enabled"
--- a/suite/common/pref/preferences.xul
+++ b/suite/common/pref/preferences.xul
@@ -10,25 +10,25 @@
 <?xml-stylesheet type="text/css" href="chrome://communicator/skin/prefpanels.css"?>
 <?xml-stylesheet type="text/css" href="chrome://communicator/skin/preferences.css"?>
 
 <!DOCTYPE prefwindow [
   <!ENTITY % dtdPrefs    SYSTEM "chrome://communicator/locale/pref/preferences.dtd"> %dtdPrefs;
   <!ENTITY % dtdPlatform SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd"> %dtdPlatform;
 ]>
 
-<prefwindow id="prefDialog" 
+<prefwindow id="prefDialog"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            title="&prefWindow.title;" 
+            title="&prefWindow.title;"
             style="&prefWindow.size;"
             overflow="auto"
             onload="OnLoad();"
             windowtype="mozilla:preferences"
             buttons="accept,cancel,help"
-            autopanes="true"> 
+            autopanes="true">
 
   <script type="application/javascript" src="chrome://communicator/content/pref/preferences.js"/>
   <!-- Used by pref-smartupdate, pref-privatedata, pref-cookies, pref-images, pref-popups and pref-passwords, as well as pref-sync (gSyncUtils.*open* -> openUILinkIn) -->
   <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
   <script type="application/javascript" src="chrome://communicator/content/tasksOverlay.js"/>
 
   <stringbundleset id="prefBundleset">
     <stringbundle id="bundle_prefutilities"
@@ -43,17 +43,17 @@
         style="width: 13em;"
         seltype="single"
         hidecolumnpicker="true"
         hidden="true"
         flex="1">
     <treecols>
       <treecol id="categoryCol"
                label="&categoryHeader;"
-               primary="true" 
+               primary="true"
                flex="1"/>
     </treecols>
 
     <treechildren id="prefsPanelChildren">
       <!-- Appearance items -->
       <treeitem container="true"
                 id="appearanceItem"
                 label="&appear.label;"
--- a/suite/common/profile/profileSelection.xul
+++ b/suite/common/profile/profileSelection.xul
@@ -72,14 +72,14 @@
             onselect="DoEnabling();"
             onkeypress="HandleKeyEvent(event);">
         <treecols>
           <treecol label="&availableProfiles.label;" flex="1" sortLocked="true"/>
         </treecols>
         <treechildren tooltip="treetip"
                       ondblclick="HandleClickEvent(event);"/>
       </tree>
-      <checkbox id="offlineState" label="&offlineState.label;" accesskey="&offlineState.accesskey;" hidden="true"/> 
+      <checkbox id="offlineState" label="&offlineState.label;" accesskey="&offlineState.accesskey;" hidden="true"/>
       <checkbox id="autoSelect" label="&autoSelect.label;" accesskey="&autoSelect.accesskey;"/>
     </vbox>
   </hbox>
 
 </dialog>
--- a/suite/common/safeMode.xul
+++ b/suite/common/safeMode.xul
@@ -48,11 +48,11 @@
               accesskey="&deleteBookmarks.accesskey;"/>
     <checkbox id="resetUserPrefs"
               label="&resetUserPrefs.label;"
               accesskey="&resetUserPrefs.accesskey;"/>
     <checkbox id="restoreSearch"
               label="&restoreSearch.label;"
               accesskey="&restoreSearch.accesskey;"/>
   </vbox>
-     
+
   <separator class="thin"/>
 </dialog>
--- a/suite/common/sidebar/customize.xul
+++ b/suite/common/sidebar/customize.xul
@@ -49,90 +49,90 @@
         <template>
           <rule>
             <conditions>
               <content uri="?uri"/>
               <triple subject="?uri" object="?panel-list"
                       predicate="http://home.netscape.com/NC-rdf#panel-list"/>
               <member container="?panel-list" child="?panel"/>
             </conditions>
-            
+
             <bindings>
-              <binding subject="?panel" object="?title" 
+              <binding subject="?panel" object="?title"
                        predicate="http://home.netscape.com/NC-rdf#title"/>
-              <binding subject="?panel" object="?link" 
+              <binding subject="?panel" object="?link"
                        predicate="http://home.netscape.com/NC-rdf#link"/>
             </bindings>
-            
+
             <action>
               <treechildren>
                 <treeitem uri="?panel" link="?link">
                   <treerow>
                     <treecell label="?title"/>
                   </treerow>
                 </treeitem>
               </treechildren>
             </action>
           </rule>
         </template>
-        
+
         <treecols>
           <treecol id="AvailNameCol" flex="1" primary="true" hideheader="true"/>
         </treecols>
       </tree>
 
       <!-- xxxslamm Need to add descriptive panel text here -->
       <hbox class="button-group">
         <button id="add_button" oncommand="AddPanel()"
                 label="&sidebar.customize.add.label;"
                 accesskey="&sidebar.customize.add.accesskey;" disabled="true"/>
 
         <button id="preview_button" oncommand="PreviewPanel()"
                 label="&sidebar.customize.preview.label;"
                 accesskey="&sidebar.customize.preview.accesskey;"
                 disabled="true"/>
       </hbox>
-    </vbox> 
-    
-    <separator orient="vertical"/>    
+    </vbox>
+
+    <separator orient="vertical"/>
 
     <!-- The panels that the user currently has chosen -->
     <vbox flex="1">
       <label value="&sidebar.customize.current.label;"
              accesskey="&sidebar.customize.current.accesskey;"
              control="current-panels" crop="right"/>
       <tree id="current-panels" flex="1" hidecolumnpicker="true"
             onselect="SelectChangeForCurrentPanels();">
         <treecols>
           <treecol id="CurrentNameCol" flex="1" hideheader="true"/>
         </treecols>
 
         <treechildren/>
       </tree>
-      
+
       <hbox class="button-group">
         <button id="customize-button" oncommand="CustomizePanel();"
                 label="&sidebar.customize.customize.label;" disabled="true"
                 accesskey="&sidebar.customize.customize.accesskey;"/>
         <button id="remove-button" oncommand="RemovePanel()"
                 label="&sidebar.customize.remove.label;" disabled="true"
                 accesskey="&sidebar.customize.remove.accesskey;"/>
-      </hbox>      
+      </hbox>
     </vbox>
 
     <separator orient="vertical" class="thin"/>
 
     <!-- The 'reorder' buttons -->
     <vbox id="reorder">
       <spacer flex="1"/>
       <button oncommand="MoveUp();" id="up" class="up"
               disabled="true" label="&sidebar.customize.up.label;"
               accesskey="&sidebar.customize.up.accesskey;"/>
       <button oncommand="MoveDown();" id="down" class="down"
               disabled="true" label="&sidebar.customize.down.label;"
               accesskey="&sidebar.customize.down.accesskey;"/>
       <spacer flex="1"/>
-    </vbox> 
+    </vbox>
 
   </hbox>
 
 </dialog>
 
--- a/suite/common/sidebar/preview.xul
+++ b/suite/common/sidebar/preview.xul
@@ -20,11 +20,11 @@
   <script type="application/javascript" src="chrome://communicator/content/sidebar/preview.js" />
 
   <vbox id="panel-container" flex="1">
 
     <hbox id="paneltitle" class="box-texttab texttab-sidebar" selected="true"/>
     <!--  <iframe id="previewframe" type="content" src="about:blank" flex="1"/>-->
     <iframe class="box-panel" id="previewframe" type="content" src="about:blank" flex="1"/>
 
-  </vbox>  
+  </vbox>
 
 </window>
--- a/suite/common/sidebar/sidebarOverlay.xul
+++ b/suite/common/sidebar/sidebarOverlay.xul
@@ -3,19 +3,19 @@
 
  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/. -->
 
 <!-- This overlay requires that the files it overlays has the menupopup
      contentAreaContextMenu defined for context menus to work correctly in
      certain custom tabs -->
- 
-<?xml-stylesheet href="chrome://communicator/content/sidebar/sidebarOverlay.css" type="text/css"?> 
-<?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebar.css" type="text/css"?> 
+
+<?xml-stylesheet href="chrome://communicator/content/sidebar/sidebarOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebar.css" type="text/css"?>
 
 <!DOCTYPE overlay [
 <!ENTITY % sidebarOverlayDTD SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd" >
 %sidebarOverlayDTD;
 ]>
 
 <overlay id="sidebarOverlay"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -49,49 +49,49 @@
                  group="sidebar"
                  sidebartitle="&sidebar.client-addressbook.label;"
                  sidebarurl="chrome://messenger/content/addressbook/addressbook-panel.xul"
                  oncommand="toggleSidebar('viewAddressbookSidebar');"/>
   </broadcasterset>
 
   <command id="toggleSidebar" oncommand="SidebarShowHide();"/>
   <key id="showHideSidebar" command="toggleSidebar"/>
-  <menupopup id="sidebarPopup" 
+  <menupopup id="sidebarPopup"
     onpopupshowing="SidebarInitContextMenu(this, document.popupNode);">
-    <menuitem id="switch-ctx-item" label="&sidebar.switch.label;" 
-              accesskey="&sidebar.switch.accesskey;" default="true" 
+    <menuitem id="switch-ctx-item" label="&sidebar.switch.label;"
+              accesskey="&sidebar.switch.accesskey;" default="true"
               oncommand="SidebarSelectPanel(document.popupNode,false,false);"/>
-    <menuitem id="reload-ctx-item" label="&sidebar.reload.label;" 
+    <menuitem id="reload-ctx-item" label="&sidebar.reload.label;"
               accesskey="&sidebar.reload.accesskey;" disabled="true"
               oncommand="SidebarReloadPanel(document.popupNode);"/>
     <menuitem id="stop-ctx-item" label="&sidebar.loading.stop.label;"
               accesskey="&sidebar.loading.stop.accesskey;" disabled="true"
               oncommand="SidebarStopPanelLoad(document.popupNode);"/>
     <menuseparator/>
-    <menuitem id="hide-ctx-item" label="&sidebar.hide.label;" 
+    <menuitem id="hide-ctx-item" label="&sidebar.hide.label;"
               accesskey="&sidebar.hide.accesskey;"
               oncommand="SidebarTogglePanel(document.popupNode);"/>
     <menuseparator/>
-    <menuitem id="customize-ctx-item" label="&sidebar.customize.label;" 
+    <menuitem id="customize-ctx-item" label="&sidebar.customize.label;"
               accesskey="&sidebar.customize.accesskey;"
               oncommand="SidebarCustomize();"/>
   </menupopup>
 
   <!-- Overlay the sidebar panels -->
   <vbox id="sidebar-box" hidden="true" persist="hidden width collapsed">
     <splitter id="sidebar-panels-splitter" collapse="after" persist="state"
       onmouseup="PersistHeight();" hidden="true">
       <grippy/>
     </splitter>
-    <vbox id="sidebar-panels-splitter-box" flex="1" 
+    <vbox id="sidebar-panels-splitter-box" flex="1"
       persist="collapsed">
       <sidebarheader id="sidebar-title-box" class="sidebarheader-main"
         label="&sidebar.panels.label;" persist="hidden" type="box"
         collapse="after" onmouseup="PersistHeight();"
-        tooltipopen="&sidebar.open.tooltip;" 
+        tooltipopen="&sidebar.open.tooltip;"
         tooltipclose="&sidebar.close.tooltip;">
         <toolbarbutton type="menu" id="sidebar-panel-picker" class="tabbable"
           onpopupshowing="SidebarBuildPickerPopup();"
           label="&sidebar.picker.label;" >
           <menupopup id="sidebar-panel-picker-popup"
             datasources="rdf:null"
             ref="urn:sidebar:current-panel-list"
             oncommand="SidebarTogglePanel(event.target);" >
@@ -126,17 +126,17 @@
             <menuitem label="&sidebar.sbDirectory.label;"
                       oncommand="BrowseMorePanels();" />
             <menuseparator />
           </menupopup>
         </toolbarbutton>
         <toolbarbutton id="sidebar-close-button" oncommand="SidebarShowHide();"
                        tooltiptext="&sidebar.close.tooltip;"/>
       </sidebarheader>
-  
+
       <vbox id="sidebar-panels"
         datasources="rdf:null"
         ref="urn:sidebar:current-panel-list"
         last-selected-panel="urn:sidebar:panel:bookmarks"
         persist="last-selected-panel height collapsed" flex="1"
         onclick="return contentAreaClick(event);">
         <template id="sidebar-template">
           <rule>
@@ -154,26 +154,26 @@
               <binding subject="?panel" object="?exclude"
                 predicate="http://home.netscape.com/NC-rdf#exclude" />
               <binding subject="?panel" object="?prereq"
                 predicate="http://home.netscape.com/NC-rdf#prereq" />
             </bindings>
             <action>
               <hbox uri="?panel" class="box-texttab texttab-sidebar"
                 oncommand="SidebarSelectPanel(this,false,false)"
-                hidden="true" label="?title" exclude="?exclude" 
+                hidden="true" label="?title" exclude="?exclude"
                 prereq="?prereq" context="sidebarPopup"/>
               <vbox uri="?panel" flex="1" hidden="true"
                 loadstate="never loaded">
                 <vbox flex="1" class="iframe-panel loadarea">
                   <hbox flex="1" align="center">
                     <image class="image-panel-loading"/>
                     <label class="text-panel-loading"
                       value="&sidebar.loading.label;"/>
-                    <label class="text-panel-loading" hidden="true" 
+                    <label class="text-panel-loading" hidden="true"
                       loading="false"
                       value="&sidebar.loadstopped.label;"/>
                     <button type="stop" label="&sidebar.loading.stop.label;"
                             oncommand="SidebarStopPanelLoad(this.parentNode.parentNode.parentNode.previousSibling);"/>
                     <button label="&sidebar.reload.label;" hidden="true"
                             oncommand="SidebarReload();"/>
                   </hbox>
                   <spacer flex="100%"/>
@@ -195,19 +195,19 @@
           hidden="true">
           <description>&sidebar.no-panels.state;</description>
           <description>&sidebar.no-panels.add;</description>
           <description>&sidebar.no-panels.hide;</description>
         </vbox>
       </vbox>
       <vbox flex="0">
         <hbox id="nav-buttons-box" hidden="true">
-          <toolbarbutton flex="1" pack="center" 
+          <toolbarbutton flex="1" pack="center"
             class="sidebar-nav-button tab-fwd" onclick="SidebarNavigate(-1);"/>
-          <toolbarbutton flex="1" pack="center" 
+          <toolbarbutton flex="1" pack="center"
             class="sidebar-nav-button tab-back" onclick="SidebarNavigate(1);"/>
         </hbox>
       </vbox>
     </vbox>
   </vbox>
 
   <!-- Splitter on the right of sidebar -->
   <splitter id="sidebar-splitter" collapse="before" persist="state hidden"
--- a/suite/common/tasksOverlay.xul
+++ b/suite/common/tasksOverlay.xul
@@ -1,14 +1,14 @@
-<?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://communicator/skin/tasksOverlay.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://communicator/skin/tasksOverlay.css" type="text/css"?>
 
 <!DOCTYPE overlay [
 <!ENTITY % tasksDTD SYSTEM "chrome://communicator/locale/tasksOverlay.dtd" >
 %tasksDTD;
 ]>
 
 <overlay id="tasksOverlay"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -104,12 +104,12 @@
 
           <!-- Overlays get stuffed in here. -->
           <menuseparator id="sep-window-list"/>
         </menupopup>
       </menu>
 
 
   <statusbarpanel id="component-bar" persist="collapsed">
-    <toolbarbutton class="taskbutton" id="mini-nav" oncommand="toNavigator();" 
+    <toolbarbutton class="taskbutton" id="mini-nav" oncommand="toNavigator();"
                    tooltiptext="&taskNavigator.tooltip;"/>
-  </statusbarpanel> 
+  </statusbarpanel>
 </overlay>
--- a/suite/common/unix/platformCommunicatorOverlay.xul
+++ b/suite/common/unix/platformCommunicatorOverlay.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/. -->
 
 <!-- unix version of platformCommunicatorOverlay.xul -->
 
 <!DOCTYPE overlay [
 
@@ -24,23 +24,23 @@
 
     <!-- quit -->
     <menupopup id="menu_FilePopup">
       <menuseparator id="menu_FileQuitSeparator"/>
       <menuitem label="&quitApplicationCmd.label;" id="menu_FileQuitItem"
                 key="key_quit" accesskey="&quitApplicationCmd.accesskey;" command="cmd_quit"/>
     </menupopup>
     <key id="key_quit"  key="&quitApplicationCmd.key;" command="cmd_quit" modifiers="accel"/>
-  
+
     <!-- Edit Menu -->
     <key id="key_redo"  key="&redoCmd.key;" command="cmd_redo" modifiers="accel"/>
 
     <!-- Select All Key -->
     <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="alt"/>
-	
+
 	<!-- Delete Key -->
   <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
 
   <keyset id="findKeys">
     <key keycode="&findCmd.key2;"
          command="cmd_find"/>
     <key id="key_findReplace"
          key="&findReplaceCmd.key;"
--- a/suite/common/utilityOverlay.xul
+++ b/suite/common/utilityOverlay.xul
@@ -33,17 +33,17 @@
     <stringbundle id="bundle_utilityOverlay"
                   src="chrome://communicator/locale/utilityOverlay.properties"/>
   </stringbundleset>
 
 <broadcasterset id="mainBroadcasterSet">
   <broadcaster id="cmd_CustomizeToolbars"/>
 </broadcasterset>
 
-  <!-- online/offline status indicators -->   
+  <!-- online/offline status indicators -->
   <broadcaster id="Communicator:WorkMode"
                label="&offlineGoOfflineCmd.label;"
                type="checkbox"
                oncommand="toggleOfflineStatus();"/>
 
   <menupopup id="networkProperties" onpopupshown="InitProxyMenu();">
     <menuitem id="network-proxy-no"
               type="radio"
@@ -175,17 +175,17 @@
   <menuitem id="menu_newEditorTemplate"
             label="&newPageFromTemplateCmd.label;"
             accesskey="&newPageFromTemplateCmd.accesskey;"
             command="cmd_newEditorTemplate"/>
   <menuitem id="menu_newEditorDraft"
             label="&newPageFromDraftCmd.label;"
             accesskey="&newPageFromDraftCmd.accesskey;"
             command="cmd_newEditorDraft"/>
- 
+
   <menu id="menu_New"
         label="&newMenu.label;"
         accesskey="&newMenu.accesskey;"/>
 
   <menuitem id="menu_newNavigator"
             label="&newNavigatorCmd.label;"
             accesskey="&newNavigatorCmd.accesskey;"
             key="key_newNavigator"
@@ -304,17 +304,17 @@
             key="key_findTypeText"
             accesskey="&findTypeTextCmd.accesskey;"
             command="cmd_findTypeText"/>
   <menuitem id="menu_findTypeLinks"
             label="&findTypeLinksCmd.label;"
             key="key_findTypeLinks"
             accesskey="&findTypeLinksCmd.accesskey;"
             command="cmd_findTypeLinks"/>
-  <menuitem id="textfieldDirection-swap" 
+  <menuitem id="textfieldDirection-swap"
             label="&bidiSwitchTextDirectionItem.label;"
             key="key_switchTextDirection"
             accesskey="&bidiSwitchTextDirectionItem.accesskey;"
             command="cmd_switchTextDirection"/>
 
   <!-- Context Menu Overlay -->
   <menuitem id="context-undo"
             accesskey="&undoCmd.accesskey;"
@@ -418,21 +418,21 @@
            valueDefault="&deleteCmd.label;"
            valueDefaultAccessKey="&deleteCmd.accesskey;"
            disabled="true"/>
   <command id="cmd_selectAll"
            oncommand="goDoCommand('cmd_selectAll')"
            disabled="true"/>
   <command id="cmd_switchTextDirection"
            oncommand="goDoCommand('cmd_switchTextDirection');"/>
-  <command id="cmd_findTypeText" 
+  <command id="cmd_findTypeText"
            oncommand="findTextAsYouType();"/>
-  <command id="cmd_findTypeLinks" 
+  <command id="cmd_findTypeLinks"
            oncommand="findLinksAsYouType();"/>
-        
+
   <!-- Not needed yet, window will need this: -->
   <!-- broadcaster id="cmd_preferences"/ -->
 
   <menuitem id="menu_preferences"
             label="&preferencesCmd.label;"
             key="key_preferences"
             accesskey="&preferencesCmd.accesskey;"/>
 
--- a/suite/common/win/platformCommunicatorOverlay.xul
+++ b/suite/common/win/platformCommunicatorOverlay.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/. -->
 
 <!-- win version of platformCommunicatorOverlay.xul -->
 
 <!DOCTYPE overlay [
 
@@ -24,23 +24,23 @@
 
   <!-- quit -->
   <menupopup id="menu_FilePopup">
     <menuseparator id="menu_FileQuitSeparator"/>
     <menuitem label="&quitApplicationCmd.label;" id="menu_FileQuitItem"
               key="key_quit" accesskey="&quitApplicationCmd.accesskey;" command="cmd_quit"/>
   </menupopup>
   <key id="key_quit"  key="&quitApplicationCmd.key;" command="cmd_quit" modifiers="accel"/>
-  
+
   <!-- Edit Menu -->
   <key id="key_redo"  key="&redoCmd.key;" command="cmd_redo" modifiers="accel"/>
 
   <!-- Select All Key -->
   <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
-  
+
   <!-- Delete Key -->
   <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
 
   <!-- Keyset for find keys -->
   <keyset id="findKeys">
     <key id="key_findReplace"
          key="&findReplaceCmd.key;"
          modifiers="accel"
@@ -86,9 +86,9 @@
   <toolbar id="mail-toolbar-menubar2"
            toolbarname="&menubarCmd.label;"
            accesskey="&menubarCmd.accesskey;"/>
 
   <toolbar id="placesToolbar"
            toolbarname="&menubarCmd.label;"
            accesskey="&menubarCmd.accesskey;"/>
 
-</overlay>    
+</overlay>
--- a/suite/debugQA/content/debugQANavigatorOverlay.xul
+++ b/suite/debugQA/content/debugQANavigatorOverlay.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/. -->
 
 <overlay id="debugQANavigatorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
--- a/suite/debugQA/content/debugQAPrefsOverlay.xul
+++ b/suite/debugQA/content/debugQAPrefsOverlay.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/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://debugQA/locale/debugQAPrefsOverlay.dtd" >
 
 <overlay id="debugQAPrefsOverlay"
--- a/suite/debugQA/content/pref-debug.xul
+++ b/suite/debugQA/content/pref-debug.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://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://debugQA/locale/pref-debug.dtd" >
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -45,17 +45,17 @@
                 label="&debugConsoleJavascript.label;"
                 preference="javascript.options.showInConsole"/>
       <checkbox id="nglayoutUseNativePrintDialog" label="&useNativePrintDialog.label;"
                 preference="print.use_native_print_dialog"/>
       <checkbox id="printUseGlobalPrintSettings" label="&printUseGlobalPrintSettings.label;"
                 preference="print.use_global_printsettings"/>
       <checkbox id="dynamicSkinSwitching" label="&dynamicSkinSwitching.label;"
                 preference="extensions.dss.enabled"/>
-    </groupbox>              
+    </groupbox>
 
 
     <groupbox>
       <caption label="&accelerators.label;"/>
       <description value="&acceleratorsBlurb.label;"/>
       <hbox align="center">
             <label value="&acceleratorKey.label;" control="acceleratorKeyValue"
                    accesskey="&acceleratorKey.accesskey;"/>
--- a/suite/debugQA/content/pref-debug1.xul
+++ b/suite/debugQA/content/pref-debug1.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://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://debugQA/locale/pref-debug1.dtd" >
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -33,32 +33,32 @@
                   name="layout.reflow.dumpframecounts" type="bool"/>
       <preference id="layout.reflow.dumpframebyframecounts"
                   name="layout.reflow.dumpframebyframecounts" type="bool"/>
     </preferences>
 
     <!-- nothing on this page has accesskeys because this is a temporary debug
          panel and you can damn well click the widgets! -->
 
-    <!-- Event Debugging -->  
+    <!-- Event Debugging -->
     <groupbox>
       <caption label="&debugEventDebugging.label;"/>
       <vbox align="start">
         <checkbox id="nglayoutDebugPaintFlashing" label="&debugPaintFlashing.label;"
                   preference="nglayout.debug.paint_flashing"/>
         <checkbox id="nglayoutDebugPaintFlashingChrome"
                   label="&debugPaintFlashingChrome.label;"
                   preference="nglayout.debug.paint_flashing_chrome"/>
         <checkbox id="nglayoutDebugPaintDumping" label="&debugPaintDumping.label;"
                   preference="nglayout.debug.paint_dumping"/>
         <checkbox id="nglayoutDebugInvalidateDumping"
                   label="&debugInvalidateDumping.label;"
                   preference="nglayout.debug.invalidate_dumping"/>
         <checkbox id="nglayoutDebugEventDumping" label="&debugEventDumping.label;"
-                  preference="nglayout.debug.event_dumping"/>              
+                  preference="nglayout.debug.event_dumping"/>
         <checkbox id="nglayoutDebugMotionEventDumping"
                   label="&debugMotionEventDumping.label;"
                   preference="nglayout.debug.motion_event_dumping"/>
         <checkbox id="nglayoutDebugCrossingEventDumping"
                   label="&debugCrossingEventDumping.label;"
                   preference="nglayout.debug.crossing_event_dumping"/>
       </vbox>
     </groupbox>
--- a/suite/debugQA/content/pref-debug2.xul
+++ b/suite/debugQA/content/pref-debug2.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://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://debugQA/locale/pref-debug2.dtd" >
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -33,17 +33,17 @@
                  when they don't actually get results -->
             <!-- <radio value="1" label="&raw.label;"/> -->
             <radio value="2" label="&html.label;"/>
             <!-- OK, this is application/http-index-format, not XUL. But the
                  result is that the XUL viwer is used. Anyway, this is only a
                  debug panel, so lets not get worked up about it -->
             <radio value="3" label="&xul.label;"/>
           </radiogroup>
-        </vbox>         
+        </vbox>
       </vbox>
     </groupbox>
 
     <groupbox>
       <caption label="&debugCache.label;"/>
       <vbox align="start">
         <checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;"
                   preference="nglayout.debug.disable_xul_cache"/>
--- a/suite/mailnews/addrbook/abCardOverlay.xul
+++ b/suite/mailnews/addrbook/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/suite/mailnews/addrbook/abEditListDialog.xul
+++ b/suite/mailnews/addrbook/abEditListDialog.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/" type="text/css"?>
 
 <?xul-overlay href="chrome://messenger/content/addressbook/abListOverlay.xul"?>
 
@@ -14,10 +14,10 @@
         id="ablistWindow"
         title="&mailListWindow.title;"
         onload="OnLoadEditList()"
         ondialogaccept="return EditListOKButton();"
         ondragover="DragOverAddressListTree(event);"
         ondrop="DropOnAddressListTree(event);">
 
   <stringbundleset id="stringbundleset"/>
-  <vbox id="editlist" flex="1"/>		
+  <vbox id="editlist" flex="1"/>
 </dialog>
--- a/suite/mailnews/addrbook/abMailListDialog.xul
+++ b/suite/mailnews/addrbook/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/" type="text/css"?>
 
 <?xul-overlay href="chrome://messenger/content/addressbook/abListOverlay.xul"?>
 
--- a/suite/mailnews/addrbook/abSelectAddressesDialog.xul
+++ b/suite/mailnews/addrbook/abSelectAddressesDialog.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/selectAddressesDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://messenger/content/addressbook/abResultsPaneOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
@@ -30,62 +30,62 @@
   <stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
   <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
   <script type="application/javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
   <script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
   <script type="application/javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <vbox flex="1">
-  
+
     <hbox id="topBox" align="center">
       <label value="&lookIn.label;" accesskey="&lookIn.accesskey;" control="addressbookList"/>
-      <menulist id="addressbookList" 
+      <menulist id="addressbookList"
                 oncommand="DirPaneSelectionChangeMenulist(); document.commandDispatcher.updateCommands('addrbook-select');">
         <menupopup id="addressbookList-menupopup" class="addrbooksPopup"/>
-      </menulist>  
+      </menulist>
       <label value="&for.label;" accesskey="&for.accesskey;" control="searchInput"/>
       <textbox id="searchInput" flex="1" type="search"
                aria-controls="abResultsTree"
                placeholder="&for.placeholder;"
                oncommand="onEnterInSearchBar();" clickSelectsAll="true"/>
     </hbox>
-    
-    <hbox flex="1">    
+
+    <hbox flex="1">
 
       <vbox id="resultsBox" flex="4">
         <tree id="abResultsTree" flex="1" persist="height"/>
       </vbox>
 
       <vbox id="addToBucketButtonBox">
         <spacer flex="1"/>
-        <button id="toButton" label="&toButton.label;" accesskey="&toButton.accesskey;" oncommand="SelectAddressToButton()"/> 
+        <button id="toButton" label="&toButton.label;" accesskey="&toButton.accesskey;" oncommand="SelectAddressToButton()"/>
         <spacer class="middle-button-spacer"/>
-        <button id="ccButton" label="&ccButton.label;" accesskey="&ccButton.accesskey;" oncommand="SelectAddressCcButton()"/> 
+        <button id="ccButton" label="&ccButton.label;" accesskey="&ccButton.accesskey;" oncommand="SelectAddressCcButton()"/>
         <spacer class="middle-button-spacer"/>
-        <button id="bccButton" label="&bccButton.label;" accesskey="&bccButton.accesskey;" oncommand="SelectAddressBccButton()"/>  
+        <button id="bccButton" label="&bccButton.label;" accesskey="&bccButton.accesskey;" oncommand="SelectAddressBccButton()"/>
         <spacer class="above-remove-spacer"/>
-        <button id="remove" label="&removeButton.label;" accesskey="&removeButton.accesskey;" class="dialog" oncommand="RemoveSelectedFromBucket()"/> 
+        <button id="remove" label="&removeButton.label;" accesskey="&removeButton.accesskey;" class="dialog" oncommand="RemoveSelectedFromBucket()"/>
         <spacer flex="1"/>
       </vbox>
 
       <vbox id="bucketBox" flex="1">
         <label value="&addressMessageTo.label;" control="addressBucket"/>
         <tree id="addressBucket" flex="1" hidecolumnpicker="true"
             ondragover="DragAddressOverTargetControl(event);"
             ondrop="DropAddressOverTargetControl(event);"
             onselect="DialogBucketPaneSelectionChanged();">
           <treecols>
             <treecol id="addressCol" flex="1" hideheader="true"/>
           </treecols>
           <treechildren id="bucketBody" flex="1"/>
         </tree>
       </vbox>
-        
+
     </hbox>
 
     <hbox id="newEditButtonBox">
-      <button id="new" label="&newButton.label;" accesskey="&newButton.accesskey;" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard();"/> 
-      <button id="edit" label="&editButton.label;" accesskey="&editButton.accesskey;" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditSelectedCard()"/> 
+      <button id="new" label="&newButton.label;" accesskey="&newButton.accesskey;" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard();"/>
+      <button id="edit" label="&editButton.label;" accesskey="&editButton.accesskey;" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditSelectedCard()"/>
     </hbox>
   </vbox>
-  
+
 </dialog>
--- a/suite/mailnews/addrbook/addressbook-panel.xul
+++ b/suite/mailnews/addrbook/addressbook-panel.xul
@@ -54,40 +54,40 @@
     <menuitem label="&newAddrBookCard.label;" accesskey="&newAddrBookCard.accesskey;" oncommand="AbPanelNewCard();"/>
     <menuitem label="&newAddrBookMailingList.label;" accesskey="&newAddrBookMailingList.accesskey;" command="cmd_newlist"/>
     <menuseparator/>
     <menuitem label="&addrBookCardProperties.label;" accesskey="&addrBookCardProperties.accesskey;" command="cmd_properties"/>
   </menupopup>
   <vbox id="results_box" flex="1">
     <hbox id="panel-bar" class="toolbar" align="center">
 	  <label value="&lookIn.label;" control="addressbookList" id="lookInLabel"/>
-      <menulist id="addressbookList" 
+      <menulist id="addressbookList"
                 oncommand="DirPaneSelectionChangeMenulist();" flex="1"
                 persist="value">
         <menupopup id="addressbookList-menupopup" class="addrbooksPopup"/>
       </menulist>
     </hbox>
 	<hbox align="center">
-	  <label value="&for.label;" id="forLabel" control="searchInput"/> 
+	  <label value="&for.label;" id="forLabel" control="searchInput"/>
 	  <textbox id="searchInput" flex="1" type="search"
                aria-labelledby="lookInLabel addressbookList forLabel"
                aria-controls="abResultsTree"
                placeholder="&for.placeholder;"
                oncommand="onEnterInSearchBar();" clickSelectsAll="true"/>
 	</hbox>
 
     <tree id="abResultsTree" flex="1" context="composeMail" onclick="AbResultsPaneOnClick(event);" class="plain"
           sortCol="GeneratedName" persist="sortCol">
   <treecols>
     <!-- these column ids must match up to the mork column names, see nsIAddrDatabase.idl -->
     <treecol id="GeneratedName"
           persist="hidden ordinal width sortDirection" flex="1" label="&GeneratedName.label;" primary="true"/>
     <splitter class="tree-splitter"/>
     <treecol id="PrimaryEmail"
-          persist="hidden ordinal width sortDirection" 
+          persist="hidden ordinal width sortDirection"
       hiddenbydefault="true"
       flex="1" label="&PrimaryEmail.label;"/>
   </treecols>
   <treechildren ondragstart="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
 </tree>
 
   </vbox>
 </page>
--- a/suite/mailnews/addrbook/addressbook.xul
+++ b/suite/mailnews/addrbook/addressbook.xul
@@ -1,14 +1,14 @@
-<?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"?>
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressPanes.css"
                  type="text/css"?>
 
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/addressbook/abResultsPaneOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/platformMailOverlay.xul"?>
@@ -60,17 +60,17 @@
 <script type="application/javascript" src="chrome://messenger/content/msgPrintEngine.js"/>
 <script type="application/javascript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
 
   <commandset id="addressBook">
     <commandset id="CommandUpdate_AddressBook"
                 commandupdater="true"
                 events="focus,addrbook-select"
                 oncommandupdate="CommandUpdate_AddressBook()"/>
-    <commandset id="selectEditMenuItems"/> 
+    <commandset id="selectEditMenuItems"/>
     <commandset id="undoEditMenuItems"/>
     <commandset id="globalEditMenuItems"/>
     <command id="cmd_newNavigator"/>
     <command id="cmd_newPrivateWindow"/>
     <command id="cmd_newEditor"/>
     <command id="cmd_newcard" oncommand="AbNewCard();"/>
     <command id="cmd_newlist" oncommand="AbNewList();"/>
     <command id="cmd_newMessage" oncommand="AbNewMessage();"/>
@@ -338,35 +338,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="&ScreenName.label;"
                                   id="cmd_SortBy_AimScreenName"
                                   accesskey="&ScreenName.accesskey;"
                                   oncommand="SortResultPane('_AimScreenName');" 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"
@@ -405,22 +405,22 @@
                                   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">
           <menupopup id="taskPopup">
-            <menuitem label="&searchAddressesCmd.label;" 
+            <menuitem label="&searchAddressesCmd.label;"
                       accesskey="&searchAddressesCmd.accesskey;"
-                      id="menu_search_addresses" 
+                      id="menu_search_addresses"
                       oncommand="onAdvancedAbSearch();"/>
             <menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="toImport()"/>
             <menuitem label="&exportCmd.label;"
                       accesskey="&exportCmd.accesskey;"
                       oncommand="AbExportSelection();"/>
             <menuseparator/>
           </menupopup>
         </menu>
@@ -531,26 +531,26 @@
         </treecols>
         <treechildren/>
       </tree>
     </vbox>
 
     <splitter id="dirTree-splitter" collapse="before" persist="state">
       <grippy/>
     </splitter>
-    
+
     <vbox flex="1" style="min-width:100px">
 
       <!-- results pane -->
       <tree id="abResultsTree" context="abResultsTreeContext" flex="1" />
-      
+
       <splitter id="results-splitter" collapse="after" persist="state">
         <grippy/>
       </splitter>
-      
+
       <!-- card view -->
       <hbox id="CardViewOuterBox" flex="1" persist="height">
         <vbox id="CardViewBox"
               flex="1"
               style="height:170px; min-height:1px; min-width:1px">
           <vbox id="CardViewInnerBox" collapsed="true" flex="1">
             <description id="CardTitle"/>
             <hbox style="width:100%" flex="1">
@@ -673,12 +673,12 @@
         </vbox>
       </hbox>
     </vbox>
   </hbox>
 
   <panel id="customizeToolbarSheetPopup"/>
   <statusbar id="status-bar" class="chromeclass-status">
     <statusbarpanel id="component-bar"/>
-    <statusbarpanel id="statusText" flex="1" value="&statusText.label;"/>  
-    <statusbarpanel id="offline-status" class="statusbarpanel-iconic"/>           
-  </statusbar>  
+    <statusbarpanel id="statusText" flex="1" value="&statusText.label;"/>
+    <statusbarpanel id="offline-status" class="statusbarpanel-iconic"/>
+  </statusbar>
 </window>
--- a/suite/mailnews/compose/addressingWidgetOverlay.xul
+++ b/suite/mailnews/compose/addressingWidgetOverlay.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/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/messengercompose/addressingWidgetOverlay.dtd">
 
 
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -22,17 +22,17 @@
     <listcols>
       <listcol id="typecol-addressingWidget"/>
       <listcol id="textcol-addressingWidget" flex="1"/>
     </listcols>
 
     <listitem class="addressingWidgetItem" allowevents="true">
       <listcell class="addressingWidgetCell" align="stretch">
         <menulist id="addressCol1#1" disableonsend="true"
-                  class="aw-menulist menulist-compact" flex="1"  
+                  class="aw-menulist menulist-compact" flex="1"
                   onkeypress="awMenulistKeyPress(event, this)"
                   oncommand="gContentChanged=true; awSetAutoComplete(this.id.slice(this.id.lastIndexOf('#') + 1));">
           <menupopup>
             <menuitem value="addr_to" label="&toAddr.label;"/>
             <menuitem value="addr_cc" label="&ccAddr.label;"/>
             <menuitem value="addr_bcc" label="&bccAddr.label;"/>
             <menuitem value="addr_reply" label="&replyAddr.label;"/>
             <menuitem value="addr_newsgroups" label="&newsgroupsAddr.label;"/>
--- a/suite/mailnews/compose/mailComposeExtrasOverlay.xul
+++ b/suite/mailnews/compose/mailComposeExtrasOverlay.xul
@@ -1,12 +1,12 @@
 <!-- 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/. -->
 
 <overlay
   xmlns:nc="http://home.netscape.com/NC-rdf#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<!-- plug in your mail compose window extras here. 
+<!-- plug in your mail compose window extras here.
      see http://www.mozilla.org/mailnews/arch/composewindowextras.html -->
 
 </overlay>
--- a/suite/mailnews/compose/prefs/pref-composing_messages.xul
+++ b/suite/mailnews/compose/prefs/pref-composing_messages.xul
@@ -54,30 +54,30 @@
                   type="int"/>
       <preference id="mail.compose.default_to_paragraph"
                   name="mail.compose.default_to_paragraph"
                   type="bool"/>
     </preferences>
 
     <groupbox>
       <caption label="&generalComposing.label;"/>
-  
+
       <radiogroup id="forwardMessageMode"
                   orient="horizontal"
                   align="center"
                   preference="mail.forward_message_mode">
         <label value="&forwardMsg.label;" control="forwardMessageMode"/>
         <radio value="2"
                label="&inline.label;"
                accesskey="&inline.accesskey;"/>
         <radio value="0"
                label="&asAttachment.label;"
                accesskey="&asAttachment.accesskey;"/>
       </radiogroup>
-  
+
       <checkbox id="replyQuoteInline" label="&replyQuoteInline.label;"
                 preference="mail.reply_quote_inline"
                 accesskey="&replyQuoteInline.accesskey;"/>
 
       <hbox align="center">
         <checkbox id="autoSave" label="&autoSave.label;"
                   preference="mail.compose.autosave"
                   accesskey="&autoSave.accesskey;"
@@ -91,17 +91,17 @@
                  aria-labelledby="autoSave autoSaveInterval autoSaveEnd"/>
         <label id="autoSaveEnd" value="&autoSaveEnd.label;"/>
       </hbox>
 
       <checkbox id="mailWarnOnSendAccelKey"
                 label="&warnOnSendAccelKey.label;"
                 accesskey="&warnOnSendAccelKey.accesskey;"
                 preference="mail.warn_on_send_accel_key"/>
-  
+
       <hbox align="center">
         <label id="wrapOutLabel"
                value="&wrapOutMsg.label;"
                accesskey="&wrapOutMsg.accesskey;"
                control="wrapLength"/>
         <textbox id="wrapLength"
                  type="number"
                  min="0"
@@ -126,27 +126,27 @@
             <menuitem value="2"
                       label="&onDateAuthorWroteOption.label;"/>
             <menuitem value="3"
                       label="&authorWroteOnDateOption.label;"/>
           </menupopup>
         </menulist>
       </hbox>
     </groupbox>
-  
+
     <!-- Composing Mail -->
- 
+
     <groupbox align="start">
       <caption label="&defaultMessagesHeader.label;"/>
       <grid>
         <columns>
           <column/>
           <column/>
         </columns>
-    
+
         <rows>
           <row align="center">
             <label value="&font.label;"
                    accesskey="&font.accesskey;"
                    control="fontSelect"/>
             <menulist id="fontSelect" preference="msgcompose.font_face">
               <menupopup>
                 <menuitem value=""
--- a/suite/mailnews/mac/platformMailnewsOverlay.xul
+++ b/suite/mailnews/mac/platformMailnewsOverlay.xul
@@ -1,17 +1,17 @@
-<?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/. -->
 
 <!-- mac version of platformMailnewsOverlay.xul -->
 
 <overlay id="platformMailnewsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Delete Key -->
   <!-- not all Mac keyboards have a VK_DELETE key, so we use VK_BACK as
        the primary and provide VK_DELETE as a secondary key definition -->
 	<key id="key_shiftDelete"  keycode="VK_BACK"   modifiers="shift" command="cmd_shiftDelete"/>
 	<key id="key_shiftDelete2" keycode="VK_DELETE" modifiers="shift" command="cmd_shiftDelete"/>
 
-</overlay>	
+</overlay>
--- a/suite/mailnews/mailEditorOverlay.xul
+++ b/suite/mailnews/mailEditorOverlay.xul
@@ -36,26 +36,26 @@
           var composeService = Components.classes["@mozilla.org/messengercompose;1"].getService(Components.interfaces.nsIMsgComposeService);
           if (composeService)
             composeService.OpenComposeWindowWithParams(null, params);
         }
       }
     }
 
   ]]>
-  </script>         
+  </script>
 
   <!-- editor specific UI items -->
   <menupopup id="menu_NewPopup">
     <!-- Command nodes and implemention are in mailOverlay.xul -->
     <menuitem id="menu_newMessage" insertafter="menu_newPrivateWindow"/>
     <menuitem id="menu_newCard" insertafter="menu_newPrivateWindow"/>
   </menupopup>
 
   <menupopup id="menu_FilePopup">
-    <!-- The command node cmd_editSendPage is in editor.xul. 
+    <!-- The command node cmd_editSendPage is in editor.xul.
          Implementation is in ComposerCommands.js
     -->
     <menuitem id="menu_sendPage" label="&sendPage.label;" accesskey="&sendPage.accesskey;" observes="cmd_editSendPage" insertafter="previewInBrowser"/>
   </menupopup>
 
 </overlay>
 
--- a/suite/mailnews/mailOverlay.xul
+++ b/suite/mailnews/mailOverlay.xul
@@ -7,18 +7,18 @@
 <!-- platform specific commands -->
 <?xul-overlay href="chrome://navigator/content/platformMailOverlay.xul"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
 <overlay id="mailOverlay.xul"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/javascript" src="chrome://messenger/content/mailOverlay.js"/>
-         
-  <!-- generic commands -->  
+
+  <!-- generic commands -->
   <commandset id="tasksCommands">
     <command id="cmd_newMessage" oncommand="goOpenNewMessage();"/>
     <command id="cmd_newCard" oncommand="openNewCardDialog()"/>
   </commandset>
   <menuitem id="menu_newCard" label="&newContactCmd.label;"
             accesskey="&newContactCmd.accesskey;" command="cmd_newCard"/>
   <menuitem id="menu_newMessage" label="&newMessageCmd.label;" accesskey="&newMessageCmd.accesskey;" key="key_newMessage" command="cmd_newMessage"/>
   <keyset id="tasksKeys">
--- a/suite/mailnews/mailTasksOverlay.xul
+++ b/suite/mailnews/mailTasksOverlay.xul
@@ -56,10 +56,10 @@
     <menuitem id="tasksMenuAddressBook"
               class="menuitem-iconic icon-addressbook16 menu-iconic"
               label="&addressBookCmd.label;"
               accesskey="&addressBookCmd.accesskey;"
               key="key_addressbook"
               command="Tasks:AddressBook"
               insertafter="tasksMenuEditor"/>
   </menupopup>
-  
+
 </overlay>
--- a/suite/mailnews/mailViewSetup.xul
+++ b/suite/mailnews/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/suite/mailnews/mailWindowOverlay.xul
+++ b/suite/mailnews/mailWindowOverlay.xul
@@ -1257,56 +1257,56 @@
           <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="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, disallow_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, disallow_classes_no_html)"/>
           <menuseparator id="viewFeedSummarySeparator"/>
-          <menuitem id="bodyFeedGlobalWebPage" 
-                    type="radio" 
+          <menuitem id="bodyFeedGlobalWebPage"
+                    type="radio"
                     name="viewFeedSummaryGroup"
-                    label="&viewFeedWebPage.label;" 
+                    label="&viewFeedWebPage.label;"
                     accesskey="&viewFeedWebPage.accesskey;"
                     oncommand="ChangeFeedShowSummaryPref(0)"/>
-          <menuitem id="bodyFeedGlobalSummary" 
-                    type="radio" 
+          <menuitem id="bodyFeedGlobalSummary"
+                    type="radio"
                     name="viewFeedSummaryGroup"
-                    label="&viewFeedSummary.label;" 
+                    label="&viewFeedSummary.label;"
                     accesskey="&viewFeedSummary.accesskey;"
                     oncommand="ChangeFeedShowSummaryPref(1)"/>
-          <menuitem id="bodyFeedPerFolderPref" 
-                    type="radio" 
+          <menuitem id="bodyFeedPerFolderPref"
+                    type="radio"
                     name="viewFeedSummaryGroup"
-                    label="&viewFeedSummaryFeedPropsPref.label;" 
+                    label="&viewFeedSummaryFeedPropsPref.label;"
                     accesskey="&viewFeedSummaryFeedPropsPref.accesskey;"
                     oncommand="ChangeFeedShowSummaryPref(2)"/>
         </menupopup>
       </menu>
       <menuitem id="viewAttachmentsInlineMenuitem"
                 type="checkbox"
                 checked="true"
                 label="&viewAttachmentsInlineCmd.label;"
@@ -1509,35 +1509,35 @@
                 accesskey="&editMsgAsNewCmd.accesskey;"
                 key="key_editAsNew"
                 command="cmd_editAsNew"/>
       <menuitem id="openMessageWindowMenuitem"
                 label="&openMessageWindowCmd.label;"
                 command="cmd_openMessage"
                 accesskey="&openMessageWindowCmd.accesskey;"
                 key="key_openMessage" observes="mailHideMenus"/>
-      <menu id="openFeedMessage" 
-            label="&openFeedMessage.label;" 
+      <menu id="openFeedMessage"
+            label="&openFeedMessage.label;"
             accesskey="&openFeedMessage.accesskey;">
         <menupopup id="menu_openFeedMessage">
-          <menuitem id="menu_openFeedWebPageInWindow" 
+          <menuitem id="menu_openFeedWebPageInWindow"
                     type="radio"
-                    name="openFeedGroup" 
+                    name="openFeedGroup"
                     label="&openFeedWebPageInWindow.label;"
                     accesskey="&openFeedWebPageInWindow.accesskey;"
                     oncommand="ChangeFeedOpenHandler(0);"/>
-          <menuitem id="menu_openFeedSummaryInWindow" 
+          <menuitem id="menu_openFeedSummaryInWindow"
                     type="radio"
-                    name="openFeedGroup" 
+                    name="openFeedGroup"
                     label="&openFeedSummaryInWindow.label;"
                     accesskey="&openFeedSummaryInWindow.accesskey;"
                     oncommand="ChangeFeedOpenHandler(1);"/>
-          <menuitem id="menu_openFeedWebPageInMessagePane" 
+          <menuitem id="menu_openFeedWebPageInMessagePane"
                     type="radio"
-                    name="openFeedGroup" 
+                    name="openFeedGroup"
                     label="&openFeedWebPageInMP.label;"
                     accesskey="&openFeedWebPageInMP.accesskey;"
                     oncommand="ChangeFeedOpenHandler(2);"/>
         </menupopup>
       </menu>
      <menuseparator id="messageAfterOpenMsgSeparator"/>
      <menu id="msgAttachmentMenu" label="&openAttachmentCmd.label;"
            accesskey="&openAttachmentCmd.accesskey;" disabled="true">
--- a/suite/mailnews/messageWindow.xul
+++ b/suite/mailnews/messageWindow.xul
@@ -1,13 +1,13 @@
-<?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/messageWindow.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://messenger/skin/messageWindow.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
--- a/suite/mailnews/msgFolderPickerOverlay.xul
+++ b/suite/mailnews/msgFolderPickerOverlay.xul
@@ -20,17 +20,17 @@
     <menulist id="runFiltersFolder"
               containment="http://home.netscape.com/NC-rdf#child"
               sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
               sortDirection="ascending"
               datasources="rdf:msgaccountmanager rdf:mailnewsfolders">
       <template>
         <rule nc:NoSelect="false" iscontainer="true" isempty="false">
           <menupopup>
-              <menu uri="..." 
+              <menu uri="..."
                 class="folderMenuItem menu-iconic"
                 oncommand="PickedMsgFolder(event.target,'runFiltersFolder')"
                 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
                 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
                 IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
                 ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
                 label="rdf:http://home.netscape.com/NC-rdf#Name">
@@ -54,17 +54,17 @@
                ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
                label="rdf:http://home.netscape.com/NC-rdf#Name">
                 <menupopup class="menulist-menupopup"/>
               </menu>
           </menupopup>
         </rule>
         <rule nc:NoSelect="false">
           <menupopup>
-             <menuitem uri="..." value="..."  
+             <menuitem uri="..." value="..."
               class="folderMenuItem menuitem-iconic"
               oncommand="PickedMsgFolder(event.target,'runFiltersFolder')"
               SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
               BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
               IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
               IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
               ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
               label="rdf:http://home.netscape.com/NC-rdf#Name"/>
--- a/suite/mailnews/msgHdrViewOverlay.xul
+++ b/suite/mailnews/msgHdrViewOverlay.xul
@@ -90,31 +90,31 @@
   <menuitem id="context-saveAttachment" label="&saveAsAttachmentCmd.label;" accesskey="&saveAsAttachmentCmd.accesskey;"
      oncommand="handleAttachmentSelection('saveAttachment');"/>
   <menuseparator/>
   <menuitem id="context-detachAttachment" label="&detachAttachmentCmd.label;" accesskey="&detachAttachmentCmd.accesskey;"
      oncommand="handleAttachmentSelection('detachAttachment');"/>
   <menuitem id="context-deleteAttachment" label="&deleteAttachmentCmd.label;" accesskey="&deleteAttachmentCmd.accesskey;"
      oncommand="handleAttachmentSelection('deleteAttachment');"/>
   <menuseparator/>
-  <menuitem id="context-saveAllAttachments" oncommand="HandleMultipleAttachments('saveAttachment', currentAttachments);" 
+  <menuitem id="context-saveAllAttachments" oncommand="HandleMultipleAttachments('saveAttachment', currentAttachments);"
     label="&saveAllAttachmentsCmd.label;" accesskey="&saveAllAttachmentsCmd.accesskey;"/>
-  <menuitem id="context-detachAllAttachments" oncommand="HandleMultipleAttachments('detachAttachment', currentAttachments);" 
+  <menuitem id="context-detachAllAttachments" oncommand="HandleMultipleAttachments('detachAttachment', currentAttachments);"
     label="&detachAllAttachmentsCmd.label;" accesskey="&detachAllAttachmentsCmd.accesskey;"/>
-  <menuitem id="context-deleteAllAttachments" oncommand="HandleMultipleAttachments('deleteAttachment', currentAttachments);" 
+  <menuitem id="context-deleteAllAttachments" oncommand="HandleMultipleAttachments('deleteAttachment', currentAttachments);"
     label="&deleteAllAttachmentsCmd.label;" accesskey="&deleteAllAttachmentsCmd.accesskey;"/>
 </menupopup>
 
 <menupopup id="attachmentMenuList">
   <menuseparator/>
-  <menuitem id="file-saveAllAttachments" label="&saveAllAttachmentsCmd.label;" 
+  <menuitem id="file-saveAllAttachments" label="&saveAllAttachmentsCmd.label;"
     accesskey="&saveAllAttachmentsCmd.accesskey;" oncommand="HandleMultipleAttachments('saveAttachment', currentAttachments);"/>
-  <menuitem id="file-detachAllAttachments" label="&detachAllAttachmentsCmd.label;" 
+  <menuitem id="file-detachAllAttachments" label="&detachAllAttachmentsCmd.label;"
     accesskey="&detachAllAttachmentsCmd.accesskey;" oncommand="HandleMultipleAttachments('detachAttachment', currentAttachments);" />
-  <menuitem id="file-deleteAllAttachments" label="&deleteAllAttachmentsCmd.label;" 
+  <menuitem id="file-deleteAllAttachments" label="&deleteAllAttachmentsCmd.label;"
     accesskey="&deleteAllAttachmentsCmd.accesskey;" oncommand="HandleMultipleAttachments('deleteAttachment', currentAttachments);" />
 </menupopup>
 
 <menupopup id="copyUrlPopup">
   <menuitem label="&openInBrowser.label;"
             accesskey="&openInBrowser.accesskey;"
             oncommand="openAsExternal(document.popupNode.getAttribute('value'));"/>
   <menuitem label="&bookmarkLinkCmd.label;"
@@ -133,17 +133,17 @@
   </rows>
   <columns>
     <column class="collapsedToggleHdrBox">
       <hbox align="start">
         <image id="toggleHeaderView" class="collapsedHeaderViewButton"
           onclick="ToggleHeaderView();"/>
       </hbox>
     </column>
-      
+
     <column id="collapsedsubjectBox" collapsed="true" flex="1">
       <hbox>
         <label class="collapsedHeaderDisplayName" value="&subjectField.label;" control="collapsedsubjectValue"/>
         <textbox id="collapsedsubjectValue" keywordrelated="true" class="collapsedHeaderValue plain" originalclass="collapsedHeaderValue plain" readonly="true" crop="right" appendoriginalclass="true" flex="1"/>
       </hbox>
     </column>
 
     <column id="collapsedfromBox" flex="1">
@@ -155,33 +155,33 @@
     <column id = "collapseddateBox" collapsed="true">
       <hbox align="start">
         <textbox id="collapseddateValue" keywordrelated="true" class="collapsedHeaderValue plain" originalclass="collapsedHeaderValue plain" appendoriginalclass="true" readonly="true"/>
       </hbox>
     </column>
 
     <column id="collapsedKeywordBox">
       <hbox align="start">
-      <image id="collapsedKeywordImage" keywordrelated="true" originalclass="none"/>  
+      <image id="collapsedKeywordImage" keywordrelated="true" originalclass="none"/>
       </hbox>
     </column>
 
     <column id="collapsedAttachmentBox" collapsed="true">
       <hbox align="start">
-      <image id="collapsedAttachment" class="collapsedAttachmentButton" onclick="ToggleHeaderView();" />  
+      <image id="collapsedAttachment" class="collapsedAttachmentButton" onclick="ToggleHeaderView();" />
       </hbox>
     </column>
   </columns>
 </grid>
 
 <hbox id="expandedHeaderView" class="header-part1" keywordrelated="true" originalclass="header-part1" flex="1" collapsed="true">
 
   <vbox id="expandedHeaders" flex="1">
     <mail-toggle-headerfield keywordrelated="true" id="expandedsubjectBox" class="subjectvalue" label="&subjectField.label;" ontwistyclick="ToggleHeaderView();" collapsed="true"/>
-   
+
     <mail-multi-emailHeaderField id="expandedfromBox" label="&fromField.label;" collapsed="true"/>
     <mail-emailheaderfield id="expandedsenderBox" label="&senderField.label;" collapsed="true"/>
     <mail-headerfield id="expandedorganizationBox" label="&organizationField.label;" collapsed="true"/>
     <mail-multi-emailHeaderField id="expandedreply-toBox" label="&replyToField.label;" collapsed="true"/>
 
     <mail-headerfield keywordrelated="true" id="expandeddateBox" label="&dateField.label;" collapsed="true"/>
 
     <mail-multi-emailHeaderField id="expandedtoBox"  label="&toField.label;"  collapsed="true"/>
@@ -196,27 +196,27 @@
     <mail-tagfield id="expandedtagsBox" label="&tagsHdr.label;" collapsed="true"/>
     <mail-urlfield id="expandedcontent-baseBox" label="&originalWebsite.label;" collapsed="true"/>
     <mail-headerfield keywordrelated="true" id="expandeduser-agentBox"  label="&userAgentField.label;"  collapsed="true"/>
   </vbox>
 
   <vbox id="expandedKeywordBox">
     <spacer flex="1"/>
     <image id="expandedKeywordImage" keywordrelated="true" originalclass="none" />
-    <spacer flex="1"/>  
+    <spacer flex="1"/>
   </vbox>
-   
+
   <vbox id="editMessageBox" class="header-part1" keywordrelated="true" originalclass="header-part1" collapsed="true">
     <spacer flex="1"/>
     <button id="editMessageButton"
             label="&editMessage.label;"
             accesskey="&editMessage.accesskey;"
             oncommand="MsgComposeDraftMessage()"/>
     <spacer flex="1"/>
-  </vbox> 
+  </vbox>
 
   <vbox>
     <spacer flex="1"/>
     <image style="padding: 5px" id="fromBuddyIcon"/>
     <spacer flex="1"/>
   </vbox>
 
   <vbox id="expandedAttachmentBox" class="header-part1" keywordrelated="true" originalclass="header-part1" collapsed="true">
--- a/suite/mailnews/msgPrintEngine.xul
+++ b/suite/mailnews/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/" type="text/css"?>
 
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
@@ -15,17 +15,17 @@
         screenX="10" screenY="10"
         persist="width height screenX screenY sizemode"
         windowtype="mail:printEngine">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
-  
+
   <!-- Provide shortcut keys for toolkit's print preview; commands will be overridden by printUtils.js -->
   <key id="printKb"/>
   <key id="key_close"/>
 
   <script type="application/javascript"
           src="chrome://global/content/printUtils.js"/>
   <script type="application/javascript"
           src="chrome://global/content/globalOverlay.js"/>
--- a/suite/mailnews/msgSelectOffline.xul
+++ b/suite/mailnews/msgSelectOffline.xul
@@ -8,17 +8,17 @@
 
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/msgSynchronize.dtd" >
 <dialog	xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="select-offline" 
+        id="select-offline"
         title="&MsgSelect.label;"
         width="450" height="400"
         persist="width height"
         buttons="accept,cancel"
         onload="selectOnLoad();"
         ondialogaccept="return selectOkButton();"
         ondialogcancel="return selectCancelButton();">
 
@@ -68,30 +68,30 @@
                    object="?isSecure" />
             <binding subject="?member"
                    predicate="http://home.netscape.com/NC-rdf#ServerType"
                    object="?serverType" />
             <binding subject="?member"
                    predicate="http://home.netscape.com/NC-rdf#Synchronize"
                    object="?synchronize" />
           </bindings>
-             
+
           <action>
             <treechildren>
               <treeitem uri="?member">
                 <treerow>
                   <treecell label="?folderTreeName"
                                 properties="specialFolder-?specialFolder isServer-?isServer isSecure-?isSecure serverType-?serverType"/>
                   <treecell properties="synchronize-?synchronize isServer-?isServer"/>
                 </treerow>
               </treeitem>
             </treechildren>
           </action>
         </rule>
       </template>
       <treecols>
         <treecol id="folderNameCol" flex="5" persist="hidden width" label="&MsgSelectItems.label;" primary="true" />
-        <splitter class="tree-splitter"/>		  
+        <splitter class="tree-splitter"/>
         <treecol id="syncCol" flex="1" persist="hidden width" label="&MsgSelectInd.label;" cycler="true" />
       </treecols>
     </tree>
 
 </dialog>
--- a/suite/mailnews/prefs/pref-mailnews.xul
+++ b/suite/mailnews/prefs/pref-mailnews.xul
@@ -126,17 +126,17 @@
       <caption label="&messengerStartPage.caption;"/>
       <hbox align="center">
         <checkbox id="mailnewsStartPageEnabled" label="&enableStartPage.label;"
                   preference="mailnews.start_page.enabled"
                   accesskey="&enableStartPage.accesskey;"/>
       </hbox>
 
       <hbox align="center">
-        <label value="&location.label;" accesskey="&location.accesskey;" 
+        <label value="&location.label;" accesskey="&location.accesskey;"
                control="mailnewsStartPageUrl"/>
         <textbox id="mailnewsStartPageUrl" flex="1" type="autocomplete"
                  preference="mailnews.start_page.url" timeout="50"
                  autocompletesearch="history" maxrows="6" class="uri-element"/>
       </hbox>
       <hbox pack="end">
         <button label="&useDefault.label;" accesskey="&useDefault.accesskey;"
                 oncommand="setHomePageToDefaultPage();">
--- a/suite/mailnews/prefs/pref-offline.xul
+++ b/suite/mailnews/prefs/pref-offline.xul
@@ -32,47 +32,47 @@
                   onchange="EnableMailPurgeThreshhold(this.value);"/>
       <preference id="mail.purge_threshhold_mb"
                   name="mail.purge_threshhold_mb"
                   type="int"/>
     </preferences>
 
     <groupbox>
       <caption label="&pref.offline.caption;"/>
-    
+
       <hbox align="center">
         <label value="&textStartUp;" control="whenStartingUp"
                accesskey="&textStartUp.accesskey;"/>
         <menulist id="whenStartingUp" preference="offline.startup_state">
           <menupopup>
             <menuitem value="0" label="&menuitemRememberPrevState;"/>
             <menuitem value="1" label="&menuitemAskMe;"/>
             <menuitem value="2" label="&menuitemAlwaysOnline;"/>
             <menuitem value="3" label="&menuitemAlwaysOffline;"/>
             <menuitem value="4" label="&menuitemAutomatic;"/>
           </menupopup>
         </menulist>
       </hbox>
-    
+
       <separator/>
-    
+
       <label value="&textGoingOnline;" control="whengoingOnlinestate"/>
         <radiogroup id="whengoingOnlinestate"
                     orient="horizontal" class="indent"
                     preference="offline.send.unsent_messages">
           <radio value="1" label="&radioAutoSend;"
                  accesskey="&radioAutoSend.accesskey;"/>
           <radio value="2" label="&radioNotSend;"
                  accesskey="&radioNotSend.accesskey;"/>
           <radio value="0" label="&radioAskUnsent;"
                  accesskey="&radioAskUnsent.accesskey;"/>
         </radiogroup>
-    
+
       <separator/>
-    
+
       <label value="&textGoingOffline;" control="whengoingOfflinestate"/>
         <radiogroup id="whengoingOfflinestate"
                     orient="horizontal" class="indent"
                     preference="offline.download.download_messages">
           <radio value="1" label="&radioAutoDownload;"
                  accesskey="&radioAutoDownload.accesskey;"/>
           <radio value="2" label="&radioNotDownload;"
                  accesskey="&radioNotDownload.accesskey;"/>
--- a/suite/mailnews/prefs/pref-tags.xul
+++ b/suite/mailnews/prefs/pref-tags.xul
@@ -40,17 +40,17 @@
             <listcol flex="1"/>
             <listcol/>
           </listcols>
           <listhead>
             <listheader label="&tagColumn.label;"/>
             <listheader label="&colorColumn.label;"/>
           </listhead>
         </listbox>
-  
+
         <vbox>
           <button id="addTagButton"
                   label="&addTagButton.label;"
                   accesskey="&addTagButton.accesskey;"
                   defaulttagname="&defaultTagName.label;"
                   preference="pref.tags.disable_button.add"
                   oncommand="AddTag();"/>
           <button id="deleteTagButton"
--- a/suite/mailnews/search/ABSearchDialog.xul
+++ b/suite/mailnews/search/ABSearchDialog.xul
@@ -46,17 +46,17 @@
   <script type="application/javascript"
           src="chrome://messenger/content/ABSearchDialog.js"/>
   <script type="application/javascript"
           src="chrome://messenger/content/addressbook/abCommon.js"/>
 
   <broadcaster id="Communicator:WorkMode"/>
 
   <dummy class="usesMailWidgets"/>
- 
+
     <vbox id="searchTerms" flex="3" persist="height">
       <vbox>
         <hbox align="center">
           <label value="&abSearchHeading.label;" accesskey="&abSearchHeading.accesskey;" control="abPopup"/>
           <menulist id="abPopup" oncommand="SelectDirectory(this.value);">
             <menupopup id="abPopup-menupopup" class="addrbooksPopup"/>
           </menulist>
           <spacer flex="10"/>
--- a/suite/mailnews/subscribe.xul
+++ b/suite/mailnews/subscribe.xul
@@ -1,19 +1,19 @@
-<?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"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/subscribe.dtd">
 
 <dialog id="subscribeWindow"
-        xmlns:NC="http://home.netscape.com/NC-rdf#" 
+        xmlns:NC="http://home.netscape.com/NC-rdf#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&subscribeDialog.title;"
         style="width: 44em; height: 33em;"
         persist="width height screenX screenY"
         buttons="accept,cancel"
         onload="SubscribeOnLoad()"
         onunload="SubscribeOnUnload()"
         ondialogaccept="return subscribeOK();"
@@ -25,25 +25,25 @@
 <script type="application/javascript" src="chrome://messenger/content/subscribe.js"/>
 <script type="application/javascript" src="chrome://messenger/content/widgetglue.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 oncommand="onServerClick(event);" id="serverMenu"
                         datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
                         sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
@@ -53,17 +53,17 @@
                     <menupopup>
                       <menuitem class="subscribeMenuItem menuitem-iconic" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name" ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType" IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"/>
                     </menupopup>
                   </rule>
                 </template>
               </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"
                        aria-controls="searchTree"
                        oncommand="Search();"
                        clickSelectsAll="true"/>
             </row>
@@ -94,24 +94,24 @@
                     <tree id="subscribeTree"
                           treelines="true"
                           flex="1"
                           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"
@@ -136,81 +136,81 @@
                                     <!-- commenting out until bug 38906 is fixed
                                     <treecell label="?TotalMessages"/> -->
                                   </treerow>
                                 </treeitem>
                               </treechildren>
                             </action>
                         </rule>
                       </template>
-    
+
                       <treecols id="theSubscribeColumns">
                         <treecol id="nameColumn" persist="hidden"
                                  flex="1" primary="true" label="..."
                                  sort="?LeafName"/>
                         <splitter class="tree-splitter"/>
                         <treecol id="subscribedColumn" persist="hidden"
                                  type="checkbox"
                                  cycler="true" label="&subscribedHeader.label;"
                                  sort="?Subscribed"/>
-                        <!-- commenting out until bug 38906 is fixed 
+                        <!-- commenting out until bug 38906 is fixed
                         <splitter class="tree-splitter"/>
                         <treecol id="messagesColumn" persist="hidden"
                                  label="&messagesHeader.label;"
                                  sort="?TotalMessages"/> -->
                       </treecols>
                     </tree>
                   </hbox>
-                  
+
                   <hbox id="searchview">
-                    <tree id="searchTree" flex="1" 
+                    <tree id="searchTree" flex="1"
                            disableKeyNavigation="true"
                            onkeypress="onSearchTreeKeyPress(event);"
-                           onclick="SearchOnClick(event);"> 
+                           onclick="SearchOnClick(event);">
                       <treecols>
                         <treecol id="nameColumn2" persist="hidden sortDirection"
                                  ignoreincolumnpicker="true" flex="1"
                                  label="..." sortDirection="ascending"/>
                         <splitter class="tree-splitter"/>
                         <treecol id="subscribedColumn2" persist="hidden"
                                  cycler="true" label="&subscribedHeader.label;" />
-                        <!-- commenting out until bug 38906 is fixed 
+                        <!-- commenting out until bug 38906 is fixed
                         <splitter class="tree-splitter"/>
                         <treecol id="messagesColumn2" persist="hidden"
                                  label="&messagesHeader.label;" /> -->
                       </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="cmd_stop" label="&stopButton.label;"
-                          accesskey="&stopButton.accesskey;" 
+                          accesskey="&stopButton.accesskey;"
                           oncommand="Stop()"/>
                   <spacer flex="1"/>
                 </vbox>
-                
-              </hbox> 
+
+              </hbox>
             </tabpanel>
           </tabpanels>
         </tabbox>
-      </row>        
+      </row>
       <row>
         <hbox id="statusContainerBox" >
-           <statusbarpanel id="statusText" crop="right" flex="1"/> 
+           <statusbarpanel id="statusText" crop="right" flex="1"/>
            <statusbarpanel class="statusbarpanel-progress" id="statusbar-progresspanel">
              <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
            </statusbarpanel>
          </hbox>
          <hbox/>
       </row>
     </rows>
   </grid>
--- a/suite/mailnews/threadPane.xul
+++ b/suite/mailnews/threadPane.xul
@@ -43,20 +43,20 @@
     <treecol id="senderCol" persist="ordinal width hidden swappedhidden" flex="4" hidden="false" swappedhidden="true"
              label="&fromColumn.label;" tooltiptext="&fromColumn2.tooltip;"/>
     <treecol id="recipientCol" persist="ordinal width hidden swappedhidden" 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="receivedCol" persist="hidden ordinal width temphidden" flex="2" hidden="true" temphidden="false" 
+    <treecol id="receivedCol" persist="hidden ordinal width temphidden" flex="2" hidden="true" temphidden="false"
              label="&receivedColumn.label;" tooltiptext="&receivedColumn2.tooltip;"/>
     <splitter class="tree-splitter"/>
-    <treecol id="dateCol" persist="hidden ordinal width" flex="2" 
+    <treecol id="dateCol" persist="hidden ordinal width" flex="2"
              label="&dateColumn.label;" tooltiptext="&dateColumn2.tooltip;"/>
     <splitter class="tree-splitter"/>
     <treecol id="statusCol" persist="hidden ordinal width" flex="1" hidden="true"
              label="&statusColumn.label;" tooltiptext="&statusColumn2.tooltip;"/>
     <splitter class="tree-splitter"/>
     <treecol id="sizeCol" persist="hidden ordinal width" flex="1" hidden="true"
              label="&sizeColumn.label;" tooltiptext="&sizeColumn2.tooltip;"/>
     <splitter class="tree-splitter"/>
--- a/suite/mailnews/unix/platformMailnewsOverlay.xul
+++ b/suite/mailnews/unix/platformMailnewsOverlay.xul
@@ -1,22 +1,22 @@
-<?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/. -->
 
 <!-- unix version of platformMailnewsOverlay.xul -->
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/messenger.dtd">
 
 <overlay id="platformMailnewsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <!-- Delete Key -->
     <key id="key_shiftDelete" keycode="VK_DELETE" modifiers="shift" command="cmd_shiftDelete"/>
-    
+
     <!-- Rename Attachment Key -->
     <key id="key_renameAttachment" keycode="VK_F2" oncommand="goDoCommand('cmd_renameAttachment');"/>
 
     <!-- Reload Key -->
     <key id="key_reload" keycode="VK_F5" oncommand="ReloadMessage();"/>
 
 </overlay>
--- a/suite/mailnews/win/platformMailnewsOverlay.xul
+++ b/suite/mailnews/win/platformMailnewsOverlay.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/. -->
 
 <!-- win version of platformMailnewsOverlay.xul -->
 
 <overlay id="platformMailnewsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -12,9 +12,9 @@
     <key id="key_shiftDelete" keycode="VK_DELETE" modifiers="shift" command="cmd_shiftDelete"/>
 
     <!-- Rename Attachment Key -->
     <key id="key_renameAttachment" keycode="VK_F2" oncommand="goDoCommand('cmd_renameAttachment');"/>
 
     <!-- Reload Key -->
     <key id="key_reload" keycode="VK_F5" oncommand="ReloadMessage();"/>
 
-</overlay>		
+</overlay>
--- a/suite/security/prefs/pref-certs.xul
+++ b/suite/security/prefs/pref-certs.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://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE overlay [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
@@ -56,17 +56,17 @@
   </groupbox>
 
   <!-- Certificate manager -->
   <groupbox>
     <caption label="&managecerts.caption;"/>
     <description>&managecerts.text;</description>
     <hbox align="center">
       <button label="&managecerts.button;"
-              oncommand="OpenCertManager();" 
+              oncommand="OpenCertManager();"
               id="openCertManagerButton"
               accesskey="&managecerts.accesskey;"
               preference="security.disable_button.openCertManager"/>
     </hbox>
   </groupbox>
 
   <!-- Device manager -->
   <groupbox>
--- a/suite/security/prefs/pref-ssl.xul
+++ b/suite/security/prefs/pref-ssl.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://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE overlay [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">