From d38575caae2343e1e2edc43c2122b75c1d51a6ef Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 20 Dec 2021 07:29:06 +0100
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index f05b3737d6..0aa78c8fc3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -5558,7 +5558,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
         // Check headers for resend
         for (TupleMessageEx message : messages) {
-            if (message.headers == null)
+            if (message == null || message.headers == null)
                 continue;
             boolean resend = iProperties.getValue("resend", message.id);
             if (!resend)