Index: branches/5.2.x/core/units/helpers/email_message_helper.php
===================================================================
diff -u -N -r14748 -r15222
--- branches/5.2.x/core/units/helpers/email_message_helper.php	(.../email_message_helper.php)	(revision 14748)
+++ branches/5.2.x/core/units/helpers/email_message_helper.php	(.../email_message_helper.php)	(revision 15222)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_message_helper.php 14748 2011-11-09 09:35:48Z alex $
+* @version	$Id: email_message_helper.php 15222 2012-03-15 16:38:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -19,23 +19,36 @@
 	/**
 	 * Extracts Subject, Headers, Body fields from email message translation
 	 *
-	 * @param string $text
+	 * @param string|SimpleXMLElement $text
+	 * @param string $message_type
 	 * @return Array
 	 */
-	function parseTemplate($text)
+	function parseTemplate($text, $message_type = '')
 	{
+		$ret = Array ('Subject' => '', 'Headers' => '', 'HtmlBody' => '', 'PlainTextBody' => '');
+
+		if ( $message_type == '' ) {
+			// this is v5+ e-mail event text as xml node
+			foreach ($ret as $field => $value) {
+				$node_name = strtoupper($field);
+				$ret[$field] = (string)$text->$node_name;
+			}
+
+			return $ret;
+		}
+
 		$line_id = 1;
-		$ret = Array ('Subject' => '', 'Headers' => '', 'Body' => '');
 		$headers = Array();
 		$lines = explode("\n", $text); // "\n" is lost in process
 
 		foreach ($lines as $line_id => $line) {
-			if (strlen(trim($line)) == 0 || ($line == '.')) {
+			if ( strlen(trim($line)) == 0 || ($line == '.') ) {
 				break;
 			}
 
 			$parts = explode(':', $line, 2);
-			if (strtolower($parts[0]) == 'subject') {
+
+			if ( strtolower($parts[0]) == 'subject' ) {
 				$ret['Subject'] = trim($parts[1]);
 			}
 			else {
@@ -48,7 +61,7 @@
 		$lines = array_slice($lines, $line_id + 1);
 
 		// add "\n", that was lost before
-		$ret['Body'] = implode("\n", $lines);
+		$ret[$message_type == 'html' ? 'HtmlBody' : 'PlainTextBody'] = implode("\n", $lines);
 
 		return $ret;
 	}