Index: branches/5.2.x/core/kernel/utility/email.php
===================================================================
diff -u -N -r15608 -r16031
--- branches/5.2.x/core/kernel/utility/email.php	(.../email.php)	(revision 15608)
+++ branches/5.2.x/core/kernel/utility/email.php	(.../email.php)	(revision 16031)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: email.php 15608 2012-11-06 17:21:28Z alex $
+ * @version	$Id: email.php 16031 2014-05-22 18:14:04Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -800,7 +800,8 @@
 		$parser_params = $this->Application->Parser->Params; // backup parser params
 		$this->Application->Parser->SetParams($this->params);
 
-		$text = $this->Application->Parser->Parse($this->_normalizeLineEndings($text), 'email_template');
+		$template_name = 'et_' . $this->emailTemplate->GetID() . '_' . crc32($text);
+		$text = $this->Application->Parser->Parse($this->_normalizeLineEndings($text), $template_name);
 		$this->Application->Parser->SetParams($parser_params); // restore parser params
 
 		$category_helper = $this->Application->recallObject('CategoryHelper');
@@ -858,4 +859,4 @@
 	{
 		return preg_replace('/(\n|\r)+/', "\\1", $text);
 	}
-}
\ No newline at end of file
+}