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)