diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
index ce0eef2e136..448236ca480 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
@@ -623,8 +623,10 @@ function MsgSubscribe()
 
 function ConfirmUnsubscribe(folder)
 {
-    var sBundle = srGetStrBundle("chrome://messenger/locale/messenger.properties"); 
-    var titleMsg = gMessengerBundle.GetStringFromName("confirmUnsubscribeTitle");
+    if (!gMessengerBundle)
+        gMessengerBundle = document.getElementById("bundle_messenger");
+
+    var titleMsg = gMessengerBundle.getString("confirmUnsubscribeTitle");
     var dialogMsg = gMessengerBundle.getFormattedString("confirmUnsubscribeText",
                                         [folder.name], 1);
 
@@ -682,7 +684,6 @@ function MsgOpenSelectedMessages()
 {
   var dbView = GetDBView();
 
-  dump("XXX dbView " + dbView + "\n");
   var indices = GetSelectedIndices(dbView);
   var numMessages = indices.length;
 
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 36caf2d4131..08aabc6a192 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -43,7 +43,9 @@ Rights Reserved.
 <script src="chrome://messenger/content/mailWindowOverlay.js"/>
 <script src="chrome://messenger/content/commandglue.js"/>
 
-<stringbundleset id="stringbundleset"/>
+<stringbundleset id="stringbundleset">
+  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
+</stringbundleset>
 
 <commandset id="mailFileMenuItems"
      				commandupdater="true"