diff --git a/js/multi-image.js b/js/multi-image.js
index cb2f2ccf..5866e2e4 100644
--- a/js/multi-image.js
+++ b/js/multi-image.js
@@ -16,7 +16,7 @@ function multi_image() {
         e.preventDefault();
         $('#upload_url').remove();
 
-        var images_len = $('input[type=file]').length;
+        var images_len = $('form:not([id="quick-reply"]) [type=file]').length;
         
         if (!(images_len >= max_images)) {
             $('.add_image').after('<br/><input type="file" name="file'+(images_len+1)+'" id="upload_file'+(images_len+1)+'">');
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 723151e3..1b6d0e06 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -116,6 +116,12 @@ form table tr td div label {
 .multifile {
     border: 2px dashed #B7C5D9;
 }
+.file:not(.multifile) .post-image {
+    float: left;
+}
+.file:not(.multifile) {
+    float: none;
+}
 p.fileinfo {
 	display: block;
 	margin: 0;
diff --git a/templates/post/fileinfo.html b/templates/post/fileinfo.html
index c2a0aa6a..f862f59d 100644
--- a/templates/post/fileinfo.html
+++ b/templates/post/fileinfo.html
@@ -3,7 +3,7 @@
     {% else %}
     <div class="files">
     {% for file in post.files %}
-        <div class="file {% if post.num_files > 1 %}multifile{% endif %}" style="width:{{ file.thumbwidth + 40 }}px">
+        <div class="file{% if post.num_files > 1 %} multifile" style="width:{{ file.thumbwidth + 40 }}px"{% else %}"{% endif %}>
 	{% if file.file == 'deleted' %}
 		<img class="post-image deleted" src="{{ config.image_deleted }}" alt="" />
 	{% else %}