From 74e6061ac5d1323d364491f084305655b92fd104 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 13 Aug 2024 19:56:44 +0200
Subject: [PATCH] Check for move of expunged messages

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

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 1e057dd227..9c3dd79efc 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1454,6 +1454,8 @@ class Core {
                 Message imessage = ifolder.getMessageByUID(message.uid);
                 if (imessage == null)
                     throw new MessageRemovedException("move without message");
+                if (imessage.isExpunged())
+                    throw new MessageRemovedException("move of expunged message");
                 map.put(imessage, message);
             } catch (MessageRemovedException ex) {
                 Log.e(ex);