diff --git a/includes/file.inc b/includes/file.inc
index fafc33da53a..6a580c3ef86 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -2563,6 +2563,7 @@ function file_directory_temp() {
  *   An associative array of headers, as expected by file_transfer().
  */
 function file_get_content_headers($file) {
+  $name = mime_header_encode($file->filename);
   $type = mime_header_encode($file->filemime);
 
   return array(