Index: trunk/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -N -r8029 -r8397
--- trunk/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 8029)
+++ trunk/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 8397)
@@ -50,13 +50,13 @@
 							'Description' => TABLE_PREFIX.'Events.Description',
 							'Module' => TABLE_PREFIX.'Events.Module',
 							'Type' => TABLE_PREFIX.'Events.Type',
+							'ReplacementTags' => TABLE_PREFIX.'Events.ReplacementTags',
 						),
 					),
 
 					'Fields' => Array (
 						'EmailMessageId'	=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 						'Template'			=>	Array('type' => 'string', 'default' => null),
-						'ReplacementTags'	=>	Array ('type' => 'string', 'default' => null),
 						'MessageType'		=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text'=>'la_Text','html'=>'la_Html'), 'not_null' => '1','default' => 'text'),
 						'LanguageId'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 						'EventId'			=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -66,6 +66,7 @@
 					'VirtualFields'		=>	Array(
 						'Headers'	=>	Array('type'=>'string'),
 						'Body'		=>	Array('type'=>'string'),
+						'ReplacementTags'	=>	Array ('type' => 'string', 'default' => null),
 						'Description'		=>	Array('type'=>'string', 'sql_filter_type'=>'having'),
 						'Module' => Array('type' => 'string','not_null' => '1','default' => ''),
             'Type' => Array('formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1),