diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 49d734452..9698949f2 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -210,7 +210,7 @@ module IssuesHelper
       old_value = content_tag("strike", old_value) if detail.old_value and detail.value.blank?
       if detail.property == 'attachment' && !value.blank? && a = Attachment.find_by_id(detail.prop_key)
         # Link to the attachment if it has not been removed
-        value = link_to_attachment(a)
+        value = link_to_attachment(a, :download => true)
       else
         value = content_tag("i", h(value)) if value
       end
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index c92599a66..0b1480aad 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -1,9 +1,14 @@
 <div class="attachments">
 <% for attachment in attachments %>
-<p><%= link_to_attachment attachment, :class => 'icon icon-attachment' -%>
-<%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+<p><%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+  <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
-  <% if options[:deletable] %>
+	<% if attachment.is_text? %>
+	  <%= link_to image_tag('magnifier.png'),
+                :controller => 'attachments', :action => 'show',
+                :id => attachment, :filename => attachment.filename %>
+  <% end %>
+	<% if options[:deletable] %>
     <%= link_to image_tag('delete.png'), attachment_path(attachment),
                                          :confirm => l(:text_are_you_sure),
                                          :method => :delete,
diff --git a/public/images/magnifier.png b/public/images/magnifier.png
new file mode 100644
index 000000000..cf3d97f75
Binary files /dev/null and b/public/images/magnifier.png differ