31 files changed, 345 insertions, 969 deletions
diff --git a/examples/davresource/CMakeLists.txt b/examples/davresource/CMakeLists.txt
index c7899eb..28829d5 100644
--- a/examples/davresource/CMakeLists.txt
+++ b/examples/davresource/CMakeLists.txt
@@ -3,16 +3,10 @@ project(sink_resource_dav)
 add_definitions(-DQT_PLUGIN)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-find_package(KF5 COMPONENTS REQUIRED Mime)
 find_package(KPimKDAV REQUIRED)
-add_library(${PROJECT_NAME} SHARED facade.cpp davresource.cpp domainadaptor.cpp)
+add_library(${PROJECT_NAME} SHARED davresource.cpp)
 qt5_use_modules(${PROJECT_NAME} Core Network)
 target_link_libraries(${PROJECT_NAME} sink KPim::KDAV)
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
-#add_definitions(-DTESTDATAPATH="${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
-#add_subdirectory(libmaildir)
-#add_subdirectory(tests)
diff --git a/examples/davresource/davresource.cpp b/examples/davresource/davresource.cpp
index de4c0b0..50471ed 100644
--- a/examples/davresource/davresource.cpp
+++ b/examples/davresource/davresource.cpp
@@ -21,10 +21,8 @@
 #include "facade.h"
 #include "resourceconfig.h"
-#include "index.h"
 #include "log.h"
 #include "definitions.h"
-#include "inspection.h"
 #include "synchronizer.h"
 #include "inspector.h"
@@ -40,181 +38,14 @@
 #include <KDAV/DavItemFetchJob>
 #include <KDAV/EtagCache>
-#include <QDir>
-#include <QDirIterator>
 //This is the resources entity type, and not the domain type
 #define ENTITY_TYPE_CONTACT "contact"
-#define ENTITY_TYPE_ADDRESSBOOK "folder"
+#define ENTITY_TYPE_ADDRESSBOOK "addressbook"
 SINK_DEBUG_AREA("davresource")
 using namespace Sink;
-/*static QString getFilePathFromMimeMessagePath(const QString &mimeMessagePath)
-{
-    auto parts = mimeMessagePath.split('/');
-    const auto key = parts.takeLast();
-    const auto path = parts.join("/") + "/cur/";
-    QDir dir(path);
-    const QFileInfoList list = dir.entryInfoList(QStringList() << (key+"*"), QDir::Files);
-    if (list.size() != 1) {
-        SinkWarning() << "Failed to find message " << mimeMessagePath;
-        SinkWarning() << "Failed to find message " << path;
-        return QString();
-    }
-    return list.first().filePath();
-}
-class MaildirMailPropertyExtractor : public MailPropertyExtractor
-{
-protected:
-    virtual QString getFilePathFromMimeMessagePath(const QString &mimeMessagePath) const Q_DECL_OVERRIDE
-    {
-        return ::getFilePathFromMimeMessagePath(mimeMessagePath);
-    }
-};
-class MaildirMimeMessageMover : public Sink::Preprocessor
-{
-public:
-    MaildirMimeMessageMover(const QByteArray &resourceInstanceIdentifier, const QString &maildirPath) : mResourceInstanceIdentifier(resourceInstanceIdentifier), mMaildirPath(maildirPath) {}
-    QString getPath(const QByteArray &folderIdentifier)
-    {
-        if (folderIdentifier.isEmpty()) {
-            return mMaildirPath;
-        }
-        QString folderPath;
-        const auto folder = entityStore().readLatest<ApplicationDomain::Folder>(folderIdentifier);
-        if (mMaildirPath.endsWith(folder.getName())) {
-            folderPath = mMaildirPath;
-        } else {
-            auto folderName = folder.getName();
-            //FIXME handle non toplevel folders
-            folderPath = mMaildirPath + "/" + folderName;
-        }
-        return folderPath;
-    }
-    QString moveMessage(const QString &oldPath, const QByteArray &folder)
-    {
-        if (oldPath.startsWith(Sink::temporaryFileLocation())) {
-            const auto path = getPath(folder);
-            KPIM::Contactdir maildir(path, false);
-            if (!maildir.isValid(true)) {
-                SinkWarning() << "Maildir is not existing: " << path;
-            }
-            auto identifier = maildir.addEntryFromPath(oldPath);
-            return path + "/" + identifier;
-        } else {
-            //Handle moves
-            const auto path = getPath(folder);
-            KPIM::Contactdir maildir(path, false);
-            if (!maildir.isValid(true)) {
-                SinkWarning() << "Maildir is not existing: " << path;
-            }
-            auto oldIdentifier = KPIM::Contactdir::getKeyFromFile(oldPath);
-            auto pathParts = oldPath.split('/');
-            pathParts.takeLast();
-            auto oldDirectory = pathParts.join('/');
-            if (oldDirectory == path) {
-                return oldPath;
-            }
-            KPIM::Contactdir oldMaildir(oldDirectory, false);
-            if (!oldMaildir.isValid(false)) {
-                SinkWarning() << "Maildir is not existing: " << path;
-            }
-            auto identifier = oldMaildir.moveEntryTo(oldIdentifier, maildir);
-            return path + "/" + identifier;
-        }
-    }
-    void newEntity(Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
-    {
-        auto mail = newEntity.cast<ApplicationDomain::Contact>();
-        const auto mimeMessage = mail.getMimeMessagePath();
-        if (!mimeMessage.isNull()) {
-            const auto path = moveMessage(mimeMessage, mail.getFolder());
-            auto blob = ApplicationDomain::BLOB{path};
-            blob.isExternal = false;
-            mail.setProperty(ApplicationDomain::Contact::MimeMessage::name, QVariant::fromValue(blob));
-        }
-    }
-    void modifiedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity, Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
-    {
-        auto newMail = newEntity.cast<ApplicationDomain::Contact>();
-        const ApplicationDomain::Contact oldMail{oldEntity};
-        const auto mimeMessage = newMail.getMimeMessagePath();
-        const auto newFolder = newMail.getFolder();
-        const bool mimeMessageChanged = !mimeMessage.isNull() && mimeMessage != oldMail.getMimeMessagePath();
-        const bool folderChanged = !newFolder.isNull() && newFolder != oldMail.getFolder();
-        if (mimeMessageChanged || folderChanged) {
-            SinkTrace() << "Moving mime message: " << mimeMessageChanged << folderChanged;
-            auto newPath = moveMessage(mimeMessage, newMail.getFolder());
-            if (newPath != oldMail.getMimeMessagePath()) {
-                const auto oldPath = getFilePathFromMimeMessagePath(oldMail.getMimeMessagePath());
-                auto blob = ApplicationDomain::BLOB{newPath};
-                blob.isExternal = false;
-                newMail.setProperty(ApplicationDomain::Contact::MimeMessage::name, QVariant::fromValue(blob));
-                //Remove the olde mime message if there is a new one
-                QFile::remove(oldPath);
-            }
-        }
-        auto mimeMessagePath = newMail.getMimeMessagePath();
-        const auto maildirPath = getPath(newMail.getFolder());
-        KPIM::Contactdir maildir(maildirPath, false);
-        const auto file = getFilePathFromMimeMessagePath(mimeMessagePath);
-        QString identifier = KPIM::Contactdir::getKeyFromFile(file);
-        //get flags from
-        KPIM::Contactdir::Flags flags;
-        if (!newMail.getUnread()) {
-            flags |= KPIM::Contactdir::Seen;
-        }
-        if (newMail.getImportant()) {
-            flags |= KPIM::Contactdir::Flagged;
-        }
-        maildir.changeEntryFlags(identifier, flags);
-    }
-    void deletedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity) Q_DECL_OVERRIDE
-    {
-        const ApplicationDomain::Contact oldMail{oldEntity};
-        const auto filePath = getFilePathFromMimeMessagePath(oldMail.getMimeMessagePath());
-        QFile::remove(filePath);
-    }
-    QByteArray mResourceInstanceIdentifier;
-    QString mMaildirPath;
-};
-class FolderPreprocessor : public Sink::Preprocessor
-{
-public:
-    FolderPreprocessor(const QString maildirPath) : mMaildirPath(maildirPath) {}
-    void newEntity(Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
-    {
-        auto folderName = Sink::ApplicationDomain::Folder{newEntity}.getName();
-        const auto path = mMaildirPath + "/" + folderName;
-        KPIM::Contactdir maildir(path, false);
-        maildir.create();
-    }
-    void modifiedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity, Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
-    {
-    }
-    void deletedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity) Q_DECL_OVERRIDE
-    {
-    }
-    QString mMaildirPath;
-};*/
 static KAsync::Job<void> runJob(KJob *job)
 {
    return KAsync::start<void>([job](KAsync::Future<void> &future) {
@@ -240,33 +71,33 @@ public:
    }
-        QByteArray createAddressbook(const QString &folderName, const QString &folderPath, const QString &parentFolderRid, const QByteArray &icon)
+    QByteArray createAddressbook(const QString &addressbookName, const QString &addressbookPath, const QString &parentAddressbookRid)
    {
-        SinkTrace() << "Creating addressbook: " << folderName << parentFolderRid;
+        SinkTrace() << "Creating addressbook: " << addressbookName << parentAddressbookRid;
-        const auto remoteId = folderPath.toUtf8();
+        const auto remoteId = addressbookPath.toUtf8();
        const auto bufferType = ENTITY_TYPE_ADDRESSBOOK;
-        Sink::ApplicationDomain::Folder folder;
+        Sink::ApplicationDomain::Addressbook addressbook;
-        folder.setName(folderName);
+        addressbook.setName(addressbookName);
-        folder.setIcon(icon);
        QHash<QByteArray, Query::Comparator> mergeCriteria;
-        if (!parentFolderRid.isEmpty()) {
+        if (!parentAddressbookRid.isEmpty()) {
-            folder.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, parentFolderRid.toUtf8()));
+            addressbook.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, parentAddressbookRid.toUtf8()));
        }
-        createOrModify(bufferType, remoteId, folder, mergeCriteria);
+        createOrModify(bufferType, remoteId, addressbook, mergeCriteria);
        return remoteId;
    }
-    void synchronizeAddressbooks(const KDAV::DavCollection::List &folderList)
+    void synchronizeAddressbooks(const KDAV::DavCollection::List &addressbookList)
    {
        const QByteArray bufferType = ENTITY_TYPE_ADDRESSBOOK;
-        SinkTrace() << "Found addressbooks " << folderList.size();
+        SinkTrace() << "Found addressbooks " << addressbookList.size();
        QVector<QByteArray> ridList;
-        for(const auto &f : folderList) {
+        for(const auto &f : addressbookList) {
-            const auto &rid = f.url().toDisplayString();
+            const auto &rid = getRid(f);
-            ridList.append(rid.toUtf8());
+            SinkTrace() << "Found addressbook:" << rid;
-            createAddressbook(f.displayName(), rid, "", "addressbook");
+            ridList.append(rid);
+            createAddressbook(f.displayName(), rid, "");
        }
        scanForRemovals(bufferType,
@@ -284,54 +115,73 @@ public:
            list << Synchronizer::SyncRequest{query};
        } else {
            //We want to synchronize everything
+            list << Synchronizer::SyncRequest{Sink::QueryBase(ApplicationDomain::getTypeName<ApplicationDomain::Addressbook>())};
            list << Synchronizer::SyncRequest{Sink::QueryBase(ApplicationDomain::getTypeName<ApplicationDomain::Contact>())};
        }
        return list;
    }
+    static QByteArray getRid(const KDAV::DavItem &item)
+    {
+        return item.url().toDisplayString().toUtf8();
+    }
+    static QByteArray getRid(const KDAV::DavCollection &item)
+    {
+        return item.url().toDisplayString().toUtf8();
+    }
    KAsync::Job<void> synchronizeWithSource(const Sink::QueryBase &query) Q_DECL_OVERRIDE
    {
-        if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) {
+        if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Addressbook>()) {
+            SinkLogCtx(mLogCtx) << "Synchronizing addressbooks:" <<  mResourceUrl.url();
            auto collectionsFetchJob = new KDAV::DavCollectionsFetchJob(mResourceUrl);
-            auto job = runJob(collectionsFetchJob).then<void>([this, collectionsFetchJob] {
+            auto job = runJob(collectionsFetchJob).then([this, collectionsFetchJob] (const KAsync::Error &error) {
-                synchronizeAddressbooks(collectionsFetchJob ->collections());
+                if (error) {
+                    SinkWarningCtx(mLogCtx) << "Failed to synchronize addressbooks." << collectionsFetchJob->errorString();
+                } else {
+                    synchronizeAddressbooks(collectionsFetchJob ->collections());
+                }
            });
            return job;
        } else if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Contact>()) {
+            SinkLogCtx(mLogCtx) << "Synchronizing contacts.";
            auto ridList = QSharedPointer<QByteArrayList>::create();
            auto collectionsFetchJob = new KDAV::DavCollectionsFetchJob(mResourceUrl);
-            auto job = runJob(collectionsFetchJob).then<KDAV::DavCollection::List>([this, collectionsFetchJob] {
+            auto job = runJob(collectionsFetchJob).then([this, collectionsFetchJob] {
                synchronizeAddressbooks(collectionsFetchJob ->collections());
                return collectionsFetchJob->collections();
            })
-            .serialEach<void>([this, ridList](const KDAV::DavCollection &collection) {
+            .serialEach([this, ridList](const KDAV::DavCollection &collection) {
-                auto collId = collection.url().toDisplayString().toLatin1();
+                auto collId = getRid(collection);
+                const auto addressbookLocalId = syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, collId);
                auto ctag = collection.CTag().toLatin1();
                if (ctag != syncStore().readValue(collId + "_ctagXX")) {
-                    SinkTrace() << "Syncing " << collId;
+                    SinkTraceCtx(mLogCtx) << "Syncing " << collId;
                    auto cache = std::shared_ptr<KDAV::EtagCache>(new KDAV::EtagCache());
                    auto davItemsListJob = new KDAV::DavItemsListJob(collection.url(), cache);
                    const QByteArray bufferType = ENTITY_TYPE_CONTACT;
                    QHash<QByteArray, Query::Comparator> mergeCriteria;
-                    auto colljob = runJob(davItemsListJob).then<KDAV::DavItem::List>([davItemsListJob] {
+                    auto colljob = runJob(davItemsListJob).then([davItemsListJob] {
                        return KAsync::value(davItemsListJob->items());
                    })
-                    .serialEach<QByteArray>([this, ridList, bufferType, mergeCriteria] (const KDAV::DavItem &item) {
+                    .serialEach([=] (const KDAV::DavItem &item) {
-                        QByteArray rid = item.url().toDisplayString().toUtf8();
+                        QByteArray rid = getRid(item);
                        if (item.etag().toLatin1() != syncStore().readValue(rid + "_etag")){
                            SinkTrace() << "Updating " << rid;
                            auto davItemFetchJob = new KDAV::DavItemFetchJob(item);
                            auto itemjob = runJob(davItemFetchJob)
-                            .then<KDAV::DavItem>([this, davItemFetchJob, bufferType, mergeCriteria] {
+                            .then([=] {
                                const auto item = davItemFetchJob->item();
-                                const auto rid = item.url().toDisplayString().toUtf8();
+                                const auto rid = getRid(item);
                                Sink::ApplicationDomain::Contact contact;
                                contact.setVcard(item.data());
+                                contact.setAddressbook(addressbookLocalId);
                                createOrModify(bufferType, rid, contact, mergeCriteria);
                                return item;
                            })
-                            .then<QByteArray>([this, ridList] (const KDAV::DavItem &item) {
+                            .then([this, ridList] (const KDAV::DavItem &item) {
-                                const auto rid = item.url().toDisplayString().toUtf8();
+                                const auto rid = getRid(item);
                                syncStore().writeValue(rid + "_etag", item.etag().toLatin1());
                                ridList->append(rid);
                                return rid;
@@ -342,11 +192,12 @@ public:
                            return KAsync::value(rid);
                        }
                    })
-                    .then<void>([this, collId, ctag] () {
+                    .then([this, collId, ctag] () {
                        syncStore().writeValue(collId + "_ctag", ctag);
                    });
                    return colljob;
                } else {
+                    SinkTraceCtx(mLogCtx) << "Collection unchanged: " << ctag;
                    // for(const auto &item : addressbook) {
                    //      ridList->append(rid);
                    // }
@@ -367,43 +218,11 @@ public:
 KAsync::Job<QByteArray> replay(const ApplicationDomain::Contact &contact, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
    {
-        /*
-        if (operation == Sink::Operation_Creation) {
-            const auto remoteId = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-            SinkTrace() << "Contact created: " << remoteId;
-            return KAsync::value(remoteId.toUtf8());
-        } else if (operation == Sink::Operation_Removal) {
-            SinkTrace() << "Removing a contact " << oldRemoteId;
-            return KAsync::null<QByteArray>();
-        } else if (operation == Sink::Operation_Modification) {
-            SinkTrace() << "Modifying a contact: " << oldRemoteId;
-            const auto remoteId = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-            return KAsync::value(remoteId.toUtf8());
-        }*/
        return KAsync::null<QByteArray>();
    }
-    KAsync::Job<QByteArray> replay(const ApplicationDomain::Folder &folder, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
+    KAsync::Job<QByteArray> replay(const ApplicationDomain::Addressbook &addressbook, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
    {
-        /*
-        if (operation == Sink::Operation_Creation) {
-            auto folderName = folder.getName();
-            //FIXME handle non toplevel folders
-            auto path = mMaildirPath + "/" + folderName;
-            SinkTrace() << "Creating a new folder: " << path;
-            KPIM::Contactdir maildir(path, false);
-            maildir.create();
-            return KAsync::value(path.toUtf8());
-        } else if (operation == Sink::Operation_Removal) {
-            const auto path = oldRemoteId;
-            SinkTrace() << "Removing a folder: " << path;
-            KPIM::Contactdir maildir(path, false);
-            maildir.remove();
-            return KAsync::null<QByteArray>();
-        } else if (operation == Sink::Operation_Modification) {
-            SinkWarning() << "Folder modifications are not implemented";
-            return KAsync::value(oldRemoteId);
-        }*/
        return KAsync::null<QByteArray>();
    }
@@ -411,109 +230,17 @@ public:
    KDAV::DavUrl mResourceUrl;
 };
-/*
-class MaildirInspector : public Sink::Inspector {
-public:
-    MaildirInspector(const Sink::ResourceContext &resourceContext)
-        : Sink::Inspector(resourceContext)
-    {
-    }
-protected:
-    KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE {
-        auto synchronizationStore = QSharedPointer<Sink::Storage::DataStore>::create(Sink::storageLocation(), mResourceContext.instanceId() + ".synchronization", Sink::Storage::DataStore::ReadOnly);
-        auto synchronizationTransaction = synchronizationStore->createTransaction(Sink::Storage::DataStore::ReadOnly);
-        auto mainStore = QSharedPointer<Sink::Storage::DataStore>::create(Sink::storageLocation(), mResourceContext.instanceId(), Sink::Storage::DataStore::ReadOnly);
-        auto transaction = mainStore->createTransaction(Sink::Storage::DataStore::ReadOnly);
-        Sink::Storage::EntityStore entityStore(mResourceContext, {"maildirresource"});
-        auto syncStore = QSharedPointer<SynchronizerStore>::create(synchronizationTransaction);
-        SinkTrace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
-        if (domainType == ENTITY_TYPE_MAIL) {
-            auto mail = entityStore.readLatest<Sink::ApplicationDomain::Contact>(entityId);
-            const auto filePath = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-            if (inspectionType == Sink::ResourceControl::Inspection::PropertyInspectionType) {
-                if (property == "unread") {
-                    const auto flags = KPIM::Contactdir::readEntryFlags(filePath.split('/').last());
-                    if (expectedValue.toBool() && (flags & KPIM::Contactdir::Seen)) {
-                        return KAsync::error<void>(1, "Expected unread but couldn't find it.");
-                    }
-                    if (!expectedValue.toBool() && !(flags & KPIM::Contactdir::Seen)) {
-                        return KAsync::error<void>(1, "Expected read but couldn't find it.");
-                    }
-                    return KAsync::null<void>();
-                }
-                if (property == "subject") {
-                    KMime::Message *msg = new KMime::Message;
-                    msg->setHead(KMime::CRLFtoLF(KPIM::Contactdir::readEntryHeadersFromFile(filePath)));
-                    msg->parse();
-                    if (msg->subject(true)->asUnicodeString() != expectedValue.toString()) {
-                        return KAsync::error<void>(1, "Subject not as expected: " + msg->subject(true)->asUnicodeString());
-                    }
-                    return KAsync::null<void>();
-                }
-            }
-            if (inspectionType == Sink::ResourceControl::Inspection::ExistenceInspectionType) {
-                if (QFileInfo(filePath).exists() != expectedValue.toBool()) {
-                    return KAsync::error<void>(1, "Wrong file existence: " + filePath);
-                }
-            }
-        }
-        if (domainType == ENTITY_TYPE_FOLDER) {
-            const auto remoteId = syncStore->resolveLocalId(ENTITY_TYPE_FOLDER, entityId);
-            auto folder = entityStore.readLatest<Sink::ApplicationDomain::Folder>(entityId);
-            if (inspectionType == Sink::ResourceControl::Inspection::CacheIntegrityInspectionType) {
-                SinkTrace() << "Inspecting cache integrity" << remoteId;
-                if (!QDir(remoteId).exists()) {
-                    return KAsync::error<void>(1, "The directory is not existing: " + remoteId);
-                }
-                int expectedCount = 0;
-                Index index("mail.index.folder", transaction);
-                index.lookup(entityId, [&](const QByteArray &sinkId) {
-                        expectedCount++;
-                },
-                [&](const Index::Error &error) {
-                    SinkWarning() << "Error in index: " <<  error.message << property;
-                });
-                QDir dir(remoteId + "/cur");
-                const QFileInfoList list = dir.entryInfoList(QDir::Files);
-                if (list.size() != expectedCount) {
-                    for (const auto &fileInfo : list) {
-                        SinkWarning() << "Found in cache: " << fileInfo.fileName();
-                    }
-                    return KAsync::error<void>(1, QString("Wrong number of files; found %1 instead of %2.").arg(list.size()).arg(expectedCount));
-                }
-            }
-            if (inspectionType == Sink::ResourceControl::Inspection::ExistenceInspectionType) {
-                if (!remoteId.endsWith(folder.getName().toUtf8())) {
-                    return KAsync::error<void>(1, "Wrong folder name: " + remoteId);
-                }
-                //TODO we shouldn't use the remoteId here to figure out the path, it could be gone/changed already
-                if (QDir(remoteId).exists() != expectedValue.toBool()) {
-                    return KAsync::error<void>(1, "Wrong folder existence: " + remoteId);
-                }
-            }
-        }
-        return KAsync::null<void>();
-    }
-};*/
 DavResource::DavResource(const Sink::ResourceContext &resourceContext)
    : Sink::GenericResource(resourceContext)
 {
+    /*
+     * Fork KIO slaves (used in kdav), instead of starting them via klauncher.
+     * Otherwise we have yet another runtime dependency that will i.e. not work in the docker container.
+     */
+    qputenv("KDE_FORK_SLAVES", "TRUE");
    auto config = ResourceConfig::getConfiguration(resourceContext.instanceId());
-    auto resourceUrl = QUrl::fromUserInput(config.value("resourceUrl").toString());
+    auto resourceUrl = QUrl::fromUserInput(config.value("server").toString());
    resourceUrl.setUserName(config.value("username").toString());
    resourceUrl.setPassword(config.value("password").toString());
@@ -522,7 +249,6 @@ DavResource::DavResource(const Sink::ResourceContext &resourceContext)
    auto synchronizer = QSharedPointer<ContactSynchronizer>::create(resourceContext);
    synchronizer->mResourceUrl = mResourceUrl;
    setupSynchronizer(synchronizer);
-    //setupInspector(QSharedPointer<MaildirInspector>::create(resourceContext));
    setupPreprocessors(ENTITY_TYPE_CONTACT, QVector<Sink::Preprocessor*>() << new ContactPropertyExtractor);
 }
@@ -530,7 +256,9 @@ DavResource::DavResource(const Sink::ResourceContext &resourceContext)
 DavResourceFactory::DavResourceFactory(QObject *parent)
    : Sink::ResourceFactory(parent,
-            {"-folder.rename"}
+            {Sink::ApplicationDomain::ResourceCapabilities::Contact::contact,
+            Sink::ApplicationDomain::ResourceCapabilities::Contact::addressbook,
+            }
            )
 {
 }
@@ -542,14 +270,14 @@ Sink::Resource *DavResourceFactory::createResource(const ResourceContext &contex
 void DavResourceFactory::registerFacades(const QByteArray &name, Sink::FacadeFactory &factory)
 {
-    factory.registerFacade<Sink::ApplicationDomain::Contact, DavResourceContactFacade>(name);
+    factory.registerFacade<ApplicationDomain::Contact, DefaultFacade<ApplicationDomain::Contact>>(name);
-    factory.registerFacade<Sink::ApplicationDomain::Folder, DavResourceFolderFacade>(name);
+    factory.registerFacade<ApplicationDomain::Addressbook, DefaultFacade<ApplicationDomain::Contact>>(name);
 }
 void DavResourceFactory::registerAdaptorFactories(const QByteArray &name, Sink::AdaptorFactoryRegistry &registry)
 {
-    registry.registerFactory<Sink::ApplicationDomain::Contact, ContactAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Contact, DefaultAdaptorFactory<ApplicationDomain::Contact>>(name);
-    registry.registerFactory<Sink::ApplicationDomain::Folder, AddressbookAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Addressbook, DefaultAdaptorFactory<ApplicationDomain::Addressbook>>(name);
 }
 void DavResourceFactory::removeDataFromDisk(const QByteArray &instanceIdentifier)
diff --git a/examples/davresource/davresource.h b/examples/davresource/davresource.h
index 415527a..1ce66ea 100644
--- a/examples/davresource/davresource.h
+++ b/examples/davresource/davresource.h
@@ -54,7 +54,7 @@ private:
 class DavResourceFactory : public Sink::ResourceFactory
 {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "sink.davresource")
+    Q_PLUGIN_METADATA(IID "sink.dav")
    Q_INTERFACES(Sink::ResourceFactory)
 public:
diff --git a/examples/davresource/domainadaptor.cpp b/examples/davresource/domainadaptor.cpp
deleted file mode 100644
index 861a10e..0000000
--- a/examples/davresource/domainadaptor.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *   Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#include "domainadaptor.h"
-using namespace flatbuffers;
-ContactAdaptorFactory::ContactAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
-AddressbookAdaptorFactory::AddressbookAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
diff --git a/examples/davresource/domainadaptor.h b/examples/davresource/domainadaptor.h
deleted file mode 100644
index 7e3c723..0000000
--- a/examples/davresource/domainadaptor.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#pragma once
-#include <common/domainadaptor.h>
-#include "contact_generated.h"
-#include "folder_generated.h"
-#include "dummy_generated.h"
-class ContactAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Contact, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    ContactAdaptorFactory();
-    virtual ~ContactAdaptorFactory() {};
-};
-class AddressbookAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    AddressbookAdaptorFactory();
-    virtual ~AddressbookAdaptorFactory() {};
-};
diff --git a/examples/davresource/facade.cpp b/examples/davresource/facade.cpp
deleted file mode 100644
index b56815a..0000000
--- a/examples/davresource/facade.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#include "facade.h"
-#include <QDir>
-#include <QFileInfo>
-#include "query.h"
-DavResourceContactFacade::DavResourceContactFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Contact>(context)
-{
-}
-DavResourceContactFacade::~DavResourceContactFacade()
-{
-}
-DavResourceFolderFacade::DavResourceFolderFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(context)
-{
-}
-DavResourceFolderFacade::~DavResourceFolderFacade()
-{
-}
diff --git a/examples/davresource/facade.h b/examples/davresource/facade.h
deleted file mode 100644
index 02bd5dc..0000000
--- a/examples/davresource/facade.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#pragma once
-#include "common/facade.h"
-class DavResourceContactFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Contact>
-{
-public:
-    DavResourceContactFacade(const Sink::ResourceContext &context);
-    virtual ~DavResourceContactFacade();
-};
-class DavResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
-{
-public:
-    DavResourceFolderFacade(const Sink::ResourceContext &context);
-    virtual ~DavResourceFolderFacade();
-};
diff --git a/examples/dummyresource/CMakeLists.txt b/examples/dummyresource/CMakeLists.txt
index 6400f0c..2bbaa47 100644
--- a/examples/dummyresource/CMakeLists.txt
+++ b/examples/dummyresource/CMakeLists.txt
@@ -4,7 +4,7 @@ add_definitions(-DQT_PLUGIN)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-add_library(${PROJECT_NAME} SHARED facade.cpp resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
+add_library(${PROJECT_NAME} SHARED resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
 generate_flatbuffers(${PROJECT_NAME} dummycalendar)
 qt5_use_modules(${PROJECT_NAME} Core Network)
 target_link_libraries(${PROJECT_NAME} sink)
diff --git a/examples/dummyresource/facade.cpp b/examples/dummyresource/facade.cpp
deleted file mode 100644
index 4343eba..0000000
--- a/examples/dummyresource/facade.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#include "facade.h"
-#include "domainadaptor.h"
-DummyResourceFacade::DummyResourceFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Event>(context)
-{
-}
-DummyResourceFacade::~DummyResourceFacade()
-{
-}
-DummyResourceMailFacade::DummyResourceMailFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Mail>(context)
-{
-}
-DummyResourceMailFacade::~DummyResourceMailFacade()
-{
-}
-DummyResourceFolderFacade::DummyResourceFolderFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(context)
-{
-}
-DummyResourceFolderFacade::~DummyResourceFolderFacade()
-{
-}
diff --git a/examples/dummyresource/facade.h b/examples/dummyresource/facade.h
deleted file mode 100644
index 1bb45fd..0000000
--- a/examples/dummyresource/facade.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#pragma once
-#include "common/facade.h"
-#include "common/domain/event.h"
-class DummyResourceFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Event>
-{
-public:
-    DummyResourceFacade(const Sink::ResourceContext &context);
-    virtual ~DummyResourceFacade();
-};
-class DummyResourceMailFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Mail>
-{
-public:
-    DummyResourceMailFacade(const Sink::ResourceContext &context);
-    virtual ~DummyResourceMailFacade();
-};
-class DummyResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
-{
-public:
-    DummyResourceFolderFacade(const Sink::ResourceContext &context);
-    virtual ~DummyResourceFolderFacade();
-};
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index e915710..c1f536e 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -26,8 +26,6 @@
 #include "mail_generated.h"
 #include "domainadaptor.h"
 #include "log.h"
-#include "domain/event.h"
-#include "domain/mail.h"
 #include "dummystore.h"
 #include "definitions.h"
 #include "facadefactory.h"
@@ -46,6 +44,8 @@
 SINK_DEBUG_AREA("dummyresource")
+using namespace Sink;
 class DummySynchronizer : public Sink::Synchronizer {
    public:
@@ -69,6 +69,7 @@ class DummySynchronizer : public Sink::Synchronizer {
    Sink::ApplicationDomain::Mail::Ptr createMail(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data)
    {
        auto mail = Sink::ApplicationDomain::Mail::Ptr::create();
+        mail->setExtractedMessageId(ridBuffer);
        mail->setExtractedSubject(data.value("subject").toString());
        mail->setExtractedSender(Sink::ApplicationDomain::Mail::Contact{data.value("senderName").toString(), data.value("senderEmail").toString()});
        mail->setExtractedDate(data.value("date").toDateTime());
@@ -163,7 +164,7 @@ DummyResource::DummyResource(const Sink::ResourceContext &resourceContext, const
    setupSynchronizer(QSharedPointer<DummySynchronizer>::create(resourceContext));
    setupInspector(QSharedPointer<DummyInspector>::create(resourceContext));
    setupPreprocessors(ENTITY_TYPE_MAIL,
-            QVector<Sink::Preprocessor*>() << new MailPropertyExtractor << new SpecialPurposeProcessor{resourceContext.resourceType, resourceContext.instanceId()});
+            QVector<Sink::Preprocessor*>() << new MailPropertyExtractor << new SpecialPurposeProcessor);
    setupPreprocessors(ENTITY_TYPE_FOLDER,
            QVector<Sink::Preprocessor*>());
    setupPreprocessors(ENTITY_TYPE_EVENT,
@@ -194,9 +195,9 @@ Sink::Resource *DummyResourceFactory::createResource(const Sink::ResourceContext
 void DummyResourceFactory::registerFacades(const QByteArray &resourceName, Sink::FacadeFactory &factory)
 {
-    factory.registerFacade<Sink::ApplicationDomain::Event, DummyResourceFacade>(resourceName);
+    factory.registerFacade<ApplicationDomain::Event, DefaultFacade<ApplicationDomain::Event>>(resourceName);
-    factory.registerFacade<Sink::ApplicationDomain::Mail, DummyResourceMailFacade>(resourceName);
+    factory.registerFacade<ApplicationDomain::Mail, DefaultFacade<ApplicationDomain::Mail>>(resourceName);
-    factory.registerFacade<Sink::ApplicationDomain::Folder, DummyResourceFolderFacade>(resourceName);
+    factory.registerFacade<ApplicationDomain::Folder, DefaultFacade<ApplicationDomain::Folder>>(resourceName);
 }
 void DummyResourceFactory::registerAdaptorFactories(const QByteArray &resourceName, Sink::AdaptorFactoryRegistry &registry)
diff --git a/examples/imapresource/CMakeLists.txt b/examples/imapresource/CMakeLists.txt
index 15a720d..46a8b08 100644
--- a/examples/imapresource/CMakeLists.txt
+++ b/examples/imapresource/CMakeLists.txt
@@ -8,7 +8,7 @@ find_package(KIMAP2 0.0.1 REQUIRED)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-add_library(${PROJECT_NAME} SHARED facade.cpp imapresource.cpp domainadaptor.cpp imapserverproxy.cpp)
+add_library(${PROJECT_NAME} SHARED imapresource.cpp imapserverproxy.cpp)
 qt5_use_modules(${PROJECT_NAME} Core Network)
 target_link_libraries(${PROJECT_NAME} sink KF5::Mime KIMAP2)
diff --git a/examples/imapresource/domainadaptor.cpp b/examples/imapresource/domainadaptor.cpp
deleted file mode 100644
index 4e74ad2..0000000
--- a/examples/imapresource/domainadaptor.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *   Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#include "domainadaptor.h"
-using namespace flatbuffers;
-ImapMailAdaptorFactory::ImapMailAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
-ImapFolderAdaptorFactory::ImapFolderAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
diff --git a/examples/imapresource/domainadaptor.h b/examples/imapresource/domainadaptor.h
deleted file mode 100644
index 06a513c..0000000
--- a/examples/imapresource/domainadaptor.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#pragma once
-#include <common/domainadaptor.h>
-#include "mail_generated.h"
-#include "folder_generated.h"
-#include "dummy_generated.h"
-class ImapMailAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Mail, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    ImapMailAdaptorFactory();
-    virtual ~ImapMailAdaptorFactory() {};
-};
-class ImapFolderAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    ImapFolderAdaptorFactory();
-    virtual ~ImapFolderAdaptorFactory() {};
-};
diff --git a/examples/imapresource/facade.cpp b/examples/imapresource/facade.cpp
deleted file mode 100644
index 2829bb1..0000000
--- a/examples/imapresource/facade.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#include "facade.h"
-#include <QDir>
-#include <QFileInfo>
-#include "domainadaptor.h"
-#include "queryrunner.h"
-ImapResourceMailFacade::ImapResourceMailFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Mail>(context)
-{
-}
-ImapResourceMailFacade::~ImapResourceMailFacade()
-{
-}
-ImapResourceFolderFacade::ImapResourceFolderFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(context)
-{
-}
-ImapResourceFolderFacade::~ImapResourceFolderFacade()
-{
-}
diff --git a/examples/imapresource/facade.h b/examples/imapresource/facade.h
deleted file mode 100644
index 1d24856..0000000
--- a/examples/imapresource/facade.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#pragma once
-#include "common/facade.h"
-class ImapResourceMailFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Mail>
-{
-public:
-    ImapResourceMailFacade(const Sink::ResourceContext &context);
-    virtual ~ImapResourceMailFacade();
-};
-class ImapResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
-{
-public:
-    ImapResourceFolderFacade(const Sink::ResourceContext &context);
-    virtual ~ImapResourceFolderFacade();
-};
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 09f57d5..0579dae 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -100,7 +100,7 @@ public:
    QByteArray createFolder(const Imap::Folder &f)
    {
        const auto parentFolderRid = parentRid(f);
-        SinkTrace() << "Creating folder: " << f.name() << parentFolderRid;
+        SinkTraceCtx(mLogCtx) << "Creating folder: " << f.name() << parentFolderRid;
        const auto remoteId = folderRid(f);
        Sink::ApplicationDomain::Folder folder;
@@ -123,7 +123,7 @@ public:
    void synchronizeFolders(const QVector<Folder> &folderList)
    {
-        SinkTrace() << "Found folders " << folderList.size();
+        SinkTraceCtx(mLogCtx) << "Found folders " << folderList.size();
        scanForRemovals(ENTITY_TYPE_FOLDER,
            [&folderList](const QByteArray &remoteId) -> bool {
@@ -164,14 +164,14 @@ public:
    {
        auto time = QSharedPointer<QTime>::create();
        time->start();
-        SinkTrace() << "Importing new mail." << folderRid;
+        SinkTraceCtx(mLogCtx) << "Importing new mail." << folderRid;
        const auto folderLocalId = syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, folderRid);
        const auto remoteId = assembleMailRid(folderLocalId, message.uid);
        Q_ASSERT(message.msg);
-        SinkTrace() << "Found a mail " << remoteId << message.msg->subject(true)->asUnicodeString() << message.flags;
+        SinkTraceCtx(mLogCtx) << "Found a mail " << remoteId << message.msg->subject(true)->asUnicodeString() << message.flags;
        auto mail = Sink::ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
        mail.setFolder(folderLocalId);
@@ -181,7 +181,7 @@ public:
        createOrModify(ENTITY_TYPE_MAIL, remoteId, mail);
        // const auto elapsed = time->elapsed();
-        // SinkTrace() << "Synchronized " << count << " mails in " << folderRid << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
+        // SinkTraceCtx(mLogCtx) << "Synchronized " << count << " mails in " << folderRid << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
    }
    void synchronizeRemovals(const QByteArray &folderRid, const QSet<qint64> &messages)
@@ -194,7 +194,7 @@ public:
            return;
        }
-        SinkTrace() << "Finding removed mail: " << folderLocalId << " remoteId: " << folderRid;
+        SinkTraceCtx(mLogCtx) << "Finding removed mail: " << folderLocalId << " remoteId: " << folderRid;
        int count = 0;
@@ -370,7 +370,7 @@ public:
    Sink::QueryBase applyMailDefaults(const Sink::QueryBase &query)
    {
-        auto defaultDateFilter = QDate::currentDate().addDays(-14);
+        auto defaultDateFilter = QDate::currentDate().addDays(0 - mDaysToSync);
        auto queryWithDefaults = query;
        if (!queryWithDefaults.hasFilter<ApplicationDomain::Mail::Date>()) {
            queryWithDefaults.filter(ApplicationDomain::Mail::Date::name, QVariant::fromValue(defaultDateFilter));
@@ -382,7 +382,11 @@ public:
    {
        QList<Synchronizer::SyncRequest> list;
        if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) {
-            list << Synchronizer::SyncRequest{applyMailDefaults(query)};
+            auto request = Synchronizer::SyncRequest{applyMailDefaults(query)};
+            if (query.hasFilter(ApplicationDomain::Mail::Folder::name)) {
+                request.applicableEntities << query.getFilter(ApplicationDomain::Mail::Folder::name).value.toByteArray();
+            }
+            list << request;
        } else if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) {
            list << Synchronizer::SyncRequest{query};
        } else {
@@ -393,15 +397,57 @@ public:
        return list;
    }
+    QByteArray getFolderFromLocalId(const QByteArray &id)
+    {
+        auto mailRemoteId = syncStore().resolveLocalId(ApplicationDomain::getTypeName<ApplicationDomain::Mail>(), id);
+        if (mailRemoteId.isEmpty()) {
+            return {};
+        }
+        return folderIdFromMailRid(mailRemoteId);
+    }
+    void mergeIntoQueue(const Synchronizer::SyncRequest &request, QList<Synchronizer::SyncRequest> &queue)  Q_DECL_OVERRIDE
+    {
+        auto isIndividualMailSync = [](const Synchronizer::SyncRequest &request) {
+            if (request.requestType == SyncRequest::Synchronization) {
+                const auto query = request.query;
+                if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) {
+                    return !query.ids().isEmpty();
+                }
+            }
+            return false;
+        };
+        if (isIndividualMailSync(request)) {
+            auto newId = request.query.ids().first();
+            auto requestFolder = getFolderFromLocalId(newId);
+            if (requestFolder.isEmpty()) {
+                SinkWarningCtx(mLogCtx) << "Failed to find folder for local id. Ignoring request: " << request.query;
+                return;
+            }
+            for (auto &r : queue) {
+                if (isIndividualMailSync(r)) {
+                    auto queueFolder = getFolderFromLocalId(r.query.ids().first());
+                    if (requestFolder == queueFolder) {
+                        //Merge
+                        r.query.filter(newId);
+                        SinkTrace() << "Merging request " << request.query;
+                        SinkTrace() << " to " << r.query;
+                        return;
+                    }
+                }
+            }
+        }
+        queue << request;
+    }
    KAsync::Job<void> login(QSharedPointer<ImapServerProxy> imap)
    {
        SinkTrace() << "Connecting to:" << mServer << mPort;
        SinkTrace() << "as:" << mUser;
        return imap->login(mUser, mPassword)
-        .addToContext(imap)
+        .addToContext(imap);
-        .onError([](const KAsync::Error &error) {
-            SinkWarning() << "Login failed.";
-        });
    }
    KAsync::Job<QVector<Folder>> getFolderList(QSharedPointer<ImapServerProxy> imap, const Sink::QueryBase &query)
@@ -431,6 +477,19 @@ public:
        }
    }
+    KAsync::Error getError(const KAsync::Error &error)
+    {
+        if (error) {
+            if (error.errorCode == Imap::CouldNotConnectError) {
+                return {ApplicationDomain::ConnectionError, error.errorMessage};
+            } else if (error.errorCode == Imap::SslHandshakeError) {
+                return {ApplicationDomain::LoginError, error.errorMessage};
+            }
+            return {ApplicationDomain::UnknownError, error.errorMessage};
+        }
+        return {};
+    }
    KAsync::Job<void> synchronizeWithSource(const Sink::QueryBase &query) Q_DECL_OVERRIDE
    {
        auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort, &mSessionCache);
@@ -446,11 +505,8 @@ public:
                });
            })
            .then([=] (const KAsync::Error &error) {
-                if (error) {
-                    SinkWarning() << "Error during folder sync: " << error.errorMessage;
-                }
                return imap->logout()
-                    .then(KAsync::error(error));
+                    .then(KAsync::error(getError(error)));
            });
        } else if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) {
            //TODO
@@ -487,7 +543,7 @@ public:
                        synchronizeMails(folderRemoteId, m);
                    },
                    [=](int progress, int total) {
-                        SinkLogCtx(mLogCtx) << "Progress: " << progress << " out of " << total;
+                        reportProgress(progress, total);
                        //commit every 100 messages
                        if ((progress % 100) == 0) {
                            commit();
@@ -503,6 +559,8 @@ public:
                        return KAsync::value(folders)
                        .serialEach<void>([=](const Folder &folder) {
                            SinkLog() << "Syncing folder " << folder.path();
+                            //Emit notification that the folder is being synced.
+                            //The synchronizer can't do that because it has no concept of the folder filter on a mail sync scope meaning that the folder is being synchronized.
                            QDate dateFilter;
                            auto filter = query.getFilter<ApplicationDomain::Mail::Date>();
                            if (filter.value.canConvert<QDate>()) {
@@ -510,7 +568,7 @@ public:
                                SinkLog() << " with date-range " << dateFilter;
                            }
                            return synchronizeFolder(imap, folder, dateFilter, syncHeaders)
-                                .onError([folder](const KAsync::Error &error) {
+                                .onError([=](const KAsync::Error &error) {
                                    SinkWarning() << "Failed to sync folder: " << folder.path() << "Error: " << error.errorMessage;
                                });
                        });
@@ -518,11 +576,8 @@ public:
                }
            })
            .then([=] (const KAsync::Error &error) {
-                if (error) {
-                    SinkWarning() << "Error during sync: " << error.errorMessage;
-                }
                return imap->logout()
-                    .then(KAsync::error(error));
+                    .then(KAsync::error(getError(error)));
            });
        }
        return KAsync::error<void>("Nothing to do");
@@ -616,11 +671,11 @@ public:
            if (!folder.getParent().isEmpty()) {
                parentFolder = syncStore().resolveLocalId(ENTITY_TYPE_FOLDER, folder.getParent());
            }
-            SinkTrace() << "Creating a new folder: " << parentFolder << folder.getName();
+            SinkTraceCtx(mLogCtx) << "Creating a new folder: " << parentFolder << folder.getName();
            auto rid = QSharedPointer<QByteArray>::create();
            auto createFolder = login.then(imap->createSubfolder(parentFolder, folder.getName()))
-                .then([imap, rid](const QString &createdFolder) {
+                .then([this, imap, rid](const QString &createdFolder) {
-                    SinkTrace() << "Finished creating a new folder: " << createdFolder;
+                    SinkTraceCtx(mLogCtx) << "Finished creating a new folder: " << createdFolder;
                    *rid = createdFolder.toUtf8();
                });
            if (folder.getSpecialPurpose().isEmpty()) {
@@ -636,19 +691,19 @@ public:
                            specialPurposeFolders->insert(SpecialPurpose::getSpecialPurposeType(folder.name()), folder.path());
                        };
                    }))
-                    .then([specialPurposeFolders, folder, imap, parentFolder, rid]() -> KAsync::Job<void> {
+                    .then([this, specialPurposeFolders, folder, imap, parentFolder, rid]() -> KAsync::Job<void> {
                        for (const auto &purpose : folder.getSpecialPurpose()) {
                            if (specialPurposeFolders->contains(purpose)) {
                                auto f = specialPurposeFolders->value(purpose);
-                                SinkTrace() << "Merging specialpurpose folder with: " << f << " with purpose: " << purpose;
+                                SinkTraceCtx(mLogCtx) << "Merging specialpurpose folder with: " << f << " with purpose: " << purpose;
                                *rid = f.toUtf8();
                                return KAsync::null<void>();
                            }
                        }
-                        SinkTrace() << "No match found for merging, creating a new folder";
+                        SinkTraceCtx(mLogCtx) << "No match found for merging, creating a new folder";
                        return imap->createSubfolder(parentFolder, folder.getName())
-                            .then([imap, rid](const QString &createdFolder) {
+                            .then([this, imap, rid](const QString &createdFolder) {
-                                SinkTrace() << "Finished creating a new folder: " << createdFolder;
+                                SinkTraceCtx(mLogCtx) << "Finished creating a new folder: " << createdFolder;
                                *rid = createdFolder.toUtf8();
                            });
@@ -659,18 +714,18 @@ public:
                return mergeJob;
            }
        } else if (operation == Sink::Operation_Removal) {
-            SinkTrace() << "Removing a folder: " << oldRemoteId;
+            SinkTraceCtx(mLogCtx) << "Removing a folder: " << oldRemoteId;
            return login.then(imap->remove(oldRemoteId))
-                .then([oldRemoteId, imap] {
+                .then([this, oldRemoteId, imap] {
-                    SinkTrace() << "Finished removing a folder: " << oldRemoteId;
+                    SinkTraceCtx(mLogCtx) << "Finished removing a folder: " << oldRemoteId;
                    return QByteArray();
                });
        } else if (operation == Sink::Operation_Modification) {
-            SinkTrace() << "Renaming a folder: " << oldRemoteId << folder.getName();
+            SinkTraceCtx(mLogCtx) << "Renaming a folder: " << oldRemoteId << folder.getName();
            auto rid = QSharedPointer<QByteArray>::create();
            return login.then(imap->renameSubfolder(oldRemoteId, folder.getName()))
-                .then([imap, rid](const QString &createdFolder) {
+                .then([this, imap, rid](const QString &createdFolder) {
-                    SinkTrace() << "Finished renaming a folder: " << createdFolder;
+                    SinkTraceCtx(mLogCtx) << "Finished renaming a folder: " << createdFolder;
                    *rid = createdFolder.toUtf8();
                })
                .then([rid] {
@@ -685,6 +740,7 @@ public:
    int mPort;
    QString mUser;
    QString mPassword;
+    int mDaysToSync = 0;
    QByteArray mResourceInstanceIdentifier;
    Imap::SessionCache mSessionCache;
 };
@@ -864,6 +920,7 @@ ImapResource::ImapResource(const ResourceContext &resourceContext)
    synchronizer->mPort = port;
    synchronizer->mUser = user;
    synchronizer->mPassword = password;
+    synchronizer->mDaysToSync = 14;
    setupSynchronizer(synchronizer);
    auto inspector = QSharedPointer<ImapInspector>::create(resourceContext);
@@ -873,7 +930,7 @@ ImapResource::ImapResource(const ResourceContext &resourceContext)
    inspector->mPassword = password;
    setupInspector(inspector);
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor << new MailPropertyExtractor);
    setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>());
 }
@@ -898,14 +955,14 @@ Sink::Resource *ImapResourceFactory::createResource(const ResourceContext &conte
 void ImapResourceFactory::registerFacades(const QByteArray &name, Sink::FacadeFactory &factory)
 {
-    factory.registerFacade<Sink::ApplicationDomain::Mail, ImapResourceMailFacade>(name);
+    factory.registerFacade<ApplicationDomain::Mail, DefaultFacade<ApplicationDomain::Mail>>(name);
-    factory.registerFacade<Sink::ApplicationDomain::Folder, ImapResourceFolderFacade>(name);
+    factory.registerFacade<ApplicationDomain::Folder, DefaultFacade<ApplicationDomain::Folder>>(name);
 }
 void ImapResourceFactory::registerAdaptorFactories(const QByteArray &name, Sink::AdaptorFactoryRegistry &registry)
 {
-    registry.registerFactory<Sink::ApplicationDomain::Mail, ImapMailAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Mail, DefaultAdaptorFactory<ApplicationDomain::Mail>>(name);
-    registry.registerFactory<Sink::ApplicationDomain::Folder, ImapFolderAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Folder, DefaultAdaptorFactory<ApplicationDomain::Folder>>(name);
 }
 void ImapResourceFactory::removeDataFromDisk(const QByteArray &instanceIdentifier)
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index dabdd8e..0cc43b8 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -69,7 +69,7 @@ static KAsync::Job<T> runJob(KJob *job, const std::function<T(KJob*)> &f)
        QObject::connect(job, &KJob::result, [&future, f](KJob *job) {
            SinkTrace() << "Job done: " << job->metaObject()->className();
            if (job->error()) {
-                SinkWarning() << "Job failed: " << job->errorString();
+                SinkWarning() << "Job failed: " << job->errorString() << job->metaObject()->className();
                future.setError(job->error(), job->errorString());
            } else {
                future.setValue(f(job));
@@ -87,7 +87,7 @@ static KAsync::Job<void> runJob(KJob *job)
        QObject::connect(job, &KJob::result, [&future](KJob *job) {
            SinkTrace() << "Job done: " << job->metaObject()->className();
            if (job->error()) {
-                SinkWarning() << "Job failed: " << job->errorString();
+                SinkWarning() << "Job failed: " << job->errorString() << job->metaObject()->className();
                future.setError(job->error(), job->errorString());
            } else {
                future.setFinished();
@@ -159,6 +159,16 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
        // SinkTrace() << "Found personal namespaces: " << mNamespaces.personal;
        // SinkTrace() << "Found shared namespaces: " << mNamespaces.shared;
        // SinkTrace() << "Found user namespaces: " << mNamespaces.user;
+    }).then([=] (const KAsync::Error &error) {
+        if (error) {
+            if (error.errorCode == KIMAP2::LoginJob::ErrorCode::ERR_COULD_NOT_CONNECT) {
+                return KAsync::error(CouldNotConnectError, "Failed to connect: " + error.errorMessage);
+            } else if (error.errorCode == KIMAP2::LoginJob::ErrorCode::ERR_SSL_HANDSHAKE_FAILED) {
+                return KAsync::error(SslHandshakeError, "Ssl handshake failed: " + error.errorMessage);
+            }
+            return KAsync::error(error);
+        }
+        return KAsync::null();
    });
 }
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index 6eb47ee..872f032 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -29,6 +29,12 @@
 namespace Imap {
+enum ErrorCode {
+    NoError,
+    CouldNotConnectError,
+    SslHandshakeError
+};
 namespace Flags
 {
    /// The flag for a message being seen (i.e. opened by user).
diff --git a/examples/maildirresource/CMakeLists.txt b/examples/maildirresource/CMakeLists.txt
index e4d113c..a8f0359 100644
--- a/examples/maildirresource/CMakeLists.txt
+++ b/examples/maildirresource/CMakeLists.txt
@@ -5,13 +5,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 find_package(KF5 COMPONENTS REQUIRED Mime)
-add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp domainadaptor.cpp)
+add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp libmaildir/maildir.cpp libmaildir/keycache.cpp)
 qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink maildir KF5::Mime)
+target_link_libraries(${PROJECT_NAME} sink KF5::Mime)
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 add_definitions(-DTESTDATAPATH="${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
-add_subdirectory(libmaildir)
 add_subdirectory(tests)
diff --git a/examples/maildirresource/domainadaptor.cpp b/examples/maildirresource/domainadaptor.cpp
deleted file mode 100644
index 71b2354..0000000
--- a/examples/maildirresource/domainadaptor.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *   Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#include "domainadaptor.h"
-using namespace flatbuffers;
-MaildirMailAdaptorFactory::MaildirMailAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
-MaildirFolderAdaptorFactory::MaildirFolderAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
diff --git a/examples/maildirresource/domainadaptor.h b/examples/maildirresource/domainadaptor.h
deleted file mode 100644
index 700d2e5..0000000
--- a/examples/maildirresource/domainadaptor.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-#pragma once
-#include <common/domainadaptor.h>
-#include "mail_generated.h"
-#include "folder_generated.h"
-#include "dummy_generated.h"
-class MaildirMailAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Mail, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    MaildirMailAdaptorFactory();
-    virtual ~MaildirMailAdaptorFactory() {};
-};
-class MaildirFolderAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    MaildirFolderAdaptorFactory();
-    virtual ~MaildirFolderAdaptorFactory() {};
-};
diff --git a/examples/maildirresource/libmaildir/CMakeLists.txt b/examples/maildirresource/libmaildir/CMakeLists.txt
deleted file mode 100644
index e7803f5..0000000
--- a/examples/maildirresource/libmaildir/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# add_subdirectory( tests )
-set(maildir_LIB_SRCS keycache.cpp maildir.cpp)
-add_library(maildir ${LIBRARY_TYPE} ${maildir_LIB_SRCS})
-qt5_use_modules(maildir Core Network)
-# set_target_properties(maildir PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS maildir ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/examples/maildirresource/libmaildir/maildir.cpp b/examples/maildirresource/libmaildir/maildir.cpp
index a889ea2..203f6a6 100644
--- a/examples/maildirresource/libmaildir/maildir.cpp
+++ b/examples/maildirresource/libmaildir/maildir.cpp
@@ -1,5 +1,6 @@
 /*
    Copyright (c) 2007 Till Adam <adam@kde.org>
+    Copyright (c) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published by
@@ -24,7 +25,6 @@
 #include <QDirIterator>
 #include <QFileInfo>
 #include <QHostInfo>
-#include <QUuid>
 #include <QLoggingCategory>
 Q_LOGGING_CATEGORY(log, "maildir");
diff --git a/examples/maildirresource/libmaildir/maildir.h b/examples/maildirresource/libmaildir/maildir.h
index c10b046..a72f2bc 100644
--- a/examples/maildirresource/libmaildir/maildir.h
+++ b/examples/maildirresource/libmaildir/maildir.h
@@ -1,5 +1,6 @@
 /*
    Copyright (c) 2007 Till Adam <adam@kde.org>
+    Copyright (c) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published by
@@ -20,9 +21,6 @@
 #ifndef MAILDIR_H
 #define MAILDIR_H
-#include "maildir_export.h"
 #include <QString>
 #include <QStringList>
@@ -30,7 +28,7 @@ class QDateTime;
 namespace KPIM {
-class MAILDIR_EXPORT Maildir
+class Maildir
 {
 public:
    /**
diff --git a/examples/maildirresource/libmaildir/maildir_export.h b/examples/maildirresource/libmaildir/maildir_export.h
deleted file mode 100644
index b330fd0..0000000
--- a/examples/maildirresource/libmaildir/maildir_export.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2007 David Faure <faure@kde.org>
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-#ifndef MAILDIR_EXPORT_H
-#define MAILDIR_EXPORT_H
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-// #include <kdemacros.h>
-#ifndef MAILDIR_EXPORT
-// # if defined(KDEPIM_STATIC_LIBS)
-//    #<{(| No export/import for static libraries |)}>#
-#  define MAILDIR_EXPORT
-// # elif defined(MAKE_MAILDIR_LIB)
-//    #<{(| We are building this library |)}># 
-// #  define MAILDIR_EXPORT KDE_EXPORT
-// # else
-//    #<{(| We are using this library |)}># 
-// #  define MAILDIR_EXPORT KDE_IMPORT
-// # endif
-#endif
-//
-// # ifndef MAILDIR_EXPORT_DEPRECATED
-// #  define MAILDIR_EXPORT_DEPRECATED KDE_DEPRECATED MAILDIR_EXPORT
-// # endif
-#endif
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 813d84f..40bab37 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -37,7 +37,7 @@
 #include <QDir>
 #include <QDirIterator>
-#include <KMime/KMime/KMimeMessage>
+#include <KMime/KMimeMessage>
 //This is the resources entity type, and not the domain type
 #define ENTITY_TYPE_MAIL "mail"
@@ -360,12 +360,12 @@ public:
    KAsync::Job<void> synchronizeWithSource(const Sink::QueryBase &query) Q_DECL_OVERRIDE
    {
-        auto job = KAsync::start<void>([this] {
+        auto job = KAsync::start([this] {
            KPIM::Maildir maildir(mMaildirPath, true);
            if (!maildir.isValid(false)) {
-                return KAsync::error<void>(1, "Maildir path doesn't point to a valid maildir: " + mMaildirPath);
+                return KAsync::error(ApplicationDomain::ConfigurationError, "Maildir path doesn't point to a valid maildir: " + mMaildirPath);
            }
-            return KAsync::null<void>();
+            return KAsync::null();
        });
        if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) {
@@ -551,7 +551,7 @@ MaildirResource::MaildirResource(const Sink::ResourceContext &resourceContext)
    setupSynchronizer(synchronizer);
    setupInspector(QSharedPointer<MaildirInspector>::create(resourceContext));
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MaildirMimeMessageMover(resourceContext.instanceId(), mMaildirPath) << new MaildirMailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor << new MaildirMimeMessageMover(resourceContext.instanceId(), mMaildirPath) << new MaildirMailPropertyExtractor);
    setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>() << new FolderPreprocessor(mMaildirPath));
    KPIM::Maildir dir(mMaildirPath, true);
@@ -596,8 +596,8 @@ void MaildirResourceFactory::registerFacades(const QByteArray &name, Sink::Facad
 void MaildirResourceFactory::registerAdaptorFactories(const QByteArray &name, Sink::AdaptorFactoryRegistry &registry)
 {
-    registry.registerFactory<Sink::ApplicationDomain::Mail, MaildirMailAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Mail, DefaultAdaptorFactory<ApplicationDomain::Mail>>(name);
-    registry.registerFactory<Sink::ApplicationDomain::Folder, MaildirFolderAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Folder, DefaultAdaptorFactory<ApplicationDomain::Folder>>(name);
 }
 void MaildirResourceFactory::removeDataFromDisk(const QByteArray &instanceIdentifier)
diff --git a/examples/mailtransportresource/mailtransport.cpp b/examples/mailtransportresource/mailtransport.cpp
index 3d56af9..84c1556 100644
--- a/examples/mailtransportresource/mailtransport.cpp
+++ b/examples/mailtransportresource/mailtransport.cpp
@@ -41,17 +41,17 @@ static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp)
    struct upload_status *upload_ctx = (struct upload_status *)userp;
    const char *data;
-    if((size == 0) || (nmemb == 0) || ((size*nmemb) < 1)) {
+    if ((size == 0) || (nmemb == 0) || ((size*nmemb) < 1)) {
        return 0;
    }
    data = &upload_ctx->data[upload_ctx->offset];
-    if(data) {
+    if (data) {
        size_t len = strlen(data);
        if (len > size * nmemb) {
            len = size * nmemb;
        }
-        fprintf(stderr, "read n bytes: %d\n", int(len));
+        fprintf(stdout, "read n bytes: %d\n", int(len));
        memcpy(ptr, data, len);
        upload_ctx->offset += len;
        return len;
@@ -69,8 +69,17 @@ static int progress_callback(void *clientp, curl_off_t dltotal, curl_off_t dlnow
    return 0;
 }
+static int debug_callback(CURL *handle,
+                   curl_infotype type,
+                   char *data,
+                   size_t size,
+                   void *userptr)
+{
+    fprintf(stdout, "CURL_DEBUG: %s", data);
+    return 0;
+}
-bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs, const char *msg, bool useTls, const char* from, const char *username, const char *password, const char *server, bool verifyPeer, const QByteArray &cacert)
+bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs, const char *msg, bool useTls, const char* from, const char *username, const char *password, const char *server, bool verifyPeer, const QByteArray &cacert, QByteArray &errorMessage)
 {
    CURL *curl;
    CURLcode res = CURLE_OK;
@@ -88,7 +97,7 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
        curl_easy_setopt(curl, CURLOPT_URL, server);
        if (useTls) {
-            curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_TRY);
+            curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_ALL);
        }
        if (!verifyPeer) {
@@ -121,19 +130,29 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
        /* Since the traffic will be encrypted, it is very useful to turn on debug
        * information within libcurl to see what is happening during the transfer.
        */
-        curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+        // curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+        curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, debug_callback);
        // curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1L);
-        //Connection timeout of 10s
+        //Connection timeout of 40s
-        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L);
+        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 40L);
        curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
        curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, progress_callback);
+        char errorBuffer[CURL_ERROR_SIZE];
+        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errorBuffer);
        res = curl_easy_perform(curl);
        if(res != CURLE_OK) {
-            fprintf(stderr, "curl_easy_perform() failed: %s\n",
+            errorMessage += curl_easy_strerror(res);
-                    curl_easy_strerror(res));
+            errorMessage += "; ";
+        }
+        long http_code = 0;
+        curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &http_code);
+        if (http_code == 200 && res != CURLE_ABORTED_BY_CALLBACK) {
+                //Succeeded
+        } else {
+            errorMessage += errorBuffer;
        }
        curl_slist_free_all(recipients);
        curl_easy_cleanup(curl);
@@ -147,8 +166,6 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
 bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteArray &server, const QByteArray &username, const QByteArray &password, const QByteArray &cacert, MailTransport::Options options)
 {
    QByteArray msg = message->encodedContent();
-    SinkLog() << "Sending message " << server << username << password << cacert;
-    SinkTrace() << "Sending message " << msg;
    QByteArray from(message->from(true)->mailboxes().isEmpty() ? QByteArray() : message->from(true)->mailboxes().first().address());
    QList<QByteArray> toList;
@@ -159,8 +176,11 @@ bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteA
    for (const auto &mb : message->cc(true)->mailboxes()) {
        ccList << mb.address();
    }
-    bool verifyPeer = options & VerifyPeers;
+    const bool verifyPeer = options.testFlag(VerifyPeers);
-    bool useTls = options & UseTls;
+    const bool useTls = options.testFlag(UseTls);
+    SinkLog() << "Sending message " << server << username << password << "CaCert: " << cacert  << "Use tls: " << useTls << " Verify peer: " << verifyPeer;
+    SinkTrace() << "Sending message " << msg;
    const int numTos = toList.size();
    const char* to[numTos];
@@ -173,6 +193,14 @@ bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteA
    for (int i = 0; i < numCcs; i++) {
        cc[i] = ccList.at(i);
    }
+    //Because curl will fail with smtps, but it won't tell you why.
-    return sendMessageCurl(to, numTos, cc, numCcs, msg, useTls, from.isEmpty() ? nullptr : from, username, password, server, verifyPeer, cacert);
+    auto serverAddress = server;
+    serverAddress.replace("smtps://", "smtp://");
+    QByteArray errorMessage;
+    auto ret =  sendMessageCurl(to, numTos, cc, numCcs, msg, useTls, from.isEmpty() ? nullptr : from, username, password, serverAddress, verifyPeer, cacert, errorMessage);
+    if (!ret) {
+        SinkWarning() << "Failed to send message: " << errorMessage;
+    }
+    return ret;
 }
diff --git a/examples/mailtransportresource/mailtransport.h b/examples/mailtransportresource/mailtransport.h
index 3ef4a6d..662fdc9 100644
--- a/examples/mailtransportresource/mailtransport.h
+++ b/examples/mailtransportresource/mailtransport.h
@@ -26,8 +26,8 @@
 namespace MailTransport
 {
    enum Option {
-        UseTls,
+        UseTls = 1,
-        VerifyPeers
+        VerifyPeers = 2
    };
    Q_DECLARE_FLAGS(Options, Option);
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index 88a90c6..8a4ef92 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -30,7 +30,6 @@
 #include <KMime/Message>
 #include "mailtransport.h"
-#include "mail_generated.h"
 #include "inspection.h"
 #include <synchronizer.h>
 #include <log.h>
@@ -44,6 +43,47 @@ SINK_DEBUG_AREA("mailtransportresource")
 using namespace Sink;
+class MailtransportPreprocessor : public Sink::Preprocessor
+{
+public:
+    MailtransportPreprocessor() : Sink::Preprocessor() {}
+    QByteArray getTargetResource()
+    {
+        using namespace Sink::ApplicationDomain;
+        auto resource = Store::readOne<ApplicationDomain::SinkResource>(Query{}.filter(resourceInstanceIdentifier()).request<ApplicationDomain::SinkResource::Account>());
+        if (resource.identifier().isEmpty()) {
+            SinkWarning() << "Failed to retrieve this resource: " << resourceInstanceIdentifier();
+        }
+        Query query;
+        query.containsFilter<ApplicationDomain::SinkResource::Capabilities>(ApplicationDomain::ResourceCapabilities::Mail::sent);
+        query.filter<ApplicationDomain::SinkResource::Account>(resource.getAccount());
+        auto targetResource = Store::readOne<ApplicationDomain::SinkResource>(query);
+        if (targetResource.identifier().isEmpty()) {
+            SinkWarning() << "Failed to find target resource: " << targetResource.identifier();
+        }
+        return targetResource.identifier();
+    }
+    virtual Result processModification(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff) Q_DECL_OVERRIDE
+    {
+        if (type == Preprocessor::Modification) {
+            using namespace Sink::ApplicationDomain;
+            if (diff.changedProperties().contains(Mail::Trash::name)) {
+                //Move back to regular resource
+                diff.setResource(getTargetResource());
+                return {MoveToResource};
+            } else if (diff.changedProperties().contains(Mail::Draft::name)) {
+                //Move back to regular resource
+                diff.setResource(getTargetResource());
+                return {MoveToResource};
+            }
+        }
+        return {NoAction};
+    }
+};
 class MailtransportSynchronizer : public Sink::Synchronizer {
 public:
    MailtransportSynchronizer(const Sink::ResourceContext &resourceContext)
@@ -55,17 +95,22 @@ public:
    KAsync::Job<void> send(const ApplicationDomain::Mail &mail, const MailtransportResource::Settings &settings)
    {
-        return KAsync::start<void>([=] {
+        return KAsync::start([=] {
            if (!syncStore().readValue(mail.identifier()).isEmpty()) {
                SinkLog() << "Mail is already sent: " << mail.identifier();
                return KAsync::null();
            }
+            emitNotification(Notification::Info, ApplicationDomain::SyncInProgress, "Sending message.", {}, {mail.identifier()});
            const auto data = mail.getMimeMessage();
            auto msg = KMime::Message::Ptr::create();
            msg->setHead(KMime::CRLFtoLF(data));
            msg->parse();
            if (settings.testMode) {
-                SinkLog() << "I would totally send that mail, but I'm in test mode." << mail.identifier();
+                auto subject = msg->subject(true)->asUnicodeString();
+                SinkLog() << "I would totally send that mail, but I'm in test mode." << mail.identifier() << subject;
+                if (!subject.contains("send")) {
+                    return KAsync::error("Failed to send the message.");
+                }
                auto path = resourceStorageLocation(mResourceInstanceIdentifier) + "/test/";
                SinkTrace() << path;
                QDir dir;
@@ -77,11 +122,16 @@ public:
            } else {
                MailTransport::Options options;
                if (settings.server.contains("smtps")) {
-                    options &= MailTransport::UseTls;
+                    options |= MailTransport::UseTls;
                }
                if (!MailTransport::sendMessage(msg, settings.server.toUtf8(), settings.username.toUtf8(), settings.password.toUtf8(), settings.cacert.toUtf8(), options)) {
                    SinkWarning() << "Failed to send message: " << mail;
+                    emitNotification(Notification::Warning, ApplicationDomain::SyncError, "Failed to send message.", {}, {mail.identifier()});
+                    emitNotification(Notification::Warning, ApplicationDomain::TransmissionError, "Failed to send message.", {}, {mail.identifier()});
                    return KAsync::error("Failed to send the message.");
+                } else {
+                    emitNotification(Notification::Info, ApplicationDomain::SyncSuccess, "Message successfully sent.", {}, {mail.identifier()});
+                    emitNotification(Notification::Info, ApplicationDomain::TransmissionSuccess, "Message successfully sent.", {}, {mail.identifier()});
                }
            }
            syncStore().writeValue(mail.identifier(), "sent");
@@ -100,9 +150,8 @@ public:
            query.filter<ApplicationDomain::SinkResource::Account>(resource.getAccount());
            return Store::fetchOne<ApplicationDomain::SinkResource>(query)
                .then([this, modifiedMail](const ApplicationDomain::SinkResource &resource) {
-                    //First modify the mail to have the sent property set to true
+                    //Modify the mail to have the sent property set to true, and move it to the new resource.
                    modify(modifiedMail, resource.identifier(), true);
-                    return KAsync::null<void>();
                });
        });
    }
@@ -112,12 +161,10 @@ public:
        return KAsync::start<void>([this]() {
            QList<ApplicationDomain::Mail> toSend;
            SinkLog() << "Looking for mails to send.";
-            store().readAll<ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) -> bool {
+            store().readAll<ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) {
-                SinkTrace() << "Found mail: " << mail.identifier();
                if (!mail.getSent()) {
                    toSend << mail;
                }
-                return true;
            });
            SinkLog() << "Found " << toSend.size() << " mails to send";
            auto job = KAsync::null<void>();
@@ -192,7 +239,7 @@ MailtransportResource::MailtransportResource(const Sink::ResourceContext &resour
    setupSynchronizer(synchronizer);
    setupInspector(QSharedPointer<MailtransportInspector>::create(resourceContext));
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MailPropertyExtractor << new MailtransportPreprocessor);
 }
 MailtransportResourceFactory::MailtransportResourceFactory(QObject *parent)
diff --git a/examples/mailtransportresource/tests/mailtransporttest.cpp b/examples/mailtransportresource/tests/mailtransporttest.cpp
index 3b848b3..e4cc447 100644
--- a/examples/mailtransportresource/tests/mailtransporttest.cpp
+++ b/examples/mailtransportresource/tests/mailtransporttest.cpp
@@ -47,7 +47,8 @@ private slots:
    void cleanup()
    {
-        VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
+        VERIFYEXEC(Store::removeDataFromDisk(mResourceInstanceIdentifier));
+        VERIFYEXEC(Store::removeDataFromDisk(mStorageResource));
    }
    void init()
@@ -58,7 +59,8 @@ private slots:
    void testSendMail()
    {
        auto message = KMime::Message::Ptr::create();
-        message->subject(true)->fromUnicodeString(QString::fromLatin1("Foobar"), "utf8");
+        message->messageID(true)->generate("foo.com");
+        message->subject(true)->fromUnicodeString(QString::fromLatin1("send: Foobar"), "utf8");
        message->assemble();
        auto mail = ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
@@ -67,9 +69,10 @@ private slots:
        VERIFYEXEC(Store::create(mail));
        VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+        //FIXME the email is sent already because changereplay kicks of automatically
        //Ensure the mail is queryable in the outbox
-        auto mailInOutbox = Store::readOne<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier).filter<Mail::Sent>(false).request<Mail::Subject>().request<Mail::Folder>().request<Mail::MimeMessage>().request<Mail::Sent>());
+        // auto mailInOutbox = Store::readOne<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier).filter<Mail::Sent>(false).request<Mail::Subject>().request<Mail::Folder>().request<Mail::MimeMessage>().request<Mail::Sent>());
-        QVERIFY(!mailInOutbox.identifier().isEmpty());
+        // QVERIFY(!mailInOutbox.identifier().isEmpty());
        //Ensure the mail is sent and moved to the sent mail folder on sync
        VERIFYEXEC(Store::synchronize(Query().resourceFilter(mResourceInstanceIdentifier)));
@@ -81,7 +84,37 @@ private slots:
        QVERIFY(!mailInSentMailFolder.getSubject().isEmpty());
    }
-    //TODO test mail that fails to be sent. add a special header to the mail and have the resource fail sending. Ensure we can modify the mail to fix sending of the message.
+    void testSendFailure()
+    {
+        auto message = KMime::Message::Ptr::create();
+        message->messageID(true)->generate("foo.com");
+        message->subject(true)->fromUnicodeString(QString::fromLatin1("error: Foobar"), "utf8");
+        message->assemble();
+        auto mail = ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
+        mail.setMimeMessage(message->encodedContent());
+        VERIFYEXEC(Store::create(mail));
+        VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+        //Ensure the mail is queryable in the outbox
+        auto mailInOutbox = Store::readOne<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier).filter<Mail::Sent>(false));
+        QVERIFY(!mailInOutbox.identifier().isEmpty());
+        //Modify back to drafts
+        auto modifiedMail = mailInOutbox;
+        modifiedMail.setDraft(true);
+        VERIFYEXEC(Store::modify(modifiedMail));
+        VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+        QTest::qWait(100);
+        auto mailsInOutbox = Store::read<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier));
+        QCOMPARE(mailsInOutbox.size(), 0);
+        auto mailsInDrafts = Store::read<ApplicationDomain::Mail>(Query().resourceFilter(mStorageResource));
+        QCOMPARE(mailsInDrafts.size(), 1);
+    }
 };