diff --git a/web/src/app/js/app.js b/web/src/app/js/app.js
index 774cbef..aa650c7 100644
--- a/web/src/app/js/app.js
+++ b/web/src/app/js/app.js
@@ -134,8 +134,10 @@ app.post = {
 				const ps = acct.split('@');
 				const link = '<a class="mention" href="'+htmlescape(href)+'">@'+
 					htmlescape(acct) + '</a>';
-				replaceAfter.push(['@'+ps[0], link]);
-				replaceAfter.push(['@'+acct, link]);
+				value = value.replaceAll('@'+ps[0], '@\\'+ps[0]);
+				value = value.replaceAll('@'+acct, '@\\'+acct);
+				replaceAfter.push(['@\\'+ps[0], link]);
+				replaceAfter.push(['@\\'+acct, link]);
 			} else if (tags[i].type.toLowerCase().includes('hashtag')) {
 				var hash = tags[i].name;
 				var href = tags[i].href;
@@ -145,7 +147,8 @@ app.post = {
 					continue;
 				const link = '<a class="hashtag" href="'+htmlescape(href)+'">'+
 					htmlescape(hash) + '</a>';
-				replaceAfter.push([hash, link]);
+				value = value.replaceAll(hash, '\\'+hash);
+				replaceAfter.push(['\\'+hash, link]);
 			}
 		}
 		value = html2text(value);