diff --git a/mail/base/content/mailWindow.js b/mail/base/content/mailWindow.js
index 8cf6df8998..a197755e33 100644
--- a/mail/base/content/mailWindow.js
+++ b/mail/base/content/mailWindow.js
@@ -504,6 +504,26 @@ function getBrowser()
                    document.getElementById("messagepane");
 }
 
+/**
+ * This function is global and expected by toolkit to get the notification box
+ * for the browser for use with items like password manager.
+ */
+function getNotificationBox(aWindow) {
+  var tabmail = document.getElementById("tabmail");
+  var tabInfo = tabmail.tabInfo;
+
+  for (var i = 0; i < tabInfo.length; ++i) {
+    var browserFunc = tabInfo[i].mode.getBrowser ||
+                      tabInfo[i].mode.tabType.getBrowser;
+    if (browserFunc) {
+      var possBrowser = browserFunc.call(tabInfo[i].mode.tabType, tabInfo[i]);
+      if (possBrowser && possBrowser.contentWindow == aWindow)
+        return possBrowser.parentNode;
+    }
+  }
+  return null;
+}
+
 // Given the server, open the twisty and the set the selection
 // on inbox of that server.
 // prompt if offline.
diff --git a/mail/base/content/specialTabs.xul b/mail/base/content/specialTabs.xul
index 3d555a1470..1fafcf927c 100644
--- a/mail/base/content/specialTabs.xul
+++ b/mail/base/content/specialTabs.xul
@@ -41,8 +41,10 @@
 
   <vbox id="contentTab" collapsed="true">
     <vbox flex="1">
-      <browser type="content-targetable" flex="1" disablehistory="true"/>
-      <findbar/>
+      <notificationbox flex="1">
+        <browser type="content-targetable" flex="1" disablehistory="true"/>
+        <findbar/>
+      </notificationbox>
     </vbox>
   </vbox>
 </overlay>