diff --git a/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift b/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift
index 5c5343b74..a3140ca0d 100644
--- a/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift
+++ b/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift
@@ -156,9 +156,6 @@ extension ComposeViewController {
         let styledQuote = input.quotedText.attributed(.regular(17))
 
         let mutableString = NSMutableAttributedString(attributedString: attributedString)
-        if input.isQuote, !mutableString.string.contains(styledQuote.string) {
-            mutableString.append(styledQuote)
-        }
 
         if let signatureRaw = getSignature() {
             func normalize(_ s: String) -> String {
@@ -178,6 +175,10 @@ extension ComposeViewController {
             }
         }
 
+        if input.isQuote, !mutableString.string.contains(styledQuote.string) {
+            mutableString.append(styledQuote)
+        }
+
         let height = max(decorator.frame(for: mutableString).height, 40)
 
         composeTextNode = TextViewCellNode(