diff --git a/mailnews/base/resources/content/subscribe.js b/mailnews/base/resources/content/subscribe.js
index 3476c729c6b9..4024561adf85 100644
--- a/mailnews/base/resources/content/subscribe.js
+++ b/mailnews/base/resources/content/subscribe.js
@@ -9,6 +9,8 @@ var gNameField = null;
 var gNameFieldLabel = null;
 var gFolderDelimiter = ".";
 var gStatusFeedback = new nsMsgStatusFeedback;
+var gTimelineEnabled = false;
+var gMessengerBundle = null;
 var gSubscribeDeck = null;
 var gSearchView = null;
 var gSearchTreeBoxObject = null;
@@ -91,10 +93,8 @@ function SetUpServerMenu()
 }
 
 var MySubscribeListener = {
-	OnDonePopulating: function() {
-		gStatusFeedback.showProgress(0);
-		gStatusFeedback.showStatusString("");
-		gStatusBar.setAttribute("mode","normal");
+    OnDonePopulating: function() {
+        gStatusFeedback._stopMeteors();
 
         // only re-root the tree, if it is null.
         // otherwise, we are in here because we are populating
@@ -136,9 +136,8 @@ function SetUpTree(forceToServer)
           gSubscribeTree.database.RemoveDataSource(subscribeDS);
           gSubscribableServer.subscribeListener = MySubscribeListener;
 
-          gStatusFeedback.showProgress(0);
+          gStatusFeedback._startMeteors();
           gStatusFeedback.showStatusString(gSubscribeBundle.getString("pleaseWaitString"));
-          gStatusBar.setAttribute("mode","undetermined");
 
           gSubscribableServer.startPopulating(msgWindow, forceToServer);
 	}
@@ -175,6 +174,7 @@ function SubscribeOnLoad()
 {
   //dump("SubscribeOnLoad()\n");
   gSubscribeBundle = document.getElementById("bundle_subscribe");
+  gMessengerBundle = document.getElementById("bundle_messenger");
 	
   gSubscribeTree = document.getElementById("subscribeTree");
   gSearchTree = document.getElementById("searchTree");
@@ -424,9 +424,8 @@ function SubscribeOnClick(event)
         if (gSubscribeTree.view.isContainerOpen(row.value)) {
           var uri = gSubscribeTree.builderView.getResourceAtIndex(row.value).Value;
 
-          gStatusFeedback.showProgress(0);
+          gStatusFeedback._startMeteors();
           gStatusFeedback.showStatusString(gSubscribeBundle.getString("pleaseWaitString"));
-          gStatusBar.setAttribute("mode", "undetermined");
 
           gSubscribableServer.startPopulatingWithUri(msgWindow, true /* force to server */, uri);
         }
diff --git a/mailnews/base/resources/content/subscribe.xul b/mailnews/base/resources/content/subscribe.xul
index 2e2ac488e086..18e2297938c4 100644
--- a/mailnews/base/resources/content/subscribe.xul
+++ b/mailnews/base/resources/content/subscribe.xul
@@ -37,6 +37,7 @@ Rights Reserved.
         ondialoghelp="return doHelpButton();">   
      
 <stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
+<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/subscribe.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
@@ -175,7 +176,7 @@ Rights Reserved.
                   oncommand="SetSubscribeState(false)"/>
           <button id="refresh" label="&refreshButton.label;" accesskey="&refreshButton.accesskey;" 
                   oncommand="Refresh()"/>
-          <button id="stop" label="&stopButton.label;" accesskey="&stopButton.accesskey;" 
+          <button id="cmd_stop" label="&stopButton.label;" accesskey="&stopButton.accesskey;" 
                   oncommand="Stop()"/>
           <spacer flex="1"/>
         </vbox>
diff --git a/mailnews/base/search/resources/content/SearchDialog.js b/mailnews/base/search/resources/content/SearchDialog.js
index 9b4899016f76..8a278f7dbaed 100644
--- a/mailnews/base/search/resources/content/SearchDialog.js
+++ b/mailnews/base/search/resources/content/SearchDialog.js
@@ -38,6 +38,8 @@ var gFolderDatasource;
 var gFolderPicker;
 var gStatusBar = null;
 var gStatusFeedback = new nsMsgStatusFeedback();
+var gTimelineEnabled = false;
+var gMessengerBundle = null;
 var RDF;
 var gSearchBundle;
 var gNextMessageViewIndexAfterDelete = -2;
@@ -163,9 +165,8 @@ var gSearchNotificationListener =
     {
         gSearchStopButton.setAttribute("label", gSearchBundle.getString("labelForSearchButton"));
         gSearchStopButton.setAttribute("accesskey", gSearchBundle.getString("accesskeyForSearchButton"));
+        gStatusFeedback._stopMeteors();
         SetAdvancedSearchStatusText(gSearchView.QueryInterface(Components.interfaces.nsITreeView).rowCount);
-        gStatusFeedback.showProgress(0);
-        gStatusBar.setAttribute("mode","normal");
     },
 
     onNewSearch: function()
@@ -173,9 +174,8 @@ var gSearchNotificationListener =
       gSearchStopButton.setAttribute("label", gSearchBundle.getString("labelForStopButton"));
       gSearchStopButton.setAttribute("accesskey", gSearchBundle.getString("accesskeyForStopButton"));
       UpdateMailSearch("new-search");	
-      gStatusFeedback.showProgress(0);
+      gStatusFeedback._startMeteors();
       gStatusFeedback.showStatusString(gSearchBundle.getString("searchingMessage"));
-      gStatusBar.setAttribute("mode","undetermined");
     }
 }
 
@@ -231,6 +231,7 @@ function searchOnLoad()
   CreateMessenger();
 
   gSearchBundle = document.getElementById("bundle_search");
+  gMessengerBundle = document.getElementById("bundle_messenger");
   setupDatasource();
   setupSearchListener();