diff --git a/mail/base/content/msgMail3PaneWindow.js b/mail/base/content/msgMail3PaneWindow.js
index 2d5b7166f71..fb3f90a1cd8 100644
--- a/mail/base/content/msgMail3PaneWindow.js
+++ b/mail/base/content/msgMail3PaneWindow.js
@@ -879,9 +879,8 @@ function loadStartFolder(initialUri)
         // only do this on startup, when we pass in null
         if (!initialUri && isLoginAtStartUpEnabled && gLoadStartFolder)
         {
-            // Perform biff on the server to check for new mail, except for imap
-            if (defaultServer.type != "imap")
-              defaultServer.PerformBiff(msgWindow);        
+            // Perform biff on the server to check for new mail
+            defaultServer.PerformBiff(msgWindow);        
         }
 
 
diff --git a/mailnews/base/resources/content/msgMail3PaneWindow.js b/mailnews/base/resources/content/msgMail3PaneWindow.js
index 8cd50c11938..036c96bcc8a 100644
--- a/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -757,16 +757,15 @@ function loadStartFolder(initialUri)
         }
 
         var startFolder = startFolderResource.QueryInterface(Components.interfaces.nsIMsgFolder);
-        SelectFolder(startFolder.URI);
 
         // only do this on startup, when we pass in null
         if (!initialUri && isLoginAtStartUpEnabled && gLoadStartFolder)
         {
-            // Perform biff on the server to check for new mail, except for imap
-            if (defaultServer.type != "imap")
+            // Perform biff on the server to check for new mail
               defaultServer.PerformBiff(msgWindow);        
         }
 
+        SelectFolder(startFolder.URI);
 
         // because the "open" state persists, we'll call
         // PerformExpand() for all servers that are open at startup.
diff --git a/mailnews/imap/src/nsImapMailFolder.cpp b/mailnews/imap/src/nsImapMailFolder.cpp
index 309a181878f..39b85d0bc5d 100644
--- a/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mailnews/imap/src/nsImapMailFolder.cpp
@@ -727,6 +727,7 @@ nsImapMailFolder::UpdateFolder(nsIMsgWindow *msgWindow)
       getter_AddRefs(eventQ));
     nsCOMPtr <nsIURI> url;
     rv = imapService->SelectFolder(eventQ, this, m_urlListener, msgWindow, getter_AddRefs(url));
+    m_urlRunning = PR_TRUE;
     if (url)
     {
       nsCOMPtr <nsIMsgMailNewsUrl> mailnewsUrl = do_QueryInterface(url);