diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp
index 430611c43..c609ed4c4 100644
--- a/src/librssguard/gui/messagesview.cpp
+++ b/src/librssguard/gui/messagesview.cpp
@@ -89,7 +89,10 @@ void MessagesView::restoreHeaderState(const QByteArray& data) {
     inn >> ss;
     inn >> ish;
 
-    header()->swapSections(header()->visualIndex(i), vi);
+    if (vi < header()->count()) {
+      header()->swapSections(header()->visualIndex(i), vi);
+    }
+
     header()->resizeSection(i, ss);
     header()->setSectionHidden(i, ish);
   }
@@ -204,6 +207,7 @@ void MessagesView::setupAppearance() {
   setItemDelegate(new StyledItemDelegateWithoutFocus(this));
   header()->setDefaultSectionSize(MESSAGES_VIEW_DEFAULT_COL);
   header()->setMinimumSectionSize(MESSAGES_VIEW_MINIMUM_COL);
+  header()->setFirstSectionMovable(true);
   header()->setCascadingSectionResizes(false);
   header()->setStretchLastSection(false);
 }