new file mode 100644
--- /dev/null
+++ b/editor/ui/composer/content/editingOverlay.xul
@@ -0,0 +1,63 @@
+<?xml version="1.0"?> 
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 1999
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Daniel Glazman (glazman@netscape.com)
+   -   Charles Manske (cmanske@netscape.com)
+   -   Ian Neal (iann_bugzilla@blueyonder.co.uk)
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either of the GNU General Public License Version 2 or later (the "GPL"),
+   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay SYSTEM "chrome://editor/locale/editingOverlay.dtd">
+
+<overlay id="editingOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <!-- commands updated when the editor gets created -->
+  <commandset id="composerEditMenuItems">
+    <command id="cmd_publishSettings"
+             oncommand="goDoCommand('cmd_publishSettings');"/>
+  </commandset>
+
+  <!-- Edit menu items -->
+  <menupopup id="menu_EditPopup">
+    <menuitem id="menu_inlineSpellCheck"
+              oncommand="InlineSpellCheckerUI.enabled = !InlineSpellCheckerUI.enabled"/>
+    <menuitem id="menu_publishSettings"
+              insertafter="sep_preferences"
+              label="&publishSettings.label;"
+              accesskey="&publishSettings.accesskey;"
+              command="cmd_publishSettings"/>
+  </menupopup>
+</overlay>

--- a/editor/ui/composer/content/editor.js
+++ b/editor/ui/composer/content/editor.js
@@ -386,17 +386,17 @@ var gEditorDocumentObserver =
           // editingSession
           editor.removeOverrideStyleSheet(kContentEditableStyleSheet);
         } catch (e) {}
 
         // Things for just the Web Composer application
         if (IsWebComposer())
         {
           InlineSpellCheckerUI.init(editor);
-          document.getElementById('menu_inlinespellcheck').setAttribute('disabled', !InlineSpellCheckerUI.canSpellCheck);
+          document.getElementById('menu_inlineSpellCheck').setAttribute('disabled', !InlineSpellCheckerUI.canSpellCheck);
 
           editor.returnInParagraphCreatesNewParagraph = gPrefs.getBoolPref(kCRInParagraphsPref);
 
           // Set focus to content window if not a mail composer
           // Race conditions prevent us from setting focus here
           //   when loading a url into blank window
           setTimeout(SetFocusOnStartup, 0);
 
@@ -1771,17 +1771,17 @@ function SetEditMode(mode)
   if (!bodyElement)
   {
     dump("SetEditMode: We don't have a body node!\n");
     return;
   }
 
   // must have editor if here!
   var editor = GetCurrentEditor();
-  var inlineSpellCheckItem = document.getElementById('menu_inlinespellcheck');
+  var inlineSpellCheckItem = document.getElementById('menu_inlineSpellCheck');
 
   // Switch the UI mode before inserting contents
   //   so user can't type in source window while new window is being filled
   var previousMode = gEditorDisplayMode;
   if (!SetDisplayMode(mode))
     return;
 
   if (mode == kDisplayModeSource)

--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -42,16 +42,17 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?> 
 
 <?xml-stylesheet href="chrome://editor/skin/editorPrimaryToolbar.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/editorFormatToolbar.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/editorModeToolbar.css" type="text/css"?> 
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
+<?xul-overlay href="chrome://editor/content/editingOverlay.xul"?>
 <?xul-overlay href="chrome://editor/content/composerOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
 <?xul-overlay href="chrome://editor/content/EditorContextMenuOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
@@ -164,17 +165,17 @@
     <key keycode="VK_TAB" modifiers="shift" oncommand="return true;"/>
     <key keycode="VK_TAB" modifiers="control" oncommand="return true;"/>
     <key keycode="VK_TAB" modifiers="control,shift" oncommand="return true;"/>
   </keyset>
 
   <toolbox class="toolbox-top" id="EditorToolbox">
   <menubar id="main-menubar" class="chromeclass-menubar" persist="collapsed" grippytooltiptext="&menuBar.tooltip;">
     <menu id="fileMenu"/>
-    <menu id="editMenu"/>
+    <menu id="menu_Edit"/>
 
     <menu id="menu_View">
     <!-- id pulls in "Show Sidebar" item from sidebarOverlay -->
     <menupopup id="menu_View_Popup">
       <menu id="menu_Toolbars">
         <menupopup id="view_toolbars_popup"> 
           <menuitem id="viewComposerToolbar" label="&compositionToolbarCmd.label;" type="checkbox" accesskey="&compositionToolbarCmd.accesskey;" command="cmd_viewCompToolbar"  />
           <menuitem id="viewFormatToolbar"   label="&formattingToolbarCmd.label;"  type="checkbox" accesskey="&formattingToolbarCmd.accesskey;"  command="cmd_viewFormatToolbar" />

--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -240,18 +240,16 @@
     <command id="cmd_findNext"      oncommand="goDoCommand('cmd_findNext');"/>
     <command id="cmd_findPrev"      oncommand="goDoCommand('cmd_findPrev');"/>
     <command id="cmd_spelling"      oncommand="goDoCommand('cmd_spelling')"/>
     <command id="cmd_checkLinks"    oncommand="goDoCommand('cmd_checkLinks')"/>
     <command id="cmd_pasteQuote"
              label="&pasteAsQuotationCmd.label;"
              accesskey="&pasteAsQuotationCmd.accesskey;"
              oncommand="goDoCommand('cmd_pasteQuote');"/>
-    <command id="cmd_publishSettings"
-             oncommand="goDoCommand('cmd_publishSettings');"/>
   </commandset>
 
   <!-- style related commands that update on creation, and on selection change -->
   <commandset id="composerStyleMenuItems"
           commandupdater="true"
           events="create, style, mode_switch"
           oncommandupdate="goUpdateComposerMenuItems(this)">
     <command id="cmd_bold"          state="false"     oncommand="doStyleUICommand('cmd_bold')"/>
@@ -411,51 +409,46 @@
       <!-- menuitems are merged in here from composerOverlay.xul -->
       <menuitem id="menu_printSetup"/>
       <menuitem id="menu_printPreview"/>
       <menuitem id="menu_print"/>
       <!-- The Exit/Quit item is merged from platformGlobalOverlay.xul -->
     </menupopup>
   </menu>
 
-  <menu id="editMenu" label="&editMenu.label;" accesskey="&editMenu.accesskey;">
-    <menupopup id="edEditMenuPopup">
+  <menu id="menu_Edit">
+    <menupopup id="menu_EditPopup">
       <!-- from utilityOverlay.xul -->
       <menuitem id="menu_undo"/>
       <menuitem id="menu_redo"/>
-      <menuseparator id="edEditMenuSep1" />
+      <menuseparator id="sep_cut"/>
       <menuitem id="menu_cut"/>
       <menuitem id="menu_copy"/>
       <menuitem id="menu_paste"/>
       <menuitem id="menu_pasteNoFormatting"
                 key="pastenoformattingkb"
                 command="cmd_pasteNoFormatting"/>
       <menuitem id="menu_delete"/>
-      <menuseparator id="edEditMenuSep2" />
+      <menuseparator id="sep_selectAll"/>
       <menuitem id="menu_selectAll"/>
       <menuseparator id="sep_find"/>
       <menuitem id="menu_find" label="&findCmd.label;"/>
       <menuitem id="menu_findNext"/>
       <menuitem id="menu_findPrev"/>
       <menuseparator id="sep_checkspelling"/>
       <menuitem id="menu_checkspelling"
                 label="&checkSpellingCmd2.label;"
                 accesskey="&checkSpellingCmd2.accesskey;"
                 key="key_checkspelling"
                 command="cmd_spelling"/>
-      <menuitem id="menu_inlinespellcheck"
+      <menuitem id="menu_inlineSpellCheck"
                 type="checkbox"
                 label="&enableInlineSpellChecker.label;"
-                accesskey="&enableInlineSpellChecker.accesskey;"
-                oncommand="InlineSpellCheckerUI.enabled = !InlineSpellCheckerUI.enabled"/>
-      <menuseparator id="menu_prefsSep"/>
-      <menuitem id="menu_publishSettings"
-                label="&publishSettings.label;"
-                accesskey="&publishSettings.accesskey;"
-                command="cmd_publishSettings"/>
+                accesskey="&enableInlineSpellChecker.accesskey;"/>
+      <menuseparator id="sep_preferences"/>
       <menuitem id="menu_preferences"
                 command="cmd_preferences"/>
     </menupopup>
   </menu>
 
   <menupopup id = "composerCharsetMenuPopup"  onpopupshowing="updateCharsetPopupMenu(this)" />
 
   <!-- Insert menu -->
@@ -1383,16 +1376,9 @@
   <toolbarbutton id="decreaseZIndexButton"
                  class="formatting-button"
                  tooltiptext="&layerSendToBack.tooltip;"
                  command="cmd_decreaseZIndex"/>
   <toolbarbutton id="increaseZIndexButton"
                  class="formatting-button"
                  tooltiptext="&layerBringToFront.tooltip;"
                  command="cmd_increaseZIndex"/>
-
-  <!-- Paste as quotation is used by mail compose,
-       but in composer it has to go in the debug menu
-   -->
-  <menuitem id="menu_pasteQuote"
-            command="cmd_pasteQuote" key="pastequotationkb"/>
-
 </overlay>

--- a/editor/ui/jar.mn
+++ b/editor/ui/jar.mn
@@ -81,16 +81,17 @@ comm.jar:
 #ifdef MOZ_SUITE
       content/editor/editor.xul                                (composer/content/editor.xul)
       content/editor/publishprefs.js                           (composer/content/publishprefs.js)
       content/editor/EditorContextMenu.js                      (composer/content/EditorContextMenu.js)
       content/editor/EditorContextMenuOverlay.xul              (composer/content/EditorContextMenuOverlay.xul)
       content/editor/EditorAllTags.css                         (composer/content/EditorAllTags.css)
       content/editor/EditorParagraphMarks.css                  (composer/content/EditorParagraphMarks.css)
       content/editor/editorOverlay.xul                         (composer/content/editorOverlay.xul) 
+      content/editor/editingOverlay.xul                        (composer/content/editingOverlay.xul)
       content/editor/composerOverlay.xul                       (composer/content/composerOverlay.xul)
       content/editor/pref-toolbars.xul                         (composer/content/pref-toolbars.xul)
       content/editor/pref-editing.xul                          (composer/content/pref-editing.xul)
       content/editor/pref-editing.js                           (composer/content/pref-editing.js)
       content/editor/pref-composer.xul                         (composer/content/pref-composer.xul)
       content/editor/editorPrefsOverlay.xul                    (composer/content/editorPrefsOverlay.xul)
       content/editor/StructBarContextMenu.js                   (composer/content/StructBarContextMenu.js)
       content/editor/images/sendtoback.gif                     (composer/content/images/sendtoback.gif)

new file mode 100644
--- /dev/null
+++ b/editor/ui/locales/en-US/chrome/composer/editingOverlay.dtd
@@ -0,0 +1,41 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 1999-2000
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Charles Manske (cmanske@netscape.com)
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either of the GNU General Public License Version 2 or later (the "GPL"),
+   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!-- Edit menu items -->
+<!ENTITY publishSettings.label "Publishing Site Settings…">
+<!ENTITY publishSettings.accesskey "b">

--- a/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
@@ -65,32 +65,28 @@
 <!ENTITY publishCmd.accesskey "b">
 <!ENTITY publishCmd.key "S">
 <!ENTITY publishAsCmd.label "Publish As…">
 <!ENTITY publishAsCmd.accesskey "h">
 <!ENTITY saveAsChangeEncodingCmd.label "Save And Change Character Encoding">
 <!ENTITY saveAsChangeEncodingCmd.accesskey "E">
 
 <!-- Edit menu items -->
-<!ENTITY editMenu.label "Edit">
-<!ENTITY editMenu.accesskey "E">
 <!ENTITY pasteNoFormatting.label "Paste Without Formatting">
 <!ENTITY pasteNoFormatting.accesskey "n">
 <!ENTITY pasteNoFormatting.key "V">
 <!ENTITY pasteAs.label "Paste As">
 <!ENTITY pasteAs.accesskey "a">
-<!ENTITY publishSettings.label "Publishing Site Settings…">
-<!ENTITY publishSettings.accesskey "b">
 <!ENTITY pasteAsQuotationCmd.label "Paste As Quotation">
 <!ENTITY pasteAsQuotationCmd.accesskey "Q">
 <!ENTITY pasteAsQuotationCmd.key "o">
 <!ENTITY findCmd.label "Find and Replace…">
 <!ENTITY enableInlineSpellChecker.label "Spellcheck As You Type">
 <!ENTITY enableInlineSpellChecker.accesskey "S">
-<!ENTITY checkSpellingCmd2.label "Check Spelling">
+<!ENTITY checkSpellingCmd2.label "Check Spelling…">
 <!ENTITY checkSpellingCmd2.accesskey "h">
 <!ENTITY checkSpellingCmd2.key "p">
 
 <!-- Insert menu items -->
 <!ENTITY insertMenu.label "Insert">
 <!ENTITY insertMenu.accesskey "I">
 <!ENTITY insertLinkCmd.label "Link…">
 <!ENTITY insertLinkCmd.accesskey "L">

--- a/editor/ui/locales/jar.mn
+++ b/editor/ui/locales/jar.mn
@@ -31,16 +31,17 @@
   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/EdLinkChecker.dtd                    (%chrome/dialogs/EdLinkChecker.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/EditorImageMap.dtd                   (%chrome/dialogs/EditorImageMap.dtd)

--- a/suite/debugQA/content/debugQAEditorOverlay.xul
+++ b/suite/debugQA/content/debugQAEditorOverlay.xul
@@ -59,17 +59,19 @@
                   oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://debugqa/content/EditorInitPage.html')"/>
         <menuitem label="&textEditorCmd.label;"
                   oncommand="EditorNewPlaintext();" />
         <menuitem label="&outputTextCmd.label;"
                   oncommand="EditorGetText()"/>
         <menuitem label="&outputHTMLCmd.label;"
                   oncommand="EditorGetHTML()"/>
         <menuseparator/>
-        <menuitem id="menu_pasteQuote"/>
+        <menuitem id="menu_pasteQuote"
+                  key="pastequotationkb"
+                  command="cmd_pasteQuote"/>
         <menuitem label="&editRewrapCmd.label;"
                   oncommand="try { GetCurrentEditor().rewrap(true); } catch (e) {}"/>
         <menuitem label="&editStripQuotesCmd.label;"
                   oncommand="try { GetCurrentEditor().stripCites(); } catch (e) {}"/>
         <menuitem label="&insertTextCmd.label;"
                   oncommand="EditorInsertText('All good things come to those who wait. ')"/>
         <menuitem id="menu_checkLinks" observes="cmd_checkLinks"
                   label="&checkLinksCmd.label;"/>

--- a/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/suite/debugQA/content/debugQATextEditorShell.xul
@@ -37,16 +37,17 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/editorPrimaryToolbar.css" type="text/css"?>
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
+<?xul-overlay href="chrome://editor/content/editingOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?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://communicator/content/sidebar/sidebarOverlay.xul"?>
 <?xul-overlay href="chrome://debugQA/content/debugQAEditorOverlay.xul"?>
 
@@ -109,17 +110,17 @@
     <key id="showHideSidebar"/>
   </keyset>
 
   <popupset id="contentAreaContextSet"/>
 
   <toolbox id="EditorToolbox">
     <menubar id="main-menubar" class="chromeclass-menubar">
       <menu id="fileMenu"/>
-      <menu id="editMenu"/>
+      <menu id="menu_Edit"/>
 
       <menu id="menu_View">
         <!-- id pulls in "Show Sidebar" item from sidebarOverlay -->
         <menupopup id="menu_View_Popup">
           <menu id="menu_Toolbars">
             <menupopup id="view_toolbars_popup">
               <menuitem id="viewComposerToolbar"
                         type="checkbox"

--- a/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
@@ -36,17 +36,16 @@
 <!ENTITY sendLaterCmd.label "Send Later">
 <!ENTITY sendLaterCmd.keycode "VK_RETURN">
 <!ENTITY sendLaterCmd.accesskey "L">
 
 <!-- Edit menu items -->
 <!ENTITY editRewrapCmd.label "Rewrap">
 <!ENTITY editRewrapCmd.key "R">
 <!ENTITY editRewrapCmd.accesskey  "w">
-<!ENTITY findCmd.label "Find and Replace…">
 <!ENTITY accountManagerCmd.label "Mail &amp; Newsgroups Account Settings…">
 <!ENTITY accountManagerCmd.accesskey "m">
 
 <!-- View menu items -->
 <!ENTITY showComposeToolbarCmd.label "Mail Toolbar">
 <!ENTITY showComposeToolbarCmd.accesskey "o">
 <!ENTITY showFormatToolbarCmd.label "Formatting Toolbar">
 <!ENTITY showFormatToolbarCmd.accesskey "F">
@@ -60,21 +59,16 @@
 <!ENTITY optionsMenu.accesskey "p">
 
 <!ENTITY quoteCmd.label "Quote Message">
 <!ENTITY quoteCmd.accesskey "Q">
 <!ENTITY selectAddressCmd.label "Select Addresses…">
 <!ENTITY selectAddressCmd.key "">
 <!ENTITY selectAddressCmd.accesskey "A">
 
-<!ENTITY checkSpellingCmd2.label "Check Spelling…">
-<!ENTITY checkSpellingCmd2.accesskey "h">
-<!ENTITY enableInlineSpellChecker.label "Spellcheck As You Type">
-<!ENTITY enableInlineSpellChecker.accesskey "S">
-
 <!ENTITY priorityMenu.label "Priority">
 <!ENTITY priorityMenu.accesskey "p">
 <!ENTITY lowestPriorityCmd.label "Lowest">
 <!ENTITY lowestPriorityCmd.accesskey "l">
 <!ENTITY lowPriorityCmd.label "Low">
 <!ENTITY lowPriorityCmd.accesskey "o">
 <!ENTITY normalPriorityCmd.label "Normal">
 <!ENTITY normalPriorityCmd.accesskey "n">

new file mode 100644
--- /dev/null
+++ b/suite/mailnews/compose/mailComposeOverlay.xul
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 1999
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Ben Goodger <ben@netscape.com> (ass'td polish fixes)
+   -   Neil Rashbrook <neil@parkwaycc.co.uk> (ass'td polish fix)
+   -   Ian Neal <iann_bugzilla@blueyonder.co.uk>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either of the GNU General Public License Version 2 or later (the "GPL"),
+   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<overlay id="mailComposeOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <menupopup id="menu_EditPopup" onpopupshowing="updateEditItems();">
+    <menuitem id="menu_pasteQuote"
+              insertafter="menu_pasteNoFormatting"
+              key="pastequotationkb"
+              command="cmd_pasteQuote"/>
+    <menuitem id="menu_rewrap"
+              insertafter="menu_pasteQuote"
+              key="key_rewrap"
+              command="cmd_rewrap"/>
+    <menuitem id="menu_inlineSpellCheck"
+              oncommand="EnableInlineSpellCheck(!InlineSpellCheckerUI.enabled);"/>
+    <menuitem id="menu_accountmgr"
+              insertafter="sep_preferences"
+              command="cmd_account"/>
+  </menupopup>
+</overlay>

--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@@ -50,16 +50,17 @@
 <?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/messengercompose/msgComposeContextOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/messengercompose/addressingWidgetOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
 <?xul-overlay href="chrome://editor/content/editorSmileyOverlay.xul"?>
+<?xul-overlay href="chrome://messenger/content/messengercompose/mailComposeOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/messengercompose/mailComposeExtrasOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % messengercomposeDTD SYSTEM "chrome://messenger/locale/messengercompose/messengercompose.dtd" >
 %messengercomposeDTD;
 <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
 %messengerDTD;
@@ -130,20 +131,26 @@
   <command id="cmd_sendNow" oncommand="goDoCommand('cmd_sendNow')"/>
   <command id="cmd_sendWithCheck" oncommand="goDoCommand('cmd_sendWithCheck')"/>
   <command id="cmd_sendLater" oncommand="goDoCommand('cmd_sendLater')"/>
 
   <!-- Edit Menu -->
   <!--command id="cmd_pasteQuote"/  DO NOT INCLUDE THOSE COMMANDS ELSE THE EDIT MENU WILL BE BROKEN! -->
   <!--command id="cmd_find"/-->
   <!--command id="cmd_findNext"/-->
-  <command id="cmd_rewrap"  oncommand="goDoCommand('cmd_rewrap')"/>
+  <command id="cmd_rewrap"
+           label="&editRewrapCmd.label;"
+           accesskey="&editRewrapCmd.accesskey;"
+           oncommand="goDoCommand('cmd_rewrap');"/>
   <command id="cmd_renameAttachment" oncommand="goDoCommand('cmd_renameAttachment')" disabled="true"/>
   <command id="cmd_openAttachment" oncommand="goDoCommand('cmd_openAttachment')"/>
-  <command id="cmd_account" oncommand="goDoCommand('cmd_account')"/>
+  <command id="cmd_account"
+           label="&accountManagerCmd.label;"
+           accesskey="&accountManagerCmd.accesskey;"
+           oncommand="goDoCommand('cmd_account');"/>
 
   <!-- Options Menu -->
   <command id="cmd_selectAddress" oncommand="goDoCommand('cmd_selectAddress')"/>
   <command id="cmd_outputFormat" oncommand="OutputFormatMenuSelect(event.target)"/>
   <command id="cmd_quoteMessage" oncommand="goDoCommand('cmd_quoteMessage')"/>
 
   <command id="cmd_CustomizeToolbars" oncommand="goCustomizeToolbar(getMailToolbox());"/>
 </commandset>
@@ -296,49 +303,17 @@
                         accesskey="&sendLaterCmd.accesskey;"
                         key="key_sendLater"
                         command="cmd_sendLater"/>
               <menuseparator id="menuFileAfterSendLaterSeparator"/>
               <menuitem id="menu_printSetup"/>
               <menuitem id="menu_print"/>
             </menupopup>
           </menu>
-          <menu id="menu_Edit">
-            <menupopup id="menu_EditPopup" onpopupshowing="updateEditItems();">
-              <menuitem id="menu_undo"/>
-              <menuitem id="menu_redo"/>
-              <menuseparator id="menuEditAfterRedoSeparator"/>
-              <menuitem id="menu_cut"/>
-              <menuitem id="menu_copy"/>
-              <menuitem id="menu_paste"/>
-              <menuitem id="menu_pasteNoFormatting"
-                        command="cmd_pasteNoFormatting"
-                        key="pastenoformattingkb"/>
-              <menuitem id="menu_pasteQuote"/>
-              <menuitem id="menu_rewrap"
-                        label="&editRewrapCmd.label;"
-                        accesskey="&editRewrapCmd.accesskey;"
-                        key="key_rewrap"
-                        command="cmd_rewrap"/>
-              <menuitem id="menu_delete"/>
-              <menuseparator id="menuEditAfterDeleteSeparator"/>
-              <menuitem id="menu_selectAll"/>
-              <menuseparator id="menuEditAfterSelectAllSeparator"/>
-              <menuitem id="menu_find" label="&findCmd.label;"/>
-              <menuitem id="menu_findNext"/>
-              <menuitem id="menu_findPrev"/>
-              <menuseparator id="prefSep"/>
-              <menuitem id="menu_accountmgr"
-                        label="&accountManagerCmd.label;"
-                        accesskey="&accountManagerCmd.accesskey;"
-                        command="cmd_account"/>
-              <menuitem id="menu_preferences"
-                        oncommand="goDoCommand('cmd_preferences')"/>
-            </menupopup>
-          </menu>
+          <menu id="menu_Edit"/>
           <menu id="menu_View">
             <menupopup id="menu_View_Popup">
               <menu id="menu_Toolbars">
                 <menupopup id="view_toolbars_popup"
                            onpopupshowing="onViewToolbarsPopupShowing(event)"
                            oncommand="onViewToolbarCommand(event);">
                   <menuitem id="menu_showFormatToolbar"
                             type="checkbox"
@@ -369,26 +344,16 @@
           <menu id="optionsMenu"
                 label="&optionsMenu.label;"
                 accesskey="&optionsMenu.accesskey;">
             <menupopup id="optionsMenuPopup">
               <menuitem id="menu_selectAddress"
                         label="&selectAddressCmd.label;"
                         accesskey="&selectAddressCmd.accesskey;"
                         command="cmd_selectAddress"/>
-              <menuitem id="menu_checkspelling"
-                        label="&checkSpellingCmd2.label;"
-                        accesskey="&checkSpellingCmd2.accesskey;"
-                        key="key_checkspelling"
-                        command="cmd_spelling"/>
-              <menuitem id="menu_inlineSpellCheck"
-                        type="checkbox"
-                        label="&enableInlineSpellChecker.label;"
-                        accesskey="&enableInlineSpellChecker.accesskey;"
-                        oncommand="EnableInlineSpellCheck(!InlineSpellCheckerUI.enabled);"/>
               <menuitem id="menu_quoteMessage"
                         label="&quoteCmd.label;"
                         accesskey="&quoteCmd.accesskey;"
                         command="cmd_quoteMessage"/>
               <menuseparator id="menuOptionsAfterQuoteSeparator"/>
               <menuitem id="returnReceiptMenu"
                         type="checkbox"
                         label="&returnReceiptMenu.label;"

--- a/suite/mailnews/jar.mn
+++ b/suite/mailnews/jar.mn
@@ -78,16 +78,17 @@ messenger.jar:
     content/messenger/ABSearchDialog.js                                        (search/ABSearchDialog.js)
     content/messenger/FilterListDialog.xul                                     (search/FilterListDialog.xul)
     content/messenger/FilterListDialog.js                                      (search/FilterListDialog.js)
     content/messenger/messengercompose/pref-composing_messages.xul             (compose/prefs/pref-composing_messages.xul)
     content/messenger/messengercompose/pref-composing_messages.js              (compose/prefs/pref-composing_messages.js)
     content/messenger/messengercompose/pref-formatting.xul                     (compose/prefs/pref-formatting.xul)
     content/messenger/messengercompose/pref-formatting.js                      (compose/prefs/pref-formatting.js)
     content/messenger/messengercompose/messengercompose.xul                    (compose/messengercompose.xul)
+    content/messenger/messengercompose/mailComposeOverlay.xul                  (compose/mailComposeOverlay.xul)
     content/messenger/messengercompose/msgComposeContextOverlay.xul            (compose/msgComposeContextOverlay.xul)
     content/messenger/messengercompose/MsgComposeCommands.js                   (compose/MsgComposeCommands.js)
     content/messenger/messengercompose/addressingWidgetOverlay.js              (compose/addressingWidgetOverlay.js)
     content/messenger/messengercompose/addressingWidgetOverlay.xul             (compose/addressingWidgetOverlay.xul)
     content/messenger/messengercompose/mailComposeExtrasOverlay.xul            (compose/mailComposeExtrasOverlay.xul)
     content/messenger/addressbook/addressbook.js                               (addrbook/addressbook.js)
     content/messenger/addressbook/addressbook.xul                              (addrbook/addressbook.xul)
     content/messenger/addressbook/abCommon.js                                  (addrbook/abCommon.js)