diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index deb5088f88..a2c5f5f207 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -864,9 +864,13 @@ public class FragmentCompose extends FragmentEx {
                             text = db.answer().getAnswer(answer).text;
 
                             String name = null;
-                            if (draft.to != null && draft.to.length > 0)
+                            String email = null;
+                            if (draft.to != null && draft.to.length > 0) {
                                 name = ((InternetAddress) draft.to[0]).getPersonal();
+                                email = ((InternetAddress) draft.to[0]).getAddress();
+                            }
                             text = text.replace("$name$", name == null ? "" : name);
+                            text = text.replace("$email$", email == null ? "" : email);
                         }
                         draft.subject = context.getString(R.string.title_subject_reply, ref.subject);
                         body = String.format("%s<br><br>%s %s:<br><br><blockquote>%s</blockquote>",