2 files changed, 16 insertions, 14 deletions

diff --git a/framework/mail/folderlistmodel.cpp b/framework/mail/folderlistmodel.cpp
index 8c513b64..b0969060 100644
--- a/framework/mail/folderlistmodel.cpp
+++ b/framework/mail/folderlistmodel.cpp
@@ -29,11 +29,12 @@ QHash< int, QByteArray > FolderListModel::roleNames() const
 
 QVariant FolderListModel::data(const QModelIndex &idx, int role) const
 {
+    auto srcIdx = mapToSource(idx);
     switch (role) {
         case Name:
-            return mapToSource(idx).data(Qt::DisplayRole).toString();
-        case Icon:
-            return mapToSource(idx).data(Qt::DisplayRole).toString();
+            return srcIdx.sibling(srcIdx.row(), 0).data(Qt::DisplayRole).toString();
+        case Icon:
+            return srcIdx.sibling(srcIdx.row(), 1).data(Qt::DisplayRole).toString();
     }
     return QIdentityProxyModel::data(idx, role);
 }
diff --git a/framework/mail/maillistmodel.cpp b/framework/mail/maillistmodel.cpp
index 06670e09..baa11bc3 100644
--- a/framework/mail/maillistmodel.cpp
+++ b/framework/mail/maillistmodel.cpp
@@ -35,19 +35,20 @@ QHash< int, QByteArray > MailListModel::roleNames() const
 
 QVariant MailListModel::data(const QModelIndex &idx, int role) const
 {
+    auto srcIdx = mapToSource(idx);
     switch (role) {
         case Subject:
-            return mapToSource(idx).data(Qt::DisplayRole).toString();
-        case Sender:
-            return mapToSource(idx).data(Qt::DisplayRole).toString();
-        case SenderName:
-            return mapToSource(idx).data(Qt::DisplayRole).toString();
-        case Date:
-            return mapToSource(idx).data(Qt::DisplayRole).toString();
-        case Unread:
-            return mapToSource(idx).data(Qt::DisplayRole).toString();
-        case Important:
-            return mapToSource(idx).data(Qt::DisplayRole).toString();
+            return srcIdx.sibling(srcIdx.row(), 0).data(Qt::DisplayRole).toString();
+        case Sender:
+            return srcIdx.sibling(srcIdx.row(), 1).data(Qt::DisplayRole).toString();
+        case SenderName:
+            return srcIdx.sibling(srcIdx.row(), 2).data(Qt::DisplayRole).toString();
+        case Date:
+            return srcIdx.sibling(srcIdx.row(), 3).data(Qt::DisplayRole).toString();
+        case Unread:
+            return srcIdx.sibling(srcIdx.row(), 4).data(Qt::DisplayRole).toString();
+        case Important:
+            return srcIdx.sibling(srcIdx.row(), 5).data(Qt::DisplayRole).toString();
     }
     return QIdentityProxyModel::data(idx, role);
 }