diff --git a/app/mentions/lib/MentionsParser.js b/app/mentions/lib/MentionsParser.js
index f82ec3f0aef..6fd1a6c6dc8 100644
--- a/app/mentions/lib/MentionsParser.js
+++ b/app/mentions/lib/MentionsParser.js
@@ -32,11 +32,11 @@ export class MentionsParser {
 	}
 
 	get userMentionRegex() {
-		return new RegExp(`(^|\\s|<p>|<br> ?)@(${ this.pattern }(@(${ this.pattern }))?)`, 'gm');
+		return new RegExp(`(^|\\s|> ?)@(${ this.pattern }(@(${ this.pattern }))?)`, 'gm');
 	}
 
 	get channelMentionRegex() {
-		return new RegExp(`(^|\\s|<p>)#(${ this.pattern }(@(${ this.pattern }))?)`, 'gm');
+		return new RegExp(`(^|\\s|>)#(${ this.pattern }(@(${ this.pattern }))?)`, 'gm');
 	}
 
 	replaceUsers = (msg, { mentions, temp }, me) => msg