2 files changed, 24 insertions, 1 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index 279e280d..405458c6 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -17,7 +17,7 @@
 */
 
 
-import QtQuick 2.4
+import QtQuick 2.7
 import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 import org.kde.kirigami 1.0 as Kirigami
@@ -83,6 +83,27 @@ ApplicationWindow {
     }
     //END Actions
 
+    //BEGIN Shortcuts
+    Shortcut {
+        sequence: StandardKey.Refresh
+        onActivated: syncAction.execute()
+        enabled: syncAction.ready
+    }
+    Shortcut {
+        sequence: StandardKey.Delete
+        onActivated: deleteAction.execute()
+        enabled: deleteAction.ready
+    }
+    Shortcut {
+        sequence: StandardKey.MoveToNextLine
+        onActivated: mailListView.currentIndex++
+    }
+    Shortcut {
+        sequence: StandardKey.MoveToPreviousLine
+        onActivated: mailListView.currentIndex--
+    }
+    //END Shortcuts
+
     //BEGIN Main content
     SplitView {
         anchors {
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml
index 282bf250..bedeeec5 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/components/package/contents/ui/MailListView.qml
@@ -30,6 +30,7 @@ Controls.ScrollView {
     property variant parentFolder
     property variant currentMail
     property bool isDraft : false
+    property int currentIndex
 
     onParentFolderChanged: {
         currentMail = null
@@ -37,6 +38,7 @@ Controls.ScrollView {
 
     ListView {
         id: listView
+        currentIndex: root.currentIndex
 
         model: KubeFramework.MailListModel {
             parentFolder: root.parentFolder