diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index dd901d8748..2f3062ed54 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1849,7 +1849,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     String personal = address.getPersonal();
 
                     if (TextUtils.isEmpty(personal)) {
-                        if (email != null) {
+                        if (!TextUtils.isEmpty(email)) {
                             int start = ssb.length();
                             ssb.append(email);
                             ssb.setSpan(new ForegroundColorSpan(textColorLink), start, ssb.length(), 0);
@@ -1857,7 +1857,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     } else {
                         if (full) {
                             ssb.append(personal).append(" <");
-                            if (email != null) {
+                            if (!TextUtils.isEmpty(email)) {
                                 int start = ssb.length();
                                 ssb.append(email);
                                 ssb.setSpan(new ForegroundColorSpan(textColorLink), start, ssb.length(), 0);