diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul
index 12d9bba4f03..f1d2ac84e6d 100644
--- a/mozilla/mailnews/base/resources/content/messenger.xul
+++ b/mozilla/mailnews/base/resources/content/messenger.xul
@@ -2,6 +2,8 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> 
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 
 <!--
 The contents of this file are subject to the Netscape Public
@@ -57,7 +59,6 @@ Rights Reserved.
 <!ENTITY printPreviewCmd.label ".Print Preview">  
 <!ENTITY printCmd.label ".Print">  
 <!ENTITY closeCmd.label "Close">  
-<!ENTITY exitCmd.label "Exit">
 
 <!-- Edit Menu -->
 <!ENTITY editMenu.label "Edit"> 
@@ -222,44 +223,6 @@ Rights Reserved.
 <!ENTITY markFlaggedCmd.label ".Flag">  
 <!ENTITY ignoreThreadCmd.label ".Ignore Thread">  
 <!ENTITY watchThreadCmd.label ".Watch Thread">  
-<!ENTITY taskMenu.label "Tasks">
-<!ENTITY navigatorCmd.label "Navigator">  
-<!ENTITY messengerCmd.label ".Messenger">  
-<!ENTITY composerCmd.label ".Composer">  
-<!ENTITY aimCmd.label ".AOL Instant Messenger Service">  
-<!ENTITY bookmarkMenu.label ".Bookmark"> 
-<!ENTITY addBookmarkCmd.label ".Add Bookmark">  
-<!ENTITY fileBookmarkCmd.label ".File Bookmark">  
-<!ENTITY editBookmarkCmd.label ".Edit Bookmark">  
-<!ENTITY newsgroupsCmd.label ".Newsgroups">  
-<!ENTITY addressBookCmd.label "Address Book">  
-<!ENTITY toolsMenu.label ".Tools"> 
-<!ENTITY historyCmd.label ".History">  
-<!ENTITY securityInfoCmd.label ".Security Info">  
-<!ENTITY messageCenterCmd.label ".Message Center">  
-<!ENTITY importUtilCmd.label ".Import...">  
-<!ENTITY javaConsoleCmd.label ".Java Console">  
-<!ENTITY serverToolsMenu.label ".Server Tools"> 
-<!ENTITY pageServiceMenu.label ".Page Service"> 
-<!ENTITY mailAccountCmd.label ".Mail Account">  
-<!ENTITY mailingListCmd.label ".Mailing List">  
-<!ENTITY folderPermissionCmd.label ".Folder Permissions">  
-<!ENTITY manageNewsgroupsCmd.label ".Manage Newsgroups">  
-<!ENTITY windowCmd.label ".Window">  
-<!ENTITY helpMenu.label ".Help"> 
-<!ENTITY helpContentCmd.label ".Help Content">  
-<!ENTITY referenceLibraryCmd.label ".Reference Library">  
-<!ENTITY releaseNotesCmd.label ".Release Notes">  
-<!ENTITY productInfoCmd.label ".Produce Information and Support">  
-<!ENTITY softwareUpdatesCmd.label ".Software Updates">  
-<!ENTITY registerCmd.label ".Register Now">  
-<!ENTITY memberServicesCmd.label ".Member Services">  
-<!ENTITY internationalCmd.label ".International Users">  
-<!ENTITY securityCmd.label ".Security">  
-<!ENTITY netwatchCmd.label ".NetWatch">  
-<!ENTITY aboutPluginsCmd.label ".About Plug-ins">  
-<!ENTITY aboutFontCmd.label ".About Font Displayers">  
-<!ENTITY aboutCmd.label ".About Communicator...">  
 
 <!-- Toolbar items -->  
 <!ENTITY getMsgButton.img "chrome://messenger/skin/getmsg.gif">
@@ -281,12 +244,12 @@ Rights Reserved.
       
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	title="&messengerWindow.title;"
-	onload="OnLoadMessenger()"
-	onunload="OnUnloadMessenger()"
-	id="messengerWindow"
-    style="width:100%;height:100%" align="vertical" width="640" height="480">
+		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+		title="&messengerWindow.title;"
+		onload="OnLoadMessenger()"
+		onunload="OnUnloadMessenger()"
+		id="messengerWindow"
+		style="width:100%;height:100%" align="vertical" width="640" height="480">
 
 
 <html:script src="chrome://messenger/content/widgetglue.js"/>
@@ -294,7 +257,7 @@ Rights Reserved.
 <html:script src="chrome://messenger/content/shareglue.js"/>
 
   <menubar>
-    <menu name="&fileMenu.label;">
+    <menu id="fileMenu" name="&fileMenu.label;">
       <menu name="&newMenu.label;">
         <menuitem name="&newNavCmd.label;" onclick="NewBrowserWindow();"/>
         <menuitem name="&newMessageCmd.label;" onclick="MsgNewMessage();"/>
@@ -329,7 +292,6 @@ Rights Reserved.
       <menuitem name="&printCmd.label;" onclick="Print();"/>
       <separator/>
       <menuitem name="&closeCmd.label;" onclick="CloseMessenger();"/>
-      <menuitem name="&exitCmd.label;" onclick="Exit();"/>
     </menu>
     <menu name="&editMenu.label;">
       <menuitem name="&undoCmd.label;" onclick="MsgEditUndo();"/>
@@ -534,56 +496,13 @@ Rights Reserved.
       <menuitem name="&ignoreThreadCmd.label;" onclick="MsgIgnoreThread();"/>
       <menuitem name="&watchThreadCmd.label;" onclick="MsgWatchThread();"/>
     </menu>
-    <menu name="&taskMenu.label;">
-      <menuitem name="&navigatorCmd.label;" onclick="NavigatorWindow();"/>
-      <menuitem name="&messengerCmd.label;" onclick="MessengerWindow();"/>
-      <menuitem name="&composerCmd.label;" onclick="ComposerWindow();"/>
-      <menuitem name="&aimCmd.label;" onclick="AIMService();"/>
-      <separator/>
-      <menu name="&bookmarkMenu.label;">
-        <menuitem name="&addBookmarkCmd.label;" onclick="AddBookmark();"/>
-        <menuitem name="&fileBookmarkCmd.label;" onclick="FileBookmark();"/>
-        <menuitem name="&editBookmarkCmd.label;" onclick="EditBookmark();"/>
-      </menu>
-      <menuitem name="&newsgroupsCmd.label;" onclick="Newsgroups();"/>
-      <menuitem name="&addressBookCmd.label;" onclick="AddressBook();"/>
-      <separator/>
-      <menu name="&toolsMenu.label;">
-        <menuitem name="&historyCmd.label;" onclick="History();"/>
-        <menuitem name="&securityInfoCmd.label;" onclick="SecurityInfo();"/>
-        <menuitem name="&messageCenterCmd.label;" onclick="MessengerCenter();"/>
-        <menuitem name="&importUtilCmd.label;" onclick="Import();"/>
-        <menuitem name="&javaConsoleCmd.label;" onclick="JavaConsole();"/>
-      </menu>
-      <menu name="&serverToolsMenu.label;">
-        <menuitem name="&pageServiceMenu.label;" onclick="PageService();"/>
-        <menuitem name="&mailAccountCmd.label;" onclick="MailAccount();"/>
-        <menuitem name="&mailingListCmd.label;" onclick="MaillingList();"/>
-        <menuitem name="&folderPermissionCmd.label;" onclick="FolderPermission();"/>
-        <menuitem name="&manageNewsgroupsCmd.label;" onclick="ManageNewsgroup();"/>
-      </menu>
-      <separator/>
-      <menuitem name="&windowCmd.label;" onclick="WindowList();"/>
-     </menu>
-    <menu name="&helpMenu.label;">
-      <menuitem name="&helpContentCmd.label;" onclick="Help();"/>
-      <menuitem name="&referenceLibraryCmd.label;" onclick="Help();"/>
-      <menuitem name="&releaseNotesCmd.label;" onclick="Help();"/>
-      <menuitem name="&productInfoCmd.label;" onclick="Help();"/>
-      <separator/>
-      <menuitem name="&softwareUpdatesCmd.label;" onclick="Help();"/>
-      <menuitem name="&registerCmd.label;" onclick="Help();"/>
-      <menuitem name="&memberServicesCmd.label;" onclick="Help();"/>
-      <separator/>
-      <menuitem name="&internationalCmd.label;" onclick="Help();"/>
-      <menuitem name="&securityCmd.label;" onclick="Help();"/>
-      <menuitem name="&netwatchCmd.label;" onclick="Help();"/>
-      <separator/>
-      <menuitem name="&aboutPluginsCmd.label;" onclick="About();"/>
-      <menuitem name="&aboutFontCmd.label;" onclick="About();"/>
-      <menuitem name="&aboutCmd.label;" onclick="About();"/>
-    </menu>
+    
+	<menu id="tasksMenu"/>
+	<menu id="helpMenu"/>
+
   </menubar>
+
+
    <toolbox>
 	  <toolbar>
 	  <titledbutton src="&getMsgButton.img;" align="bottom" value="&getMsgButton.label;" onclick="MsgGetMessage()"/>
@@ -614,5 +533,6 @@ Rights Reserved.
 	<titledbutton id="statusText" align="right" flex="100%" value="Document: Done" style="font-family:sans-serif;font-size:2.5mm">
 	</titledbutton>
     </box>
+
 </window>
 
diff --git a/mozilla/mailnews/base/resources/content/shareglue.js b/mozilla/mailnews/base/resources/content/shareglue.js
index f38aa67a322..687eb4b668e 100644
--- a/mozilla/mailnews/base/resources/content/shareglue.js
+++ b/mozilla/mailnews/base/resources/content/shareglue.js
@@ -65,12 +65,6 @@ function CloseMessenger()
 	messenger.Close();
 }
 
-function Exit()
-{
-  dump("\nExit from XUL\n");
-  messenger.Exit();
-}
-
 function CharacterSet(){}
 
 function MessengerSetDefaultCharacterSet(aCharset)
@@ -83,49 +77,3 @@ function MessengerSetDefaultCharacterSet(aCharset)
     MsgReload();
 }
 
-function NavigatorWindow()
-{
-	var toolkitCore = XPAppCoresManager.Find("ToolkitCore");
-	if (!toolkitCore)
-	{
-		toolkitCore = new ToolkitCore();
-		if (toolkitCore)
-		{
-			toolkitCore.Init("ToolkitCore");
-		}
-    }
-
-    if (toolkitCore)
-	{
-      toolkitCore.ShowWindow("chrome://navigator/content/",
-                             window);
-    }
-
-
-}
-function MessengerWindow() {}
-function ComposerWindow() {}
-function AIMService() {}
-function AddBookmark() {}
-function FileBookmark() {}
-function EditBookmark() {}
-function Newsgroups() {}
-function AddressBook() 
-{
-	var wind = window.open("chrome://addressbook/content/addressbook.xul",
-							 "addressbook", "chrome");
-	return wind;
-}
-
-function History() {}
-function SecurityInfo() {}
-function MessengerCenter() {}
-function JavaConsole() {}
-function PageService() {}
-function MailAccount() {}
-function MaillingList() {}
-function FolderPermission() {}
-function ManageNewsgroup() {}
-function WindowList() {}
-function Help() {}
-function About() {}
diff --git a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
index 75493ef099a..f7b1dcf1d14 100644
--- a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
+++ b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
@@ -191,14 +191,6 @@ function ComposeUnload(calledFromExit)
 	//...and what's about the editor appcore, how can we release it?
 }
 
-function ComposeExit()
-{
-	dump("\nComposeExit from XUL\n");
-
-	//editor appcore knows how to shutdown the application, just use it...
-	window.editorShell.Exit();
-}
-
 function SetDocumentCharacterSet(aCharset)
 {
 	dump("SetDocumentCharacterSet Callback!\n");
diff --git a/mozilla/mailnews/compose/resources/content/messengercompose.xul b/mozilla/mailnews/compose/resources/content/messengercompose.xul
index 6babc993081..0200d65813e 100644
--- a/mozilla/mailnews/compose/resources/content/messengercompose.xul
+++ b/mozilla/mailnews/compose/resources/content/messengercompose.xul
@@ -1,6 +1,8 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messengercompose/skin/" type="text/css"?> 
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 
 <!--
 The contents of this file are subject to the Netscape Public
@@ -24,7 +26,6 @@ Rights Reserved.
 
 <!DOCTYPE window
 [
-
 <!ENTITY msgComposeWindow.title "Message Compose">
 
 <!-- address labels -->
@@ -53,7 +54,6 @@ Rights Reserved.
 <!ENTITY printPreviewCmd.label ".Print Preview">
 <!ENTITY printCmd.label ".Print">
 <!ENTITY closeCmd.label ".Close">
-<!ENTITY exitCmd.label "Exit">
 
 <!-- Edit menu items -->
 <!ENTITY editMenu.label ".Edit">
@@ -132,7 +132,7 @@ Rights Reserved.
 <observes element="dialog.start" attribute="ready" onchange="ComposeStartup()"/>
 
 <menubar>
-	<menu name="File">
+	<menu id="fileMenu" name="&fileMenu.label;">
 		<menuitem name="&newCmd.label;" cmd="nsCmd:ComposeNew"/>
 		<menuitem name="&saveCmd.label;" cmd="nsCmd:ComposeSave"/>
 		<menuitem name="&saveAsCmd.label;" onclick="SaveAsDraft()"/>
@@ -149,7 +149,6 @@ Rights Reserved.
 		<menuitem name="&printCmd.label;" cmd="nsCmd:BrowserPrint"/>
 		<separator/>
 		<menuitem name="&closeCmd.label;" cmd="nsCmd:BrowserClose"/>
-		<menuitem name="&exitCmd.label;" onclick="ComposeExit()"/>
 	</menu>
     <menu name="&editMenu.label;">
 		<menuitem name="&undoCmd.label;" cmd="nsCmd:ComposeNYI"/>
@@ -220,6 +219,9 @@ Rights Reserved.
     <menu name="&toolsMenu.label;">
 		<menuitem name="&checkSpellCmd.label;" cmd="nsCmd:ComposeSpelling"/>
     </menu>
+
+	<menu id="tasksMenu"/>
+	<menu id="helpMenu"/>
 </menubar>
 
 <!-- box id="toolbar" align="vertical" style="width:100%;height:100%" -->