diff --git a/CMakeLists.txt b/CMakeLists.txt
index 277f0a9..ddad91f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,6 +152,6 @@ include_directories(${PROJECT_SOURCE_DIR}/pEpDBusAdapter)
 include_directories(${PROJECT_SOURCE_DIR}/pEpDBusAdapter/types)
 add_subdirectory(akonadi_pep_agent)
 add_subdirectory(messageviewerplugin)
-#add_subdirectory(pepcomposer)
+add_subdirectory(pepcomposer)
 add_subdirectory(pep_plugin)
 
diff --git a/pepcomposer/kmail b/pepcomposer/kmail
new file mode 160000
index 0000000..19a5a77
--- /dev/null
+++ b/pepcomposer/kmail
@@ -0,0 +1 @@
+Subproject commit 19a5a77733811fec2ddb984a3aa65e7c7535913e