From 194555500adfb8a6bb108d72011d69b42af6bbff Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 24 Jul 2020 18:25:05 -0300
Subject: [PATCH] Regression: Mentions in thread title (#18369)

---
 app/threads/client/components/ThreadComponent.js | 2 +-
 app/threads/client/lib/normalizeThreadTitle.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/threads/client/components/ThreadComponent.js b/app/threads/client/components/ThreadComponent.js
index 36dcdd58f09..9cbcddf06f9 100644
--- a/app/threads/client/components/ThreadComponent.js
+++ b/app/threads/client/components/ThreadComponent.js
@@ -88,7 +88,7 @@ export default function ThreadComponent({ mid, rid, jump, room, ...props }) {
 			<VerticalBar rcx-thread-view width='full' style={style} display='flex' flexDirection='column' position='absolute' { ...!expanded && { width: '380px' } }>
 				<VerticalBar.Header>
 					<VerticalBar.Icon name='thread' />
-					<VerticalBar.Text>{headerTitle}</VerticalBar.Text>
+					<VerticalBar.Text dangerouslySetInnerHTML={{ __html: headerTitle }} />
 					<VerticalBar.Action aria-label={expandLabel} onClick={handleExpandButton} name={expandIcon}/>
 					<VerticalBar.Action aria-label={actionLabel} onClick={handleFollowButton} name={button}/>
 					<VerticalBar.Close aria-label={t('Close')} onClick={handleClose}/>
diff --git a/app/threads/client/lib/normalizeThreadTitle.js b/app/threads/client/lib/normalizeThreadTitle.js
index c2d9aaf0100..1eae0c55afb 100644
--- a/app/threads/client/lib/normalizeThreadTitle.js
+++ b/app/threads/client/lib/normalizeThreadTitle.js
@@ -8,7 +8,7 @@ import { MentionsParser } from '../../../mentions/lib/MentionsParser';
 
 export const normalizeThreadTitle = ({ ...message }) => {
 	if (message.msg) {
-		const filteredMessage = filterMarkdown(message.msg);
+		const filteredMessage = filterMarkdown(s.escapeHTML(message.msg));
 		if (!message.channels && !message.mentions) {
 			return filteredMessage;
 		}