From ea6d15d935be12a75e9f09edbeb05d7e8c0e909c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 24 Feb 2021 12:19:35 +0100
Subject: [PATCH] Apply reply-self to reply header

---
 app/src/main/java/eu/faircode/email/EntityMessage.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index e08ef660cc..7ab2e4f3b7 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -368,8 +368,12 @@ public class EntityMessage implements Serializable {
                 p.appendText(subject);
                 p.appendElement("br");
             }
-        } else
-            p.text(DF.format(new Date(received)) + " " + MessageHelper.formatAddresses(from) + ":");
+        } else {
+            DB db = DB.getInstance(context);
+            List<TupleIdentityEx> identities = db.identity().getComposableIdentities(account);
+            boolean self = replySelf(identities, account);
+            p.text(DF.format(new Date(received)) + " " + MessageHelper.formatAddresses(self ? to : from) + ":");
+        }
 
         if (separate) {
             Element div = document.createElement("div");