diff --git a/app/src/main/java/eu/faircode/email/ActivitySignature.java b/app/src/main/java/eu/faircode/email/ActivitySignature.java
index 68a5d9517e..af011f086b 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySignature.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySignature.java
@@ -219,6 +219,7 @@ public class ActivitySignature extends ActivityBase {
         etText.setRaw(raw);
 
         if (!raw || dirty) {
+            etText.clearComposingText();
             String html = (raw
                     ? HtmlHelper.toHtml(etText.getText(), this)
                     : etText.getText().toString());