1 files changed, 17 insertions, 5 deletions

diff --git a/common/specialpurposepreprocessor.cpp b/common/specialpurposepreprocessor.cpp
index be5fa50..25a6d1a 100644
--- a/common/specialpurposepreprocessor.cpp
+++ b/common/specialpurposepreprocessor.cpp
@@ -46,7 +46,7 @@ QByteArray getSpecialPurposeType(const QString &name)
 }
 }
 
-SpecialPurposeProcessor::SpecialPurposeProcessor(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier) : mResourceType(resourceType), mResourceInstanceIdentifier(resourceInstanceIdentifier) {}
+SpecialPurposeProcessor::SpecialPurposeProcessor() : Sink::Preprocessor() {}
 
 QByteArray SpecialPurposeProcessor::findFolder(const QByteArray &specialPurpose, bool createIfMissing)
 {
@@ -60,7 +60,7 @@ QByteArray SpecialPurposeProcessor::findFolder(const QByteArray &specialPurpose,
 
         if (!mSpecialPurposeFolders.contains(specialPurpose) && createIfMissing) {
             SinkTrace() << "Failed to find a " << specialPurpose << " folder, creating a new one";
-            auto folder = ApplicationDomain::Folder::create(mResourceInstanceIdentifier);
+            auto folder = ApplicationDomain::Folder::create(resourceInstanceIdentifier());
             folder.setSpecialPurpose(QByteArrayList() << specialPurpose);
             folder.setName(sSpecialPurposeFolders.value(specialPurpose));
             folder.setIcon("folder");
@@ -104,7 +104,19 @@ void SpecialPurposeProcessor::moveToFolder(Sink::ApplicationDomain::ApplicationD
 
 void SpecialPurposeProcessor::newEntity(Sink::ApplicationDomain::ApplicationDomainType &newEntity)
 {
-    moveToFolder(newEntity);
+    auto mail = newEntity.cast<ApplicationDomain::Mail>();
+    const auto folder = mail.getFolder();
+    if (folder.isEmpty()) {
+        moveToFolder(newEntity);
+    } else {
+        bool isDraft = findFolder(ApplicationDomain::SpecialPurpose::Mail::drafts) == folder;
+        bool isSent = findFolder(ApplicationDomain::SpecialPurpose::Mail::sent) == folder;
+        bool isTrash = findFolder(ApplicationDomain::SpecialPurpose::Mail::trash) == folder;
+        mail.setDraft(isDraft);
+        mail.setTrash(isTrash);
+        mail.setSent(isSent);
+    }
+
 }
 
 void SpecialPurposeProcessor::modifiedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity, Sink::ApplicationDomain::ApplicationDomainType &newEntity)
@@ -118,8 +130,8 @@ void SpecialPurposeProcessor::modifiedEntity(const Sink::ApplicationDomain::Appl
         bool isSent = findFolder(ApplicationDomain::SpecialPurpose::Mail::sent) == folder;
         bool isTrash = findFolder(ApplicationDomain::SpecialPurpose::Mail::trash) == folder;
         mail.setDraft(isDraft);
-        mail.setTrash(isSent);
-        mail.setSent(isTrash);
+        mail.setTrash(isTrash);
+        mail.setSent(isSent);
     } else {
         moveToFolder(newEntity);
     }