diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index fa59801c..734387f2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -89,10 +89,10 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             if (EntityFolder.DRAFTS.equals(message.folderType) ||
                     EntityFolder.OUTBOX.equals(message.folderType) ||
                     EntityFolder.SENT.equals(message.folderType)) {
-                tvFrom.setText(MessageHelper.getFormattedAddresses(message.to));
+                tvFrom.setText(MessageHelper.getFormattedAddresses(message.to, false));
                 tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.sent == null ? message.received : message.sent));
             } else {
-                tvFrom.setText(MessageHelper.getFormattedAddresses(message.from));
+                tvFrom.setText(MessageHelper.getFormattedAddresses(message.from, false));
                 tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.received));
             }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index 5b49da69..08179adb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -257,10 +257,10 @@ public class FragmentMessage extends FragmentEx {
 
                     String extra = (debug ? (message.ui_hide ? "HIDDEN " : "") + message.uid + "/" + message.id + " " : "");
 
-                    tvFrom.setText(message.from == null ? null : TextUtils.join(", ", message.from));
-                    tvTo.setText(message.to == null ? null : TextUtils.join(", ", message.to));
-                    tvCc.setText(message.cc == null ? null : TextUtils.join(", ", message.cc));
-                    tvBcc.setText(message.bcc == null ? null : TextUtils.join(", ", message.bcc));
+                    tvFrom.setText(message.from == null ? null : MessageHelper.getFormattedAddresses(message.from, true));
+                    tvTo.setText(message.to == null ? null : MessageHelper.getFormattedAddresses(message.to, true));
+                    tvCc.setText(message.cc == null ? null : MessageHelper.getFormattedAddresses(message.cc, true));
+                    tvBcc.setText(message.bcc == null ? null : MessageHelper.getFormattedAddresses(message.bcc, true));
                     tvTime.setText(message.sent == null ? null : df.format(new Date(message.sent)));
                     tvSubject.setText(message.subject);
                     tvCount.setText(extra + Integer.toString(message.count));
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index e924893d..20a7f99b 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -166,7 +166,7 @@ public class MessageHelper {
         return imessage.getReplyTo();
     }
 
-    static String getFormattedAddresses(Address[] addresses) {
+    static String getFormattedAddresses(Address[] addresses, boolean full) {
         if (addresses == null)
             return null;
 
@@ -177,6 +177,8 @@ public class MessageHelper {
                 String personal = a.getPersonal();
                 if (TextUtils.isEmpty(personal))
                     formatted.add(address.toString());
+                else if (full)
+                    formatted.add(personal + " <" + a.getAddress() + ">");
                 else
                     formatted.add(personal);
             } else