diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index d96c9a8a88..05ee960daa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3504,13 +3504,13 @@ public class FragmentCompose extends FragmentBase {
 
                         Document document = HtmlHelper.sanitizeCompose(context, doc.html(), true);
 
+                        for (Element e : ref)
+                            document.body().appendChild(e);
+
                         EntityIdentity identity = null;
                         if (data.draft.identity != null)
                             identity = db.identity().getIdentity(data.draft.identity);
 
-                        for (Element e : ref)
-                            document.body().appendChild(e);
-
                         addSignature(context, document, data.draft, identity);
 
                         String html = document.html();