diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 355f57e2c3..2c8e47ec73 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -849,7 +849,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             tvIdentityTitle.setVisibility(show_addresses && debug && via != null ? View.VISIBLE : View.GONE);
             tvIdentity.setVisibility(show_addresses && debug && via != null ? View.VISIBLE : View.GONE);
-            tvIdentity.setText(MessageHelper.formatAddresses(new Address[]{via}));
+            tvIdentity.setText(via == null ? null : MessageHelper.formatAddresses(new Address[]{via}));
 
             tvTimeExTitle.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
             tvTimeEx.setVisibility(show_addresses ? View.VISIBLE : View.GONE);