3 files changed, 21 insertions, 0 deletions

diff --git a/framework/qml/ConversationView.qml b/framework/qml/ConversationView.qml
index 4aa2b2c0..8331e581 100644
--- a/framework/qml/ConversationView.qml
+++ b/framework/qml/ConversationView.qml
@@ -62,9 +62,17 @@ FocusScope {
 
             Keys.onPressed: {
                 if (event.text == "j" || event.matches(StandardKey.MoveToNextLine)) {
+                    listView.scrollDown()
+                } else if (event.text == "J" || event.matches(StandardKey.MoveToNextPage)) {
                     listView.incrementCurrentIndex()
                 } else if (event.text == "k" || event.matches(StandardKey.MoveToPreviousLine)) {
+                    listView.scrollUp()
+                } else if (event.text == "K" || event.matches(StandardKey.MoveToPreviousPage)) {
                     listView.decrementCurrentIndex()
+                } else if (event.text == "n") {
+                   Kube.Fabric.postMessage(Kube.Messages.nextConversation, {})
+                } else if (event.text == "p") {
+                   Kube.Fabric.postMessage(Kube.Messages.previousConversation, {})
                 } else if (event.text == "d") {
                    //Not implemented as a shortcut because we want it only to apply if we have the focus
                    Kube.Fabric.postMessage(Kube.Messages.moveToTrash, {"mail": listView.currentItem.currentData.mail})
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index eb124102..ff72a59c 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -60,6 +60,16 @@ FocusScope {
         text: qsTr("Nothing here...")
     }
 
+    Kube.Listener {
+        filter: Kube.Messages.nextConversation
+        onMessageReceived: listView.incrementCurrentIndex()
+    }
+
+    Kube.Listener {
+        filter: Kube.Messages.previousConversation
+        onMessageReceived: listView.decrementCurrentIndex()
+    }
+
     ColumnLayout {
         anchors.fill: parent
 
diff --git a/framework/qml/Messages.qml b/framework/qml/Messages.qml
index 35aa750a..a3f6ef00 100644
--- a/framework/qml/Messages.qml
+++ b/framework/qml/Messages.qml
@@ -51,5 +51,8 @@ Item {
     property string sendOutbox: "sendOutbox"
 
     property string componentDone: "done"
+
+    property string nextConversation: "nextConversation"
+    property string previousConversation: "previousConversation"
 }