From 5230a6f9eb7428676de9807bb95a29c23be1c98f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Sat, 18 Jun 2016 15:55:34 +0200
Subject: [PATCH] Reference the message-id of parent comment's email
 notification for responses

---
 ...rofileCommentResponseOwnerUserNotificationEvent.class.php | 5 +++++
 ...UserProfileCommentResponseUserNotificationEvent.class.php | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php
index c70a97be2d..cdf4ab2245 100644
--- a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php
@@ -5,6 +5,7 @@ use wcf\data\user\User;
 use wcf\data\user\UserProfile;
 use wcf\system\cache\runtime\CommentRuntimeCache;
 use wcf\system\cache\runtime\UserProfileRuntimeCache;
+use wcf\system\email\Email;
 use wcf\system\request\LinkHandler;
 use wcf\system\user\notification\object\CommentResponseUserNotificationObject;
 use wcf\system\WCF;
@@ -97,9 +98,13 @@ class UserProfileCommentResponseOwnerUserNotificationEvent extends AbstractShare
 			]);
 		}
 		
+		$messageID = '<com.woltlab.wcf.user.profileComment.notification/'.$comment->commentID.'@'.Email::getHost().'>';
+		
 		return [
 			'template' => 'email_notification_userProfileCommentResponseOwner',
 			'application' => 'wcf',
+			'in-reply-to' => [$messageID],
+			'references' => [$messageID],
 			'variables' => [
 				'commentAuthor' => $commentAuthor,
 				'owner' => $owner
diff --git a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php
index d2ade897b2..ac7ea1e4b6 100644
--- a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\user\notification\event;
 use wcf\system\cache\runtime\UserProfileRuntimeCache;
+use wcf\system\email\Email;
 
 /**
  * User notification event for profile comment responses.
@@ -72,9 +73,13 @@ class UserProfileCommentResponseUserNotificationEvent extends AbstractSharedUser
 	public function getEmailMessage($notificationType = 'instant') {
 		$owner = UserProfileRuntimeCache::getInstance()->getObject($this->additionalData['objectID']);
 		
+		$messageID = '<com.woltlab.wcf.user.profileComment.notification/'.$comment->commentID.'@'.Email::getHost().'>';
+		
 		return [
 			'template' => 'email_notification_userProfileCommentResponse',
 			'application' => 'wcf',
+			'in-reply-to' => [$messageID],
+			'references' => [$messageID],
 			'variables' => [
 				'owner' => $owner
 			]
-- 
2.20.1