diff --git a/mailnews/base/resources/content/commandglue.js b/mailnews/base/resources/content/commandglue.js
index 5969d4e395fc..7404c9214dbd 100644
--- a/mailnews/base/resources/content/commandglue.js
+++ b/mailnews/base/resources/content/commandglue.js
@@ -712,8 +712,10 @@ function FolderPaneSelectionChange()
         ClearThreadPane();
     }
 
-    if (!gAccountCentralLoaded) 
-        ClearMessagePane();
+    if (gAccountCentralLoaded)
+      UpdateMailToolbar("gAccountCentralLoaded");
+    else
+      ClearMessagePane();
 
     if (gDisplayStartupPage)
     {