diff --git a/app/oembed/client/oembedAudioWidget.html b/app/oembed/client/oembedAudioWidget.html
index 9d4117485189e..62c1924b4491b 100644
--- a/app/oembed/client/oembedAudioWidget.html
+++ b/app/oembed/client/oembedAudioWidget.html
@@ -5,7 +5,7 @@
 				<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
 			{{else}}
 				<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
-				<blockquote class="background-transparent-darker-before">
+				<blockquote class="message-oembed background-transparent-darker-before">
 					<audio controls>
 						<source src="{{url}}" rel="noopener noreferrer" type="{{headers.contentType}}">
 						Your browser does not support the audio element.
diff --git a/app/oembed/client/oembedFrameWidget.html b/app/oembed/client/oembedFrameWidget.html
index 7a88ca046c927..c11a82b79b383 100644
--- a/app/oembed/client/oembedFrameWidget.html
+++ b/app/oembed/client/oembedFrameWidget.html
@@ -1,6 +1,6 @@
 <template name="oembedFrameWidget">
 {{#if parsedUrl}}
-	<blockquote class="background-transparent-darker-before">
+	<blockquote class="message-oembed background-transparent-darker-before">
 		{{#if meta.oembedProviderName}}
 			{{#if meta.oembedProviderUrl}}
 				<a href="{{meta.oembedProviderUrl}}" rel="noopener noreferrer" target="_blank" style="color: #9e9ea6">{{meta.oembedProviderName}}</a>
diff --git a/app/oembed/client/oembedUrlWidget.html b/app/oembed/client/oembedUrlWidget.html
index a464f5f32a524..3d411cdebb372 100644
--- a/app/oembed/client/oembedUrlWidget.html
+++ b/app/oembed/client/oembedUrlWidget.html
@@ -1,6 +1,6 @@
 <template name="oembedUrlWidget">
 	{{#if show}}
-		<blockquote class="background-transparent-darker-before">
+		<blockquote class="message-oembed background-transparent-darker-before">
 			<div style="{{#if image}}min-height: 80px;{{/if}} padding: 10px 3px;">
 				{{#if image}}
 					{{#if meta.ogImageUserGenerated}}
diff --git a/app/oembed/client/oembedVideoWidget.html b/app/oembed/client/oembedVideoWidget.html
index 20b2189dca3a6..7cbc8e658c789 100644
--- a/app/oembed/client/oembedVideoWidget.html
+++ b/app/oembed/client/oembedVideoWidget.html
@@ -1,6 +1,6 @@
 <template name="oembedVideoWidget">
 {{#if parsedUrl}}
-	<blockquote class="background-transparent-darker-before">
+	<blockquote class="message-oembed background-transparent-darker-before">
 		<div><a href="{{url}}" rel="noopener noreferrer" target="_blank">{{parsedUrl.host}}</a></div>
 		<span>{{title}}</span>
 		{{#if collapsed}}
diff --git a/app/oembed/client/oembedYoutubeWidget.html b/app/oembed/client/oembedYoutubeWidget.html
index a496f14a31a91..a30b1c1eb2d04 100644
--- a/app/oembed/client/oembedYoutubeWidget.html
+++ b/app/oembed/client/oembedYoutubeWidget.html
@@ -1,6 +1,6 @@
 <template name="oembedYoutubeWidget">
 	{{#if parsedUrl}}
-		<blockquote class="background-transparent-darker-before">
+		<blockquote class="message-oembed background-transparent-darker-before">
 			<a href="{{url}}" rel="noopener noreferrer" target="_blank">{{parsedUrl.host}}</a>
 			{{#if collapsed}}
 				<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br>
diff --git a/app/spotify/lib/client/oembedSpotifyWidget.html b/app/spotify/lib/client/oembedSpotifyWidget.html
index c66cfca2efdcd..271c13e98a259 100644
--- a/app/spotify/lib/client/oembedSpotifyWidget.html
+++ b/app/spotify/lib/client/oembedSpotifyWidget.html
@@ -1,6 +1,6 @@
 <template name="oembedSpotifyWidget">
 	{{#if parsedUrl}}
-		<blockquote class="background-transparent-darker-before">
+		<blockquote class="message-oembed background-transparent-darker-before">
 			<a href="https://www.spotify.com" rel="noopener noreferrer" style="color: #9e9ea6">Spotify</a><br/>
 			{{#if match meta.ogAudio "spotify:artist:\\S+"}}
 				<a rel="noopener noreferrer" href="{{url}}">{{{meta.ogTitle}}}</a>
diff --git a/app/theme/client/imports/components/message-box.css b/app/theme/client/imports/components/message-box.css
index 7f216d829179e..95a89fab0bc58 100644
--- a/app/theme/client/imports/components/message-box.css
+++ b/app/theme/client/imports/components/message-box.css
@@ -262,7 +262,7 @@
 	&__join-button {
 		flex: 0;
 
-		margin: 0 0.25rem;
+		margin: -1rem 0.15rem;
 	}
 }
 
diff --git a/app/theme/client/imports/components/messages.css b/app/theme/client/imports/components/messages.css
index 57ef05552666e..19a4edb1c60a1 100644
--- a/app/theme/client/imports/components/messages.css
+++ b/app/theme/client/imports/components/messages.css
@@ -101,6 +101,47 @@
 	}
 }
 
+.message-body {
+	&--unstyled {
+		font: inherit;
+		line-height: initial;
+
+		& .emojione,
+		& .emoji {
+			display: inline-block !important;
+
+			width: 1em !important;
+			min-width: 1em;
+			height: 1em !important;
+			min-height: 1em;
+		}
+
+		& * {
+			display: inline !important;
+
+			padding: unset !important;
+
+			white-space: unset !important;
+
+			color: inherit !important;
+
+			background-color: unset !important;
+
+			font-family: inherit !important;
+
+			font-weight: unset !important;
+		}
+
+		& a {
+			pointer-events: none;
+		}
+	}
+}
+
+.message-oembed {
+	overflow: hidden;
+}
+
 .messages-box .rc-popover__list {
 	padding: 0;
 }
diff --git a/app/theme/client/imports/components/sidebar/sidebar-item.css b/app/theme/client/imports/components/sidebar/sidebar-item.css
index f5647d554ca4b..14bc45df94d01 100644
--- a/app/theme/client/imports/components/sidebar/sidebar-item.css
+++ b/app/theme/client/imports/components/sidebar/sidebar-item.css
@@ -270,36 +270,6 @@
 
 		font-size: 12px;
 		line-height: normal;
-
-		& .emojione,
-		& .emoji {
-			display: inline-block !important;
-
-			width: 13px !important;
-			min-width: 13px;
-			height: 13px !important;
-			min-height: 13px;
-		}
-
-		& * {
-			display: inline !important;
-
-			padding: unset !important;
-
-			white-space: unset !important;
-
-			color: inherit !important;
-
-			background-color: unset !important;
-
-			font-family: inherit !important;
-
-			font-weight: unset !important;
-		}
-
-		& a {
-			pointer-events: none;
-		}
 	}
 
 	&__time {
diff --git a/app/threads/client/threads.css b/app/threads/client/threads.css
index 0f7e324b2f512..ce6dfb076a6a8 100644
--- a/app/threads/client/threads.css
+++ b/app/threads/client/threads.css
@@ -20,6 +20,8 @@
 
 .thread-list {
 	overflow: auto;
+
+	word-wrap: break-word;
 	flex-shrink: 1;
 }
 
@@ -42,10 +44,6 @@
 	cursor: pointer;
 
 	color: var(--rc-color-link-active);
-
-	font-style: normal;
-
-	line-height: initial;
 }
 
 .contextual-bar__content.thread,
diff --git a/app/threads/server/functions.js b/app/threads/server/functions.js
index a657f795deb19..2a8fe49ee51c4 100644
--- a/app/threads/server/functions.js
+++ b/app/threads/server/functions.js
@@ -1,7 +1,7 @@
 import { Messages, Subscriptions } from '../../models/server';
 
-export const reply = ({ tmid }, { rid, ts, u }, parentMessage) => {
-	if (!tmid) {
+export const reply = ({ tmid }, { rid, ts, u, editedAt }, parentMessage) => {
+	if (!tmid || editedAt) {
 		return false;
 	}
 
diff --git a/app/ui-message/client/message.html b/app/ui-message/client/message.html
index 9bd5c1e9c29da..f8b08c7a283bf 100644
--- a/app/ui-message/client/message.html
+++ b/app/ui-message/client/message.html
@@ -67,7 +67,12 @@
 				<span>******</span>
 			{{else}}
 				{{#if and settings.showreply msg.tmid}}
-					<p class="thread-replied"> {{_ "Replied_on"}}: <q aria-label="Open_thread" class="rc-tooltip thread-quote js-open-thread">{{parentMessage}}</q> </p>
+					<p class="thread-replied">
+						{{_ "Replied_on"}}:
+						<q role="button" aria-label="{{_ "Open_thread"}}" class="thread-quote js-open-thread">
+							<span class="message-body--unstyled">{{{parentMessage}}}</span>
+						</q>
+					</p>
 					<blockquote>
 						{{{body}}}
 					</blockquote>
diff --git a/app/ui-message/client/messageBox.html b/app/ui-message/client/messageBox.html
index 4c8097a5f7fc3..3a31d5572da91 100644
--- a/app/ui-message/client/messageBox.html
+++ b/app/ui-message/client/messageBox.html
@@ -39,7 +39,7 @@
 								{{/if}}
 							</span>
 						{{else}}
-							<button class="js-join rc-button rc-button--primary rc-button--small rc-message-box__join-button">
+							<button class="js-join rc-button rc-button--primary rc-message-box__join-button">
 								{{_ "join"}}
 							</button>
 						{{/if}}
diff --git a/app/ui-message/client/messageBox.js b/app/ui-message/client/messageBox.js
index 2f3e0fe055e23..e9e0b093c1ff4 100644
--- a/app/ui-message/client/messageBox.js
+++ b/app/ui-message/client/messageBox.js
@@ -42,6 +42,20 @@ Template.messageBox.onCreated(function() {
 	this.replyMessageData = new ReactiveVar();
 	this.isMicrophoneDenied = new ReactiveVar(true);
 	this.sendIconDisabled = new ReactiveVar(false);
+
+	this.send = (event) => {
+		if (!this.input) {
+			return;
+		}
+
+		const { rid, tmid, onSend } = this.data;
+		const { value } = this.input;
+		this.input.value = '';
+		onSend && onSend.call(this.data, event, { rid, tmid, value }, () => {
+			this.input.updateAutogrow();
+			this.input.focus();
+		});
+	};
 });
 
 Template.messageBox.onRendered(function() {
@@ -222,7 +236,7 @@ const insertNewLine = (input) => {
 };
 
 const handleSubmit = (event, instance) => {
-	const { data: { rid, tmid, onSend }, input } = instance;
+	const { input } = instance;
 	const { which: keyCode } = event;
 
 	const isSubmitKey = keyCode === keyCodes.CARRIAGE_RETURN || keyCode === keyCodes.NEW_LINE;
@@ -238,10 +252,7 @@ const handleSubmit = (event, instance) => {
 	const isSending = (sendOnEnterActive && !withModifier) || (!sendOnEnterActive && withModifier);
 
 	if (isSending) {
-		onSend && onSend.call(this, event, { rid, tmid, value: input.value }, () => {
-			input.updateAutogrow();
-			input.focus();
-		});
+		instance.send(event);
 		return true;
 	}
 
@@ -369,12 +380,7 @@ Template.messageBox.events({
 		onValueChanged && onValueChanged.call(this, event, { rid, tmid });
 	},
 	async 'click .js-send'(event, instance) {
-		const { input } = instance;
-		const { rid, tmid, onSend } = this;
-		onSend && onSend.call(this, event, { rid, tmid, value: input.value }, () => {
-			input.updateAutogrow();
-			input.focus();
-		});
+		instance.send(event);
 	},
 	'click .js-action-menu'(event, instance) {
 		const groups = messageBox.actions.get();
diff --git a/app/ui-sidenav/client/sidebarItem.html b/app/ui-sidenav/client/sidebarItem.html
index c36ac3016c12c..8d35fdb019c0d 100644
--- a/app/ui-sidenav/client/sidebarItem.html
+++ b/app/ui-sidenav/client/sidebarItem.html
@@ -53,7 +53,9 @@
 					<div class="sidebar-item__message-bottom">
 						{{#if extended}}
 							{{#if lastMessage}}
-								<div class="sidebar-item__last-message">{{{lastMessage}}}</div>
+								<div class="sidebar-item__last-message">
+									<span class="message-body--unstyled">{{{lastMessage}}}</span>
+								</div>
 							{{/if}}
 						{{/if}}
 						{{#if unread}}
diff --git a/app/ui-utils/client/lib/RoomHistoryManager.js b/app/ui-utils/client/lib/RoomHistoryManager.js
index a32df5f081d91..bc5dc47806c22 100644
--- a/app/ui-utils/client/lib/RoomHistoryManager.js
+++ b/app/ui-utils/client/lib/RoomHistoryManager.js
@@ -1,28 +1,30 @@
+import mem from 'mem';
+import s from 'underscore.string';
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Blaze } from 'meteor/blaze';
-import { /* UserRoles, RoomRoles,*/ ChatMessage, ChatSubscription, ChatRoom } from '../../../models';
-// import _ from 'underscore';
+import { ChatMessage, ChatSubscription, ChatRoom } from '../../../models';
 import { RoomManager } from './RoomManager';
 import { readMessage } from './readMessages';
+import { renderMessageBody } from './renderMessageBody';
 
-export const normalizeThreadMessage = (message) => {
+export const normalizeThreadMessage = mem((message) => {
 	if (message.msg) {
-		return message.msg;
+		return renderMessageBody(message).replace(/<br\s?\\?>/g, ' ');
 	}
 
 	if (message.attachments) {
 		const attachment = message.attachments.find((attachment) => attachment.title || attachment.description);
 
 		if (attachment.description) {
-			return attachment.description;
+			return s.escapeHTML(attachment.description);
 		}
 
 		if (attachment.title) {
-			return attachment.title;
+			return s.escapeHTML(attachment.title);
 		}
 	}
-};
+}, { maxAge: 1000 });
 
 export const upsertMessage = ({ msg: { _id, ...msg }, subscription }) => {
 	const userId = msg.u && msg.u._id;
diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
index b0c46671f4dff..4c7df34f3d65b 100644
--- a/app/ui/client/lib/chatMessages.js
+++ b/app/ui/client/lib/chatMessages.js
@@ -228,7 +228,6 @@ export class ChatMessages {
 		const cursorPosition = editingNext ? 0 : -1;
 		this.$input.setCursorPosition(cursorPosition);
 		this.input.focus();
-		return this.input;
 	}
 
 	clearEditing() {
@@ -259,6 +258,8 @@ export class ChatMessages {
 			await call('joinRoom', rid);
 		}
 
+		messageBoxState.save({ rid, tmid }, this.input);
+
 		let msg = value;
 		if (value.trim()) {
 			const mention = this.$input.data('mention-user') || false;
@@ -288,8 +289,6 @@ export class ChatMessages {
 
 			try {
 				await this.processMessageSend(message);
-				messageBoxState.set(this.input, '');
-				messageBoxState.save({ rid, tmid }, this.input);
 				this.$input.removeData('reply').trigger('dataChange');
 			} catch (error) {
 				console.error(error);