2 files changed, 4 insertions, 18 deletions

diff --git a/framework/qml/ConversationView.qml b/framework/qml/ConversationView.qml
index c8ea74ae..f3011f65 100644
--- a/framework/qml/ConversationView.qml
+++ b/framework/qml/ConversationView.qml
@@ -116,23 +116,6 @@ FocusScope {
                 }
             }
 
-            onCurrentItemChanged: {
-                if (currentItem) {
-                    markAsReadTimer.restart()
-                }
-            }
-
-            Timer {
-                id: markAsReadTimer
-                interval: 2000
-                running: false
-                repeat: false
-                onTriggered: {
-                    if (listView.currentItem && !!listView.currentItem.currentData.mail) {
-                        Kube.Fabric.postMessage(Kube.Messages.markAsRead, {"mail": listView.currentItem.currentData.mail})
-                    }
-                }
-            }
         }
     }
 }
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 96cf30bc..1cdc664f 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -33,7 +33,10 @@ FocusScope {
     property bool isUnread : false
     property variant currentMail: null
 
-    onCurrentMailChanged: Kube.Fabric.postMessage(Kube.Messages.mailSelection, {"mail":currentMail})
+    onCurrentMailChanged: {
+        Kube.Fabric.postMessage(Kube.Messages.markAsRead, {"mail": currentMail})
+        Kube.Fabric.postMessage(Kube.Messages.mailSelection, {"mail": currentMail})
+    }
 
     Kube.Listener {
         filter: Kube.Messages.folderSelection