synch with the trunk.

mail/base/content/mailWindow.js

@@ -577,8 +577,10 @@ function OpenInboxForServer(server)
         var inboxFolder = GetInboxFolder(server);
         SelectFolder(inboxFolder.URI);
 
-        if(CheckOnline())
+        if(CheckOnline())	{
-            GetMessagesForInboxOnServer(server);
+            if (server.type != "imap")
+                GetMessagesForInboxOnServer(server);
+        }
         else {
             var option = PromptGetMessagesOffline();
             if(option == 0) {