Merge pull request #823 from Infomaniak/fix-mailto-text-position

fix: Insert signature after mailto body
Infomaniak · Jun 22, 2023 · c09b6a1 · c09b6a1
2 parents 7aec620 + 943b677
commit c09b6a1
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/Mail/Views/New Message/ComposeMessageBodyView.swift b/Mail/Views/New Message/ComposeMessageBodyView.swift
@@ -132,12 +132,16 @@ struct ComposeMessageBodyView: View {
             }
 
             let html = "<br><br><div class=\"editorUserSignature\">\(signature.content)</div>"
-            switch signature.position {
-            case .beforeReplyMessage:
-                $draft.body.wrappedValue.insert(contentsOf: html, at: draft.body.startIndex)
-            case .afterReplyMessage:
-                $draft.body.wrappedValue.append(contentsOf: html)
+            var signaturePosition = draft.body.endIndex
+            if messageReply != nil {
+                switch signature.position {
+                case .beforeReplyMessage:
+                    signaturePosition = draft.body.startIndex
+                case .afterReplyMessage:
+                    signaturePosition = draft.body.endIndex
+                }
             }
+            $draft.body.wrappedValue.insert(contentsOf: html, at: signaturePosition)
         }
     }