Re-apply Martin's patch.

svn path=/trunk/kdepim/; revision=335775

kmfolderdia.cpp

@@ -772,6 +772,7 @@ bool FolderDiaGeneralTab::save()
       folder->storage()->setContentsType( static_cast<KMail::FolderContentsType>( mContentsComboBox->currentItem() ) );
 
     folder->setIgnoreNewMail( mIgnoreNewMailCheckBox->isChecked() );
+    kmkernel->folderMgr()->contentsChanged();
 
     folder->setPutRepliesInSameFolder( mKeepRepliesInSameFolderCheckBox->isChecked() );
 

kmsystemtray.cpp

@@ -268,8 +268,9 @@ void KMSystemTray::foldersChanged()
     KMFolder * currentFolder = *it;
     QString currentName = *strIt;
 
-    if((!currentFolder->isSystemFolder() || (currentFolder->name().lower() == "inbox")) ||
-       (currentFolder->folderType() == KMFolderTypeImap))
+    if ( ((!currentFolder->isSystemFolder() || (currentFolder->name().lower() == "inbox")) ||
+         (currentFolder->folderType() == KMFolderTypeImap)) &&
+         !currentFolder->ignoreNewMail() )
     {
       /** If this is a new folder, start listening for messages */
       connect(currentFolder, SIGNAL(numUnreadMsgsChanged(KMFolder *)),