diff --git a/src/main.rs b/src/main.rs
index a16ee2c0d..9b5f2f742 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -146,6 +146,7 @@ fn start_renderer() -> Addr<Syn, Renderer> {
         ext_autolink: true,
         ext_tasklist: true,
         ext_footnotes: true,
+        ext_tagfilter: true,
         ..Default::default()
     };
 
diff --git a/src/render.rs b/src/render.rs
index e02ac31ea..95edb5749 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -118,14 +118,13 @@ fn prepare_thread(comrak: &ComrakOptions, page: ThreadPage) -> RenderableThreadP
     let user = page.current_user;
 
     let posts = page.posts.into_iter().map(|post| {
-        let escaped_body = escape_html(&post.body);
         let editable = user.clone()
             .map(|c| post.author_email.eq(&c))
             .unwrap_or_else(|| false);
 
         RenderablePost {
             id: post.id,
-            body: markdown_to_html(&escaped_body, comrak),
+            body: markdown_to_html(&post.body, comrak),
             posted: post.posted.into(),
             author_name: post.author_name.clone(),
             author_gravatar: md5_hex(post.author_email.as_bytes()),