diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 33990e8ab..a7c463989 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -2,7 +2,7 @@
   <span>
     <%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil, :class => 'file',
           :onchange => "checkFileSize(this, #{Setting.attachment_max_size.to_i.kilobytes}, '#{escape_javascript(l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)))}');"  -%>
-    <label class="inline"><%= l(:label_optional_description) %><%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil, :class => 'description' %></label>
+    <%= text_field_tag 'attachments[1][description]', '', :id => nil, :class => 'description', :placeholder => l(:label_optional_description) %>
     <%= link_to_function(image_tag('delete.png'), 'removeFileField(this)', :title => (l(:button_delete))) %>
   </span>
 </span>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b9b6da6bb..f67071ec7 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -479,7 +479,7 @@ fieldset#notified_events .parent { padding-left: 20px; }
 .required {color: #bb0000;}
 .summary {font-style: italic;}
 
-#attachments_fields input[type=text] {margin-left: 8px; }
+#attachments_fields input.description {margin-left: 8px; width:340px;}
 #attachments_fields span {display:block; white-space:nowrap;}
 #attachments_fields img {vertical-align: middle;}