2 files changed, 21 insertions, 7 deletions

diff --git a/framework/qml/Icons.qml b/framework/qml/Icons.qml
index 252f9f43..0a633463 100644
--- a/framework/qml/Icons.qml
+++ b/framework/qml/Icons.qml
@@ -33,6 +33,7 @@ Item {
     property string success_inverted: "dialog-ok-inverted"
 
     property string markAsRead: "mail-mark-unread-new"
+    property string markAsUnread: "mail-mark-unread-new"
     property string markImportant: "mail-mark-important"
     property string undo: "edit-undo"
     property string moveToTrash: "edit-delete"
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 28386442..1e0123cc 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -48,28 +48,40 @@ Item {
             Controls.ToolButton {
                 iconName: Kube.Icons.markAsRead
                 text: qsTr("Mark As Read")
+                tooltip: text
                 enabled: mailController.markAsReadAction.enabled
-                tooltip: qsTr("mark mail as read")
+                visible: enabled
                 onClicked: {
                     mailController.markAsReadAction.execute()
                 }
             }
 
             Controls.ToolButton {
+                iconName: Kube.Icons.markAsUnread
+                text: qsTr("Mark As Unread")
+                tooltip: text
+                enabled: mailController.markAsUnreadAction.enabled
+                visible: enabled
+                onClicked: {
+                    mailController.markAsUnreadAction.execute()
+                }
+            }
+
+            Controls.ToolButton {
                 iconName: Kube.Icons.markImportant
-                text: qsTr("Mark Important")
-                enabled: mailController.markAsImportantAction.enabled
-                tooltip: qsTr("mark mail as important")
+                text: qsTr("Toggle Important")
+                tooltip: text
+                enabled: mailController.toggleImportantAction.enabled
                 onClicked: {
-                    mailController.markAsImportantAction.execute()
+                    mailController.toggleImportantAction.execute()
                 }
             }
 
             Controls.ToolButton {
                 iconName: Kube.Icons.moveToTrash
                 text: qsTr("Delete Mail")
+                tooltip: text
                 enabled: mailController.moveToTrashAction.enabled
-                tooltip: qsTr("delete email")
                 onClicked: {
                     mailController.moveToTrashAction.execute()
                 }
@@ -78,8 +90,9 @@ Item {
             Controls.ToolButton {
                 iconName: Kube.Icons.undo
                 text: qsTr("Restore Mail")
+                tooltip: text
                 enabled: mailController.restoreFromTrashAction.enabled
-                tooltip: qsTr("restore email")
+                visible: enabled
                 onClicked: {
                     mailController.restoreFromTrashAction.execute()
                 }