From c982b2dc45b7e345c2f34aef10427d8a79f14193 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 30 May 2022 12:26:32 +0200
Subject: [PATCH] Update msgid of duplicated messages

---
 app/src/main/java/eu/faircode/email/Core.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 5ae4354da3..9deecff23a 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1444,6 +1444,15 @@ class Core {
                             msgids.put(message, msgid);
                             icopy = new MimeMessageEx(isession, is, msgid);
                             icopy.saveChanges();
+
+                            if (!copy) {
+                                List<EntityMessage> tmps = db.message().getMessagesByMsgId(message.account, message.msgid);
+                                for (EntityMessage tmp : tmps)
+                                    if (target.id.equals(tmp.folder)) {
+                                        db.message().setMessageMsgId(tmp.id, msgid);
+                                        break;
+                                    }
+                            }
                         } else
                             icopy = new MimeMessage(isession, is);
                     }