diff --git a/mail/base/content/contents.rdf b/mail/base/content/contents.rdf
index bb274e6b725..1d0b7aa2540 100644
--- a/mail/base/content/contents.rdf
+++ b/mail/base/content/contents.rdf
@@ -5,14 +5,14 @@
 
   <!-- list all the packages being supplied by this jar -->
   <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger"/>
+    <RDF:li resource="urn:mozilla:package:mail"/>
   </RDF:Seq>
 
   <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger"
+  <RDF:Description about="urn:mozilla:package:mail"
         chrome:displayName="Messenger"
         chrome:author="mozilla.org"
-        chrome:name="messenger"
+        chrome:name="mail"
         chrome:localeVersion="1.2a"
         chrome:skinVersion="1.2">
   </RDF:Description>
@@ -24,79 +24,51 @@
     <RDF:li resource="chrome://communicator/content/pref/pref-scripts.xul"/>
     <RDF:li resource="chrome://cookie/content/pref-cookies.xul"/>
     <RDF:li resource="chrome://cookie/content/pref-images.xul"/>
-    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
-    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
-    <RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
-    <RDF:li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/>
-    <RDF:li resource="chrome://messenger/content/addressbook/addressbook.xul"/>
-    <RDF:li resource="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul"/>
-    <RDF:li resource="chrome://editor/content/editor.xul"/>
-    <RDF:li resource="chrome://editor/content/editorTasksOverlay.xul"/>
+    <RDF:li resource="chrome://mail/content/messengercompose/messengercompose.xul"/>
+    <RDF:li resource="chrome://mail/content/addressbook/addressbook.xul"/>
+    <RDF:li resource="chrome://mail/content/addressbook/abSelectAddressesDialog.xul"/>
   </RDF:Seq>
 
 
   <!-- messenger preferences branches -->
   <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+    <RDF:li>chrome://mail/content/mailPrefsOverlay.xul</RDF:li>
   </RDF:Seq>
 
   <!-- messenger startup pref -->
   <RDF:Seq about="chrome://communicator/content/pref/pref-appearance.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+    <RDF:li>chrome://mail/content/mailPrefsOverlay.xul</RDF:li>
   </RDF:Seq>
 
   <!-- messenger js toggle pref -->
   <RDF:Seq about="chrome://communicator/content/pref/pref-scripts.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+    <RDF:li>chrome://mail/content/mailPrefsOverlay.xul</RDF:li>
   </RDF:Seq>
 
   <!-- messenger cookie toggle pref -->
   <RDF:Seq about="chrome://cookie/content/pref-cookies.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+    <RDF:li>chrome://mail/content/mailPrefsOverlay.xul</RDF:li>
   </RDF:Seq>
 
   <!-- messenger image toggle pref -->
   <RDF:Seq about="chrome://cookie/content/pref-images.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger taskbar/tasks menu items -->
-  <RDF:Seq about="chrome://editor/content/editorTasksOverlay.xul">
-    <RDF:li>chrome://messenger/content/mailTasksOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger items for Navigator -->
-  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
-    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger items for Messenger -->
-  <RDF:Seq about="chrome://messenger/content/messenger.xul">
-    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
-  </RDF:Seq>
-  <RDF:Seq about="chrome://messenger/content/mail3PaneWindowVertLayout.xul">
-    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
+    <RDF:li>chrome://mail/content/mailPrefsOverlay.xul</RDF:li>
   </RDF:Seq>
 
   <!-- messenger items for Mail Compose -->
-  <RDF:Seq about="chrome://messenger/content/messengercompose/messengercompose.xul">
-    <RDF:li>chrome://messenger/content/mailMessengerComposeOverlay.xul</RDF:li>
+  <RDF:Seq about="chrome://mail/content/messengercompose/messengercompose.xul">
+    <RDF:li>chrome://mail/content/mailMessengerComposeOverlay.xul</RDF:li>
   </RDF:Seq>
   
   <!-- messenger items for Addressbook -->
-  <RDF:Seq about="chrome://messenger/content/addressbook/addressbook.xul">
-    <RDF:li>chrome://messenger/content/mailABOverlay.xul</RDF:li>
+  <RDF:Seq about="chrome://mail/content/addressbook/addressbook.xul">
+    <RDF:li>chrome://mail/content/mailABOverlay.xul</RDF:li>
   </RDF:Seq>
   
   <!-- messenger items for Select Addresses dialog -->
-  <RDF:Seq about="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul">
-    <RDF:li>chrome://messenger/content/mailOverlay.xul</RDF:li>
+  <RDF:Seq about="chrome://mail/content/addressbook/abSelectAddressesDialog.xul">
+    <RDF:li>chrome://mail/content/mailOverlay.xul</RDF:li>
   </RDF:Seq>
 
-
-  <!-- messenger items for Composer -->
-  <RDF:Seq about="chrome://editor/content/editor.xul">
-    <RDF:li>chrome://messenger/content/mailEditorOverlay.xul</RDF:li>
-  </RDF:Seq>
   
 </RDF:RDF>
diff --git a/mail/base/content/mail.xul b/mail/base/content/mail.xul
new file mode 100644
index 00000000000..82ba2969318
--- /dev/null
+++ b/mail/base/content/mail.xul
@@ -0,0 +1,1912 @@
+<?xml version="1.0"?> 
+<!--
+The contents of this file are subject to the Netscape 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/NPL/
+
+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 Netscape are
+Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+-->
+<?xml-stylesheet href="chrome://messenger/skin/mailWindow1.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/threadPane.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/threadPaneExtras.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/threadPaneLabels.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/folderPaneExtras.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/fakeAccount.css" type="text/css"?>
+
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+<?xul-overlay href="chrome://mail/content/msgHdrViewOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % messengerDTD SYSTEM "chrome://mail/locale/messenger.dtd" >
+%messengerDTD;
+<!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
+%contentAreaCommandsDTD;
+<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charset.dtd" >
+%charsetDTD;
+]>
+
+<window id="messengerWindow"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:nc="http://home.netscape.com/NC-rdf#"
+        title="&messengerWindow.title;"
+        titlemodifier="&titleModifier.label;"
+        titlemenuseparator="&titleSeparator.label;"
+        onload="OnLoadMessenger()"
+        onunload="OnUnloadMessenger()"
+        width="750"
+        height="500"
+        screenX="10" screenY="10"
+        persist="width height screenX screenY sizemode"
+        windowtype="mail:3pane">
+
+<stringbundleset id="stringbundleset">
+  <stringbundle id="bundle_messenger" src="chrome://mail/locale/messenger.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_search" src="chrome://mail/locale/search.properties"/>
+  <stringbundle id="bundle_offlinePrompts" src="chrome://mail/locale/offline.properties"/>
+  <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
+</stringbundleset>
+
+<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/widgetglue.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/commandglue.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/shareglue.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/msgViewNavigation.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/mailWindow.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/msgMail3PaneWindow.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/mail3PaneWindowCommands.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/mailContextMenus.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/messengerdnd.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/msgAccountCentral.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/mail-offline.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/searchBar.js"/>
+<script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/threadPane.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/mailCommands.js"/>
+<script type="application/x-javascript" src="chrome://mail/content/mailWindowOverlay.js"/>
+<script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
+<script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
+<script type="application/x-javascript" src="chrome://global/content/charset.js"/>
+
+  <command id="cmd_quit"/>
+  <!--The cmd_createFilterFromPopup is used to notify the email context popup -->
+  <command id="cmd_createFilterFromPopup"/>
+  <!-- <command id="cmd_pageSetup"/>-->
+  <command id="cmd_search" oncommand="goDoCommand('cmd_search')" disabled="true"/>
+  <command id="cmd_textZoomReduce"  oncommand="ZoomManager.prototype.getInstance().reduce();"/>
+  <command id="cmd_textZoomEnlarge" oncommand="ZoomManager.prototype.getInstance().enlarge();"/>
+  <commandset id="mailFileMenuItems"
+              commandupdater="true"
+              events="create-menu-file"
+              oncommandupdate="goUpdateMailMenuItems(this)">
+  
+      <command id="cmd_getNewMessages" oncommand="goDoCommand('cmd_getNewMessages')" disabled="true"/>
+      <command id="cmd_close" oncommand="goDoCommand('cmd_close')"/>
+      <command id="cmd_open" oncommand="goDoCommand('cmd_open')"/>
+      
+      <command id="cmd_file" disabled="true"/>
+  
+      <command id="cmd_emptyTrash" oncommand="goDoCommand('cmd_emptyTrash')" disabled="true"/>
+      <command id="cmd_compactFolder" oncommand="goDoCommand('cmd_compactFolder')" disabled="true"/>
+      <command id="cmd_synchronizeOffline" oncommand="goDoCommand('cmd_synchronizeOffline')" disabled="true"/>
+      <command id="cmd_downloadFlagged" oncommand="goDoCommand('cmd_downloadFlagged')" disabled="true"/>
+      <command id="cmd_downloadSelected" oncommand="goDoCommand('cmd_downloadSelected')" disabled="true"/>
+      <command id="cmd_settingsOffline" oncommand="goDoCommand('cmd_settingsOffline')" disabled="true"/>
+      
+      <command id="cmd_openMessage" oncommand="goDoCommand('cmd_openMessage')" disabled="true"/>
+      <command id="cmd_printSetup" oncommand="goDoCommand('cmd_printSetup')" disabled="true"/>
+      <command id="cmd_print" oncommand="goDoCommand('cmd_print')" disabled="true"/>
+      <command id="cmd_saveAsFile" oncommand="goDoCommand('cmd_saveAsFile')" disabled="true"/>
+      <command id="cmd_saveAsTemplate" oncommand="goDoCommand('cmd_saveAsTemplate')" disabled="true"/>    
+      <command id="cmd_getNextNMessages" oncommand="goDoCommand('cmd_getNextNMessages')" disabled="true"/>
+      <command id="cmd_renameFolder" oncommand="goDoCommand('cmd_renameFolder')" />
+      <command id="cmd_sendUnsentMsgs" oncommand="goDoCommand('cmd_sendUnsentMsgs')" />
+  </commandset>
+  <commandset id="mailViewMenuItems"
+              commandupdater="true"
+              events="create-menu-view"
+              oncommandupdate="goUpdateMailMenuItems(this)">
+  
+     <command id="cmd_viewPageSource" oncommand="goDoCommand('cmd_viewPageSource')" disabled="true"/>
+     <command id="cmd_setFolderCharset" oncommand="goDoCommand('cmd_setFolderCharset')" />
+     <command id="cmd_reload" oncommand="goDoCommand('cmd_reload')" disabled="true"/>
+     <command id="cmd_expandAllThreads" oncommand="goDoCommand('cmd_expandAllThreads')" disabled="true"/>
+     <command id="cmd_collapseAllThreads" oncommand="goDoCommand('cmd_collapseAllThreads')" disabled="true"/>
+     <command id="cmd_viewAllMsgs" oncommand="goDoCommand('cmd_viewAllMsgs')" disabled="true"/>
+     <command id="cmd_viewUnreadMsgs" oncommand="goDoCommand('cmd_viewUnreadMsgs')" disabled="true"/>
+     <command id="cmd_viewThreadsWithUnread" oncommand="goDoCommand('cmd_viewThreadsWithUnread')" disabled="true"/>
+     <command id="cmd_viewWatchedThreadsWithUnread" oncommand="goDoCommand('cmd_viewWatchedThreadsWithUnread')" disabled="true"/>
+     <command id="cmd_viewIgnoredThreads" oncommand="goDoCommand('cmd_viewIgnoredThreads')" disabled="true"/>
+     <command id="cmd_sortByThread" oncommand="goDoCommand('cmd_sortByThread')" disabled="true"/>
+  </commandset>
+  <commandset id="mailEditMenuItems"
+              commandupdater="true"
+              events="create-menu-edit"
+              oncommandupdate="goUpdateMailMenuItems(this)">
+  
+    <command id="cmd_undo"
+           valueDeleteMsg="&undoDeleteMsgCmd.label;"
+           valueMoveMsg="&undoMoveMsgCmd.label;"
+           valueCopyMsg="&undoCopyMsgCmd.label;"
+           valueDefault="&undoDefaultCmd.label;"/>
+    <command id="cmd_redo"
+           valueDeleteMsg="&redoDeleteMsgCmd.label;"
+           valueMoveMsg="&redoMoveMsgCmd.label;"
+           valueCopyMsg="&redoCopyMsgCmd.label;"
+           valueDefault="&redoDefaultCmd.label;"/>
+    <command id="cmd_cut"/>
+    <command id="cmd_copy"/>
+    <command id="cmd_paste"/>
+    <command id="cmd_delete"
+           valueFolder="&deleteFolderCmd.label;"
+           valueFolderAccessKey="&deleteFolderCmd.accesskey;"
+           valueNewsgroup="&unsubscribeNewsgroupCmd.label;"
+           valueNewsgroupAccessKey="&unsubscribeNewsgroupCmd.accesskey;"
+           valueMessage="&deleteMsgCmd.label;"
+           valueMessageAccessKey="&deleteMsgCmd.accesskey;"
+           valueIMAPDeletedMessage="&undeleteMsgCmd.label;"
+           valueIMAPDeletedMessageAccessKey="&undeleteMsgCmd.accesskey;"
+           valueNewsMessage="&cancelNewsMsgCmd.label;"
+           valueNewsMessageAccessKey="&cancelNewsMsgCmd.accesskey;"
+           valueMessages="&deleteMsgsCmd.label;"
+           valueMessagesAccessKey="&deleteMsgsCmd.accesskey;"
+           valueIMAPDeletedMessages="&undeleteMsgsCmd.label;"
+           valueIMAPDeletedMessagesAccessKey="&undeleteMsgsCmd.accesskey;"
+           valueNewsMessages="&cancelNewsMsgsCmd.label;"
+           valueNewsMessagesAccessKey="&cancelNewsMsgsCmd.accesskey;"/>
+    <command id="cmd_selectAll"/>
+    <command id="cmd_selectThread" oncommand="goDoCommand('cmd_selectThread')"/>
+    <command id="cmd_selectFlagged" oncommand="goDoCommand('cmd_selectFlagged')"/>
+    <command id="cmd_properties" oncommand="goDoCommand('cmd_properties')"
+           valueNewsgroup="&folderPropsNewsgroupCmd.label;"
+           valueFolder="&folderPropsFolderCmd.label;"
+           valueGeneric="&folderPropsCmd.label;"/>
+    <command id="cmd_find" oncommand="goDoCommand('cmd_find')" disabled="true"/>
+    <command id="cmd_findAgain" oncommand="goDoCommand('cmd_findAgain')" disabled="true"/>
+    <command id="cmd_findPrev"  oncommand="goDoCommand('cmd_findPrev')"  disabled="true"/>
+    <command id="cmd_stop" oncommand="MsgStop();"/>
+  </commandset>
+  <commandset id="mailEditContextMenuItems">
+    <command id="cmd_copyLink"/>
+    <command id="cmd_copyImageLocation"/>
+    <command id="cmd_copyImageContents"/>
+  </commandset>
+  <commandset id="mailSearchMenuItems"/>
+  <commandset id="mailGoMenuItems"
+              commandupdater="true"
+              events="create-menu-go"
+              oncommandupdate="goUpdateMailMenuItems(this)">
+  
+    <command id="cmd_nextMsg" oncommand="goDoCommand('cmd_nextMsg')" disabled="true"/>
+    <command id="cmd_nextUnreadMsg" oncommand="goDoCommand('cmd_nextUnreadMsg')" disabled="true"/>
+    <command id="cmd_nextFlaggedMsg" oncommand="goDoCommand('cmd_nextFlaggedMsg')" disabled="true"/>
+    <command id="cmd_nextUnreadThread" oncommand="goDoCommand('cmd_nextUnreadThread')" disabled="true"/>
+    <command id="cmd_previousMsg" oncommand="goDoCommand('cmd_previousMsg')" disabled="true"/>
+    <command id="cmd_previousUnreadMsg" oncommand="goDoCommand('cmd_previousUnreadMsg')" disabled="true"/>
+    <command id="cmd_previousFlaggedMsg" oncommand="goDoCommand('cmd_previousFlaggedMsg')" disabled="true"/>
+  </commandset>
+  <commandset id="mailMessageMenuItems"
+              commandupdater="true"
+              events="create-menu-message"
+              oncommandupdate="goUpdateMailMenuItems(this)">
+    <command id="cmd_reply" oncommand="goDoCommand('cmd_reply')"/>
+    <command id="cmd_replySender" oncommand="goDoCommand('cmd_replySender')"/>
+    <command id="cmd_replyGroup" oncommand="goDoCommand('cmd_replyGroup')"/>
+    <command id="cmd_replyall" oncommand="goDoCommand('cmd_replyall')"/>
+    <command id="cmd_forward" oncommand="goDoCommand('cmd_forward')"/>
+    <command id="cmd_forwardInline" oncommand="goDoCommand('cmd_forwardInline')"/>
+    <command id="cmd_forwardAttachment" oncommand="goDoCommand('cmd_forwardAttachment')"/>
+    <command id="cmd_editAsNew" oncommand="goDoCommand('cmd_editAsNew')"/>
+    <command id="cmd_createFilterFromMenu" oncommand="goDoCommand('cmd_createFilterFromMenu')"/>
+    <command id="cmd_killThread" oncommand="goDoCommand('cmd_killThread')"/>
+    <command id="cmd_watchThread" oncommand="goDoCommand('cmd_watchThread')"/> 
+  </commandset>
+  <commandset id="mailToolbarItems"
+              commandupdater="true"
+              events="mail-toolbar"
+              oncommandupdate="goUpdateMailMenuItems(this)">
+    
+    <command id="button_reply"/>
+    <command id="button_replyall"/>
+    <command id="button_forward"/>
+    <command id="button_delete"/>
+    <command id="button_mark"/>
+    <command id="button_getNewMessages"/>
+    <command id="button_print"/>
+    <command id="button_next"/>
+    <command id="button_file"/>
+    <command id="cmd_delete"/>
+    <command id="button_junk"/>
+  </commandset>
+  <command id="cmd_searchMsgs" oncommand="MsgSearchMessages();"/>
+  <commandset id="mailGetMsgMenuItems"
+              commandupdater="true"
+              events="create-menu-getMsgToolbar,create-menu-file"
+              oncommandupdate="goUpdateMailMenuItems(this)">
+  
+      <command id="cmd_getMsgsForAuthAccounts" 
+               oncommand="goDoCommand('cmd_getMsgsForAuthAccounts'); event.preventBubble()" 
+               disabled="true"/>
+  </commandset>
+  <commandset id="mailMarkMenuItems"
+                commandupdater="true"
+                events="create-menu-mark"
+                oncommandupdate="goUpdateMailMenuItems(this)">
+  
+      <command id="cmd_markAsRead" oncommand="goDoCommand('cmd_markAsRead'); event.preventBubble()" disabled="true"/>
+      <command id="cmd_markAllRead" oncommand="goDoCommand('cmd_markAllRead'); event.preventBubble()" disabled="true"/>
+      <command id="cmd_markThreadAsRead" oncommand="goDoCommand('cmd_markThreadAsRead'); event.preventBubble()" disabled="true"/>
+      <command id="cmd_markAsFlagged" oncommand="goDoCommand('cmd_markAsFlagged'); event.preventBubble()" disabled="true"/>
+  </commandset>
+  <commandset id="mailLabelMenuItems"
+                commandupdater="true"
+                events="create-menu-label"
+                oncommandupdate="goUpdateMailMenuItems(this)">
+  
+      <command id="cmd_label0" oncommand="goDoCommand('cmd_label0');" disabled="true"/>
+      <command id="cmd_label1" oncommand="goDoCommand('cmd_label1');" disabled="true"/>
+      <command id="cmd_label2" oncommand="goDoCommand('cmd_label2');" disabled="true"/>
+      <command id="cmd_label3" oncommand="goDoCommand('cmd_label3');" disabled="true"/>
+      <command id="cmd_label4" oncommand="goDoCommand('cmd_label4');" disabled="true"/>
+      <command id="cmd_label5" oncommand="goDoCommand('cmd_label5');" disabled="true"/>
+  </commandset>
+  <commandset id="globalEditMenuItems"
+              commandupdater="true"
+              events="create-menu-edit"
+              oncommandupdate="goUpdateGlobalEditMenuItems()"/>
+  <commandset id="selectEditMenuItems"
+              commandupdater="true"
+              events="create-menu-edit"
+              oncommandupdate="goUpdateSelectEditMenuItems()"/>
+  <commandset id="clipboardEditMenuItems"/>
+  <commandset id="FocusRingUpdate_Mail"
+        commandupdater="true"
+        events="focus"
+        oncommandupdate="FocusRingUpdate_Mail()"/>
+  <command id="cmd_newMessage" oncommand="goOpenNewMessage();"/>
+  <command id="cmd_newCard" oncommand="openNewCardDialog()"/>
+
+<broadcasterset id="mailBroadcasters">
+  <!-- File Menu -->
+  <broadcaster id="Communicator:WorkMode"/>
+  <!-- Edit Menu -->
+</broadcasterset>
+
+<keyset>
+    <key id="space" key=" " oncommand="SpaceHit()"/>
+
+  <key id="key_textZoomReduce"  key="&textZoomReduceCmd.commandkey;"   command="cmd_textZoomReduce"  modifiers="accel"/>
+  <key id="key_textZoomEnlarge" key="&textZoomEnlargeCmd.commandkey;"  command="cmd_textZoomEnlarge" modifiers="accel"/>
+
+  <!-- File Menu -->
+  <key id="key_close"/>
+  <key id="key_quit"/>
+  <!-- Edit Menu -->
+  <key id="key_undo"/>
+  <key id="key_redo"/>
+  <key id="key_cut"/>
+  <key id="key_copy"/>
+  <key id="key_paste"/>
+  <key id="key_delete" oncommand="goDoCommand('cmd_delete');" shift="false"/>
+  <key id="cmd_shiftDelete" keycode="VK_DELETE"  xulkey="false" modifiers="shift" oncommand="goDoCommand('cmd_shiftDelete')"/>
+  <key id="key_selectAll"/>
+  <key id="key_selectThread" key="&selectThreadCmd.key;"             oncommand="goDoCommand('cmd_selectThread');" modifiers="accel, shift"/>
+  <key id="key_newMessage"   key="&newMessageCmd.key;" command="cmd_newMessage" modifiers="accel"/>
+  <key id="key_toggleRead" key="&markAsReadCmd.key;"                 oncommand="goDoCommand('cmd_markAsRead');"/>
+  <key id="key_markAllRead" key="&markAllReadCmd.key;"               oncommand="goDoCommand('cmd_markAllRead');" modifiers="accel, shift"/>
+  <key id="key_markThreadAsRead" key="&markThreadAsReadCmd.key;"     oncommand="goDoCommand('cmd_markThreadAsRead')"/>
+  <key id="key_nextMsg" key="&nextMsgCmd.key;"                       oncommand="goDoCommand('cmd_nextMsg')"/>
+  <key id="key_nextUnreadMsg" key="&nextUnreadMsgCmd.key;"           oncommand="goDoCommand('cmd_nextUnreadMsg')"/>
+  <key id="key_expandAllThreads" key="&expandAllThreadsCmd.key;"     oncommand="goDoCommand('cmd_expandAllThreads')"/>
+  <key id="key_collapseAllThreads" key="&collapseAllThreadsCmd.key;" oncommand="goDoCommand('cmd_collapseAllThreads')"/>
+  <key id="key_nextUnreadThread" key="&nextUnreadThreadCmd.key;"     oncommand="goDoCommand('cmd_nextUnreadThread')"/>
+  <key id="key_previousMsg" key="&previousMsgCmd.key;"               oncommand="goDoCommand('cmd_previousMsg')"/>
+  <key id="key_previousUnreadMsg" key="&previousUnreadMsgCmd.key;"   oncommand="goDoCommand('cmd_previousUnreadMsg')"/>
+  <key id="key_reply" key="&replyMsgCmd.key;"                        oncommand="goDoCommand('cmd_reply')" modifiers="accel"/>
+  <key id="key_replyall" key="&replyToAllMsgCmd.key;"                oncommand="goDoCommand('cmd_replyall')" modifiers="accel, shift"/>
+  <key id="key_forward" key="&forwardMsgCmd.key;"                    oncommand="goDoCommand('cmd_forward')" modifiers="accel"/>
+  <key id="key_editAsNew" key="&editMsgAsNewCmd.key;"                oncommand="goDoCommand('cmd_editAsNew')" modifiers="accel"/>
+  <key id="key_watchThread" key="&watchThreadMenu.key;"              oncommand="goDoCommand('cmd_watchThread')" />
+  <key id="key_killThread" key="&killThreadMenu.key;"                oncommand="goDoCommand('cmd_killThread')" />
+  <key id="key_openMessage" key="&openMessageWindowCmd.key;"         oncommand="goDoCommand('cmd_openMessage')" modifiers="accel"/>
+  <key id="key_print" key="&printCmd.key;"                           oncommand="goDoCommand('cmd_print')" modifiers="accel"/>
+  <key id="key_saveAsFile" key="&saveAsFileCmd.key;"                 oncommand="goDoCommand('cmd_saveAsFile')" modifiers="accel"/>
+  <key id="key_viewPageSource" key="&pageSourceCmd.key;"             oncommand="goDoCommand('cmd_viewPageSource')" modifiers="accel"/>
+  <key id="key_getNewMessages" key="&getNewMsgCmd.key;"              oncommand="goDoCommand('cmd_getNewMessages')" modifiers="accel"/>
+        <key id="key_getAllNewMessages" 
+             key="&getAllNewMsgCmd.key;"  
+             oncommand="goDoCommand('cmd_getMsgsForAuthAccounts');"
+             modifiers="accel, shift"/>
+  <key id="key_find" key="&findCmd.key;"  oncommand="goDoCommand('cmd_find')" modifiers="accel"/>
+  <key id="key_findAgain" key="&findAgainCmd.key;"   oncommand="goDoCommand('cmd_findAgain')" modifiers="accel"/>
+  <key id="key_findPrev"  key="&findPrevCmd.key;"    oncommand="goDoCommand('cmd_findPrev')"  modifiers="accel, shift"/>
+  <key keycode="&findAgainCmd.key2;"   oncommand="goDoCommand('cmd_findAgain')"/>
+  <key keycode="&findPrevCmd.key2;"    oncommand="goDoCommand('cmd_findPrev')"  modifiers="shift"/>
+  <key id="key_stop" keycode="VK_ESCAPE" command="cmd_stop"/>
+
+  <!-- Tab/F6 Keys -->
+  <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
+  <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
+  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
+  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
+  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="shift"/>
+  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);"/>
+
+  <!-- Label Keys -->
+  <key id="key_label0" charcode="&labelCmd0.key;"  oncommand="goDoCommand('cmd_label0')"/>
+  <key id="key_label1" charcode="&labelCmd1.key;"  oncommand="goDoCommand('cmd_label1')"/>
+  <key id="key_label2" charcode="&labelCmd2.key;"  oncommand="goDoCommand('cmd_label2')"/>
+  <key id="key_label3" charcode="&labelCmd3.key;"  oncommand="goDoCommand('cmd_label3')"/>
+  <key id="key_label4" charcode="&labelCmd4.key;"  oncommand="goDoCommand('cmd_label4')"/>
+  <key id="key_label5" charcode="&labelCmd5.key;"  oncommand="goDoCommand('cmd_label5')"/>
+
+  <key id="key_searchMail" key="&searchMailCmd.key;" command="cmd_searchMsgs" modifiers="accel, shift"/>
+</keyset>
+
+  <popup id="threadPaneContext" onpopupshowing="return fillThreadPaneContextMenu();"
+    onpopuphiding="if (event.target == this) threadPaneOnPopupHiding();">
+    <menuitem id="threadPaneContext-openNewWindow"
+        label="&contextOpenNewWindow.label;"
+        accesskey="&contextOpenNewWindow.accesskey;"
+        oncommand="MsgOpenNewWindowForMessage();"/>
+    <menuseparator id="threadPaneContext-sep-open"/>
+    <menuitem id="threadPaneContext-replySender"
+        label="&contextReplySender.label;"
+        accesskey="&contextReplySender.accesskey;"
+        oncommand="MsgReplySender(event);"/>
+    <menuitem id="threadPaneContext-replyNewsgroup"
+        label="&contextReplyNewsgroup.label;"
+        accesskey="&contextReplyNewsgroup.accesskey;"
+        oncommand="MsgReplyGroup(event);"/>
+    <menuitem id="threadPaneContext-replyAll"
+        label="&contextReplyAll.label;"
+        accesskey="&contextReplyAll.accesskey;"
+        oncommand="MsgReplyToAllMessage(event);"/>
+    <menuitem id="threadPaneContext-forward"
+        label="&contextForward.label;"
+        accesskey="&contextForward.accesskey;"
+        oncommand="MsgForwardMessage(event);"/>
+    <menuitem id="threadPaneContext-forwardAsAttachment"
+        label="&contextForwardAsAttachment.label;"
+        accesskey="&contextForwardAsAttachment.accesskey;"
+        oncommand="MsgForwardAsAttachment(event);"/>
+    <menuitem id="threadPaneContext-editAsNew"
+        label="&contextEditAsNew.label;"
+        accesskey="&contextEditAsNew.accesskey;"
+        oncommand="MsgEditMessageAsNew();"/>
+    <menuseparator id="threadPaneContext-sep-reply"/>
+    <menuitem id="threadPaneContext-copyMessageUrl"
+        label="&copyMessageLocation.label;"
+        accesskey="&copyMessageLocation.accesskey;"
+        oncommand="CopyMessageUrl()"/>
+    <menu id="threadPaneContext-moveMenu"
+        label="&contextMoveMsgMenu.label;"
+        accesskey="&contextMoveMsgMenu.accesskey;"
+        sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+        sortDirection="ascending"
+        datasources="rdf:null">
+      <menupopup/>
+      <template> 
+      <rule nc:NoSelect="true" iscontainer="true" isempty="false">
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
+              <menupopup>
+                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
+                <menuseparator/>
+              </menupopup>
+            </menu>
+          </menupopup>
+        </rule> 
+        <rule nc:NoSelect="true">
+          <menupopup>
+            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+              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">
+              <menupopup>
+                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
+                  oncommand="MsgMoveMessage(event.target.parentNode.parentNode)"/>
+                <menuseparator/>
+              </menupopup>
+            </menu>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessagesOnServer="false">
+          <!-- don't show servers (nntp & any others) which does not allow message filing -->
+          <!-- File, Move & Copy menus -->
+        </rule>
+        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
+          <!-- note, there is no "file here" -->
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                  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">
+              <menupopup/>
+            </menu>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessages="true">
+          <menupopup>
+            <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
+              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"/>
+          </menupopup>
+        </rule>
+      </template>
+    </menu>
+    <menu id="threadPaneContext-copyMenu"
+      label="&contextCopyMsgMenu.label;"
+      accesskey="&contextCopyMsgMenu.accesskey;"
+      sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+      sortDirection="ascending"
+      datasources="rdf:null"> 
+      <menupopup/>
+      <template>
+      <rule nc:NoSelect="true" iscontainer="true" isempty="false">
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
+              <menupopup>
+                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
+                <menuseparator/>
+              </menupopup>
+            </menu>
+          </menupopup>
+        </rule> 
+        <rule nc:NoSelect="true">
+          <menupopup>
+            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+              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">
+              <menupopup>
+                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
+                  oncommand="MsgCopyMessage(event.target.parentNode.parentNode)"/>
+                <menuseparator/>
+              </menupopup>
+            </menu>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessagesOnServer="false">
+          <!-- don't show servers (nntp & any others) which does not allow message filing -->
+          <!-- File, Move & Copy menus -->
+        </rule>
+        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
+          <!-- note, there is no "file here" -->
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                  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">
+              <menupopup/>
+            </menu>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessages="true">
+          <menupopup>
+            <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" 
+              oncommand="MsgCopyMessage(event.target)" 
+              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"/>
+          </menupopup>
+        </rule>
+      </template>
+    </menu>
+    <menuseparator/>
+    <menu id="threadPaneContext-labels" label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
+      <menupopup onpopupshowing="InitMessageLabel('threadPaneContext')">
+        <menuitem
+           id="threadPaneContext-labelMenuItem0"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd0.accesskey;"
+           observes="cmd_label0"/>
+        <menuseparator/>
+        <menuitem
+           id="threadPaneContext-labelMenuItem1"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd1.accesskey;"
+           observes="cmd_label1"/>
+        <menuitem
+           id="threadPaneContext-labelMenuItem2"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd2.accesskey;"
+           observes="cmd_label2"/>
+        <menuitem
+           id="threadPaneContext-labelMenuItem3"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd3.accesskey;"
+           observes="cmd_label3"/>
+        <menuitem
+           id="threadPaneContext-labelMenuItem4"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd4.accesskey;"
+           observes="cmd_label4"/>
+        <menuitem
+           id="threadPaneContext-labelMenuItem5"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd5.accesskey;"
+           observes="cmd_label5"/>
+      </menupopup>
+    </menu>
+    <menuseparator/>
+    <menuitem id="threadPaneContext-saveAs"
+        label="&contextSaveAs.label;"
+        accesskey="&contextSaveAs.accesskey;"
+        oncommand="MsgSaveAsFile();"/>
+    <menuitem id="threadPaneContext-print"
+        label="&contextPrint.label;"
+        accesskey="&contextPrint.accesskey;"
+        oncommand="PrintEnginePrint();"/>
+    <menuitem id="threadPaneContext-delete"
+        command="cmd_delete"/>
+  </popup>
+  <popup id="folderPaneContext" onpopupshowing="return fillFolderPaneContextMenu();"
+    onpopuphiding="if (event.target == this) folderPaneOnPopupHiding();">
+    <menuitem id="folderPaneContext-openNewWindow"
+        label="&folderContextOpenNewWindow.label;"
+        accesskey="&folderContextOpenNewWindow.accesskey;"
+        oncommand="MsgOpenNewWindowForFolder(null,-1);"/>
+    <menuitem id="folderPaneContext-copy-location"
+        label="&folderContextCopyLocation.label;"
+        accesskey="&folderContextCopyLocation.accesskey;"
+        oncommand="CopyFolderUrl();"/>
+    <menuitem id="folderPaneContext-subscribe"
+        label="&folderContextSubscribe.label;"
+        accesskey="&folderContextSubscribe.accesskey;"
+        oncommand="MsgSubscribe();"/>
+    <menuitem id="folderPaneContext-newsUnsubscribe"
+        label="&folderContextUnsubscribe.label;"
+        accesskey="&folderContextUnsubscribe.accesskey;"
+        oncommand="MsgUnsubscribe();"/>
+    <menuseparator id="folderPaneContext-sep1"/>
+    <menuitem id="folderPaneContext-getMessages"
+        label="&folderContextGetMessages.label;"
+        accesskey="&folderContextGetMessages.accesskey;"
+        oncommand="MsgGetMessage();"/>
+    <menuitem id="folderPaneContext-markAllRead"
+        label="&folderContextMarkNewsgroupRead.label;"
+        accesskey="&folderContextMarkNewsgroupRead.accesskey;"
+        oncommand="MsgMarkAllRead();"/>
+    <menuitem id="folderPaneContext-new"
+        label="&folderContextNew.label;"
+        accesskey="&folderContextNew.accesskey;"
+        oncommand="MsgNewFolder(NewFolder);"/>
+    <menuitem id="folderPaneContext-rename"
+        label="&folderContextRename.label;"
+        accesskey="&folderContextRename.accesskey;"
+        oncommand="MsgRenameFolder();"/>
+        <menuitem id="folderPaneContext-compact"
+              label="&folderContextCompact.label;"
+              accesskey="&folderContextCompact.accesskey;"
+        oncommand="MsgCompactFolder(false);"/>          //for one folder only
+    <menuitem id="folderPaneContext-remove"
+        label="&folderContextRemove.label;"
+        accesskey="&folderContextRemove.accesskey;"
+        oncommand="MsgDeleteFolder();"/>
+    <menuitem id="folderPaneContext-emptyTrash"
+        label="&folderContextEmptyTrash.label;"
+        accesskey="&folderContextEmptyTrash.accesskey;"
+        oncommand="MsgEmptyTrash();"/>
+    <menuitem id="folderPaneContext-sendUnsentMessages"
+        label="&folderContextSendUnsentMessages.label;"
+        accesskey="&folderContextSendUnsentMessages.accesskey;"
+        oncommand="goDoCommand('cmd_sendUnsentMsgs')"/>
+    <menuseparator id="folderPaneContext-sep-edit"/>
+    <menuitem id="folderPaneContext-searchMessages"
+        label="&folderContextSearchMessages.label;"
+        accesskey="&folderContextSearchMessages.accesskey;"
+        observes="cmd_search"/>
+    <menuitem id="folderPaneContext-properties"
+        label="&folderContextProperties.label;"
+        accesskey="&folderContextProperties.accesskey;"
+        oncommand="MsgFolderProperties();"/>
+  </popup> 
+<popup id="attachmentListContext"/>
+<tooltip id="attachmentListTooltip"/>
+
+<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
+    <menuitem label="&AddToAddressBook.label;"
+              accesskey="&AddToAddressBook.accesskey;"
+              oncommand="AddNodeToAddressBook(document.popupNode)"/>
+    <menuitem label="&SendMailTo.label;"
+              accesskey="&SendMailTo.accesskey;"
+              oncommand="SendMailToNode(document.popupNode)"/>
+    <menuitem label="&CopyEmailAddress.label;"
+              accesskey="&CopyEmailAddress.accesskey;"
+              oncommand="CopyEmailAddress(document.popupNode)"/>  
+    <menuitem label="&CreateFilter.label;"
+              accesskey="&CreateFilter.accesskey;"
+              oncommand="CreateFilter(document.popupNode)"
+              observes="cmd_createFilterFromPopup"/>  
+</popup>
+
+<popup id="allHeadersPopup"  onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
+  <hbox id="allHeadersPopupContainer">
+  </hbox>
+</popup>
+
+  <popup id="messagePaneContext"   
+     onpopupshowing="gContextMenu = new nsContextMenu(this); return fillMessagePaneContextMenu();"
+     onpopuphiding="gContextMenu.onDestroy(); gContextMenu = null;">
+        <menuitem id="context-openlink"
+                  label="&openLinkCmd.label;"
+                  accesskey="&openLinkCmd.accesskey;"
+                  oncommand="gContextMenu.openLink();"/>
+        <menuseparator id="messagePaneContext-sep-link"/>
+        <menuitem id="context-selectall"
+                  label="&selectAllCmd.label;"
+                  accesskey="&selectAllCmd.accesskey;"
+                  command="cmd_selectAll"/>
+        <menuitem id="context-copy"
+                  label="&copyCmd.label;"
+                  accesskey="&copyCmd.accesskey;"
+                  command="cmd_copy"/>
+    <menuseparator id="messagePaneContext-sep-open"/>
+    <menuitem id="messagePaneContext-replySender"
+        label="&contextReplySender.label;"
+        accesskey="&contextReplySender.accesskey;"
+        oncommand="MsgReplySender(event);"/>
+    <menuitem id="messagePaneContext-replyNewsgroup"
+        label="&contextReplyNewsgroup.label;"
+        accesskey="&contextReplyNewsgroup.accesskey;"
+        oncommand="MsgReplyMessage(event);"/>
+    <menuitem id="messagePaneContext-replyAll"
+        label="&contextReplyAll.label;"
+        accesskey="&contextReplyAll.accesskey;"
+        oncommand="MsgReplyToAllMessage(event);"/>
+    <menuitem id="messagePaneContext-forward"
+        label="&contextForward.label;"
+        accesskey="&contextForward.accesskey;"
+        oncommand="MsgForwardMessage(event);"/>
+    <menuitem id="messagePaneContext-editAsNew"
+        label="&contextEditAsNew.label;"
+        accesskey="&contextEditAsNew.accesskey;"
+        oncommand="MsgEditMessageAsNew();"/>
+    <menuseparator id="messagePaneContext-sep-reply"/>
+    <menuitem id="messagePaneContext-copyMessageUrl"
+        label="&copyMessageLocation.label;"
+        accesskey="&copyMessageLocation.accesskey;"
+        oncommand="CopyMessageUrl()"/>
+    <menu id="messagePaneContext-moveMenu"
+        label="&contextMoveMsgMenu.label;"
+        accesskey="&contextMoveMsgMenu.accesskey;"
+        sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+        sortDirection="ascending"
+        datasources="rdf:null">
+      <menupopup/>
+      <template> 
+      <rule nc:NoSelect="true" iscontainer="true" isempty="false">
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
+              <menupopup>
+                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
+                <menuseparator/>
+              </menupopup>
+            </menu>
+          </menupopup>
+        </rule> 
+        <rule nc:NoSelect="true">
+          <menupopup>
+            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+              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">
+              <menupopup>
+                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
+                  oncommand="MsgMoveMessage(event.target.parentNode.parentNode)"/>
+                <menuseparator/>
+              </menupopup>
+            </menu>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessagesOnServer="false">
+          <!-- don't show servers (nntp & any others) which does not allow message filing -->
+          <!-- File, Move & Copy menus -->
+        </rule>
+        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
+          <!-- note, there is no "file here" -->
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                  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">
+              <menupopup/>
+            </menu>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessages="true">
+          <menupopup>
+            <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
+              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"/>
+          </menupopup>
+        </rule>
+      </template>
+    </menu>
+    <menu id="messagePaneContext-copyMenu"
+      label="&contextCopyMsgMenu.label;"
+      accesskey="&contextCopyMsgMenu.accesskey;"
+      sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+      sortDirection="ascending"
+      datasources="rdf:null">
+      <menupopup/>
+      <template>
+      <rule nc:NoSelect="true" iscontainer="true" isempty="false">
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
+              <menupopup>
+                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
+                <menuseparator/>
+              </menupopup>
+            </menu>
+          </menupopup>
+        </rule> 
+        <rule nc:NoSelect="true">
+          <menupopup>
+            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+              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">
+              <menupopup>
+                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
+                  oncommand="MsgCopyMessage(event.target.parentNode.parentNode)"/>
+                <menuseparator/>
+              </menupopup>
+            </menu>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessagesOnServer="false">
+          <!-- don't show servers (nntp & any others) which does not allow message filing -->
+          <!-- File, Move & Copy menus -->
+        </rule>
+        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
+          <!-- note, there is no "file here" -->
+          <menupopup>
+            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                  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">
+              <menupopup/>
+            </menu>
+          </menupopup>
+        </rule>
+        <rule nc:CanFileMessages="true">
+          <menupopup>
+            <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" 
+              oncommand="MsgCopyMessage(event.target)" 
+              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"/>
+          </menupopup>
+        </rule>
+      </template>
+    </menu>
+    <menuseparator id="messagePaneContext-sep-labels-1"/>
+    <menu id="messagePaneContext-labels" label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
+      <menupopup onpopupshowing="InitMessageLabel('messagePaneContext')">
+        <menuitem
+           id="messagePaneContext-labelMenuItem0"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd0.accesskey;"
+           observes="cmd_label0"/>
+        <menuseparator/>
+        <menuitem
+           id="messagePaneContext-labelMenuItem1"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd1.accesskey;"
+           observes="cmd_label1"/>
+        <menuitem
+           id="messagePaneContext-labelMenuItem2"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd2.accesskey;"
+           observes="cmd_label2"/>
+        <menuitem
+           id="messagePaneContext-labelMenuItem3"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd3.accesskey;"
+           observes="cmd_label3"/>
+        <menuitem
+           id="messagePaneContext-labelMenuItem4"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd4.accesskey;"
+           observes="cmd_label4"/>
+        <menuitem
+           id="messagePaneContext-labelMenuItem5"
+           type="radio"
+           checked="false"
+           accesskey="&labelCmd5.accesskey;"
+           observes="cmd_label5"/>
+      </menupopup>
+    </menu>
+    <menuseparator id="messagePaneContext-sep-labels-2"/>
+    <menuitem id="messagePaneContext-saveAs"
+        label="&contextSaveAs.label;"
+        accesskey="&contextSaveAs.accesskey;"
+        oncommand="MsgSaveAsFile();"/>
+    <menuitem id="messagePaneContext-print"
+        label="&contextPrint.label;"
+        accesskey="&contextPrint.accesskey;"
+        oncommand="PrintEnginePrint();"/>
+    <menuitem id="messagePaneContext-delete"
+        command="cmd_delete"/>
+    <menuseparator id="messagePaneContext-sep-edit"/>
+        <menuitem id="context-viewimage"
+                  label="&viewImageCmd.label;"
+                  accesskey="&viewImageCmd.accesskey;"
+                  oncommand="gContextMenu.viewImage();"/>
+        <menuseparator id="messagePaneContext-sep-image"/>
+        <menuitem id="context-copylink"
+                  label="&copyLinkCmd.label;"
+                  accesskey="&copyLinkCmd.accesskey;"
+                  command="cmd_copyLink"/>
+        <menuitem id="context-copyimage"
+                  label="&copyImageCmd.label;"
+                  accesskey="&copyImageCmd.accesskey;"
+                  command="cmd_copyImageLocation"/>
+        <menuitem id="context-copyemail"
+                  label="&copyEmailCmd.label;"
+                  accesskey="&copyEmailCmd.accesskey;"
+                  oncommand="gContextMenu.copyEmail();"/>
+        <menuseparator id="messagePaneContext-sep-copy"/>
+        <menuitem id="context-savelink"
+                  label="&saveLinkCmd.label;"
+                  accesskey="&saveLinkCmd.accesskey;"
+                  oncommand="gContextMenu.saveLink();"/>
+        <menuitem id="context-saveimage"
+                  label="&saveImageCmd.label;"
+                  accesskey="&saveImageCmd.accesskey;"
+                  oncommand="gContextMenu.saveImage();"/>
+        <menuitem id="context-bookmarklink"
+                  label="&bookmarkLinkCmd.label;"
+                  accesskey="&bookmarkLinkCmd.accesskey;"
+                  oncommand="BookmarksUtils.addBookmark(gContextMenu.linkURL(),
+                                                        gContextMenu.linkText());"/>
+
+</popup>
+
+  <toolbox id="mailToolbarToolbox" class="toolbox-top">
+    <menubar id="mailMenubar" grippytooltiptext="&menuBar.tooltip;">
+      <menu id="menu_File" >
+        <menupopup id="menu_FilePopup" onpopupshowing="file_init();">
+          <menu id="menu_New">
+            <menupopup id="menu_NewPopup" onpopupshowing="menu_new_init();">
+              <menuitem label="&newNewMsgCmd.label;"
+                        accesskey="&newNewMsgCmd.accesskey;"
+                        key="key_newMessage"
+                        oncommand="MsgNewMessage(null);"/>
+              <menuitem id="menu_newFolder" label="&newFolderCmd.label;"
+                         oncommand="MsgNewFolder(NewFolder);"
+                         accesskey="&newFolderCmd.accesskey;"/>
+              <menuitem id="newAccountMenuItem" label="&newAccountCmd.label;"
+                         accesskey="&newAccountCmd.accesskey;"
+                         oncommand="MsgAccountWizard();"/>
+              <menuseparator/>
+            </menupopup>
+          </menu>
+          <menuitem id="openMessageWindowMenuitem" label="&openMessageWindowCmd.label;"
+            observes="cmd_openMessage"
+            accesskey="&openMessageWindowCmd.accesskey;"
+            key="key_openMessage"/>
+          <menu id="fileAttachmentMenu" label="&openAttachmentCmd.label;" accesskey="&openAttachmentCmd.accesskey;">
+            <menupopup id="attachmentMenuList" onpopupshowing="FillAttachmentListPopup(this);"/>
+          </menu>
+          <menuitem id="menu_close"/>
+          <menuseparator/>
+          <menu label="&saveAsMenu.label;" accesskey="&saveAsMenu.accesskey;">
+            <menupopup>
+              <menuitem label="&saveAsFileCmd.label;"
+               accesskey="&saveAsFileCmd.accesskey;"
+               key="key_saveAsFile"
+               observes="cmd_saveAsFile"/>
+              <menuitem label="&saveAsTemplateCmd.label;"
+               accesskey="&saveAsTemplateCmd.accesskey;"
+               observes="cmd_saveAsTemplate"/>
+            </menupopup>
+          </menu>
+          <menuseparator/>
+          <menuitem label="&getNewMsgCmd.label;"
+           accesskey="&getNewMsgCmd.accesskey;"
+           key="key_getNewMessages"
+           observes="cmd_getNewMessages"/>
+                            <menu label="&getNewMsgForCmd.label;" 
+                                  accesskey="&getNewMsgForCmd.accesskey;"
+                                  sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+                                  sortDirection="ascending"
+                                  datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
+                                  containment="http://home.netscape.com/NC-rdf#child"
+                                  ref="msgaccounts:/"
+                                  observes="cmd_getNewMessages">
+                                <menupopup>
+                                    <menuitem label="&getAllNewMsgCmd.label;" 
+                                              key="key_getAllNewMessages"
+                                              observes="cmd_getMsgsForAuthAccounts"/>
+                                    <menuseparator/>
+                                </menupopup>
+                                <template>
+                                    <rule nc:IsServer="true" nc:CanGetMessages="true">
+                                        <menupopup>
+                                            <menuitem uri="..." 
+                                                      value="..." 
+                                                      label="rdf:http://home.netscape.com/NC-rdf#Name" 
+                                                      oncommand="MsgGetMessagesForAccount(event)"/>
+                                        </menupopup>
+                                    </rule>
+                                </template>
+                                <menupopup/>
+                            </menu>
+          <menuitem id="menu_getnextnmsg" label="&getNextNMsgCmd.label;"
+           observes="cmd_getNextNMessages"/>
+          <menuitem id="menu_sendunsentmsgs" label="&sendUnsentCmd.label;"
+           accesskey="&sendUnsentCmd.accesskey;"
+           observes="cmd_sendUnsentMsgs"/>
+          <menuitem label="&subscribeCmd.label;"
+           accesskey="&subscribeCmd.accesskey;"
+           oncommand="MsgSubscribe();"/>
+           <menuseparator/>
+          <menuitem id="menu_renameFolder" label="&renameFolder.label;"
+                 accesskey="&renameFolder.accesskey;"
+                 observes="cmd_renameFolder"/>
+          <menuitem id="menu_compactFolder" label="&compactFolders.label;" accesskey="&compactFolder.accesskey;" observes="cmd_compactFolder"/>
+          <menuitem id="menu_emptyTrash" label="&emptyTrashCmd.label;"
+                 accesskey="&emptyTrashCmd.accesskey;"
+                 observes="cmd_emptyTrash"/>
+          <menuseparator id="trashMenuSeparator"/>
+          <menu label="&offlineMenu.label;" accesskey="&offlineMenu.accesskey;">
+            <menupopup>
+               <menuitem id="offlineGoOfflineCmd"/>
+           <menuseparator/>
+           <menuitem label="&synchronizeOfflineCmd.label;"  accesskey="&synchronizeOfflineCmd.accesskey;" observes="cmd_synchronizeOffline"/>
+           <menuitem label="&settingsOfflineCmd.label;"     accesskey="&settingsOfflineCmd.accesskey;"    observes="cmd_settingsOffline"/>
+               <menuseparator/>
+               <menuitem label="&downloadFlaggedCmd.label;"     accesskey="&downloadFlaggedCmd.accesskey;"    observes="cmd_downloadFlagged"/>
+               <menuitem label="&downloadSelectedCmd.label;"    accesskey="&downloadSelectedCmd.accesskey;"   observes="cmd_downloadSelected"/>
+            </menupopup>
+          </menu>
+    
+          <menuseparator/>
+          <!--Page setup gets overlaid here from platformGlobalOverlay.xul / -->
+          <menuitem id="printMenuItem" key="key_print" label="&printCmd.label;" accesskey="&printCmd.accesskey;" observes="cmd_print"/>
+        </menupopup>
+      </menu>
+    
+      <menu id="menu_Edit" oncommand="CommandUpdate_UndoRedo();">
+        <menupopup onpopupshowing="InitEditMessagesMenu()">
+          <menuitem id="menu_undo" label="&undoDefaultCmd.label;" accesskey="&undoDefaultCmd.accesskey;" key="key_undo" observes="cmd_undo" oncommand="Undo()"/>
+          <menuitem id="menu_redo" label="&redoDefaultCmd.label;" accesskey="&redoDefaultCmd.accesskey;" key="key_redo" observes="cmd_redo" oncommand="Redo()"/>
+          <menuseparator/>
+          <menuitem id="menu_cut"/>
+          <menuitem id="menu_copy"/>
+          <menuitem id="menu_paste"/>
+          <menuitem id="menu_delete" observes="cmd_delete"/>
+          <menuseparator/>
+          <menu label="&selectMenu.label;" accesskey="&selectMenu.accesskey;">
+            <menupopup>
+              <menuitem label="&all.label;" accesskey="&all.accesskey;" key="key_selectAll"
+                        command="cmd_selectAll"/>
+              <menuseparator/>
+              <menuitem label="&selectThreadCmd.label;"
+               accesskey="&selectThreadCmd.accesskey;"
+               key="key_selectThread"
+               observes="cmd_selectThread"/>
+            </menupopup>
+          </menu>
+          <menuseparator/>
+          <menuitem label="&findCmd.label;" key="key_find" accesskey="&findCmd.accesskey;" observes="cmd_find"/>
+          <menuitem label="&findAgainCmd.label;" key="key_findAgain" accesskey="&findAgainCmd.accesskey;" observes="cmd_findAgain"/>
+          <menuitem label="&findPrevCmd.label;"  key="key_findPrev"  accesskey="&findPrevCmd.accesskey;"  observes="cmd_findPrev"/>
+          <menuseparator/>
+          <menuitem id="menu_properties" label="&folderPropsCmd.label;"
+                    accesskey="&folderPropsCmd.accesskey;"
+                    observes="cmd_properties"/>
+          <menuitem label="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" oncommand="MsgAccountManager(null);"/>
+          <menuitem id="menu_preferences" oncommand="goPreferences('mailnews', 'chrome://mail/content/pref-mailnews.xul','mailnews')"/>
+        </menupopup>
+      </menu>
+    
+      <menu id="menu_View">
+        <menupopup id="menu_View_Popup" onpopupshowing="view_init()">
+          <menu id="menu_Toolbars">
+            <menupopup id="view_toolbars_popup">
+              <menuitem id="menu_showMessengerToolbar"
+               type="checkbox"
+               label="&showMessengerToolbarCmd.label;"
+               accesskey="&showMessengerToolbarCmd.accesskey;"
+               oncommand="goToggleToolbar('msgToolbar', 'menu_showMessengerToolbar')"
+               checked="true"/>
+              <menuitem id="menu_showSearchToolbar"
+               type="checkbox"
+               label="&showSearchToolbarCmd.label;"
+               accesskey="&showSearchToolbarCmd.accesskey;"
+               oncommand="goToggleToolbar('searchBox', 'menu_showSearchToolbar'); SearchBarToggled();"
+               checked="true"/>
+              <menuitem type="checkbox" id="menu_showTaskbar"/>
+              <menuseparator/>
+              <menuitem id="menu_showMessage"
+               type="checkbox"
+               label="&showMessageCmd.label;"
+               accesskey="&showMessageCmd.accesskey;"
+               oncommand="MsgToggleMessagePane();"/>
+            </menupopup>
+          </menu>
+          <menuseparator/>
+          <menu id="viewSortMenu" accesskey="&sortMenu.accesskey;" label="&sortMenu.label;">
+            <menupopup onpopupshowing="InitViewSortByMenu()">
+              <menuitem id="sortByDateMenuitem" type="radio" name="sortby" label="&sortByDateCmd.label;" accesskey="&sortByDateCmd.accesskey;" oncommand="MsgSortByDate()"/>
+              <menuitem id="sortByFlagMenuitem" type="radio" name="sortby" label="&sortByFlagCmd.label;" accesskey="&sortByFlagCmd.accesskey;" oncommand="MsgSortByFlagged()"/>
+              <menuitem id="sortByOrderReceivedMenuitem" type="radio" name="sortby" label="&sortByOrderReceivedCmd.label;"  accesskey="&sortByOrderReceivedCmd.accesskey;" oncommand="MsgSortByOrderReceived()"/>
+              <menuitem id="sortByPriorityMenuitem" type="radio" name="sortby" label="&sortByPriorityCmd.label;" accesskey="&sortByPriorityCmd.accesskey;" oncommand="MsgSortByPriority()"/>
+        <!-- for Sender / Recipient, accesskey and label are set dynamically -->
+              <menuitem id="sortBySenderOrRecipientMenuitem" type="radio" name="sortby" oncommand="MsgSortBySenderOrRecipient()"/>
+              <menuitem id="sortBySizeMenuitem" type="radio" name="sortby" label="&sortBySizeCmd.label;" accesskey="&sortBySizeCmd.accesskey;" oncommand="MsgSortBySize()"/>
+              <menuitem id="sortByStatusMenuitem" type="radio" name="sortby" label="&sortByStatusCmd.label;" accesskey="&sortByStatusCmd.accesskey;" oncommand="MsgSortByStatus()"/>
+              <menuitem id="sortBySubjectMenuitem" type="radio" name="sortby" label="&sortBySubjectCmd.label;" accesskey="&sortBySubjectCmd.accesskey;" oncommand="MsgSortBySubject()"/>
+              <menuitem id="sortByThreadMenuitem" type="radio" name="sortby" label="&sortByThreadCmd.label;"  accesskey="&sortByThreadCmd.accesskey;" oncommand="MsgSortByThread()"/>
+              <menuitem id="sortByUnreadMenuitem" type="radio" name="sortby" label="&sortByUnreadCmd.label;"  accesskey="&sortByUnreadCmd.accesskey;" oncommand="MsgSortByUnread()"/>
+              <menuitem id="sortByLabelMenuitem" type="radio" name="sortby" label="&sortByLabelCmd.label;" accesskey="&sortByLabelCmd.accesskey;" oncommand="MsgSortByLabel()"/>
+    <!-- not ready yet
+              <menuitem id="sortByScoreMenuitem" type="radio" name="sortby" label="&sortByScoreCmd.label;" accesskey="&sortByScoreCmd.accesskey;" oncommand="MsgSortByScore()"/>
+    -->
+              <menuseparator/>
+              <menuitem id="sortAscending" type="radio" name="sortdirection" label="&sortAscending.label;" accesskey="&sortAscending.accesskey;" oncommand="MsgSortAscending()"/>
+              <menuitem id="sortDescending" type="radio" name="sortdirection" label="&sortDescending.label;" accesskey="&sortDescending.accesskey;" oncommand="MsgSortDescending()"/>
+            </menupopup>
+          </menu>
+          <menu label="&msgsMenu.label;" id="viewMessagesMenu" accesskey="&msgsMenu.accesskey;">
+            <menupopup onpopupshowing="InitViewMessagesMenu()">
+              <menuitem id="viewAllMessagesMenuItem" type="radio" name="viewmessages" label="&allMsgsCmd.label;" accesskey="&allMsgsCmd.accesskey;" disabled="true" observes="cmd_viewAllMsgs"/>
+              <menuitem id="viewUnreadMessagesMenuItem" type="radio" name="viewmessages" label="&unreadMsgsCmd.label;" accesskey="&unreadMsgsCmd.accesskey;" disabled="true" observes="cmd_viewUnreadMsgs"/>
+              <menuitem id="viewThreadsWithUnreadMenuItem" type="radio" name="viewmessages" label="&threadsWithUnreadCmd.label;" accesskey="&threadsWithUnreadCmd.accesskey;" disabled="true" observes="cmd_viewThreadsWithUnread"/>
+              <menuitem id="viewWatchedThreadsWithUnreadMenuItem" type="radio" name="viewmessages" label="&watchedThreadsWithUnreadCmd.label;" accesskey="&watchedThreadsWithUnreadCmd.accesskey;" disabled="true" observes="cmd_viewWatchedThreadsWithUnread"/>
+              <menuseparator/>
+              <menuitem id="viewIgnoredThreadsMenuItem" type="checkbox" label="&ignoredThreadsCmd.label;" disabled="true" observes="cmd_viewIgnoredThreads" accesskey="&ignoredThreadsCmd.accesskey;"/>
+              <menuseparator/>
+              <menuitem label="&expandAllThreadsCmd.label;" accesskey="&expandAllThreadsCmd.accesskey;" key="key_expandAllThreads" disabled="true" observes="cmd_expandAllThreads"/>
+              <menuitem label="&collapseAllThreadsCmd.label;" accesskey="&collapseAllThreadsCmd.accesskey;" key="key_collapseAllThreads" disabled="true" observes="cmd_collapseAllThreads"/>
+            </menupopup>
+          </menu>
+          <menu id="viewheadersmenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
+            <menupopup  onpopupshowing="InitViewHeadersMenu();">
+              <menuitem id="viewallheaders"
+               type="radio"
+               name="viewheadergroup"
+               label="&headersAllCmd.label;"
+               accesskey="&headersAllCmd.accesskey;"
+               oncommand="MsgViewAllHeaders();"/>
+              <menuitem id="viewnormalheaders"
+               checked="true"
+               type="radio"
+               name="viewheadergroup"
+               label="&headersNormalCmd.label;"
+               accesskey="&headersNormalCmd.accesskey;"
+               oncommand="MsgViewNormalHeaders();"/>
+            </menupopup>
+          </menu>
+          <menu id="viewBodyMenu"
+           accesskey="&bodyMenu.accesskey;"
+           label="&bodyMenu.label;">
+            <menupopup onpopupshowing="InitViewBodyMenu()">
+              <menuitem id="bodyAllowHTML"
+               type="radio"
+               name="bodyPlaintextVsHTMLPref"
+               label="&bodyAllowHTML.label;"
+               accesskey="&bodyAllowHTML.accesskey;"
+               oncommand="MsgBodyAllowHTML()"/>
+              <menuitem id="bodySanitized"
+               type="radio"
+               name="bodyPlaintextVsHTMLPref"
+               label="&bodySanitized.label;"
+               accesskey="&bodySanitized.accesskey;"
+               oncommand="MsgBodySanitized()"/>
+              <menuitem id="bodyAsPlaintext"
+               type="radio"
+               name="bodyPlaintextVsHTMLPref"
+               label="&bodyAsPlaintext.label;"
+               accesskey="&bodyAsPlaintext.accesskey;"
+               oncommand="MsgBodyAsPlaintext()"/>
+            </menupopup>
+          </menu>
+          <menuseparator/>
+          <menuitem id="stopMenuitem" label="&stopCmd.label;" accesskey="&stopCmd.accesskey;" key="key_stop" disabled="true" command="cmd_stop"/>
+          <menuitem label="&reloadCmd.label;" accesskey="&reloadCmd.accesskey;" observes="cmd_reload"/>
+          <menuseparator/>
+          <menuitem key="key_textZoomEnlarge" label="&textZoomEnlargeCmd.label;" accesskey="&textZoomEnlargeCmd.accesskey;"
+                    command="cmd_textZoomEnlarge"/>
+          <menuitem key="key_textZoomReduce"  label="&textZoomReduceCmd.label;"  accesskey="&textZoomReduceCmd.accesskey;"
+                    command="cmd_textZoomReduce"/>
+          <menu id="mailviewCharsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:MailviewCharsetMenuRoot" oncommand="MailMultiplexHandler(event)" onpopupshowing="CreateMenu('mailview');UpdateMailMenus()" onpopupshown="CreateMenu('more-menu');">
+              <template>
+                  <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
+                      <menupopup>
+                      <menuseparator uri="..." />
+                      </menupopup>
+                  </rule>
+                  <rule>
+                      <menupopup>
+                      <menuitem type="radio" name="charsetGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                      </menupopup>
+                  </rule>
+              </template>
+      
+              <menupopup>
+              <menu label="&charsetMenuAutodet.label;" accesskey="&charsetMenuAutodet.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserAutodetMenuRoot">
+                  <template>
+                      <rule rdf:type="http://home.netscape.com/NC-rdf#CharsetDetector">
+                          <menupopup>
+                          <menuitem type="radio" name="detectorGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                          </menupopup>
+                      </rule>
+                  </template>
+                  <menupopup>
+                  </menupopup>
+              </menu>
+              <menu label="&charsetMenuMore.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMoreCharsetMenuRoot">
+                  <template>
+                      <rule>
+                          <menupopup>
+                          <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                          </menupopup>
+                      </rule>
+                  </template>
+                  <menupopup>
+                      <menu label="&charsetMenuMore1.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMore1CharsetMenuRoot">
+                          <template>
+                              <rule>
+                                  <menupopup>
+                                  <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                  </menupopup>
+                              </rule>
+                          </template>
+                          <menupopup>
+                          </menupopup>
+                      </menu>
+                      <menu label="&charsetMenuMore2.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMore2CharsetMenuRoot">
+                          <template>
+                              <rule>
+                                  <menupopup>
+                                  <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                  </menupopup>
+                              </rule>
+                          </template>
+                          <menupopup>
+                          </menupopup>
+                      </menu>
+                      <menu label="&charsetMenuMore3.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMore3CharsetMenuRoot">
+                          <template>
+                              <rule>
+                                  <menupopup>
+                                  <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                  </menupopup>
+                              </rule>
+                          </template>
+                          <menupopup>
+                          </menupopup>
+                      </menu>
+                      <menu label="&charsetMenuMore4.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMore4CharsetMenuRoot">
+                          <template>
+                              <rule>
+                                  <menupopup>
+                                  <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                  </menupopup>
+                              </rule>
+                          </template>
+                          <menupopup>
+                          </menupopup>
+                      </menu>
+                      <menu label="&charsetMenuMore5.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMore5CharsetMenuRoot">
+                          <template>
+                              <rule>
+                                  <menupopup>
+                                  <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                                  </menupopup>
+                              </rule>
+                          </template>
+                          <menupopup>
+                          </menupopup>
+                      </menu>
+                      <menuseparator />
+                  </menupopup>
+              </menu>
+              <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://communicator/content/pref/pref-charset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
+              </menupopup>
+          </menu>
+          <menuseparator/>
+          <menuitem id="pageSourceMenuItem" label="&pageSourceCmd.label;" key="key_viewPageSource" accesskey="&pageSourceCmd.accesskey;" observes="cmd_viewPageSource"/>
+        </menupopup>
+      </menu>
+      <menu label="&goMenu.label;" accesskey="&goMenu.accesskey;">
+        <menupopup  onpopupshowing="InitGoMessagesMenu();">
+          <menu id="goNextMenu" label="&nextMenu.label;" accesskey="&nextMenu.accesskey;">
+            <menupopup>
+              <menuitem label="&nextMsgCmd.label;" key="key_nextMsg" accesskey="&nextMsgCmd.accesskey;" observes="cmd_nextMsg"/>
+              <menuitem label="&nextUnreadMsgCmd.label;" key="key_nextUnreadMsg" accesskey="&nextUnreadMsgCmd.accesskey;" observes="cmd_nextUnreadMsg"/>
+              <menuitem label="&nextFlaggedMsgCmd.label;" accesskey="&nextFlaggedMsgCmd.accesskey;" observes="cmd_nextFlaggedMsg"/>
+              <menuseparator/>
+              <menuitem label="&nextUnreadThread.label;" key="key_nextUnreadThread" accesskey="&nextUnreadThreadCmd.accesskey;" observes="cmd_nextUnreadThread"/>
+            </menupopup>
+          </menu>
+          <menu id="goPreviousMenu" label="&prevMenu.label;" accesskey="&prevMenu.accesskey;">
+            <menupopup>
+              <menuitem label="&prevMsgCmd.label;" key="key_previousMsg" accesskey="&previousMsgCmd.accesskey;" observes="cmd_previousMsg"/>
+              <menuitem label="&prevUnreadMsgCmd.label;" key="key_previousUnreadMsg" accesskey="&previousUnreadMsgCmd.accesskey;" observes="cmd_previousUnreadMsg"/>
+              <menuitem label="&prevFlaggedMsgCmd.label;" accesskey="&previousFlaggedMsgCmd.accesskey;" observes="cmd_previousFlaggedMsg"/>
+            </menupopup>
+          </menu>
+          <menuseparator id="goNextSeparator"/>
+          <menuitem label="&startPageCmd.label;" accesskey="&startPageCmd.accesskey;" oncommand="HideMessageHeaderPane();loadStartPage();"/>
+        </menupopup>
+      </menu>
+      
+      <menu label="&msgMenu.label;" accesskey="&msgMenu.accesskey;" >
+      <menupopup onpopupshowing="InitMessageMenu();">
+        <menuitem label="&newMsgCmd.label;"
+        accesskey="&newMsgCmd.accesskey;"
+        key="key_newMessage"
+        oncommand="MsgNewMessage(null);"/>
+        <menuitem id="replyMainMenu" label="&replyMsgCmd.label;" 
+          accesskey="&replyMsgCmd.accesskey;"
+          key="key_reply"
+          observes="cmd_reply"/>
+        <menuitem id="replySenderMainMenu" label="&replySenderCmd.label;" 
+          accesskey="&replySenderCmd.accesskey;"
+          observes="cmd_replySender"/>
+        <menuitem id="replyNewsgroupMainMenu" label="&replyNewsgroupCmd.label;" 
+          accesskey="&replyNewsgroupCmd.accesskey;"
+          key="key_reply"
+          observes="cmd_replyGroup"/>
+        <menuitem label="&replyToAllMsgCmd.label;"
+          accesskey="&replyToAllMsgCmd.accesskey;"
+          key="key_replyall"
+          observes="cmd_replyall"/>
+        <menuitem label="&forwardMsgCmd.label;"
+          accesskey="&forwardMsgCmd.accesskey;"
+          key="key_forward"
+          observes="cmd_forward"/>
+        <menu label="&forwardAsMenu.label;" accesskey="&forwardAsMenu.accesskey;">
+          <menupopup>
+            <menuitem label="&forwardAsInline.label;" accesskey="&forwardAsInline.accesskey;" observes="cmd_forwardInline"/>
+            <menuitem label="&forwardAsAttachmentCmd.label;" accesskey="&forwardAsAttachmentCmd.accesskey;" observes="cmd_forwardAttachment"/>
+          </menupopup>
+        </menu>
+            <menuitem label="&editMsgAsNewCmd.label;"
+                accesskey="&editMsgAsNewCmd.accesskey;"
+                key="key_editAsNew"
+                observes="cmd_editAsNew"/>
+        <menuseparator/>
+        <menu label="&moveMsgMenu.label;" accesskey="&moveMsgMenu.accesskey;" id="moveMenu" datasources="rdf:null"
+         sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+         sortDirection="ascending">
+          <menupopup/>
+          <template> 
+          <rule nc:NoSelect="true" iscontainer="true" isempty="false">
+              <menupopup>
+                <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
+                  <menupopup>
+                    <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
+                    <menuseparator/>
+                  </menupopup>
+                </menu>
+              </menupopup>
+            </rule> 
+            <rule nc:NoSelect="true">
+              <menupopup>
+                <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
+              </menupopup>
+            </rule>
+            <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
+              <menupopup>
+                <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                 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">
+                  <menupopup>
+                    <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
+                      oncommand="MsgMoveMessage(event.target.parentNode.parentNode)"/>
+                    <menuseparator/>
+                  </menupopup>
+                </menu>
+              </menupopup>
+            </rule>
+            <rule nc:CanFileMessagesOnServer="false">
+              <!-- don't show servers (nntp & any others) which does not allow message filing -->
+              <!-- File, Move & Copy menus -->
+            </rule>
+            <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
+              <!-- note, there is no "file here" -->
+              <menupopup>
+                <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                 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">
+                  <menupopup/>
+                </menu>
+              </menupopup>
+            </rule>
+            <rule nc:CanFileMessages="true">
+              <menupopup>
+                <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
+                 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"/>
+              </menupopup>
+            </rule>
+          </template>
+        </menu>
+        <menu label="&copyMsgMenu.label;" accesskey="&copyMsgMenu.accesskey;" id="copyMenu" datasources="rdf:null"
+         sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+         sortDirection="ascending">
+          <menupopup/>
+          <template>
+          <rule nc:NoSelect="true" iscontainer="true" isempty="false">
+              <menupopup>
+                <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
+                  <menupopup>
+                    <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
+                    <menuseparator/>
+                  </menupopup>
+                </menu>
+              </menupopup>
+            </rule> 
+            <rule nc:NoSelect="true">
+              <menupopup>
+                <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
+              </menupopup>
+            </rule>
+            <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
+              <menupopup>
+                <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                 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">
+                  <menupopup>
+                    <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
+                      oncommand="MsgCopyMessage(event.target.parentNode.parentNode)"/>
+                    <menuseparator/>
+                  </menupopup>
+                </menu>
+              </menupopup>
+            </rule>
+            <rule nc:CanFileMessagesOnServer="false">
+              <!-- don't show servers (nntp & any others) which does not allow message filing -->
+              <!-- File, Move & Copy menus -->
+            </rule>
+            <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
+              <!-- note, there is no "file here" -->
+              <menupopup>
+                <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                 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">
+                  <menupopup/>
+                </menu>
+              </menupopup>
+            </rule>
+            <rule nc:CanFileMessages="true">
+              <menupopup>
+                <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" 
+                 oncommand="MsgCopyMessage(event.target)" 
+                 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"/>
+              </menupopup>
+            </rule>
+          </template>
+        </menu>
+        <menu label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
+          <menupopup id="menuPopup-labels" onpopupshowing="InitMessageLabel('menuPopup')">
+            <menuitem
+               id="menuPopup-labelMenuItem0"
+               type="radio"
+               checked="false"
+               accesskey="&labelCmd0.accesskey;"
+               observes="cmd_label0"/>
+            <menuseparator/>
+            <menuitem
+               id="menuPopup-labelMenuItem1"
+               type="radio"
+               checked="false"
+               accesskey="&labelCmd1.accesskey;"
+               observes="cmd_label1"/>
+            <menuitem
+               id="menuPopup-labelMenuItem2"
+               type="radio"
+               checked="false"
+               accesskey="&labelCmd2.accesskey;"
+               observes="cmd_label2"/>
+            <menuitem
+               id="menuPopup-labelMenuItem3"
+               type="radio"
+               checked="false"
+               accesskey="&labelCmd3.accesskey;"
+               observes="cmd_label3"/>
+            <menuitem
+               id="menuPopup-labelMenuItem4"
+               type="radio"
+               checked="false"
+               accesskey="&labelCmd4.accesskey;"
+               observes="cmd_label4"/>
+            <menuitem
+               id="menuPopup-labelMenuItem5"
+               type="radio"
+               checked="false"
+               accesskey="&labelCmd5.accesskey;"
+               observes="cmd_label5"/>
+          </menupopup>
+        </menu>
+        <menu label="&markMenu.label;" accesskey="&markMenu.accesskey;">
+          <menupopup onpopupshowing="InitMessageMark()">
+            <menuitem type="checkbox" key="key_toggleRead" id="markReadMenuItem" label="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" observes="cmd_markAsRead"/>
+            <menuitem label="&markThreadAsReadCmd.label;" key="key_markThreadAsRead" accesskey="&markThreadAsReadCmd.accesskey;" observes="cmd_markThreadAsRead"/>
+            <menuitem label="&markAllReadCmd.label;" key="key_markAllRead" accesskey="&markAllReadCmd.accesskey;" observes="cmd_markAllRead"/>
+            <menuseparator/>
+            <menuitem type="checkbox" id="markFlaggedMenuItem" label="&markFlaggedCmd.label;" accesskey="&markFlaggedCmd.accesskey;" observes="cmd_markAsFlagged"/>
+          </menupopup>
+        </menu>
+        <menuseparator/>
+        <menuitem id="createFilter" label="&createFilter.label;"
+                  accesskey="&createFilter.accesskey;"
+                  observes="cmd_createFilterFromMenu"/>
+        <menuseparator id="threadItemsSeparator"/>
+        <menuitem label="&killThreadMenu.label;"
+            accesskey="&killThreadMenu.accesskey;"
+            key="key_killThread"
+            id="killThread"
+            observes="cmd_killThread"/>
+        <menuitem label="&watchThreadMenu.label;"
+            accesskey="&watchThreadMenu.accesskey;"
+            key="key_watchThread"
+            id="watchThread"
+            observes="cmd_watchThread"/>
+      </menupopup>
+    </menu>
+    
+    <menu label="&toolsMenu.label;" accesskey="&toolsMenu.accesskey;">
+      <menupopup id="toolsPopup">
+        <menuitem label="&searchMailCmd.label;" 
+                  key="key_searchMail" 
+                  accesskey="&searchMailCmd.accesskey;" 
+                  command="cmd_searchMsgs"/>
+        <menuitem label="&searchAddressesCmd.label;" 
+                  accesskey="&searchAddressesCmd.accesskey;" 
+                  oncommand="MsgSearchAddresses()"/>
+        <menuitem label="&filtersCmd.label;"
+                  accesskey="&filtersCmd.accesskey;"
+                  oncommand="MsgFilters(null);"/>
+    <!-- not ready yet
+        <menuitem label="&junkMailCmd.label;" 
+                  accesskey="&junkMailCmd.accesskey;" 
+                  oncommand="MsgJunkMail()"/>
+        <menuseparator/>
+        <menuitem label="Mark All Messages In Folder As Junk" oncommand="markFolderAsJunk(true);"/>
+        <menuitem label="Mark All Messages In Folder As Not Junk" oncommand="markFolderAsJunk(false);"/>
+        <menuitem label="Analyze Folder" oncommand="analyzeFolder();"/>
+        <menuitem label="Analyze Messages" oncommand="analyzeMessages();"/>
+        <menuitem label="Write DB" oncommand="writeHash();"/>
+        <menuseparator/>
+    
+    -->
+    
+        <menuitem label="&filtersApply.label;"
+                  accesskey="&filtersApply.accesskey;"
+                  oncommand="MsgApplyFilters(null);"/>
+        <menuitem label="&importCmd.label;" 
+                  accesskey="&importCmd.accesskey;" 
+                  oncommand="toImport();"/>
+      </menupopup>
+    </menu>
+    <menu id="menu_Help"/>
+    <spacer flex="100%"/>
+    </menubar>
+    <toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed" grippytooltiptext="&mailToolbar.tooltip;">
+      <hbox id="toolbar_button_box">
+        <toolbarbutton type="menu-button" id="button-getmsg" 
+                       class="toolbarbutton-1"
+                       label="&getMsgButton.label;"
+                       sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+                       sortDirection="ascending"
+                       tooltiptext="&getMsgButton.tooltip;" 
+                       observes="button_getNewMessages" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" 
+                       oncommand="goDoCommand('cmd_getNewMessages')" 
+                       containment="http://home.netscape.com/NC-rdf#child" 
+                       ref="msgaccounts:/">
+            <menupopup onpopupshowing="getMsgToolbarMenu_init()">
+                <menuitem label="&getAllNewMsgCmd.label;" 
+                          observes="cmd_getMsgsForAuthAccounts"/>
+                <menuseparator/>
+            </menupopup>
+            <template>
+                <rule nc:IsServer="true" nc:CanGetMessages="true">
+                    <menupopup>
+                        <menuitem uri="..." 
+                                  value="..." 
+                                  label="rdf:http://home.netscape.com/NC-rdf#Name"
+                                  oncommand="MsgGetMessagesForAccount(event);"/>
+                    </menupopup>
+                </rule>
+            </template>
+            <menupopup/>
+        </toolbarbutton>
+        <toolbarbutton id="button-newmsg" class="toolbarbutton-1" label="&newMsgButton.label;" tooltiptext="&newMsgButton.tooltip;" oncommand="MsgNewMessage(event)"/>
+        <toolbarseparator class="toolbarseparator-primary"/>
+        <toolbarbutton id="button-reply" class="toolbarbutton-1" label="&replyButton.label;" tooltiptext="&replyButton.tooltip;" observes="button_reply" oncommand="MsgReplyMessage(event)"/>
+        <toolbarbutton class="toolbarbutton-1" id="button-replyall" label="&replyAllButton.label;" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" oncommand="MsgReplyToAllMessage(event)"/>
+        <toolbarbutton class="toolbarbutton-1" id="button-forward" label="&forwardButton.label;" tooltiptext="&forwardButton.tooltip;" observes="button_forward" oncommand="MsgForwardMessage(event)"/>
+        <toolbarseparator class="toolbarseparator-primary"/>
+        <toolbarbutton type="menu" id="button-file" class="toolbarbutton-1" 
+                    label="&fileButton.label;" observes="button_file"
+                    datasources="rdf:null" 
+                    tooltiptext="&fileButton.tooltip;"
+                    sortResource="http://home.netscape.com/NC-rdf#FolderTreeName" sortDirection="ascending">
+          <template> 
+          <rule nc:NoSelect="true" iscontainer="true" isempty="false">
+            <menupopup>
+              <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
+                <menupopup>
+                  <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
+                  <menuseparator/>
+                </menupopup>
+              </menu>
+            </menupopup>
+          </rule> 
+          <rule nc:NoSelect="true">
+            <menupopup>
+              <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
+            </menupopup>
+          </rule>
+            <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
+              <menupopup>
+                <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                 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">
+                  <menupopup>
+                    <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
+                      oncommand="MsgMoveMessage(event.target.parentNode.parentNode)"/>
+                    <menuseparator/>
+                  </menupopup>
+                </menu>
+              </menupopup>
+            </rule>
+            <rule nc:CanFileMessagesOnServer="false">
+              <!-- don't show servers (nntp & any others) which does not allow message filing -->
+              <!-- File, Move & Copy menus -->
+            </rule>
+            <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
+            <!-- note, there is no "file here" -->
+              <menupopup>
+                <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                 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">
+                  <menupopup/>
+                </menu>
+              </menupopup>
+            </rule>
+            <rule nc:CanFileMessages="true">
+              <menupopup>
+                <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
+                 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"/>
+              </menupopup>
+            </rule>
+          </template>
+          <menupopup/>
+        </toolbarbutton>
+        <toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;" oncommand="goDoCommand('button_next')" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
+        <toolbarbutton class="toolbarbutton-1" id="button-delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/>
+  <!-- not ready yet
+        <toolbarbutton class="toolbarbutton-1" id="button-junk" label="&junkButton.label;" tooltiptext="&junkButton.tooltip;" observes="button_junk" oncommand="goDoCommand('button_junk')"/>
+  -->
+        <toolbarbutton type="menu-button" id="button-mark" class="toolbarbutton-1" label="&markButton.label;" hidden="true" oncommand="goDoCommand('button_mark')"
+                    observes="button_mark" tooltiptext="&markButton.tooltip;">  
+              <menupopup onpopupshowing="InitMessageMark()">
+                  <menuitem type="checkbox" key="key_toggleRead" id="markReadToolbarItem" label="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" observes="cmd_markAsRead" default="true" />
+                  <menuitem label="&markThreadAsReadCmd.label;" key="key_markThreadAsRead" accesskey="&markThreadAsReadCmd.accesskey;" observes="cmd_markThreadAsRead"/>
+                  <menuitem label="&markAllReadCmd.label;" key="key_markAllRead" accesskey="&markAllReadCmd.accesskey;" observes="cmd_markAllRead"/>
+                  <menuseparator/>
+                  <menuitem type="checkbox" id="markFlaggedToolbarItem" label="&markFlaggedCmd.label;" accesskey="&markFlaggedCmd.accesskey;" observes="cmd_markAsFlagged"/>
+              </menupopup>
+        </toolbarbutton>
+        <toolbarbutton id="button-print" type="menu-button" class="toolbarbutton-1" label="&printButton.label;" 
+                    observes="button_print" oncommand="goDoCommand('cmd_print')" tooltiptext="&printButton.tooltip;">  
+          <menupopup id="printMenu">
+            <menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" default="true"/>
+            </menupopup>
+        </toolbarbutton>
+        <toolbarbutton class="toolbarbutton-1" id="button-stop" label="&stopButton.label;" tooltiptext="&stopButton.tooltip;" command="cmd_stop"/>
+        <spacer flex="1"/>
+              <hbox id="throbber-box" align="center">
+                  <button id="navigator-throbber" oncommand="goClickThrobber('messenger.throbber.url')" tooltiptext="&throbber.tooltip;"/>
+              </hbox>
+      </hbox>
+    </toolbar>
+  </toolbox>
+
+  <hbox style="height:100px" flex="1">
+    <vbox id="folderPaneBox" flex="1" autostretch="always" persist="width">
+      <tree id="folderTree" class="plain" flex="1" seltype="single" 
+                disableKeyNavigation="true" style="min-width: 100px;" context="folderPaneContext" 
+                datasources="rdf:null" persist="collapsed width height"
+                statedatasource="rdf:mailnewsfolders"
+                flags="dont-build-content"
+                ondraggesture="BeginDragFolderTree(event);"
+                onselect="FolderPaneSelectionChange();">
+        <template>
+          <rule>
+            <conditions>
+              <treeitem uri="?container"/>
+              <member container="?container" child="?member" />
+            </conditions>
+    
+            <bindings>
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#FolderTreeName"
+                       object="?folderTreeName" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#FolderTreeName?sort=true"
+                       object="?folderTreeNameSort" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#FolderTreeSimpleName"
+                       object="?folderTreeSimpleName" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#SpecialFolder"
+                       object="?specialFolder" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#BiffState"
+                       object="?biffState" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#IsServer"
+                       object="?isServer" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#NewMessages"
+                       object="?newMessages" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#HasUnreadMessages"
+                       object="?hasUnreadMessages" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#SubfoldersHaveUnreadMessages"
+                       object="?subfoldersHaveUnreadMessages" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#IsSecure"
+                       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#RedirectorType"
+                       object="?redirectorType" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#NoSelect"
+                       object="?noSelect" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#ImapShared"
+                       object="?imapShared" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#TotalUnreadMessages"
+                       object="?unreadCount" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#TotalMessages"
+                       object="?totalCount" />
+              <binding subject="?member"
+                       predicate="http://home.netscape.com/NC-rdf#PageTitleFakeAccount"
+                       object="?fakeAccount" />
+            </bindings>
+    
+            <action>
+              <treechildren>
+                <treeitem uri="?member">
+                  <treerow>
+                    <treecell id="folderNameCell"
+                                  label="?folderTreeName"
+                                  properties="specialFolder-?specialFolder biffState-?biffState isServer-?isServer newMessages-?newMessages hasUnreadMessages-?hasUnreadMessages subfoldersHaveUnreadMessages-?subfoldersHaveUnreadMessages isSecure-?isSecure serverType-?serverType redirectorType-?redirectorType noSelect-?noSelect imapShared-?imapShared fakeAccount-?fakeAccount"/>
+                    <treecell label="?unreadCount"
+                                  properties="hasUnreadMessages-?hasUnreadMessages subfoldersHaveUnreadMessages-?subfoldersHaveUnreadMessages"/>
+                    <treecell label="?totalCount"
+                                  properties="hasUnreadMessages-?hasUnreadMessages subfoldersHaveUnreadMessages-?subfoldersHaveUnreadMessages"/>
+                  </treerow>
+                </treeitem>
+              </treechildren>
+            </action>
+          </rule>
+        </template>
+        <treecols>
+          <treecol id="folderNameCol"
+                       flex="5"
+                       label="&nameColumn.label;"
+                       crop="center"
+                       persist="width"
+                       ignoreincolumnpicker="true"
+                       primary="true"
+                       sort="?folderTreeNameSort"
+                       sortActive="true"
+                       sortDirection="ascending"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="folderUnreadCol"
+                       persist="hidden width"
+                       flex="1"
+                       label="&unreadColumn.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="folderTotalCol"
+                       persist="hidden width"
+                       flex="1"
+                       label="&totalColumn.label;"/>
+        </treecols>
+      </tree>
+    </vbox>
+      
+    <splitter id="gray_vertical_splitter" collapse="before" persist="state">
+      <grippy/>
+    </splitter>
+    
+    <vbox id="messengerBox" flex="1" persist="width">
+      <vbox id="accountCentralBox" flex="1">
+        <iframe name="accountCentralPane" flex="1" src="about:blank"/>
+      </vbox>
+      <vbox id="messagesBox" flex="1">
+      <hbox id="searchBox" persist="collapsed" align="center">
+        <label id="searchCriteria" value="&SearchSubjectOrSender.label;" control="searchInput" 
+               accesskey="&SearchSubjectOrSender.accesskey;"/>
+        <textbox id="searchInput" flex="5" onfocus="this.select();" oninput="onSearchInput(false);" onkeypress="onSearchKeyPress(event);"/>
+        <button id="clearButton" label="&clearButton.label;" disabled="true" tooltiptext="&clearButton.tooltip;" oncommand="onClearSearch();" 
+                accesskey="&clearButton.accesskey;"/>
+        <button id="advancedButton" label="&advancedButton.label;" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"
+                accesskey="&advancedButton.accesskey;"/>
+      </hbox>
+      <tree id="threadTree" flex="2" enableColumnDrag="true" _selectDelay="500" class="plain" disableKeyNavigation="true"
+          onkeypress="ThreadPaneKeyPress(event);" context="threadPaneContext" style="height:0px;" persist="height"
+          onselect="ThreadPaneSelectionChanged();">
+        <treecols>
+          <treecol id="threadCol" display="&threadColumn.label;" class="treecol-image threadColumnHeader" currentView="unthreaded" cycler="true" persist="hidden ordinal" fixed="true" />
+          <treecol id="subjectCol" class="sortDirectionIndicator" persist="hidden ordinal width" flex="7" label="&subjectColumn.label;" primary="true"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="senderOrRecipientCol" class="sortDirectionIndicator" persist="hidden ordinal width"  flex="4" label="&senderColumn.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="unreadButtonColHeader" fixed="true" persist="hidden ordinal" class="treecol-image readColumnHeader" display="&readColumn.label;" cycler="true"/> 
+          <splitter class="tree-splitter"/>
+          <treecol id="dateCol" class="sortDirectionIndicator" persist="hidden ordinal width"  flex="2" label="&dateColumn.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="statusCol" class="sortDirectionIndicator" persist="hidden ordinal width" flex="1" label="&statusColumn.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="sizeCol" class="sortDirectionIndicator" persist="hidden ordinal width" flex="1"  label="&sizeColumn.label;"/>
+          <splitter class="tree-splitter"/>
+      <!-- not ready yet
+          <treecol id="scoreCol" class="sortDirectionIndicator" persist="hidden ordinal width" flex="1" label="&scoreColumn.label;"/>
+          <splitter class="tree-splitter"/>
+      -->
+          <treecol id="flaggedCol" fixed="true" persist="hidden ordinal" class="treecol-image flagColumnHeader" display="&flagColumn.label;" cycler="true"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="labelCol" class="sortDirectionIndicator" persist="hidden ordinal width" flex="1" label="&labelColumn.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="priorityCol" class="sortDirectionIndicator" persist="hidden ordinal width" flex="1" label="&priorityColumn.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="unreadCol" class="sortDirectionIndicator" persist="hidden ordinal width" flex="1" label="&unreadColumn.label;"/>
+          <splitter class="tree-splitter"/>
+          <treecol id="totalCol" class="sortDirectionIndicator" persist="hidden ordinal width" flex="1" label="&totalColumn.label;"/>
+          <treecol id="locationCol" class="sortDirectionIndicator" persist="width" flex="1" hidden="true" ignoreincolumnpicker="true" label="&locationColumn.label;"/>
+        </treecols>
+        <treechildren ondraggesture="BeginDragThreadPane(event);"/>
+      </tree>
+      <!-- if you change this id, please change GetThreadAndMessagePaneSplitter() and MsgToggleMessagePane() -->
+      <splitter collapse="after" persist="state" 
+		onmouseup="OnMouseUpThreadAndMessagePaneSplitter()"
+                id="threadpane-splitter"/>
+      
+      <vbox id="messagepanebox" flex="3" persist="collapsed height" onclick="contentAreaClick(event);">
+        <hbox id="msgHeaderView"/>
+    
+        <browser id="messagepane" context="messagePaneContext"
+                 style="height: 0px; min-height: 1px" flex="1" name="messagepane" 
+                 disablehistory="true" type="content-primary" src="about:blank"
+                 disablesecurity="true"/>
+       </vbox>  
+     </vbox>
+   </vbox>             
+  </hbox>
+
+  <statusbar id="status-bar" class="chromeclass-status mailwindow-statusbar">
+     <statusbarpanel id="statusText" label="&statusText.label;" flex="1"/>
+     <statusbarpanel class="statusbarpanel-progress">
+       <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0" oncommand="dumpProgress()"/>
+     </statusbarpanel>
+    <statusbarpanel id="unreadMessageCount" style="min-width: 5px"/>
+    <statusbarpanel id="totalMessageCount" style="min-width: 5px"/>
+    <statusbarpanel checkfunc="MailCheckBeforeOfflineChange()" id="offline-status" class="statusbarpanel-iconic"/> 
+  </statusbar>
+</window>
diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index f95f77429cf..e49dd9b9643 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -23,7 +23,6 @@ Rights Reserved.
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/viewZoomOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailWindowExtrasOverlay.xul"?>
 
 <!DOCTYPE window [
@@ -45,14 +44,8 @@ Rights Reserved.
 <script src="chrome://messenger/content/mail-offline.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
 
-<stringbundleset id="stringbundleset">
-  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
-  <stringbundle id="bundle_viewZoom"/>
-  <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
-</stringbundleset>
- 
 <!-- Performance optimization...we include utilityOverlay.xul which defines some command sets
      which are updated based on events like focus and select. We have our own custom events
      which we use to optmize when we do command updating. To avoid unnecessary command updating,
@@ -60,1552 +53,9 @@ Rights Reserved.
      are updated on with events of our own controlling. 
  -->
 
-<commandset id="globalEditMenuItems"
-            commandupdater="true"
-            events="create-menu-edit"
-            oncommandupdate="goUpdateGlobalEditMenuItems()"/>
-<commandset id="selectEditMenuItems"
-            commandupdater="true"
-            events="create-menu-edit"
-            oncommandupdate="goUpdateSelectEditMenuItems()"/>
-
-<!-- End command set merging -->
-
-<commandset id="mailFileMenuItems"
-            commandupdater="true"
-            events="create-menu-file"
-            oncommandupdate="goUpdateMailMenuItems(this)">
-
-    <command id="cmd_getNewMessages" oncommand="goDoCommand('cmd_getNewMessages')" disabled="true"/>
-    <command id="cmd_close" oncommand="goDoCommand('cmd_close')"/>
-    <command id="cmd_open" oncommand="goDoCommand('cmd_open')"/>
-    
-    <command id="cmd_file" disabled="true"/>
-
-    <command id="cmd_emptyTrash" oncommand="goDoCommand('cmd_emptyTrash')" disabled="true"/>
-    <command id="cmd_compactFolder" oncommand="goDoCommand('cmd_compactFolder')" disabled="true"/>
-    <command id="cmd_synchronizeOffline" oncommand="goDoCommand('cmd_synchronizeOffline')" disabled="true"/>
-    <command id="cmd_downloadFlagged" oncommand="goDoCommand('cmd_downloadFlagged')" disabled="true"/>
-    <command id="cmd_downloadSelected" oncommand="goDoCommand('cmd_downloadSelected')" disabled="true"/>
-    <command id="cmd_settingsOffline" oncommand="goDoCommand('cmd_settingsOffline')" disabled="true"/>
-    
-    <command id="cmd_openMessage" oncommand="goDoCommand('cmd_openMessage')" disabled="true"/>
-    <command id="cmd_printSetup" oncommand="goDoCommand('cmd_printSetup')" disabled="true"/>
-    <command id="cmd_print" oncommand="goDoCommand('cmd_print')" disabled="true"/>
-    <command id="cmd_saveAsFile" oncommand="goDoCommand('cmd_saveAsFile')" disabled="true"/>
-    <command id="cmd_saveAsTemplate" oncommand="goDoCommand('cmd_saveAsTemplate')" disabled="true"/>    
-    <command id="cmd_getNextNMessages" oncommand="goDoCommand('cmd_getNextNMessages')" disabled="true"/>
-    <command id="cmd_renameFolder" oncommand="goDoCommand('cmd_renameFolder')" />
-    <command id="cmd_sendUnsentMsgs" oncommand="goDoCommand('cmd_sendUnsentMsgs')" />
-</commandset>
-
-<commandset id="mailCommands">
-  <command id="cmd_newNavigator"/>
-  <command id="cmd_newEditor"/>
-  <command id="cmd_quit"/>
-  <!--The cmd_createFilterFromPopup is used to notify the email context popup -->
-  <command id="cmd_createFilterFromPopup"/>
-  <!-- <command id="cmd_pageSetup"/>-->
-  <command id="cmd_search" oncommand="goDoCommand('cmd_search')" disabled="true"/>
-</commandset>
-<commandset id="mailViewMenuItems"
-            commandupdater="true"
-            events="create-menu-view"
-            oncommandupdate="goUpdateMailMenuItems(this)">
-
-   <command id="cmd_viewPageSource" oncommand="goDoCommand('cmd_viewPageSource')" disabled="true"/>
-   <command id="cmd_setFolderCharset" oncommand="goDoCommand('cmd_setFolderCharset')" />
-   <command id="cmd_reload" oncommand="goDoCommand('cmd_reload')" disabled="true"/>
-
-   <command id="cmd_expandAllThreads" oncommand="goDoCommand('cmd_expandAllThreads')" disabled="true"/>
-   <command id="cmd_collapseAllThreads" oncommand="goDoCommand('cmd_collapseAllThreads')" disabled="true"/>
-   <command id="cmd_viewAllMsgs" oncommand="goDoCommand('cmd_viewAllMsgs')" disabled="true"/>
-   <command id="cmd_viewUnreadMsgs" oncommand="goDoCommand('cmd_viewUnreadMsgs')" disabled="true"/>
-   <command id="cmd_viewThreadsWithUnread" oncommand="goDoCommand('cmd_viewThreadsWithUnread')" disabled="true"/>
-   <command id="cmd_viewWatchedThreadsWithUnread" oncommand="goDoCommand('cmd_viewWatchedThreadsWithUnread')" disabled="true"/>
-   <command id="cmd_viewIgnoredThreads" oncommand="goDoCommand('cmd_viewIgnoredThreads')" disabled="true"/>
-   <command id="cmd_sortByThread" oncommand="goDoCommand('cmd_sortByThread')" disabled="true"/>
-   <commandset id="viewZoomCommands"/>
-</commandset>
-
-<commandset id="mailEditMenuItems"
-            commandupdater="true"
-            events="create-menu-edit"
-            oncommandupdate="goUpdateMailMenuItems(this)">
-
-  <command id="cmd_undo"
-         valueDeleteMsg="&undoDeleteMsgCmd.label;"
-         valueMoveMsg="&undoMoveMsgCmd.label;"
-         valueCopyMsg="&undoCopyMsgCmd.label;"
-         valueDefault="&undoDefaultCmd.label;"/>
-  <command id="cmd_redo"
-         valueDeleteMsg="&redoDeleteMsgCmd.label;"
-         valueMoveMsg="&redoMoveMsgCmd.label;"
-         valueCopyMsg="&redoCopyMsgCmd.label;"
-         valueDefault="&redoDefaultCmd.label;"/>
-  <command id="cmd_cut"/>
-  <command id="cmd_copy"/>
-  <command id="cmd_paste"/>
-  <command id="cmd_delete"
-         valueFolder="&deleteFolderCmd.label;"
-         valueFolderAccessKey="&deleteFolderCmd.accesskey;"
-         valueNewsgroup="&unsubscribeNewsgroupCmd.label;"
-         valueNewsgroupAccessKey="&unsubscribeNewsgroupCmd.accesskey;"
-         valueMessage="&deleteMsgCmd.label;"
-         valueMessageAccessKey="&deleteMsgCmd.accesskey;"
-         valueIMAPDeletedMessage="&undeleteMsgCmd.label;"
-         valueIMAPDeletedMessageAccessKey="&undeleteMsgCmd.accesskey;"
-         valueNewsMessage="&cancelNewsMsgCmd.label;"
-         valueNewsMessageAccessKey="&cancelNewsMsgCmd.accesskey;"
-         valueMessages="&deleteMsgsCmd.label;"
-         valueMessagesAccessKey="&deleteMsgsCmd.accesskey;"
-         valueIMAPDeletedMessages="&undeleteMsgsCmd.label;"
-         valueIMAPDeletedMessagesAccessKey="&undeleteMsgsCmd.accesskey;"
-         valueNewsMessages="&cancelNewsMsgsCmd.label;"
-         valueNewsMessagesAccessKey="&cancelNewsMsgsCmd.accesskey;"/>
-  <command id="cmd_selectAll"/>
-  <command id="cmd_selectThread" oncommand="goDoCommand('cmd_selectThread')"/>
-  <command id="cmd_selectFlagged" oncommand="goDoCommand('cmd_selectFlagged')"/>
-  <command id="cmd_properties" oncommand="goDoCommand('cmd_properties')"
-         valueNewsgroup="&folderPropsNewsgroupCmd.label;"
-         valueFolder="&folderPropsFolderCmd.label;"
-         valueGeneric="&folderPropsCmd.label;"/>
-  <command id="cmd_find" oncommand="goDoCommand('cmd_find')" disabled="true"/>
-  <command id="cmd_findAgain" oncommand="goDoCommand('cmd_findAgain')" disabled="true"/>
-  <command id="cmd_findPrev"  oncommand="goDoCommand('cmd_findPrev')"  disabled="true"/>
-  <command id="cmd_stop" oncommand="MsgStop();"/>
-</commandset>
-
-<commandset id="mailEditContextMenuItems">
-  <command id="cmd_copyLink"/>
-  <command id="cmd_copyImageLocation"/>
-  <command id="cmd_copyImageContents"/>
-</commandset>
-
-<commandset id="mailGoMenuItems"
-            commandupdater="true"
-            events="create-menu-go"
-            oncommandupdate="goUpdateMailMenuItems(this)">
-
-  <command id="cmd_nextMsg" oncommand="goDoCommand('cmd_nextMsg')" disabled="true"/>
-  <command id="cmd_nextUnreadMsg" oncommand="goDoCommand('cmd_nextUnreadMsg')" disabled="true"/>
-  <command id="cmd_nextFlaggedMsg" oncommand="goDoCommand('cmd_nextFlaggedMsg')" disabled="true"/>
-  <command id="cmd_nextUnreadThread" oncommand="goDoCommand('cmd_nextUnreadThread')" disabled="true"/>
-  <command id="cmd_previousMsg" oncommand="goDoCommand('cmd_previousMsg')" disabled="true"/>
-  <command id="cmd_previousUnreadMsg" oncommand="goDoCommand('cmd_previousUnreadMsg')" disabled="true"/>
-  <command id="cmd_previousFlaggedMsg" oncommand="goDoCommand('cmd_previousFlaggedMsg')" disabled="true"/>
-</commandset>
-
-<commandset id="mailMessageMenuItems"
-            commandupdater="true"
-            events="create-menu-message"
-            oncommandupdate="goUpdateMailMenuItems(this)">
-  <command id="cmd_reply" oncommand="goDoCommand('cmd_reply')"/>
-  <command id="cmd_replySender" oncommand="goDoCommand('cmd_replySender')"/>
-  <command id="cmd_replyGroup" oncommand="goDoCommand('cmd_replyGroup')"/>
-  <command id="cmd_replyall" oncommand="goDoCommand('cmd_replyall')"/>
-  <command id="cmd_forward" oncommand="goDoCommand('cmd_forward')"/>
-  <command id="cmd_forwardInline" oncommand="goDoCommand('cmd_forwardInline')"/>
-  <command id="cmd_forwardAttachment" oncommand="goDoCommand('cmd_forwardAttachment')"/>
-  <command id="cmd_editAsNew" oncommand="goDoCommand('cmd_editAsNew')"/>
-  <command id="cmd_createFilterFromMenu" oncommand="goDoCommand('cmd_createFilterFromMenu')"/>
-  <command id="cmd_killThread" oncommand="goDoCommand('cmd_killThread')"/>
-  <command id="cmd_watchThread" oncommand="goDoCommand('cmd_watchThread')"/>
-
-</commandset>
-
-<commandset id="mailToolbarItems"
-            commandupdater="true"
-            events="mail-toolbar"
-            oncommandupdate="goUpdateMailMenuItems(this)">
-  
-  <command id="button_reply"/>
-  <command id="button_replyall"/>
-  <command id="button_forward"/>
-  <command id="button_delete"/>
-  <command id="button_mark"/>
-  <command id="button_getNewMessages"/>
-  <command id="button_print"/>
-  <command id="button_next"/>
-  <command id="button_file"/>
-  <command id="cmd_delete"/>
-  <command id="button_junk"/>
-</commandset>
-
-
-<commandset id="mailGetMsgMenuItems"
-            commandupdater="true"
-            events="create-menu-getMsgToolbar,create-menu-file"
-            oncommandupdate="goUpdateMailMenuItems(this)">
-
-    <command id="cmd_getMsgsForAuthAccounts" 
-             oncommand="goDoCommand('cmd_getMsgsForAuthAccounts'); event.preventBubble()" 
-             disabled="true"/>
-</commandset>
-
-<commandset id="mailMarkMenuItems"
-              commandupdater="true"
-              events="create-menu-mark"
-              oncommandupdate="goUpdateMailMenuItems(this)">
-
-    <command id="cmd_markAsRead" oncommand="goDoCommand('cmd_markAsRead'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markAllRead" oncommand="goDoCommand('cmd_markAllRead'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markThreadAsRead" oncommand="goDoCommand('cmd_markThreadAsRead'); event.preventBubble()" disabled="true"/>
-    <command id="cmd_markAsFlagged" oncommand="goDoCommand('cmd_markAsFlagged'); event.preventBubble()" disabled="true"/>
-</commandset>
-
-<commandset id="mailLabelMenuItems"
-              commandupdater="true"
-              events="create-menu-label"
-              oncommandupdate="goUpdateMailMenuItems(this)">
-
-    <command id="cmd_label0" oncommand="goDoCommand('cmd_label0');" disabled="true"/>
-    <command id="cmd_label1" oncommand="goDoCommand('cmd_label1');" disabled="true"/>
-    <command id="cmd_label2" oncommand="goDoCommand('cmd_label2');" disabled="true"/>
-    <command id="cmd_label3" oncommand="goDoCommand('cmd_label3');" disabled="true"/>
-    <command id="cmd_label4" oncommand="goDoCommand('cmd_label4');" disabled="true"/>
-    <command id="cmd_label5" oncommand="goDoCommand('cmd_label5');" disabled="true"/>
-</commandset>
-
-<commandset id="tasksCommands">
-  <command id="cmd_searchMsgs" oncommand="MsgSearchMessages();"/>
-</commandset>
 
 <keyset id="mailKeys">
-    <key id="space" key=" " oncommand="SpaceHit()"/>
-
-  <!-- File Menu -->
-  <key id="key_newNavigator"/>
-  <key id="key_newBlankPage"/>
-  <key id="key_close"/>
-  <key id="key_quit"/>
-  <!-- Edit Menu -->
-  <key id="key_undo"/>
-  <key id="key_redo"/>
-  <key id="key_cut"/>
-  <key id="key_copy"/>
-  <key id="key_paste"/>
-  <key id="key_delete" oncommand="goDoCommand('cmd_delete');" shift="false"/>
-  <key id="cmd_shiftDelete" oncommand="goDoCommand('cmd_shiftDelete')"/>
-  <key id="key_selectAll"/>
-  <key id="key_selectThread" key="&selectThreadCmd.key;"             oncommand="goDoCommand('cmd_selectThread');" modifiers="accel, shift"/>
-  
-  <key id="key_toggleRead" key="&markAsReadCmd.key;"                 oncommand="goDoCommand('cmd_markAsRead');"/>
-  <key id="key_markAllRead" key="&markAllReadCmd.key;"               oncommand="goDoCommand('cmd_markAllRead');" modifiers="accel, shift"/>
-  <key id="key_markThreadAsRead" key="&markThreadAsReadCmd.key;"     oncommand="goDoCommand('cmd_markThreadAsRead')"/>
-  <key id="key_nextMsg" key="&nextMsgCmd.key;"                       oncommand="goDoCommand('cmd_nextMsg')"/>
-  <key id="key_nextUnreadMsg" key="&nextUnreadMsgCmd.key;"           oncommand="goDoCommand('cmd_nextUnreadMsg')"/>
-  <key id="key_expandAllThreads" key="&expandAllThreadsCmd.key;"     oncommand="goDoCommand('cmd_expandAllThreads')"/>
-  <key id="key_collapseAllThreads" key="&collapseAllThreadsCmd.key;" oncommand="goDoCommand('cmd_collapseAllThreads')"/>
-  <key id="key_nextUnreadThread" key="&nextUnreadThreadCmd.key;"     oncommand="goDoCommand('cmd_nextUnreadThread')"/>
-  <key id="key_previousMsg" key="&previousMsgCmd.key;"               oncommand="goDoCommand('cmd_previousMsg')"/>
-  <key id="key_previousUnreadMsg" key="&previousUnreadMsgCmd.key;"   oncommand="goDoCommand('cmd_previousUnreadMsg')"/>
-  <key id="key_reply" key="&replyMsgCmd.key;"                        oncommand="goDoCommand('cmd_reply')" modifiers="accel"/>
-  <key id="key_replyall" key="&replyToAllMsgCmd.key;"                oncommand="goDoCommand('cmd_replyall')" modifiers="accel, shift"/>
-  <key id="key_forward" key="&forwardMsgCmd.key;"                    oncommand="goDoCommand('cmd_forward')" modifiers="accel"/>
-  <key id="key_editAsNew" key="&editMsgAsNewCmd.key;"                oncommand="goDoCommand('cmd_editAsNew')" modifiers="accel"/>
-  <key id="key_watchThread" key="&watchThreadMenu.key;"              oncommand="goDoCommand('cmd_watchThread')" />
-  <key id="key_killThread" key="&killThreadMenu.key;"                oncommand="goDoCommand('cmd_killThread')" />
-  <key id="key_openMessage" key="&openMessageWindowCmd.key;"         oncommand="goDoCommand('cmd_openMessage')" modifiers="accel"/>
-  <key id="key_print" key="&printCmd.key;"                           oncommand="goDoCommand('cmd_print')" modifiers="accel"/>
-  <key id="key_saveAsFile" key="&saveAsFileCmd.key;"                 oncommand="goDoCommand('cmd_saveAsFile')" modifiers="accel"/>
-  <key id="key_viewPageSource" key="&pageSourceCmd.key;"             oncommand="goDoCommand('cmd_viewPageSource')" modifiers="accel"/>
-  <key id="key_getNewMessages" key="&getNewMsgCmd.key;"              oncommand="goDoCommand('cmd_getNewMessages')" modifiers="accel"/>
-        <key id="key_getAllNewMessages" 
-             key="&getAllNewMsgCmd.key;"  
-             oncommand="goDoCommand('cmd_getMsgsForAuthAccounts');"
-             modifiers="accel, shift"/>
-  <key id="key_find" key="&findCmd.key;"  oncommand="goDoCommand('cmd_find')" modifiers="accel"/>
-  <key id="key_findAgain" key="&findAgainCmd.key;"   oncommand="goDoCommand('cmd_findAgain')" modifiers="accel"/>
-  <key id="key_findPrev"  key="&findPrevCmd.key;"    oncommand="goDoCommand('cmd_findPrev')"  modifiers="accel, shift"/>
-  <key keycode="&findAgainCmd.key2;"   oncommand="goDoCommand('cmd_findAgain')"/>
-  <key keycode="&findPrevCmd.key2;"    oncommand="goDoCommand('cmd_findPrev')"  modifiers="shift"/>
-  <key id="key_stop" keycode="VK_ESCAPE" command="cmd_stop"/>
-  <keyset id="viewZoomKeys"/>
-
-  <!-- Tab/F6 Keys -->
-  <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
-  <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
-  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
-  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
-  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="shift"/>
-  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);"/>
-
-  <!-- Label Keys -->
-  <key id="key_label0" charcode="&labelCmd0.key;"  oncommand="goDoCommand('cmd_label0')"/>
-  <key id="key_label1" charcode="&labelCmd1.key;"  oncommand="goDoCommand('cmd_label1')"/>
-  <key id="key_label2" charcode="&labelCmd2.key;"  oncommand="goDoCommand('cmd_label2')"/>
-  <key id="key_label3" charcode="&labelCmd3.key;"  oncommand="goDoCommand('cmd_label3')"/>
-  <key id="key_label4" charcode="&labelCmd4.key;"  oncommand="goDoCommand('cmd_label4')"/>
-  <key id="key_label5" charcode="&labelCmd5.key;"  oncommand="goDoCommand('cmd_label5')"/>
-
-  <key id="key_searchMail" key="&searchMailCmd.key;" command="cmd_searchMsgs" modifiers="accel, shift"/>
 
 </keyset>
 
-  <popup id="threadPaneContext" onpopupshowing="return fillThreadPaneContextMenu();"
-    onpopuphiding="if (event.target == this) threadPaneOnPopupHiding();">
-    <menuitem id="threadPaneContext-openNewWindow"
-        label="&contextOpenNewWindow.label;"
-        accesskey="&contextOpenNewWindow.accesskey;"
-        oncommand="MsgOpenNewWindowForMessage();"/>
-    <menuseparator id="threadPaneContext-sep-open"/>
-    <menuitem id="threadPaneContext-replySender"
-        label="&contextReplySender.label;"
-        accesskey="&contextReplySender.accesskey;"
-        oncommand="MsgReplySender(event);"/>
-    <menuitem id="threadPaneContext-replyNewsgroup"
-        label="&contextReplyNewsgroup.label;"
-        accesskey="&contextReplyNewsgroup.accesskey;"
-        oncommand="MsgReplyGroup(event);"/>
-    <menuitem id="threadPaneContext-replyAll"
-        label="&contextReplyAll.label;"
-        accesskey="&contextReplyAll.accesskey;"
-        oncommand="MsgReplyToAllMessage(event);"/>
-    <menuitem id="threadPaneContext-forward"
-        label="&contextForward.label;"
-        accesskey="&contextForward.accesskey;"
-        oncommand="MsgForwardMessage(event);"/>
-    <menuitem id="threadPaneContext-forwardAsAttachment"
-        label="&contextForwardAsAttachment.label;"
-        accesskey="&contextForwardAsAttachment.accesskey;"
-        oncommand="MsgForwardAsAttachment(event);"/>
-    <menuitem id="threadPaneContext-editAsNew"
-        label="&contextEditAsNew.label;"
-        accesskey="&contextEditAsNew.accesskey;"
-        oncommand="MsgEditMessageAsNew();"/>
-    <menuseparator id="threadPaneContext-sep-reply"/>
-    <menuitem id="threadPaneContext-copyMessageUrl"
-        label="&copyMessageLocation.label;"
-        accesskey="&copyMessageLocation.accesskey;"
-        oncommand="CopyMessageUrl()"/>
-    <menu id="threadPaneContext-moveMenu"
-        label="&contextMoveMsgMenu.label;"
-        accesskey="&contextMoveMsgMenu.accesskey;"
-        sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-        sortDirection="ascending"
-        datasources="rdf:null">
-      <menupopup/>
-      <template> 
-      <rule nc:NoSelect="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule> 
-        <rule nc:NoSelect="true">
-          <menupopup>
-            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-              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">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
-                  oncommand="MsgMoveMessage(event.target.parentNode.parentNode)"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessagesOnServer="false">
-          <!-- don't show servers (nntp & any others) which does not allow message filing -->
-          <!-- File, Move & Copy menus -->
-        </rule>
-        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
-          <!-- note, there is no "file here" -->
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-                  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">
-              <menupopup/>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true">
-          <menupopup>
-            <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
-              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"/>
-          </menupopup>
-        </rule>
-      </template>
-    </menu>
-    <menu id="threadPaneContext-copyMenu"
-      label="&contextCopyMsgMenu.label;"
-      accesskey="&contextCopyMsgMenu.accesskey;"
-      sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-      sortDirection="ascending"
-      datasources="rdf:null"> 
-      <menupopup/>
-      <template>
-      <rule nc:NoSelect="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule> 
-        <rule nc:NoSelect="true">
-          <menupopup>
-            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-              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">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
-                  oncommand="MsgCopyMessage(event.target.parentNode.parentNode)"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessagesOnServer="false">
-          <!-- don't show servers (nntp & any others) which does not allow message filing -->
-          <!-- File, Move & Copy menus -->
-        </rule>
-        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
-          <!-- note, there is no "file here" -->
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-                  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">
-              <menupopup/>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true">
-          <menupopup>
-            <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" 
-              oncommand="MsgCopyMessage(event.target)" 
-              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"/>
-          </menupopup>
-        </rule>
-      </template>
-    </menu>
-    <menuseparator/>
-    <menu id="threadPaneContext-labels" label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
-      <menupopup onpopupshowing="InitMessageLabel('threadPaneContext')">
-        <menuitem
-           id="threadPaneContext-labelMenuItem0"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd0.accesskey;"
-           observes="cmd_label0"/>
-        <menuseparator/>
-        <menuitem
-           id="threadPaneContext-labelMenuItem1"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd1.accesskey;"
-           observes="cmd_label1"/>
-        <menuitem
-           id="threadPaneContext-labelMenuItem2"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd2.accesskey;"
-           observes="cmd_label2"/>
-        <menuitem
-           id="threadPaneContext-labelMenuItem3"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd3.accesskey;"
-           observes="cmd_label3"/>
-        <menuitem
-           id="threadPaneContext-labelMenuItem4"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd4.accesskey;"
-           observes="cmd_label4"/>
-        <menuitem
-           id="threadPaneContext-labelMenuItem5"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd5.accesskey;"
-           observes="cmd_label5"/>
-      </menupopup>
-    </menu>
-    <menuseparator/>
-    <menuitem id="threadPaneContext-saveAs"
-        label="&contextSaveAs.label;"
-        accesskey="&contextSaveAs.accesskey;"
-        oncommand="MsgSaveAsFile();"/>
-    <menuitem id="threadPaneContext-print"
-        label="&contextPrint.label;"
-        accesskey="&contextPrint.accesskey;"
-        oncommand="PrintEnginePrint();"/>
-    <menuitem id="threadPaneContext-delete"
-        command="cmd_delete"/>
-  </popup>
-
-  <popup id="folderPaneContext" onpopupshowing="return fillFolderPaneContextMenu();"
-    onpopuphiding="if (event.target == this) folderPaneOnPopupHiding();">
-    <menuitem id="folderPaneContext-openNewWindow"
-        label="&folderContextOpenNewWindow.label;"
-        accesskey="&folderContextOpenNewWindow.accesskey;"
-        oncommand="MsgOpenNewWindowForFolder(null,-1);"/>
-    <menuitem id="folderPaneContext-copy-location"
-        label="&folderContextCopyLocation.label;"
-        accesskey="&folderContextCopyLocation.accesskey;"
-        oncommand="CopyFolderUrl();"/>
-    <menuitem id="folderPaneContext-subscribe"
-        label="&folderContextSubscribe.label;"
-        accesskey="&folderContextSubscribe.accesskey;"
-        oncommand="MsgSubscribe();"/>
-    <menuitem id="folderPaneContext-newsUnsubscribe"
-        label="&folderContextUnsubscribe.label;"
-        accesskey="&folderContextUnsubscribe.accesskey;"
-        oncommand="MsgUnsubscribe();"/>
-    <menuseparator id="folderPaneContext-sep1"/>
-    <menuitem id="folderPaneContext-getMessages"
-        label="&folderContextGetMessages.label;"
-        accesskey="&folderContextGetMessages.accesskey;"
-        oncommand="MsgGetMessage();"/>
-    <menuitem id="folderPaneContext-markAllRead"
-        label="&folderContextMarkNewsgroupRead.label;"
-        accesskey="&folderContextMarkNewsgroupRead.accesskey;"
-        oncommand="MsgMarkAllRead();"/>
-    <menuitem id="folderPaneContext-new"
-        label="&folderContextNew.label;"
-        accesskey="&folderContextNew.accesskey;"
-        oncommand="MsgNewFolder(NewFolder);"/>
-    <menuitem id="folderPaneContext-rename"
-        label="&folderContextRename.label;"
-        accesskey="&folderContextRename.accesskey;"
-        oncommand="MsgRenameFolder();"/>
-        <menuitem id="folderPaneContext-compact"
-              label="&folderContextCompact.label;"
-              accesskey="&folderContextCompact.accesskey;"
-        oncommand="MsgCompactFolder(false);"/>          //for one folder only
-    <menuitem id="folderPaneContext-remove"
-        label="&folderContextRemove.label;"
-        accesskey="&folderContextRemove.accesskey;"
-        oncommand="MsgDeleteFolder();"/>
-    <menuitem id="folderPaneContext-emptyTrash"
-        label="&folderContextEmptyTrash.label;"
-        accesskey="&folderContextEmptyTrash.accesskey;"
-        oncommand="MsgEmptyTrash();"/>
-    <menuitem id="folderPaneContext-sendUnsentMessages"
-        label="&folderContextSendUnsentMessages.label;"
-        accesskey="&folderContextSendUnsentMessages.accesskey;"
-        oncommand="goDoCommand('cmd_sendUnsentMsgs')"/>
-    <menuseparator id="folderPaneContext-sep-edit"/>
-    <menuitem id="folderPaneContext-searchMessages"
-        label="&folderContextSearchMessages.label;"
-        accesskey="&folderContextSearchMessages.accesskey;"
-        observes="cmd_search"/>
-    <menuitem id="folderPaneContext-properties"
-        label="&folderContextProperties.label;"
-        accesskey="&folderContextProperties.accesskey;"
-        oncommand="MsgFolderProperties();"/>
-  </popup> 
-
-  <popup id="messagePaneContext"   
-     onpopupshowing="gContextMenu = new nsContextMenu(this); return fillMessagePaneContextMenu();"
-     onpopuphiding="gContextMenu.onDestroy(); gContextMenu = null;">
-        <menuitem id="context-openlink"
-                  label="&openLinkCmd.label;"
-                  accesskey="&openLinkCmd.accesskey;"
-                  oncommand="gContextMenu.openLink();"/>
-        <menuseparator id="messagePaneContext-sep-link"/>
-        <menuitem id="context-selectall"
-                  label="&selectAllCmd.label;"
-                  accesskey="&selectAllCmd.accesskey;"
-                  command="cmd_selectAll"/>
-        <menuitem id="context-copy"
-                  label="&copyCmd.label;"
-                  accesskey="&copyCmd.accesskey;"
-                  command="cmd_copy"/>
-    <menuseparator id="messagePaneContext-sep-open"/>
-    <menuitem id="messagePaneContext-replySender"
-        label="&contextReplySender.label;"
-        accesskey="&contextReplySender.accesskey;"
-        oncommand="MsgReplySender(event);"/>
-    <menuitem id="messagePaneContext-replyNewsgroup"
-        label="&contextReplyNewsgroup.label;"
-        accesskey="&contextReplyNewsgroup.accesskey;"
-        oncommand="MsgReplyMessage(event);"/>
-    <menuitem id="messagePaneContext-replyAll"
-        label="&contextReplyAll.label;"
-        accesskey="&contextReplyAll.accesskey;"
-        oncommand="MsgReplyToAllMessage(event);"/>
-    <menuitem id="messagePaneContext-forward"
-        label="&contextForward.label;"
-        accesskey="&contextForward.accesskey;"
-        oncommand="MsgForwardMessage(event);"/>
-    <menuitem id="messagePaneContext-editAsNew"
-        label="&contextEditAsNew.label;"
-        accesskey="&contextEditAsNew.accesskey;"
-        oncommand="MsgEditMessageAsNew();"/>
-    <menuseparator id="messagePaneContext-sep-reply"/>
-    <menuitem id="messagePaneContext-copyMessageUrl"
-        label="&copyMessageLocation.label;"
-        accesskey="&copyMessageLocation.accesskey;"
-        oncommand="CopyMessageUrl()"/>
-    <menu id="messagePaneContext-moveMenu"
-        label="&contextMoveMsgMenu.label;"
-        accesskey="&contextMoveMsgMenu.accesskey;"
-        sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-        sortDirection="ascending"
-        datasources="rdf:null">
-      <menupopup/>
-      <template> 
-      <rule nc:NoSelect="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule> 
-        <rule nc:NoSelect="true">
-          <menupopup>
-            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-              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">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
-                  oncommand="MsgMoveMessage(event.target.parentNode.parentNode)"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessagesOnServer="false">
-          <!-- don't show servers (nntp & any others) which does not allow message filing -->
-          <!-- File, Move & Copy menus -->
-        </rule>
-        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
-          <!-- note, there is no "file here" -->
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-                  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">
-              <menupopup/>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true">
-          <menupopup>
-            <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
-              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"/>
-          </menupopup>
-        </rule>
-      </template>
-    </menu>
-    <menu id="messagePaneContext-copyMenu"
-      label="&contextCopyMsgMenu.label;"
-      accesskey="&contextCopyMsgMenu.accesskey;"
-      sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-      sortDirection="ascending"
-      datasources="rdf:null">
-      <menupopup/>
-      <template>
-      <rule nc:NoSelect="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule> 
-        <rule nc:NoSelect="true">
-          <menupopup>
-            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-              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">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
-                  oncommand="MsgCopyMessage(event.target.parentNode.parentNode)"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessagesOnServer="false">
-          <!-- don't show servers (nntp & any others) which does not allow message filing -->
-          <!-- File, Move & Copy menus -->
-        </rule>
-        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
-          <!-- note, there is no "file here" -->
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-                  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">
-              <menupopup/>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true">
-          <menupopup>
-            <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" 
-              oncommand="MsgCopyMessage(event.target)" 
-              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"/>
-          </menupopup>
-        </rule>
-      </template>
-    </menu>
-    <menuseparator id="messagePaneContext-sep-labels-1"/>
-    <menu id="messagePaneContext-labels" label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
-      <menupopup onpopupshowing="InitMessageLabel('messagePaneContext')">
-        <menuitem
-           id="messagePaneContext-labelMenuItem0"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd0.accesskey;"
-           observes="cmd_label0"/>
-        <menuseparator/>
-        <menuitem
-           id="messagePaneContext-labelMenuItem1"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd1.accesskey;"
-           observes="cmd_label1"/>
-        <menuitem
-           id="messagePaneContext-labelMenuItem2"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd2.accesskey;"
-           observes="cmd_label2"/>
-        <menuitem
-           id="messagePaneContext-labelMenuItem3"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd3.accesskey;"
-           observes="cmd_label3"/>
-        <menuitem
-           id="messagePaneContext-labelMenuItem4"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd4.accesskey;"
-           observes="cmd_label4"/>
-        <menuitem
-           id="messagePaneContext-labelMenuItem5"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd5.accesskey;"
-           observes="cmd_label5"/>
-      </menupopup>
-    </menu>
-    <menuseparator id="messagePaneContext-sep-labels-2"/>
-    <menuitem id="messagePaneContext-saveAs"
-        label="&contextSaveAs.label;"
-        accesskey="&contextSaveAs.accesskey;"
-        oncommand="MsgSaveAsFile();"/>
-    <menuitem id="messagePaneContext-print"
-        label="&contextPrint.label;"
-        accesskey="&contextPrint.accesskey;"
-        oncommand="PrintEnginePrint();"/>
-    <menuitem id="messagePaneContext-delete"
-        command="cmd_delete"/>
-    <menuseparator id="messagePaneContext-sep-edit"/>
-        <menuitem id="context-viewimage"
-                  label="&viewImageCmd.label;"
-                  accesskey="&viewImageCmd.accesskey;"
-                  oncommand="gContextMenu.viewImage();"/>
-        <menuseparator id="messagePaneContext-sep-image"/>
-        <menuitem id="context-copylink"
-                  label="&copyLinkCmd.label;"
-                  accesskey="&copyLinkCmd.accesskey;"
-                  command="cmd_copyLink"/>
-        <menuitem id="context-copyimage"
-                  label="&copyImageCmd.label;"
-                  accesskey="&copyImageCmd.accesskey;"
-                  command="cmd_copyImageLocation"/>
-        <menuitem id="context-copyemail"
-                  label="&copyEmailCmd.label;"
-                  accesskey="&copyEmailCmd.accesskey;"
-                  oncommand="gContextMenu.copyEmail();"/>
-        <menuseparator id="messagePaneContext-sep-copy"/>
-        <menuitem id="context-savelink"
-                  label="&saveLinkCmd.label;"
-                  accesskey="&saveLinkCmd.accesskey;"
-                  oncommand="gContextMenu.saveLink();"/>
-        <menuitem id="context-saveimage"
-                  label="&saveImageCmd.label;"
-                  accesskey="&saveImageCmd.accesskey;"
-                  oncommand="gContextMenu.saveImage();"/>
-        <menuitem id="context-bookmarklink"
-                  label="&bookmarkLinkCmd.label;"
-                  accesskey="&bookmarkLinkCmd.accesskey;"
-                  oncommand="BookmarksUtils.addBookmark(gContextMenu.linkURL(),
-                                                        gContextMenu.linkText());"/>
-
-</popup>
-
-<menubar id="mailMenubar" grippytooltiptext="&menuBar.tooltip;">
-  <menu id="menu_File" >
-    <menupopup id="menu_FilePopup" onpopupshowing="file_init();">
-      <menu id="menu_New">
-        <menupopup id="menu_NewPopup" onpopupshowing="menu_new_init();">
-          <menuitem label="&newNewMsgCmd.label;"
-                    accesskey="&newNewMsgCmd.accesskey;"
-                    key="key_newMessage"
-                    oncommand="MsgNewMessage(null);"/>
-          <menuitem id="menu_newFolder" label="&newFolderCmd.label;"
-                     oncommand="MsgNewFolder(NewFolder);"
-                     accesskey="&newFolderCmd.accesskey;"/>
-          <menuitem id="newAccountMenuItem" label="&newAccountCmd.label;"
-                     accesskey="&newAccountCmd.accesskey;"
-                     oncommand="MsgAccountWizard();"/>
-          <menuseparator/>
-          <menuitem id="menu_newNavigator"/>
-          <menuitem id="menu_newEditor"/>
-        </menupopup>
-      </menu>
-      <menuitem id="openMessageWindowMenuitem" label="&openMessageWindowCmd.label;"
-        observes="cmd_openMessage"
-        accesskey="&openMessageWindowCmd.accesskey;"
-        key="key_openMessage"/>
-      <menu id="fileAttachmentMenu" label="&openAttachmentCmd.label;" accesskey="&openAttachmentCmd.accesskey;">
-        <menupopup id="attachmentMenuList" onpopupshowing="FillAttachmentListPopup(this);"/>
-      </menu>
-      <menuitem id="menu_close"/>
-      <menuseparator/>
-      <menu label="&saveAsMenu.label;" accesskey="&saveAsMenu.accesskey;">
-        <menupopup>
-          <menuitem label="&saveAsFileCmd.label;"
-           accesskey="&saveAsFileCmd.accesskey;"
-           key="key_saveAsFile"
-           observes="cmd_saveAsFile"/>
-          <menuitem label="&saveAsTemplateCmd.label;"
-           accesskey="&saveAsTemplateCmd.accesskey;"
-           observes="cmd_saveAsTemplate"/>
-        </menupopup>
-      </menu>
-      <menuseparator/>
-      <menuitem label="&getNewMsgCmd.label;"
-       accesskey="&getNewMsgCmd.accesskey;"
-       key="key_getNewMessages"
-       observes="cmd_getNewMessages"/>
-                        <menu label="&getNewMsgForCmd.label;" 
-                              accesskey="&getNewMsgForCmd.accesskey;"
-                              sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-                              sortDirection="ascending"
-                              datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
-                              containment="http://home.netscape.com/NC-rdf#child"
-                              ref="msgaccounts:/"
-                              observes="cmd_getNewMessages">
-                            <menupopup>
-                                <menuitem label="&getAllNewMsgCmd.label;" 
-                                          key="key_getAllNewMessages"
-                                          observes="cmd_getMsgsForAuthAccounts"/>
-                                <menuseparator/>
-                            </menupopup>
-                            <template>
-                                <rule nc:IsServer="true" nc:CanGetMessages="true">
-                                    <menupopup>
-                                        <menuitem uri="..." 
-                                                  value="..." 
-                                                  label="rdf:http://home.netscape.com/NC-rdf#Name" 
-                                                  oncommand="MsgGetMessagesForAccount(event)"/>
-                                    </menupopup>
-                                </rule>
-                            </template>
-                            <menupopup/>
-                        </menu>
-      <menuitem id="menu_getnextnmsg" label="&getNextNMsgCmd.label;"
-       observes="cmd_getNextNMessages"/>
-      <menuitem id="menu_sendunsentmsgs" label="&sendUnsentCmd.label;"
-       accesskey="&sendUnsentCmd.accesskey;"
-       observes="cmd_sendUnsentMsgs"/>
-      <menuitem label="&subscribeCmd.label;"
-       accesskey="&subscribeCmd.accesskey;"
-       oncommand="MsgSubscribe();"/>
-       <menuseparator/>
-      <menuitem id="menu_renameFolder" label="&renameFolder.label;"
-             accesskey="&renameFolder.accesskey;"
-             observes="cmd_renameFolder"/>
-      <menuitem id="menu_compactFolder" label="&compactFolders.label;" accesskey="&compactFolder.accesskey;" observes="cmd_compactFolder"/>
-      <menuitem id="menu_emptyTrash" label="&emptyTrashCmd.label;"
-             accesskey="&emptyTrashCmd.accesskey;"
-             observes="cmd_emptyTrash"/>
-      <menuseparator id="trashMenuSeparator"/>
-      <menu label="&offlineMenu.label;" accesskey="&offlineMenu.accesskey;">
-        <menupopup>
-           <menuitem id="offlineGoOfflineCmd"/>
-       <menuseparator/>
-       <menuitem label="&synchronizeOfflineCmd.label;"  accesskey="&synchronizeOfflineCmd.accesskey;" observes="cmd_synchronizeOffline"/>
-       <menuitem label="&settingsOfflineCmd.label;"     accesskey="&settingsOfflineCmd.accesskey;"    observes="cmd_settingsOffline"/>
-           <menuseparator/>
-           <menuitem label="&downloadFlaggedCmd.label;"     accesskey="&downloadFlaggedCmd.accesskey;"    observes="cmd_downloadFlagged"/>
-           <menuitem label="&downloadSelectedCmd.label;"    accesskey="&downloadSelectedCmd.accesskey;"   observes="cmd_downloadSelected"/>
-        </menupopup>
-      </menu>
-
-      <menuseparator/>
-      <!--Page setup gets overlaid here from platformGlobalOverlay.xul / -->
-      <menuitem id="printMenuItem" key="key_print" label="&printCmd.label;" accesskey="&printCmd.accesskey;" observes="cmd_print"/>
-    </menupopup>
-  </menu>
-
-  <menu id="menu_Edit" oncommand="CommandUpdate_UndoRedo();">
-    <menupopup onpopupshowing="InitEditMessagesMenu()">
-      <menuitem id="menu_undo" label="&undoDefaultCmd.label;" accesskey="&undoDefaultCmd.accesskey;" key="key_undo" observes="cmd_undo" oncommand="Undo()"/>
-      <menuitem id="menu_redo" label="&redoDefaultCmd.label;" accesskey="&redoDefaultCmd.accesskey;" key="key_redo" observes="cmd_redo" oncommand="Redo()"/>
-      <menuseparator/>
-      <menuitem id="menu_cut"/>
-      <menuitem id="menu_copy"/>
-      <menuitem id="menu_paste"/>
-      <menuitem id="menu_delete" observes="cmd_delete"/>
-      <menuseparator/>
-      <menu label="&selectMenu.label;" accesskey="&selectMenu.accesskey;">
-        <menupopup>
-          <menuitem label="&all.label;" accesskey="&all.accesskey;" key="key_selectAll"
-                    command="cmd_selectAll"/>
-          <menuseparator/>
-          <menuitem label="&selectThreadCmd.label;"
-           accesskey="&selectThreadCmd.accesskey;"
-           key="key_selectThread"
-           observes="cmd_selectThread"/>
-        </menupopup>
-      </menu>
-      <menuseparator/>
-      <menuitem label="&findCmd.label;" key="key_find" accesskey="&findCmd.accesskey;" observes="cmd_find"/>
-      <menuitem label="&findAgainCmd.label;" key="key_findAgain" accesskey="&findAgainCmd.accesskey;" observes="cmd_findAgain"/>
-      <menuitem label="&findPrevCmd.label;"  key="key_findPrev"  accesskey="&findPrevCmd.accesskey;"  observes="cmd_findPrev"/>
-      <menuseparator/>
-      <menuitem id="menu_properties" label="&folderPropsCmd.label;"
-                accesskey="&folderPropsCmd.accesskey;"
-                observes="cmd_properties"/>
-      <menuitem label="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" oncommand="MsgAccountManager(null);"/>
-      <menuitem id="menu_preferences" oncommand="goPreferences('mailnews', 'chrome://messenger/content/pref-mailnews.xul','mailnews')"/>
-    </menupopup>
-  </menu>
-
-  <menu id="menu_View">
-    <menupopup id="menu_View_Popup" onpopupshowing="view_init()">
-      <menu id="menu_Toolbars">
-        <menupopup id="view_toolbars_popup">
-          <menuitem id="menu_showMessengerToolbar"
-           type="checkbox"
-           label="&showMessengerToolbarCmd.label;"
-           accesskey="&showMessengerToolbarCmd.accesskey;"
-           oncommand="goToggleToolbar('msgToolbar', 'menu_showMessengerToolbar')"
-           checked="true"/>
-          <menuitem id="menu_showSearchToolbar"
-           type="checkbox"
-           label="&showSearchToolbarCmd.label;"
-           accesskey="&showSearchToolbarCmd.accesskey;"
-           oncommand="goToggleToolbar('searchBox', 'menu_showSearchToolbar'); SearchBarToggled();"
-           checked="true"/>
-          <menuitem type="checkbox" id="menu_showTaskbar"/>
-          <menuseparator/>
-          <menuitem id="menu_showMessage"
-           type="checkbox"
-           label="&showMessageCmd.label;"
-           accesskey="&showMessageCmd.accesskey;"
-           oncommand="MsgToggleMessagePane();"/>
-        </menupopup>
-      </menu>
-      <menuseparator/>
-      <menu id="viewSortMenu" accesskey="&sortMenu.accesskey;" label="&sortMenu.label;">
-        <menupopup onpopupshowing="InitViewSortByMenu()">
-          <menuitem id="sortByDateMenuitem" type="radio" name="sortby" label="&sortByDateCmd.label;" accesskey="&sortByDateCmd.accesskey;" oncommand="MsgSortByDate()"/>
-          <menuitem id="sortByFlagMenuitem" type="radio" name="sortby" label="&sortByFlagCmd.label;" accesskey="&sortByFlagCmd.accesskey;" oncommand="MsgSortByFlagged()"/>
-          <menuitem id="sortByOrderReceivedMenuitem" type="radio" name="sortby" label="&sortByOrderReceivedCmd.label;"  accesskey="&sortByOrderReceivedCmd.accesskey;" oncommand="MsgSortByOrderReceived()"/>
-          <menuitem id="sortByPriorityMenuitem" type="radio" name="sortby" label="&sortByPriorityCmd.label;" accesskey="&sortByPriorityCmd.accesskey;" oncommand="MsgSortByPriority()"/>
-    <!-- for Sender / Recipient, accesskey and label are set dynamically -->
-          <menuitem id="sortBySenderOrRecipientMenuitem" type="radio" name="sortby" oncommand="MsgSortBySenderOrRecipient()"/>
-          <menuitem id="sortBySizeMenuitem" type="radio" name="sortby" label="&sortBySizeCmd.label;" accesskey="&sortBySizeCmd.accesskey;" oncommand="MsgSortBySize()"/>
-          <menuitem id="sortByStatusMenuitem" type="radio" name="sortby" label="&sortByStatusCmd.label;" accesskey="&sortByStatusCmd.accesskey;" oncommand="MsgSortByStatus()"/>
-          <menuitem id="sortBySubjectMenuitem" type="radio" name="sortby" label="&sortBySubjectCmd.label;" accesskey="&sortBySubjectCmd.accesskey;" oncommand="MsgSortBySubject()"/>
-          <menuitem id="sortByThreadMenuitem" type="radio" name="sortby" label="&sortByThreadCmd.label;"  accesskey="&sortByThreadCmd.accesskey;" oncommand="MsgSortByThread()"/>
-          <menuitem id="sortByUnreadMenuitem" type="radio" name="sortby" label="&sortByUnreadCmd.label;"  accesskey="&sortByUnreadCmd.accesskey;" oncommand="MsgSortByUnread()"/>
-          <menuitem id="sortByLabelMenuitem" type="radio" name="sortby" label="&sortByLabelCmd.label;" accesskey="&sortByLabelCmd.accesskey;" oncommand="MsgSortByLabel()"/>
-<!-- not ready yet
-          <menuitem id="sortByScoreMenuitem" type="radio" name="sortby" label="&sortByScoreCmd.label;" accesskey="&sortByScoreCmd.accesskey;" oncommand="MsgSortByScore()"/>
--->
-          <menuseparator/>
-          <menuitem id="sortAscending" type="radio" name="sortdirection" label="&sortAscending.label;" accesskey="&sortAscending.accesskey;" oncommand="MsgSortAscending()"/>
-          <menuitem id="sortDescending" type="radio" name="sortdirection" label="&sortDescending.label;" accesskey="&sortDescending.accesskey;" oncommand="MsgSortDescending()"/>
-        </menupopup>
-      </menu>
-      <menu label="&msgsMenu.label;" id="viewMessagesMenu" accesskey="&msgsMenu.accesskey;">
-        <menupopup onpopupshowing="InitViewMessagesMenu()">
-          <menuitem id="viewAllMessagesMenuItem" type="radio" name="viewmessages" label="&allMsgsCmd.label;" accesskey="&allMsgsCmd.accesskey;" disabled="true" observes="cmd_viewAllMsgs"/>
-          <menuitem id="viewUnreadMessagesMenuItem" type="radio" name="viewmessages" label="&unreadMsgsCmd.label;" accesskey="&unreadMsgsCmd.accesskey;" disabled="true" observes="cmd_viewUnreadMsgs"/>
-          <menuitem id="viewThreadsWithUnreadMenuItem" type="radio" name="viewmessages" label="&threadsWithUnreadCmd.label;" accesskey="&threadsWithUnreadCmd.accesskey;" disabled="true" observes="cmd_viewThreadsWithUnread"/>
-          <menuitem id="viewWatchedThreadsWithUnreadMenuItem" type="radio" name="viewmessages" label="&watchedThreadsWithUnreadCmd.label;" accesskey="&watchedThreadsWithUnreadCmd.accesskey;" disabled="true" observes="cmd_viewWatchedThreadsWithUnread"/>
-          <menuseparator/>
-          <menuitem id="viewIgnoredThreadsMenuItem" type="checkbox" label="&ignoredThreadsCmd.label;" disabled="true" observes="cmd_viewIgnoredThreads" accesskey="&ignoredThreadsCmd.accesskey;"/>
-          <menuseparator/>
-          <menuitem label="&expandAllThreadsCmd.label;" accesskey="&expandAllThreadsCmd.accesskey;" key="key_expandAllThreads" disabled="true" observes="cmd_expandAllThreads"/>
-          <menuitem label="&collapseAllThreadsCmd.label;" accesskey="&collapseAllThreadsCmd.accesskey;" key="key_collapseAllThreads" disabled="true" observes="cmd_collapseAllThreads"/>
-        </menupopup>
-      </menu>
-      <menu id="viewheadersmenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
-        <menupopup  onpopupshowing="InitViewHeadersMenu();">
-          <menuitem id="viewallheaders"
-           type="radio"
-           name="viewheadergroup"
-           label="&headersAllCmd.label;"
-           accesskey="&headersAllCmd.accesskey;"
-           oncommand="MsgViewAllHeaders();"/>
-          <menuitem id="viewnormalheaders"
-           checked="true"
-           type="radio"
-           name="viewheadergroup"
-           label="&headersNormalCmd.label;"
-           accesskey="&headersNormalCmd.accesskey;"
-           oncommand="MsgViewNormalHeaders();"/>
-        </menupopup>
-      </menu>
-      <menu id="viewBodyMenu"
-       accesskey="&bodyMenu.accesskey;"
-       label="&bodyMenu.label;">
-        <menupopup onpopupshowing="InitViewBodyMenu()">
-          <menuitem id="bodyAllowHTML"
-           type="radio"
-           name="bodyPlaintextVsHTMLPref"
-           label="&bodyAllowHTML.label;"
-           accesskey="&bodyAllowHTML.accesskey;"
-           oncommand="MsgBodyAllowHTML()"/>
-          <menuitem id="bodySanitized"
-           type="radio"
-           name="bodyPlaintextVsHTMLPref"
-           label="&bodySanitized.label;"
-           accesskey="&bodySanitized.accesskey;"
-           oncommand="MsgBodySanitized()"/>
-          <menuitem id="bodyAsPlaintext"
-           type="radio"
-           name="bodyPlaintextVsHTMLPref"
-           label="&bodyAsPlaintext.label;"
-           accesskey="&bodyAsPlaintext.accesskey;"
-           oncommand="MsgBodyAsPlaintext()"/>
-        </menupopup>
-      </menu>
-      <menuseparator/>
-      <menuitem id="stopMenuitem" label="&stopCmd.label;" accesskey="&stopCmd.accesskey;" key="key_stop" disabled="true" command="cmd_stop"/>
-      <menuitem label="&reloadCmd.label;" accesskey="&reloadCmd.accesskey;" observes="cmd_reload"/>
-      <menuseparator/>
-      <!-- overlayed from viewZoomOverlay.xul -->
-      <menu id="menu_textZoom"/>
-      <menu id="mailviewCharsetMenu" />
-      <menuseparator/>
-      <menuitem id="pageSourceMenuItem" label="&pageSourceCmd.label;" key="key_viewPageSource" accesskey="&pageSourceCmd.accesskey;" observes="cmd_viewPageSource"/>
-    </menupopup>
-  </menu>
-  <menu label="&goMenu.label;" accesskey="&goMenu.accesskey;">
-    <menupopup  onpopupshowing="InitGoMessagesMenu();">
-      <menu id="goNextMenu" label="&nextMenu.label;" accesskey="&nextMenu.accesskey;">
-        <menupopup>
-          <menuitem label="&nextMsgCmd.label;" key="key_nextMsg" accesskey="&nextMsgCmd.accesskey;" observes="cmd_nextMsg"/>
-          <menuitem label="&nextUnreadMsgCmd.label;" key="key_nextUnreadMsg" accesskey="&nextUnreadMsgCmd.accesskey;" observes="cmd_nextUnreadMsg"/>
-          <menuitem label="&nextFlaggedMsgCmd.label;" accesskey="&nextFlaggedMsgCmd.accesskey;" observes="cmd_nextFlaggedMsg"/>
-          <menuseparator/>
-          <menuitem label="&nextUnreadThread.label;" key="key_nextUnreadThread" accesskey="&nextUnreadThreadCmd.accesskey;" observes="cmd_nextUnreadThread"/>
-        </menupopup>
-      </menu>
-      <menu id="goPreviousMenu" label="&prevMenu.label;" accesskey="&prevMenu.accesskey;">
-        <menupopup>
-          <menuitem label="&prevMsgCmd.label;" key="key_previousMsg" accesskey="&previousMsgCmd.accesskey;" observes="cmd_previousMsg"/>
-          <menuitem label="&prevUnreadMsgCmd.label;" key="key_previousUnreadMsg" accesskey="&previousUnreadMsgCmd.accesskey;" observes="cmd_previousUnreadMsg"/>
-          <menuitem label="&prevFlaggedMsgCmd.label;" accesskey="&previousFlaggedMsgCmd.accesskey;" observes="cmd_previousFlaggedMsg"/>
-        </menupopup>
-      </menu>
-      <menuseparator id="goNextSeparator"/>
-      <menuitem label="&startPageCmd.label;" accesskey="&startPageCmd.accesskey;" oncommand="HideMessageHeaderPane();loadStartPage();"/>
-    </menupopup>
-  </menu>
-  
-  <menu label="&msgMenu.label;" accesskey="&msgMenu.accesskey;" >
-  <menupopup onpopupshowing="InitMessageMenu();">
-    <menuitem label="&newMsgCmd.label;"
-    accesskey="&newMsgCmd.accesskey;"
-    key="key_newMessage"
-    oncommand="MsgNewMessage(null);"/>
-    <menuitem id="replyMainMenu" label="&replyMsgCmd.label;" 
-      accesskey="&replyMsgCmd.accesskey;"
-      key="key_reply"
-      observes="cmd_reply"/>
-    <menuitem id="replySenderMainMenu" label="&replySenderCmd.label;" 
-      accesskey="&replySenderCmd.accesskey;"
-      observes="cmd_replySender"/>
-    <menuitem id="replyNewsgroupMainMenu" label="&replyNewsgroupCmd.label;" 
-      accesskey="&replyNewsgroupCmd.accesskey;"
-      key="key_reply"
-      observes="cmd_replyGroup"/>
-    <menuitem label="&replyToAllMsgCmd.label;"
-      accesskey="&replyToAllMsgCmd.accesskey;"
-      key="key_replyall"
-      observes="cmd_replyall"/>
-    <menuitem label="&forwardMsgCmd.label;"
-      accesskey="&forwardMsgCmd.accesskey;"
-      key="key_forward"
-      observes="cmd_forward"/>
-    <menu label="&forwardAsMenu.label;" accesskey="&forwardAsMenu.accesskey;">
-      <menupopup>
-        <menuitem label="&forwardAsInline.label;" accesskey="&forwardAsInline.accesskey;" observes="cmd_forwardInline"/>
-        <menuitem label="&forwardAsAttachmentCmd.label;" accesskey="&forwardAsAttachmentCmd.accesskey;" observes="cmd_forwardAttachment"/>
-      </menupopup>
-    </menu>
-        <menuitem label="&editMsgAsNewCmd.label;"
-            accesskey="&editMsgAsNewCmd.accesskey;"
-            key="key_editAsNew"
-            observes="cmd_editAsNew"/>
-    <menuseparator/>
-    <menu label="&moveMsgMenu.label;" accesskey="&moveMsgMenu.accesskey;" id="moveMenu" datasources="rdf:null"
-     sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-     sortDirection="ascending">
-      <menupopup/>
-      <template> 
-      <rule nc:NoSelect="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule> 
-        <rule nc:NoSelect="true">
-          <menupopup>
-            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-             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">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
-                  oncommand="MsgMoveMessage(event.target.parentNode.parentNode)"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessagesOnServer="false">
-          <!-- don't show servers (nntp & any others) which does not allow message filing -->
-          <!-- File, Move & Copy menus -->
-        </rule>
-        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
-          <!-- note, there is no "file here" -->
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-             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">
-              <menupopup/>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true">
-          <menupopup>
-            <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
-             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"/>
-          </menupopup>
-        </rule>
-      </template>
-    </menu>
-    <menu label="&copyMsgMenu.label;" accesskey="&copyMsgMenu.accesskey;" id="copyMenu" datasources="rdf:null"
-     sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-     sortDirection="ascending">
-      <menupopup/>
-      <template>
-      <rule nc:NoSelect="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule> 
-        <rule nc:NoSelect="true">
-          <menupopup>
-            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-             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">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
-                  oncommand="MsgCopyMessage(event.target.parentNode.parentNode)"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessagesOnServer="false">
-          <!-- don't show servers (nntp & any others) which does not allow message filing -->
-          <!-- File, Move & Copy menus -->
-        </rule>
-        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
-          <!-- note, there is no "file here" -->
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-             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">
-              <menupopup/>
-            </menu>
-          </menupopup>
-        </rule>
-        <rule nc:CanFileMessages="true">
-          <menupopup>
-            <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" 
-             oncommand="MsgCopyMessage(event.target)" 
-             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"/>
-          </menupopup>
-        </rule>
-      </template>
-    </menu>
-    <menu label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
-      <menupopup id="menuPopup-labels" onpopupshowing="InitMessageLabel('menuPopup')">
-        <menuitem
-           id="menuPopup-labelMenuItem0"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd0.accesskey;"
-           observes="cmd_label0"/>
-        <menuseparator/>
-        <menuitem
-           id="menuPopup-labelMenuItem1"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd1.accesskey;"
-           observes="cmd_label1"/>
-        <menuitem
-           id="menuPopup-labelMenuItem2"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd2.accesskey;"
-           observes="cmd_label2"/>
-        <menuitem
-           id="menuPopup-labelMenuItem3"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd3.accesskey;"
-           observes="cmd_label3"/>
-        <menuitem
-           id="menuPopup-labelMenuItem4"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd4.accesskey;"
-           observes="cmd_label4"/>
-        <menuitem
-           id="menuPopup-labelMenuItem5"
-           type="radio"
-           checked="false"
-           accesskey="&labelCmd5.accesskey;"
-           observes="cmd_label5"/>
-      </menupopup>
-    </menu>
-    <menu label="&markMenu.label;" accesskey="&markMenu.accesskey;">
-      <menupopup onpopupshowing="InitMessageMark()">
-        <menuitem type="checkbox" key="key_toggleRead" id="markReadMenuItem" label="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" observes="cmd_markAsRead"/>
-        <menuitem label="&markThreadAsReadCmd.label;" key="key_markThreadAsRead" accesskey="&markThreadAsReadCmd.accesskey;" observes="cmd_markThreadAsRead"/>
-        <menuitem label="&markAllReadCmd.label;" key="key_markAllRead" accesskey="&markAllReadCmd.accesskey;" observes="cmd_markAllRead"/>
-        <menuseparator/>
-        <menuitem type="checkbox" id="markFlaggedMenuItem" label="&markFlaggedCmd.label;" accesskey="&markFlaggedCmd.accesskey;" observes="cmd_markAsFlagged"/>
-      </menupopup>
-    </menu>
-    <menuseparator/>
-    <menuitem id="createFilter" label="&createFilter.label;"
-              accesskey="&createFilter.accesskey;"
-              observes="cmd_createFilterFromMenu"/>
-    <menuseparator id="threadItemsSeparator"/>
-    <menuitem label="&killThreadMenu.label;"
-        accesskey="&killThreadMenu.accesskey;"
-        key="key_killThread"
-        id="killThread"
-        observes="cmd_killThread"/>
-    <menuitem label="&watchThreadMenu.label;"
-        accesskey="&watchThreadMenu.accesskey;"
-        key="key_watchThread"
-        id="watchThread"
-        observes="cmd_watchThread"/>
-  </menupopup>
-</menu>
-
-<menu id="tasksMenu">
-  <menupopup id="taskPopup">
-    <menuitem label="&searchMailCmd.label;" 
-              key="key_searchMail" 
-              accesskey="&searchMailCmd.accesskey;" 
-              command="cmd_searchMsgs"/>
-    <menuitem label="&searchAddressesCmd.label;" 
-              accesskey="&searchAddressesCmd.accesskey;" 
-              oncommand="MsgSearchAddresses()"/>
-    <menuitem label="&filtersCmd.label;"
-              accesskey="&filtersCmd.accesskey;"
-              oncommand="MsgFilters(null);"/>
-<!-- not ready yet
-    <menuitem label="&junkMailCmd.label;" 
-              accesskey="&junkMailCmd.accesskey;" 
-              oncommand="MsgJunkMail()"/>
-    <menuseparator/>
-    <menuitem label="Mark All Messages In Folder As Junk" oncommand="markFolderAsJunk(true);"/>
-    <menuitem label="Mark All Messages In Folder As Not Junk" oncommand="markFolderAsJunk(false);"/>
-    <menuitem label="Analyze Folder" oncommand="analyzeFolder();"/>
-    <menuitem label="Analyze Messages" oncommand="analyzeMessages();"/>
-    <menuitem label="Write DB" oncommand="writeHash();"/>
-    <menuseparator/>
-
--->
-
-    <menuitem label="&filtersApply.label;"
-              accesskey="&filtersApply.accesskey;"
-              oncommand="MsgApplyFilters(null);"/>
-    <menuitem label="&importCmd.label;" 
-              accesskey="&importCmd.accesskey;" 
-              oncommand="toImport();"/>
-    <menuseparator/>
-  </menupopup>
-</menu>
-<menu id="windowMenu"/>
-<menu id="menu_Help"/>
-<spacer flex="100%"/>
-</menubar>
-
-<toolbox id="mailToolbarToolbox">
-  <toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed" grippytooltiptext="&mailToolbar.tooltip;">
-    <hbox id="toolbar_button_box">
-      <toolbarbutton type="menu-button" id="button-getmsg" 
-                     class="toolbarbutton-1"
-                     label="&getMsgButton.label;"
-                     sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-                     sortDirection="ascending"
-                     tooltiptext="&getMsgButton.tooltip;" 
-                     observes="button_getNewMessages" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" 
-                     oncommand="goDoCommand('cmd_getNewMessages')" 
-                     containment="http://home.netscape.com/NC-rdf#child" 
-                     ref="msgaccounts:/">
-          <menupopup onpopupshowing="getMsgToolbarMenu_init()">
-              <menuitem label="&getAllNewMsgCmd.label;" 
-                        observes="cmd_getMsgsForAuthAccounts"/>
-              <menuseparator/>
-          </menupopup>
-          <template>
-              <rule nc:IsServer="true" nc:CanGetMessages="true">
-                  <menupopup>
-                      <menuitem uri="..." 
-                                value="..." 
-                                label="rdf:http://home.netscape.com/NC-rdf#Name"
-                                oncommand="MsgGetMessagesForAccount(event);"/>
-                  </menupopup>
-              </rule>
-          </template>
-          <menupopup/>
-      </toolbarbutton>
-      <toolbarbutton id="button-newmsg" class="toolbarbutton-1" label="&newMsgButton.label;" tooltiptext="&newMsgButton.tooltip;" oncommand="MsgNewMessage(event)"/>
-      <toolbarseparator class="toolbarseparator-primary"/>
-      <toolbarbutton id="button-reply" class="toolbarbutton-1" label="&replyButton.label;" tooltiptext="&replyButton.tooltip;" observes="button_reply" oncommand="MsgReplyMessage(event)"/>
-      <toolbarbutton class="toolbarbutton-1" id="button-replyall" label="&replyAllButton.label;" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" oncommand="MsgReplyToAllMessage(event)"/>
-      <toolbarbutton class="toolbarbutton-1" id="button-forward" label="&forwardButton.label;" tooltiptext="&forwardButton.tooltip;" observes="button_forward" oncommand="MsgForwardMessage(event)"/>
-      <toolbarseparator class="toolbarseparator-primary"/>
-      <toolbarbutton type="menu" id="button-file" class="toolbarbutton-1" 
-                  label="&fileButton.label;" observes="button_file"
-                  datasources="rdf:null" 
-                  tooltiptext="&fileButton.tooltip;"
-                  sortResource="http://home.netscape.com/NC-rdf#FolderTreeName" sortDirection="ascending">
-        <template> 
-        <rule nc:NoSelect="true" iscontainer="true" isempty="false">
-          <menupopup>
-            <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
-              <menupopup>
-                <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" disabled="true"/>
-                <menuseparator/>
-              </menupopup>
-            </menu>
-          </menupopup>
-        </rule> 
-        <rule nc:NoSelect="true">
-          <menupopup>
-            <menuitem uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" disabled="true"/>
-          </menupopup>
-        </rule>
-          <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
-            <menupopup>
-              <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-               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">
-                <menupopup>
-                  <menuitem label="&fileHereMenu.label;" accesskey="&fileHereMenu.accesskey;" 
-                    oncommand="MsgMoveMessage(event.target.parentNode.parentNode)"/>
-                  <menuseparator/>
-                </menupopup>
-              </menu>
-            </menupopup>
-          </rule>
-          <rule nc:CanFileMessagesOnServer="false">
-            <!-- don't show servers (nntp & any others) which does not allow message filing -->
-            <!-- File, Move & Copy menus -->
-          </rule>
-          <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
-          <!-- note, there is no "file here" -->
-            <menupopup>
-              <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
-               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">
-                <menupopup/>
-              </menu>
-            </menupopup>
-          </rule>
-          <rule nc:CanFileMessages="true">
-            <menupopup>
-              <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
-               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"/>
-            </menupopup>
-          </rule>
-        </template>
-        <menupopup/>
-      </toolbarbutton>
-      <toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;" oncommand="goDoCommand('button_next')" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
-      <toolbarbutton class="toolbarbutton-1" id="button-delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/>
-<!-- not ready yet
-      <toolbarbutton class="toolbarbutton-1" id="button-junk" label="&junkButton.label;" tooltiptext="&junkButton.tooltip;" observes="button_junk" oncommand="goDoCommand('button_junk')"/>
--->
-      <toolbarbutton type="menu-button" id="button-mark" class="toolbarbutton-1" label="&markButton.label;" hidden="true" oncommand="goDoCommand('button_mark')"
-                  observes="button_mark" tooltiptext="&markButton.tooltip;">  
-            <menupopup onpopupshowing="InitMessageMark()">
-                <menuitem type="checkbox" key="key_toggleRead" id="markReadToolbarItem" label="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" observes="cmd_markAsRead" default="true" />
-                <menuitem label="&markThreadAsReadCmd.label;" key="key_markThreadAsRead" accesskey="&markThreadAsReadCmd.accesskey;" observes="cmd_markThreadAsRead"/>
-                <menuitem label="&markAllReadCmd.label;" key="key_markAllRead" accesskey="&markAllReadCmd.accesskey;" observes="cmd_markAllRead"/>
-                <menuseparator/>
-                <menuitem type="checkbox" id="markFlaggedToolbarItem" label="&markFlaggedCmd.label;" accesskey="&markFlaggedCmd.accesskey;" observes="cmd_markAsFlagged"/>
-            </menupopup>
-      </toolbarbutton>
-      <toolbarbutton id="button-print" type="menu-button" class="toolbarbutton-1" label="&printButton.label;" 
-                  observes="button_print" oncommand="goDoCommand('cmd_print')" tooltiptext="&printButton.tooltip;">  
-        <menupopup id="printMenu">
-          <menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" default="true"/>
-          </menupopup>
-      </toolbarbutton>
-      <toolbarbutton class="toolbarbutton-1" id="button-stop" label="&stopButton.label;" tooltiptext="&stopButton.tooltip;" command="cmd_stop"/>
-      <spacer flex="1"/>
-            <hbox id="throbber-box" align="center">
-                <button id="navigator-throbber" oncommand="goClickThrobber('messenger.throbber.url')" tooltiptext="&throbber.tooltip;"/>
-            </hbox>
-    </hbox>
-  </toolbar>
-</toolbox>
-
-<hbox id="searchBox" persist="collapsed" align="center">
-  <label id="searchCriteria" value="&SearchSubjectOrSender.label;" control="searchInput" 
-         accesskey="&SearchSubjectOrSender.accesskey;"/>
-  <textbox id="searchInput" flex="5" onfocus="this.select();" oninput="onSearchInput(false);" onkeypress="onSearchKeyPress(event);"/>
-  <button id="clearButton" label="&clearButton.label;" disabled="true" tooltiptext="&clearButton.tooltip;" oncommand="onClearSearch();" 
-          accesskey="&clearButton.accesskey;"/>
-  <button id="advancedButton" label="&advancedButton.label;" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"
-          accesskey="&advancedButton.accesskey;"/>
-</hbox>
-
-<statusbar class="chromeclass-status" id="status-bar"> 
-  <hbox insertbefore="unreadMessageCount" flex="1">
-    <statusbarpanel id="component-bar"/>
-    <statusbarpanel id="statusText" label="&statusText.label;" flex="1"/>
-    <statusbarpanel class="statusbarpanel-progress">
-      <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0" oncommand="dumpProgress()"/>
-    </statusbarpanel>
-  </hbox>
-  <hbox insertafter="totalMessageCount" id="status-bar-end-box">
-    <statusbarpanel checkfunc="MailCheckBeforeOfflineChange()" id="offline-status" class="statusbarpanel-iconic"/> 
-  </hbox>
-</statusbar> 
-
-
 </overlay>
diff --git a/mail/base/jar.mn b/mail/base/jar.mn
index 6a528212f4d..e9c195385f8 100644
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -1,71 +1,73 @@
-messenger.jar:
-+    content/messenger/contents.rdf                                             (content/contents.rdf)
-+    content/messenger/messenger.css                                            (content/messenger.css)
-+    content/messenger/messenger.xul                                            (content/messenger.xul)
-+    content/messenger/mail3PaneWindowVertLayout.xul                            (content/mail3PaneWindowVertLayout.xul)
-+    content/messenger/mailWindowExtrasOverlay.xul                              (content/mailWindowExtrasOverlay.xul)
-+    content/messenger/mailWindowOverlay.xul                                    (content/mailWindowOverlay.xul)
-+    content/messenger/mailWindowOverlay.js                                     (content/mailWindowOverlay.js)
-+    content/messenger/msgSynchronize.xul                                       (content/msgSynchronize.xul)
-+    content/messenger/msgSynchronize.js                                        (content/msgSynchronize.js)
-+    content/messenger/msgSelectOffline.xul                                     (content/msgSelectOffline.xul)
-+    content/messenger/mailWindow.js                                            (content/mailWindow.js)
-+    content/messenger/messageWindow.xul                                        (content/messageWindow.xul)
-+    content/messenger/messageWindow.js                                         (content/messageWindow.js)
-+    content/messenger/folderProps.xul                                          (content/folderProps.xul)
-+    content/messenger/folderProps.js                                           (content/folderProps.js)
-+    content/messenger/msgHdrViewOverlay.xul                                    (content/msgHdrViewOverlay.xul)
-+    content/messenger/msgHdrViewOverlay.js                                     (content/msgHdrViewOverlay.js)
-+    content/messenger/msgHdrViewAddresses.js                                   (content/msgHdrViewAddresses.js)
-+    content/messenger/widgetglue.js                                            (content/widgetglue.js)
-+    content/messenger/commandglue.js                                           (content/commandglue.js)
-+    content/messenger/mailCommands.js                                          (content/mailCommands.js)
-+    content/messenger/shareglue.js                                             (content/shareglue.js)
-+    content/messenger/subscribe.xul                                            (content/subscribe.xul)
-+    content/messenger/subscribe.js                                             (content/subscribe.js)
-+    content/messenger/newFolderDialog.xul                                      (content/newFolderDialog.xul)
-+    content/messenger/newFolderDialog.js                                       (content/newFolderDialog.js)
-+    content/messenger/msgViewNavigation.js                                     (content/msgViewNavigation.js)
-+    content/messenger/msgMail3PaneWindow.js                                    (content/msgMail3PaneWindow.js)
-+    content/messenger/searchBar.js                                             (content/searchBar.js)
-+    content/messenger/msgAccountCentral.xul                                    (content/msgAccountCentral.xul)
-+    content/messenger/msgAccountCentral.js                                     (content/msgAccountCentral.js)
-+    content/messenger/mail3PaneWindowCommands.js                               (content/mail3PaneWindowCommands.js)
-+    content/messenger/msgFolderPickerOverlay.js                                (content/msgFolderPickerOverlay.js)
-+    content/messenger/msgFolderPickerOverlay.xul                               (content/msgFolderPickerOverlay.xul)
-+    content/messenger/renameFolderDialog.xul                                   (content/renameFolderDialog.xul)
-+    content/messenger/renameFolderDialog.js                                    (content/renameFolderDialog.js)
-+    content/messenger/messengerdnd.js                                          (content/messengerdnd.js)
-+    content/messenger/mailContextMenus.js                                      (content/mailContextMenus.js)
-+    content/messenger/msgPrintEngine.js                                        (content/msgPrintEngine.js)
-+    content/messenger/msgPrintEngine.xul                                       (content/msgPrintEngine.xul)
-+    content/messenger/mailTasksOverlay.xul                                     (content/mailTasksOverlay.xul)
-+    content/messenger/mailNavigatorOverlay.xul                                 (content/mailNavigatorOverlay.xul)
-+    content/messenger/mailEditorOverlay.xul                                    (content/mailEditorOverlay.xul)
-+    content/messenger/mailABOverlay.xul                                        (content/mailABOverlay.xul)
-+    content/messenger/mailMessengerOverlay.xul                                 (content/mailMessengerOverlay.xul)
-+    content/messenger/mailMessengerComposeOverlay.xul                          (content/mailMessengerComposeOverlay.xul)
-+    content/messenger/mailWidgets.xml                                          (content/mailWidgets.xml)
-+    content/messenger/mail-offline.js                                          (content/mail-offline.js)
+mail.jar:
+    content/mail/contents.rdf                                             (content/contents.rdf)
+    content/mail/messenger.css                                            (content/messenger.css)
+    content/mail/mail.xul                                                 (content/mail.xul)
+    content/mail/mail3PaneWindowVertLayout.xul                            (content/mail3PaneWindowVertLayout.xul)
+    content/mail/mailWindowExtrasOverlay.xul                              (content/mailWindowExtrasOverlay.xul)
+    content/mail/mailWindowOverlay.xul                                    (content/mailWindowOverlay.xul)
+    content/mail/mailWindowOverlay.js                                     (content/mailWindowOverlay.js)
+    content/mail/msgSynchronize.xul                                       (content/msgSynchronize.xul)
+    content/mail/msgSynchronize.js                                        (content/msgSynchronize.js)
+    content/mail/msgSelectOffline.xul                                     (content/msgSelectOffline.xul)
+    content/mail/mailWindow.js                                            (content/mailWindow.js)
+    content/mail/messageWindow.xul                                        (content/messageWindow.xul)
+    content/mail/messageWindow.js                                         (content/messageWindow.js)
+    content/mail/folderProps.xul                                          (content/folderProps.xul)
+    content/mail/folderProps.js                                           (content/folderProps.js)
+    content/mail/msgHdrViewOverlay.xul                                    (content/msgHdrViewOverlay.xul)
+    content/mail/msgHdrViewOverlay.js                                     (content/msgHdrViewOverlay.js)
+    content/mail/msgHdrViewAddresses.js                                   (content/msgHdrViewAddresses.js)
+    content/mail/widgetglue.js                                            (content/widgetglue.js)
+    content/mail/commandglue.js                                           (content/commandglue.js)
+    content/mail/mailCommands.js                                          (content/mailCommands.js)
+    content/mail/shareglue.js                                             (content/shareglue.js)
+    content/mail/subscribe.xul                                            (content/subscribe.xul)
+    content/mail/subscribe.js                                             (content/subscribe.js)
+    content/mail/newFolderDialog.xul                                      (content/newFolderDialog.xul)
+    content/mail/newFolderDialog.js                                       (content/newFolderDialog.js)
+    content/mail/msgViewNavigation.js                                     (content/msgViewNavigation.js)
+    content/mail/msgMail3PaneWindow.js                                    (content/msgMail3PaneWindow.js)
+    content/mail/searchBar.js                                             (content/searchBar.js)
+    content/mail/msgAccountCentral.xul                                    (content/msgAccountCentral.xul)
+    content/mail/msgAccountCentral.js                                     (content/msgAccountCentral.js)
+    content/mail/mail3PaneWindowCommands.js                               (content/mail3PaneWindowCommands.js)
+    content/mail/msgFolderPickerOverlay.js                                (content/msgFolderPickerOverlay.js)
+    content/mail/msgFolderPickerOverlay.xul                               (content/msgFolderPickerOverlay.xul)
+    content/mail/renameFolderDialog.xul                                   (content/renameFolderDialog.xul)
+    content/mail/renameFolderDialog.js                                    (content/renameFolderDialog.js)
+    content/mail/messengerdnd.js                                          (content/messengerdnd.js)
+    content/mail/mailContextMenus.js                                      (content/mailContextMenus.js)
+    content/mail/msgPrintEngine.js                                        (content/msgPrintEngine.js)
+    content/mail/msgPrintEngine.xul                                       (content/msgPrintEngine.xul)
+    content/mail/mailTasksOverlay.xul                                     (content/mailTasksOverlay.xul)
+    content/mail/mailNavigatorOverlay.xul                                 (content/mailNavigatorOverlay.xul)
+    content/mail/mailEditorOverlay.xul                                    (content/mailEditorOverlay.xul)
+    content/mail/mailABOverlay.xul                                        (content/mailABOverlay.xul)
+    content/mail/mailMessengerOverlay.xul                                 (content/mailMessengerOverlay.xul)
+    content/mail/mailMessengerComposeOverlay.xul                          (content/mailMessengerComposeOverlay.xul)
+    content/mail/mailWidgets.xml                                          (content/mailWidgets.xml)
+    content/mail/mail-offline.js                                          (content/mail-offline.js)
+    content/mail/threadPane.js                                            (content/threadPane.js)
  
 
 en-US.jar:
-+    locale/en-US/messenger/messenger.dtd                                (locale/messenger.dtd)
-+    locale/en-US/messenger/msgAccountCentral.dtd                        (locale/msgAccountCentral.dtd)
-+    locale/en-US/messenger/messenger.properties                         (locale/messenger.properties)
-+    locale/en-US/messenger/newFolderDialog.dtd                          (locale/newFolderDialog.dtd)
-+    locale/en-US/messenger/renameFolderDialog.dtd                       (locale/renameFolderDialog.dtd)
-+    locale/en-US/messenger/folderProps.dtd                              (locale/folderProps.dtd)
-+    locale/en-US/messenger/subscribe.dtd                                (locale/subscribe.dtd)
-+    locale/en-US/messenger/subscribe.properties                         (locale/subscribe.properties)
-+    locale/en-US/messenger/msgFolderPickerOverlay.dtd                   (locale/msgFolderPickerOverlay.dtd)
-+    locale/en-US/messenger/msgHdrViewOverlay.dtd                        (locale/msgHdrViewOverlay.dtd)
-+    locale/en-US/messenger/mailTasksOverlay.dtd                         (locale/mailTasksOverlay.dtd)
-+    locale/en-US/messenger/mailTurboMenu.properties                     (locale/mailTurboMenu.properties)
-+    locale/en-US/messenger/mailNavigatorOverlay.dtd                     (locale/mailNavigatorOverlay.dtd)
-+    locale/en-US/messenger/mailEditorOverlay.dtd                        (locale/mailEditorOverlay.dtd)
-+    locale/en-US/messenger/msgSynchronize.dtd                           (locale/msgSynchronize.dtd)
-+    locale/en-US/messenger/offline.properties                           (locale/offline.properties)
+    locale/en-US/mail/messenger.dtd                                (locale/messenger.dtd)
+    locale/en-US/mail/msgAccountCentral.dtd                        (locale/msgAccountCentral.dtd)
+    locale/en-US/mail/messenger.properties                         (locale/messenger.properties)
+    locale/en-US/mail/newFolderDialog.dtd                          (locale/newFolderDialog.dtd)
+    locale/en-US/mail/renameFolderDialog.dtd                       (locale/renameFolderDialog.dtd)
+    locale/en-US/mail/folderProps.dtd                              (locale/folderProps.dtd)
+    locale/en-US/mail/subscribe.dtd                                (locale/subscribe.dtd)
+    locale/en-US/mail/subscribe.properties                         (locale/subscribe.properties)
+    locale/en-US/mail/msgFolderPickerOverlay.dtd                   (locale/msgFolderPickerOverlay.dtd)
+    locale/en-US/mail/msgHdrViewOverlay.dtd                        (locale/msgHdrViewOverlay.dtd)
+    locale/en-US/mail/mailTasksOverlay.dtd                         (locale/mailTasksOverlay.dtd)
+    locale/en-US/mail/mailTurboMenu.properties                     (locale/mailTurboMenu.properties)
+    locale/en-US/mail/mailNavigatorOverlay.dtd                     (locale/mailNavigatorOverlay.dtd)
+    locale/en-US/mail/mailEditorOverlay.dtd                        (locale/mailEditorOverlay.dtd)
+    locale/en-US/mail/msgSynchronize.dtd                           (locale/msgSynchronize.dtd)
+    locale/en-US/mail/offline.properties                           (locale/offline.properties)
+     locale/en-US/mail/contents.rdf                                 (locale/contents.rdf)
 
 
 US.jar:
diff --git a/mail/base/locale/messenger.dtd b/mail/base/locale/messenger.dtd
index 1c83d1fe3ff..ce09eaa282d 100644
--- a/mail/base/locale/messenger.dtd
+++ b/mail/base/locale/messenger.dtd
@@ -512,4 +512,46 @@ Rights Reserved.
 <!ENTITY searchAddressesCmd.accesskey "S">
 
 <!ENTITY junkMailCmd.label "Junk Mail Controls...">
-<!ENTITY junkMailCmd.accesskey "J">
\ No newline at end of file
+<!ENTITY junkMailCmd.accesskey "J">
+
+<!ENTITY toolsMenu.label "Tools">
+<!ENTITY toolsMenu.accesskey "T">
+
+<!ENTITY textZoomEnlargeCmd.label       "Increase Text Size">
+<!ENTITY textZoomEnlargeCmd.accesskey   "I">
+<!ENTITY textZoomEnlargeCmd.commandkey  "+">
+<!ENTITY textZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
+
+<!ENTITY textZoomReduceCmd.label        "Decrease Text Size">
+<!ENTITY textZoomReduceCmd.accesskey    "D">
+<!ENTITY textZoomReduceCmd.commandkey   "-">
+<!ENTITY  newMessageCmd.key               "M">
+<!ENTITY  newMessageCmd.label             "Message">
+<!ENTITY  newMessageCmd.accesskey         "m">
+<!ENTITY threadColumn.label "Thread">
+<!ENTITY senderColumn.label "Sender">
+<!ENTITY subjectColumn.label "Subject">
+<!ENTITY dateColumn.label "Date">
+<!ENTITY priorityColumn.label "Priority">
+<!ENTITY labelColumn.label "Label">
+<!ENTITY statusColumn.label "Status">
+<!ENTITY sizeColumn.label "Size">
+<!ENTITY scoreColumn.label "Junk Score">
+<!ENTITY linesColumn.label "Lines">
+<!ENTITY unreadColumn.label "Unread">
+<!ENTITY totalColumn.label "Total">
+<!ENTITY orderReceivedColumn.label "Order Received">
+<!ENTITY readColumn.label "Read">
+<!ENTITY flagColumn.label "Flag">
+<!ENTITY locationColumn.label "Location">
+
+<!--Tooltips-->
+<!ENTITY threadColumnHeader.tooltip "Click to display message threads"> 
+<!ENTITY columnChooser.tooltip "Click to select columns to display"> 
+<!ENTITY nameColumn.label   "Name"> 
+<!ENTITY unreadColumn.label "Unread"> 
+<!ENTITY totalColumn.label "Total"> 
+<!ENTITY accounts.label "Accounts">
+<!-- LOCALIZATION NOTE (accounts.img) : DONT_TRANSLATE -->
+<!ENTITY accounts.img "chrome://messenger/skin/local-mailhost.gif">
+