diff --git a/mozilla/suite/browser/mailNavigatorOverlay.xul b/mozilla/suite/browser/mailNavigatorOverlay.xul
index 7d44532d9f2..113aa89a394 100644
--- a/mozilla/suite/browser/mailNavigatorOverlay.xul
+++ b/mozilla/suite/browser/mailNavigatorOverlay.xul
@@ -145,15 +145,11 @@
       gContextMenu.showItem("context-sep-apps", gContextMenu.shouldShowSeparator("context-sep-apps"));
     }
       
-    var gAddedMailContextMenuPopupListener = false;
     function initMailContextMenuPopupListener(aEvent)
     {
-      // This is really lame, but we can't seem to add a bubbling listener to the DOMWindow (!)
-      if (gAddedMailContextMenuPopupListener)
-        return;
       var popup = document.getElementById("contentAreaContextMenu");
-      popup.addEventListener("popupshowing", initMailContextMenuItems, false);
-      gAddedMailContextMenuPopupListener = true;
+      if (popup)
+        popup.addEventListener("popupshowing", initMailContextMenuItems, false);
     }
 
     function hideMenuitems() {
@@ -168,7 +164,7 @@
       hideMenuitems();
     }
 
-    addEventListener("load", initOverlay, true);
+    addEventListener("load", initOverlay, false);
   ]]>
   </script>         
 
diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul
index 5471f955706..9a9a517229c 100644
--- a/mozilla/suite/browser/navigator.xul
+++ b/mozilla/suite/browser/navigator.xul
@@ -42,6 +42,7 @@
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
+<?xul-overlay href="chrome://navigator/content/mailNavigatorOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/navExtraOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/linkToolbarOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index 8ef89ed2b63..fa9190fb52e 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -45,7 +45,6 @@
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?>
-<?xul-overlay href="chrome://navigator/content/mailNavigatorOverlay.xul"?>
 
 <!DOCTYPE overlay [
 <!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
diff --git a/mozilla/suite/browser/viewPartialSource.xul b/mozilla/suite/browser/viewPartialSource.xul
index 87d6fa2a11b..bb64f0c1f84 100644
--- a/mozilla/suite/browser/viewPartialSource.xul
+++ b/mozilla/suite/browser/viewPartialSource.xul
@@ -68,7 +68,6 @@
   <keyset id="viewSourceKeys"/>
   <stringbundleset id="viewSource-stringbundleset"/>
   <popupset id="viewSourceContextSet" />
-  <popup id="contentAreaContextMenu"/>
 
   <toolbox id="viewSource-toolbox"/>
 
diff --git a/mozilla/suite/browser/viewSource.xul b/mozilla/suite/browser/viewSource.xul
index 945cd632e80..c0a79a008b7 100644
--- a/mozilla/suite/browser/viewSource.xul
+++ b/mozilla/suite/browser/viewSource.xul
@@ -69,7 +69,6 @@
   <keyset id="viewSourceKeys"/>
   <stringbundleset id="viewSource-stringbundleset"/>
   <popupset id="viewSourceContextSet" />
-  <popup id="contentAreaContextMenu"/>
 
   <toolbox id="viewSource-toolbox"/>