diff --git a/include/staff/templates/thread-entries.tmpl.php b/include/staff/templates/thread-entries.tmpl.php
index 821c1c50ca4416860e4350507fa730b744d6a2e9..be49ed35f6296a097e5cba20968737d5f81b6aef 100644
--- a/include/staff/templates/thread-entries.tmpl.php
+++ b/include/staff/templates/thread-entries.tmpl.php
@@ -60,7 +60,8 @@ if ($entries) {
                             Format::file_size($A->file->size));
 ?>
             <a class="Icon file no-pjax" href="<?php echo $A->file->getDownloadUrl();
-                ?>" target="_blank"><?php echo Format::htmlchars($A->file->name);
+                ?>" download="<?php echo Format::htmlchars($A->file->name); ?>"
+                target="_blank"><?php echo Format::htmlchars($A->file->name);
             ?></a><?php echo $size;?>&nbsp;
 <?php               } ?>
             </td>
diff --git a/scp/js/ticket.js b/scp/js/ticket.js
index a105918683214496cb4050d7d238089924dc120b..c5c8df2025938307c5e9e79eccfe2d183f995799 100644
--- a/scp/js/ticket.js
+++ b/scp/js/ticket.js
@@ -328,7 +328,9 @@ $.showImagesInline = function(urls, thread_id) {
                     }
                 ).append($('<div class="caption">')
                     .append('<span class="filename">'+info.filename+'</span>')
-                    .append('<a href="'+info.download_url+'" class="action-button pull-right no-pjax"><i class="icon-download-alt"></i> '+__('Download')+'</a>')
+                    .append($('<a href="'+info.download_url+'" class="action-button pull-right no-pjax"><i class="icon-download-alt"></i> '+__('Download')+'</a>')
+                      .attr('download', info.filename)
+                    )
                 );
             e.data('wrapped', true);
         }
@@ -419,11 +421,7 @@ var ticket_onload = function($) {
         });
     });
 
-    $('.thread-body').each(function() {
-        var urls = $(this).data('urls');
-        if (urls)
-            $.showImagesInline(urls, $(this).data('id'));
-    });
+    $.showImagesInline($('#ticket_thread').data('imageUrls'));
 };
 $(ticket_onload);
 $(document).on('pjax:success', function() { ticket_onload(jQuery); });