fix for bug #197149. spam filter shouldn't be applied to trash or junk folder.

r/sr=bienvenu, a=sspitzer

mailnews/base/util/nsMsgDBFolder.cpp

@@ -1685,7 +1685,6 @@ nsMsgDBFolder::SpamFilterClassifyMessages(const char **aURIArray, PRUint32 aURIC
 NS_IMETHODIMP
 nsMsgDBFolder::CallFilterPlugins(nsIMsgWindow *aMsgWindow)
 {
-
     nsCOMPtr<nsIMsgIncomingServer> server;
     nsCOMPtr<nsISpamSettings> spamSettings;
     nsCOMPtr<nsIAbMDBDirectory> whiteListDirectory;
@@ -1694,6 +1693,11 @@ nsMsgDBFolder::CallFilterPlugins(nsIMsgWindow *aMsgWindow)
     PRInt32 spamLevel = 0;
     nsXPIDLCString whiteListAbURI;
  
+    // if this is the junk folder, or the trash folder
+    // don't analyze for spam
+    if (mFlags & MSG_FOLDER_FLAG_JUNK || mFlags & MSG_FOLDER_FLAG_TRASH)
+      return NS_OK;
+
     nsresult rv = GetServer(getter_AddRefs(server));
     NS_ENSURE_SUCCESS(rv, rv); 
     rv = server->GetSpamSettings(getter_AddRefs(spamSettings));