3 files changed, 49 insertions, 31 deletions

diff --git a/components/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml
index d7c3193c..6baeaed2 100644
--- a/components/package/contents/ui/SingleMailView.qml
+++ b/components/package/contents/ui/SingleMailView.qml
@@ -363,7 +363,7 @@ Item {
 
                         KubeFramework.MailController {
                             id: mailController
-                            mail: model.mail
+                            threadLeader: model.mail
                         }
 
                         text: model.trash ? qsTr("Delete Mail") : qsTr("Move to trash")
diff --git a/framework/domain/mailcontroller.cpp b/framework/domain/mailcontroller.cpp
index a5d7efb7..962b785f 100644
--- a/framework/domain/mailcontroller.cpp
+++ b/framework/domain/mailcontroller.cpp
@@ -20,6 +20,7 @@
 
 #include <sink/store.h>
 #include <sink/log.h>
+#include <sink/standardqueries.h>
 
 SINK_DEBUG_AREA("mailcontroller");
 
@@ -40,9 +41,24 @@ MailController::MailController()
     updateActions();
 }
 
-void MailController::updateActions()
+void MailController::runModification(const std::function<void(ApplicationDomain::Mail &)> &f)
 {
     if (auto mail = getMail()) {
+        f(*mail);
+        run(Store::modify(*mail));
+    } else if (auto mail = getThreadLeader()) {
+        f(*mail);
+        run(Store::modify(Sink::StandardQueries::completeThread(*mail), *mail));
+    }
+}
+
+void MailController::updateActions()
+{
+    auto mail = getMail();
+    if (!mail) {
+        mail= getThreadLeader();
+    }
+    if (mail) {
         action_moveToTrash->setEnabled(!mail->getTrash());
         action_restoreFromTrash->setEnabled(mail->getTrash());
     }
@@ -50,58 +66,58 @@ void MailController::updateActions()
 
 void MailController::markAsRead()
 {
-    auto mail = getMail();
-    mail->setUnread(false);
-    SinkLog() << "Mark as read " << mail->identifier();
-    run(Store::modify(*mail));
+    runModification([] (ApplicationDomain::Mail &mail) {
+        mail.setUnread(false);
+        SinkLog() << "Mark as read " << mail.identifier();
+    });
 }
 
 void MailController::markAsUnread()
 {
-    auto mail = getMail();
-    mail->setUnread(true);
-    SinkLog() << "Mark as unread " << mail->identifier();
-    run(Store::modify(*mail));
+    runModification([] (ApplicationDomain::Mail &mail) {
+        mail.setUnread(true);
+        SinkLog() << "Mark as unread " << mail.identifier();
+    });
 }
 
 void MailController::markAsImportant()
 {
-    auto mail = getMail();
-    mail->setImportant(true);
-    SinkLog() << "Mark as important " << mail->identifier();
-    run(Store::modify(*mail));
+    runModification([] (ApplicationDomain::Mail &mail) {
+        mail.setImportant(true);
+        SinkLog() << "Mark as important " << mail.identifier();
+    });
 }
 
 void MailController::moveToTrash()
 {
-    auto mail = getMail();
-    mail->setTrash(true);
-    SinkLog() << "Move to trash " << mail->identifier();
-    run(Store::modify(*mail));
+    runModification([] (ApplicationDomain::Mail &mail) {
+        mail.setTrash(true);
+        SinkLog() << "Move to trash " << mail.identifier();
+    });
 }
 
 void MailController::restoreFromTrash()
 {
-    auto mail = getMail();
-    mail->setTrash(false);
-    SinkLog() << "Restore from trash " << mail->identifier();
-    run(Store::modify(*mail));
+    runModification([] (ApplicationDomain::Mail &mail) {
+        mail.setTrash(false);
+        SinkLog() << "Restore from trash " << mail.identifier();
+    });
 }
 
 void MailController::remove()
 {
-    auto mail = getMail();
-    mail->setTrash(true);
-    SinkLog() << "Remove " << mail->identifier();
-    run(Store::remove(*mail));
+    runModification([] (ApplicationDomain::Mail &mail) {
+        mail.setTrash(true);
+        SinkLog() << "Remove " << mail.identifier();
+    });
 }
 
 void MailController::moveToFolder()
 {
-    auto mail = getMail();
-    auto targetFolder = getTargetFolder();
-    mail->setFolder(*targetFolder);
-    SinkLog() << "Moving to folder " << mail->identifier() << targetFolder->identifier();
-    run(Store::modify(*mail));
+    runModification([&] (ApplicationDomain::Mail &mail) {
+        auto targetFolder = getTargetFolder();
+        mail.setFolder(*targetFolder);
+        SinkLog() << "Moving to folder " << mail.identifier() << targetFolder->identifier();
+    });
 }
 
diff --git a/framework/domain/mailcontroller.h b/framework/domain/mailcontroller.h
index b4f08aac..ae0f32d5 100644
--- a/framework/domain/mailcontroller.h
+++ b/framework/domain/mailcontroller.h
@@ -26,6 +26,7 @@ class MailController : public Kube::Controller
 {
     Q_OBJECT
     KUBE_CONTROLLER_PROPERTY(Sink::ApplicationDomain::Mail::Ptr, Mail, mail)
+    KUBE_CONTROLLER_PROPERTY(Sink::ApplicationDomain::Mail::Ptr, ThreadLeader, threadLeader)
     KUBE_CONTROLLER_PROPERTY(Sink::ApplicationDomain::Folder::Ptr, TargetFolder, targetFolder)
     KUBE_CONTROLLER_ACTION(markAsRead)
     KUBE_CONTROLLER_ACTION(markAsUnread)
@@ -39,4 +40,5 @@ public:
     explicit MailController();
 private slots:
     void updateActions();
+    void runModification(const std::function<void(Sink::ApplicationDomain::Mail &)> &f);
 };