diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 39ef47b1b..18f641c7f 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -1,6 +1,6 @@
 <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
-  <% container.saved_attachments.each_with_index do |attachment, i| %>
+  <% container.attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 9e9bc9859..2b9d1586f 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -629,7 +629,7 @@ function img_thumbnails() {
   $('.thumbnails a').colorbox({rel:'nofollow'});
   $('.attachments').find('a').each(function(index, element) {
     var href_value = $(element).attr('href');
-    if (/\.(jpg|png|gif|bmp)$/.test(href_value)) {
+    if (/\.(jpg|png|gif|bmp|PNG|BMP|GIF|JPG)$/.test(href_value)) {
       $(element).colorbox({rel:'nofollow'});
     }