Index: trunk/core/kernel/parser/template.php
===================================================================
diff -u -N -r8358 -r8793
--- trunk/core/kernel/parser/template.php	(.../template.php)	(revision 8358)
+++ trunk/core/kernel/parser/template.php	(.../template.php)	(revision 8793)
@@ -99,6 +99,9 @@
 			$filename = $this->Application->ReplacementTemplates[$filename];
 		}
 
+		// allows to use non-replaced version of replaced template
+		$filename = preg_replace('/^original:(.*)/', '\\1', $filename);
+		
 		if (preg_match('#^[\/]{0,1}([^\/]*)\/(.*)#', $filename, $regs)) {
 			$module_filename = $regs[2];
 			$first_dir = $regs[1];