diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 0fde5b1dbf..51d7472075 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -81,7 +81,7 @@ class Attachment < ActiveRecord::Base
   end
 
   def content_disposition
-    inlineable? ? 'inline' : 'attachment'
+    inlineable? ? "inline" : "attachment; filename=#{self[:file]}"
   end
 
   def visible?(user = User.current)