From f1894d64fb67d7cc9f87ab63ed849cb7434612b9 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 11 Sep 2014 09:21:07 +0000 Subject: [PATCH] * Mail: Respect References AND In-Reply-To Headers, and set them on reply if available --- mail/inc/class.mail_compose.inc.php | 5 ++++- mail/templates/default/compose.xet | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index 0fb8fcb52b..fc39ee6cce 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -2169,9 +2169,12 @@ class mail_compose $_mailObject->Priority = $_formData['priority']; $_mailObject->Encoding = 'quoted-printable'; $_mailObject->AddCustomHeader('X-Mailer: EGroupware-Mail'); - if(isset($_formData['in-reply-to'])) { + if(isset($_formData['in-reply-to']) && !empty($_formData['in-reply-to'])) { $_mailObject->AddCustomHeader('In-Reply-To: '. $_formData['in-reply-to']); } + if(isset($_formData['references']) && !empty($_formData['references'])) { + $_mailObject->AddCustomHeader('References: '. $_formData['references']); + } if($_formData['disposition']) { $_mailObject->AddCustomHeader('Disposition-Notification-To: '. $_identity['ident_email']); } diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet index 67775f580e..f38b8cb946 100644 --- a/mail/templates/default/compose.xet +++ b/mail/templates/default/compose.xet @@ -57,6 +57,8 @@ + +