diff --git a/src/File.php b/src/File.php
index 285d11b..47f1d3a 100644
--- a/src/File.php
+++ b/src/File.php
@@ -89,10 +89,11 @@ public function send($filename = null, $contentType, $inline = false)
 
         if ($filename !== null || $inline) {
             $disposition = $inline ? 'inline' : 'attachment';
+            $encodedFilename = rawurlencode($filename);
             header(
-                'Content-Disposition: ' . $disposition .
-                '; filename=' . $filename .
-                "; filename*=UTF-8''" . rawurlencode($filename)
+                "Content-Disposition: $disposition; " .
+                "filename=\"$filename\"; " .
+                "filename*=UTF-8''$encodedFilename"
             );
         }