From b261dbaa092d9da4e25daa41b8d305f7fb2b7e9d Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Sat, 30 Apr 2016 14:07:59 +0200
Subject: [PATCH] Minor

---
 src/kmkernel.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
index ac1bf71e5..133e70020 100644
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@@ -1400,8 +1400,17 @@ void KMKernel::cleanup(void)
     the_msgSender = Q_NULLPTR;
     delete the_undoStack;
     the_undoStack = Q_NULLPTR;
+    delete mConfigureDialog;
+    mConfigureDialog = Q_NULLPTR;
+    // do not delete, because mWin may point to an existing window
+    // delete mWin;
+    mWin = Q_NULLPTR;
 
     KSharedConfig::Ptr config =  KMKernel::config();
+    if (RecentAddresses::exists()) {
+        RecentAddresses::self(config.data())->save(config.data());
+    }
+
     Akonadi::Collection trashCollection = CommonKernel->trashCollectionFolder();
     if (trashCollection.isValid()) {
         if (KMailSettings::self()->emptyTrashOnExit()) {
@@ -1413,15 +1422,6 @@ void KMKernel::cleanup(void)
             }
         }
     }
-    delete mConfigureDialog;
-    mConfigureDialog = Q_NULLPTR;
-    // do not delete, because mWin may point to an existing window
-    // delete mWin;
-    mWin = Q_NULLPTR;
-
-    if (RecentAddresses::exists()) {
-        RecentAddresses::self(config.data())->save(config.data());
-    }
 }
 
 void KMKernel::dumpDeadLetters()