diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js
index 422e465627743..9d51d106442c1 100644
--- a/app/ui-message/client/message.js
+++ b/app/ui-message/client/message.js
@@ -8,7 +8,8 @@ import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { timeAgo, formatDateAndTime } from '../../lib/client/lib/formatDate';
 import { DateFormat } from '../../lib/client';
-import { renderMessageBody, MessageTypes, MessageAction, call, normalizeThreadMessage } from '../../ui-utils/client';
+import { normalizeThreadTitle } from '../../threads/client/lib/normalizeThreadTitle';
+import { renderMessageBody, MessageTypes, MessageAction, call } from '../../ui-utils/client';
 import { RoomRoles, UserRoles, Roles, Messages } from '../../models/client';
 import { callbacks } from '../../callbacks/client';
 import { Markdown } from '../../markdown/client';
@@ -74,7 +75,7 @@ const findParentMessage = (() => {
 			{
 				$set: {
 					following: message.replies && message.replies.indexOf(uid) > -1,
-					threadMsg: normalizeThreadMessage(message),
+					threadMsg: normalizeThreadTitle(message),
 					repliesCount: message.tcount,
 				},
 			},
@@ -219,7 +220,7 @@ Template.message.helpers({
 	},
 	threadMessage() {
 		const { msg } = this;
-		return normalizeThreadMessage(msg);
+		return normalizeThreadTitle(msg);
 	},
 	bodyClass() {
 		const { msg } = this;
diff --git a/app/ui-message/client/messageThread.js b/app/ui-message/client/messageThread.js
index 87ef1410d4fc4..cdfed91f4912c 100644
--- a/app/ui-message/client/messageThread.js
+++ b/app/ui-message/client/messageThread.js
@@ -2,10 +2,10 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import _ from 'underscore';
 
-import { call, normalizeThreadMessage } from '../../ui-utils/client';
+import { call } from '../../ui-utils/client';
 import { Messages } from '../../models/client';
-
 import './messageThread.html';
+import { normalizeThreadTitle } from '../../threads/client/lib/normalizeThreadTitle';
 
 const findParentMessage = (() => {
 	const waiting = [];
@@ -22,7 +22,7 @@ const findParentMessage = (() => {
 	const get = async (tmid) => {
 		getMessages();
 		const messages = await pending;
-		return normalizeThreadMessage(messages.find(({ _id }) => _id === tmid));
+		return messages.find(({ _id }) => _id === tmid);
 	};
 
 
@@ -30,7 +30,7 @@ const findParentMessage = (() => {
 		const message = Messages.findOne({ _id: tmid });
 
 		if (message) {
-			return normalizeThreadMessage(message);
+			return message;
 		}
 
 		if (waiting.indexOf(tmid) === -1) {
@@ -44,7 +44,7 @@ Template.messageThread.helpers({
 	parentMessage() {
 		const { parentMessage } = Template.instance();
 		if (parentMessage) {
-			return parentMessage.get();
+			return normalizeThreadTitle(parentMessage.get());
 		}
 	},
 });