diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index 1aba043dbf..80fa24db62 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -161,6 +161,8 @@ public class FragmentAnswer extends FragmentBase {
     }
 
     private void onActionSave() {
+        etText.clearComposingText();
+
         Bundle args = new Bundle();
         args.putLong("id", id);
         args.putString("name", etName.getText().toString());
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 19ca73e3e4..e29aa854b9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -524,6 +524,8 @@ public class FragmentIdentity extends FragmentBase {
                 name = hint.toString();
         }
 
+        etSignature.clearComposingText();
+
         Bundle args = new Bundle();
         args.putLong("id", id);
         args.putString("name", name);