2 files changed, 18 insertions, 11 deletions

diff --git a/framework/mail/maillistmodel.cpp b/framework/mail/maillistmodel.cpp
index f18861c4..5ffcec0f 100644
--- a/framework/mail/maillistmodel.cpp
+++ b/framework/mail/maillistmodel.cpp
@@ -1,12 +1,19 @@
 #include "maillistmodel.h"
+#include <akonadi2common/clientapi.h>
 
-MailListModel::MailListModel(QObject *parent) : ListModelResult<Akonadi2::ApplicationDomain::Mail::Ptr>(QList<QByteArray>() << "subject" << "uid")
+
+MailListModel::MailListModel(QObject *parent)
+    : QIdentityProxyModel()
 {
     Akonadi2::Query query;
     query.syncOnDemand = false;
     query.processAll = false;
     query.liveQuery = true;
-    setEmitter(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Mail>(query));
+    QList<QByteArray> requestedProperties;
+    requestedProperties << "subject";
+    query.requestedProperties = requestedProperties.toSet();
+    mModel = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);
+    setSourceModel(mModel.data());
 }
 
 MailListModel::~MailListModel()
@@ -27,9 +34,9 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
 {
     switch (role) {
         case Subject:
-            return ListModelResult<Akonadi2::ApplicationDomain::Mail::Ptr>::data(index(idx.row(), 0, idx.parent()), Qt::DisplayRole);
+            return mapToSource(idx).data(Qt::DisplayRole).toString();
     }
-    return QVariant();
+    return QIdentityProxyModel::data(idx, role);
 }
 
 void MailListModel::runQuery(const QString& query)
diff --git a/framework/mail/maillistmodel.h b/framework/mail/maillistmodel.h
index b0a153a5..4e360d96 100644
--- a/framework/mail/maillistmodel.h
+++ b/framework/mail/maillistmodel.h
@@ -1,13 +1,10 @@
 #pragma once
 
-#include <QAbstractListModel>
+#include <QIdentityProxyModel>
+#include <QSharedPointer>
 #include <QStringList>
 
-#include <akonadi2common/clientapi.h>
-#include <akonadi2common/query.h>
-#include <akonadi2common/listmodelresult.h>
-
-class MailListModel : public ListModelResult<Akonadi2::ApplicationDomain::Mail::Ptr>
+class MailListModel : public QIdentityProxyModel
 {
     Q_OBJECT
 
@@ -15,12 +12,15 @@ public:
     MailListModel(QObject *parent = Q_NULLPTR);
     ~MailListModel();
 
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
     enum Roles {
         Subject  = Qt::UserRole + 1
     };
 
     QHash<int, QByteArray> roleNames() const;
-    QVariant data(const QModelIndex &index, int role) const;
 
     void runQuery(const QString &query);
+private:
+    QSharedPointer<QAbstractItemModel> mModel;
 };