Index: branches/RC/core/units/general/helpers/image_helper.php
===================================================================
diff -u -N -r9651 -r9697
--- branches/RC/core/units/general/helpers/image_helper.php	(.../image_helper.php)	(revision 9651)
+++ branches/RC/core/units/general/helpers/image_helper.php	(.../image_helper.php)	(revision 9697)
@@ -48,10 +48,10 @@
 				list ($params['max_width'], $params['max_height'], $needs_resize) = $this->GetImageDimensions($src_image, $params['max_width'], $params['max_height']);
 
 				$src_path = dirname($src_image);
-				$dst_image = preg_replace('/^'.preg_quote($src_path, '/').'(.*)\.(.*)$/', $src_path.'/resized\\1_'.crc32(serialize($params)).'.\\2', $src_image);
 
 				if ($needs_resize || array_key_exists('wm_filename', $params) && $params['wm_filename']) {
-
+					// resize required OR watermarking required -> change resulting image name !
+					$dst_image = preg_replace('/^'.preg_quote($src_path, '/').'(.*)\.(.*)$/', $src_path.'/resized\\1_'.crc32(serialize($params)).'.\\2', $src_image);
 					if (!file_exists($dst_image) || filemtime($src_image) > filemtime($dst_image)) {
 						// resized image not available OR should be recreated due source image change
 						$params['dst_image'] = $dst_image;
@@ -60,12 +60,11 @@
 							// resize failed, because of server error
 							$dst_image = $src_image;
 						}
-
-						// resize ok
-
 					}
+
+					// resize/watermarking ok
+					$src_image = $dst_image;
 				}
-				$src_image = $dst_image;
 			}
 
 			$base_url = rtrim($this->Application->BaseURL(), '/');