Index: branches/RC/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -N -r11610 -r11612
--- branches/RC/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 11610)
+++ branches/RC/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 11612)
@@ -61,7 +61,11 @@
 			'EmailMessageId'	=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'Template'			=>	Array('type' => 'string', 'default' => null),
 			'MessageType'		=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text'=>'la_Text','html'=>'la_Html'), 'use_phrases' => 1, 'not_null' => '1','default' => 'text'),
-			'LanguageId'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
+			'LanguageId'		=>	Array(
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Language ORDER BY PackName', 'option_key_field' => 'LanguageId', 'option_title_field' => 'PackName',
+				'not_null' => 1, 'default' => 0
+			),
 			'EventId'			=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'Subject'			=>	Array('type' => 'string', 'default' => null),
 		),
@@ -91,6 +95,17 @@
 				),
 
 			),
+
+			'Emails' => Array(
+				'Icons' => Array ('default' => 'icon16_custom.gif'),
+				'Fields' => Array(
+					'Subject' => Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter'),
+					'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+					'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'),
+					'LanguageId' => Array( 'title'=>'la_col_PackName', 'filter_block' => 'grid_options_filter'),
+				),
+
+			),
 		),
 	);