diff --git a/include/class.forms.php b/include/class.forms.php
index 9b50b944023e85a932c84dbf854893d3af72a861..3c583b56b3321c455f501f46ac7130bb67f102b8 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -1068,10 +1068,13 @@ class ThreadEntryWidget extends Widget {
             || ($cfg->allowAttachmentsOnlogin()
                 && ($thisclient && $thisclient->isValid()))) { ?>
         <hr/>
-        <div><strong>Attachments:</strong></div>
-        <div class="uploads"></div><br>
+        <div><strong style="padding-right:1em;vertical-align:top">Attachments: </strong>
+        <div style="display:inline-block">
+        <div class="uploads" style="display:block"></div>
         <input type="file" class="multifile" name="attachments[]" id="attachments" size="30" value="" />
+        </div>
         <font class="error">&nbsp;<?php echo $errors['attachments']; ?></font>
+        <hr/>
         <?php
         }
     }
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index c11b606685db5059b39b6e779debb7c5f0742a65..1eedde09fc8eeac7661900b912b7d8f12cea883e 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -504,7 +504,7 @@ if(!$cfg->showNotesInline()) { ?>
             <?php
             if($cfg->allowAttachments()) { ?>
             <tr>
-                <td width="120">
+                <td width="120" style="vertical-align:top">
                     <label for="attachment">Attachments:</label>
                 </td>
                 <td id="reply_form_attachments" class="attachments">
diff --git a/js/jquery.multifile.js b/js/jquery.multifile.js
index 0c0dd4a1cc4fa75e59a0bc232acde768dede0b60..a1ae5a02fd9eb4e7f54c53c60951933ecf7fb801 100644
--- a/js/jquery.multifile.js
+++ b/js/jquery.multifile.js
@@ -114,16 +114,16 @@
             }
 
             $(this).bind('change.multifile', addInput);
-  
+
         });
   };
 
   $.fn.multifile.inputTemplate = function(file) {
-    return $('<label style="padding-right:5px;"><input type="checkbox" name="uploads[]" value="' + file.name + '" checked="checked"> ' + file.name + '</label>');
+    return $('<label style="padding-right:5px;"><input type="checkbox" name="uploads[]" value="' + file.name + '" checked="checked"> ' + file.name + '</label><br/>');
   };
 
   $.fn.multifile.checkFileTypes = function(file, allowedFileTypes) {
-     
+
       //Wildcard.
       if(allowedFileTypes[0]=='.*')
           return true;