2 files changed, 27 insertions, 4 deletions

diff --git a/framework/qml/ModelIndexRetriever.qml b/framework/qml/ModelIndexRetriever.qml
index d01ceb71..080012aa 100644
--- a/framework/qml/ModelIndexRetriever.qml
+++ b/framework/qml/ModelIndexRetriever.qml
@@ -22,6 +22,19 @@ Repeater {
     id: root
     property var currentData
     property int currentIndex: 0
+
+    function increaseCurrentIndex() {
+        if (currentIndex < count - 1) {
+            currentIndex = currentIndex + 1
+        }
+    }
+
+    function decreaseCurrentIndex() {
+        if (currentIndex > 0) {
+            currentIndex = currentIndex - 1
+        }
+    }
+
     onCurrentIndexChanged: {
         currentData = itemAt(currentIndex).currentData
     }
diff --git a/views/inboxcrusher/qml/View.qml b/views/inboxcrusher/qml/View.qml
index 7059a8eb..cb662c33 100644
--- a/views/inboxcrusher/qml/View.qml
+++ b/views/inboxcrusher/qml/View.qml
@@ -26,12 +26,10 @@ FocusScope {
     property variant currentMail: null
 
     Keys.onRightPressed: {
-        modelIndexRetriever.currentIndex = modelIndexRetriever.currentIndex + 1
+        modelIndexRetriever.increaseCurrentIndex()
     }
     Keys.onLeftPressed: {
-        if (modelIndexRetriever.currentIndex > 0) {
-            modelIndexRetriever.currentIndex = modelIndexRetriever.currentIndex - 1
-        }
+        modelIndexRetriever.decreaseCurrentIndex()
     }
     Kube.ModelIndexRetriever {
         id: modelIndexRetriever
@@ -97,6 +95,18 @@ FocusScope {
                 onClicked: {
                 }
             }
+            Kube.Button {
+                text: qsTr("Previous")
+                onClicked: {
+                    modelIndexRetriever.decreaseCurrentIndex()
+                }
+            }
+            Kube.Button {
+                text: qsTr("Next")
+                onClicked: {
+                    modelIndexRetriever.increaseCurrentIndex()
+                }
+            }
         }
     }
 }