From b7349140ee59c61bd20c1315deb6ae118e3b838f Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 9 Dec 2015 20:32:55 +0100
Subject: [PATCH] Fix message loading for standar root.

---
 src/services/standard/standardserviceroot.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp
index 6a6c44884..2c8c6da62 100755
--- a/src/services/standard/standardserviceroot.cpp
+++ b/src/services/standard/standardserviceroot.cpp
@@ -590,13 +590,14 @@ QList<QAction*> StandardServiceRoot::contextMenu() {
 
 bool StandardServiceRoot::loadMessagesForItem(RootItem *item, QSqlTableModel *model) {
   if (item->kind() == RootItemKind::Bin) {
-    model->setFilter(QSL("is_deleted = 1 AND is_pdeleted = 0"));
+    model->setFilter(QString("is_deleted = 1 AND is_pdeleted = 0 AND account_id = %1").arg(accountId()));
   }
   else {
     QList<Feed*> children = item->getSubTreeFeeds();
     QString filter_clause = textualFeedIds(children).join(QSL(", "));
 
-    model->setFilter(QString(QSL("feed IN (%1) AND is_deleted = 0 AND is_pdeleted = 0")).arg(filter_clause));
+    model->setFilter(QString(QSL("feed IN (%1) AND is_deleted = 0 AND is_pdeleted = 0 AND account_id = %1")).arg(filter_clause,
+                                                                                             accountId()));
     qDebug("Loading messages from feeds: %s.", qPrintable(filter_clause));
   }