fix dependencies

mailnews/base/resources/content/mailNavigatorOverlay.xul

@@ -40,8 +40,8 @@
          
   <!-- navigator specific UI items -->
   <menupopup id="menu_NewPopup">
-    <menuitem id="menu_newMessage"   observes="cmd_newMessage" position="2"/>
+    <menuitem id="menu_newCard" insertafter="menu_newNavigator" observes="cmd_newCard" position="3"/>
-    <menuitem id="menu_newCard"      observes="cmd_newCard" position="3"/>
+    <menuitem id="menu_newMessage" insertafter="menu_newNavigator" observes="cmd_newMessage" position="2"/>
   </menupopup>
 
   <menupopup id="menu_FilePopup">

mailnews/base/resources/content/manifest.rdf

@@ -21,6 +21,9 @@
     <RDF:li resource="chrome://communicator/content/pref/pref-advanced.xul"/>
     <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
     <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
+    <RDF:li resource="chrome://communicator/content/history/history.xul"/>
+    <RDF:li resource="chrome://communicator/content/bookmarks/bookmarks.xul"/>
+    <RDF:li resource="chrome://communicator/content/bookmarks/bm-find.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"/>
@@ -49,6 +52,21 @@
     <RDF:li>chrome://messenger/content/mailTasksOverlay.xul</RDF:li>
   </RDF:Seq>
 
+  <!-- messenger items for History -->
+  <RDF:Seq about="chrome://communicator/content/history/history.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Bookmarks -->
+  <RDF:Seq about="chrome://communicator/content/bookmarks/bookmarks.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for History -->
+  <RDF:Seq about="chrome://communicator/content/bookmarks/bm-find.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.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>

xpfe/components/bookmarks/resources/bm-find.xul

@@ -31,7 +31,6 @@
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
-<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bm-find.dtd">
 
@@ -85,8 +84,6 @@
       <menu id="menu_New">
         <menupopup id="menu_NewPopup">
 	    <menuitem id="menu_newNavigator" observes="cmd_newNavigator"/>
-	    <menuitem id="menu_newMessage"   observes="cmd_newMessage"/>
-	    <menuitem id="menu_newCard"      observes="cmd_newCard"/>
 	    <menuitem id="menu_newEditor"    observes="cmd_newEditor"/>
         </menupopup>
       </menu>

xpfe/components/bookmarks/resources/bookmarks.xul

@@ -28,7 +28,6 @@
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
-<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
 
@@ -108,8 +107,6 @@
           <menuitem value="&menuitem.newSeparator.label;" oncommand="return doContextCmd('http://home.netscape.com/NC-rdf#command?cmd=newseparator');"/>
           <menuseparator/>
 	    <menuitem id="menu_newNavigator" observes="cmd_newNavigator"/>
-	    <menuitem id="menu_newMessage"   observes="cmd_newMessage"/>
-	    <menuitem id="menu_newCard"      observes="cmd_newCard"/>
 	    <menuitem id="menu_newEditor"    observes="cmd_newEditor"/>
         </menupopup>
       </menu>
@@ -347,19 +344,8 @@
                            'bookmarksTree');"/>
 </tree>
 
-<!--
+<statusbar id="status-bar">
-pinkerton
+  <statusbarpanel id="statusbar-text" flex="1"/>
-This extra "status" bar is necessary because the bottom right corner of
+</statusbar>
-the window on MacOS is taken up by the growBox. If this window had a
-horizontal scrollbar, we'd be alright, but since it doesn't the bottom
-arrow on the vertical scrollbar was being hidden by this growBox. To
-combat this, we can just stick in a 16px high bar to bump up the bottom
-of the tree so that the scrollbar is visible. Yes, I know this is not
-necessary for win32 or gtk, but we can use this area for information
-(maybe full URL of selected item or the like) in the future.
--->
-<box id="status-bar" style="height:16px; max-height:16px;">
-  <text id="statusbar-text" />
-</box>
-
 </window>
+