Merge pull request #752 from Infomaniak/forward

fix(Forward): Body not inserted in composeMessageView
Infomaniak · May 23, 2023 · 3839ae7 · 3839ae7
2 parents b4556b9 + 1f7aa8b
commit 3839ae7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/MailCore/Utils/Constants.swift b/MailCore/Utils/Constants.swift
@@ -80,6 +80,7 @@ public enum Constants {
     public static func forwardQuote(message: Message) -> String {
         let date = DateFormatter.localizedString(from: message.date, dateStyle: .medium, timeStyle: .short)
         let to = ListFormatter.localizedString(byJoining: message.to.map(\.htmlDescription))
+        let subject = message.formattedSubject.replacingOccurrences(of: "'", with: "’")
         var cc: String {
             if !message.cc.isEmpty {
                 return "<div>\(MailResourcesStrings.Localizable.ccTitle) \(ListFormatter.localizedString(byJoining: message.cc.map(\.htmlDescription)))<br></div>"
@@ -92,7 +93,7 @@ public enum Constants {
         <div>---------- \(MailResourcesStrings.Localizable.messageForwardHeader) ---------<br></div>
         <div>\(MailResourcesStrings.Localizable.fromTitle) \(message.from.first?.htmlDescription ?? "")<br></div>
         <div>\(MailResourcesStrings.Localizable.dateTitle) \(date)<br></div>
-        <div>\(MailResourcesStrings.Localizable.subjectTitle) \(message.formattedSubject)<br></div>
+        <div>\(MailResourcesStrings.Localizable.subjectTitle) \(subject)<br></div>
         <div>\(MailResourcesStrings.Localizable.toTitle) \(to)<br></div>
         \(cc)
         <div><br></div>