From 14ce0a02aaaf7fd62aab62cfcbe1fcd72379f651 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 2 Jan 2021 08:50:28 +0100
Subject: [PATCH] Revert "Simplification"

This reverts commit e9113b3d579519ffd627443bfeeade85bbb22026.
---
 app/src/main/java/eu/faircode/email/Core.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index c101af0dfd..9fe8bab4e1 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1195,8 +1195,10 @@ class Core {
             throw new IllegalArgumentException("account missing");
 
         try {
-            if (removed)
+            if (removed) {
+                db.message().deleteMessage(folder.id, uid);
                 throw new MessageRemovedException("removed uid=" + uid);
+            }
 
             MimeMessage imessage = (MimeMessage) ifolder.getMessageByUID(uid);
             if (imessage == null)