From 7e30c8beae06825b8d6c7569475a978bed8d2d3b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 20 Jun 2025 09:09:12 +0200
Subject: [PATCH] Oops

---
 .../main/java/eu/faircode/email/BoundaryCallbackMessages.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 1b7c03ca55..fceaf8f409 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -129,7 +129,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         this.criteria = criteria;
         this.pageSize = pageSize;
 
-        if (this.folder != null || server || EntityFolder.INBOX.equals(this.criteria.with_folder_type))
+        if (this.criteria != null &&
+                (this.folder != null || server || EntityFolder.INBOX.equals(this.criteria.with_folder_type)))
             this.criteria.with_folder_type = null;
     }