Index: core/kernel/utility/email.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/kernel/utility/email.php	(revision 16027)
+++ core/kernel/utility/email.php	(revision )
@@ -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
+}