3 files changed, 15 insertions, 5 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index e3795657..5fe8581f 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -199,20 +199,20 @@ Controls2.ApplicationWindow {
                     ToolButton {
                         iconName: "mail-mark-unread"
                         text: qsTr("Mark As Read")
-                        enabled: mailController.markAsRead.enabled
+                        enabled: mailController.markAsReadAction.enabled
                         tooltip: qsTr("mark mail as read")
                         onClicked: {
-                            mailController.markAsRead.execute()
+                            mailController.markAsReadAction.execute()
                         }
                     }
 
                     ToolButton {
                         iconName: "mail-mark-important"
                         text: qsTr("Mark Important")
-                        enabled: mailController.markAsImportant.enabled
+                        enabled: mailController.markAsImportantAction.enabled
                         tooltip: qsTr("mark mail as important")
                         onClicked: {
-                            mailController.markAsImportant.execute()
+                            mailController.markAsImportantAction.execute()
                         }
                     }
 
diff --git a/framework/domain/mailcontroller.cpp b/framework/domain/mailcontroller.cpp
index a65c2692..3e5e6ed4 100644
--- a/framework/domain/mailcontroller.cpp
+++ b/framework/domain/mailcontroller.cpp
@@ -29,6 +29,7 @@ using namespace Sink::ApplicationDomain;
 MailController::MailController()
     : Kube::Controller(),
     action_markAsRead{new Kube::ControllerAction{this, &MailController::markAsRead}},
+    action_markAsUnread{new Kube::ControllerAction{this, &MailController::markAsUnread}},
     action_markAsImportant{new Kube::ControllerAction{this, &MailController::markAsImportant}},
     action_moveToTrash{new Kube::ControllerAction{this, &MailController::moveToTrash}},
     action_restoreFromTrash{new Kube::ControllerAction{this, &MailController::restoreFromTrash}},
@@ -54,6 +55,14 @@ void MailController::markAsRead()
     run(Store::modify(*mail));
 }
 
+void MailController::markAsUnread()
+{
+    auto mail = getMail();
+    mail->setUnread(true);
+    SinkLog() << "Mark as unread " << mail->identifier();
+    run(Store::modify(*mail));
+}
+
 void MailController::markAsImportant()
 {
     auto mail = getMail();
@@ -74,7 +83,7 @@ void MailController::restoreFromTrash()
 {
     auto mail = getMail();
     mail->setTrash(false);
-    SinkLog() << "Move to trash " << mail->identifier();
+    SinkLog() << "Restore from trash " << mail->identifier();
     run(Store::modify(*mail));
 }
 
diff --git a/framework/domain/mailcontroller.h b/framework/domain/mailcontroller.h
index 324f6c62..b92fd566 100644
--- a/framework/domain/mailcontroller.h
+++ b/framework/domain/mailcontroller.h
@@ -27,6 +27,7 @@ class MailController : public Kube::Controller
     Q_OBJECT
     KUBE_CONTROLLER_PROPERTY(Sink::ApplicationDomain::Mail::Ptr, Mail, mail)
     KUBE_CONTROLLER_ACTION(markAsRead)
+    KUBE_CONTROLLER_ACTION(markAsUnread)
     KUBE_CONTROLLER_ACTION(markAsImportant)
     KUBE_CONTROLLER_ACTION(moveToTrash)
     KUBE_CONTROLLER_ACTION(restoreFromTrash)