From d16a1a97085931c3fa25e17b63cb0cbcb4a4e120 Mon Sep 17 00:00:00 2001
From: smizrahi <seb.mizrahi@gmail.com>
Date: Wed, 6 May 2026 19:24:00 +0200
Subject: [PATCH] fix(mail): escape References/Organization/Newsgroups headers
 in HTML forward so message-id chevrons aren't parsed as HTML tags hiding the
 quoted body. Closes #6046.

---
 SoObjects/Mailer/SOGoMailForward.m | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m
index 44567b5d8..f72286e71 100644
--- a/SoObjects/Mailer/SOGoMailForward.m
+++ b/SoObjects/Mailer/SOGoMailForward.m
@@ -153,7 +153,7 @@
   NSString *rc;
 
   if (htmlComposition)
-    rc = [NSString stringWithFormat: @"%@<br/>", [self _headerField: @"organization"]];
+    rc = [NSString stringWithFormat: @"%@<br/>", [[self _headerField: @"organization"] stringByEscapingHTMLString]];
   else
     rc = [NSString stringWithFormat: @"%@\n", [self _headerField: @"organization"]];
 
@@ -205,7 +205,7 @@
   NSString *rc;
 
   if (htmlComposition)
-    rc = [NSString stringWithFormat: @"%@<br/>", [self _headerField: @"newsgroups"]];
+    rc = [NSString stringWithFormat: @"%@<br/>", [[self _headerField: @"newsgroups"] stringByEscapingHTMLString]];
   else
     rc = [NSString stringWithFormat: @"%@\n", [self _headerField: @"newsgroups"]];
 
@@ -222,7 +222,7 @@
   NSString *rc;
 
   if (htmlComposition)
-    rc = [NSString stringWithFormat: @"%@<br/>", [self _headerField: @"references"]];
+    rc = [NSString stringWithFormat: @"%@<br/>", [[self _headerField: @"references"] stringByEscapingHTMLString]];
   else
     rc = [NSString stringWithFormat: @"%@\n", [self _headerField: @"references"]];