diff --git a/js/views/message_view.js b/js/views/message_view.js
index 866cba27a8..59f0e54d8e 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -6,6 +6,7 @@
     'use strict';
     window.Whisper = window.Whisper || {};
 
+    const { HTML } = window.Signal;
     const { Attachment } = window.Signal.Types;
     const { loadAttachmentData } = window.Signal.Migrations;
 
@@ -375,8 +376,8 @@
             emoji_util.parse(body);
 
             if (body.length > 0) {
-                var escaped = body.html();
-                body.html(escaped.replace(/\n/g, '<br>').replace(URL_REGEX, "$1<a href='$2' target='_blank'>$2</a>"));
+                const escapedBody = body.html();
+                body.html(HTML.render(escapedBody));
             }
 
             this.renderSent();
diff --git a/preload.js b/preload.js
index d11951f738..9146f62165 100644
--- a/preload.js
+++ b/preload.js
@@ -158,6 +158,7 @@ window.Signal.Backup = require('./js/modules/backup');
 window.Signal.Crypto = require('./js/modules/crypto');
 window.Signal.Database = require('./js/modules/database');
 window.Signal.Debug = require('./js/modules/debug');
+window.Signal.HTML = require('./ts/html');
 window.Signal.Logs = require('./js/modules/logs');
 
 window.Signal.Components = {};