From 38c2b0f598c365429538a2548f853d7b6f63bc6f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 16 Aug 2018 17:14:05 +0000
Subject: [PATCH] Possible Message-ID fix

Refs #41
---
 app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 4a1d244f79..366afb4a0f 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -954,10 +954,8 @@ public class ServiceSynchronize extends LifecycleService {
                 EntityFolder sent = db.folder().getFolderByType(ident.account, EntityFolder.SENT);
                 if (sent == null)
                     ; // Leave message in outbox
-                else {
+                else
                     message.folder = sent.id;
-                    message.uid = null;
-                }
 
                 // Update state
                 if (message.thread == null)
@@ -1223,7 +1221,7 @@ public class ServiceSynchronize extends LifecycleService {
                 // - messages in archive have same id as original
                 if (message == null) {
                     // Will fetch headers within database transaction
-                    String msgid = imessage.getMessageID();
+                    String msgid = helper.getMessageID();
                     message = db.message().getMessageByMsgId(msgid);
                     if (message != null) {
                         EntityFolder mfolder = db.folder().getFolder(message.folder);