2 files changed, 26 insertions, 1 deletions

diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
index 0a517e03..464322cf 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -20,6 +20,7 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 1.3
+import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.0 as Dialogs
 
@@ -45,6 +46,12 @@ Kube.View {
 
     Component.onCompleted: loadMessage(root.message, root.loadAsDraft)
 
+    Controls2.StackView.onActivated: {
+        Kube.Fabric.postMessage(Kube.Messages.synchronize, {"type": "mail", "specialPurpose": "drafts"})
+        //For autocompletion
+        Kube.Fabric.postMessage(Kube.Messages.synchronize, {"type": "contacts"})
+    }
+
     function loadMessage(message, loadAsDraft) {
         if (message) {
             composerController.loadMessage(message, loadAsDraft)
diff --git a/framework/src/sinkfabric.cpp b/framework/src/sinkfabric.cpp
index 766380af..79afd33b 100644
--- a/framework/src/sinkfabric.cpp
+++ b/framework/src/sinkfabric.cpp
@@ -45,6 +45,24 @@ public:
                 auto scope = SyncScope().resourceFilter(folder->resourceInstanceIdentifier()).filter<Mail::Folder>(QVariant::fromValue(folder->identifier()));
                 scope.setType<ApplicationDomain::Mail>();
                 Store::synchronize(scope).exec();
+            } else if (message.contains("specialPurpose")) {
+                auto specialPurpose = message["specialPurpose"].value<QString>();
+                //Synchronize all drafts folders
+                if (specialPurpose == "drafts") {
+                    //TODO or rather just synchronize draft mails and have resource figure out what that means?
+                    Sink::Query folderQuery{};
+                    folderQuery.containsFilter<Sink::ApplicationDomain::Folder::SpecialPurpose>(Sink::ApplicationDomain::SpecialPurpose::Mail::drafts);
+                    folderQuery.request<Sink::ApplicationDomain::Folder::SpecialPurpose>();
+                    folderQuery.request<Sink::ApplicationDomain::Folder::Name>();
+                    Store::fetch<Sink::ApplicationDomain::Folder>(folderQuery)
+                        .then([] (const QList<Sink::ApplicationDomain::Folder::Ptr> &folders) {
+                            for (const auto f : folders) {
+                                auto scope = SyncScope().resourceFilter(f->resourceInstanceIdentifier()).filter<Mail::Folder>(QVariant::fromValue(f->identifier()));
+                                scope.setType<ApplicationDomain::Mail>();
+                                Store::synchronize(scope).exec();
+                            }
+                        }).exec();
+                }
             } else {
                 auto accountId = message["accountId"].value<QString>();
                 auto type = message["type"].value<QString>();
@@ -63,7 +81,7 @@ public:
                     //Only synchronize folders by default for now
                     scope.setType<ApplicationDomain::Folder>();
                 }
-                SinkLog() << "Synchronizing all. AccountId: " << accountId << " Type: " << scope.type();
+                SinkLog() << "Synchronizing... AccountId: " << accountId << " Type: " << scope.type();
                 Store::synchronize(scope).exec();
             }
         }