From 1a65df8d289a1f0b94ede2352f1450f08194effb Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 21 Sep 2025 07:31:25 +0200
Subject: [PATCH] Prevent rare NPE

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

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 268ee9f831..81a5eb793b 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1901,11 +1901,12 @@ class Core {
                     itrash.open(READ_WRITE);
                     try {
                         List<Message> trashed = new ArrayList<>();
-                        for (EntityMessage message : messages) {
-                            Message[] itrashed = itrash.search(new MessageIDTerm(message.msgid));
-                            if (itrashed != null && itrashed.length == 1)
-                                trashed.add(itrashed[0]);
-                        }
+                        for (EntityMessage message : messages)
+                            if (!TextUtils.isEmpty(message.msgid)) {
+                                Message[] itrashed = itrash.search(new MessageIDTerm(message.msgid));
+                                if (itrashed != null && itrashed.length == 1)
+                                    trashed.add(itrashed[0]);
+                            }
 
                         itrash.setFlags(trashed.toArray(new Message[0]), new Flags(Flags.Flag.DELETED), true);
                         if (perform_expunge)