Revert "JavaMail: fixed EXPUNGE/VANISHED interaction"

This reverts commit 97332375ac.

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--;
-						realTotal--;
+					messageCache.expungeMessage(m.getMessageNumber());
-						messageCache.expungeMessage(m.getMessageNumber());
+					msgs.add(m);
-						msgs.add(m);
-					} else
-						m.setExpunged(true);
 				}
 			}
 			if (!msgs.isEmpty() &&