From 5097c0a5373dfe49ac3358867f019afe11419c02 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 8 Dec 2018 08:42:37 +0100
Subject: [PATCH] Keep existing uid

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

diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index c36348ce12..4fd96a63a6 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -2114,10 +2114,12 @@ public class ServiceSynchronize extends LifecycleService {
 
                 if (dup.folder.equals(folder.id) || outbox) {
                     String thread = helper.getThreadId(uid);
-                    Log.i(Helper.TAG, folder.name + " found as id=" + dup.id + "/" + uid +
+                    Log.i(Helper.TAG, folder.name + " found as id=" + dup.id + "/" +
+                            " uid=" + dup.uid + "/" + uid +
                             " msgid=" + msgid + " thread=" + thread);
                     dup.folder = folder.id; // From outbox
-                    dup.uid = uid;
+                    if (dup.uid == null)
+                        dup.uid = uid;
                     dup.msgid = msgid;
                     dup.thread = thread;
                     dup.error = null;