diff --git a/README.md b/README.md
index e36d1e8..2b7353a 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ tests locally:
 ## TODOs
 
 - Do the if-markdown-else-plaintext stuff in templates
-- Non-markdown posts will need to handle whitespace/newlines with CSS stuff
+- `plain-text` CSS class may need bottom padding
 - Do I need `SUM` for `by_id()`?
 
 ## AGPL-3.0+ANTIFA compliance
diff --git a/templates/remark/create.html.ep b/templates/remark/create.html.ep
index df26bbd..bda15b5 100644
--- a/templates/remark/create.html.ep
+++ b/templates/remark/create.html.ep
@@ -19,8 +19,10 @@
     <% if ($draft->{'markdown'}) { =%>
     <%== markdown $draft->{'body'} =%>
     <% } else {                    =%>
-    <%= $draft->{'body'}           =%>
-    <% }                           =%>
+    <span class="plain-text">
+      <%= $draft->{'body'} =%>
+    </span>
+    <% } =%>
   </div>
   <% } =%>
   <div class="form-field">
diff --git a/templates/thread/create.html.ep b/templates/thread/create.html.ep
index 07f7824..32017d8 100644
--- a/templates/thread/create.html.ep
+++ b/templates/thread/create.html.ep
@@ -16,8 +16,10 @@
     <% if ($draft->{'markdown'}) { =%>
     <%== markdown $draft->{'body'} =%>
     <% } else {                    =%>
-    <%= $draft->{'body'}           =%>
-    <% }                           =%>
+    <span class="plain-text">
+      <%= $draft->{'body'} =%>
+    </span>
+    <% } =%>
   </div>
   <% } =%>
   <div class="form-field">