diff --git a/src/kmkernel.h b/src/kmkernel.h
--- a/src/kmkernel.h
+++ b/src/kmkernel.h
@@ -487,6 +487,7 @@
     void resourceGoOnLine();
     void openReader(bool onlyCheck);
     QSharedPointer<MailCommon::FolderSettings> currentFolderCollection();
+    void saveConfig();
 
     KMail::UndoStack *the_undoStack = nullptr;
     MessageComposer::AkonadiSender *the_msgSender = nullptr;
diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@@ -231,7 +231,7 @@
     mMailService = nullptr;
 
     stopAgentInstance();
-    slotSyncConfig();
+    saveConfig();
 
     delete mAutoCorrection;
     delete mMailCommonSettings;
@@ -1172,16 +1172,7 @@
 
 void KMKernel::slotSyncConfig()
 {
-    PimCommon::PimCommonSettings::self()->save();
-    MessageCore::MessageCoreSettings::self()->save();
-    MessageViewer::MessageViewerSettings::self()->save();
-    MessageComposer::MessageComposerSettings::self()->save();
-    TemplateParser::TemplateParserSettings::self()->save();
-    MessageList::MessageListSettings::self()->save();
-    mMailCommonSettings->save();
-    Gravatar::GravatarSettings::self()->save();
-    KMailSettings::self()->save();
-    KMKernel::config()->sync();
+    saveConfig();
     //Laurent investigate why we need to reload them.
     PimCommon::PimCommonSettings::self()->load();
     MessageCore::MessageCoreSettings::self()->load();
@@ -1195,6 +1186,19 @@
     KMKernel::config()->reparseConfiguration();
 }
 
+void KMKernel::saveConfig()
+{
+    PimCommon::PimCommonSettings::self()->save();
+    MessageCore::MessageCoreSettings::self()->save();
+    MessageViewer::MessageViewerSettings::self()->save();
+    MessageComposer::MessageComposerSettings::self()->save();
+    TemplateParser::TemplateParserSettings::self()->save();
+    MessageList::MessageListSettings::self()->save();
+    mMailCommonSettings->save();
+    Gravatar::GravatarSettings::self()->save();
+    KMailSettings::self()->save();
+}
+
 void KMKernel::updateConfig()
 {
     slotConfigChanged();