Index: branches/5.0.x/core/units/email_messages/email_messages_event_handler.php
===================================================================
diff -u -r12299 -r12400
--- branches/5.0.x/core/units/email_messages/email_messages_event_handler.php	(.../email_messages_event_handler.php)	(revision 12299)
+++ branches/5.0.x/core/units/email_messages/email_messages_event_handler.php	(.../email_messages_event_handler.php)	(revision 12400)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_messages_event_handler.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: email_messages_event_handler.php 12400 2009-09-01 19:17:59Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -108,33 +108,14 @@
 		function OnAfterItemLoad(&$event)
 		{
 			$object =& $event->getObject();
-
-			$lines = explode("\n", $object->GetDBField('Template') );
-
-			$headers = Array();
-
-			foreach($lines as $line)
-			{
-				if( strlen(trim($line)) == 0 || ($line == '.') ) break;
-
-				$parts = explode(':', $line, 2);
-				if(strtolower($parts[0]) == 'subject')
-				{
-					$object->SetDBField('Subject', trim($parts[1]) );
-				}
-				else
-				{
-					$headers[] = $line;
-				}
-			}
-			$object->SetDBField('Headers', implode("\n", $headers) );
-
-			$message_body = '';
-			while( (list($line_id,$line) = each($lines)) )
-			{
-				$message_body .= $line;
-			}
-			$object->SetDBField('Body', $message_body);
+			/* @var $object kDBItem */
+			
+			$email_message_helper =& $this->Application->recallObject('EmailMessageHelper');
+			/* @var $email_message_helper EmailMessageHelper */
+			
+			$fields_hash = $email_message_helper->parseTemplate( $object->GetDBField('Template') );
+			
+			$object->SetDBFieldsFromHash($fields_hash);
 		}
 
 		/**