diff --git a/messagelist/src/pane.cpp b/messagelist/src/pane.cpp
--- a/messagelist/src/pane.cpp
+++ b/messagelist/src/pane.cpp
@@ -188,6 +188,7 @@
 
 Pane::~Pane()
 {
+    saveCurrentSelection();
     writeConfig(true);
     delete d;
 }
@@ -606,6 +607,11 @@
         return;
     }
 
+    Widget *wWidget = qobject_cast<Widget *>(w);
+    if (wWidget) {
+        wWidget->saveCurrentSelection();
+    }
+
     delete w;
     updateTabControls();
 }
@@ -692,6 +698,7 @@
         }
 
         foreach (Widget *other, widgets) {
+            other->saveCurrentSelection();
             delete other;
         }