diff --git a/kmsearchpattern.cpp b/kmsearchpattern.cpp
index 35aba2784..32a1f6882 100644
--- a/kmsearchpattern.cpp
+++ b/kmsearchpattern.cpp
@@ -23,7 +23,6 @@
 #include "filterlog.h"
 using KMail::FilterLog;
 #include "kmkernel.h"
-#include "kmfolder.h"
 #include <kpimutils/email.h>
 
 #include <selectsqarqlbuilder.h>
@@ -867,12 +866,12 @@ bool KMSearchPattern::matches( quint32 serNum, bool ignoreBody ) const
 
   bool res = false;
   int idx = -1;
+#if 0 //Port to akonadi
   KMFolder *folder = 0;
   KMMsgDict::instance()->getLocation( serNum, &folder, &idx );
   if ( !folder || ( idx == -1 ) || ( idx >= folder->count() ) ) {
     return res;
   }
-#if 0 //TODO port to akonadi
   KMFolderOpener openFolder( folder, "searptr" );
   if ( openFolder.openResult() == 0 ) { // 0 means no error codes
     KMFolder *f =  openFolder.folder();
diff --git a/mailmanagerimpl.cpp b/mailmanagerimpl.cpp
index d60f17c12..d8b0a4061 100644
--- a/mailmanagerimpl.cpp
+++ b/mailmanagerimpl.cpp
@@ -34,7 +34,6 @@
 #include <manageradaptor.h>
 
 #include <kmime/kmime_message.h>
-#include "kmfolder.h"
 
 #include <KUrl>
 #include <KDebug>