diff --git a/public/css/simple.css b/public/css/simple.css
index 9647d4f..b9b117d 100644
--- a/public/css/simple.css
+++ b/public/css/simple.css
@@ -134,5 +134,5 @@
 .plain-text {
     white-space: pre-wrap;
     display: inline-block;
-    margin-bottom: 1em;
+    margin: 1em 0;
 }
diff --git a/templates/remark/create.html.ep b/templates/remark/create.html.ep
index 1290a53..4e945f2 100644
--- a/templates/remark/create.html.ep
+++ b/templates/remark/create.html.ep
@@ -19,9 +19,7 @@
     <% if ($draft->{'markdown'}) { =%>
     <%== markdown $draft->{'body'} =%>
     <% } else {                    =%>
-    <span class="plain-text">
-      <%= $draft->{'body'} =%>
-    </span>
+    <span class="plain-text"><%= $draft->{'body'} =%></span>
     <% } =%>
   </div>
   <% } =%>
@@ -82,9 +80,7 @@
     </h4>
     <h5 class="post__author"><%= $last_remark->{'author'} %></h5>
     <div class="post__body">
-      <span class="plain-text">
-        <%= $last_remark->{'body'} =%>
-      </span>
+      <span class="plain-text"><%= $last_remark->{'body'} =%></span>
     </div>
     <nav class="post__nav">
       <%= link_to Thread => single_thread =>
@@ -110,9 +106,7 @@
     <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>
+      <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_page.html.ep b/templates/thread/by_page.html.ep
index 268b8f3..4ed4556 100644
--- a/templates/thread/by_page.html.ep
+++ b/templates/thread/by_page.html.ep
@@ -28,11 +28,19 @@
       <summary>
         <%= truncate_text $thread->{'body'} %>
       </summary>
+      <% if ($thread->{'markdown'}) { =%>
       <%== markdown $thread->{'body'} =%>
+      <% } else { =%>
+      <span class="plain-text"><%= $thread->{'body'} %></span>
+      <% } =%>
     </details>
     <% } else { =%>
     <div class="post__body">
+      <% if ($thread->{'markdown'}) { =%>
       <%== markdown $thread->{'body'} =%>
+      <% } else { =%>
+      <span class="plain-text"><%= $thread->{'body'} %></span>
+      <% } =%>
     </div>
     <% } =%>
     <nav class="post__nav">