Bug 1629079 - Consolidate throbber UI. r=frg DONTBUILD
authorIan Neal <iann_cvs@blueyonder.co.uk>
Fri, 10 Apr 2020 03:13:15 +0100
changeset 39105 216dd6f69088ed1ca6c8697945110a75b51c3c94
parent 39104 bb8c9919df27708c9dd4a861e360a98343b974c3
child 39106 7e4fdcca791e07b149ca1d3fb5064226c901f3d4
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersfrg
bugs1629079
Bug 1629079 - Consolidate throbber UI. r=frg DONTBUILD
editor/ui/composer.js
editor/ui/composer/content/editor.xhtml
editor/ui/jar.mn
editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
editor/ui/locales/en-US/chrome/region/region.properties
editor/ui/locales/jar.mn
mailnews/mailnews.js
suite/base/content/utilityOverlay.xul
suite/browser/navigator.xul
suite/components/migration/src/nsThunderbirdProfileMigrator.cpp
suite/locales/en-US/chrome/browser/navigator.dtd
suite/locales/en-US/chrome/common/utilityOverlay.dtd
suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
suite/locales/en-US/chrome/mailnews/messenger.dtd
suite/locales/en-US/chrome/mailnews/region.properties
suite/mailnews/components/addrbook/content/addressbook.xul
suite/mailnews/components/compose/content/messengercompose.xul
suite/mailnews/content/mailWindowOverlay.xul
suite/mailnews/content/messageWindow.xul
suite/mailnews/content/messenger.xul
--- a/editor/ui/composer.js
+++ b/editor/ui/composer.js
@@ -27,18 +27,16 @@ pref("editor.hrule.width",              
 pref("editor.hrule.width_percent",          true);
 pref("editor.hrule.shading",                true);
 pref("editor.hrule.align",                  1); // center
 
 pref("editor.table.maintain_structure", true);
 
 pref("editor.prettyprint", true);
 
-pref("editor.throbber.url","chrome://editor-region/locale/region.properties");
-
 pref("editor.toolbars.showbutton.bold", true);
 pref("editor.toolbars.showbutton.italic", true);
 pref("editor.toolbars.showbutton.underline", true);
 pref("editor.toolbars.showbutton.DecreaseFontSize", true);
 pref("editor.toolbars.showbutton.IncreaseFontSize", true);
 pref("editor.toolbars.showbutton.ul", true);
 pref("editor.toolbars.showbutton.ol", true);
 pref("editor.toolbars.showbutton.outdent", true);
--- a/editor/ui/composer/content/editor.xhtml
+++ b/editor/ui/composer/content/editor.xhtml
@@ -271,25 +271,17 @@
     <toolbarbutton id="print-button"/>
     <toolbarbutton id="findButton"/>
     <toolbarbutton id="linkButton"/>
     <toolbarbutton id="namedAnchorButton"/>
     <toolbarbutton id="imageButton"/>
     <toolbarbutton id="hlineButton"/>
     <toolbarbutton id="tableButton"/>
     <toolbarbutton id="spellingButton"/>
-    <toolbaritem id="throbber-box"
-                 class="toolbaritem-noline"
-                 removable="true"
-                 align="center">
-      <button id="navigator-throbber"
-              oncommand="goClickThrobber('editor.throbber.url', event);"
-              onclick="checkForMiddleClick(this, event);"
-              tooltiptext="&throbber.tooltip2;"/>
-    </toolbaritem>
+    <toolbaritem id="throbber-box"/>
   </toolbar>
 
   <toolbarset id="customToolbars" context="toolbar-context-menu"/>
 
   <toolbarpalette id="EditToolbarPalette"/>
 
   <toolbar id="FormatToolbar"
            class="chromeclass-toolbar"
--- a/editor/ui/jar.mn
+++ b/editor/ui/jar.mn
@@ -5,17 +5,16 @@
 comm.jar:
 % content editor %content/editor/
 #ifdef MOZ_SUITE
 % overlay chrome://communicator/content/tasksOverlay.xhtml chrome://editor/content/editorTasksOverlay.xhtml
 % overlay chrome://messenger/content/mailWindowOverlay.xhtml chrome://editor/content/editorMailOverlay.xhtml
 % overlay chrome://communicator/content/pref/preferences.xhtml chrome://editor/content/editorPrefsOverlay.xhtml
 % overlay chrome://communicator/content/pref/pref-appearance.xhtml chrome://editor/content/editorPrefsOverlay.xhtml
 % overlay chrome://navigator/content/navigatorOverlay.xhtml chrome://editor/content/editorNavigatorOverlay.xhtml
-% content editor-region %content/editor-region/
 #endif
       content/editor/editor.js                                 (composer/content/editor.js)
       content/editor/editorUtilities.js                        (composer/content/editorUtilities.js)
       content/editor/ComposerCommands.js                       (composer/content/ComposerCommands.js)
       content/editor/EditorContent.css                         (composer/content/EditorContent.css)
       content/editor/images/tag-anchor.gif                     (composer/content/images/tag-anchor.gif)
       content/editor/EdDialogCommon.js                         (dialogs/content/EdDialogCommon.js)
       content/editor/EdLinkProps.xhtml                         (dialogs/content/EdLinkProps.xhtml)
--- a/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
@@ -301,17 +301,16 @@
 <!ENTITY tableToolbarCmd.label "Table">
 <!ENTITY tableToolbarCmd.tooltip "Insert new table or edit selected table's properties">
 <!ENTITY linkToolbarCmd.label "Link">
 <!ENTITY linkToolbarCmd.tooltip "Insert new link or edit selected link's properties">
 <!ENTITY anchorToolbarCmd.label "Anchor">
 <!ENTITY anchorToolbarCmd.tooltip "Insert new named anchor or edit selected anchor's properties">
 <!ENTITY TextColorButton.tooltip "Choose color for text">
 <!ENTITY BackgroundColorButton.tooltip "Choose color for background">
-<!ENTITY throbber.tooltip2 "Go to the &brandShortName; home page">
 <!ENTITY HighlightColorButton.tooltip "Choose highlight color for text">
 
 <!-- Editor toolbar -->
 <!ENTITY absoluteFontSizeToolbarCmd.tooltip "Set font size">
 <!ENTITY decreaseFontSizeToolbarCmd.tooltip "Smaller font size">
 <!ENTITY increaseFontSizeToolbarCmd.tooltip "Larger font size">
 <!ENTITY boldToolbarCmd.tooltip "Bold">
 <!ENTITY italicToolbarCmd.tooltip "Italic">
deleted file mode 100644
--- a/editor/ui/locales/en-US/chrome/region/region.properties
+++ /dev/null
@@ -1,8 +0,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/.
-
-#
-# editor.js
-# editor.properties
-editor.throbber.url=http://www.seamonkey-project.org/
--- a/editor/ui/locales/jar.mn
+++ b/editor/ui/locales/jar.mn
@@ -34,23 +34,21 @@
   locale/@AB_CD@/editor/EdNamedAnchorProperties.dtd          (%chrome/dialogs/EdNamedAnchorProperties.dtd)
   locale/@AB_CD@/editor/EdDialogOverlay.dtd                  (%chrome/dialogs/EdDialogOverlay.dtd)
   locale/@AB_CD@/editor/EdAdvancedEdit.dtd                   (%chrome/dialogs/EdAdvancedEdit.dtd)
   locale/@AB_CD@/editor/EdConvertToTable.dtd                 (%chrome/dialogs/EdConvertToTable.dtd)
 
 
 #ifdef MOZ_SUITE
 @AB_CD@.jar:
-% locale editor-region @AB_CD@ %locale/@AB_CD@/editor-region/
   locale/@AB_CD@/editor/editor.dtd                           (%chrome/composer/editor.dtd)
   locale/@AB_CD@/editor/editingOverlay.dtd                   (%chrome/composer/editingOverlay.dtd)
   locale/@AB_CD@/editor/editorPrefsOverlay.dtd               (%chrome/composer/editorPrefsOverlay.dtd)
   locale/@AB_CD@/editor/pref-toolbars.dtd                    (%chrome/composer/pref-toolbars.dtd)
   locale/@AB_CD@/editor/pref-editing.dtd                     (%chrome/composer/pref-editing.dtd)
   locale/@AB_CD@/editor/pref-composer.dtd                    (%chrome/composer/pref-composer.dtd)
   locale/@AB_CD@/editor/EditorPageProperties.dtd             (%chrome/dialogs/EditorPageProperties.dtd)
   locale/@AB_CD@/editor/EditorSnapToGrid.dtd                 (%chrome/dialogs/EditorSnapToGrid.dtd)
   locale/@AB_CD@/editor/EditConflict.dtd                     (%chrome/dialogs/EditConflict.dtd)
   locale/@AB_CD@/editor/EditorSaveAsCharset.dtd              (%chrome/dialogs/EditorSaveAsCharset.dtd)
   locale/@AB_CD@/editor/EditorPublish.dtd                    (%chrome/dialogs/EditorPublish.dtd)
   locale/@AB_CD@/editor/EditorPublishProgress.dtd            (%chrome/dialogs/EditorPublishProgress.dtd)
-  locale/@AB_CD@/editor-region/region.properties             (%chrome/region/region.properties)
 #endif
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -181,19 +181,16 @@ pref("mail.addr_book.mapit_url.2.format"
 pref("mail.addr_book.mapit_url.3.name", "chrome://messenger-region/locale/region.properties");
 pref("mail.addr_book.mapit_url.3.format", "chrome://messenger-region/locale/region.properties");
 pref("mail.addr_book.mapit_url.4.name", "chrome://messenger-region/locale/region.properties");
 pref("mail.addr_book.mapit_url.4.format", "chrome://messenger-region/locale/region.properties");
 pref("mail.addr_book.mapit_url.5.name", "chrome://messenger-region/locale/region.properties");
 pref("mail.addr_book.mapit_url.5.format", "chrome://messenger-region/locale/region.properties");
 #ifdef MOZ_SUITE
 pref("mailnews.start_page.url", "chrome://messenger-region/locale/region.properties");
-pref("messenger.throbber.url", "chrome://messenger-region/locale/region.properties");
-pref("compose.throbber.url", "chrome://messenger-region/locale/region.properties");
-pref("addressbook.throbber.url", "chrome://messenger-region/locale/region.properties");
 pref("mail.accountwizard.deferstorage", false);
 // |false|: Show both name and address, even for people in my addressbook.
 pref("mail.showCondensedAddresses", false);
 #endif
 
 pref("mail.addr_book.view.startupURI", "moz-abdirectory://?");
 pref("mail.addr_book.view.startupURIisDefault", true);
 
--- a/suite/base/content/utilityOverlay.xul
+++ b/suite/base/content/utilityOverlay.xul
@@ -702,14 +702,25 @@
 #endif
       <menuitem id="printSetupToolbar"
                 label="&printSetupCmd.label;"
                 accesskey="&printSetupCmd.accesskey;"
                 command="cmd_printSetup"/>
     </menupopup>
   </toolbarbutton>
 
+  <toolbaritem id="throbber-box"
+               class="toolbaritem-noline"
+               title="&throbber.title;"
+               removable="true"
+               align="center">
+    <button id="navigator-throbber"
+            onclick="checkForMiddleClick(this, event);"
+            oncommand="goClickThrobber('browser.throbber.url', event);"
+            tooltiptext="&throbber.tooltip2;"/>
+  </toolbaritem>
+
   <!-- Sync toolbar button
   <toolbarbutton id="sync-button"
                  class="toolbarbutton-1 chromeclass-toolbar-additional"
                  label="&syncToolbarButton.label;"
                  oncommand="gSyncUI.handleToolbarButton();"/> -->
 </overlay>
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -404,22 +404,17 @@
                    flex="1" persist="width" removable="true">
         <searchbar id="searchbar" flex="1"/>
       </toolbaritem>
 
       <toolbarbutton id="print-button"
                      label="&printButton.label;"
                      tooltiptext="&printButton.tooltip;"/>
 
-      <toolbaritem id="throbber-box" align="center">
-        <button id="navigator-throbber"
-                oncommand="goClickThrobber('browser.throbber.url', event)"
-                onclick="checkForMiddleClick(this, event);"
-                tooltiptext="&throbber.tooltip2;"/>
-      </toolbaritem>
+      <toolbaritem id="throbber-box"/>
 
       <!-- "Bookmarks" button on Bookmarks Toolbar -->
       <toolbarbutton type="menu" id="bookmarks-button"
                      class="bookmark-item" container="true"
                      label="&bookmarksButton.label;"
                      ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
                      ondragover="PlacesMenuDNDHandler.onDragOver(event);"
                      ondragexit="PlacesMenuDNDHandler.onDragExit(event);"
--- a/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp
+++ b/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp
@@ -374,17 +374,16 @@ nsThunderbirdProfileMigrator::PrefTransf
   MAKESAMETYPEPREFTRANSFORM("mailnews.start_page.enabled",             Bool),
   MAKESAMETYPEPREFTRANSFORM("mailnews.start_page.url",                 String),
   MAKESAMETYPEPREFTRANSFORM("mailnews.tcptimeout",                     Int),
   MAKESAMETYPEPREFTRANSFORM("mailnews.thread_pane_column_unthreads",   Bool),
   MAKESAMETYPEPREFTRANSFORM("mailnews.view_default_charset",           String),
   MAKESAMETYPEPREFTRANSFORM("mailnews.wraplength",                     Int),
 
   MAKESAMETYPEPREFTRANSFORM("messenger.save.dir",                      String),
-  MAKESAMETYPEPREFTRANSFORM("messenger.throbber.url",                  String),
 
   MAKESAMETYPEPREFTRANSFORM("msgcompose.background_color",             String),
   MAKESAMETYPEPREFTRANSFORM("msgcompose.font_face",                    String),
   MAKESAMETYPEPREFTRANSFORM("msgcompose.font_size",                    String),
   MAKESAMETYPEPREFTRANSFORM("msgcompose.text_color",                   String),
 
   MAKESAMETYPEPREFTRANSFORM("news.get_messages_on_select",             Bool),
   MAKESAMETYPEPREFTRANSFORM("news.show_size_in_lines",                 Bool),
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -53,18 +53,16 @@
 <!ENTITY stopButton.tooltip           "Stop loading this page">
 <!ENTITY searchButton.label           "Search">
 <!ENTITY searchButton.tooltip         "Type a word in the field to the left, then click Search">
 <!ENTITY goButton.label               "Go">
 <!ENTITY goButton.tooltip             "Type a location in the field to the left, then click Go">
 <!ENTITY printButton.label            "Print">
 <!ENTITY printButton.tooltip          "Print this page">
 
-<!ENTITY throbber.tooltip2            "Go to the &brandShortName; home page">
-
 <!ENTITY locationBar.tooltip          "Enter search term, keyword, or web address">
 <!ENTITY locationBar.accesskey        "d">
 <!ENTITY locationBar.title            "Location">
 <!ENTITY proxyIcon.tooltip            "Drag and drop this icon to create a link to this page">
 
 <!ENTITY searchItem.title             "Search">
 
 <!ENTITY bookmarksButton.label        "Bookmarks">
--- a/suite/locales/en-US/chrome/common/utilityOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/utilityOverlay.dtd
@@ -197,9 +197,12 @@
 
 <!-- Popup Blocked notification menu -->
 <!ENTITY allowPopups.accesskey        "p">
 <!ENTITY showPopupManager.label       "Manage Popups">
 <!ENTITY showPopupManager.accesskey   "M">
 <!ENTITY dontShowMessage.label        "Don't show this message when popups are blocked">
 <!ENTITY dontShowMessage.accesskey    "D">
 
+<!ENTITY throbber.title "Throbber">
+<!ENTITY throbber.tooltip2 "Go to the &brandShortName; home page">
+
 <!ENTITY syncToolbarButton.label "Sync">
--- a/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -90,17 +90,16 @@
 <!-- Tooltips -->
 <!ENTITY addressbookToolbar.tooltip                     "Address Book Toolbar">
 <!ENTITY newContactButton.tooltip                       "Create a new address book contact">
 <!ENTITY newlistButton.tooltip                          "Create a new list">
 <!ENTITY editItemButton.tooltip                         "Edit the selected item">
 <!ENTITY newmsgButton.tooltip                           "Send a mail message">
 <!ENTITY newIM.tooltip                                  "Send an instant message or chat">
 <!ENTITY deleteItemButton.tooltip                       "Delete selected item">
-<!ENTITY throbber.tooltip2                              "Go to the &brandShortName; home page">
 <!ENTITY advancedButton.tooltip                         "Advanced address search">
 
 <!-- Dir Tree header -->
 <!ENTITY dirTreeHeader.label                            "Address Books">
 
 <!-- Card Summary Pane -->
 <!-- Box Headings -->
 <!ENTITY contact.heading                                "Contact">
--- a/suite/locales/en-US/chrome/mailnews/messenger.dtd
+++ b/suite/locales/en-US/chrome/mailnews/messenger.dtd
@@ -443,17 +443,16 @@
 <!ENTITY fileButton.tooltip "File selected message">
 <!ENTITY nextButton.tooltip "Move to the next unread message">
 <!ENTITY goBackButton.tooltip "Go back one message">
 <!ENTITY goForwardButton.tooltip "Go forward one message">
 <!ENTITY deleteButton.tooltip "Delete selected message or folder">
 <!ENTITY undeleteButton.tooltip "Undelete selected message">
 <!ENTITY markButton.tooltip "Mark messages">
 <!ENTITY stopButton.tooltip "Stop the current transfer">
-<!ENTITY throbber.tooltip2 "Go to the &brandShortName; home page">
 <!ENTITY junkButton.tooltip "Mark the selected messages as junk">
 <!ENTITY notJunkButton.tooltip "Mark the selected messages as not junk">
 
 <!-- Remote Content Button Popup -->
 <!ENTITY remoteContentOptionsAllowForMsg.label "Show remote content in this message">
 <!ENTITY remoteContentOptionsAllowForMsg.accesskey "S">
 <!ENTITY editRemoteContentSettings.label "Edit permissions for remote content…">
 <!ENTITY editRemoteContentSettings.accesskey "E">
--- a/suite/locales/en-US/chrome/mailnews/region.properties
+++ b/suite/locales/en-US/chrome/mailnews/region.properties
@@ -1,19 +1,16 @@
 # 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/.
 
 #
 # messenger.properties
 # mailnews.js
 mailnews.start_page.url=chrome://messenger/content/start.xhtml
-messenger.throbber.url=http://www.seamonkey-project.org/
-compose.throbber.url=http://www.seamonkey-project.org/
-addressbook.throbber.url=http://www.seamonkey-project.org/
 # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
 # mail.addr_book.mapit_url.format=
 # The mail.addr_book.mapit_url.format should start with the URL of the mapping
 # service and then the query part with placeholders to be subsituted from values
 # from the addressbook contact's address.
 # Available placeholders are:
 # @A1 == address, part 1
 # @A2 == address, part 2
--- a/suite/mailnews/components/addrbook/content/addressbook.xul
+++ b/suite/mailnews/components/addrbook/content/addressbook.xul
@@ -500,25 +500,17 @@
                type="search"
                aria-controls="abResultsTree"
                placeholder="&searchNameAndEmail.placeholder;"
                clickSelectsAll="true"
                oncommand="onEnterInSearchBar();"
                onkeypress="if (event.keyCode == KeyEvent.DOM_VK_RETURN) this.select();"/>
     </toolbaritem>
 
-    <toolbaritem id="throbber-box"
-                 class="toolbaritem-noline"
-                 removable="true"
-                 align="center">
-      <button id="navigator-throbber"
-              oncommand="goClickThrobber('addressbook.throbber.url', event)"
-              onclick="checkForMiddleClick(this, event);"
-              tooltiptext="&throbber.tooltip2;"/>
-    </toolbaritem>
+    <toolbaritem id="throbber-box"/>
   </toolbar>
   <toolbarpalette id="AbToolbarPalette"/>
   <toolbarset id="customToolbars" context="toolbar-context-menu"/>
 </toolbox>
 
   <!-- The main address book three pane -->
   <hbox flex="1">
     <vbox id="dirTreeBox" persist="width collapsed">
--- a/suite/mailnews/components/compose/content/messengercompose.xul
+++ b/suite/mailnews/components/compose/content/messengercompose.xul
@@ -523,25 +523,17 @@
                     command="cmd_saveAsDraft"/>
           <menuitem id="button-saveAsTemplate"
                     label="&saveAsTemplateCmd.label;"
                     accesskey="&saveAsTemplateCmd.accesskey;"
                     command="cmd_saveAsTemplate"/>
         </menupopup>
       </toolbarbutton>
 
-      <toolbaritem id="throbber-box"
-                   class="toolbaritem-noline"
-                   removable="true"
-                   align="center">
-          <button id="navigator-throbber"
-                  oncommand="goClickThrobber('compose.throbber.url', event)"
-                  onclick="checkForMiddleClick(this, event);"
-                  tooltiptext="&throbber.tooltip2;"/>
-      </toolbaritem>
+      <toolbaritem id="throbber-box"/>
     </toolbar>
 
     <toolbarset id="customToolbars" context="toolbar-context-menu"/>
 
     <toolbar id="MsgHeadersToolbar"
              persist="collapsed"
              flex="1"
              grippytooltiptext="&addressBar.tooltip;"
--- a/suite/mailnews/content/mailWindowOverlay.xul
+++ b/suite/mailnews/content/mailWindowOverlay.xul
@@ -8,16 +8,18 @@
 
 <?xul-overlay href="chrome://communicator/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/viewZoomOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/viewApplyThemeOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/msgHdrViewOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailKeysOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
 <!DOCTYPE overlay [
   <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd">
   %messengerDTD;
   <!ENTITY % mailKeysDTD SYSTEM "chrome://messenger/locale/mailKeysOverlay.dtd">
   %mailKeysDTD;
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
   %globalDTD;
@@ -1835,24 +1837,17 @@
               oncommand="goDoCommand('button_search')"/>
       <button id="button-advanced"
               label="&advancedButton.label;"
               accesskey="&advancedButton.accesskey;"
               tooltiptext="&advancedButton.tooltip;"
               observes="button_search"
               oncommand="goDoCommand('button_search')"/>
     </toolbaritem>
-    <toolbaritem id="throbber-box"
-                 class="toolbaritem-noline"
-                 align="center">
-        <button id="navigator-throbber"
-                oncommand="goClickThrobber('messenger.throbber.url', event)"
-                onclick="checkForMiddleClick(this, event);"
-                tooltiptext="&throbber.tooltip2;"/>
-    </toolbaritem>
+    <toolbaritem id="throbber-box"/>
     <!-- see utilityOverlay.xul
     <toolbarbutton id="sync-button"/> -->
   </toolbarpalette>
 
 </toolbox>
 
 <statusbar class="chromeclass-status" id="status-bar">
   <statusbarpanel id="component-bar"/>
--- a/suite/mailnews/content/messageWindow.xul
+++ b/suite/mailnews/content/messageWindow.xul
@@ -1,17 +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://messenger/skin/messageWindow.css" type="text/css"?>
 
-<?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" >
 %brandDTD;
 <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
 %messengerDTD;
 ]>
 
--- a/suite/mailnews/content/messenger.xul
+++ b/suite/mailnews/content/messenger.xul
@@ -1,19 +1,17 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://messenger/skin/mailWindow1.css" type="text/css"?>
 
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/threadPane.xul"?>
 <?xul-overlay href="chrome://messenger/content/folderPane.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" >
 %brandDTD;
 <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
 %messengerDTD;
 ]>