From 1f7aa8b008615195b01389e3a0107071adcd30f4 Mon Sep 17 00:00:00 2001
From: Ambroise Decouttere <ambroise.decouttere@infomaniak.com>
Date: Tue, 23 May 2023 07:20:14 +0200
Subject: [PATCH] fix(Forward): Body not inserted in composeMessageView

---
 MailCore/Utils/Constants.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MailCore/Utils/Constants.swift b/MailCore/Utils/Constants.swift
index 8712c4fc8..d405073f0 100644
--- 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>