diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 463707607c..4eb8f39548 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -6886,10 +6886,10 @@ public class FragmentCompose extends FragmentBase {
                                     d.body().prependChild(e);
                                 else
                                     d.body().appendChild(e);
-
-                            addSignature(context, d, draft, identity);
                         }
 
+                        addSignature(context, d, draft, identity);
+
                         body = d.html();
 
                         // Create new revision