Index: branches/5.2.x/core/units/email_events/email_events_config.php
===================================================================
diff -u -N -r14244 -r14572
--- branches/5.2.x/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 14244)
+++ branches/5.2.x/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 14572)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_config.php 14244 2011-03-16 20:53:41Z alex $
+* @version	$Id: email_events_config.php 14572 2011-09-20 15:25:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -61,8 +61,7 @@
 			),
 
 			// for mass mailing
-			'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
-			'email_prepare' => Array ('prefixes' => Array (), 'format' => '!la_title_PreparingEmailsForSending!. !la_title_PleaseWait!'),
+			'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),			
 			'email_send' => Array ('prefixes' => Array (), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'),
 			'email_send_complete' => Array ('prefixes' => Array (), 'format' => '!la_title_SendMailComplete!'),
 		),
@@ -151,12 +150,14 @@
             'Subject' => Array (
 				'type' => 'string',
 				'formatter' => 'kMultiLanguage', 'db_type' => 'text',
+				'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
 				'required' => 1, 'default' => null
 			),
 
 			'Body' => Array (
 				'type' => 'string',
 				'formatter' => 'kMultiLanguage', 'db_type' => 'longtext',
+				'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
 				'required' => 1, 'default' => null
 			),