diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js
index 35633c4cd..a3ae55e06 100644
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -15,6 +15,7 @@ define([
 
     var DiffDOM = window.diffDOM;
     var renderer = new Marked.Renderer();
+    var restrictedRenderer = new Marked.Renderer();
 
     var Mermaid = {
         init: function () {}
@@ -61,13 +62,20 @@ define([
         return h('div.cp-md-toc', content).outerHTML;
     };
 
-    DiffMd.render = function (md, sanitize) {
+    DiffMd.render = function (md, sanitize, restrictedMd) {
+        console.error("DIFFMD RENDER", restrictedMd);
+        console.log("md:\n", md);
+        Marked.setOptions({
+            renderer: restrictedMd ? restrictedRenderer : renderer,
+        });
         var r = Marked(md, {
             sanitize: sanitize
         });
 
         // Add Table of Content
-        r = r.replace(/<div class="cp-md-toc"><\/div>/g, getTOC());
+        if (!restrictedMd) {
+            r = r.replace(/<div class="cp-md-toc"><\/div>/g, getTOC());
+        }
         toc = [];
 
         return r;
@@ -83,6 +91,7 @@ define([
             return defaultCode.apply(renderer, arguments);
         }
     };
+    restrictedRenderer.code = renderer.code;
 
     var stripTags = function (text) {
         var div = document.createElement("div");
@@ -109,6 +118,9 @@ define([
         });
         return "<h" + level + " id=\"" + id + "\"><a href=\"#" + id + "\" class=\"anchor\"></a>" + text + "</h" + level + ">";
     };
+    restrictedRenderer.heading = function (text) {
+        return text;
+    };
 
     // Tasks list
     var checkedTaskItemPtn = /^\s*(<p>)?\[[xX]\](<\/p>)?\s*/;
@@ -138,6 +150,13 @@ define([
         var cls = (isCheckedTaskItem || isUncheckedTaskItem || hasBogusInput) ? ' class="todo-list-item"' : '';
         return '<li'+ cls + '>' + text + '</li>\n';
     };
+    restrictedRenderer.listitem = function (text) {
+        if (bogusCheckPtn.test(text)) {
+            text = text.replace(bogusCheckPtn, '');
+        }
+        return '<li>' + text + '</li>\n';
+    }
+
     renderer.image = function (href, title, text) {
         if (href.slice(0,6) === '/file/') {
             // DEPRECATED
@@ -162,6 +181,7 @@ define([
         out += this.options.xhtml ? '/>' : '>';
         return out;
     };
+    restrictedRenderer.image = renderer.image;
 
     renderer.paragraph = function (p) {
         if (p === '[TOC]') {
@@ -169,6 +189,9 @@ define([
         }
         return /<media\-tag[\s\S]*>/i.test(p)? p + '\n': '<p>' + p + '</p>\n';
     };
+    restrictedRenderer.paragraph = function (p) {
+        return /<media\-tag[\s\S]*>/i.test(p)? p + '\n': '<p>' + p + '</p>\n';
+    };
 
     var MutationObserver = window.MutationObserver;
     var forbiddenTags = [
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 682535d98..223f67bb3 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -151,7 +151,7 @@ define([
             });
             try {
                 var $d = $(d);
-                DiffMd.apply(DiffMd.render(md || '', true), $d, common);
+                DiffMd.apply(DiffMd.render(md || '', true, true), $d, common);
                 $d.addClass("cp-app-contacts-content");
 
                 // override link clicking, because we're in an iframe
@@ -197,7 +197,7 @@ define([
         var getChat = function (id) {
             return $messages.find(dataQuery(id));
         };
-        
+
         var scrollChatToBottom = function () {
             var $messagebox = $('.cp-app-contacts-messages');
             $messagebox.scrollTop($messagebox[0].scrollHeight);