diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index ec34d5aaaf..5dd523b969 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -5499,7 +5499,7 @@ public class MessageHelper {
             result.add(address);
         }
 
-        return result.toArray(new Address[0]);
+        return (result.size() == 0 ? null : result.toArray(new Address[0]));
     }
 
     static void getStructure(Part part, SpannableStringBuilder ssb, int level, int textColorLink) {