From b964f7f3915a15d920796e0f31271d3abb2fa086 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 15 Aug 2024 23:59:55 +0200
Subject: [PATCH] Revert "JavaMail: fixed EXPUNGE/VANISHED interaction"

This reverts commit 97332375ac26828a539eaaa8d1150f0453628b1a.
---
 app/src/main/java/com/sun/mail/imap/IMAPFolder.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/sun/mail/imap/IMAPFolder.java b/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
index be6e7cf8b1..00a48f2ec4 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
@@ -3643,14 +3643,11 @@ public class IMAPFolder extends Folder implements UIDFolder, ResponseHandler {
 		if (uidset != null) {
 			List<Message> msgs = new ArrayList<>();
 			for (long uid : UIDSet.toArray(uidset)) {
-				IMAPMessage m = uidTable.get(uid);
+				Message m = uidTable.get(uid);
 				if (m != null && m.getMessageNumber() > 0) {
-					if (doExpungeNotification) {
-						realTotal--;
-						messageCache.expungeMessage(m.getMessageNumber());
-						msgs.add(m);
-					} else
-						m.setExpunged(true);
+					realTotal--;
+					messageCache.expungeMessage(m.getMessageNumber());
+					msgs.add(m);
 				}
 			}
 			if (!msgs.isEmpty() &&