Index: t3lib/class.t3lib_stdgraphic.php
===================================================================
--- t3lib/class.t3lib_stdgraphic.php	(revision 9217)
+++ t3lib/class.t3lib_stdgraphic.php	(working copy)
@@ -2332,10 +2332,20 @@
 				$w=$data['origW'];
 				$h=$data['origH'];
 
-					// if no convertion should be performed
-				$wh_noscale = (!$w && !$h) || ($data[0]==$info[0] && $data[1]==$info[1]);		// this flag is true if the width / height does NOT dictate the image to be scaled!! (that is if no w/h is given or if the destination w/h matches the original image-dimensions....
+					// if no conversion should be performed
+					// this flag is true if the width / height does NOT dictate 
+					// the image to be scaled!! (that is if no width / height is
+					// given or if the destination w/h matches the original image
+					// dimensions or if the option to not scale the image is set)
+				$noScale = (!$w && !$h) || ($data[0] == $info[0] && $data[1] == $info[1]) || $options['noScale'];
 
-				if ($wh_noscale && !$data['crs'] && !$params && !$frame && $newExt==$info[2] && !$mustCreate) {
+				if ($noScale && !$data['crs'] && !$params && !$frame && $newExt == $info[2] && !$mustCreate) {
+						// set the new width and height before returning, 
+						// if the noScale option is set
+					if ($options['noScale']) {
+						$info[0] = $data[0];
+						$info[1] = $data[1];
+					}
 					$info[3] = $imagefile;
 					return $info;
 				}
Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php	(revision 9217)
+++ typo3/sysext/cms/tslib/class.tslib_content.php	(working copy)
@@ -4752,6 +4752,7 @@
 						$fileArray['maxH'] = intval($this->stdWrap($fileArray['maxH'], $fileArray['maxH.']));
 						$fileArray['minW'] = intval($this->stdWrap($fileArray['minW'], $fileArray['minW.']));
 						$fileArray['minH'] = intval($this->stdWrap($fileArray['minH'], $fileArray['minH.']));
+						$fileArray['noScale'] = $this->stdWrap($fileArray['noScale'], $fileArray['noScale.']);
 						$maskArray = $fileArray['m.'];
 						$maskImages = array();
 						if (is_array($fileArray['m.'])) { // Must render mask images and include in hash-calculating - else we cannot be sure the filename is unique for the setup!
@@ -4800,6 +4801,9 @@
 							if ($fileArray['minH']) {
 								$options['minH'] = $fileArray['minH'];
 							}
+							if ($fileArray['noScale']) {
+								$options['noScale'] = $fileArray['noScale'];
+							}
 
 								// checks to see if m (the mask array) is defined
 							if (is_array($maskArray) && $GLOBALS['TYPO3_CONF_VARS']['GFX']['im']) {