diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ef18793ab..1b0f25fcf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -127,7 +127,7 @@ module ApplicationHelper
   # * :text - Link text (default to attachment filename)
   # * :download - Force download (default: false)
   def link_to_attachment(attachment, options={})
-    text = options.delete(:text) || attachment.filename
+    text = h(truncate(options.delete(:text) || attachment.filename, length: 60, omission: '...'))
     route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
     html_options = options.slice!(:only_path)
     url = send(route_method, attachment, attachment.filename, options)
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index b9d91d5b5..4c4065d09 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -6,8 +6,10 @@
   </span>
   <% if attachment.is_text? %>
     <%= link_to image_tag('magnifier.png'),
-                :controller => 'attachments', :action => 'show',
-                :id => attachment, :filename => attachment.filename %>
+                :controller => 'attachments',
+                :action => 'show',
+                :id => attachment,
+                :filename => attachment.filename%>
   <% end %>
   <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
@@ -18,13 +20,6 @@
                                          :method => :delete,
                                          :class => 'delete',
                                          :title => l(:button_delete) %>
-    <%# elsif attachment.container_type == 'Softapplication'%>
-      <%#= link_to image_tag('delete.png'), delete_softapplications_attachments_path(:id => attachment.id),
-                  :data => {:confirm => l(:text_are_you_sure)},
-                  :method => :delete,
-                  :class => 'delete',
-                  :remote => true,
-                  :title => l(:button_delete) %>
     <% else %>
     <%= link_to image_tag('delete.png'), attachment_path(attachment),
                                          :data => {:confirm => l(:text_are_you_sure)},