diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index e1092c5d54..ebe133e5b0 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1656,10 +1656,12 @@ public class MessageHelper {
                     Log.w(ex);
                 }
 
-            email = decodeMime(email);
-            email = punyCode(email);
+            if (email != null) {
+                email = decodeMime(email);
+                email = punyCode(email);
 
-            iaddress.setAddress(email);
+                iaddress.setAddress(email);
+            }
 
             if (personal != null) {
                 try {