diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c16485dec37d81c7dff06ae6f1f960e28ef4f6fb..1b1932a5497605f5c82b4c87663f16a8386daf74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,10 +37,10 @@ set(libimportwizard_autodetect_SRCS
     autodetect/thunderbird/thunderbirdsettings.cpp
     autodetect/thunderbird/thunderbirdaddressbook.cpp
     autodetect/thunderbird/addressbook/MorkParser.cpp
-    autodetect/sylpheed/sylpheedimportdata.cpp
-    autodetect/sylpheed/sylpheedsettings.cpp
-    autodetect/sylpheed/sylpheedaddressbook.cpp
-    autodetect/sylpheed/sylpheedsettingsutils.cpp
+#    autodetect/sylpheed/sylpheedimportdata.cpp
+#    autodetect/sylpheed/sylpheedsettings.cpp
+#    autodetect/sylpheed/sylpheedaddressbook.cpp
+#    autodetect/sylpheed/sylpheedsettingsutils.cpp
 #    autodetect/evolutionv3/evolutionv3importdata.cpp
 #    autodetect/evolutionv3/evolutionsettings.cpp
 #    autodetect/evolutionv3/evolutioncalendar.cpp
@@ -59,9 +59,9 @@ set(libimportwizard_autodetect_SRCS
 #    autodetect/balsa/balsaimportdata.cpp
 #    autodetect/balsa/balsasettings.cpp
 #    autodetect/balsa/balsaaddressbook.cpp
-    autodetect/claws-mail/clawsmailimportdata.cpp
-    autodetect/claws-mail/clawsmailsettings.cpp
-    autodetect/claws-mail/clawsmailaddressbook.cpp
+#    autodetect/claws-mail/clawsmailimportdata.cpp
+#    autodetect/claws-mail/clawsmailsettings.cpp
+#    autodetect/claws-mail/clawsmailaddressbook.cpp
 #    autodetect/trojita/trojitasettings.cpp
 #    autodetect/trojita/trojitaimportdata.cpp
 #    autodetect/trojita/trojitaaddressbook.cpp
diff --git a/src/autodetect/CMakeLists.txt b/src/autodetect/CMakeLists.txt
index 6c43948aae57bd9cdde13e313489138bf6907ccc..8fd4f889eab79483a1a9a9a34974f95b9aadbe4f 100644
--- a/src/autodetect/CMakeLists.txt
+++ b/src/autodetect/CMakeLists.txt
@@ -9,4 +9,6 @@ add_subdirectory(evolutionv2)
 add_subdirectory(evolutionv3)
 add_subdirectory(oe)
 add_subdirectory(thebat)
+add_subdirectory(sylpheed)
+add_subdirectory(claws-mail)
 
diff --git a/src/autodetect/claws-mail/CMakeLists.txt b/src/autodetect/claws-mail/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..45ca2535bafbcad255d4e23739697fea0e5f3564
--- /dev/null
+++ b/src/autodetect/claws-mail/CMakeLists.txt
@@ -0,0 +1,24 @@
+set(clawsmailimporter_SRCS
+   clawsmailaddressbook.cpp  
+   clawsmailimportdata.cpp  
+   clawsmailsettings.cpp
+   ../sylpheed/sylpheedaddressbook.cpp  
+   ../sylpheed/sylpheedsettings.cpp
+   ../sylpheed/sylpheedsettingsutils.cpp
+
+)
+
+kcoreaddons_add_plugin(clawsmailimporterplugin JSON clawsmailimporter.json SOURCES
+    ${clawsmailimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(clawsmailimporterplugin
+  libimportwizard
+  KF5::XmlGui
+  KF5::I18n
+  KF5::Contacts
+  KF5::MailImporterAkonadi
+  KF5::MailTransport
+  KF5::IdentityManagement
+  KF5::MailCommon
+)
diff --git a/src/autodetect/claws-mail/clawsmailimportdata.cpp b/src/autodetect/claws-mail/clawsmailimportdata.cpp
index 4062e136b11475637ed90162e6646b78a61efa4d..748d522e1e349a5843cd11267084f377820347f8 100644
--- a/src/autodetect/claws-mail/clawsmailimportdata.cpp
+++ b/src/autodetect/claws-mail/clawsmailimportdata.cpp
@@ -31,7 +31,7 @@
 
 #include <QDir>
 
-//K_PLUGIN_FACTORY_WITH_JSON(ClawsMailImporterFactory, "clawsmailimporter.json", registerPlugin<ClawsMailImportData>();)
+K_PLUGIN_FACTORY_WITH_JSON(ClawsMailImporterFactory, "clawsmailimporter.json", registerPlugin<ClawsMailImportData>();)
 
 ClawsMailImportData::ClawsMailImportData(QObject *parent, const QList<QVariant> &)
     : AbstractImporter(parent)
diff --git a/src/autodetect/claws-mail/clawsmailsettings.cpp b/src/autodetect/claws-mail/clawsmailsettings.cpp
index 619954ed166d9a917d672718273ab524e4b8e05c..ab713d1686a452eca9de99cf6927a2182beae6db 100644
--- a/src/autodetect/claws-mail/clawsmailsettings.cpp
+++ b/src/autodetect/claws-mail/clawsmailsettings.cpp
@@ -26,7 +26,7 @@
 #include <KIdentityManagement/kidentitymanagement/identity.h>
 #include <KIdentityManagement/kidentitymanagement/signature.h>
 
-#include "importwizard_debug.h"
+//#include "importwizard_debug.h"
 #include <KConfig>
 #include <KConfigGroup>
 #include <QFileInfo>
@@ -71,7 +71,7 @@ void ClawsMailSettings::importSettings(const QString &filename, const QString &p
     QFile customHeaderFile(customheaderrc);
     if (customHeaderFile.exists()) {
         if (!customHeaderFile.open(QIODevice::ReadOnly)) {
-            qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << customheaderrc;
+            //FIXME qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << customheaderrc;
         } else {
             readCustomHeader(&customHeaderFile);
         }
diff --git a/src/autodetect/sylpheed/CMakeLists.txt b/src/autodetect/sylpheed/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fe20d752283d2e9fd2ef0fa5d30423f800553f8a
--- /dev/null
+++ b/src/autodetect/sylpheed/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(sylpheedimporter_SRCS
+   sylpheedaddressbook.cpp  
+   sylpheedimportdata.cpp  
+   sylpheedsettings.cpp
+   sylpheedsettingsutils.cpp
+)
+
+kcoreaddons_add_plugin(sylpheedimporterplugin JSON sylpheedimporter.json SOURCES
+    ${sylpheedimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(sylpheedimporterplugin
+  libimportwizard
+  KF5::XmlGui
+  KF5::I18n
+  KF5::Contacts
+  KF5::MailImporterAkonadi
+  KF5::MailTransport
+  KF5::IdentityManagement
+  KF5::MailCommon
+)
diff --git a/src/autodetect/sylpheed/sylpheedimportdata.cpp b/src/autodetect/sylpheed/sylpheedimportdata.cpp
index bac927deda5797a5fbc1c53cb8fd9ac605f1fb76..9cd1306ec799807eb8f77a158d1c1094ae19c51b 100644
--- a/src/autodetect/sylpheed/sylpheedimportdata.cpp
+++ b/src/autodetect/sylpheed/sylpheedimportdata.cpp
@@ -30,6 +30,8 @@
 #include <kpluginfactory.h>
 #include <QDir>
 
+K_PLUGIN_FACTORY_WITH_JSON(SylpheedImporterFactory, "sylpheedimporter.json", registerPlugin<SylpheedImportData>();)
+
 SylpheedImportData::SylpheedImportData(QObject *parent, const QList<QVariant> &)
     : AbstractImporter(parent)
 {
@@ -105,3 +107,5 @@ AbstractImporter::TypeSupportedOptions SylpheedImportData::supportedOption()
     options |= AbstractImporter::AddressBooks;
     return options;
 }
+
+#include "sylpheedimportdata.moc"
diff --git a/src/importwizard.cpp b/src/importwizard.cpp
index 70a5472ad40685b0d8abd34a809beedff51a6051..11e4bc99d76b10bfc3fdb119ea7024e1caea2a85 100644
--- a/src/importwizard.cpp
+++ b/src/importwizard.cpp
@@ -28,11 +28,9 @@
 #include "importfinishpage.h"
 
 #include "autodetect/thunderbird/thunderbirdimportdata.h"
-#include "autodetect/sylpheed/sylpheedimportdata.h"
 #include "autodetect/icedove/icedoveimportdata.h"
 #include "autodetect/oe/oeimportdata.h"
 #include "autodetect/thebat/thebatimportdata.h"
-#include "autodetect/claws-mail/clawsmailimportdata.h"
 
 #include "manual/manualimportmailpage.h"
 #include "manual/manualselectfilterpage.h"
@@ -218,9 +216,9 @@ void ImportWizard::initializeImportModule()
     importer->setImportWizard(this);
     addImportModule(importer);
 
-    importer = new SylpheedImportData(this);
-    importer->setImportWizard(this);
-    addImportModule(importer);
+//    importer = new SylpheedImportData(this);
+//    importer->setImportWizard(this);
+//    addImportModule(importer);
 
 //    importer = new Evolutionv3ImportData(this);
 //    importer->setImportWizard(this);
@@ -262,9 +260,9 @@ void ImportWizard::initializeImportModule()
 //    importer->setImportWizard(this);
 //    addImportModule(importer);
 
-    importer = new ClawsMailImportData(this);
-    importer->setImportWizard(this);
-    addImportModule(importer);
+//    importer = new ClawsMailImportData(this);
+//    importer->setImportWizard(this);
+//    addImportModule(importer);
 
 //    importer = new TrojitaImportData(this);
 //    importer->setImportWizard(this);