5 files changed, 5 insertions, 5 deletions

diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt
index 69b7a151..64cec905 100644
--- a/framework/src/CMakeLists.txt
+++ b/framework/src/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(KF5Package CONFIG REQUIRED)
 
 add_definitions("-Wall -std=c++0x -g")
 
-include_directories(. domain/mime/mimetreeparser)
+include_directories(. domain/mime/mimetreeparser domain/ domain/mime)
 
 set(SRCS
     frameworkplugin.cpp
diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index 670cca0b..332101ac 100644
--- a/framework/src/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
@@ -33,7 +33,7 @@
 
 #include "identitiesmodel.h"
 #include "recepientautocompletionmodel.h"
-#include "mailtemplates.h"
+#include "mime/mailtemplates.h"
 
 class IdentitySelector : public Selector {
 public:
diff --git a/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
index ea0ab8d2..841cf6ff 100644
--- a/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
@@ -3,7 +3,7 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-set( MIMETREEPARSERRELPATH framework/src/domain/mimetreeparser)
+set( MIMETREEPARSERRELPATH framework/src/domain/mime/mimetreeparser)
 set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home )
 add_definitions( -DGNUPGHOME="${GNUPGHOME}" )
 
diff --git a/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
index ea0ab8d2..841cf6ff 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
+++ b/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
@@ -3,7 +3,7 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-set( MIMETREEPARSERRELPATH framework/src/domain/mimetreeparser)
+set( MIMETREEPARSERRELPATH framework/src/domain/mime/mimetreeparser)
 set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home )
 add_definitions( -DGNUPGHOME="${GNUPGHOME}" )
 
diff --git a/framework/src/frameworkplugin.cpp b/framework/src/frameworkplugin.cpp
index 1c881e24..84ada236 100644
--- a/framework/src/frameworkplugin.cpp
+++ b/framework/src/frameworkplugin.cpp
@@ -23,7 +23,7 @@
 #include "domain/maillistmodel.h"
 #include "domain/folderlistmodel.h"
 #include "domain/composercontroller.h"
-#include "domain/messageparser.h"
+#include "domain/mime/messageparser.h"
 #include "domain/retriever.h"
 #include "domain/outboxmodel.h"
 #include "domain/mouseproxy.h"