12 files changed, 249 insertions, 112 deletions

diff --git a/examples/client/CMakeLists.txt b/examples/client/CMakeLists.txt
index 85840c4..ef00368 100644
--- a/examples/client/CMakeLists.txt
+++ b/examples/client/CMakeLists.txt
@@ -3,6 +3,6 @@ project(sink_client)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(${PROJECT_NAME} main.cpp console.cpp)
-target_link_libraries(${PROJECT_NAME} sinkcommon)
+target_link_libraries(${PROJECT_NAME} sink)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
 install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index f437c19..07e780e 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -22,7 +22,7 @@
 #include <QCommandLineOption>
 #include <QTime>
 
-#include "common/clientapi.h"
+#include "common/store.h"
 #include "common/log.h"
 
 #include <QWidget>
@@ -38,6 +38,7 @@
  */
 class StoreBase {
 public:
+    virtual ~StoreBase(){};
     virtual Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject() = 0;
     virtual Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier = QByteArray()) = 0;
     virtual KAsync::Job<void> create(const Sink::ApplicationDomain::ApplicationDomainType &type) = 0;
diff --git a/examples/dummyresource/CMakeLists.txt b/examples/dummyresource/CMakeLists.txt
index 6ffac9a..6400f0c 100644
--- a/examples/dummyresource/CMakeLists.txt
+++ b/examples/dummyresource/CMakeLists.txt
@@ -7,6 +7,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 add_library(${PROJECT_NAME} SHARED facade.cpp resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
 generate_flatbuffers(${PROJECT_NAME} dummycalendar)
 qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sinkcommon)
+target_link_libraries(${PROJECT_NAME} sink)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 31633d7..48858da 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -95,12 +95,17 @@ Sink::ApplicationDomain::Folder::Ptr DummyResource::createFolder(const QByteArra
 
 void DummyResource::synchronize(const QByteArray &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function<Sink::ApplicationDomain::ApplicationDomainType::Ptr(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &)> createEntity)
 {
+    auto time = QSharedPointer<QTime>::create();
+    time->start();
     //TODO find items to remove
+    int count = 0;
     for (auto it = data.constBegin(); it != data.constEnd(); it++) {
+        count++;
         const auto remoteId = it.key().toUtf8();
         auto entity = createEntity(remoteId, it.value(), synchronizationTransaction);
         createOrModify(transaction, synchronizationTransaction, adaptorFactory, bufferType, remoteId, *entity);
     }
+    Trace() << "Sync of " << count << " entities of type " << bufferType << " done." << Sink::Log::TraceTime(time->elapsed());
 }
 
 KAsync::Job<void> DummyResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore)
@@ -128,6 +133,11 @@ KAsync::Job<void> DummyResource::replay(Sink::Storage &synchronizationStore, con
     return KAsync::null<void>();
 }
 
+void DummyResource::removeDataFromDisk()
+{
+    removeFromDisk(mResourceInstanceIdentifier);
+}
+
 void DummyResource::removeFromDisk(const QByteArray &instanceIdentifier)
 {
     GenericResource::removeFromDisk(instanceIdentifier);
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index 240bb9f..865f6e5 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -39,6 +39,7 @@ public:
     DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline = QSharedPointer<Sink::Pipeline>());
     KAsync::Job<void> synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) Q_DECL_OVERRIDE;
     using GenericResource::synchronizeWithSource;
+    void removeDataFromDisk() Q_DECL_OVERRIDE;
     static void removeFromDisk(const QByteArray &instanceIdentifier);
     KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE;
 private:
diff --git a/examples/maildirresource/CMakeLists.txt b/examples/maildirresource/CMakeLists.txt
index baacd44..efaa266 100644
--- a/examples/maildirresource/CMakeLists.txt
+++ b/examples/maildirresource/CMakeLists.txt
@@ -8,7 +8,7 @@ find_package(KF5 COMPONENTS REQUIRED Mime)
 add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp domainadaptor.cpp)
 # generate_flatbuffers(${PROJECT_NAME} dummycalendar)
 qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sinkcommon maildir KF5::Mime)
+target_link_libraries(${PROJECT_NAME} sink maildir KF5::Mime)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 
diff --git a/examples/maildirresource/facade.cpp b/examples/maildirresource/facade.cpp
index 7178ab9..a7a0348 100644
--- a/examples/maildirresource/facade.cpp
+++ b/examples/maildirresource/facade.cpp
@@ -19,17 +19,47 @@
 
 #include "facade.h"
 
+#include <QDir>
+#include <QFileInfo>
+
 #include "domainadaptor.h"
+#include "queryrunner.h"
 
 MaildirResourceMailFacade::MaildirResourceMailFacade(const QByteArray &instanceIdentifier)
     : Sink::GenericFacade<Sink::ApplicationDomain::Mail>(instanceIdentifier, QSharedPointer<MaildirMailAdaptorFactory>::create())
 {
+    mResultTransformation = [](Sink::ApplicationDomain::ApplicationDomainType &value) {
+        if (value.hasProperty("mimeMessage")) {
+            const auto property = value.getProperty("mimeMessage");
+            //Transform the mime message property into the actual path on disk.
+            const auto mimeMessage = property.toString();
+            auto parts = mimeMessage.split('/');
+            auto key = parts.takeLast();
+            const auto folderPath = parts.join('/');
+            const auto path =  folderPath + "/cur/";
+
+            Trace() << "Looking for mail in: " << path << key;
+            QDir dir(path);
+            const QFileInfoList list = dir.entryInfoList(QStringList() << (key+"*"), QDir::Files);
+            if (list.size() != 1) {
+                Warning() << "Failed to find message " << path << key << list.size();
+                value.setProperty("mimeMessage", QVariant());
+            } else {
+                value.setProperty("mimeMessage", list.at(0).filePath());
+            }
+        }
+    };
 }
 
 MaildirResourceMailFacade::~MaildirResourceMailFacade()
 {
 }
 
+QPair<KAsync::Job<void>, Sink::ResultEmitter<Sink::ApplicationDomain::Mail::Ptr>::Ptr> MaildirResourceMailFacade::load(const Sink::Query &query)
+{
+    return Sink::GenericFacade<Sink::ApplicationDomain::Mail>::load(query);
+}
+
 
 MaildirResourceFolderFacade::MaildirResourceFolderFacade(const QByteArray &instanceIdentifier)
     : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(instanceIdentifier, QSharedPointer<MaildirFolderAdaptorFactory>::create())
diff --git a/examples/maildirresource/facade.h b/examples/maildirresource/facade.h
index a243b0d..38981d0 100644
--- a/examples/maildirresource/facade.h
+++ b/examples/maildirresource/facade.h
@@ -26,6 +26,7 @@ class MaildirResourceMailFacade : public Sink::GenericFacade<Sink::ApplicationDo
 public:
     MaildirResourceMailFacade(const QByteArray &instanceIdentifier);
     virtual ~MaildirResourceMailFacade();
+    QPair<KAsync::Job<void>, Sink::ResultEmitter<Sink::ApplicationDomain::Mail::Ptr>::Ptr> load(const Sink::Query &query) Q_DECL_OVERRIDE;
 };
 
 class MaildirResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
diff --git a/examples/maildirresource/libmaildir/maildir.cpp b/examples/maildirresource/libmaildir/maildir.cpp
index 3d4630f..59e7e5c 100644
--- a/examples/maildirresource/libmaildir/maildir.cpp
+++ b/examples/maildirresource/libmaildir/maildir.cpp
@@ -142,7 +142,6 @@ public:
     {
         // KeyCache* keyCache = KeyCache::self();
         // if (keyCache->isNewKey(path, key)) {
-        qWarning() << path + QString::fromLatin1("/new/") + key;
         if (QFile::exists(path + QString::fromLatin1("/new/") + key)) {
 #ifdef DEBUG_KEYCACHE_CONSITENCY
           if (!QFile::exists(path + QString::fromLatin1("/new/") + key)) {
@@ -178,6 +177,13 @@ public:
         return realKey;
     }
 
+    static QString stripFlags(const QString& key)
+    {
+        const QRegExp rx = *(statusSeparatorRx());
+        const int index = key.indexOf(rx);
+        return key.mid(0, index);
+    }
+
     static QString subDirNameForFolderName(const QString &folderName)
     {
         return QString::fromLatin1(".%1.directory").arg(folderName);
@@ -560,7 +566,20 @@ QDateTime Maildir::lastModified(const QString& key) const
     return info.lastModified();
 }
 
-QByteArray Maildir::readEntryHeadersFromFile(const QString& file) const
+QString Maildir::getKeyFromFile(const QString& file)
+{
+    return Maildir::Private::stripFlags(file.split('/').last());
+}
+
+QString Maildir::getDirectoryFromFile( const QString& file )
+{
+    auto parts = file.split('/');
+    parts.removeLast(); //File
+    parts.removeLast(); //cur/new/tmp
+    return parts.join('/') + "/";
+}
+
+QByteArray Maildir::readEntryHeadersFromFile(const QString& file)
 {
     QByteArray result;
 
@@ -643,9 +662,14 @@ QString Maildir::addEntry(const QByteArray& data)
 
     QFile f(key);
     bool result = f.open(QIODevice::WriteOnly);
+    if (!result) {
+       qWarning() << f.errorString();
+       qWarning() << "Cannot write to mail file: " << key;
+    }
     result = result & (f.write(data) != -1);
     f.close();
     if (!result) {
+       qWarning() << "Cannot write to mail file: " << key;
        // d->lastError = i18n("Cannot write to mail file %1." , key);
        return QString();
     }
@@ -688,88 +712,89 @@ bool Maildir::removeEntry(const QString& key)
     // return QFile::remove(realKey);
 }
 
-// QString Maildir::changeEntryFlags(const QString& key, const Sink::Item::Flags& flags)
-// {
-//     QString realKey(d->findRealKey(key));
-//     if (realKey.isEmpty()) {
-//         qWarning() << "Maildir::changeEntryFlags unable to find: " << key;
-//         d->lastError = i18n("Cannot locate mail file %1." , key);
-//         return QString();
-//     }
-//
-//     const QRegExp rx = *(statusSeparatorRx());
-//     QString finalKey = key.left(key.indexOf(rx));
-//
-//     QStringList mailDirFlags;
-//     Q_FOREACH (const Sink::Item::Flag &flag, flags) {
-//       if (flag == Sink::MessageFlags::Forwarded)
-//         mailDirFlags << QLatin1String("P");
-//       if (flag == Sink::MessageFlags::Replied)
-//         mailDirFlags << QLatin1String("R");
-//       if (flag == Sink::MessageFlags::Seen)
-//         mailDirFlags << QLatin1String("S");
-//       if (flag == Sink::MessageFlags::Deleted)
-//         mailDirFlags << QLatin1String("T");
-//       if (flag == Sink::MessageFlags::Flagged)
-//         mailDirFlags << QLatin1String("F");
-//     }
-//     mailDirFlags.sort();
-//     if (!mailDirFlags.isEmpty()) {
-// #ifdef Q_OS_WIN
-//       finalKey.append(QLatin1String("!2,") + mailDirFlags.join(QString()));
-// #else
-//       finalKey.append(QLatin1String(":2,") + mailDirFlags.join(QString()));
-// #endif
-//     }
-//
-//     QString newUniqueKey = finalKey; //key without path
-//     finalKey.prepend(d->path + QString::fromLatin1("/cur/"));
-//
-//     if (realKey == finalKey) {
-//       // Somehow it already is named this way (e.g. migration bug -> wrong status in sink)
-//       return newUniqueKey;
-//     }
-//
-//     QFile f(realKey);
-//     if (QFile::exists(finalKey)) {
-//       QFile destFile(finalKey);
-//       QByteArray destContent;
-//       if (destFile.open(QIODevice::ReadOnly)) {
-//         destContent = destFile.readAll();
-//         destFile.close();
-//       }
-//       QByteArray sourceContent;
-//       if (f.open(QIODevice::ReadOnly)) {
-//         sourceContent = f.readAll();
-//         f.close();
-//       }
-//
-//       if (destContent != sourceContent) {
-//          QString newFinalKey = QLatin1String("1-") + newUniqueKey;
-//          int i = 1;
-//          while (QFile::exists(d->path + QString::fromLatin1("/cur/") + newFinalKey)) {
-//            i++;
-//            newFinalKey = QString::number(i) + QLatin1Char('-') + newUniqueKey;
-//          }
-//          finalKey = d->path + QString::fromLatin1("/cur/") + newFinalKey;
-//       } else {
-//             QFile::remove(finalKey); //they are the same
-//       }
-//     }
-//
-//     if (!f.rename(finalKey)) {
-//         qWarning() << "Maildir: Failed to rename entry: " << f.fileName() << " to "  << finalKey  << "! Error: " << f.errorString();
-//         d->lastError = i18n("Failed to update the file name %1 to %2 on the disk. The error was: %3." , f.fileName(), finalKey, f.errorString());
-//         return QString();
-//      }
-//
-//     KeyCache *keyCache = KeyCache::self();
-//     keyCache->removeKey(d->path, key);
-//     keyCache->addCurKey(d->path, newUniqueKey);
-//
-//     return newUniqueKey;
-// }
-//
+QString Maildir::changeEntryFlags(const QString& key, const Maildir::Flags& flags)
+{
+    QString realKey(d->findRealKey(key));
+    if (realKey.isEmpty()) {
+        qWarning() << "Maildir::changeEntryFlags unable to find: " << key;
+        // d->lastError = i18n("Cannot locate mail file %1." , key);
+        return QString();
+    }
+
+    const QRegExp rx = *(statusSeparatorRx());
+    QString finalKey = key.left(key.indexOf(rx));
+
+    QStringList mailDirFlags;
+    if (flags & Forwarded)
+        mailDirFlags << QLatin1String("P");
+    if (flags & Replied)
+        mailDirFlags << QLatin1String("R");
+    if (flags & Seen)
+        mailDirFlags << QLatin1String("S");
+    if (flags & Deleted)
+        mailDirFlags << QLatin1String("T");
+    if (flags & Flagged)
+        mailDirFlags << QLatin1String("F");
+
+    mailDirFlags.sort();
+    if (!mailDirFlags.isEmpty()) {
+#ifdef Q_OS_WIN
+      finalKey.append(QLatin1String("!2,") + mailDirFlags.join(QString()));
+#else
+      finalKey.append(QLatin1String(":2,") + mailDirFlags.join(QString()));
+#endif
+    }
+
+    QString newUniqueKey = finalKey; //key without path
+    finalKey.prepend(d->path + QString::fromLatin1("/cur/"));
+
+    if (realKey == finalKey) {
+      // Somehow it already is named this way (e.g. migration bug -> wrong status in sink)
+      qWarning() << "File already named that way: " << newUniqueKey << finalKey;
+      return newUniqueKey;
+    }
+
+    QFile f(realKey);
+    if (QFile::exists(finalKey)) {
+      QFile destFile(finalKey);
+      QByteArray destContent;
+      if (destFile.open(QIODevice::ReadOnly)) {
+        destContent = destFile.readAll();
+        destFile.close();
+      }
+      QByteArray sourceContent;
+      if (f.open(QIODevice::ReadOnly)) {
+        sourceContent = f.readAll();
+        f.close();
+      }
+
+      if (destContent != sourceContent) {
+         QString newFinalKey = QLatin1String("1-") + newUniqueKey;
+         int i = 1;
+         while (QFile::exists(d->path + QString::fromLatin1("/cur/") + newFinalKey)) {
+           i++;
+           newFinalKey = QString::number(i) + QLatin1Char('-') + newUniqueKey;
+         }
+         finalKey = d->path + QString::fromLatin1("/cur/") + newFinalKey;
+      } else {
+            QFile::remove(finalKey); //they are the same
+      }
+    }
+
+    if (!f.rename(finalKey)) {
+        qWarning() << "Maildir: Failed to rename entry: " << f.fileName() << " to "  << finalKey  << "! Error: " << f.errorString();
+        // d->lastError = i18n("Failed to update the file name %1 to %2 on the disk. The error was: %3." , f.fileName(), finalKey, f.errorString());
+        return QString();
+    }
+    qWarning() << "Renamed file: " << f.fileName() << finalKey;
+
+    // KeyCache *keyCache = KeyCache::self();
+    // keyCache->removeKey(d->path, key);
+    // keyCache->addCurKey(d->path, newUniqueKey);
+
+    return newUniqueKey;
+}
+
 Maildir::Flags Maildir::readEntryFlags(const QString& key)
 {
     Flags flags;
diff --git a/examples/maildirresource/libmaildir/maildir.h b/examples/maildirresource/libmaildir/maildir.h
index a89a832..6c68656 100644
--- a/examples/maildirresource/libmaildir/maildir.h
+++ b/examples/maildirresource/libmaildir/maildir.h
@@ -167,13 +167,14 @@ public:
      */
     QByteArray readEntry( const QString& key ) const;
 
-    enum MailFlags {
-        Forwarded,
-        Replied,
-        Seen,
-        Flagged
+    enum Flag {
+        Forwarded = 0x1,
+        Replied = 0x2,
+        Seen = 0x4,
+        Flagged = 0x8,
+        Deleted = 0x10
     };
-    Q_DECLARE_FLAGS(Flags, MailFlags);
+    Q_DECLARE_FLAGS(Flags, Flag);
 
     /**
      * Return the flags encoded in the maildir file name for an entry
@@ -184,7 +185,7 @@ public:
      * Return the contents of the headers section of the file the maildir with the given @p file, that
      * is a full path to the file. You can get it by using findRealKey(key) .
      */
-    QByteArray readEntryHeadersFromFile( const QString& file ) const;
+    static QByteArray readEntryHeadersFromFile( const QString& file );
 
     /**
      * Return the contents of the headers section of the file the maildir with the given @p key.
@@ -211,7 +212,7 @@ public:
      * Change the flags for an entry specified by @p key. Returns the new key of the entry (the key might change because
      * flags are stored in the unique filename).
      */
-    // QString changeEntryFlags( const QString& key, const Sink::Item::Flags& flags );
+    QString changeEntryFlags( const QString& key, const Flags& flags );
 
     /**
      * Moves this maildir into @p destination.
@@ -261,6 +262,19 @@ public:
      querying the last error string. */
     QString lastError() const;
 
+    /**
+     * Returns the key from the file identified by the full path @param file.
+     */
+    static QString getKeyFromFile( const QString& file );
+
+    /**
+     * Returns the directory from a file.
+     * 
+     * Strips key and new/cur/tmp.
+     * The returned path is ended with a trailing slash.
+     */
+    static QString getDirectoryFromFile( const QString& file );
+
 private:
     void swap( const Maildir& );
     class Private;
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 33883a7..0ddd8f8 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -46,6 +46,9 @@
 #define ENTITY_TYPE_MAIL "mail"
 #define ENTITY_TYPE_FOLDER "folder"
 
+#undef DEBUG_AREA
+#define DEBUG_AREA "resource.maildir"
+
 MaildirResource::MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline)
     : Sink::GenericResource(instanceIdentifier, pipeline),
     mMailAdaptorFactory(QSharedPointer<MaildirMailAdaptorFactory>::create()),
@@ -103,7 +106,7 @@ void MaildirResource::synchronizeFolders(Sink::Storage::Transaction &transaction
             //we should rather iterate over an index that contains every uid exactly once. The remoteId index would be such an index,
             //but we currently fail to iterate over all entries in an index it seems.
             // auto remoteIds = synchronizationTransaction.openDatabase("rid.mapping." + bufferType, std::function<void(const Sink::Storage::Error &)>(), true);
-            auto mainDatabase = transaction.openDatabase(bufferType + ".main");
+            auto mainDatabase = Sink::Storage::mainDatabase(transaction, bufferType);
             mainDatabase.scan("", [&](const QByteArray &key, const QByteArray &) {
                 callback(key);
                 return true;
@@ -132,6 +135,8 @@ void MaildirResource::synchronizeFolders(Sink::Storage::Transaction &transaction
 void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, const QString &path)
 {
     Trace() << "Synchronizing mails" << path;
+    auto time = QSharedPointer<QTime>::create();
+    time->start();
     const QByteArray bufferType = ENTITY_TYPE_MAIL;
 
     KPIM::Maildir maildir(path, true);
@@ -162,7 +167,9 @@ void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction,
         }
     );
 
+    int count = 0;
     while (entryIterator->hasNext()) {
+        count++;
         const QString filePath = QDir::fromNativeSeparators(entryIterator->next());
         const QString fileName = entryIterator->fileName();
         const auto remoteId = filePath.toUtf8();
@@ -172,6 +179,7 @@ void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction,
         msg->parse();
 
         const auto flags = maildir.readEntryFlags(fileName);
+        const auto maildirKey = maildir.getKeyFromFile(fileName);
 
         Trace() << "Found a mail " << filePath << " : " << fileName << msg->subject(true)->asUnicodeString();
 
@@ -181,12 +189,16 @@ void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction,
         mail.setProperty("senderName", msg->from(true)->asUnicodeString());
         mail.setProperty("date", msg->date(true)->dateTime());
         mail.setProperty("folder", folderLocalId);
-        mail.setProperty("mimeMessage", filePath);
+        //We only store the directory path + key, so we facade can add the changing bits (flags)
+        mail.setProperty("mimeMessage", KPIM::Maildir::getDirectoryFromFile(filePath) + maildirKey);
         mail.setProperty("unread", !flags.testFlag(KPIM::Maildir::Seen));
         mail.setProperty("important", flags.testFlag(KPIM::Maildir::Flagged));
 
         createOrModify(transaction, synchronizationTransaction, *mMailAdaptorFactory, bufferType, remoteId, mail);
     }
+    const auto elapsed = time->elapsed();
+    Trace() << "Synchronized " << count << " mails in " << listingPath << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
+
 }
 
 KAsync::Job<void> MaildirResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore)
@@ -216,7 +228,7 @@ KAsync::Job<void> MaildirResource::replay(Sink::Storage &synchronizationStore, c
 
     Trace() << "Replaying " << key << type;
     if (type == ENTITY_TYPE_FOLDER) {
-        Sink::EntityBuffer buffer(value.data(), value.size());
+        Sink::EntityBuffer buffer(value);
         const Sink::Entity &entity = buffer.entity();
         const auto metadataBuffer = Sink::EntityBuffer::readBuffer<Sink::Metadata>(entity.metadata());
         if (metadataBuffer && !metadataBuffer->replayToSource()) {
@@ -248,7 +260,7 @@ KAsync::Job<void> MaildirResource::replay(Sink::Storage &synchronizationStore, c
             Warning() << "Unkown operation" << operation;
         }
     } else if (type == ENTITY_TYPE_MAIL) {
-        Sink::EntityBuffer buffer(value.data(), value.size());
+        Sink::EntityBuffer buffer(value);
         const Sink::Entity &entity = buffer.entity();
         const auto metadataBuffer = Sink::EntityBuffer::readBuffer<Sink::Metadata>(entity.metadata());
         if (metadataBuffer && !metadataBuffer->replayToSource()) {
@@ -268,10 +280,19 @@ KAsync::Job<void> MaildirResource::replay(Sink::Storage &synchronizationStore, c
             }
             const auto parentFolderPath = parentFolderRemoteId;
             KPIM::Maildir maildir(parentFolderPath, false);
-            //FIXME assemble the MIME message
-            const auto id = maildir.addEntry("foobar");
-            Trace() << "Creating a new mail: " << id;
-            recordRemoteId(ENTITY_TYPE_MAIL, mail.identifier(), id.toUtf8(), synchronizationTransaction);
+            if (!maildir.isValid(true)) {
+                return KAsync::error<void>(1, "Invalid folder " + parentFolderPath);
+            }
+            //FIXME move the mime message from the mimeMessage property to the proper place.
+            Trace() << "Creating a new mail.";
+            const auto remoteId = maildir.addEntry("foobar");
+            if (remoteId.isEmpty()) {
+                Warning() << "Failed to create mail: " << remoteId;
+                return KAsync::error<void>(1, "Failed to create mail.");
+            } else {
+                Trace() << "Mail created: " << remoteId;
+                recordRemoteId(ENTITY_TYPE_MAIL, mail.identifier(), remoteId.toUtf8(), synchronizationTransaction);
+            }
         } else if (operation == Sink::Operation_Removal) {
             const auto uid = Sink::Storage::uidFromKey(key);
             const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, uid, synchronizationTransaction);
@@ -279,7 +300,26 @@ KAsync::Job<void> MaildirResource::replay(Sink::Storage &synchronizationStore, c
             QFile::remove(remoteId);
             removeRemoteId(ENTITY_TYPE_MAIL, uid, remoteId, synchronizationTransaction);
         } else if (operation == Sink::Operation_Modification) {
-            Warning() << "Mail modifications are not implemented";
+            const auto uid = Sink::Storage::uidFromKey(key);
+            const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, uid, synchronizationTransaction);
+            Trace() << "Modifying a mail: " << remoteId;
+            auto parts = remoteId.split('/');
+            const auto filename = parts.takeLast(); //filename
+            parts.removeLast(); //cur/new folder
+            auto maildirPath = parts.join('/');
+
+            KPIM::Maildir maildir(maildirPath, false);
+
+            const Sink::ApplicationDomain::Mail mail(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, mMailAdaptorFactory->createAdaptor(entity));
+
+            //get flags from
+            KPIM::Maildir::Flags flags;
+            if (!mail.getProperty("unread").toBool()) {
+                flags |= KPIM::Maildir::Seen;
+            }
+
+            auto newRemoteId = maildir.changeEntryFlags(filename, flags);
+            updateRemoteId(ENTITY_TYPE_MAIL, uid, QString(maildirPath + "/cur/" + newRemoteId).toUtf8(), synchronizationTransaction);
         } else {
             Warning() << "Unkown operation" << operation;
         }
@@ -299,20 +339,32 @@ KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray
     auto synchronizationTransaction = synchronizationStore->createTransaction(Sink::Storage::ReadOnly);
     Trace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
     if (domainType == ENTITY_TYPE_MAIL) {
-        if (inspectionType == Sink::Resources::Inspection::PropertyInspectionType) {
+        if (inspectionType == Sink::ResourceControl::Inspection::PropertyInspectionType) {
             if (property == "unread") {
                 const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction);
                 const auto flags = KPIM::Maildir::readEntryFlags(remoteId.split('/').last());
-                if (expectedValue.toBool() && !(flags & KPIM::Maildir::Seen)) {
-                    return KAsync::error<void>(1, "Expected seen but couldn't find it.");
+                if (expectedValue.toBool() && (flags & KPIM::Maildir::Seen)) {
+                    return KAsync::error<void>(1, "Expected unread but couldn't find it.");
                 }
-                if (!expectedValue.toBool() && (flags & KPIM::Maildir::Seen)) {
-                    return KAsync::error<void>(1, "Expected seen but couldn't find it.");
+                if (!expectedValue.toBool() && !(flags & KPIM::Maildir::Seen)) {
+                    return KAsync::error<void>(1, "Expected read but couldn't find it.");
+                }
+                return KAsync::null<void>();
+            }
+            if (property == "subject") {
+                const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction);
+
+                KMime::Message *msg = new KMime::Message;
+                msg->setHead(KMime::CRLFtoLF(KPIM::Maildir::readEntryHeadersFromFile(remoteId)));
+                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::Resources::Inspection::ExistenceInspectionType) {
+        if (inspectionType == Sink::ResourceControl::Inspection::ExistenceInspectionType) {
             const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction);
             if (QFileInfo(remoteId).exists() != expectedValue.toBool()) {
                 return KAsync::error<void>(1, "Wrong file existence: " + remoteId);
diff --git a/examples/maildirresource/maildirresource.h b/examples/maildirresource/maildirresource.h
index 9af2f39..32eb88c 100644
--- a/examples/maildirresource/maildirresource.h
+++ b/examples/maildirresource/maildirresource.h
@@ -32,12 +32,15 @@ class MaildirMailAdaptorFactory;
 class MaildirFolderAdaptorFactory;
 
 /**
- * A maildir resource
+ * A maildir resource.
  * 
  * Implementation details:
  * The remoteid's have the following formats:
  * files: full file path
  * directories: full directory path
+ * 
+ * The resource moves all messages from new to cur during sync and thus expectes all messages that are in the store to always reside in cur.
+ * The tmp directory is never directly used
  */
 class MaildirResource : public Sink::GenericResource
 {