diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index ec36b145..6d74751f 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -36,8 +36,12 @@
     <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
     <%= wikitoolbar_for 'notes' %>
     <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
+    </fieldset>
     
-    <p><%=l(:label_attachment_plural)%><br /><%= render :partial => 'attachments/form' %></p>
+    <fieldset id="attachments" class="collapsible collapsed borders"><legend onclick="toggleFieldset(this);"><%=l(:label_attachment_plural)%></legend>
+      <div style="display: none;">
+      <%= render :partial => 'attachments/form' %>
+      </div>
     </fieldset>
     </div>
     
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 39d15fbe..7e5847b1 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -279,6 +279,8 @@ div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;}
 #issue_tree td.checkbox {display:none;}
 
 fieldset.collapsible { border-width: 1px 0 0 0; font-size: 0.9em; }
+fieldset.collapsible.borders { border-width: 1px; }
+fieldset.collapsible.collapsed.borders { border-width: 1px 0 0 0; }
 fieldset.collapsible legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; }
 fieldset.collapsible.collapsed legend { background-image: url(../images/arrow_collapsed.png); }
 
@@ -427,6 +429,7 @@ fieldset.settings label { display: block; }
 .required {color: #bb0000;}
 .summary {font-style: italic;}
 
+#attachments {font-size: 1em; }
 #attachments_fields input[type=text] {margin-left: 8px; }
 
 div.attachments { margin-top: 12px; }