diff --git a/kmacctimap.cpp b/kmacctimap.cpp
index a7817e35a..2645bf90d 100644
--- a/kmacctimap.cpp
+++ b/kmacctimap.cpp
@@ -399,10 +399,6 @@ void KMAcctImap::setPrefixHook() {
 void KMAcctImap::readConfig(KConfig& config)
 {
   ImapAccountBase::readConfig( config );
-  if ( checkExclude() ) {
-    disconnect(kmkernel->imapFolderMgr(), SIGNAL(changed()),
-        this, SLOT(slotUpdateFolderList()));
-  }
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmfolderimap.cpp b/kmfolderimap.cpp
index 407630237..b2b2cb46c 100644
--- a/kmfolderimap.cpp
+++ b/kmfolderimap.cpp
@@ -1692,6 +1692,7 @@ int KMFolderImap::expungeContents()
   return rc;
 }
 
+//-----------------------------------------------------------------------------
 void
 KMFolderImap::setUserRights( unsigned int userRights )
 {
@@ -1699,6 +1700,7 @@ KMFolderImap::setUserRights( unsigned int userRights )
   kdDebug(5006) << imapPath() << " setUserRights: " << userRights << endl;
 }
 
+//-----------------------------------------------------------------------------
 void KMFolderImap::slotCompleteMailCheckProgress()
 {
   if ( mMailCheckProgressItem ) {
@@ -1707,6 +1709,7 @@ void KMFolderImap::slotCompleteMailCheckProgress()
   }
 }
 
+//-----------------------------------------------------------------------------
 void KMFolderImap::setSubfolderState( imapState state )
 {
   mSubfolderState = state;
@@ -1725,4 +1728,13 @@ void KMFolderImap::setSubfolderState( imapState state )
   }
 }
 
+//-----------------------------------------------------------------------------
+void KMFolderImap::setIncludeInMailCheck( bool check )
+{
+  bool changed = ( mCheckMail != check );
+  mCheckMail = check;
+  if ( changed )
+    account()->slotUpdateFolderList();
+}
+
 #include "kmfolderimap.moc"
diff --git a/kmfolderimap.h b/kmfolderimap.h
index 08b860662..f4b8b82a7 100644
--- a/kmfolderimap.h
+++ b/kmfolderimap.h
@@ -247,7 +247,7 @@ public:
    * If this folder should be included in new-mail-check
    */
   bool includeInMailCheck() { return mCheckMail; }
-  void setIncludeInMailCheck( bool check ) { mCheckMail = check; }
+  void setIncludeInMailCheck( bool check );
 
   /** Inherited */
   virtual int create(bool imap = FALSE);