diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 0996aba17a..72ce9b0bfb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -7358,7 +7358,7 @@ public class FragmentCompose extends FragmentBase {
                     if (dirty) {
                         // Update draft
                         draft.identity = ident;
-                        draft.extra = extra;
+                        draft.extra = (identity.sender_extra ? extra : null);
                         draft.from = afrom;
                         draft.to = ato;
                         draft.cc = acc;