diff --git a/webroot/js/message.js b/webroot/js/message.js
index 0641e7098..86aa5aee3 100644
--- a/webroot/js/message.js
+++ b/webroot/js/message.js
@@ -18,7 +18,13 @@ class Message {
 			literalMidWordUnderscores: true,
 			strikethrough: true,
 		}).makeHtml(this.body);
-		var linked = autoLink(markdownToHTML, { embed: true });
+		const linked = autoLink(markdownToHTML, {
+			embed: true,
+			removeHTTP: true,
+			linkAttr: {
+				target: '_blank'
+			}
+		});
 		return addNewlines(linked);
 	}
 	userColor() {