2 files changed, 16 insertions, 7 deletions

diff --git a/framework/domain/composercontroller.cpp b/framework/domain/composercontroller.cpp
index a4a8857f..9fb2c6f8 100644
--- a/framework/domain/composercontroller.cpp
+++ b/framework/domain/composercontroller.cpp
@@ -221,17 +221,22 @@ void ComposerController::send()
         .then<void, QList<ApplicationDomain::SinkResource::Ptr>>([=](const QList<ApplicationDomain::SinkResource::Ptr> &resources) -> KAsync::Job<void> {
             if (!resources.isEmpty()) {
                 auto resourceId = resources[0]->identifier();
-                SinkTrace() << "Sending message via resource: " << resourceId;
+                SinkLog() << "Sending message via resource: " << resourceId;
                 Mail mail(resourceId);
-                mail.setBlobProperty("mimeMessage", message->encodedContent());
-                return Store::create(mail);
+                mail.setMimeMessage(message->encodedContent());
+                return Store::create(mail)
+                    .then<void>([=] {
+                        //Trigger a sync, but don't wait for it.
+                        Store::synchronize(Sink::SyncScope{}.resourceFilter(resourceId)).exec();
+                        return KAsync::null<void>();
+                    });
             }
             return KAsync::error<void>(0, "Failed to find a MailTransport resource.");
+        })
+        .syncThen<void>([&] (const KAsync::Error &error) {
+            emit done();
         });
     run(job);
-    job = job.syncThen<void>([&] {
-        emit done();
-    });
 }
 
 void ComposerController::updateSaveAsDraftAction()
@@ -268,7 +273,7 @@ void ComposerController::saveAsDraft()
                     return Store::create(mail);
                 });
         } else {
-            SinkWarning() << "Modifying an existing mail" << existingMail.identifier();
+            SinkLog() << "Modifying an existing mail" << existingMail.identifier();
             existingMail.setDraft(true);
             existingMail.setMimeMessage(message->encodedContent());
             return Store::modify(existingMail);
diff --git a/framework/domain/controller.cpp b/framework/domain/controller.cpp
index fb971136..52f4cd1f 100644
--- a/framework/domain/controller.cpp
+++ b/framework/domain/controller.cpp
@@ -20,6 +20,7 @@
 
 #include <QQmlEngine>
 #include <QMetaProperty>
+#include <sink/log.h>
 
 using namespace Kube;
 
@@ -49,6 +50,9 @@ void Controller::clear()
 void Controller::run(const KAsync::Job<void> &job)
 {
     auto jobToExec = job;
+    jobToExec.onError([] (const KAsync::Error &error) {
+        SinkWarningCtx(Sink::Log::Context{"controller"}) << "Error while executing job: " << error.errorMessage;
+    });
     //TODO handle error
     //TODO attach a log context to the execution that we can gather from the job?
     jobToExec.exec();