diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h
index 019a85786..371d7b184 100755
--- a/src/librssguard/definitions/definitions.h
+++ b/src/librssguard/definitions/definitions.h
@@ -125,7 +125,6 @@
 #define LOGSEC_DB                   "database: "
 #define LOGSEC_NEXTCLOUD            "nextcloud: "
 #define LOGSEC_GREADER              "greader: "
-#define LOGSEC_INOREADER            "inoreader: "
 #define LOGSEC_FEEDLY               "feedly: "
 #define LOGSEC_TTRSS                "tt-rss: "
 #define LOGSEC_GMAIL                "gmail: "
diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp
index c609ed4c4..5b1921cd2 100644
--- a/src/librssguard/gui/messagesview.cpp
+++ b/src/librssguard/gui/messagesview.cpp
@@ -78,6 +78,12 @@ void MessagesView::restoreHeaderState(const QByteArray& data) {
   inn.setVersion(QDataStream::Version::Qt_4_7);
 
   int saved_header_count; inn >> saved_header_count;
+
+  if (std::abs(saved_header_count - header()->count()) > 10) {
+    qWarningNN << LOGSEC_GUI << "Detected invalid state for list view.";
+    return;
+  }
+
   Qt::SortOrder saved_sort_order; inn >> saved_sort_order;
   int saved_sort_column; inn >> saved_sort_column;