diff --git a/mailnews/base/resources/content/mailWindow.js b/mailnews/base/resources/content/mailWindow.js
index ab2ef1062ed5..3b828290496b 100644
--- a/mailnews/base/resources/content/mailWindow.js
+++ b/mailnews/base/resources/content/mailWindow.js
@@ -158,6 +158,8 @@ function CreateMailWindowGlobals()
   messagesBox       = document.getElementById("messagesBox");
   accountCentralBox = document.getElementById("accountCentralBox");
   gPaneConfig = pref.GetIntPref("mail.pane_config");
+
+  setOfflineStatus();
 }
 
 function InitMsgWindow()
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 16391a24ed23..f16f1f58c60b 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -77,12 +77,6 @@ Rights Reserved.
     <command id="cmd_renameFolder" oncommand="goDoCommand('cmd_renameFolder')" />
 </commandset>
 
-<broadcasterset id="broadcasterset">
-	<broadcaster id="cmd_toggleWorkOffline" oncommand="goDoCommand('cmd_toggleWorkOffline')" disabled="true"/>
-</broadcasterset>
-
-<statusbarpanel id="offline-status" tooltip="aTooltip" observes="cmd_toggleWorkOffline"/> 
-
 <commandset id="mailCommands">
   <command id="cmd_newNavigator"/>
   <command id="cmd_newEditor"/>