From 5fc3cf21ae04fc2af8bb44cfa816baba9d0023d0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 18 Dec 2021 18:57:16 +0100
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 {