4 files changed, 28 insertions, 0 deletions

diff --git a/framework/qml/ConversationListView.qml b/framework/qml/ConversationListView.qml
index 1d408edc..c84bbf6d 100644
--- a/framework/qml/ConversationListView.qml
+++ b/framework/qml/ConversationListView.qml
@@ -37,6 +37,14 @@ FocusScope {
 
     property var currentItem: null
 
+    function scrollDown() {
+        scrollHelper.scrollDown()
+    }
+
+    function scrollUp() {
+        scrollHelper.scrollUp()
+    }
+
     function setCurrentItem() {
         if (currentItem) {
             currentItem.isCurrentItem = false
diff --git a/framework/qml/ConversationView.qml b/framework/qml/ConversationView.qml
index 1109ad8e..fc239d40 100644
--- a/framework/qml/ConversationView.qml
+++ b/framework/qml/ConversationView.qml
@@ -54,6 +54,16 @@ FocusScope {
         }
     }
 
+    Kube.Listener {
+        filter: Kube.Messages.scrollConversationDown
+        onMessageReceived: listView.scrollDown()
+    }
+
+    Kube.Listener {
+        filter: Kube.Messages.scrollConversationUp
+        onMessageReceived: listView.scrollUp()
+    }
+
     Rectangle {
         anchors.fill: parent
         color: Kube.Colors.backgroundColor
diff --git a/framework/qml/Messages.qml b/framework/qml/Messages.qml
index 630d05ab..1483a71c 100644
--- a/framework/qml/Messages.qml
+++ b/framework/qml/Messages.qml
@@ -58,5 +58,7 @@ Item {
     property string selectPreviousMessage: "selectPreviousMessage"
     property string selectNextFolder: "selectNextFolder"
     property string selectPreviousFolder: "selectPreviousFolder"
+    property string scrollConversationDown: "scrollConversationDown"
+    property string scrollConversationUp: "scrollConversationUp"
 }
 
diff --git a/views/conversation/qml/View.qml b/views/conversation/qml/View.qml
index 4cfac3df..088b7ae5 100644
--- a/views/conversation/qml/View.qml
+++ b/views/conversation/qml/View.qml
@@ -38,6 +38,14 @@ FocusScope {
         onActivated: Kube.Fabric.postMessage(Kube.Messages.selectPreviousConversation, {})
     }
     Shortcut {
+        sequences: ['Shift+J']
+        onActivated: Kube.Fabric.postMessage(Kube.Messages.scrollConversationDown, {})
+    }
+    Shortcut {
+        sequences: ['Shift+K']
+        onActivated: Kube.Fabric.postMessage(Kube.Messages.scrollConversationUp, {})
+    }
+    Shortcut {
         sequences: ['n']
         onActivated: Kube.Fabric.postMessage(Kube.Messages.selectNextMessage, {})
     }