Index: branches/unlabeled/unlabeled-1.9.2/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -r8079 -r8245
--- branches/unlabeled/unlabeled-1.9.2/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 8079)
+++ branches/unlabeled/unlabeled-1.9.2/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 8245)
@@ -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),
Index: branches/unlabeled/unlabeled-1.6.2/core/install/upgrades.php
===================================================================
diff -u -r8154 -r8245
--- branches/unlabeled/unlabeled-1.6.2/core/install/upgrades.php	(.../upgrades.php)	(revision 8154)
+++ branches/unlabeled/unlabeled-1.6.2/core/install/upgrades.php	(.../upgrades.php)	(revision 8245)
@@ -41,6 +41,33 @@
 		}
 
 		/**
+		 * Moves ReplacementTags functionality from EmailMessage to Events table
+		 *
+		 * @param string $mode when called mode {before, after)
+		 */
+		function Upgrade_4_1_1($mode)
+		{
+			if ($mode == 'after') {
+				$sql = 'SELECT ReplacementTags, EventId
+						FROM '.TABLE_PREFIX.'EmailMessage
+						WHERE (ReplacementTags IS NOT NULL) AND (ReplacementTags <> "") AND (LanguageId = 1)';
+				$replacement_tags = $this->Conn->GetCol($sql, 'EventId');
+				
+				foreach ($replacement_tags as $event_id => $replacement_tag) {
+					$sql = 'UPDATE '.TABLE_PREFIX.'Events
+							SET ReplacementTags = '.$this->Conn->qstr($replacement_tag).'
+							WHERE EventId = '.$event_id;
+					$this->Conn->Query($sql);
+				}
+				
+				// drop moved field from source table
+				$sql = 'ALTER TABLE '.TABLE_PREFIX.'EmailMessage
+						DROP `ReplacementTags`';
+				$this->Conn->Query($sql);
+			}
+		}
+		
+		/**
 		 * Callback function, that makes all ml fields of text type null with same default value
 		 *
 		 * @param string $prefix
Index: branches/unlabeled/unlabeled-1.11.2/core/install/install_schema.sql
===================================================================
diff -u -r8227 -r8245
--- branches/unlabeled/unlabeled-1.11.2/core/install/install_schema.sql	(.../install_schema.sql)	(revision 8227)
+++ branches/unlabeled/unlabeled-1.11.2/core/install/install_schema.sql	(.../install_schema.sql)	(revision 8245)
@@ -61,7 +61,6 @@
 CREATE TABLE EmailMessage (
   EmailMessageId int(10) NOT NULL auto_increment,
   Template longtext,
-  ReplacementTags text,
   MessageType enum('html','text') NOT NULL default 'text',
   LanguageId int(11) NOT NULL default '0',
   EventId int(11) NOT NULL default '0',
@@ -91,6 +90,7 @@
 CREATE TABLE Events (
   EventId int(11) NOT NULL auto_increment,
   Event varchar(40) NOT NULL default '',
+  ReplacementTags text,
   Enabled int(11) NOT NULL default '1',
   FromUserId int(11) NOT NULL default '-1',
   Module varchar(40) NOT NULL default '',
Index: branches/unlabeled/unlabeled-1.11.2/core/install/upgrades.sql
===================================================================
diff -u -r8227 -r8245
--- branches/unlabeled/unlabeled-1.11.2/core/install/upgrades.sql	(.../upgrades.sql)	(revision 8227)
+++ branches/unlabeled/unlabeled-1.11.2/core/install/upgrades.sql	(.../upgrades.sql)	(revision 8245)
@@ -102,3 +102,5 @@
   KEY LastSendRetry (LastSendRetry),
   KEY SendRetries (SendRetries)
 );
+
+ALTER TABLE Events ADD ReplacementTags TEXT AFTER Event;
Index: branches/unlabeled/unlabeled-1.10.2/core/units/email_events/email_events_config.php
===================================================================
diff -u -r8227 -r8245
--- branches/unlabeled/unlabeled-1.10.2/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 8227)
+++ branches/unlabeled/unlabeled-1.10.2/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 8245)
@@ -62,6 +62,7 @@
 					'Fields'			=>	Array(
 													'EventId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 										            'Event' => Array('type' => 'string','not_null' => '1','default' => ''),
+										            'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),
 										            'Enabled' => Array('type'=>'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled', 2 => 'la_Text_FrontOnly'), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1),
 										            'FromUserId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter','options' => Array(-1=>'root'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required'=>1, 'not_null' => 1, 'default' => -1),
 										            'Module' => Array('type' => 'string','not_null' => '1','default' => ''),