diff --git a/src/core/feedsselection.h b/src/core/feedsselection.h
index 43658ad94..4e6e1d5dc 100644
--- a/src/core/feedsselection.h
+++ b/src/core/feedsselection.h
@@ -23,6 +23,7 @@
 
 
 class FeedsModelRootItem;
+class FeedsModelFeed;
 
 class FeedsSelection {
   public:
diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp
index 38bddaa1e..2ac6e9e42 100755
--- a/src/core/messagesmodel.cpp
+++ b/src/core/messagesmodel.cpp
@@ -122,6 +122,7 @@ Message MessagesModel::messageAt(int row_index) const {
   message.m_enclosures = Enclosures::decodeEnclosuresFromString(rec.value(MSG_DB_ENCLOSURES_INDEX).toString());
   message.m_title = rec.value(MSG_DB_TITLE_INDEX).toString();
   message.m_url = rec.value(MSG_DB_URL_INDEX).toString();
+  message.m_feedId = rec.value(MSG_DB_FEED_INDEX).toInt();
   message.m_created = TextFactory::parseDateTime(rec.value(MSG_DB_DCREATED_INDEX).value<qint64>()).toLocalTime();
 
   return message;
diff --git a/src/core/messagesmodel.h b/src/core/messagesmodel.h
index f90163cee..3c2138d7c 100755
--- a/src/core/messagesmodel.h
+++ b/src/core/messagesmodel.h
@@ -86,6 +86,7 @@ class Message {
   public:
     explicit Message() {
       m_title = m_url = m_author = m_contents = "";
+      m_feedId = 0;
       m_enclosures = QList<Enclosure>();
     }
 
@@ -94,6 +95,7 @@ class Message {
     QString m_author;
     QString m_contents;
     QDateTime m_created;
+    int m_feedId;
 
     QList<Enclosure> m_enclosures;