3 files changed, 24 insertions, 3 deletions

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index aca1c01..8cbb9fa 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -491,8 +491,11 @@ public:
                 flags << Imap::Flags::Flagged;
             }
 
-            const bool messageChanged = changedProperties.contains(Sink::ApplicationDomain::Mail::MimeMessage::name);
-            if (messageChanged) {
+            const bool messageMoved = changedProperties.contains(ApplicationDomain::Mail::Folder::name);
+            const bool messageChanged = changedProperties.contains(ApplicationDomain::Mail::MimeMessage::name);
+            if (messageChanged || messageMoved) {
+                const auto folderId = folderIdFromMailRid(oldRemoteId);
+                const QString oldMailbox = syncStore().resolveLocalId(ENTITY_TYPE_FOLDER, folderId);
                 QByteArray content = KMime::LFtoCRLF(mail.getMimeMessage());
                 QDateTime internalDate = mail.getDate();
                 auto rid = QSharedPointer<QByteArray>::create();
@@ -504,7 +507,7 @@ public:
                         Trace() << "Finished creating a modified mail: " << remoteId;
                         *rid = remoteId;
                     })
-                    .then(imap->remove(mailbox, set))
+                    .then(imap->remove(oldMailbox, set))
                     .then<QByteArray>([rid, imap]() {
                         return *rid;
                     });
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index db68a53..49711a9 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -25,6 +25,7 @@
 #include <KIMAP/KIMAP/SelectJob>
 #include <KIMAP/KIMAP/AppendJob>
 #include <KIMAP/KIMAP/CreateJob>
+#include <KIMAP/KIMAP/CopyJob>
 #include <KIMAP/KIMAP/RenameJob>
 #include <KIMAP/KIMAP/DeleteJob>
 #include <KIMAP/KIMAP/StoreJob>
@@ -219,6 +220,15 @@ KAsync::Job<void> ImapServerProxy::expunge(const KIMAP::ImapSet &set)
     return runJob(job);
 }
 
+KAsync::Job<void> ImapServerProxy::copy(const KIMAP::ImapSet &set, const QString &newMailbox)
+{
+    auto copy = new KIMAP::CopyJob(mSession);
+    copy->setSequenceSet(set);
+    copy->setUidBased(true);
+    copy->setMailBox(newMailbox);
+    return runJob(copy);
+}
+
 KAsync::Job<void> ImapServerProxy::fetch(const KIMAP::ImapSet &set, KIMAP::FetchJob::FetchScope scope, FetchCallback callback)
 {
     auto fetch = new KIMAP::FetchJob(mSession);
@@ -304,6 +314,12 @@ KAsync::Job<void> ImapServerProxy::remove(const QString &mailbox, const QByteArr
     return remove(mailbox, set);
 }
 
+
+KAsync::Job<void> ImapServerProxy::move(const QString &mailbox, const KIMAP::ImapSet &set, const QString &newMailbox)
+{
+    return select(mailbox).then<void>(copy(set, newMailbox)).then<void>(store(set, QByteArrayList() << Flags::Deleted)).then<void>(expunge(set));
+}
+
 KAsync::Job<QString> ImapServerProxy::createSubfolder(const QString &parentMailbox, const QString &folderName)
 {
     auto folder = QSharedPointer<QString>::create();
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index 67ff000..95ed704 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -93,6 +93,7 @@ public:
     KAsync::Job<void> remove(const QString &mailbox);
     KAsync::Job<void> expunge();
     KAsync::Job<void> expunge(const KIMAP::ImapSet &set);
+    KAsync::Job<void> copy(const KIMAP::ImapSet &set, const QString &newMailbox);
 
     typedef std::function<void(const QString &,
                         const QMap<qint64,qint64> &,
@@ -109,6 +110,7 @@ public:
     KAsync::Job<QList<qint64>> fetchHeaders(const QString &mailbox);
     KAsync::Job<void> remove(const QString &mailbox, const KIMAP::ImapSet &set);
     KAsync::Job<void> remove(const QString &mailbox, const QByteArray &imapSet);
+    KAsync::Job<void> move(const QString &mailbox, const KIMAP::ImapSet &set, const QString &newMailbox);
     KAsync::Job<QString> createSubfolder(const QString &parentMailbox, const QString &folderName);
     KAsync::Job<QString> renameSubfolder(const QString &mailbox, const QString &newName);