diff --git a/kmail.kcfg b/kmail.kcfg
index b00e00f4f..907b3d601 100644
--- a/kmail.kcfg
+++ b/kmail.kcfg
@@ -219,6 +219,11 @@
         <whatsthis>&lt;p&gt;If you want to set the folder names of the IMAP storage to your local language, you can choose between these available languages.&lt;/p&gt;&lt;p&gt; Please note, that the only reason to do so is for compatibility with Microsoft Outlook. It is considered a bad idea to set this, since it makes changing languages impossible. &lt;/p&gt;&lt;p&gt;So do not set this unless you have to.&lt;/p&gt;</whatsthis>
         <default>0</default>
       </entry>
+
+      <entry name="FilterOnlyDIMAPInbox" type="Bool">
+        <default>true</default>
+        <label>Only filter mails received in disconnected IMAP inbox.</label>
+      </entry>
     </group>
 
     <group name="Internal">
diff --git a/kmfoldercachedimap.cpp b/kmfoldercachedimap.cpp
index b66dcd3f6..c4625be2c 100644
--- a/kmfoldercachedimap.cpp
+++ b/kmfoldercachedimap.cpp
@@ -452,7 +452,7 @@ int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index
   // Add the message
   int rc = KMFolderMaildir::addMsg( msg, index_return );
 
-  if ( newMail && imapPath() == "/INBOX/" ) {
+  if ( newMail && (imapPath() == "/INBOX/" || !GlobalSettings::self()->filterOnlyDIMAPInbox()) ) {
     // This is a new message. Filter it
     mAccount->processNewMsg( msg );
   }