diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 426e4228ef..5165df0f33 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -188,9 +188,10 @@ public class FragmentCompose extends FragmentEx {
                 String html = Html.toHtml(etBody.getText());
                 Log.i(Helper.TAG, html);
                 int cstart = html.indexOf("<tt>");
-                int cend = html.indexOf("</tt>");
+                int cend = html.lastIndexOf("</tt>");
                 if (cstart >= 0 && cend > cstart) {
                     html = html.substring(0, cstart + 4) + signature + html.substring(cend);
+                    Log.i(Helper.TAG, "tt html="+html);
                     etBody.setText(Html.fromHtml(html));
                 }
             }