diff --git a/cake/libs/cake_response.php b/cake/libs/cake_response.php
index 6a3d300b9..180aa2d9b 100644
--- a/cake/libs/cake_response.php
+++ b/cake/libs/cake_response.php
@@ -614,9 +614,9 @@ class CakeResponse {
 			$time = strtotime($time);
 		}
 		$this->header(array(
-			'Date' => date("D, j M Y G:i:s ", $since) . 'GMT',
+			'Date' => gmdate("D, j M Y G:i:s ", $since) . 'GMT',
 			'Expires' => gmdate("D, j M Y H:i:s", $time) . " GMT",
-			'Cache-Control' => 'cache',
+			'Cache-Control' => 'public, max-age=' . $time - time(),
 			'Pragma' => 'cache'
 		));
 	}
diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php
index d30b156f7..43271fc93 100644
--- a/cake/libs/view/media.php
+++ b/cake/libs/view/media.php
@@ -21,74 +21,7 @@ App::import('View', 'View', false);
 
 class MediaView extends View {
 
-/**
- * Holds known mime type mappings
- *
- * @var array
- * @access public
- */
-	public $mimeType = array(
-		'ai' => 'application/postscript', 'bcpio' => 'application/x-bcpio', 'bin' => 'application/octet-stream',
-		'ccad' => 'application/clariscad', 'cdf' => 'application/x-netcdf', 'class' => 'application/octet-stream',
-		'cpio' => 'application/x-cpio', 'cpt' => 'application/mac-compactpro', 'csh' => 'application/x-csh',
-		'csv' => 'application/csv', 'dcr' => 'application/x-director', 'dir' => 'application/x-director',
-		'dms' => 'application/octet-stream', 'doc' => 'application/msword', 'drw' => 'application/drafting',
-		'dvi' => 'application/x-dvi', 'dwg' => 'application/acad', 'dxf' => 'application/dxf',
-		'dxr' => 'application/x-director', 'eot' => 'application/vnd.ms-fontobject', 'eps' => 'application/postscript',
-		'exe' => 'application/octet-stream', 'ez' => 'application/andrew-inset',
-		'flv' => 'video/x-flv', 'gtar' => 'application/x-gtar', 'gz' => 'application/x-gzip',
-		'bz2' => 'application/x-bzip', '7z' => 'application/x-7z-compressed', 'hdf' => 'application/x-hdf',
-		'hqx' => 'application/mac-binhex40', 'ico' => 'image/vnd.microsoft.icon', 'ips' => 'application/x-ipscript',
-		'ipx' => 'application/x-ipix', 'js' => 'application/x-javascript', 'latex' => 'application/x-latex',
-		'lha' => 'application/octet-stream', 'lsp' => 'application/x-lisp', 'lzh' => 'application/octet-stream',
-		'man' => 'application/x-troff-man', 'me' => 'application/x-troff-me', 'mif' => 'application/vnd.mif',
-		'ms' => 'application/x-troff-ms', 'nc' => 'application/x-netcdf', 'oda' => 'application/oda',
-		'otf' => 'font/otf', 'pdf' => 'application/pdf',
-		'pgn' => 'application/x-chess-pgn', 'pot' => 'application/mspowerpoint', 'pps' => 'application/mspowerpoint',
-		'ppt' => 'application/mspowerpoint', 'ppz' => 'application/mspowerpoint', 'pre' => 'application/x-freelance',
-		'prt' => 'application/pro_eng', 'ps' => 'application/postscript', 'roff' => 'application/x-troff',
-		'scm' => 'application/x-lotusscreencam', 'set' => 'application/set', 'sh' => 'application/x-sh',
-		'shar' => 'application/x-shar', 'sit' => 'application/x-stuffit', 'skd' => 'application/x-koan',
-		'skm' => 'application/x-koan', 'skp' => 'application/x-koan', 'skt' => 'application/x-koan',
-		'smi' => 'application/smil', 'smil' => 'application/smil', 'sol' => 'application/solids',
-		'spl' => 'application/x-futuresplash', 'src' => 'application/x-wais-source', 'step' => 'application/STEP',
-		'stl' => 'application/SLA', 'stp' => 'application/STEP', 'sv4cpio' => 'application/x-sv4cpio',
-		'sv4crc' => 'application/x-sv4crc', 'svg' => 'image/svg+xml', 'svgz' => 'image/svg+xml',
-		'swf' => 'application/x-shockwave-flash', 't' => 'application/x-troff',
-		'tar' => 'application/x-tar', 'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex',
-		'texi' => 'application/x-texinfo', 'texinfo' => 'application/x-texinfo', 'tr' => 'application/x-troff',
-		'tsp' => 'application/dsptype', 'ttf' => 'font/ttf',
-		'unv' => 'application/i-deas', 'ustar' => 'application/x-ustar',
-		'vcd' => 'application/x-cdlink', 'vda' => 'application/vda', 'xlc' => 'application/vnd.ms-excel',
-		'xll' => 'application/vnd.ms-excel', 'xlm' => 'application/vnd.ms-excel', 'xls' => 'application/vnd.ms-excel',
-		'xlw' => 'application/vnd.ms-excel', 'zip' => 'application/zip', 'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff',
-		'aiff' => 'audio/x-aiff', 'au' => 'audio/basic', 'kar' => 'audio/midi', 'mid' => 'audio/midi',
-		'midi' => 'audio/midi', 'mp2' => 'audio/mpeg', 'mp3' => 'audio/mpeg', 'mpga' => 'audio/mpeg',
-		'ra' => 'audio/x-realaudio', 'ram' => 'audio/x-pn-realaudio', 'rm' => 'audio/x-pn-realaudio',
-		'rpm' => 'audio/x-pn-realaudio-plugin', 'snd' => 'audio/basic', 'tsi' => 'audio/TSP-audio', 'wav' => 'audio/x-wav',
-		'asc' => 'text/plain', 'c' => 'text/plain', 'cc' => 'text/plain', 'css' => 'text/css', 'etx' => 'text/x-setext',
-		'f' => 'text/plain', 'f90' => 'text/plain', 'h' => 'text/plain', 'hh' => 'text/plain', 'htm' => 'text/html',
-		'html' => 'text/html', 'm' => 'text/plain', 'rtf' => 'text/rtf', 'rtx' => 'text/richtext', 'sgm' => 'text/sgml',
-		'sgml' => 'text/sgml', 'tsv' => 'text/tab-separated-values', 'tpl' => 'text/template', 'txt' => 'text/plain',
-		'xml' => 'text/xml', 'avi' => 'video/x-msvideo', 'fli' => 'video/x-fli', 'mov' => 'video/quicktime',
-		'movie' => 'video/x-sgi-movie', 'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg', 'mpg' => 'video/mpeg',
-		'qt' => 'video/quicktime', 'viv' => 'video/vnd.vivo', 'vivo' => 'video/vnd.vivo', 'gif' => 'image/gif',
-		'ief' => 'image/ief', 'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg', 'jpg' => 'image/jpeg',
-		'pbm' => 'image/x-portable-bitmap', 'pgm' => 'image/x-portable-graymap', 'png' => 'image/png',
-		'pnm' => 'image/x-portable-anymap', 'ppm' => 'image/x-portable-pixmap', 'ras' => 'image/cmu-raster',
-		'rgb' => 'image/x-rgb', 'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'xbm' => 'image/x-xbitmap',
-		'xpm' => 'image/x-xpixmap', 'xwd' => 'image/x-xwindowdump', 'ice' => 'x-conference/x-cooltalk',
-		'iges' => 'model/iges', 'igs' => 'model/iges', 'mesh' => 'model/mesh', 'msh' => 'model/mesh',
-		'silo' => 'model/mesh', 'vrml' => 'model/vrml', 'wrl' => 'model/vrml',
-		'mime' => 'www/mime', 'pdb' => 'chemical/x-pdb', 'xyz' => 'chemical/x-pdb');
 
-/**
- * Holds headers sent to browser before rendering media
- *
- * @var array
- * @access protected
- */
-	protected $_headers = array();
 
 /**
  * Constructor
@@ -97,6 +30,12 @@ class MediaView extends View {
  */
 	function __construct(&$controller) {
 		parent::__construct($controller);
+		if (is_object($controller) && isset($controller->response)) {
+			$this->response = $controller->response;
+		} else {
+			App::import('Core', 'CakeRequest');
+			$this->response = new CakeResponse;
+		}
 	}
 
 /**
@@ -119,8 +58,7 @@ class MediaView extends View {
 		}
 
 		if (!file_exists($path)) {
-			header('Content-Type: text/html');
-			$this->cakeError('error404');
+			throw new NotFoundException('The requested file was not found');
 		}
 
 		if (is_null($name)) {
@@ -128,10 +66,10 @@ class MediaView extends View {
 		}
 
 		if (is_array($mimeType)) {
-			$this->mimeType = array_merge($this->mimeType, $mimeType);
+			$this->response->type($mimeType);
 		}
 
-		if (isset($extension) && isset($this->mimeType[$extension]) && connection_status() == 0) {
+		if (isset($extension) && $this->response->type($extension) && $this->_isActive()) {
 			$chunkSize = 8192;
 			$buffer = '';
 			$fileSize = @filesize($path);
@@ -186,97 +124,66 @@ class MediaView extends View {
 					$this->_header('Content-Length: ' . $fileSize);
 				}
 			} else {
-				$this->_header('Date: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
-				if ($cache) {
-					if (!is_numeric($cache)) {
-						$cache = strtotime($cache) - time();
-					}
-					$this->_header(array(
-						'Cache-Control: max-age=' . $cache,
-						'Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache) . ' GMT',
-						'Pragma: cache'));
-				} else {
-					$this->_header(array(
-						'Cache-Control: must-revalidate, post-check=0, pre-check=0',
-						'Pragma: no-cache'));
-				}
-				$this->_header(array(
-					'Last-Modified: ' . $modified,
-					'Content-Type: ' . $this->mimeType[$extension],
-					'Content-Length: ' . $fileSize));
-			}
-			$this->_output();
-			$this->_clearBuffer();
 
-			while (!feof($handle)) {
-				if (!$this->_isActive()) {
-					fclose($handle);
-					return false;
+				if ($cache) {
+					$this->response->cache(time(), $cache);
+				} else {
+					$this->response->header(array(
+						'Date' => gmdate('D, d M Y H:i:s', time()) . ' GMT',
+						'Cache-Control' => 'must-revalidate, post-check=0, pre-check=0',
+						'Pragma' => 'no-cache'
+					));
 				}
-				set_time_limit(0);
-				$buffer = fread($handle, $chunkSize);
-				echo $buffer;
-				$this->_flushBuffer();
+
+				$this->response->type($extension);
+				$this->respose->header(array(
+					'Last-Modified' => $modified,
+					'Content-Length' => $fileSize
+				));
 			}
-			fclose($handle);
+			$this->response->send();
+			$this->_clearBuffer();
+			$this->_sendFile($handle);
+
 			return;
 		}
 		return false;
 	}
 
-/**
- * Method to set headers
- * @param mixed $header
- * @param boolean $boolean
- */
-	protected function _header($header, $boolean = true) {
-		if (is_array($header)) {
-			foreach ($header as $string => $boolean) {
-				if (is_numeric($string)) {
-					$this->_headers[] = array($boolean => true);
-				} else {
-					$this->_headers[] = array($string => $boolean);
-				}
+	protected function _sendFile($handle) {
+		while (!feof($handle)) {
+			if (!$this->_isActive()) {
+				fclose($handle);
+				return false;
 			}
-			return;
-		}
-		$this->_headers[] = array($header => $boolean);
-		return;
-	}
-
-/**
- * Method to output headers
- */
-	protected function _output() {
-		foreach ($this->_headers as $key => $value) {
-			$header = key($value);
-			header($header, $value[$header]);
+			set_time_limit(0);
+			$buffer = fread($handle, $chunkSize);
+			echo $buffer;
+			$this->_flushBuffer();
 		}
+		fclose($handle);
 	}
 
 /**
  * Returns true if connection is still active
  * @return boolean
- * @access protected
  */
-	function _isActive() {
+	protected function _isActive() {
 		return connection_status() == 0 && !connection_aborted();
 	}
 
 /**
  * Clears the contents of the topmost output buffer and discards them
  * @return boolean
- * @access protected
  */
-	function _clearBuffer() {
+	protected function _clearBuffer() {
 		return @ob_end_clean();
 	}
 
 /**
  * Flushes the contents of the output buffer
- * @access protected
  */
-	function _flushBuffer() {
+	protected function _flushBuffer() {
 		@flush();
 		@ob_flush();
 	}