diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -509,12 +509,13 @@
 
     mDummyComposer = new MessageComposer::Composer(this);
     mDummyComposer->globalPart()->setParentWidgetForGui(this);
+
+    KConfigGroup grp(KMKernel::self()->config()->group("Composer"));
+    setAutoSaveSettings(grp, true);
 }
 
 KMComposerWin::~KMComposerWin()
 {
-    writeConfig();
-
     // When we have a collection set, store the message back to that collection.
     // Note that when we save the message or sent it, mFolder is set back to 0.
     // So this for example kicks in when opening a draft and then closing the window.
@@ -654,8 +655,6 @@
     KMailSettings::self()->setComposerSize(size());
     KMailSettings::self()->setShowSnippetManager(mSnippetAction->isChecked());
 
-    KConfigGroup grp(KMKernel::self()->config()->group("Composer"));
-    saveMainWindowSettings(grp);
     if (mSnippetAction->isChecked()) {
         KMailSettings::setSnippetSplitterPosition(mSnippetSplitter->sizes());
     }
@@ -1741,6 +1740,7 @@
         qCWarning(KMAIL_LOG) << "Tried to close while composer was active";
         return false;
     }
+    writeConfig();
     return true;
 }
 
@@ -3017,8 +3017,6 @@
 
 void KMComposerWin::slotEditToolbars()
 {
-    KConfigGroup grp(KMKernel::self()->config()->group("Composer"));
-    saveMainWindowSettings(grp);
     KEditToolBar dlg(guiFactory(), this);
 
     connect(&dlg, &KEditToolBar::newToolBarConfig, this, &KMComposerWin::slotUpdateToolbars);