diff --git a/lib/files.php b/lib/files.php
index f8bae778ed..69097e4107 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -212,6 +212,7 @@ class OC_Files {
 				self::addSendfileHeader($filename);
 			}else{
 				header('Content-Type: '.OC_Filesystem::getMimeType($filename));
+				header("Content-Length: ".OC_Filesystem::filesize($filename));
 				$storage = OC_Filesystem::getStorage($filename);
 				if ($storage instanceof OC_Filestorage_Local) {
 					self::addSendfileHeader(OC_Filesystem::getLocalFile($filename));
@@ -227,8 +228,6 @@ class OC_Files {
 			die('403 Forbidden');
 		}
 		if($only_header) {
-			if(!$zip)
-				header("Content-Length: ".OC_Filesystem::filesize($filename));
 			return ;
 		}
 		if($zip) {