From 80aa2e72623fc89d2c653f7b0be5636cdd5a55bf Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 31 May 2021 14:53:29 +0200
Subject: [PATCH] Added add/found old resolution

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

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index aabd8c8f86..856689782c 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1088,6 +1088,18 @@ class Core {
                         newuid = found;
                     else if (!newuid.equals(found)) {
                         Log.w(folder.name + " Added=" + newuid + " found=" + found);
+                        try {
+                            Message iprev = ifolder.getMessageByUID(Math.min(newuid, found));
+                            if (iprev != null) {
+                                iprev.setFlag(Flags.Flag.DELETED, true);
+                                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                                boolean perform_expunge = prefs.getBoolean("perform_expunge", true);
+                                if (perform_expunge)
+                                    ifolder.expunge();
+                            }
+                        } catch (MessagingException ex) {
+                            Log.w(ex);
+                        }
                         newuid = Math.max(newuid, found);
                     }
             } catch (MessagingException ex) {