From 642e1dd6c2f7b71b626b693f2b53ac712a019801 Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com" <reed%reedloden.com>
Date: Mon, 14 Jan 2008 09:14:42 +0000
Subject: [PATCH] Bug 411481 - "Make it easier for extensions to overlay the TB
 menubar by adding IDs" [p=bugzilla@babylonsounds.com (Simon 'sipaq' Paquet)
 r=mkmelin sr=bienvenu]

---
 mail/base/content/mailWindowOverlay.xul | 240 +++++++++++++-----------
 1 file changed, 127 insertions(+), 113 deletions(-)

diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index ffc5e833847..51da724e98d 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1160,7 +1160,7 @@
               <menuitem id="newAccountMenuItem" label="&newAccountCmd.label;"
                          accesskey="&newAccountCmd.accesskey;"
                          oncommand="MsgAccountWizard();"/>
-              <menuseparator/>
+              <menuseparator id="newPopupMenuSeparator"/>
               <menuitem id="menu_newCard"/>
             </menupopup>
           </menu>
@@ -1171,29 +1171,30 @@
             <menupopup id="attachmentMenuList" onpopupshowing="FillAttachmentListPopup(this);"/>
           </menu>
           <menuitem id="menu_close"/>
-          <menuseparator/>
+          <menuseparator id="fileMenuAfterCloseSeparator"/>
           <menu id="menu_saveAs" label="&saveAsMenu.label;" accesskey="&saveAsMenu.accesskey;">
-            <menupopup>
+            <menupopup id="menu_SavePopup">
               <menuitem id="menu_saveAsFile" label="&saveAsFileCmd.label;"
                accesskey="&saveAsFileCmd.accesskey;"
                key="key_saveAsFile"
                command="cmd_saveAsFile"/>
-              <menuitem label="&saveAsTemplateCmd.label;"
+              <menuitem id="menu_saveAsTemplate" label="&saveAsTemplateCmd.label;"
                accesskey="&saveAsTemplateCmd.accesskey;"
                command="cmd_saveAsTemplate"/>
             </menupopup>
           </menu>
-          <menuseparator/>
-
+          <menuseparator id="fileMenuAfterSaveSeparator"/>
           <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:/"
                 command="cmd_getNewMessages">
-            <menupopup>
-              <menuitem label="&getAllNewMsgCmd.label;" key="key_getAllNewMessages" command="cmd_getMsgsForAuthAccounts"/>
-              <menuseparator/>
+            <menupopup id="menu_getAllNewMsgPopup">
+              <menuitem id="menu_getAllNewMsg" label="&getAllNewMsgCmd.label;"
+                        key="key_getAllNewMessages"
+                        command="cmd_getMsgsForAuthAccounts"/>
+              <menuseparator id="fileMenuAfterGetNewMsgSeparator"/>
             </menupopup>
             <template>
               <rule nc:IsServer="true" nc:CanGetMessages="true">
@@ -1204,14 +1205,13 @@
               </rule>
             </template>
           </menu>
-
           <menuitem id="menu_getnextnmsg" label="&getNextNMsgCmd.label;" accesskey="&getNextNMsgCmd.accesskey;"
                     command="cmd_getNextNMessages"/>
           <menuitem id="menu_sendunsentmsgs" label="&sendUnsentCmd.label;"
                     accesskey="&sendUnsentCmd.accesskey;" command="cmd_sendUnsentMsgs"/>
           <menuitem id="menu_subscribe" label="&subscribeCmd.label;"
                     accesskey="&subscribeCmd.accesskey;" oncommand="MsgSubscribe();"/>
-          <menuseparator/>
+          <menuseparator id="fileMenuAfterSubscribeSeparator"/>
           <menuitem id="menu_renameFolder" label="&renameFolder.label;"
                  accesskey="&renameFolder.accesskey;"
                  key="key_renameFolder"
@@ -1222,19 +1222,30 @@
                  command="cmd_emptyTrash"/>
           <menuseparator id="trashMenuSeparator"/>
           <menu id="offlineMenuItem" label="&offlineMenu.label;" accesskey="&offlineMenu.accesskey;">
-            <menupopup>
+            <menupopup id="menu_OfflinePopup">
               <menuitem id="goOfflineMenuItem" type="checkbox" label="&offlineGoOfflineCmd.label;"
                         accesskey="&offlineGoOfflineCmd.accesskey;" oncommand="MailOfflineMgr.toggleOfflineStatus();"/>
-              <menuseparator/>
-              <menuitem label="&synchronizeOfflineCmd.label;" accesskey="&synchronizeOfflineCmd.accesskey;" command="cmd_synchronizeOffline"/>
-              <menuitem label="&settingsOfflineCmd.label;" accesskey="&settingsOfflineCmd.accesskey;" command="cmd_settingsOffline"/>
-              <menuseparator/>
-              <menuitem label="&downloadStarredCmd.label;" accesskey="&downloadStarredCmd.accesskey;"    command="cmd_downloadFlagged"/>
-              <menuitem label="&downloadSelectedCmd.label;" accesskey="&downloadSelectedCmd.accesskey;"   command="cmd_downloadSelected"/>
+              <menuseparator id="offlineMenuAfterGoSeparator"/>
+              <menuitem id="menu_synchronizeOffline"
+                        label="&synchronizeOfflineCmd.label;"
+                        accesskey="&synchronizeOfflineCmd.accesskey;"
+                        command="cmd_synchronizeOffline"/>
+              <menuitem id="menu_settingsOffline"
+                        label="&settingsOfflineCmd.label;"
+                        accesskey="&settingsOfflineCmd.accesskey;"
+                        command="cmd_settingsOffline"/>
+              <menuseparator id="offlineMenuAfterSettingsSeparator"/>
+              <menuitem id="menu_downloadStarred"
+                        label="&downloadStarredCmd.label;"
+                        accesskey="&downloadStarredCmd.accesskey;"
+                        command="cmd_downloadFlagged"/>
+              <menuitem id="menu_downloadSelected"
+                        label="&downloadSelectedCmd.label;"
+                        accesskey="&downloadSelectedCmd.accesskey;"
+                        command="cmd_downloadSelected"/>
             </menupopup>
           </menu>
-          <menuseparator/>
-
+          <menuseparator id="fileMenuAfterOfflineSeparator"/>
           <menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_printSetup"/>
 #ifndef XP_MACOSX
           <menuitem id="printPreviewMenuItem" label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" command="cmd_printpreview"/>
@@ -1245,32 +1256,33 @@
 
     <!-- Edit -->
     <menu id="menu_Edit" oncommand="CommandUpdate_UndoRedo();">
-      <menupopup onpopupshowing="InitEditMessagesMenu()">
+      <menupopup id="menu_EditPopup" onpopupshowing="InitEditMessagesMenu()">
         <menuitem id="menu_undo" label="&undoDefaultCmd.label;" accesskey="&undoDefaultCmd.accesskey;" key="key_undo" command="cmd_undo"/>
         <menuitem id="menu_redo" label="&redoDefaultCmd.label;" accesskey="&redoDefaultCmd.accesskey;" key="key_redo" command="cmd_redo"/>
-        <menuseparator/>
+        <menuseparator id="editMenuAfterRedoSeparator"/>
         <menuitem id="menu_cut"/>
         <menuitem id="menu_copy"/>
         <menuitem id="menu_paste"/>
         <menuitem id="menu_delete" command="cmd_delete"/>
-        <menuseparator/>
+        <menuseparator id="editMenuAfterDeleteSeparator"/>
         <menu id="menu_select" label="&selectMenu.label;" accesskey="&selectMenu.accesskey;">
-          <menupopup>
-            <menuitem label="&all.label;" accesskey="&all.accesskey;" key="key_selectAll"
+          <menupopup id="menu_SelectPopup">
+            <menuitem id="menu_SelectAll" label="&all.label;" 
+                      accesskey="&all.accesskey;" key="key_selectAll"
                       command="cmd_selectAll"/>
-            <menuseparator/>
+            <menuseparator id="selectMenuSeparator"/>
             <menuitem id="menu_selectThread" label="&selectThreadCmd.label;"
              accesskey="&selectThreadCmd.accesskey;"
              key="key_selectThread"
              command="cmd_selectThread"/>
           </menupopup>
         </menu>
-        <menuseparator/>
+        <menuseparator id="editMenuAfterSelectSeparator"/>
         <menu id="menu_find" label="&findMenu.label;" accesskey="&findMenu.accesskey;">
-          <menupopup>
+          <menupopup id="menu_FindPopup">
             <menuitem id="menu_findCmd" label="&findCmd.label;" key="key_find" accesskey="&findCmd.accesskey;" command="cmd_find"/>
             <menuitem id="menu_findAgainCmd" label="&findAgainCmd.label;" key="key_findAgain" accesskey="&findAgainCmd.accesskey;" command="cmd_findAgain"/>
-            <menuseparator/>
+            <menuseparator id="editMenuAfterFindSeparator"/>
             <menuitem id="searchMailCmd" label="&searchMailCmd.label;"
                       key="key_searchMail"
                       accesskey="&searchMailCmd.accesskey;"
@@ -1302,7 +1314,6 @@
     <!-- View -->
     <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"
@@ -1312,11 +1323,10 @@
              oncommand="onViewToolbarCommand('mail-bar2', 'menu_showMessengerToolbar');"
              checked="true"/>
             <menuitem type="checkbox" id="menu_showTaskbar"/>
-            <menuseparator/>
+            <menuseparator id="viewMenuAfterTaskbarSeparator"/>
             <menuitem id="menu_customizeToolbar" oncommand="CustomizeMailToolbar('mail-toolbox');" label="&customizeToolbar.label;" accesskey="&customizeToolbar.accesskey;"/>
           </menupopup>
         </menu>
-
         <menu id="menu_MessagePaneLayout" label="&messagePaneLayoutStyle.label;" accesskey="&messagePaneLayoutStyle.accesskey;">
           <menupopup id="view_layout_popup" onpopupshowing="InitViewLayoutStyleMenu(event)">
             <menuitem id="messagePaneClassic" type="radio" label="&messagePaneClassic.label;" name="viewlayoutgroup"
@@ -1325,14 +1335,13 @@
                       accesskey="&messagePaneWide.accesskey;" oncommand="ChangeMailLayout(kWideMailLayout);"/>
             <menuitem id="messagePaneVertical" type="radio" label="&messagePaneVertical.label;" name="viewlayoutgroup"
                       accesskey="&messagePaneVertical.accesskey;" oncommand="ChangeMailLayout(kVerticalMailLayout);"/>
-            <menuseparator/>
+            <menuseparator id="viewMenuAfterPaneVerticalSeparator"/>
             <menuitem id="menu_showMessage" type="checkbox" label="&showMessageCmd.label;" key="key_toggleMessagePane"
                       accesskey="&showMessageCmd.accesskey;" oncommand="MsgToggleMessagePane();"/>
           </menupopup>
         </menu>
-
         <menu id="menu_FolderViews" label="&folderView.label;" accesskey="&folderView.accesskey;">
-          <menupopup onpopupshowing="InitViewFolderViewsMenu(event)">
+          <menupopup id="menu_FolderViewsPopup" onpopupshowing="InitViewFolderViewsMenu(event)">
             <menuitem id="menu_allFolders"      label="&allFolders.label;" accesskey="&allFolders.accesskey;"
                       type="radio" name="viewmessages" oncommand="loadFolderView(0);"/>
             <menuitem id="menu_unreadFolders"   label="&unreadFolders.label;" accesskey="&unreadFolders.accesskey;"
@@ -1343,11 +1352,9 @@
                       type="radio" name="viewmessages" oncommand="loadFolderView(3);"/>
           </menupopup>
         </menu>
-
         <menuseparator id="viewSortMenuSeparator"/>
-
         <menu id="viewSortMenu" accesskey="&sortMenu.accesskey;" label="&sortMenu.label;">
-          <menupopup onpopupshowing="InitViewSortByMenu()">
+          <menupopup id="menu_viewSortPopup" onpopupshowing="InitViewSortByMenu()">
             <menuitem id="sortByDateMenuitem" type="radio" name="sortby" label="&sortByDateCmd.label;" accesskey="&sortByDateCmd.accesskey;" oncommand="MsgSortByDate()"/>
             <menuitem id="sortByReceivedMenuitem" type="radio" name="sortby" label="&sortByReceivedCmd.label;" accesskey="&sortByReceivedCmd.accesskey;" oncommand="MsgSortByReceived()"/>
             <menuitem id="sortByFlagMenuitem" type="radio" name="sortby" label="&sortByStarCmd.label;" accesskey="&sortByStarCmd.accesskey;" oncommand="MsgSortByFlagged()"/>
@@ -1362,53 +1369,50 @@
             <menuitem id="sortByTagsMenuitem" type="radio" name="sortby" label="&sortByTagsCmd.label;" accesskey="&sortByTagsCmd.accesskey;" oncommand="MsgSortByTags()"/>
             <menuitem id="sortByJunkStatusMenuitem" type="radio" name="sortby" label="&sortByJunkStatusCmd.label;" accesskey="&sortByJunkStatusCmd.accesskey;" oncommand="MsgSortByJunkStatus()"/>
             <menuitem id="sortByAttachmentsMenuitem" type="radio" name="sortby" label="&sortByAttachmentsCmd.label;" accesskey="&sortByAttachmentsCmd.accesskey;" oncommand="MsgSortByAttachments()"/>
-            <menuseparator/>
+            <menuseparator id="sortAfterAttachmentSeparator"/>
             <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()"/>
-            <menuseparator/>
+            <menuseparator id="sortAfterDescendingSeparator"/>
             <menuitem id="sortThreaded" type="radio" name="threaded" label="&sortThreaded.label;" accesskey="&sortThreaded.accesskey;" oncommand="MsgSortThreaded();"/>
             <menuitem id="sortUnthreaded" type="radio" name="threaded" label="&sortUnthreaded.label;" accesskey="&sortUnthreaded.accesskey;" oncommand="MsgSortUnthreaded();"/>
             <menuitem id="groupBySort" type="radio" name="group" label="&groupBySort.label;" accesskey="&groupBySort.accesskey;" oncommand="MsgGroupBySort();"
                       key="key_groupBySort"/>
           </menupopup>
         </menu>
-
         <menu id="viewMessageViewMenu" label="&msgsMenu.label;" accesskey="&msgsMenu.accesskey;"
               command="mailHideMenus" oncommand="ViewChangeByMenuitem(event.target);">
             <menupopup id="viewMessagePopup" onpopupshowing="RefreshViewPopup(this, false);">
               <menuitem id="viewMessageAll"    value="0" type="radio" label="&viewAll.label;" accesskey="&viewAll.accesskey;"/>
               <menuitem id="viewMessageUnread" value="1" type="radio" label="&viewUnread.label;" accesskey="&viewUnread.accesskey;"/>
-              <menuseparator/>
+              <menuseparator id="messageViewAfterUnreadSeparator"/>
               <menu id="viewMessageTags" label="&viewTags.label;" accesskey="&viewTags.accesskey;">
                 <menupopup id="viewMessageTagsPopup" onpopupshowing="RefreshTagsPopup(this, false);"/>
               </menu>
               <menu id="viewMessageCustomViews" label="&viewCustomViews.label;" accesskey="&viewCustomViews.accesskey;">
                 <menupopup id="viewMessageCustomViewsPopup" onpopupshowing="RefreshCustomViewsPopup(this, false);"/>
               </menu>
-              <menuseparator/>
+              <menuseparator id="messageViewAfterCustomSeparator"/>
               <menuitem id="viewMessageVirtualFolder" value="7" label="&viewVirtualFolder.label;" accesskey="&viewVirtualFolder.accesskey;"/>
               <menuitem id="viewMessageCustomize"     value="8" label="&viewCustomizeView.label;" accesskey="&viewCustomizeView.accesskey;"/>
             </menupopup>
           </menu>
 
           <menu label="&threads.label;" id="viewMessagesMenu" accesskey="&threads.accesskey;">
-            <menupopup onpopupshowing="InitViewMessagesMenu()">
+            <menupopup id="menu_ThreadsPopup" onpopupshowing="InitViewMessagesMenu()">
               <menuitem id="viewAllMessagesMenuItem" type="radio" name="viewmessages" label="&allMsgsCmd.label;" accesskey="&allMsgsCmd.accesskey;" disabled="true" command="cmd_viewAllMsgs"/>
               <menuitem id="viewUnreadMessagesMenuItem" type="radio" name="viewmessages" label="&unreadMsgsCmd.label;" accesskey="&unreadMsgsCmd.accesskey;" disabled="true" command="cmd_viewUnreadMsgs"/>
               <menuitem id="viewThreadsWithUnreadMenuItem" type="radio" name="viewmessages" label="&threadsWithUnreadCmd.label;" accesskey="&threadsWithUnreadCmd.accesskey;" disabled="true" command="cmd_viewThreadsWithUnread"/>
               <menuitem id="viewWatchedThreadsWithUnreadMenuItem" type="radio" name="viewmessages" label="&watchedThreadsWithUnreadCmd.label;" accesskey="&watchedThreadsWithUnreadCmd.accesskey;" disabled="true" command="cmd_viewWatchedThreadsWithUnread"/>
-              <menuseparator/>
+              <menuseparator id="threadsAfterWatchedSeparator"/>
               <menuitem id="viewIgnoredThreadsMenuItem" type="checkbox" label="&ignoredThreadsCmd.label;" disabled="true" command="cmd_viewIgnoredThreads" accesskey="&ignoredThreadsCmd.accesskey;"/>
-              <menuseparator/>
+              <menuseparator id="threadsAfterIgnoredSeparator"/>
               <menuitem id="menu_expandAllThreads" label="&expandAllThreadsCmd.label;" accesskey="&expandAllThreadsCmd.accesskey;" key="key_expandAllThreads" disabled="true" command="cmd_expandAllThreads"/>
               <menuitem id="collapseAllThreads" label="&collapseAllThreadsCmd.label;" accesskey="&collapseAllThreadsCmd.accesskey;" key="key_collapseAllThreads" disabled="true" command="cmd_collapseAllThreads"/>
             </menupopup>
           </menu>
-
-          <menuseparator/>
-
+          <menuseparator id="viewAfterThreadsSeparator"/>
           <menu id="viewheadersmenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
-            <menupopup  onpopupshowing="InitViewHeadersMenu();">
+            <menupopup id="menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
               <menuitem id="viewallheaders"
                type="radio"
                name="viewheadergroup"
@@ -1423,7 +1427,6 @@
                oncommand="MsgViewNormalHeaders();"/>
             </menupopup>
           </menu>
-
           <menu id="viewBodyMenu" accesskey="&bodyMenu.accesskey;" label="&bodyMenu.label;">
             <menupopup id="viewBodyPopMenu" onpopupshowing="InitViewBodyMenu()">
               <menuitem id="bodyAllowHTML" type="radio" name="bodyPlaintextVsHTMLPref" label="&bodyAllowHTML.label;"
@@ -1435,45 +1438,42 @@
                         accesskey="&bodyAsPlaintext.accesskey;" oncommand="MsgBodyAsPlaintext()"/>
             </menupopup>
           </menu>
-
           <menuitem id="viewAttachmentsInlineMenuitem" label="&viewAttachmentsInlineCmd.label;" accesskey="&viewAttachmentsInlineCmd.accesskey;"
             oncommand="ToggleInlineAttachment(event.target)" type="checkbox" checked="true"/>
-          <menuseparator/>
-
+          <menuseparator id="viewAfterAttachmentsSeparator"/>
           <menu id="viewTextSizeMenu" label="&textSize.label;" accesskey="&textSize.accesskey;">
-            <menupopup>
+            <menupopup id="menu_TextSizePopup">
           <menuitem id="menu_textZoomEnlarge" key="key_textZoomEnlarge" label="&textZoomEnlargeCmd.label;" accesskey="&textZoomEnlargeCmd.accesskey;"
                     command="cmd_textZoomEnlarge"/>
           <menuitem id="menu_textZoomReduce" key="key_textZoomReduce" label="&textZoomReduceCmd.label;" accesskey="&textZoomReduceCmd.accesskey;"
                     command="cmd_textZoomReduce"/>
-              <menuseparator/>
+              <menuseparator id="textSizeAfterReduceSeparator"/>
               <menuitem key="key_textZoomReset" label="&textZoomResetCmd.label;" accesskey="&textZoomResetCmd.accesskey;" command="cmd_textZoomReset"/>
             </menupopup>
           </menu>
-
           <menu id="mailviewCharsetMenu" />
-          <menuseparator/>
+          <menuseparator id="viewAfterCharsetSeparator"/>
           <menuitem id="pageSourceMenuItem" label="&pageSourceCmd.label;" key="key_viewPageSource" accesskey="&pageSourceCmd.accesskey;" command="cmd_viewPageSource"/>
         </menupopup>
         </menu>
 
         <!-- Go -->
-        <menu label="&goMenu.label;" accesskey="&goMenu.accesskey;">
-          <menupopup  onpopupshowing="InitGoMessagesMenu();">
+        <menu id="menu_Go" label="&goMenu.label;" accesskey="&goMenu.accesskey;">
+          <menupopup id="menu_GoPopup" onpopupshowing="InitGoMessagesMenu();">
           <menu id="goNextMenu" label="&nextMenu.label;" accesskey="&nextMenu.accesskey;">
-            <menupopup>
+            <menupopup id="menu_GoNextPopup">
               <menuitem id="menu_nextMsg" label="&nextMsgCmd.label;" accesskey="&nextMsgCmd.accesskey;" command="cmd_nextMsg"
                         key="key_nextMsg"/>
               <menuitem id="menu_nextUnreadMsg" label="&nextUnreadMsgCmd.label;" accesskey="&nextUnreadMsgCmd.accesskey;" command="cmd_nextUnreadMsg"
                         key="key_nextUnreadMsg"/>
               <menuitem id="menu_nextStarredMsg" label="&nextStarredMsgCmd.label;" accesskey="&nextStarredMsgCmd.accesskey;" command="cmd_nextFlaggedMsg"/>
-              <menuseparator/>
+              <menuseparator id="goNextAfterStarredSeparator"/>
               <menuitem id="menu_nextUnreadThread" label="&nextUnreadThread.label;" accesskey="&nextUnreadThreadCmd.accesskey;" command="cmd_nextUnreadThread"
                         key="key_nextUnreadThread"/>
             </menupopup>
           </menu>
           <menu id="goPreviousMenu" label="&prevMenu.label;" accesskey="&prevMenu.accesskey;">
-            <menupopup>
+            <menupopup id="menu_GoPreviousPopup">
               <menuitem id="menu_prevMsg" label="&prevMsgCmd.label;" accesskey="&prevMsgCmd.accesskey;" command="cmd_previousMsg"
                         key="key_previousMsg"/>
               <menuitem id="menu_prevUnreadMsg" label="&prevUnreadMsgCmd.label;" accesskey="&prevUnreadMsgCmd.accesskey;" command="cmd_previousUnreadMsg"
@@ -1517,9 +1517,15 @@
               key="key_forward"
               command="cmd_forward"/>
             <menu id="forwardAsMenu" label="&forwardAsMenu.label;" accesskey="&forwardAsMenu.accesskey;">
-              <menupopup>
-                <menuitem label="&forwardAsInline.label;" accesskey="&forwardAsInline.accesskey;" command="cmd_forwardInline"/>
-                <menuitem label="&forwardAsAttachmentCmd.label;" accesskey="&forwardAsAttachmentCmd.accesskey;" command="cmd_forwardAttachment"/>
+              <menupopup id="menu_forwardAsPopup">
+                <menuitem id="menu_forwardAsInline"
+                          label="&forwardAsInline.label;"
+                          accesskey="&forwardAsInline.accesskey;"
+                          command="cmd_forwardInline"/>
+                <menuitem id="menu_forwardAsAttachment"
+                          label="&forwardAsAttachmentCmd.label;"
+                          accesskey="&forwardAsAttachmentCmd.accesskey;"
+                          command="cmd_forwardAttachment"/>
               </menupopup>
             </menu>
             <menuitem id="menu_editMsgAsNew" label="&editMsgAsNewCmd.label;"
@@ -1530,11 +1536,11 @@
               command="cmd_openMessage"
               accesskey="&openMessageWindowCmd.accesskey;"
               key="key_openMessage"/>
-            <menuseparator/>
+            <menuseparator id="messageAfterOpenMsgSeparator"/>
             <menu label="&moveMsgMenu.label;" accesskey="&moveMsgMenu.accesskey;" id="moveMenu" datasources="rdf:null"
                 sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
                 sortDirection="ascending">
-              <menupopup>
+              <menupopup id="menu_MovePopup">
                 <menu label="&moveCopyMsgRecentMenu.label;" accesskey="&moveCopyMsgRecentMenu.accesskey;"
                       sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
                       sortDirection="ascending"
@@ -1543,7 +1549,7 @@
                   <menupopup/>
                   <template>
                     <rule nc:CanFileMessages="true">
-                      <menupopup>
+                      <menupopup id="menu_MoveRecentPopup">
                         <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#FolderTreeSimpleName"
                           oncommand="MsgMoveMessage(event.target.id)"
                           SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
@@ -1555,15 +1561,17 @@
                     </rule>
                   </template>
                 </menu>
-                <menuseparator/>
+                <menuseparator id="moveMsgRecentSeparator"/>
               </menupopup>
               <template>
                 <rule nc:NoSelect="true" iscontainer="true" isempty="false">
-                  <menupopup>
+                  <menupopup id="menu_folderMenuPopup1">
                     <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 id="menu_fileHerePopup1">
+                        <menuitem id="menu_fileHere1" label="&fileHereMenu.label;"
+                                  accesskey="&fileHereMenu.accesskey;"
+                                  disabled="true"/>
+                        <menuseparator id="fileHereMenuSeparator1"/>
                       </menupopup>
                     </menu>
                   </menupopup>
@@ -1574,17 +1582,18 @@
                   </menupopup>
                 </rule>
                 <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
-                  <menupopup>
+                  <menupopup id="menu_folderMenuPopup2">
                     <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.id)"/>
-                        <menuseparator/>
+                      <menupopup id="menu_fileHerePopup2">
+                        <menuitem id="menu_fileHere2" label="&fileHereMenu.label;"
+                                  accesskey="&fileHereMenu.accesskey;"
+                                  oncommand="MsgMoveMessage(event.target.parentNode.parentNode.id)"/>
+                        <menuseparator id="fileHereMenuSeparator2"/>
                       </menupopup>
                     </menu>
                   </menupopup>
@@ -1595,7 +1604,7 @@
                 </rule>
                 <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
                   <!-- note, there is no "file here" -->
-                  <menupopup>
+                  <menupopup id="menu_folderMenuPopup3">
                     <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"
@@ -1607,7 +1616,7 @@
                   </menupopup>
                 </rule>
                 <rule nc:CanFileMessages="true">
-                  <menupopup>
+                  <menupopup id="menu_folderMenuPopup4">
                     <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target.id)"
                               SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                               BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -1618,11 +1627,10 @@
                 </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>
+              <menupopup id="menu_copyPopup">
                 <menu label="&moveCopyMsgRecentMenu.label;" accesskey="&moveCopyMsgRecentMenu.accesskey;"
                       sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
                       sortDirection="ascending"
@@ -1631,7 +1639,7 @@
                   <menupopup/>
                   <template>
                     <rule nc:CanFileMessages="true">
-                      <menupopup>
+                      <menupopup id="menu_copyRecentPopup">
                         <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#FolderTreeSimpleName"
                           oncommand="MsgCopyMessage(event.target.id)"
                           SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
@@ -1643,36 +1651,40 @@
                     </rule>
                   </template>
                 </menu>
-                <menuseparator/>
+                <menuseparator id="copyMsgRecentSeparator"/>
               </menupopup>
               <template>
                 <rule nc:NoSelect="true" iscontainer="true" isempty="false">
-                  <menupopup>
+                  <menupopup id="menu_copyFolderMenuPopup1">
                     <menu uri="..."  class="folderMenuItem menu-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name">
-                      <menupopup>
-                        <menuitem label="&copyHereMenu.label;" accesskey="&copyHereMenu.accesskey;" disabled="true"/>
-                        <menuseparator/>
+                      <menupopup id="menu_copyHerePopup1">
+                        <menuitem id="menu_copyHere1"
+                                  label="&copyHereMenu.label;"
+                                  accesskey="&copyHereMenu.accesskey;"
+                                  disabled="true"/>
+                        <menuseparator id="copyHereMenuSeparator1"/>
                       </menupopup>
                     </menu>
                   </menupopup>
                 </rule>
                 <rule nc:NoSelect="true">
-                  <menupopup>
+                  <menupopup id="menu_copyFolderMenuPopup2">
                     <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>
+                  <menupopup id="menu_copyFolderMenuPopup3">
                     <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="&copyHereMenu.label;" accesskey="&copyHereMenu.accesskey;"
-                          oncommand="MsgCopyMessage(event.target.parentNode.parentNode.id)"/>
-                        <menuseparator/>
+                      <menupopup id="menu_copyHerePopup2">
+                        <menuitem id="menu_copyHere2" label="&copyHereMenu.label;"
+                                  accesskey="&copyHereMenu.accesskey;"
+                                  oncommand="MsgCopyMessage(event.target.parentNode.parentNode.id)"/>
+                        <menuseparator id="copyHereMenuSeparator2"/>
                       </menupopup>
                     </menu>
                   </menupopup>
@@ -1683,7 +1695,7 @@
                 </rule>
                 <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
                   <!-- note, there is no "file here" -->
-                  <menupopup>
+                  <menupopup id="menu_copyFolderMenuPopup4">
                     <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"
@@ -1695,7 +1707,7 @@
                   </menupopup>
                 </rule>
                 <rule nc:CanFileMessages="true">
-                  <menupopup>
+                  <menupopup id="menu_copyFolderMenuPopup5">
                     <menuitem uri="..." class="folderMenuItem menuitem-iconic" label="rdf:http://home.netscape.com/NC-rdf#Name"
                      oncommand="MsgCopyMessage(event.target.id)"
                      SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
@@ -1712,14 +1724,14 @@
             <menu id="tagMenu" label="&tagMenu.label;" accesskey="&tagMenu.accesskey;" command="cmd_tag">
               <menupopup id="tagMenu-tagpopup" onpopupshowing="InitMessageTags(this)">
               <menuitem id="tagMenu-tagRemoveAll" oncommand="RemoveAllMessageTags();"/>
-                <menuseparator/>
-                <menuseparator/>
+                <menuseparator id="tagMenuAfterRemoveSeparator"/>
+                <menuseparator id="tagMenuBeforeAddSeparator"/>
                 <menuitem id="addNewTag" label="&addNewTag.label;" accesskey="&addNewTag.accesskey;"
                           oncommand="AddTag();"/>
               </menupopup>
             </menu>
             <menu id="markMenu" label="&markMenu.label;" accesskey="&markMenu.accesskey;">
-              <menupopup onpopupshowing="InitMessageMark()">
+              <menupopup id="menu_MarkPopup" onpopupshowing="InitMessageMark()">
                 <menuitem type="checkbox" id="markReadMenuItem" label="&markAsReadCmd.label;" accesskey="&markAsReadCmd.accesskey;" command="cmd_markAsRead"
                           key="key_toggleRead"/>
                 <menuitem id="menu_markThreadAsRead" label="&markThreadAsReadCmd.label;" accesskey="&markThreadAsReadCmd.accesskey;" command="cmd_markThreadAsRead"
@@ -1727,28 +1739,29 @@
                 <menuitem id="menu_markReadByDate" label="&markReadByDateCmd.label;" accesskey="&markReadByDateCmd.accesskey;" command="cmd_markReadByDate"
                           key="key_markReadByDate"/>
                 <menuitem id="menu_markAllRead" label="&markAllReadCmd.label;" key="key_markAllRead" accesskey="&markAllReadCmd.accesskey;" command="cmd_markAllRead"/>
-                <menuseparator/>
+                <menuseparator id="markMenuAfterAllReadSeparator"/>
                 <menuitem id="markFlaggedMenuItem"
                           type="checkbox"
                           label="&markStarredCmd.label;"
                           accesskey="&markStarredCmd.accesskey;"
                           command="cmd_markAsFlagged"
                           key="key_toggleFlagged"/>
-                <menuseparator/>
+                <menuseparator id="markMenuAfterFlaggedSeparator"/>
                 <menuitem id="menu_markAsJunk" label="&markAsJunkCmd.label;"
                           accesskey="&markAsJunkCmd.accesskey;"
                           command="cmd_markAsJunk"
                           key="key_markJunk"/>
                 <menuitem id="menu_markAsNotJunk" label="&markAsNotJunkCmd.label;"
                           key="key_markNotJunk"
-                      accesskey="&markAsNotJunkCmd.accesskey;"
-                      command="cmd_markAsNotJunk"/>
-                <menuitem label="&recalculateJunkScoreCmd.label;"
+                          accesskey="&markAsNotJunkCmd.accesskey;"
+                          command="cmd_markAsNotJunk"/>
+                <menuitem id="menu_recalculateJunkScore"
+                          label="&recalculateJunkScoreCmd.label;"
                           accesskey="&recalculateJunkScoreCmd.accesskey;"
                           command="cmd_recalculateJunkScore"/>
               </menupopup>
             </menu>
-            <menuseparator/>
+            <menuseparator id="messageMenuAfterMarkSeparator"/>
             <menuitem id="createFilter" label="&createFilter.label;"
                       accesskey="&createFilter.accesskey;"
                       command="cmd_createFilterFromMenu"/>
@@ -1778,7 +1791,6 @@
         <menuitem id="addonsManager" label="&addons.label;" accesskey="&addons.accesskey;"
                   oncommand="openAddonsMgr();"/>
         <menuseparator id="devToolsSeparator"/>
-
         <menuitem id="filtersCmd" label="&filtersCmd.label;"
                   accesskey="&filtersCmd.accesskey;"
                   oncommand="MsgFilters(null, null);"/>
@@ -1786,7 +1798,7 @@
                   label="&filtersApply.label;"
                   accesskey="&filtersApply.accesskey;"
                   command="cmd_applyFilters"/>
-        <menuseparator/>
+        <menuseparator id="tasksMenuAfterApplySeparator"/>
         <menuitem id="runJunkControls"
             label="&runJunkControls.label;"
             accesskey="&runJunkControls.accesskey;"
@@ -1795,7 +1807,7 @@
             label="&deleteJunk.label;"
             accesskey="&deleteJunk.accesskey;"
             command="cmd_deleteJunk"/>
-        <menuseparator/>
+        <menuseparator id="tasksMenuAfterDeleteSeparator"/>
         <menuitem id="menu_import" label="&importCmd.label;"
                   accesskey="&importCmd.accesskey;"
                   oncommand="toImport();"/>
@@ -1825,9 +1837,11 @@
 
       <!-- Help -->
 #ifdef XP_WIN
-      <menu label="&helpMenuWin.label;" accesskey="&helpMenuWin.accesskey;">
+      <menu id="menu_HelpWin" label="&helpMenuWin.label;"
+            accesskey="&helpMenuWin.accesskey;">
 #else
-      <menu label="&helpMenu.label;" accesskey="&helpMenu.accesskey;">
+      <menu id="menu_Help" label="&helpMenu.label;"
+            accesskey="&helpMenu.accesskey;">
 #endif
      <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
 #ifdef XP_MACOSX
@@ -1841,7 +1855,7 @@
           <menuitem id="checkForUpdates" accesskey="&updateCmd.accesskey;" class="menuitem-iconic"
                     label="&updateCmd.label;" oncommand="checkForUpdates();"/>
 #ifndef XP_MACOSX
-          <menuseparator/>
+          <menuseparator id="menu_HelpAfterUpdatesSeparator"/>
 #endif
           <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
                     label="&aboutCmd.label;"
@@ -1852,7 +1866,7 @@
         </menupopup>
       </menu>
 
-      <spacer flex="100%"/>
+      <spacer id="menubar_spacer" flex="100%"/>
       </menubar>
     </toolbaritem>
   </toolbar>