From 97332375ac26828a539eaaa8d1150f0453628b1a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 15 Aug 2024 23:51:40 +0200
Subject: [PATCH] JavaMail: fixed EXPUNGE/VANISHED interaction

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