From 24b43019e108f9d3a99f5d6d1055cdb7c3bb9255 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 20 Dec 2021 20:24:00 +0100
Subject: [PATCH] Prevent deleting messages when auto expunge is disabled

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

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index efa260d016..7ab2629b4f 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3579,8 +3579,8 @@ class Core {
 
         if (imessage.isSet(Flags.Flag.DELETED)) {
             Log.w(folder.name + " deleted uid=" + uid);
-            expunge(context, ifolder, Arrays.asList(imessage));
-            throw new MessageRemovedException("Deleted");
+            if (expunge(context, ifolder, Arrays.asList(imessage)))
+                throw new MessageRemovedException("Deleted");
         }
 
         MessageHelper helper = new MessageHelper(imessage, context);