diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index f521da3a81db90732016c55179c2be9da50f7efa..b47c9195332ee0f2b76e405300503654cf0a0c3a 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -16,6 +16,10 @@ include(KDEFrameworkCompilerSettings)
 set(KF5_VERSION "4.98.0")
 set(QT_REQUIRED_VERSION "5.2.0")
 
+set(KDEPIM_LIB_VERSION "4.70.0")
+set(KDEPIM_LIB_SOVERSION "5")
+
+
 find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Akonadi ${KF5_VERSION} CONFIG REQUIRED)
@@ -25,6 +29,7 @@ find_package(KF5Abc ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiMime ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5PimIdentities ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5MailTransport ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Mime ${KF5_VERSION} CONFIG REQUIRED)
 
 
 # Xsltproc
@@ -62,6 +67,7 @@ include_directories(
   ${kdepim-runtime_SOURCE_DIR}/libkdepim-copy
   ${CMAKE_CURRENT_SOURCE_DIR}/shared
   ${CMAKE_CURRENT_BINARY_DIR}/shared
+  ${CMAKE_CURRENT_SOURCE_DIR}/folderarchivesettings/
 )
 
 
@@ -101,7 +107,7 @@ set( AKONADI_IMAPATTRIBUTES_SHARED_SOURCES
 #add_subdirectory( contacts )
 add_subdirectory( dav )
 #add_subdirectory( ical )
-#add_subdirectory( imap )
+add_subdirectory( imap )
 add_subdirectory( kdeaccounts )
 #if (Libkolab_FOUND AND Libkolabxml_FOUND)
 #    add_subdirectory( kolabproxy )
diff --git a/resources/maildir/libmaildir/maildir.cpp b/resources/maildir/libmaildir/maildir.cpp
index 0531438b2c72893a686af346ffe72305b91a1e25..0e4606a8e3b341e7a8f0b312902e6107f597cd2b 100644
--- a/resources/maildir/libmaildir/maildir.cpp
+++ b/resources/maildir/libmaildir/maildir.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <KPIMUtils/kfileio.h>
-#include <akonadi/kmime/messageflags.h>
+#include <Akonadi/KMime/messageflags.h>
 
 #include <kde_file.h>
 #include <time.h>
diff --git a/resources/maildir/maildirresource.cpp b/resources/maildir/maildirresource.cpp
index aeed1d133daa1ccfef7eeef6bd7ab535b375df2b..27773fc4b1ec8e61e496d725ed779011622477f7 100644
--- a/resources/maildir/maildirresource.cpp
+++ b/resources/maildir/maildirresource.cpp
@@ -26,7 +26,7 @@
 #include <QtCore/QDir>
 #include <QtDBus/QDBusConnection>
 
-#include <akonadi/kmime/messageparts.h>
+#include <Akonadi/KMime/messageparts.h>
 #include <changerecorder.h>
 #include <itemfetchscope.h>
 #include <itemfetchjob.h>
diff --git a/resources/nntp/nntpresource.cpp b/resources/nntp/nntpresource.cpp
index 8f8d17d40eeba30739d2883850c8c521580c6c84..de236dad6032125863f0bda1f6214562bf41b8ab 100644
--- a/resources/nntp/nntpresource.cpp
+++ b/resources/nntp/nntpresource.cpp
@@ -27,7 +27,7 @@
 #include <cachepolicy.h>
 #include <collectionmodifyjob.h>
 #include <itemcreatejob.h>
-#include <akonadi/kmime/messageparts.h>
+#include <Akonadi/KMime/messageparts.h>
 #include <monitor.h>
 #include <session.h>
 #include <changerecorder.h>
diff --git a/resources/pop3/accountdialog.cpp b/resources/pop3/accountdialog.cpp
index 682902f60c493b2cfddd881d362ce6806a90f61e..5966e276a22f65da0b2a1df1f10c786f680cba5b 100644
--- a/resources/pop3/accountdialog.cpp
+++ b/resources/pop3/accountdialog.cpp
@@ -29,8 +29,8 @@
 // KDEPIMLIBS includes
 #include <Collection>
 #include <CollectionFetchJob>
-#include <akonadi/kmime/specialmailcollections.h>
-#include <akonadi/kmime/specialmailcollectionsrequestjob.h>
+#include <Akonadi/KMime/specialmailcollections.h>
+#include <Akonadi/KMime/specialmailcollectionsrequestjob.h>
 #include <resourcesettings.h>
 #include <MailTransport/ServerTest>
 
diff --git a/resources/pop3/pop3resource.cpp b/resources/pop3/pop3resource.cpp
index 52d78fd731ddcdcd768df1ec899c3148354ae1cc..17fc83f1deb1056c7ec47b98ac4c99e1e9d4ccbf 100644
--- a/resources/pop3/pop3resource.cpp
+++ b/resources/pop3/pop3resource.cpp
@@ -25,9 +25,9 @@
 #include <CollectionFetchJob>
 #include <ItemCreateJob>
 #include <AttributeFactory>
-#include <akonadi/kmime/messageflags.h>
-#include <akonadi/kmime/specialmailcollectionsrequestjob.h>
-#include <akonadi/kmime/specialmailcollections.h>
+#include <Akonadi/KMime/messageflags.h>
+#include <Akonadi/KMime/specialmailcollectionsrequestjob.h>
+#include <Akonadi/KMime/specialmailcollections.h>
 #include <KMime/kmime_util.h>
 #include <MailTransport/PrecommandJob>
 #include <MailTransport/Transport>