2 files changed, 11 insertions, 16 deletions

diff --git a/framework/domain/maillistmodel.cpp b/framework/domain/maillistmodel.cpp
index c33d8b67..6fe80092 100644
--- a/framework/domain/maillistmodel.cpp
+++ b/framework/domain/maillistmodel.cpp
@@ -74,6 +74,14 @@ static QString join(const QList<Sink::ApplicationDomain::Mail::Contact> &contact
     return list.join(", ");
 }
 
+void fetchMail(Sink::ApplicationDomain::Mail::Ptr mail)
+{
+    if (mail && !mail->getFullPayloadAvailable()) {
+        qWarning() << "Fetching mail: " << mail->identifier() << mail->getSubject();
+        Sink::Store::synchronize(Sink::SyncScope{*mail}).exec();
+    }
+}
+
 QVariant MailListModel::data(const QModelIndex &idx, int role) const
 {
     auto srcIdx = mapToSource(idx);
@@ -106,6 +114,9 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
         case DomainObject:
             return QVariant::fromValue(mail);
         case MimeMessage:
+            if (mFetchMails) {
+                fetchMail(mail);
+            }
             return mail->getMimeMessage();
         case ThreadSize:
             return mail->getProperty("count").toInt();
@@ -125,23 +136,9 @@ bool MailListModel::lessThan(const QModelIndex &left, const QModelIndex &right)
 void MailListModel::runQuery(const Sink::Query &query)
 {
     m_model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
-    QObject::connect(m_model.data(), &QAbstractItemModel::rowsInserted, this, &MailListModel::onRowsInserted);
     setSourceModel(m_model.data());
 }
 
-void MailListModel::onRowsInserted(const QModelIndex &parent, int begin, int end)
-{
-    if (mFetchMails && sourceModel()) {
-        for (int row = begin; row <= end; row++) {
-            auto mail = sourceModel()->index(row, 0, parent).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Mail::Ptr>();
-            if (mail && !mail->getFullPayloadAvailable()) {
-                qWarning() << "Fetching mail: " << mail->identifier();
-                Sink::Store::synchronize(Sink::SyncScope{*mail}).exec();
-            }
-        }
-    }
-}
-
 void MailListModel::setParentFolder(const QVariant &parentFolder)
 {
     using namespace Sink::ApplicationDomain;
diff --git a/framework/domain/maillistmodel.h b/framework/domain/maillistmodel.h
index faed9edf..dbb24a4d 100644
--- a/framework/domain/maillistmodel.h
+++ b/framework/domain/maillistmodel.h
@@ -68,8 +68,6 @@ public:
 
     void setMail(const QVariant &mail);
     QVariant mail() const;
-private slots:
-    void onRowsInserted(const QModelIndex &idx, int, int);
 
 private:
     QSharedPointer<QAbstractItemModel> m_model;