diff --git a/EnvelopeGenerator.Web/Views/Envelope/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Envelope/ShowEnvelope.cshtml
index 3cc959d8..99646bfc 100644
--- a/EnvelopeGenerator.Web/Views/Envelope/ShowEnvelope.cshtml
+++ b/EnvelopeGenerator.Web/Views/Envelope/ShowEnvelope.cshtml
@@ -79,7 +79,7 @@
                 }
                 else
                 {
-                <div id="envelope-message"></div>
+                <div class="markdown">@(envelope?.Message)</div>
                 }
                 <p>
                     <small class="text-body-secondary">
@@ -134,8 +134,6 @@
 @if (!isReadOnly)
 {
 <script nonce="@nonce">
-    document.getElementById('envelope-message').innerHTML = marked.parse('@(envelope?.Message)');
-
     document.getElementById('readonly-send').addEventListener('click', async () => {
         const receiverMail = document.getElementById('readonly-receiver-mail');
         const dateValid = document.getElementById('readonly-date-valid');
diff --git a/EnvelopeGenerator.Web/Views/Shared/_Layout.cshtml b/EnvelopeGenerator.Web/Views/Shared/_Layout.cshtml
index a5414219..42c0fcee 100644
--- a/EnvelopeGenerator.Web/Views/Shared/_Layout.cshtml
+++ b/EnvelopeGenerator.Web/Views/Shared/_Layout.cshtml
@@ -96,5 +96,6 @@
         </div>
         <a href="/privacy-policy.@(_localizer.Culture()).html" target="_blank">@_localizer.Privacy()</a>
     </footer>
+    <script src="~/js/markdown.min.js" asp-append-version="true"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/EnvelopeGenerator.Web/bundleconfig.json b/EnvelopeGenerator.Web/bundleconfig.json
index 972f1662..8893821f 100644
--- a/EnvelopeGenerator.Web/bundleconfig.json
+++ b/EnvelopeGenerator.Web/bundleconfig.json
@@ -41,6 +41,12 @@
       "wwwroot/js/util.js"
     ]
   },
+  {
+    "outputFileName": "wwwroot/js/markdown.min.js",
+    "inputFiles": [
+      "wwwroot/js/markdown.js"
+    ]
+  },
   {
     "outputFileName": "wwwroot/css/error-space.min.css",
     "inputFiles": [
diff --git a/EnvelopeGenerator.Web/wwwroot/js/markdown.js b/EnvelopeGenerator.Web/wwwroot/js/markdown.js
new file mode 100644
index 00000000..0a118bdf
--- /dev/null
+++ b/EnvelopeGenerator.Web/wwwroot/js/markdown.js
@@ -0,0 +1 @@
+document.querySelectorAll('.markdown').forEach(e => e.innerHTML = marked.parse(e.innerHTML));
\ No newline at end of file
diff --git a/EnvelopeGenerator.Web/wwwroot/js/markdown.min.js b/EnvelopeGenerator.Web/wwwroot/js/markdown.min.js
new file mode 100644
index 00000000..d2688129
--- /dev/null
+++ b/EnvelopeGenerator.Web/wwwroot/js/markdown.min.js
@@ -0,0 +1 @@
+document.querySelectorAll(".markdown").forEach(n=>n.innerHTML=marked.parse(n.innerHTML));
\ No newline at end of file