diff --git a/mozilla/mailnews/base/resources/content/messageWindow.js b/mozilla/mailnews/base/resources/content/messageWindow.js
index 1c3cf61d67b..0739471b103 100644
--- a/mozilla/mailnews/base/resources/content/messageWindow.js
+++ b/mozilla/mailnews/base/resources/content/messageWindow.js
@@ -150,6 +150,13 @@ function OnLoadMessageWindow()
 		}
 	}	
 
+  if (gCurrentMessageUri) {
+    SetUpToolbarButtons(gCurrentMessageUri);
+  }
+  else if (gCurrentFolderUri) {
+    SetUpToolbarButtons(gCurrentFolderUri);
+  }
+    
   setTimeout("OpenURL(gCurrentMessageUri);", 0);
   SetupCommandUpdateHandlers();