From bd59f4914cd5b202f259afb35a72b748b0247e90 Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Sat, 23 May 2020 15:05:39 +0200
Subject: [PATCH] Add hint where the error comes from

---
 src/job.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/job.rs b/src/job.rs
index 7249cb0e5..19e2f7e65 100644
--- a/src/job.rs
+++ b/src/job.rs
@@ -519,7 +519,11 @@ impl Job {
                 ImapActionResult::RetryLater => Status::RetryLater,
                 ImapActionResult::Success => {
                     // XXX Rust-Imap provides no target uid on mv, so just set it to 0
+<<<<<<< HEAD
                     message::update_server_uid(context, &msg.rfc724_mid, &dest_folder, 0).await;
+=======
+                    message::update_server_uid(context, &msg.rfc724_mid, &dest_folder, 0); // The server_uid is set to 0 and then the email can't be found in MarkseenMsgOnImap() -> set_seen() -> prepare_imap_operation_on_msg().
+>>>>>>> 52196f64... Add hint where the error comes from
                     Status::Finished(Ok(()))
                 }
                 ImapActionResult::Failed => {