diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp
index e2147a01db6..57bd74b0e6f 100644
--- a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp
+++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp
@@ -81,7 +81,7 @@ nsMsgIncomingServer::~nsMsgIncomingServer()
         nsCOMPtr<nsIMsgFilterService> filterService =
             do_GetService(kMsgFilterServiceCID, &rv);
         if (NS_SUCCEEDED(rv))
-            rv = filterService->CloseFilterList(mFilterList);
+            rv = filterService->SaveFilterList(mFilterList, &mFilterFile);
     }
     if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID,
                                                   m_prefs,
@@ -910,18 +910,16 @@ nsMsgIncomingServer::GetFilterList(nsIMsgFilterList **aResult)
       rv = msgFolder->GetPath(getter_AddRefs(thisFolder));
       NS_ENSURE_SUCCESS(rv, rv);
       
-      nsFileSpec filterFile;
-      
-      rv = thisFolder->GetFileSpec(&filterFile);
+      rv = thisFolder->GetFileSpec(&mFilterFile);
       NS_ENSURE_SUCCESS(rv, rv);
       
-      filterFile += "rules.dat";
+      mFilterFile += "rules.dat";
       
       nsCOMPtr<nsIMsgFilterService> filterService =
           do_GetService(kMsgFilterServiceCID, &rv);
       NS_ENSURE_SUCCESS(rv, rv);
       
-      rv = filterService->OpenFilterList(&filterFile, msgFolder, getter_AddRefs(mFilterList));
+      rv = filterService->OpenFilterList(&mFilterFile, msgFolder, getter_AddRefs(mFilterList));
       NS_ENSURE_SUCCESS(rv, rv);
   }
   
diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.h b/mozilla/mailnews/base/util/nsMsgIncomingServer.h
index fc64e929bd5..438bd728b25 100644
--- a/mozilla/mailnews/base/util/nsMsgIncomingServer.h
+++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.h
@@ -75,6 +75,7 @@ protected:
   nsresult CreateRootFolder();
   nsresult StorePassword();  // stuff the password in the single signon database
 
+  nsFileSpec mFilterFile;
   nsCOMPtr<nsIMsgFilterList> mFilterList;
   // pref callback to clear the user prefs
   static void clearPrefEnum(const char  *aPref, void *aClosure);