diff --git a/stylesheets/style.css b/stylesheets/style.css
index ae123573..ef26f40c 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -304,6 +304,10 @@ div.post.reply {
   max-width: 94%!important;
 }
 
+div.post.reply.has-file.body-not-empty {
+  min-width: 33%;
+}
+
 div.post_modified {
   margin-left: 1.8em;
 }
@@ -749,6 +753,9 @@ pre {
   .theme-catalog div.threads {
     overflow: hidden;
   }
+  div.post .body {
+    clear: both;
+  }
 }
 
 .compact-boardlist {
diff --git a/templates/post_reply.html b/templates/post_reply.html
index a88f9d5c..d580ddd3 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -1,6 +1,6 @@
 {% filter remove_whitespace %}
 {# tabs and new lines will be ignored #}
-<div class="post reply" id="reply_{{ post.id }}">
+<div class="post reply{% if post.files %} has-file{% endif %}{% if post.body_nomarkup %} body-not-empty{% endif %}" id="reply_{{ post.id }}">
 <p class="intro">
 	{% if not index %}<a id="{{ post.id }}" class="post_anchor"></a>{% endif %}
 	<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
diff --git a/templates/post_thread.html b/templates/post_thread.html
index aa130c0a..7bfbd89b 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -5,7 +5,7 @@
 {% if not index %}<a id="{{ post.id }}" class="post_anchor"></a>{% endif %}
 
 {% include 'post/fileinfo.html' %}
-<div class="post op" id="op_{{ post.id }}" {%if post.num_files > 1%}style='clear:both'{%endif%}><p class="intro">
+<div class="post op{% if post.files %} has-file{% endif %}{% if post.body_nomarkup %} body-not-empty{% endif %}" id="op_{{ post.id }}" {%if post.num_files > 1%}style='clear:both'{%endif%}><p class="intro">
 	<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
 	<label for="delete_{{ post.id }}">
 		{% include 'post/subject.html' %}