diff --git a/README.md b/README.md
index cac897c..0846d05 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,6 @@ tests locally:
 
 ## TODOs
 
-- Do the if-markdown-else-plaintext stuff in templates
 - Fix preview tests
 - Do I need `SUM` for `by_id()`?
 
diff --git a/templates/remark/by_id.html.ep b/templates/remark/by_id.html.ep
index b49fc1a..0038aaa 100644
--- a/templates/remark/by_id.html.ep
+++ b/templates/remark/by_id.html.ep
@@ -25,7 +25,11 @@
     </h4>
     <h5 class="post__author"><%= $remark->{'author'} %></h5>
     <div class="post__body">
+      <% if ($remark->{'markdown'}) { =%>
       <%== markdown $remark->{'body'} =%>
+      <% } else { =%>
+      <span class="plain-text"><%= $remark->{'body'} %></span>
+      <% } =%>
     </div>
     <nav class="post__nav">
       <%= link_to Thread => single_thread =>
diff --git a/templates/remark/create.html.ep b/templates/remark/create.html.ep
index 4e945f2..d830fe3 100644
--- a/templates/remark/create.html.ep
+++ b/templates/remark/create.html.ep
@@ -80,7 +80,11 @@
     </h4>
     <h5 class="post__author"><%= $last_remark->{'author'} %></h5>
     <div class="post__body">
-      <span class="plain-text"><%= $last_remark->{'body'} =%></span>
+      <% if ($last_remark->{'markdown'}) { =%>
+      <%== markdown $last_remark->{'body'} =%>
+      <% } else { =%>
+      <span class="plain-text"><%= $last_remark->{'body'} %></span>
+      <% } =%>
     </div>
     <nav class="post__nav">
       <%= link_to Thread => single_thread =>
@@ -106,7 +110,11 @@
     <h4 class="post__date"><%= $thread->{'date'} %></h4>
     <h5 class="post__author"><%= $thread->{'author'} %></h5>
     <div class="post__body">
-      <span class="plain-text"><%= $thread->{'body'} =%></span>
+      <% if ($thread->{'markdown'}) { =%>
+      <%== markdown $thread->{'body'} =%>
+      <% } else { =%>
+      <span class="plain-text"><%= $thread->{'body'} %></span>
+      <% } =%>
     </div>
     <nav class="post__nav">
       <%= link_to post_remark => {thread_id => $thread->{'id'}},
diff --git a/templates/thread/by_id.html.ep b/templates/thread/by_id.html.ep
index 1f57ac0..ba2db15 100644
--- a/templates/thread/by_id.html.ep
+++ b/templates/thread/by_id.html.ep
@@ -24,7 +24,11 @@
     <h4 class="post__date"><%= $thread->{'date'} %></h4>
     <h5 class="post__author"><%= $thread->{'author'} %></h5>
     <div class="post__body">
+      <% if ($thread->{'markdown'}) { =%>
       <%== markdown $thread->{'body'} =%>
+      <% } else { =%>
+      <span class="plain-text"><%= $thread->{'body'} %></span>
+      <% } =%>
     </div>
     <nav class="post__nav">
       <%= link_to post_remark => {thread_id => $thread->{'id'}},
@@ -55,7 +59,11 @@
     </h4>
     <h5 class="post__author"><%= $remark->{'author'} %></h5>
     <div class="post__body">
+      <% if ($remark->{'markdown'}) { =%>
       <%== markdown $remark->{'body'} =%>
+      <% } else { =%>
+      <span class="plain-text"><%= $remark->{'body'} %></span>
+      <% } =%>
     </div>
     <nav class="post__nav">
       <%= link_to Remark => post_remark =>