2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index dca1c78d40..024bad4dd6 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -90,6 +90,8 @@ class factory implements \phpbb\textformatter\cache_interface
 				post_id={UINT;optional}
 				post_url={URL;optional;postFilter=#false}
 				profile_url={URL;optional;postFilter=#false}
+				msg_id={UINT;optional}
+				msg_url={URL;optional;postFilter=#false}
 				time={UINT;optional}
 				url={URL;optional}
 				user_id={UINT;optional}
diff --git a/phpBB/phpbb/textformatter/s9e/quote_helper.php b/phpBB/phpbb/textformatter/s9e/quote_helper.php
index 86c33c7591..dc01883c43 100644
--- a/phpBB/phpbb/textformatter/s9e/quote_helper.php
+++ b/phpBB/phpbb/textformatter/s9e/quote_helper.php
@@ -40,6 +40,7 @@ class quote_helper
 	public function __construct(\phpbb\user $user, $root_path, $php_ext)
 	{
 		$this->post_url = append_sid($root_path . 'viewtopic.' . $php_ext, 'p={POST_ID}#p{POST_ID}', false);
+		$this->msg_url = append_sid($root_path . 'ucp.' . $php_ext, 'i=pm&mode=view&p={MSG_ID}', false);
 		$this->profile_url = append_sid($root_path . 'memberlist.' . $php_ext, 'mode=viewprofile&u={USER_ID}', false);
 		$this->user = $user;
 	}
@@ -53,6 +54,7 @@ class quote_helper
 	public function inject_metadata($xml)
 	{
 		$post_url = $this->post_url;
+		$msg_url = $this->msg_url;
 		$profile_url = $this->profile_url;
 		$user = $this->user;
 
@@ -65,6 +67,10 @@ class quote_helper
 				{
 					$attributes['post_url'] = str_replace('{POST_ID}', $attributes['post_id'], $post_url);
 				}
+				if (isset($attributes['msg_id']))
+				{
+					$attributes['msg_url'] = str_replace('{MSG_ID}', $attributes['msg_id'], $msg_url);
+				}
 				if (isset($attributes['time']))
 				{
 					$attributes['date'] = $user->format_date($attributes['time']);