diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d385d7e28e..f6638bf807 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1839,6 +1839,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         }
                     }
 
+                    if (outgoing && message.reply != null &&
+                            MessageHelper.equal(message.from, message.to))
+                        return message.reply;
+
                     return (outgoing ? message.to : message.from);
                 }