diff --git a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp
index 73c018329ae..428232021a4 100644
--- a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp
+++ b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp
@@ -131,6 +131,8 @@ NS_IMETHODIMP nsMsgDBFolder::Shutdown(PRBool shutdownChildren)
 				}
 			}
 		}
+    // Ask base class shutdown itself.
+    nsMsgFolder::Shutdown(shutdownChildren);
 	}
 	return NS_OK;
 }
diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp
index 6243cf3de21..0712363d7ad 100644
--- a/mozilla/mailnews/base/util/nsMsgFolder.cpp
+++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp
@@ -284,6 +284,8 @@ nsresult nsMsgFolder::CreateBaseMessageURI(const char *aURI)
 
 NS_IMETHODIMP nsMsgFolder::Shutdown(PRBool shutdownChildren)
 {
+  // Reset incoming server pointer.
+  mServer = nsnull;
 	return NS_OK;
 }