diff --git a/Mail/Views/New Message/ComposeMessageBodyView.swift b/Mail/Views/New Message/ComposeMessageBodyView.swift
index 11f95de77..eb356ab60 100644
--- a/Mail/Views/New Message/ComposeMessageBodyView.swift
+++ b/Mail/Views/New Message/ComposeMessageBodyView.swift
@@ -132,12 +132,16 @@ struct ComposeMessageBodyView: View {
}
let html = "
\(signature.content)
"
- 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)
}
}