From a0a4421e18522b2e6f96ef9e45e3f67b3282990f Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 5 Aug 2015 17:43:13 -0500
Subject: [PATCH] email: Treat bounce email as a reply
---
include/class.mailfetch.php | 2 +-
include/class.mailparse.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 0887ec7c9..1aa28471e 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -666,7 +666,7 @@ class MailFetcher {
// Fetch the original References and assign to 'references'
if ($headers = $this->getOriginalMessageHeaders($mid)) {
$vars['references'] = $headers['references'];
- $vars['in-reply-to'] = @$headers['in-reply-to'] ?: null;
+ $vars['in-reply-to'] = $headers['message-id'] ?: @$headers['in-reply-to'] ?: null;
}
// Fetch deliver status report
$vars['message'] = $this->getDeliveryStatusMessage($mid) ?: $this->getBody($mid);
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index ab69f8ce2..f530ac50b 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -694,7 +694,7 @@ class EmailDataParser {
// Fetch the original References and assign to 'references'
if ($headers = $parser->getOriginalMessageHeaders()) {
$data['references'] = $headers['references'];
- $data['in-reply-to'] = @$headers['in-reply-to'] ?: null;
+ $data['in-reply-to'] = $headers['message-id'] ?: @$headers['in-reply-to'] ?: null;
}
// Fetch deliver status report
$data['message'] = $parser->getDeliveryStatusMessage() ?: $parser->getBody();
--
GitLab