From 2e2fe58cc195a453b2ed7d828af89481da8afd54 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 13 Jun 2019 17:53:56 +0200
Subject: [PATCH] Erase identity on pre move

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

diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 1d008c9243..c30c56ab8f 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -153,13 +153,16 @@ public class EntityOperation {
 
                     // Copy message to target folder
                     long id = message.id;
+                    Long identity = message.identity;
                     long uid = message.uid;
                     boolean seen = message.seen;
                     boolean ui_seen = message.ui_seen;
                     boolean ui_browsed = message.ui_browsed;
+
                     message.id = null;
                     message.account = target.account;
                     message.folder = target.id;
+                    message.identity = null;
                     message.uid = null;
                     if (autoread) {
                         message.seen = true;
@@ -173,6 +176,7 @@ public class EntityOperation {
                     message.id = id;
                     message.account = source.account;
                     message.folder = source.id;
+                    message.identity = identity;
                     message.uid = uid;
                     message.seen = seen;
                     message.ui_seen = ui_seen;