diff --git a/app/src/main/java/eu/faircode/email/EntityAnswer.java b/app/src/main/java/eu/faircode/email/EntityAnswer.java
index 5e1f3f8c28..2ecc0626e6 100644
--- a/app/src/main/java/eu/faircode/email/EntityAnswer.java
+++ b/app/src/main/java/eu/faircode/email/EntityAnswer.java
@@ -200,7 +200,7 @@ public class EntityAnswer implements Serializable {
 
             if (c != null) {
                 v = Html.escapeHtml(SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG).format(c.getTime()));
-                text = text.substring(0, s) + v + text.substring(e);
+                text = text.substring(0, s) + v + text.substring(e + 1);
                 s = text.indexOf("$date", s + v.length());
             }
         }