Prevent NPE

3 weeks ago · 50a6f2f80c
parent 7f1ec8f308
commit 50a6f2f80c
1 changed files with 5 additions and 3 deletions
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@ -870,9 +870,11 @@ public class MessageHelper {
                String email = ((InternetAddress) from).getAddress();
                String user = UriHelper.getEmailUser(email);
                String domain = UriHelper.getEmailDomain(email);
+                if (message.extra != null) {
                    Pair<String, String> extra = getExtra(email, message.extra);
                    if (extra.second != null)
                        email = extra.second;
+                }
                address = address
                        .replace("$from$", email)
                        .replace("$user$", user)