diff --git a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
index 2059458cd5c..97473efc70d 100644
--- a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
+++ b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
@@ -1791,6 +1791,10 @@ NS_IMETHODIMP nsImapIncomingServer::DiscoveryDone()
         ((NS_SUCCEEDED(currentFolder->GetHasSubFolders(&hasSubFolders)) && hasSubFolders)
         && !NoDescendentsAreVerified(currentFolder)))
       {
+        PRBool isNamespace;
+        currentImapFolder->GetIsNamespace(&isNamespace);
+        if (!isNamespace) // don't list namespaces explicitly
+        {
         // If there are no subfolders and this is unverified, we don't want to run
         // this url.  That is, we want to undiscover the folder.
         // If there are subfolders and no descendants are verified, we want to 
@@ -1800,6 +1804,7 @@ NS_IMETHODIMP nsImapIncomingServer::DiscoveryDone()
         currentImapFolder->SetExplicitlyVerify(PR_FALSE);
         currentImapFolder->List();
       }
+      }
       else
       {
         DeleteNonVerifiedFolders(currentFolder);