Index: admin/system_presets/simple/email_events_emailevents.php
===================================================================
--- admin/system_presets/simple/email_events_emailevents.php	(revision 15437)
+++ admin/system_presets/simple/email_events_emailevents.php	(working copy)
@@ -1,64 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	// section removal
-	$remove_sections = Array (
-//		'in-portal:configemail',
-	);
-
-	// sections shown with debug on
-	$debug_only_sections = Array (
-		'in-portal:configemail',
-	);
-
-	// toolbar buttons
-	$remove_buttons = Array (
-//		list of all email templates
-		'email_message_list' => Array (/*'new_item', 'edit', 'delete', 'approve', 'decline', 'frontend_mail', 'view',*/ 'export', /*'dbl-click'*/),
-
-//		edit email edit - general tab
-//		'email_message_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
-
-//		edit email edit - settings tab
-//		'email_message_edit_settings' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
-	);
-
-	// fields to hide
-	$hidden_fields = Array (
-		/*'EventId', 'Event', 'ReplacementTags', 'AllowChangingSender', 'CustomSender',
-		'SenderName', 'SenderAddressType', 'SenderAddress', 'AllowChangingRecipient',
-		'CustomRecipient', 'Recipients', 'Subject', 'HtmlBody', 'PlainTextBody', 'Headers',
-		'Enabled', 'FrontEndOnly', 'Module', 'BindToSystemEvent', 'Description', 'Type'*/
-	);
-
-	// virtual fields to hide
-	$virtual_hidden_fields = Array (
-		/*'RecipientType', 'RecipientName', 'RecipientAddressType',
-		'RecipientAddress', 'Tag', 'Replacement', 'ReplacementTagsXML',*/
-	);
-
-	// fields to make required
-	$required_fields = Array (
-		/*'EventId',*/ 'Event', /*'ReplacementTags', 'AllowChangingSender', 'CustomSender',
-		'SenderName', 'SenderAddressType', 'SenderAddress', 'AllowChangingRecipient',
-		'CustomRecipient', 'Recipients',*/ 'Subject', /*'HtmlBody', 'PlainTextBody', 'Headers',*/
-		/*'Enabled', 'FrontEndOnly',*/ 'Module', /*'BindToSystemEvent', 'Description',*/ 'Type'
-	);
-
-	// virtual fields to make required
-	$virtual_required_fields = Array (
-		/*'RecipientType', 'RecipientName', 'RecipientAddressType',
-		'RecipientAddress', 'Tag', 'Replacement', 'ReplacementTagsXML',*/
-	);
-
-	// tabs during editing
-	$hide_edit_tabs = Array (
-		'Default' => Array (/*'general',*/ 'settings'),
-	);
-
-	// hide columns in grids
-	$hide_columns = Array (
-//		'Default'	=>	Array ('EventId', 'Description', 'Event', 'Module', 'Type', 'Enabled', 'LastChanged'),
-//		'Emails'	=>	Array ('EventId', 'Event', 'Subject', 'Description', 'Type', 'Enabled', 'Module', 'FrontEndOnly', 'LastChanged'),
-	);
\ No newline at end of file
Index: admin/system_presets/simple/email_logs_email-log.php
===================================================================
--- admin/system_presets/simple/email_logs_email-log.php	(revision 15437)
+++ admin/system_presets/simple/email_logs_email-log.php	(working copy)
@@ -20,7 +20,7 @@
 
 	// fields to hide
 	$hidden_fields = Array (
-		/*'EmailLogId', 'From', 'To', 'OtherRecipients', 'Subject', 'HtmlBody', 'TextBody', 'SentOn', 'EventName', 'EventType', 'EventParams', 'AccessKey'*/
+		/*'EmailLogId', 'From', 'To', 'OtherRecipients', 'Subject', 'HtmlBody', 'TextBody', 'SentOn', 'TemplateName', 'EventType', 'EventParams', 'AccessKey'*/
 	);
 
 	// virtual fields to hide
@@ -30,7 +30,7 @@
 
 	// fields to make required
 	$required_fields = Array (
-		/*'EmailLogId', 'From', 'To', 'OtherRecipients', 'Subject', 'HtmlBody', 'TextBody', 'SentOn', 'EventName', 'EventType', 'EventParams', 'AccessKey'*/
+		/*'EmailLogId', 'From', 'To', 'OtherRecipients', 'Subject', 'HtmlBody', 'TextBody', 'SentOn', 'TemplateName', 'EventType', 'EventParams', 'AccessKey'*/
 	);
 
 	// virtual fields to make required
@@ -46,5 +46,5 @@
 	// hide columns in grids
 	$hide_columns = Array (
 //		currently not in user
-//		'Default'	=>	Array ('EmailLogId', 'From', 'To', 'Subject', 'SentOn', 'EventName', 'EventType'),
+//		'Default'	=>	Array ('EmailLogId', 'From', 'To', 'Subject', 'SentOn', 'TemplateName', 'EventType'),
 	);
\ No newline at end of file
Index: admin/system_presets/simple/email_templates_email-template.php
===================================================================
--- admin/system_presets/simple/email_templates_email-template.php	(revision 15437)
+++ admin/system_presets/simple/email_templates_email-template.php	(working copy)
@@ -15,18 +15,18 @@
 	// toolbar buttons
 	$remove_buttons = Array (
 //		list of all email templates
-		'email_message_list' => Array (/*'new_item', 'edit', 'delete', 'approve', 'decline', 'frontend_mail', 'view',*/ 'export', /*'dbl-click'*/),
+		'email_template_list' => Array (/*'new_item', 'edit', 'delete', 'approve', 'decline', 'frontend_mail', 'view',*/ 'export', /*'dbl-click'*/),
 
-//		edit email edit - general tab
-//		'email_message_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+//		edit email template - general tab
+//		'email_template_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
 
-//		edit email edit - settings tab
-//		'email_message_edit_settings' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+//		edit email template - settings tab
+//		'email_template_edit_settings' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
 	);
 
 	// fields to hide
 	$hidden_fields = Array (
-		/*'EventId', 'Event', 'ReplacementTags', 'AllowChangingSender', 'CustomSender',
+		/*'TemplateId', 'TemplateName', 'ReplacementTags', 'AllowChangingSender', 'CustomSender',
 		'SenderName', 'SenderAddressType', 'SenderAddress', 'AllowChangingRecipient',
 		'CustomRecipient', 'Recipients', 'Subject', 'HtmlBody', 'PlainTextBody', 'Headers',
 		'Enabled', 'FrontEndOnly', 'Module', 'BindToSystemEvent', 'Description', 'Type'*/
@@ -40,7 +40,7 @@
 
 	// fields to make required
 	$required_fields = Array (
-		/*'EventId',*/ 'Event', /*'ReplacementTags', 'AllowChangingSender', 'CustomSender',
+		/*'TemplateId',*/ 'TemplateName', /*'ReplacementTags', 'AllowChangingSender', 'CustomSender',
 		'SenderName', 'SenderAddressType', 'SenderAddress', 'AllowChangingRecipient',
 		'CustomRecipient', 'Recipients',*/ 'Subject', /*'HtmlBody', 'PlainTextBody', 'Headers',*/
 		/*'Enabled', 'FrontEndOnly',*/ 'Module', /*'BindToSystemEvent', 'Description',*/ 'Type'
@@ -59,6 +59,6 @@
 
 	// hide columns in grids
 	$hide_columns = Array (
-//		'Default'	=>	Array ('EventId', 'Description', 'Event', 'Module', 'Type', 'Enabled', 'LastChanged'),
-//		'Emails'	=>	Array ('EventId', 'Event', 'Subject', 'Description', 'Type', 'Enabled', 'Module', 'FrontEndOnly', 'LastChanged'),
+//		'Default'	=>	Array ('TemplateId', 'Description', 'TemplateName', 'Module', 'Type', 'Enabled', 'LastChanged'),
+//		'Emails'	=>	Array ('TemplateId', 'TemplateName', 'Subject', 'Description', 'Type', 'Enabled', 'Module', 'FrontEndOnly', 'LastChanged'),
 	);
\ No newline at end of file
Index: admin/system_presets/simple/languages_lang.php
===================================================================
--- admin/system_presets/simple/languages_lang.php	(revision 15437)
+++ admin/system_presets/simple/languages_lang.php	(working copy)
@@ -15,7 +15,7 @@
 	// toolbar buttons
 	$remove_buttons = Array (
 //		'languages_list' => Array ('new_item', 'edit', 'delete', 'export', 'import', 'setprimary', 'refresh', 'view', 'dbl-click'),
-//		'email_messages_edit' => Array ('select', 'cancel', 'prev', 'next'),
+//		'email_template_edit' => Array ('select', 'cancel', 'prev', 'next'),
 	);
 
 
Index: admin/system_presets/simple/phrases_phrases.php
===================================================================
--- admin/system_presets/simple/phrases_phrases.php	(revision 15437)
+++ admin/system_presets/simple/phrases_phrases.php	(working copy)
@@ -32,7 +32,7 @@
 	// virtual fields to hide
 	$virtual_hidden_fields = Array (
 		/*'PrimaryTranslation', 'CurrentTranslation', 'CurrentHintTranslation', 'CurrentColumnTranslation',
-		'LangFile', 'ImportOverwrite', 'DoNotEncode', 'ExportPhrases', 'ExportEmailEvents'*/
+		'LangFile', 'ImportOverwrite', 'DoNotEncode', 'ExportPhrases', 'ExportEmailTemplates'*/
 	);
 
 	$debug_only_fields = Array (
Index: admin/system_presets/simple/system_event_subscriptions_system-event-subscription.php
===================================================================
--- admin/system_presets/simple/system_event_subscriptions_system-event-subscription.php	(revision 15437)
+++ admin/system_presets/simple/system_event_subscriptions_system-event-subscription.php	(working copy)
@@ -23,30 +23,30 @@
 
 	// fields to hide
 	$hidden_fields = Array (
-		/*'SubscriptionId', 'EmailEventId', 'SubscriberEmail', 'UserId', 'CategoryId',
+		/*'SubscriptionId', 'EmailTemplateId', 'SubscriberEmail', 'UserId', 'CategoryId',
 		'ItemId', 'ParentItemId', 'SubscribedOn',*/
 	);
 
 	// virtual fields to hide
 	$virtual_hidden_fields = Array (
-		/*'Username', 'EmailEventName', 'CategoryName',*/
+		/*'Username', 'EmailTemplateName', 'CategoryName',*/
 	);
 
 	// fields to make required
 	$required_fields = Array (
-		/*'SubscriptionId',*/ 'EmailEventId', /*'SubscriberEmail', 'UserId', 'CategoryId',
+		/*'SubscriptionId',*/ 'EmailTemplateId', /*'SubscriberEmail', 'UserId', 'CategoryId',
 		'ItemId', 'ParentItemId',*/ 'SubscribedOn',
 	);
 
 	// virtual fields to make required
 	$virtual_required_fields = Array (
-		/*'Username', 'EmailEventName', 'CategoryName',*/
+		/*'Username', 'EmailTemplateName', 'CategoryName',*/
 	);
 
 	// hide columns in grids
 	$hide_columns = Array (
 		/*'Default' => Array (
-			'SubscriptionId', 'EmailEventId', 'EmailEventName', 'SubscriberEmail', 'UserId', 'Username', 'CategoryId',
+			'SubscriptionId', 'EmailTemplateId', 'EmailTemplateName', 'SubscriberEmail', 'UserId', 'Username', 'CategoryId',
 			'CategoryName', 'ItemId', 'ItemName', 'ParentItemId', 'ParentItemName', 'SubscribedOn',
 		),*/
 	);
\ No newline at end of file
Index: core/admin_templates/config/custom_variables.tpl
===================================================================
--- core/admin_templates/config/custom_variables.tpl	(revision 15437)
+++ core/admin_templates/config/custom_variables.tpl	(working copy)
@@ -114,7 +114,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="cf_DefaultEmailRecipients_value">
-	<inp2:emailevents.{$PrefixSpecial}_PresetFormFields/>
+	<inp2:email-template.{$PrefixSpecial}_PresetFormFields/>
 
 	<style type="text/css">
 		.grid-edit-table {
@@ -130,15 +130,15 @@
 	</style>
 
 	<table class="grid-edit-table">
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents.{$PrefixSpecial}" field="RecipientType" title="la_fld_RecipientType"/>
-		<inp2:m_RenderElement name="inp_edit_combo_target" prefix="emailevents.{$PrefixSpecial}" field="RecipientAddress" title="la_fld_RecipientAddress" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents.{$PrefixSpecial}" field="RecipientName" title="la_fld_RecipientName" style="width: 318px;"/>
-		<inp2:m_RenderElement name="inp_edit_minput" prefix="emailevents.{$PrefixSpecial}" field="Recipients" title="la_fld_Recipients" format="auto" style="width: 400px; height: 150px;"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="email-template.{$PrefixSpecial}" field="RecipientType" title="la_fld_RecipientType"/>
+		<inp2:m_RenderElement name="inp_edit_combo_target" prefix="email-template.{$PrefixSpecial}" field="RecipientAddress" title="la_fld_RecipientAddress" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="email-template.{$PrefixSpecial}" field="RecipientName" title="la_fld_RecipientName" style="width: 318px;"/>
+		<inp2:m_RenderElement name="inp_edit_minput" prefix="email-template.{$PrefixSpecial}" field="Recipients" title="la_fld_Recipients" format="auto" style="width: 400px; height: 150px;"/>
 	</table>
 
 	<input type="hidden" name="<inp2:InputName field='VariableValue'/>" value="<inp2:Field field='VariableValue' />"/>
 
-	<inp2:m_RenderElement name="email_recipients_js" prefix="emailevents.{$PrefixSpecial}" to_readonly="0"/>
+	<inp2:m_RenderElement name="email_recipients_js" prefix="email-template.{$PrefixSpecial}" to_readonly="0"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="cf_AllowAdminConsoleInterfaceChange_value">
Index: core/admin_templates/incs/form_blocks.tpl
===================================================================
--- core/admin_templates/incs/form_blocks.tpl	(revision 15541)
+++ core/admin_templates/incs/form_blocks.tpl	(working copy)
@@ -731,7 +731,7 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="email_recipients_js" prefix="emailevents" to_readonly="auto">
+<inp2:m_DefineElement name="email_recipients_js" prefix="email-template" to_readonly="auto">
 	<script type="text/javascript">
 		Recipients.formatLine = function($record_index) {
 			if (this.Records[$record_index]['RecipientName']) {
@@ -774,11 +774,11 @@
 
 		<inp2:m_if check="m_Param" name="to_readonly">
 			Recipients.isReadOnly = function($record_index) {
-				return this.Records[$record_index]['RecipientType'] == <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_TO"/>;
+				return this.Records[$record_index]['RecipientType'] == <inp2:m_GetConst name="EmailTemplate::RECIPIENT_TYPE_TO"/>;
 			}
 
 			<inp2:$prefix_RestoreRecipientType/>
-			Recipients.registerControl('RecipientType', {type: 'radio', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="$prefix" field="RecipientType" strip_nl="2"/>, 'default': <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_CC"/>});
+			Recipients.registerControl('RecipientType', {type: 'radio', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="$prefix" field="RecipientType" strip_nl="2"/>, 'default': <inp2:m_GetConst name="EmailTemplate::RECIPIENT_TYPE_CC"/>});
 		<inp2:m_else/>
 			Recipients.registerControl('RecipientType', {type: 'radio', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="$prefix" field="RecipientType" strip_nl="2"/>, 'default': <inp2:$prefix_FieldOption field="RecipientType" option="default"/>});
 		</inp2:m_if>
Index: core/admin_templates/languages/email_message_edit.tpl
===================================================================
--- core/admin_templates/languages/email_message_edit.tpl	(revision 15437)
+++ core/admin_templates/languages/email_message_edit.tpl	(working copy)
@@ -1,82 +0,0 @@
-<inp2:adm_SetPopupSize width="875" height="650"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="emailevents" title_preset="email_message_edit" tab_preset="Default"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('emailevents','<inp2:emailevents_SaveEvent/>');
-						}
-					) );
-
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							cancel_edit('emailevents','OnCancelEdit','<inp2:emailevents_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
-						}
-				 ) );
-
-
-				a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
-						reset_form('emailevents', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
-					}
-			 	) );
-
-			 	<inp2:m_if check="emailevents_IsSingle" inverse="inverse">
-					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				</inp2:m_if>
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('emailevents', '<inp2:emailevents_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('emailevents', '<inp2:emailevents_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.Render();
-
-				<inp2:m_RenderElement name="edit_navigation" prefix="emailevents"/>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="ml_selector" prefix="emailevents"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:emailevents_SaveWarning name="grid_save_warning"/>
-<inp2:emailevents_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="EventId,Description,Subject" title="la_section_General"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="emailevents" field="EventId" title="la_fld_Id"/>
-
-			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="Event" title="la_fld_Event"/>
-			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Event" title="la_fld_Event"/>
-			</inp2:m_if>
-
-			<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Description" title="la_fld_Description"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="emailevents" field="Subject" format="no_default" title="la_fld_Subject"/>
-
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="HtmlBody,PlainTextBody" title="la_section_Message"/>
-			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" control_options="{min_height: 200}"/>
-			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_fck" prefix="emailevents" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" rows="5" cols="60" control_options="{min_height: 200}"/>
-			</inp2:m_if>
-
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="PlainTextBody" format="no_default" title="la_fld_TextVersion" allow_html="0" control_options="{min_height: 200}"/>
-		<inp2:m_RenderElement name="inp_edit_filler" control_options="{max_height: 8}"/>
-	</table>
-</div>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: core/admin_templates/languages/email_message_list.tpl
===================================================================
--- core/admin_templates/languages/email_message_list.tpl	(revision 15542)
+++ core/admin_templates/languages/email_message_list.tpl	(working copy)
@@ -1,93 +0,0 @@
-<inp2:m_include t="incs/header"/>
-
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="emailevents" grid="Emails" title_preset="email_message_list" additional_blue_bar_render_as="grid_ml_selector"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  		<td>
-  			<script type="text/javascript">
-  				function edit() {
-	  				std_edit_item('emailevents', 'languages/email_message_edit');
-	  			}
-
-  				a_toolbar = new ToolBar();
-
-  				<inp2:m_if check="m_IsDebugMode">
-					<inp2:m_RenderElement design="toolbar_button" icon="new_item" title="la_ToolTip_Add">
-						std_precreate_item('emailevents', 'languages/email_message_edit');
-					</inp2:m_RenderElement>
-				</inp2:m_if>
-
-				<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_Edit" short_title="la_ShortToolTip_Edit">
-					edit();
-				</inp2:m_RenderElement>
-
-				<inp2:m_if check="m_IsDebugMode">
-					<inp2:m_RenderElement design="toolbar_button" icon="delete" title="la_ToolTip_Delete">
-						std_delete_items('emailevents');
-					</inp2:m_RenderElement>
-				</inp2:m_if>
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				<inp2:m_if check="m_IsDebugMode">
-					<inp2:m_RenderElement design="toolbar_button" icon="approve" title="la_ToolTip_Enable">
-						  submit_event('emailevents', 'OnMassApprove');
-					</inp2:m_RenderElement>
-
-				  	<inp2:m_RenderElement design="toolbar_button" icon="decline" title="la_ToolTip_Disable">
-				  		submit_event('emailevents', 'OnMassDecline');
-				  	</inp2:m_RenderElement>
-				</inp2:m_if>
-
-				<inp2:m_RenderElement design="toolbar_button" icon="frontend_mail" title="la_ToolTip_Email_FrontOnly">
-					submit_event('emailevents', 'OnFrontOnly');
-				</inp2:m_RenderElement>
-
-				<inp2:m_RenderElement design="toolbar_button" icon="export" title="la_ToolTip_Export" short_title="la_ShortToolTip_Export">
-					open_popup('emailevents', 'OnExportEmailEvents', 'regional/languages_export');
-				</inp2:m_RenderElement>
-
-				<inp2:m_if check="m_IsDebugMode">
-					<inp2:m_RenderElement design="toolbar_button" icon="process" title="la_ToolTip_Send">
-						submit_event('emailevents', 'OnSend');
-					</inp2:m_RenderElement>
-				</inp2:m_if>
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View">
-					show_viewmenu(a_toolbar,'view');
-				</inp2:m_RenderElement>
-
-				a_toolbar.Render();
-			</script>
-		</td>
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailevents" grid="Emails"/>
-	</tr>
-</tbody>
-</table>
-
-<style type="text/css">
-	tr.row-disabled td {
-		background-color: #FFDFE0;
-	}
-
-	tr.grid-data-row-even.row-disabled td {
-		background-color: #F4D4D5;
-	}
-</style>
-
-<inp2:m_DefineElement name="row_class">
-	<inp2:m_ifnot check="Field" field="Enabled" db="db">
-		row-disabled
-	</inp2:m_ifnot>
-</inp2:m_DefineElement>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="emailevents" IdField="EventId" grid="Emails" row_class_render_as="row_class"/>
-<script type="text/javascript">
-	Grids['emailevents'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline', 'frontend_mail', 'process') );
-</script>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: core/admin_templates/languages/email_message_settings.tpl
===================================================================
--- core/admin_templates/languages/email_message_settings.tpl	(revision 15437)
+++ core/admin_templates/languages/email_message_settings.tpl	(working copy)
@@ -1,194 +0,0 @@
-<inp2:adm_SetPopupSize width="875" height="650"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="emailevents" title_preset="email_message_edit_settings" tab_preset="Default"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('emailevents','<inp2:emailevents_SaveEvent/>');
-						}
-					) );
-
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							cancel_edit('emailevents','OnCancelEdit','<inp2:emailevents_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
-						}
-				 ) );
-
-
-				a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
-						reset_form('emailevents', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
-					}
-			 	) );
-
-				<inp2:m_if check="emailevents_IsSingle" inverse="inverse">
-					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				</inp2:m_if>
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('emailevents', '<inp2:emailevents_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('emailevents', '<inp2:emailevents_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.Render();
-
-				<inp2:m_RenderElement name="edit_navigation" prefix="emailevents"/>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="ml_selector" prefix="emailevents"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:emailevents_SaveWarning name="grid_save_warning"/>
-<inp2:emailevents_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="AllowChangingSender,CustomSender,SenderAddress,SenderAddressType,SenderName" title="la_section_SenderInfo"/>
-			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="emailevents" field="AllowChangingSender"/>
-			</inp2:m_if>
-
-			<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingSender">
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="CustomSender"/>
-				<inp2:m_RenderElement name="inp_edit_combo_target" prefix="emailevents" field="SenderAddress" has_empty="1"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="SenderName" style="width: 318px;"/>
-			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="CustomSender"/>
-				<inp2:m_RenderElement name="inp_edit_combo_target" prefix="emailevents" field="SenderAddress" read_only="1"/>
-				<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="SenderName"/>
-			</inp2:m_if>
-
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="AllowChangingRecipient,CustomRecipient,RecipientType,RecipientAddress,RecipientAddressType,RecipientName,Recipients" title="la_section_RecipientsInfo"/>
-			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="emailevents" field="AllowChangingRecipient"/>
-			</inp2:m_if>
-
-			<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="CustomRecipient"/>
-			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="CustomRecipient"/>
-				<inp2:emailevents_RemoveToRecipientType/>
-			</inp2:m_if>
-
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="RecipientType"/>
-			<inp2:m_RenderElement name="inp_edit_combo_target" prefix="emailevents" field="RecipientAddress" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="RecipientName" style="width: 318px;"/>
-			<inp2:m_RenderElement name="inp_edit_minput" prefix="emailevents" field="Recipients" format="auto" style="width: 400px; height: 150px;"/>
-
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="Tag,Replacement,ReplacementTagsXML" title="la_section_ReplacementTags"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="Tag"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Replacement" control_options="{height: 60}"/>
-			<inp2:m_RenderElement name="inp_edit_minput" prefix="emailevents" field="ReplacementTagsXML" title="la_fld_ReplacementTags" allow_move="0" format="#Tag# = #Replacement#" style="width: 600px; height: 100px;"/>
-
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="Enabled,Description,FrontEndOnly,Type,Headers,Module,BindToSystemEvent" title="la_section_General"/>
-			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="emailevents" field="Enabled"/>
-			</inp2:m_if>
-
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Description" control_options="{max_height: 50}"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="emailevents" field="FrontEndOnly"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="Type"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Headers" title="la_fld_ExtraHeaders" control_options="{max_height: 50}"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="emailevents" field="Module" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="BindToSystemEvent" style="width: 200px;"/>
-			<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<inp2:m_if check="emailevents_FieldVisible" field="Recipients">
-	<inp2:m_RenderElement name="email_recipients_js"/>
-</inp2:m_if>
-
-<script type="text/javascript">
-	<inp2:m_if check="emailevents_FieldVisible" field="ReplacementTagsXML">
-		// replacement tags
-		ReplacementTagsXML.formatLine = function($record_index) {
-			var $ret = MultiInputControl.prototype.formatLine.call(this, $record_index, false);
-
-			if ($ret.length > 80) {
-				$ret = $ret.substring(0, 80) + ' ...';
-			}
-
-			return this.htmlspecialchars($ret);
-		}
-
-		ReplacementTagsXML.compareRecords = function($record_a, $record_b) {
-			return $record_a['Tag'] == $record_b['Tag'];
-		}
-
-		ReplacementTagsXML.registerControl('Tag', 'textbox', true);
-		ReplacementTagsXML.registerControl('Replacement', 'textbox', true);
-		ReplacementTagsXML.LoadValues();
-	</inp2:m_if>
-
-	// reflect custom sender & custom recipient radio button-dependent controls
-	var $field_mask = '<inp2:emailevents_InputName name="#FIELD_NAME#" js_escape="1"/>';
-
-	function reflectCustomSender() {
-		var $default_sender = get_control($field_mask, 'CustomSender', '0').checked;
-		var $type = get_control($field_mask, 'SenderAddressType');
-
-		$type.disabled = $default_sender;
-		get_control($field_mask, 'SenderAddress').disabled = $default_sender;
-		get_control($field_mask, 'SenderName').disabled = $default_sender;
-
-		$($type).change();
-	}
-
-	function reflectCustomRecipient() {
-		<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">
-			var $default_recipient = get_control($field_mask, 'CustomRecipient', '0').checked;
-			var $to_recipient = get_control($field_mask, 'RecipientType', <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_TO"/>);
-		<inp2:m_else/>
-			var $default_recipient = <inp2:m_if check="emailevents_Field" name="CustomRecipient" db="db" equals_to="0">true<inp2:m_else/>false</inp2:m_if>;
-		</inp2:m_if>
-
-		if ($default_recipient) {
-			<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">
-				if ($to_recipient.checked) {
-					get_control($field_mask, 'RecipientType', <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_CC"/>).checked = true;
-				}
-			</inp2:m_if>
-
-			Recipients.registerControl('RecipientType', {'default': <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_CC"/>}, true);
-		}
-		else {
-			Recipients.registerControl('RecipientType', {'default': <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_TO"/>}, true);
-		}
-
-		<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">
-			$to_recipient.disabled = $default_recipient;
-		</inp2:m_if>
-	}
-
-	reflectCustomSender();
-	reflectCustomRecipient();
-
-	$(document).ready(
-		function () {
-			$("input[name='" + jq($field_mask.replace('#FIELD_NAME#', 'CustomSender')) + "']").click(reflectCustomSender);
-			$("input[name='" + jq($field_mask.replace('#FIELD_NAME#', 'CustomRecipient')) + "']").click(reflectCustomRecipient);
-		}
-	);
-
-	// enable all disabled controls before submit
-	Application.setHook('emailevents:*',
-		function () {
-			$(':input:disabled').attr('disabled', '');
-		}
-	)
-</script>
-
-<inp2:m_include t="incs/footer"/>
Index: core/admin_templates/languages/email_template_edit.tpl
===================================================================
--- core/admin_templates/languages/email_template_edit.tpl	(revision 15437)
+++ core/admin_templates/languages/email_template_edit.tpl	(working copy)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="875" height="650"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="emailevents" title_preset="email_message_edit" tab_preset="Default"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="email-template" title_preset="email_template_edit" tab_preset="Default"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,70 +11,70 @@
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('emailevents','<inp2:emailevents_SaveEvent/>');
+							submit_event('email-template','<inp2:email-template_SaveEvent/>');
 						}
 					) );
 
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							cancel_edit('emailevents','OnCancelEdit','<inp2:emailevents_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+							cancel_edit('email-template','OnCancelEdit','<inp2:email-template_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
 						}
 				 ) );
 
 
 				a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
-						reset_form('emailevents', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+						reset_form('email-template', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
 					}
 			 	) );
 
-			 	<inp2:m_if check="emailevents_IsSingle" inverse="inverse">
+			 	<inp2:m_if check="email-template_IsSingle" inverse="inverse">
 					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 				</inp2:m_if>
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('emailevents', '<inp2:emailevents_PrevId/>');
+							go_to_id('email-template', '<inp2:email-template_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('emailevents', '<inp2:emailevents_NextId/>');
+							go_to_id('email-template', '<inp2:email-template_NextId/>');
 						}
 				 ) );
 
 				a_toolbar.Render();
 
-				<inp2:m_RenderElement name="edit_navigation" prefix="emailevents"/>
+				<inp2:m_RenderElement name="edit_navigation" prefix="email-template"/>
 			</script>
 		</td>
 
-		<inp2:m_RenderElement name="ml_selector" prefix="emailevents"/>
+		<inp2:m_RenderElement name="ml_selector" prefix="email-template"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:emailevents_SaveWarning name="grid_save_warning"/>
-<inp2:emailevents_ErrorWarning name="form_error_warning"/>
+<inp2:email-template_SaveWarning name="grid_save_warning"/>
+<inp2:email-template_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="EventId,Description,Subject" title="la_section_General"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="emailevents" field="EventId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="subsection" prefix="email-template" fields="TemplateId,Description,Subject" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="email-template" field="TemplateId" title="la_fld_Id"/>
 
 			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="Event" title="la_fld_Event"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="email-template" field="TemplateName"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Event" title="la_fld_Event"/>
+				<inp2:m_RenderElement name="inp_label" prefix="email-template" field="TemplateName"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Description" title="la_fld_Description"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="emailevents" field="Subject" format="no_default" title="la_fld_Subject"/>
+			<inp2:m_RenderElement name="inp_label" prefix="email-template" field="Description" title="la_fld_Description"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="email-template" field="Subject" format="no_default" title="la_fld_Subject"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="HtmlBody,PlainTextBody" title="la_section_Message"/>
+		<inp2:m_RenderElement name="subsection" prefix="email-template" fields="HtmlBody,PlainTextBody" title="la_section_Message"/>
 			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" control_options="{min_height: 200}"/>
+				<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" control_options="{min_height: 200}"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_fck" prefix="emailevents" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" rows="5" cols="60" control_options="{min_height: 200}"/>
+				<inp2:m_RenderElement name="inp_edit_fck" prefix="email-template" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" rows="5" cols="60" control_options="{min_height: 200}"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="PlainTextBody" format="no_default" title="la_fld_TextVersion" allow_html="0" control_options="{min_height: 200}"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="PlainTextBody" format="no_default" title="la_fld_TextVersion" allow_html="0" control_options="{min_height: 200}"/>
 		<inp2:m_RenderElement name="inp_edit_filler" control_options="{max_height: 8}"/>
 	</table>
 </div>
Index: core/admin_templates/languages/email_template_list.tpl
===================================================================
--- core/admin_templates/languages/email_template_list.tpl	(revision 15437)
+++ core/admin_templates/languages/email_template_list.tpl	(working copy)
@@ -1,6 +1,6 @@
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="emailevents" grid="Emails" title_preset="email_message_list" additional_blue_bar_render_as="grid_ml_selector"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="email-template" grid="Emails" title_preset="email_template_list" additional_blue_bar_render_as="grid_ml_selector"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -9,14 +9,14 @@
   		<td>
   			<script type="text/javascript">
   				function edit() {
-	  				std_edit_item('emailevents', 'languages/email_message_edit');
+	  				std_edit_item('email-template', 'languages/email_template_edit');
 	  			}
 
   				a_toolbar = new ToolBar();
 
   				<inp2:m_if check="m_IsDebugMode">
 					<inp2:m_RenderElement design="toolbar_button" icon="new_item" title="la_ToolTip_Add">
-						std_precreate_item('emailevents', 'languages/email_message_edit');
+						std_precreate_item('email-template', 'languages/email_template_edit');
 					</inp2:m_RenderElement>
 				</inp2:m_if>
 
@@ -26,7 +26,7 @@
 
 				<inp2:m_if check="m_IsDebugMode">
 					<inp2:m_RenderElement design="toolbar_button" icon="delete" title="la_ToolTip_Delete">
-						std_delete_items('emailevents');
+						std_delete_items('email-template');
 					</inp2:m_RenderElement>
 				</inp2:m_if>
 
@@ -34,25 +34,25 @@
 
 				<inp2:m_if check="m_IsDebugMode">
 					<inp2:m_RenderElement design="toolbar_button" icon="approve" title="la_ToolTip_Enable">
-						  submit_event('emailevents', 'OnMassApprove');
+						  submit_event('email-template', 'OnMassApprove');
 					</inp2:m_RenderElement>
 
 				  	<inp2:m_RenderElement design="toolbar_button" icon="decline" title="la_ToolTip_Disable">
-				  		submit_event('emailevents', 'OnMassDecline');
+				  		submit_event('email-template', 'OnMassDecline');
 				  	</inp2:m_RenderElement>
 				</inp2:m_if>
 
 				<inp2:m_RenderElement design="toolbar_button" icon="frontend_mail" title="la_ToolTip_Email_FrontOnly">
-					submit_event('emailevents', 'OnFrontOnly');
+					submit_event('email-template', 'OnFrontOnly');
 				</inp2:m_RenderElement>
 
 				<inp2:m_RenderElement design="toolbar_button" icon="export" title="la_ToolTip_Export" short_title="la_ShortToolTip_Export">
-					open_popup('emailevents', 'OnExportEmailEvents', 'regional/languages_export');
+					open_popup('email-template', 'OnExportEmailTemplates', 'regional/languages_export');
 				</inp2:m_RenderElement>
 
 				<inp2:m_if check="m_IsDebugMode">
 					<inp2:m_RenderElement design="toolbar_button" icon="process" title="la_ToolTip_Send">
-						submit_event('emailevents', 'OnSend');
+						submit_event('email-template', 'OnSend');
 					</inp2:m_RenderElement>
 				</inp2:m_if>
 
@@ -65,7 +65,7 @@
 				a_toolbar.Render();
 			</script>
 		</td>
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailevents" grid="Emails"/>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="email-template" grid="Emails"/>
 	</tr>
 </tbody>
 </table>
@@ -86,8 +86,8 @@
 	</inp2:m_ifnot>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="emailevents" IdField="EventId" grid="Emails" row_class_render_as="row_class"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="email-template" IdField="TemplateId" grid="Emails" row_class_render_as="row_class"/>
 <script type="text/javascript">
-	Grids['emailevents'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline', 'frontend_mail', 'process') );
+	Grids['email-template'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline', 'frontend_mail', 'process') );
 </script>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: core/admin_templates/languages/email_template_settings.tpl
===================================================================
--- core/admin_templates/languages/email_template_settings.tpl	(revision 15437)
+++ core/admin_templates/languages/email_template_settings.tpl	(working copy)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="875" height="650"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="emailevents" title_preset="email_message_edit_settings" tab_preset="Default"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="email-template" title_preset="email_template_edit_settings" tab_preset="Default"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,108 +11,108 @@
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('emailevents','<inp2:emailevents_SaveEvent/>');
+							submit_event('email-template','<inp2:email-template_SaveEvent/>');
 						}
 					) );
 
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							cancel_edit('emailevents','OnCancelEdit','<inp2:emailevents_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+							cancel_edit('email-template','OnCancelEdit','<inp2:email-template_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
 						}
 				 ) );
 
 
 				a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
-						reset_form('emailevents', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+						reset_form('email-template', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
 					}
 			 	) );
 
-				<inp2:m_if check="emailevents_IsSingle" inverse="inverse">
+				<inp2:m_if check="email-template_IsSingle" inverse="inverse">
 					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 				</inp2:m_if>
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('emailevents', '<inp2:emailevents_PrevId/>');
+							go_to_id('email-template', '<inp2:email-template_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('emailevents', '<inp2:emailevents_NextId/>');
+							go_to_id('email-template', '<inp2:email-template_NextId/>');
 						}
 				 ) );
 
 				a_toolbar.Render();
 
-				<inp2:m_RenderElement name="edit_navigation" prefix="emailevents"/>
+				<inp2:m_RenderElement name="edit_navigation" prefix="email-template"/>
 			</script>
 		</td>
 
-		<inp2:m_RenderElement name="ml_selector" prefix="emailevents"/>
+		<inp2:m_RenderElement name="ml_selector" prefix="email-template"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:emailevents_SaveWarning name="grid_save_warning"/>
-<inp2:emailevents_ErrorWarning name="form_error_warning"/>
+<inp2:email-template_SaveWarning name="grid_save_warning"/>
+<inp2:email-template_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="AllowChangingSender,CustomSender,SenderAddress,SenderAddressType,SenderName" title="la_section_SenderInfo"/>
+		<inp2:m_RenderElement name="subsection" prefix="email-template" fields="AllowChangingSender,CustomSender,SenderAddress,SenderAddressType,SenderName" title="la_section_SenderInfo"/>
 			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="emailevents" field="AllowChangingSender"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="email-template" field="AllowChangingSender"/>
 			</inp2:m_if>
 
-			<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingSender">
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="CustomSender"/>
-				<inp2:m_RenderElement name="inp_edit_combo_target" prefix="emailevents" field="SenderAddress" has_empty="1"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="SenderName" style="width: 318px;"/>
+			<inp2:m_if check="email-template_IsEditable" check_field="AllowChangingSender">
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="email-template" field="CustomSender"/>
+				<inp2:m_RenderElement name="inp_edit_combo_target" prefix="email-template" field="SenderAddress" has_empty="1"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="email-template" field="SenderName" style="width: 318px;"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="CustomSender"/>
-				<inp2:m_RenderElement name="inp_edit_combo_target" prefix="emailevents" field="SenderAddress" read_only="1"/>
-				<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="SenderName"/>
+				<inp2:m_RenderElement name="inp_label" prefix="email-template" field="CustomSender"/>
+				<inp2:m_RenderElement name="inp_edit_combo_target" prefix="email-template" field="SenderAddress" read_only="1"/>
+				<inp2:m_RenderElement name="inp_label" prefix="email-template" field="SenderName"/>
 			</inp2:m_if>
 
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="AllowChangingRecipient,CustomRecipient,RecipientType,RecipientAddress,RecipientAddressType,RecipientName,Recipients" title="la_section_RecipientsInfo"/>
+		<inp2:m_RenderElement name="subsection" prefix="email-template" fields="AllowChangingRecipient,CustomRecipient,RecipientType,RecipientAddress,RecipientAddressType,RecipientName,Recipients" title="la_section_RecipientsInfo"/>
 			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="emailevents" field="AllowChangingRecipient"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="email-template" field="AllowChangingRecipient"/>
 			</inp2:m_if>
 
-			<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="CustomRecipient"/>
+			<inp2:m_if check="email-template_IsEditable" check_field="AllowChangingRecipient">
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="email-template" field="CustomRecipient"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="CustomRecipient"/>
-				<inp2:emailevents_RemoveToRecipientType/>
+				<inp2:m_RenderElement name="inp_label" prefix="email-template" field="CustomRecipient"/>
+				<inp2:email-template_RemoveToRecipientType/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="RecipientType"/>
-			<inp2:m_RenderElement name="inp_edit_combo_target" prefix="emailevents" field="RecipientAddress" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="RecipientName" style="width: 318px;"/>
-			<inp2:m_RenderElement name="inp_edit_minput" prefix="emailevents" field="Recipients" format="auto" style="width: 400px; height: 150px;"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="email-template" field="RecipientType"/>
+			<inp2:m_RenderElement name="inp_edit_combo_target" prefix="email-template" field="RecipientAddress" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="email-template" field="RecipientName" style="width: 318px;"/>
+			<inp2:m_RenderElement name="inp_edit_minput" prefix="email-template" field="Recipients" format="auto" style="width: 400px; height: 150px;"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="Tag,Replacement,ReplacementTagsXML" title="la_section_ReplacementTags"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="Tag"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Replacement" control_options="{height: 60}"/>
-			<inp2:m_RenderElement name="inp_edit_minput" prefix="emailevents" field="ReplacementTagsXML" title="la_fld_ReplacementTags" allow_move="0" format="#Tag# = #Replacement#" style="width: 600px; height: 100px;"/>
+		<inp2:m_RenderElement name="subsection" prefix="email-template" fields="Tag,Replacement,ReplacementTagsXML" title="la_section_ReplacementTags"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="email-template" field="Tag"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="email-template" field="Replacement" control_options="{height: 60}"/>
+			<inp2:m_RenderElement name="inp_edit_minput" prefix="email-template" field="ReplacementTagsXML" title="la_fld_ReplacementTags" allow_move="0" format="#Tag# = #Replacement#" style="width: 600px; height: 100px;"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="Enabled,Description,FrontEndOnly,Type,Headers,Module,BindToSystemEvent" title="la_section_General"/>
+		<inp2:m_RenderElement name="subsection" prefix="email-template" fields="Enabled,Description,FrontEndOnly,Type,Headers,Module,BindToSystemEvent" title="la_section_General"/>
 			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="emailevents" field="Enabled"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="email-template" field="Enabled"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Description" control_options="{max_height: 50}"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="emailevents" field="FrontEndOnly"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="Type"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Headers" title="la_fld_ExtraHeaders" control_options="{max_height: 50}"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="emailevents" field="Module" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="BindToSystemEvent" style="width: 200px;"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="email-template" field="Description" control_options="{max_height: 50}"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="email-template" field="FrontEndOnly"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="email-template" field="Type"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="email-template" field="Headers" title="la_fld_ExtraHeaders" control_options="{max_height: 50}"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="email-template" field="Module" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="email-template" field="BindToSystemEvent" style="width: 200px;"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
 
-<inp2:m_if check="emailevents_FieldVisible" field="Recipients">
+<inp2:m_if check="email-template_FieldVisible" field="Recipients">
 	<inp2:m_RenderElement name="email_recipients_js"/>
 </inp2:m_if>
 
 <script type="text/javascript">
-	<inp2:m_if check="emailevents_FieldVisible" field="ReplacementTagsXML">
+	<inp2:m_if check="email-template_FieldVisible" field="ReplacementTagsXML">
 		// replacement tags
 		ReplacementTagsXML.formatLine = function($record_index) {
 			var $ret = MultiInputControl.prototype.formatLine.call(this, $record_index, false);
@@ -134,7 +134,7 @@
 	</inp2:m_if>
 
 	// reflect custom sender & custom recipient radio button-dependent controls
-	var $field_mask = '<inp2:emailevents_InputName name="#FIELD_NAME#" js_escape="1"/>';
+	var $field_mask = '<inp2:email-template_InputName name="#FIELD_NAME#" js_escape="1"/>';
 
 	function reflectCustomSender() {
 		var $default_sender = get_control($field_mask, 'CustomSender', '0').checked;
@@ -148,27 +148,27 @@
 	}
 
 	function reflectCustomRecipient() {
-		<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">
+		<inp2:m_if check="email-template_IsEditable" check_field="AllowChangingRecipient">
 			var $default_recipient = get_control($field_mask, 'CustomRecipient', '0').checked;
-			var $to_recipient = get_control($field_mask, 'RecipientType', <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_TO"/>);
+			var $to_recipient = get_control($field_mask, 'RecipientType', <inp2:m_GetConst name="EmailTemplate::RECIPIENT_TYPE_TO"/>);
 		<inp2:m_else/>
-			var $default_recipient = <inp2:m_if check="emailevents_Field" name="CustomRecipient" db="db" equals_to="0">true<inp2:m_else/>false</inp2:m_if>;
+			var $default_recipient = <inp2:m_if check="email-template_Field" name="CustomRecipient" db="db" equals_to="0">true<inp2:m_else/>false</inp2:m_if>;
 		</inp2:m_if>
 
 		if ($default_recipient) {
-			<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">
+			<inp2:m_if check="email-template_IsEditable" check_field="AllowChangingRecipient">
 				if ($to_recipient.checked) {
-					get_control($field_mask, 'RecipientType', <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_CC"/>).checked = true;
+					get_control($field_mask, 'RecipientType', <inp2:m_GetConst name="EmailTemplate::RECIPIENT_TYPE_CC"/>).checked = true;
 				}
 			</inp2:m_if>
 
-			Recipients.registerControl('RecipientType', {'default': <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_CC"/>}, true);
+			Recipients.registerControl('RecipientType', {'default': <inp2:m_GetConst name="EmailTemplate::RECIPIENT_TYPE_CC"/>}, true);
 		}
 		else {
-			Recipients.registerControl('RecipientType', {'default': <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_TO"/>}, true);
+			Recipients.registerControl('RecipientType', {'default': <inp2:m_GetConst name="EmailTemplate::RECIPIENT_TYPE_TO"/>}, true);
 		}
 
-		<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">
+		<inp2:m_if check="email-template_IsEditable" check_field="AllowChangingRecipient">
 			$to_recipient.disabled = $default_recipient;
 		</inp2:m_if>
 	}
@@ -184,7 +184,7 @@
 	);
 
 	// enable all disabled controls before submit
-	Application.setHook('emailevents:*',
+	Application.setHook('email-template:*',
 		function () {
 			$(':input:disabled').attr('disabled', '');
 		}
Index: core/admin_templates/logs/email_logs/email_log_edit.tpl
===================================================================
--- core/admin_templates/logs/email_logs/email_log_edit.tpl	(revision 15437)
+++ core/admin_templates/logs/email_logs/email_log_edit.tpl	(working copy)
@@ -48,8 +48,8 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="inp_id_label" prefix="email-log" field="EmailLogId" title="la_fld_Id"/>
 
-		<inp2:m_if check="email-log_Field" name="EventName" db="db">
-			<inp2:m_RenderElement name="inp_label" prefix="email-log" field="EventName" title="la_fld_Event"/>
+		<inp2:m_if check="email-log_Field" name="TemplateName" db="db">
+			<inp2:m_RenderElement name="inp_label" prefix="email-log" field="TemplateName"/>
 			<inp2:m_RenderElement name="inp_label" prefix="email-log" field="EventType" title="la_fld_Type"/>
 		</inp2:m_if>
 
Index: core/admin_templates/logs/email_logs/email_queue_list.tpl
===================================================================
--- core/admin_templates/logs/email_logs/email_queue_list.tpl	(revision 15437)
+++ core/admin_templates/logs/email_logs/email_queue_list.tpl	(working copy)
@@ -55,7 +55,7 @@
 									'e-mail',
 									'<inp2:m_phrase label="la_ToolTip_ProcessQueue" escape="1"/>',
 									function() {
-										open_popup('emailevents', null, 'mailing_lists/send_queue');
+										open_popup('email-template', null, 'mailing_lists/send_queue');
 									}
 				 				)
 				 			);
Index: core/admin_templates/mailing_lists/send_complete.tpl
===================================================================
--- core/admin_templates/mailing_lists/send_complete.tpl	(revision 15437)
+++ core/admin_templates/mailing_lists/send_complete.tpl	(working copy)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="900" height="600"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="emailevents" title_preset="email_send_complete"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="email-template" title_preset="email_send_complete"/>
 
 <script type="text/javascript">
 	function close_window() {
Index: core/admin_templates/mailing_lists/send_queue.tpl
===================================================================
--- core/admin_templates/mailing_lists/send_queue.tpl	(revision 15437)
+++ core/admin_templates/mailing_lists/send_queue.tpl	(working copy)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="900" height="600"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="emailevents" title_preset="email_send"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="email-template" title_preset="email_send"/>
 
 <inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 <script type="text/javascript">
@@ -9,7 +9,7 @@
 		redirect('<inp2:m_Link template="mailing_lists/send_complete"/>');
 	}
 
-	$QueueProcessor = new AjaxProgressBar('<inp2:m_t template="index" emailevents_event="OnProcessEmailQueue" type="return_progress" finish_template="mailing_lists/send_complete" pass="m,emailevents" no_amp="1"/>');
+	$QueueProcessor = new AjaxProgressBar('<inp2:m_t template="index" email-template_event="OnProcessEmailQueue" type="return_progress" finish_template="mailing_lists/send_complete" pass="m,email-template" no_amp="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: core/admin_templates/regional/email_messages_edit.tpl
===================================================================
--- core/admin_templates/regional/email_messages_edit.tpl	(revision 15437)
+++ core/admin_templates/regional/email_messages_edit.tpl	(working copy)
@@ -1,76 +0,0 @@
-<inp2:adm_SetPopupSize width="827" height="600"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="email_messages_edit"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('emailevents','<inp2:emailevents_SaveEvent/>');
-						}
-					) );
-
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('emailevents','OnCancel');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-					go_to_id('emailevents', '<inp2:emailevents_PrevId/>');
-					}
-				));
-
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-						go_to_id('emailevents', '<inp2:emailevents_NextId/>');
-					}
-				));
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="emailevents_IsSingle">
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="emailevents_IsLast">
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="emailevents_IsFirst">
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:emailevents_SaveWarning name="grid_save_warning"/>
-<inp2:emailevents_ErrorWarning name="form_error_warning"/>
-<input type="hidden" name="regional" value="<inp2:m_Get name='regional'/>"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="emailevents" field="EventId" title="la_fld_Id"/>
-			<!--## <inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Type" title="la_fld_Type"/> ##-->
-
-			<inp2:lang_Field name="LanguageId" result_to_var="language_id"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="emailevents" field="l{$language_id}_Subject" title="la_fld_Subject" size="60"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Headers" title="la_fld_ExtraHeaders" allow_html="0" control_options="{min_height: 50}" rows="3" cols="60"/>
-
-		<inp2:m_RenderElement name="subsection" title="la_section_Message"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="l{$language_id}_HtmlBody" title="la_fld_HtmlVersion" control_options="{min_height: 200}" rows="20" cols="85"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="l{$language_id}_PlainTextBody" title="la_fld_TextVersion" control_options="{min_height: 200}" allow_html="0" rows="20" cols="85"/>
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: core/admin_templates/regional/email_template_edit.tpl
===================================================================
--- core/admin_templates/regional/email_template_edit.tpl	(revision 15437)
+++ core/admin_templates/regional/email_template_edit.tpl	(working copy)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="827" height="600"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="email_messages_edit"/>
+<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="email_template_edit"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,38 +11,38 @@
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('emailevents','<inp2:emailevents_SaveEvent/>');
+							submit_event('email-template','<inp2:email-template_SaveEvent/>');
 						}
 					) );
 
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('emailevents','OnCancel');
+							submit_event('email-template','OnCancel');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-					go_to_id('emailevents', '<inp2:emailevents_PrevId/>');
+					go_to_id('email-template', '<inp2:email-template_PrevId/>');
 					}
 				));
 
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-						go_to_id('emailevents', '<inp2:emailevents_NextId/>');
+						go_to_id('email-template', '<inp2:email-template_NextId/>');
 					}
 				));
 
 				a_toolbar.Render();
 
-				<inp2:m_if check="emailevents_IsSingle">
+				<inp2:m_if check="email-template_IsSingle">
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
-					<inp2:m_if check="emailevents_IsLast">
+					<inp2:m_if check="email-template_IsLast">
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
-					<inp2:m_if check="emailevents_IsFirst">
+					<inp2:m_if check="email-template_IsFirst">
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
@@ -52,23 +52,23 @@
 </tbody>
 </table>
 
-<inp2:emailevents_SaveWarning name="grid_save_warning"/>
-<inp2:emailevents_ErrorWarning name="form_error_warning"/>
+<inp2:email-template_SaveWarning name="grid_save_warning"/>
+<inp2:email-template_ErrorWarning name="form_error_warning"/>
 <input type="hidden" name="regional" value="<inp2:m_Get name='regional'/>"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="emailevents" field="EventId" title="la_fld_Id"/>
-			<!--## <inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Type" title="la_fld_Type"/> ##-->
+			<inp2:m_RenderElement name="inp_id_label" prefix="email-template" field="TemplateId" title="la_fld_Id"/>
+			<!--## <inp2:m_RenderElement name="inp_label" prefix="email-template" field="Type" title="la_fld_Type"/> ##-->
 
 			<inp2:lang_Field name="LanguageId" result_to_var="language_id"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="emailevents" field="l{$language_id}_Subject" title="la_fld_Subject" size="60"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailevents" field="Headers" title="la_fld_ExtraHeaders" allow_html="0" control_options="{min_height: 50}" rows="3" cols="60"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="email-template" field="l{$language_id}_Subject" title="la_fld_Subject" size="60"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="email-template" field="Headers" title="la_fld_ExtraHeaders" allow_html="0" control_options="{min_height: 50}" rows="3" cols="60"/>
 
 		<inp2:m_RenderElement name="subsection" title="la_section_Message"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="l{$language_id}_HtmlBody" title="la_fld_HtmlVersion" control_options="{min_height: 200}" rows="20" cols="85"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="l{$language_id}_PlainTextBody" title="la_fld_TextVersion" control_options="{min_height: 200}" allow_html="0" rows="20" cols="85"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="l{$language_id}_HtmlBody" title="la_fld_HtmlVersion" control_options="{min_height: 200}" rows="20" cols="85"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="l{$language_id}_PlainTextBody" title="la_fld_TextVersion" control_options="{min_height: 200}" allow_html="0" rows="20" cols="85"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>

Property changes on: core\admin_templates\regional\email_template_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4.2.3
Added: svn:eol-style
   + LF

Index: core/admin_templates/regional/languages_edit_email_events.tpl
===================================================================
--- core/admin_templates/regional/languages_edit_email_events.tpl	(revision 15437)
+++ core/admin_templates/regional/languages_edit_email_events.tpl	(working copy)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="950" height="700"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="events_list" tab_preset="Default" pagination="1" pagination_prefix="emailevents"/>
+<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="events_list" tab_preset="Default" pagination="1" pagination_prefix="email-template"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -13,7 +13,7 @@
   				function edit()
 	  			{
   					Application.SetVar('regional', 1);
-	  				std_edit_temp_item('emailevents', 'regional/email_messages_edit');
+	  				std_edit_temp_item('email-template', 'regional/email_template_edit');
 	  			}
 
   				a_toolbar = new ToolBar();
@@ -65,13 +65,13 @@
 			</script>
 		</td>
 
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailevents" grid="Default"/>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="email-template" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="emailevents" IdField="EventId" grid="Default" main_prefix="lang"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="email-template" IdField="TemplateId" grid="Default" main_prefix="lang"/>
 <script type="text/javascript">
-	Grids['emailevents'].SetDependantToolbarButtons( new Array('edit') );
+	Grids['email-template'].SetDependantToolbarButtons( new Array('edit') );
 </script>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: core/admin_templates/regional/languages_export.tpl
===================================================================
--- core/admin_templates/regional/languages_export.tpl	(revision 15437)
+++ core/admin_templates/regional/languages_export.tpl	(working copy)
@@ -65,7 +65,7 @@
 						<inp2:$prefix_PhraseCount module="$key"/>
 					</td>
 					<td align="right">
-						<inp2:$prefix_EventCount module="$key"/>
+						<inp2:$prefix_TemplateCount module="$key"/>
 					</td>
 				</tr>
 			</inp2:m_DefineElement>
@@ -91,7 +91,7 @@
 						<tr>
 							<th align="center" colspan="2"><inp2:m_Phrase name="column:la_fld_Module"/></th>
 							<th align="center"><inp2:m_Phrase name="la_col_Phrases"/></th>
-							<th align="center"><inp2:m_Phrase name="la_col_EmailEvents"/></th>
+							<th align="center"><inp2:m_Phrase name="la_col_EmailTemplates"/></th>
 						</tr>
 						<inp2:phrases.export_PredefinedOptions prefix="phrases.export" field="Module" block="export_module_element" selected="checked"/>
 					</table>
@@ -117,7 +117,7 @@
 			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportPhrases" allow_html="0"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportEmailEvents" allow_html="0"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportEmailTemplates" allow_html="0"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportCountries" allow_html="0"/>
 		</inp2:m_if>
 
Index: core/admin_templates/site_domains/site_domain_edit.tpl
===================================================================
--- core/admin_templates/site_domains/site_domain_edit.tpl	(revision 15437)
+++ core/admin_templates/site_domains/site_domain_edit.tpl	(working copy)
@@ -69,7 +69,7 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:emailevents.site-domain_PresetFormFields/>
+<inp2:email-template.site-domain_PresetFormFields/>
 
 <div id="scroll_container">
 	<table class="edit-form">
@@ -91,16 +91,16 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="site-domain" field="Priority" title="la_fld_Priority" style="width: 50px;"/>
 
 		<inp2:m_RenderElement name="subsection" title="la_section_RecipientsInfo"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents.site-domain" field="RecipientType" title="la_fld_RecipientType"/>
-			<inp2:m_RenderElement name="inp_edit_combo_target" prefix="emailevents.site-domain" field="RecipientAddress" title="la_fld_RecipientAddress" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents.site-domain" field="RecipientName" title="la_fld_RecipientName" style="width: 318px;"/>
-			<inp2:m_RenderElement name="inp_edit_minput" prefix="emailevents.site-domain" field="Recipients" title="la_fld_Recipients" format="auto" style="width: 400px; height: 150px;"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="email-template.site-domain" field="RecipientType" title="la_fld_RecipientType"/>
+			<inp2:m_RenderElement name="inp_edit_combo_target" prefix="email-template.site-domain" field="RecipientAddress" title="la_fld_RecipientAddress" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="email-template.site-domain" field="RecipientName" title="la_fld_RecipientName" style="width: 318px;"/>
+			<inp2:m_RenderElement name="inp_edit_minput" prefix="email-template.site-domain" field="Recipients" title="la_fld_Recipients" format="auto" style="width: 400px; height: 150px;"/>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
 
-<inp2:m_RenderElement name="email_recipients_js" prefix="emailevents.site-domain" to_readonly="0"/>
+<inp2:m_RenderElement name="email_recipients_js" prefix="email-template.site-domain" to_readonly="0"/>
 
 <script type="text/javascript">
 	var $field_mask = jq('<inp2:site-domain_InputName name="#FIELD_NAME#" js_escape="1"/>');
Index: core/admin_templates/system_event_subscriptions/system_event_subscription_edit.tpl
===================================================================
--- core/admin_templates/system_event_subscriptions/system_event_subscription_edit.tpl	(revision 15437)
+++ core/admin_templates/system_event_subscriptions/system_event_subscription_edit.tpl	(working copy)
@@ -61,8 +61,8 @@
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="inp_id_label" prefix="system-event-subscription" field="SubscriptionId" title="la_fld_Id"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="system-event-subscription" field="EmailEventId" title="la_fld_SystemEvent" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_label" prefix="system-event-subscription" field="EmailEventName" title="la_fld_EmailEvent"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="system-event-subscription" field="EmailTemplateId" title="la_fld_SystemEvent" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_label" prefix="system-event-subscription" field="EmailTemplateName"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="system-event-subscription" field="SubscriberEmail" title="la_fld_Email"/>
 		<inp2:m_RenderElement name="inp_edit_user" prefix="system-event-subscription" field="UserId" title="la_fld_Username"/>
 		<inp2:m_RenderElement name="inp_edit_category" prefix="system-event-subscription" field="CategoryId" title="la_fld_Category"/>
Index: core/install/english.lang
===================================================================
--- core/install/english.lang	(revision 15593)
+++ core/install/english.lang	(working copy)
@@ -82,7 +82,7 @@
 			<PHRASE Label="la_col_CategoryName" Module="Core" Type="1">U2VjdGlvbiBOYW1l</PHRASE>
 			<PHRASE Label="la_col_ColumnPhrase" Module="Core" Type="1">Q29sdW1uIFBocmFzZQ==</PHRASE>
 			<PHRASE Label="la_col_Effective" Module="Core" Type="1">RWZmZWN0aXZl</PHRASE>
-			<PHRASE Label="la_col_EmailEvents" Module="Core" Type="1">RW1haWwgRXZlbnRz</PHRASE>
+			<PHRASE Label="la_col_EmailTemplates" Module="Core" Type="1">RS1tYWlsIFRlbXBsYXRlcw==</PHRASE>
 			<PHRASE Label="la_col_EnableEmailCommunication" Module="Core" Type="1">RW5hYmxlIEUtbWFpbCBDb21tdW5pY2F0aW9u</PHRASE>
 			<PHRASE Label="la_col_Error" Module="Core" Type="1">Jm5ic3A7</PHRASE>
 			<PHRASE Label="la_col_EventDescription" Module="Core" Type="1">RXZlbnQgRGVzY3JpcHRpb24=</PHRASE>
@@ -402,24 +402,23 @@
 			<PHRASE Label="la_fld_ElapsedTime" Module="Core" Type="1">RWxhcHNlZCBUaW1l</PHRASE>
 			<PHRASE Label="la_fld_Email" Module="Core" Type="1" Column="RW1haWw=">RS1tYWls</PHRASE>
 			<PHRASE Label="la_fld_EmailCommunicationRole" Module="Core" Type="1" Column="RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==">RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==</PHRASE>
-			<PHRASE Label="la_fld_EmailEvent" Module="Core" Type="1" Column="RS1tYWlsIEV2ZW50">RS1tYWlsIEV2ZW50</PHRASE>
 			<PHRASE Label="la_fld_EmailOrUsername" Module="Core" Type="1">RS1tYWlsIG9yIFVzZXJuYW1l</PHRASE>
 			<PHRASE Label="la_fld_EmailPassword" Module="Core" Type="1">RS1tYWlsICI8c3Ryb25nPntwYXNzd29yZH08L3N0cm9uZz4iIHBhc3N3b3JkIHRvIHVzZXI=</PHRASE>
 			<PHRASE Label="la_fld_EmailsQueued" Module="Core" Type="1" Column="UXVldWU=">RW1haWxzIGluIFF1ZXVl</PHRASE>
 			<PHRASE Label="la_fld_EmailsSent" Module="Core" Type="1" Column="U2VudA==">RW1haWxzIFNlbnQ=</PHRASE>
 			<PHRASE Label="la_fld_EmailsTotal" Module="Core" Type="1" Column="VG90YWw=">RW1haWxzIFRvdGFs</PHRASE>
+			<PHRASE Label="la_fld_EmailTemplateName" Module="Core" Type="1" Column="RS1tYWlsIFRlbXBsYXRlIE5hbWU=">RS1tYWlsIFRlbXBsYXRlIE5hbWU=</PHRASE>
 			<PHRASE Label="la_fld_EmailVerified" Module="Core" Type="1" Column="RW1haWwgVmVyaWZpZWQ=">RW1haWwgVmVyaWZpZWQ=</PHRASE>
 			<PHRASE Label="la_fld_Enable" Module="Core" Type="1">RW5hYmxl</PHRASE>
 			<PHRASE Label="la_fld_Enabled" Module="Core" Type="1" Column="RW5hYmxlZA==">RW5hYmxlZA==</PHRASE>
 			<PHRASE Label="la_fld_EnablePageCache" Module="Core" Type="1">RW5hYmxlIENhY2hpbmcgZm9yIHRoaXMgU2VjdGlvbg==</PHRASE>
 			<PHRASE Label="la_fld_ErrorTag" Module="Core" Type="1">RXJyb3IgVGFn</PHRASE>
 			<PHRASE Label="la_fld_EstimatedTime" Module="Core" Type="1">RXN0aW1hdGVkIFRpbWU=</PHRASE>
-			<PHRASE Label="la_fld_Event" Module="Core" Type="1" Column="RXZlbnQ=">RXZlbnQ=</PHRASE>
 			<PHRASE Label="la_fld_Expire" Module="Core" Type="1">RXhwaXJl</PHRASE>
 			<PHRASE Label="la_fld_ExportColumns" Module="Core" Type="1">RXhwb3J0IGNvbHVtbnM=</PHRASE>
 			<PHRASE Label="la_fld_ExportCountries" Module="Core" Type="1" Hint="U2luZ2xlIENvdW50cnkgSVNPIGNvZGUgcGVyIGxpbmUgKGZvcm1hdHM6IEFUQSwgQkVMKQ==">RXhwb3J0IFNwZWNpZmllZCBDb3VudHJpZXM=</PHRASE>
 			<PHRASE Label="la_fld_ExportDataTypes" Module="Core" Type="1">RGF0YSBUeXBlcyB0byBFeHBvcnQ=</PHRASE>
-			<PHRASE Label="la_fld_ExportEmailEvents" Module="Core" Type="1" Hint="U2luZ2xlIEVtYWlsIEV2ZW50IHBlciBsaW5lIChmb3JtYXRzOiBVU0VSLkFERCwgT1JERVIuU1VCTUlUKQ==">RXhwb3J0IFNwZWNpZmllZCBFbWFpbCBFdmVudHM=</PHRASE>
+			<PHRASE Label="la_fld_ExportEmailTemplates" Module="Core" Type="1" Hint="U2luZ2xlIEUtbWFpbCBUZW1wbGF0ZSBwZXIgbGluZSAoZm9ybWF0czogVVNFUi5BREQsIE9SREVSLlNVQk1JVCk=">RXhwb3J0IFNwZWNpZmllZCBFLW1haWwgVGVtcGxhdGVz</PHRASE>
 			<PHRASE Label="la_fld_ExportFileName" Module="Core" Type="1">RXhwb3J0IEZpbGVuYW1l</PHRASE>
 			<PHRASE Label="la_fld_ExportFormat" Module="Core" Type="1">RXhwb3J0IGZvcm1hdA==</PHRASE>
 			<PHRASE Label="la_fld_ExportModules" Module="Core" Type="1">RXhwb3J0IE1vZHVsZXM=</PHRASE>
@@ -683,6 +682,7 @@
 			<PHRASE Label="la_fld_Tag" Module="Core" Type="1">VGFn</PHRASE>
 			<PHRASE Label="la_fld_TargetId" Module="Core" Type="1" Column="SXRlbQ==">SXRlbQ==</PHRASE>
 			<PHRASE Label="la_fld_TemplateFile" Module="Core" Type="1">VGVtcGxhdGUgRmlsZQ==</PHRASE>
+			<PHRASE Label="la_fld_TemplateName" Module="Core" Type="1" Column="VGVtcGxhdGUgTmFtZQ==">VGVtcGxhdGUgTmFtZQ==</PHRASE>
 			<PHRASE Label="la_fld_TemplateType" Module="Core" Type="1" Column="VGVtcGxhdGU=">VGVtcGxhdGU=</PHRASE>
 			<PHRASE Label="la_fld_Text" Module="Core" Type="1">VGV4dA==</PHRASE>
 			<PHRASE Label="la_fld_TextAlign" Module="Core" Type="1">VGV4dCBBbGlnbg==</PHRASE>
@@ -882,9 +882,9 @@
 			<PHRASE Label="la_opt_EditorsPick" Module="Core" Type="1">RWRpdG9yJ3MgUGljaw==</PHRASE>
 			<PHRASE Label="la_opt_Email" Module="Core" Type="1">RS1tYWls</PHRASE>
 			<PHRASE Label="la_opt_EmailBody" Module="Core" Type="1">RS1tYWlsIEJvZHk=</PHRASE>
-			<PHRASE Label="la_opt_EmailEvents" Module="Core" Type="1">RS1tYWlsIEV2ZW50cw==</PHRASE>
 			<PHRASE Label="la_opt_EmailLogKeepForever" Module="Core" Type="1">Rm9yZXZlciAobmV2ZXIgZGVsZXRlZCBhdXRvbWF0aWNhbGx5KQ==</PHRASE>
 			<PHRASE Label="la_opt_EmailSubject" Module="Core" Type="1">RS1tYWlsIFN1YmplY3Q=</PHRASE>
+			<PHRASE Label="la_opt_EmailTemplates" Module="Core" Type="1">RS1tYWlsIFRlbXBsYXRlcw==</PHRASE>
 			<PHRASE Label="la_opt_Everyone" Module="Core" Type="1">RXZlcnlvbmU=</PHRASE>
 			<PHRASE Label="la_opt_Exact" Module="Core" Type="1">RXhhY3Q=</PHRASE>
 			<PHRASE Label="la_opt_Expired" Module="Core" Type="1">RXhwaXJlZA==</PHRASE>
@@ -1252,11 +1252,10 @@
 			<PHRASE Label="la_tab_ConfigSearch" Module="Core" Type="1">U2VhcmNo</PHRASE>
 			<PHRASE Label="la_tab_ConfigSettings" Module="Core" Type="1">R2VuZXJhbA==</PHRASE>
 			<PHRASE Label="la_tab_Custom" Module="Core" Type="1">Q3VzdG9t</PHRASE>
-			<PHRASE Label="la_tab_E-mails" Module="Core" Type="1">RS1tYWlsIFRlbXBsYXRlcw==</PHRASE>
 			<PHRASE Label="la_tab_EmailCommunication" Module="Core" Type="1">RS1tYWlsIENvbW11bmljYXRpb24=</PHRASE>
-			<PHRASE Label="la_tab_EmailEvents" Module="Core" Type="1">RW1haWwgRXZlbnRz</PHRASE>
 			<PHRASE Label="la_tab_EmailLog" Module="Core" Type="1">RS1tYWlsIExvZw==</PHRASE>
 			<PHRASE Label="la_tab_EmailQueue" Module="Core" Type="1">RW1haWwgUXVldWU=</PHRASE>
+			<PHRASE Label="la_tab_EmailTemplates" Module="Core" Type="1">RS1tYWlsIFRlbXBsYXRlcw==</PHRASE>
 			<PHRASE Label="la_tab_Fields" Module="Core" Type="1">RmllbGRz</PHRASE>
 			<PHRASE Label="la_tab_Files" Module="Core" Type="1">RmlsZXM=</PHRASE>
 			<PHRASE Label="la_tab_FormsConfig" Module="Core" Type="1">Rm9ybXMgQ29uZmlndXJhdGlvbg==</PHRASE>
@@ -1369,6 +1368,7 @@
 			<PHRASE Label="la_title_AddingBanRule" Module="Core" Type="1">QWRkaW5nIEJhbiBSdWxl</PHRASE>
 			<PHRASE Label="la_title_AddingCountryState" Module="Core" Type="1">QWRkaW5nIENvdW50cnkvU3RhdGU=</PHRASE>
 			<PHRASE Label="la_title_addingCustom" Module="Core" Type="1">QWRkaW5nIEN1c3RvbSBGaWVsZA==</PHRASE>
+			<PHRASE Label="la_title_AddingEmailTemplate" Module="Core" Type="1">QWRkaW5nIEUtbWFpbCBUZW1wbGF0ZQ==</PHRASE>
 			<PHRASE Label="la_title_AddingFile" Module="Core" Type="1">QWRkaW5nIEZpbGU=</PHRASE>
 			<PHRASE Label="la_title_AddingItemFilter" Module="Core" Type="1">QWRkaW5nIEl0ZW0gRmlsdGVy</PHRASE>
 			<PHRASE Label="la_title_AddingMailingList" Module="Core" Type="1">QWRkaW5nIE1haWxpbmcgTGlzdA==</PHRASE>
@@ -1389,7 +1389,6 @@
 			<PHRASE Label="la_title_Adding_Category" Module="Core" Type="1">QWRkaW5nIFNlY3Rpb24=</PHRASE>
 			<PHRASE Label="la_title_Adding_ConfigSearch" Module="Core" Type="1">QWRkaW5nIFNlYXJjaCBGaWVsZA==</PHRASE>
 			<PHRASE Label="la_title_Adding_Content" Module="Core" Type="1">QWRkaW5nIENNUyBCbG9jaw==</PHRASE>
-			<PHRASE Label="la_title_Adding_E-mail" Module="Core" Type="1">QWRkaW5nIEVtYWlsIEV2ZW50</PHRASE>
 			<PHRASE Label="la_title_Adding_Form" Module="Core" Type="1">QWRkaW5nIEZvcm0=</PHRASE>
 			<PHRASE Label="la_title_Adding_FormField" Module="Core" Type="1">QWRkaW5nIEZvcm0gRmllbGQ=</PHRASE>
 			<PHRASE Label="la_title_Adding_Group" Module="Core" Type="1">QWRkaW5nIEdyb3Vw</PHRASE>
@@ -1423,7 +1422,7 @@
 			<PHRASE Label="la_title_EditingContentAutosaved" Module="Core" Type="1">Q29udGVudCBFZGl0b3IgLSBBdXRvLXNhdmVkIGF0ICVz</PHRASE>
 			<PHRASE Label="la_title_EditingCountryState" Module="Core" Type="1">RWRpdGluZyBDb3VudHJ5L1N0YXRl</PHRASE>
 			<PHRASE Label="la_title_EditingDraft" Module="Core" Type="1">RWRpdGluZyBEcmFmdCAoJTIkcyk=</PHRASE>
-			<PHRASE Label="la_title_EditingEmailEvent" Module="Core" Type="1">RWRpdGluZyBFbWFpbCBFdmVudA==</PHRASE>
+			<PHRASE Label="la_title_EditingEmailTemplate" Module="Core" Type="1">RWRpdGluZyBFLW1haWwgVGVtcGxhdGU=</PHRASE>
 			<PHRASE Label="la_title_EditingFile" Module="Core" Type="1">RWRpdGluZyBGaWxl</PHRASE>
 			<PHRASE Label="la_title_EditingItemFilter" Module="Core" Type="1">RWRpdGluZyBJdGVtIEZpbHRlcg==</PHRASE>
 			<PHRASE Label="la_title_EditingMembership" Module="Core" Type="1">RWRpdGluZyBNZW1iZXJzaGlw</PHRASE>
@@ -1447,7 +1446,6 @@
 			<PHRASE Label="la_title_Editing_Category" Module="Core" Type="1">RWRpdGluZyBTZWN0aW9u</PHRASE>
 			<PHRASE Label="la_title_Editing_Content" Module="Core" Type="1">RWRpdGluZyBDTVMgQmxvY2s=</PHRASE>
 			<PHRASE Label="la_title_Editing_CustomField" Module="Core" Type="1">RWRpdGluZyBDdXN0b20gRmllbGQ=</PHRASE>
-			<PHRASE Label="la_title_Editing_E-mail" Module="Core" Type="1">RWRpdGluZyBFLW1haWw=</PHRASE>
 			<PHRASE Label="la_title_Editing_Form" Module="Core" Type="1">RWRpdGluZyBGb3Jt</PHRASE>
 			<PHRASE Label="la_title_Editing_FormField" Module="Core" Type="1">RWRpdGluZyBGb3JtIEZpZWxk</PHRASE>
 			<PHRASE Label="la_title_Editing_Group" Module="Core" Type="1">RWRpdGluZyBHcm91cA==</PHRASE>
@@ -1460,9 +1458,8 @@
 			<PHRASE Label="la_title_Editing_Theme" Module="Core" Type="1">RWRpdGluZyBUaGVtZQ==</PHRASE>
 			<PHRASE Label="la_title_Editing_User" Module="Core" Type="1">RWRpdGluZyBVc2Vy</PHRASE>
 			<PHRASE Label="la_title_EmailCommunication" Module="Core" Type="1">RS1tYWlsIENvbW11bmljYXRpb24=</PHRASE>
-			<PHRASE Label="la_title_EmailEvents" Module="Core" Type="1">RS1tYWlsIEV2ZW50cw==</PHRASE>
-			<PHRASE Label="la_title_EmailMessages" Module="Core" Type="1">RS1tYWlscw==</PHRASE>
 			<PHRASE Label="la_title_EmailSettings" Module="Core" Type="1">RS1tYWlsIFNldHRpbmdz</PHRASE>
+			<PHRASE Label="la_title_EmailTemplates" Module="Core" Type="1">RS1tYWlsIFRlbXBsYXRlcw==</PHRASE>
 			<PHRASE Label="la_title_ExportLanguagePackResults" Module="Core" Type="1">RXhwb3J0IExhbmd1YWdlIFBhY2sgLSBSZXN1bHRz</PHRASE>
 			<PHRASE Label="la_title_ExportLanguagePackStep1" Module="Core" Type="1">RXhwb3J0IExhbmd1YWdlIFBhY2sgLSBTdGVwMQ==</PHRASE>
 			<PHRASE Label="la_title_Fields" Module="Core" Type="1">RmllbGRz</PHRASE>
@@ -1488,7 +1485,7 @@
 			<PHRASE Label="la_title_MailingLists" Module="Core" Type="1">TWFpbGluZ3M=</PHRASE>
 			<PHRASE Label="la_title_Messages" Module="Core" Type="1">TWVzc2FnZXM=</PHRASE>
 			<PHRASE Label="la_title_Module_Status" Module="Core" Type="1">TW9kdWxlcw==</PHRASE>
-			<PHRASE Label="la_title_NewEmailEvent" Module="Core" Type="1">TmV3IEVtYWlsIEV2ZW50</PHRASE>
+			<PHRASE Label="la_title_NewEmailTemplate" Module="Core" Type="1">TmV3IEUtbWFpbCBUZW1wbGF0ZQ==</PHRASE>
 			<PHRASE Label="la_title_NewFile" Module="Core" Type="1">TmV3IEZpbGU=</PHRASE>
 			<PHRASE Label="la_title_NewReply" Module="Core" Type="1">TmV3IFJlcGx5</PHRASE>
 			<PHRASE Label="la_title_NewScheduledTask" Module="Core" Type="1">TmV3IFNjaGVkdWxlZCBUYXNr</PHRASE>
Index: core/install/install_data.sql
===================================================================
--- core/install/install_data.sql	(revision 15593)
+++ core/install/install_data.sql	(working copy)
@@ -149,45 +149,45 @@
 INSERT INTO ItemTypes VALUES (1, 'In-Portal', 'c', 'Categories', 'Name', 'CreatedById', NULL, NULL, 'la_ItemTab_Categories', 1, 'admin/category/addcategory.php', 'clsCategory', 'Category');
 INSERT INTO ItemTypes VALUES (6, 'In-Portal', 'u', 'Users', 'Username', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User');
 
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD', NULL, 1, 0, 'Core', 'Add User', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD', NULL, 1, 1, 'Core', 'Add User', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.APPROVE', NULL, 1, 0, 'Core', 'Approve User', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.APPROVE', NULL, 1, 1, 'Core', 'Approve User', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.VALIDATE', NULL, 1, 0, 'Core', 'Validate User', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.VALIDATE', NULL, 1, 1, 'Core', 'Validate User', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.DENY', NULL, 1, 0, 'Core', 'Deny User', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.DENY', NULL, 1, 1, 'Core', 'Deny User', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD.PENDING', NULL, 1, 0, 'Core', 'Add Pending User', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD.PENDING', NULL, 1, 1, 'Core', 'Add Pending User', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 0, 'Core', 'Add Category', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 0, 'Core', 'Add Pending Category', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 1, 'Core', 'Add Pending Category', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 1, 'Core', 'Add Category', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.APPROVE', NULL, 1, 0, 'Core', 'Approve Category', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.DENY', NULL, 1, 0, 'Core', 'Deny Category', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 0, 'Core', 'User subscribed', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 1, 'Core', 'User subscribed', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 0, 'Core', 'User unsubscribed', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 1, 'Core', 'User unsubscribed', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.SUGGEST', NULL, 1, 0, 'Core', 'Suggest to a friend', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.SUGGEST', NULL, 1, 1, 'Core', 'Suggest to a friend', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.PSWDC', NULL, 1, 0, 'Core', 'Password Confirmation', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, 'Core', 'Membership expired', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, 'Core', 'Membership expired', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'Core', 'Membership expiration notice', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'Core', 'Membership expiration notice', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'COMMON.FOOTER', NULL, 1, 0, 'Core', 'Common Footer Template', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core', 'This e-mail is sent to a user after filling in the Contact Us form', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core', 'This e-mail is sent to a user after filling in the Contact Us form', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'FORM.SUBMISSION.REPLY.TO.USER', NULL, 1, 0, 'Core', 'Admin Reply to User Form Submission', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'FORM.SUBMISSION.REPLY.FROM.USER', NULL, 1, 0, 'Core', 'User Replied to It\'s Form Submission', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'FORM.SUBMISSION.REPLY.FROM.USER.BOUNCED', NULL, 1, 0, 'Core', 'Form Submission Admin Reply Delivery Failure', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.NEW.PASSWORD', NULL, 1, 0, 'Core', 'Sends new password to an existing user', 0, 1, 0);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD.BYADMIN', NULL, 1, 0, 'Core', 'Sends password to a new user', 0, 1, 0);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ROOT.RESET.PASSWORD', NULL, 1, 0, 'Core', 'Root Reset Password', 1, 1, 0);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.EMAIL.CHANGE.VERIFY', NULL, 1, 0, 'Core', 'Changed E-mail Verification', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.EMAIL.CHANGE.UNDO', NULL, 1, 0, 'Core', 'Changed E-mail Rollback', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'SYSTEM.LOG.NOTIFY', NULL, 1, 0, 'Core', 'Notification about message added to System Log', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD', NULL, 1, 0, 'Core', 'Add User', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD', NULL, 1, 1, 'Core', 'Add User', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.APPROVE', NULL, 1, 0, 'Core', 'Approve User', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.APPROVE', NULL, 1, 1, 'Core', 'Approve User', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.VALIDATE', NULL, 1, 0, 'Core', 'Validate User', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.VALIDATE', NULL, 1, 1, 'Core', 'Validate User', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.DENY', NULL, 1, 0, 'Core', 'Deny User', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.DENY', NULL, 1, 1, 'Core', 'Deny User', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD.PENDING', NULL, 1, 0, 'Core', 'Add Pending User', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD.PENDING', NULL, 1, 1, 'Core', 'Add Pending User', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 0, 'Core', 'Add Category', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 0, 'Core', 'Add Pending Category', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 1, 'Core', 'Add Pending Category', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 1, 'Core', 'Add Category', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.APPROVE', NULL, 1, 0, 'Core', 'Approve Category', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'CATEGORY.DENY', NULL, 1, 0, 'Core', 'Deny Category', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 0, 'Core', 'User subscribed', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 1, 'Core', 'User subscribed', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 0, 'Core', 'User unsubscribed', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 1, 'Core', 'User unsubscribed', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.SUGGEST', NULL, 1, 0, 'Core', 'Suggest to a friend', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.SUGGEST', NULL, 1, 1, 'Core', 'Suggest to a friend', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.PSWDC', NULL, 1, 0, 'Core', 'Password Confirmation', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, 'Core', 'Membership expired', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, 'Core', 'Membership expired', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'Core', 'Membership expiration notice', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'Core', 'Membership expiration notice', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'COMMON.FOOTER', NULL, 1, 0, 'Core', 'Common Footer Template', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core', 'This e-mail is sent to a user after filling in the Contact Us form', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core', 'This e-mail is sent to a user after filling in the Contact Us form', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'FORM.SUBMISSION.REPLY.TO.USER', NULL, 1, 0, 'Core', 'Admin Reply to User Form Submission', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'FORM.SUBMISSION.REPLY.FROM.USER', NULL, 1, 0, 'Core', 'User Replied to It\'s Form Submission', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'FORM.SUBMISSION.REPLY.FROM.USER.BOUNCED', NULL, 1, 0, 'Core', 'Form Submission Admin Reply Delivery Failure', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.NEW.PASSWORD', NULL, 1, 0, 'Core', 'Sends new password to an existing user', 0, 1, 0);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.ADD.BYADMIN', NULL, 1, 0, 'Core', 'Sends password to a new user', 0, 1, 0);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ROOT.RESET.PASSWORD', NULL, 1, 0, 'Core', 'Root Reset Password', 1, 1, 0);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.EMAIL.CHANGE.VERIFY', NULL, 1, 0, 'Core', 'Changed E-mail Verification', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.EMAIL.CHANGE.UNDO', NULL, 1, 0, 'Core', 'Changed E-mail Rollback', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'SYSTEM.LOG.NOTIFY', NULL, 1, 0, 'Core', 'Notification about message added to System Log', 1, 1, 1);
 
 INSERT INTO IdGenerator VALUES ('100');
 
Index: core/install/install_schema.sql
===================================================================
--- core/install/install_schema.sql	(revision 15602)
+++ core/install/install_schema.sql	(working copy)
@@ -83,9 +83,9 @@
   KEY MailingId (MailingId)
 );
 
-CREATE TABLE EmailEvents (
-  EventId int(11) NOT NULL AUTO_INCREMENT,
-  `Event` varchar(40) NOT NULL DEFAULT '',
+CREATE TABLE EmailTemplates (
+  TemplateId int(11) NOT NULL AUTO_INCREMENT,
+  TemplateName varchar(40) NOT NULL DEFAULT '',
   ReplacementTags text,
   AllowChangingSender tinyint(4) NOT NULL DEFAULT '0',
   CustomSender tinyint(4) NOT NULL DEFAULT '0',
@@ -118,10 +118,10 @@
   `Type` int(11) NOT NULL DEFAULT '0',
   LastChanged int(10) unsigned DEFAULT NULL,
   BindToSystemEvent varchar(255) NOT NULL DEFAULT '',
-  PRIMARY KEY (EventId),
+  PRIMARY KEY (TemplateId),
   KEY `Type` (`Type`),
   KEY Enabled (Enabled),
-  KEY `Event` (`Event`),
+  KEY `Event` (TemplateName),
   KEY FrontEndOnly (FrontEndOnly),
   KEY AllowChangingSender (AllowChangingSender),
   KEY CustomSender (CustomSender),
@@ -142,7 +142,7 @@
 
 CREATE TABLE SystemEventSubscriptions (
   SubscriptionId int(11) NOT NULL AUTO_INCREMENT,
-  EmailEventId int(11) DEFAULT NULL,
+  EmailTemplateId int(11) DEFAULT NULL,
   SubscriberEmail varchar(255) NOT NULL DEFAULT '',
   UserId int(11) DEFAULT NULL,
   CategoryId int(11) DEFAULT NULL,
@@ -151,7 +151,7 @@
   ParentItemId int(11) DEFAULT NULL,
   SubscribedOn int(11) DEFAULT NULL,
   PRIMARY KEY (SubscriptionId),
-  KEY EmailEventId (EmailEventId)
+  KEY EmailEventId (EmailTemplateId)
 );
 
 CREATE TABLE IdGenerator (
@@ -414,7 +414,7 @@
   HtmlBody longtext,
   TextBody longtext,
   SentOn int(11) DEFAULT NULL,
-  EventName varchar(255) NOT NULL DEFAULT '',
+  TemplateName varchar(255) NOT NULL DEFAULT '',
   EventType tinyint(4) DEFAULT NULL,
   EventParams text,
   AccessKey varchar(32) NOT NULL DEFAULT '',
Index: core/install/remove_schema.sql
===================================================================
--- core/install/remove_schema.sql	(revision 15552)
+++ core/install/remove_schema.sql	(working copy)
@@ -3,7 +3,7 @@
 DROP TABLE CustomFields;
 DROP TABLE SystemSettings;
 DROP TABLE EmailQueue;
-DROP TABLE EmailEvents;
+DROP TABLE EmailTemplates;
 DROP TABLE SystemEventSubscriptions;
 DROP TABLE IdGenerator;
 DROP TABLE Languages;
Index: core/install/upgrades.php
===================================================================
--- core/install/upgrades.php	(revision 15590)
+++ core/install/upgrades.php	(working copy)
@@ -34,7 +34,7 @@
 			'c' => Array ('from' => 'Category', 'to' => 'Categories'),
 			'cf' => Array ('from' => 'CustomField', 'to' => 'CustomFields'),
 			'draft' => Array ('from' => 'Drafts', 'to' => 'FormSubmissionReplyDrafts'),
-			'emailevents' => Array ('from' => 'Events', 'to' => 'EmailEvents'),
+			'email-template' => Array ('from' => 'Events', 'to' => 'EmailEvents'),
 			'fav' => Array ('from' => 'Favorites', 'to' => 'UserFavorites'),
 			'img' => Array ('from' => 'Images', 'to' => 'CatalogImages'),
 			'#file' => Array ('from' => 'ItemFiles', 'to' => 'CatalogFiles'),
@@ -164,9 +164,9 @@
 			if ($mode == 'after') {
 				// 1. get event ids based on their name and type combination
 				$event_names = Array (
-					'USER.PSWD_' . EmailEvent::EVENT_TYPE_ADMIN,
-					'USER.PSWD_' . EmailEvent::EVENT_TYPE_FRONTEND,
-					'USER.PSWDC_' . EmailEvent::EVENT_TYPE_FRONTEND,
+					'USER.PSWD_' . EmailTemplate::TEMPLATE_TYPE_ADMIN,
+					'USER.PSWD_' . EmailTemplate::TEMPLATE_TYPE_FRONTEND,
+					'USER.PSWDC_' . EmailTemplate::TEMPLATE_TYPE_FRONTEND,
 				);
 
 				$event_sql = Array ();
@@ -1212,7 +1212,7 @@
 				// partially delete events
 				$sql = 'SELECT EventId
 						FROM ' . TABLE_PREFIX . 'Events
-						WHERE (Event IN ("CATEGORY.APPROVE", "CATEGORY.DENY")) AND (Type = ' . EmailEvent::EVENT_TYPE_ADMIN . ')';
+						WHERE (Event IN ("CATEGORY.APPROVE", "CATEGORY.DENY")) AND (Type = ' . EmailTemplate::TEMPLATE_TYPE_ADMIN . ')';
 				$event_ids = $this->Conn->GetCol($sql);
 
 				if ($event_ids) {
@@ -1485,12 +1485,12 @@
 				/* @var $ml_helper kMultiLanguageHelper */
 
 				$ml_helper->createFields('phrases');
-				$ml_helper->createFields('emailevents');
+				$ml_helper->createFields('email-template');
 				$languages = $ml_helper->getLanguages();
 
 				if ($this->Conn->TableFound(TABLE_PREFIX . 'EmailMessage', true)) {
-					$email_message_helper = $this->Application->recallObject('kEmailMessageHelper');
-					/* @var $email_message_helper kEmailMessageHelper */
+					$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
+					/* @var $email_template_helper kEmailTemplateHelper */
 
 					foreach ($languages as $language_id) {
 						$sql = 'SELECT EmailMessageId, Template, EventId
@@ -1499,7 +1499,7 @@
 						$translations = $this->Conn->Query($sql, 'EventId');
 
 						foreach ($translations as $event_id => $translation_data) {
-							$parsed = $email_message_helper->parseTemplate($translation_data['Template'], 'html');
+							$parsed = $email_template_helper->parseTemplate($translation_data['Template'], 'html');
 
 							$fields_hash = Array (
 								'l' . $language_id . '_Subject' => $parsed['Subject'],
@@ -1702,22 +1702,22 @@
 					continue;
 				}
 
-				if ($event_data['Type'] == EmailEvent::EVENT_TYPE_FRONTEND) {
+				if ($event_data['Type'] == EmailTemplate::TEMPLATE_TYPE_FRONTEND) {
 					// from user
 					$fields_hash = Array (
 						'CustomSender' => 1,
-						'SenderAddressType' => EmailEvent::ADDRESS_TYPE_USER,
+						'SenderAddressType' => EmailTemplate::ADDRESS_TYPE_USER,
 						'SenderAddress' => $username
 					);
 				}
 
-				if ($event_data['Type'] == EmailEvent::EVENT_TYPE_ADMIN) {
+				if ($event_data['Type'] == EmailTemplate::TEMPLATE_TYPE_ADMIN) {
 					// to user
 					$records = Array (
 						Array (
-							'RecipientType' => EmailEvent::RECIPIENT_TYPE_TO,
+							'RecipientType' => EmailTemplate::RECIPIENT_TYPE_TO,
 							'RecipientName' => '',
-							'RecipientAddressType' => EmailEvent::ADDRESS_TYPE_USER,
+							'RecipientAddressType' => EmailTemplate::ADDRESS_TYPE_USER,
 							'RecipientAddress' => $username
 						)
 					);
@@ -2054,8 +2054,8 @@
 		 */
 		private function _splitEmailBody()
 		{
-			$id_field = $this->Application->getUnitOption('emailevents', 'IDField');
-			$table_name = $this->Application->getUnitOption('emailevents', 'TableName');
+			$id_field = $this->Application->getUnitOption('email-template', 'IDField');
+			$table_name = $this->Application->getUnitOption('email-template', 'TableName');
 			$fields = $this->Conn->Query('DESCRIBE ' . $table_name, 'Field');
 
 			if ( !isset($fields['l1_Body']) ) {
@@ -2067,7 +2067,7 @@
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			$languages = $ml_helper->getLanguages();
-			$ml_helper->createFields('emailevents');
+			$ml_helper->createFields('email-template');
 
 			$sql = 'SELECT *
 					FROM ' . $table_name;
@@ -2111,7 +2111,7 @@
 
 			$languages = $ml_helper->getLanguages();
 
-			$event_table = $this->Application->getUnitOption('emailevents', 'TableName');
+			$event_table = $this->Application->getUnitOption('email-template', 'TableName');
 
 			$sql = 'SELECT *
 					FROM ' . $event_table . '
@@ -2189,7 +2189,7 @@
 
 			// fix e-mail event translations
 			$languages = $ml_helper->getLanguages();
-			$table_name = $this->Application->getUnitOption('emailevents', 'TableName');
+			$table_name = $this->Application->getUnitOption('email-template', 'TableName');
 
 			$change_fields = Array ('Subject', 'HtmlBody', 'PlainTextBody');
 
@@ -2206,7 +2206,7 @@
 
 			// add new ml columns to phrases/e-mail events
 			$ml_helper->createFields('phrases');
-			$ml_helper->createFields('emailevents');
+			$ml_helper->createFields('email-template');
 		}
 
 		/**
Index: core/install/upgrades.sql
===================================================================
--- core/install/upgrades.sql	(revision 15602)
+++ core/install/upgrades.sql	(working copy)
@@ -2863,3 +2863,16 @@
 INSERT INTO SystemSettings VALUES(DEFAULT, 'TypeKitId', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_Settings3rdPartyAPI', 'la_config_TypeKitId', 'text', NULL, NULL, 80.05, 0, 1, NULL);
 
 ALTER TABLE MailingLists CHANGE EmailsQueued EmailsQueuedTotal INT(10) UNSIGNED NOT NULL DEFAULT '0';
+
+RENAME TABLE <%TABLE_PREFIX%>EmailEvents TO <%TABLE_PREFIX%>EmailTemplates;
+ALTER TABLE EmailTemplates CHANGE `Event` TemplateName VARCHAR(40) NOT NULL DEFAULT '';
+ALTER TABLE EmailTemplates CHANGE EventId TemplateId INT(11) NOT NULL AUTO_INCREMENT;
+ALTER TABLE SystemEventSubscriptions CHANGE EmailEventId EmailTemplateId INT(11) NULL DEFAULT NULL;
+
+DELETE FROM LanguageLabels WHERE PhraseKey IN (
+	'LA_FLD_EXPORTEMAILEVENTS', 'LA_FLD_EVENT', 'LA_TITLE_EMAILMESSAGES', 'LA_TAB_E-MAILS', 'LA_COL_EMAILEVENTS',
+	'LA_OPT_EMAILEVENTS', 'LA_FLD_EMAILEVENT', 'LA_TITLE_EMAILEVENTS', 'LA_TITLE_ADDING_E-MAIL', 'LA_TITLE_EDITING_E-MAIL',
+	'LA_TITLE_EDITINGEMAILEVENT', 'LA_TITLE_NEWEMAILEVENT', 'LA_TAB_EMAILEVENTS'
+);
+DELETE FROM UserPersistentSessionData WHERE VariableName IN ('system-event-subscription[Default]columns_.', 'email-log[Default]columns_.');
+ALTER TABLE EmailLog CHANGE EventName TemplateName VARCHAR(255) NOT NULL DEFAULT '';
Index: core/kernel/application.php
===================================================================
--- core/kernel/application.php	(revision 15590)
+++ core/kernel/application.php	(working copy)
@@ -2453,48 +2453,48 @@
 	/**
 	 * Triggers email event of type Admin
 	 *
-	 * @param string $email_event_name
+	 * @param string $email_template_name
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
 	 * @return kEvent
 	 * @access public
 	 */
-	public function EmailEventAdmin($email_event_name, $to_user_id = null, $send_params = Array ())
+	public function emailAdmin($email_template_name, $to_user_id = null, $send_params = Array ())
 	{
-		return $this->_emailEvent($email_event_name, EmailEvent::EVENT_TYPE_ADMIN, $to_user_id, $send_params);
+		return $this->_email($email_template_name, EmailTemplate::TEMPLATE_TYPE_ADMIN, $to_user_id, $send_params);
 	}
 
 	/**
 	 * Triggers email event of type User
 	 *
-	 * @param string $email_event_name
+	 * @param string $email_template_name
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
 	 * @return kEvent
 	 * @access public
 	 */
-	public function EmailEventUser($email_event_name, $to_user_id = null, $send_params = Array ())
+	public function emailUser($email_template_name, $to_user_id = null, $send_params = Array ())
 	{
-		return $this->_emailEvent($email_event_name, EmailEvent::EVENT_TYPE_FRONTEND, $to_user_id, $send_params);
+		return $this->_email($email_template_name, EmailTemplate::TEMPLATE_TYPE_FRONTEND, $to_user_id, $send_params);
 	}
 
 	/**
 	 * Triggers general email event
 	 *
-	 * @param string $email_event_name
-	 * @param int $email_event_type (0 for User, 1 for Admin)
+	 * @param string $email_template_name
+	 * @param int $email_template_type (0 for User, 1 for Admin)
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params,
 	 *  possible keys: to_email, to_name, from_email, from_name, message, message_text
 	 * @return kEvent
 	 * @access protected
 	 */
-	protected function _emailEvent($email_event_name, $email_event_type, $to_user_id = null, $send_params = Array ())
+	protected function _email($email_template_name, $email_template_type, $to_user_id = null, $send_params = Array ())
 	{
 		$email = $this->makeClass('kEmail');
 		/* @var $email kEmail */
 
-		if ( !$email->findEvent($email_event_name, $email_event_type) ) {
+		if ( !$email->findTemplate($email_template_name, $email_template_type) ) {
 			return false;
 		}
 
Index: core/kernel/constants.php
===================================================================
--- core/kernel/constants.php	(revision 15590)
+++ core/kernel/constants.php	(working copy)
@@ -137,9 +137,9 @@
 	define('SITE_DOMAIN_REDIRECT_CURRENT', 1);
 	define('SITE_DOMAIN_REDIRECT_EXTERNAL', 2);
 
-	class EmailEvent {
-		const EVENT_TYPE_FRONTEND = 0;
-		const EVENT_TYPE_ADMIN = 1;
+	class EmailTemplate {
+		const TEMPLATE_TYPE_FRONTEND = 0;
+		const TEMPLATE_TYPE_ADMIN = 1;
 
 		const ADDRESS_TYPE_EMAIL = 1;
 		const ADDRESS_TYPE_USER = 2;
Index: core/kernel/db/cat_dbitem.php
===================================================================
--- core/kernel/db/cat_dbitem.php	(revision 15594)
+++ core/kernel/db/cat_dbitem.php	(working copy)
@@ -477,7 +477,7 @@
 
 		if ( $new_status != $this->GetDBField($status_field) ) {
 			// status was changed
-			$this->sendEmailEvents($new_status, $pending_editing);
+			$this->sendEmails($new_status, $pending_editing);
 		}
 
 		$this->SetDBField($status_field, $new_status);
@@ -485,7 +485,7 @@
 		return $this->Update();
 	}
 
-	function sendEmailEvents($new_status, $pending_editing = false)
+	function sendEmails($new_status, $pending_editing = false)
 	{
 		$owner_field = $this->Application->getUnitOption($this->Prefix, 'OwnerField');
 		if (!$owner_field) {
@@ -498,7 +498,7 @@
 		}
 
 		$event_name .= $new_status == STATUS_ACTIVE ? '.APPROVE' : '.DENY';
-		$this->Application->EmailEventUser($event_name, $this->GetDBField($owner_field));
+		$this->Application->emailUser($event_name, $this->GetDBField($owner_field));
 	}
 
 	/**
@@ -551,7 +551,7 @@
 
 		$temp_handler->DeleteItems($this->Prefix, $this->Special, Array ($this->GetID()));
 
-		$this->sendEmailEvents(STATUS_DISABLED, true);
+		$this->sendEmails(STATUS_DISABLED, true);
 		// original item is not changed here, because it is already enabled (thrus pending copy is visible to item's owner or admin with permission)
 		return true;
 	}
Index: core/kernel/db/cat_event_handler.php
===================================================================
--- core/kernel/db/cat_event_handler.php	(revision 15563)
+++ core/kernel/db/cat_event_handler.php	(working copy)
@@ -2573,15 +2573,15 @@
 		switch ( $event->Name ) {
 			case 'OnCreate':
 				$event_suffix = $is_active ? 'ADD' : 'ADD.PENDING';
-				$this->Application->EmailEventAdmin($perm_prefix . '.' . $event_suffix); // there are no ADD.PENDING event for admin :(
-				$this->Application->EmailEventUser($perm_prefix . '.' . $event_suffix, $owner_id);
+				$this->Application->emailAdmin($perm_prefix . '.' . $event_suffix); // there are no ADD.PENDING event for admin :(
+				$this->Application->emailUser($perm_prefix . '.' . $event_suffix, $owner_id);
 				break;
 
 			case 'OnUpdate':
 				$event_suffix = $is_active ? 'MODIFY' : 'MODIFY.PENDING';
 				$user_id = is_numeric($object->GetDBField('ModifiedById')) ? $object->GetDBField('ModifiedById') : $owner_id;
-				$this->Application->EmailEventAdmin($perm_prefix . '.' . $event_suffix); // there are no ADD.PENDING event for admin :(
-				$this->Application->EmailEventUser($perm_prefix . '.' . $event_suffix, $user_id);
+				$this->Application->emailAdmin($perm_prefix . '.' . $event_suffix); // there are no ADD.PENDING event for admin :(
+				$this->Application->emailUser($perm_prefix . '.' . $event_suffix, $user_id);
 				break;
 		}
 	}
Index: core/kernel/db/db_event_handler.php
===================================================================
--- core/kernel/db/db_event_handler.php	(revision 15601)
+++ core/kernel/db/db_event_handler.php	(working copy)
@@ -2501,19 +2501,19 @@
 		 */
 		protected function _deleteSubscriptions($prefix, $field, $value)
 		{
-			$sql = 'SELECT EventId
-					FROM ' . TABLE_PREFIX . 'EmailEvents
+			$sql = 'SELECT TemplateId
+					FROM ' . $this->Application->getUnitOption('email-template', 'TableName') . '
 					WHERE BindToSystemEvent REGEXP "' . $this->Conn->escape($prefix) . '(\\\\.[^:]*:.*|:.*)"';
-			$email_event_ids = $this->Conn->GetCol($sql);
+			$email_template_ids = $this->Conn->GetCol($sql);
 
-			if ( !$email_event_ids ) {
+			if ( !$email_template_ids ) {
 				return;
 			}
 
 			// e-mail events, connected to that unit prefix are found
 			$sql = 'SELECT SubscriptionId
 					FROM ' . TABLE_PREFIX . 'SystemEventSubscriptions
-					WHERE ' . $field . ' = ' . $value . ' AND EmailEventId IN (' . implode(',', $email_event_ids) . ')';
+					WHERE ' . $field . ' = ' . $value . ' AND EmailTemplateId IN (' . implode(',', $email_template_ids) . ')';
 			$ids = $this->Conn->GetCol($sql);
 
 			if ( !$ids ) {
Index: core/kernel/event_manager.php
===================================================================
--- core/kernel/event_manager.php	(revision 15437)
+++ core/kernel/event_manager.php	(working copy)
@@ -284,34 +284,34 @@
 			return;
 		}
 
-		$cache_key = 'email_to_event_mapping[%EmaileventsSerial%]';
+		$cache_key = 'email_to_event_mapping[%EmailTemplateSerial%]';
 		$event_mapping = $this->Application->getCache($cache_key);
 
 		if ( $event_mapping === false ) {
 			$this->Conn->nextQueryCachable = true;
-			$sql = 'SELECT EventId, Event, Type, BindToSystemEvent
-					FROM ' . TABLE_PREFIX . 'EmailEvents
+			$sql = 'SELECT TemplateId, TemplateName, Type, BindToSystemEvent
+					FROM ' . $this->Application->getUnitOption('email-template', 'TableName') . '
 					WHERE BindToSystemEvent <> ""';
 			$event_mapping = $this->Conn->Query($sql, 'BindToSystemEvent');
 
 			$this->Application->setCache($cache_key, $event_mapping);
 		}
 
-		$email_event = Array ();
+		$email_template = Array ();
 
 		if ( isset($event_mapping[(string)$event]) ) {
-			$email_event = $event_mapping[(string)$event];
+			$email_template = $event_mapping[(string)$event];
 		}
 		elseif ( isset($event_mapping[$event->Prefix . '.*:' . $event->Name]) ) {
-			$email_event = $event_mapping[$event->Prefix . '.*:' . $event->Name];
+			$email_template = $event_mapping[$event->Prefix . '.*:' . $event->Name];
 		}
 
-		if ( !$email_event ) {
+		if ( !$email_template ) {
 			return;
 		}
 
 		$where_clause = Array ();
-		$where_clause['EmailEventId'] = 'EmailEventId = ' . $email_event['EventId'];
+		$where_clause['EmailTemplateId'] = 'EmailTemplateId = ' . $email_template['TemplateId'];
 
 		try {
 			$category_ids = Array ();
@@ -350,7 +350,7 @@
 		$where_clause['ParentItemId'] = $this->_getSubscriberFilter('ParentItemId', $parent_item_id);
 
 		$event_params = Array (
-			'EmailEventId' => $email_event['EventId'],
+			'EmailTemplateId' => $email_template['TemplateId'],
 			'CategoryIds' => $category_ids,
 			'ItemId' => $item_id,
 			'ParentId' => $parent_item_id,
@@ -374,12 +374,12 @@
 			'PrefixSpecial' => $event->getPrefixSpecial(),
 		);
 
-		$send_method = $email_event['Type'] == EmailEvent::EVENT_TYPE_FRONTEND ? 'EmailEventUser' : 'EmailEventAdmin';
+		$send_method = $email_template['Type'] == EmailTemplate::TEMPLATE_TYPE_FRONTEND ? 'emailUser' : 'emailAdmin';
 
 		foreach ($subscribers as $subscriber_info) {
 			$send_params['to_name'] = $subscriber_info['SubscriberEmail'];
 			$send_params['to_email'] = $subscriber_info['SubscriberEmail'];
-			$this->Application->$send_method($email_event['Event'], $subscriber_info['UserId'], $send_params);
+			$this->Application->$send_method($email_template['TemplateName'], $subscriber_info['UserId'], $send_params);
 		}
 	}
 
Index: core/kernel/managers/subscription_manager.php
===================================================================
--- core/kernel/managers/subscription_manager.php	(revision 15437)
+++ core/kernel/managers/subscription_manager.php	(working copy)
@@ -95,21 +95,21 @@
 	/**
 	 * Returns e-mail event id or throws an exception, when such event not found
 	 *
-	 * @param string $email_event_name
+	 * @param string $template_name
 	 * @param int $type
 	 * @return string
 	 * @throws Exception
 	 * @access public
 	 */
-	public function getEmailEventId($email_event_name, $type = EmailEvent::EVENT_TYPE_FRONTEND)
+	public function getEmailTemplateId($template_name, $type = EmailTemplate::TEMPLATE_TYPE_FRONTEND)
 	{
-		$sql = 'SELECT EventId
-				FROM ' . TABLE_PREFIX . 'EmailEvents
-				WHERE Event = ' . $this->Conn->qstr($email_event_name) . ' AND Type = ' . $type;
+		$sql = 'SELECT TemplateId
+				FROM ' . $this->Application->getUnitOption('email-template', 'TableName') . '
+				WHERE TemplateName = ' . $this->Conn->qstr($template_name) . ' AND Type = ' . $type;
 		$id = $this->Conn->GetOne($sql);
 
 		if ( !$id ) {
-			throw new Exception('E-mail event "' . $email_event_name . '" not found');
+			throw new Exception('E-mail template "' . $template_name . '" not found');
 		}
 
 		return $id;
Index: core/kernel/utility/email.php
===================================================================
--- core/kernel/utility/email.php	(revision 15552)
+++ core/kernel/utility/email.php	(working copy)
@@ -34,11 +34,11 @@
 	protected $params = Array ();
 
 	/**
-	 * Reference to e-mail event object, that would be used as data source
+	 * Reference to e-mail template object, that would be used as data source
 	 *
 	 * @var kDBItem
 	 */
-	protected $emailEvent = null;
+	protected $emailTemplate = null;
 
 	/**
 	 * Sender name
@@ -86,9 +86,9 @@
 	 * @access protected
 	 */
 	protected $recipients = Array (
-		EmailEvent::RECIPIENT_TYPE_TO => Array (),
-		EmailEvent::RECIPIENT_TYPE_CC => Array (),
-		EmailEvent::RECIPIENT_TYPE_BCC => Array (),
+		EmailTemplate::RECIPIENT_TYPE_TO => Array (),
+		EmailTemplate::RECIPIENT_TYPE_CC => Array (),
+		EmailTemplate::RECIPIENT_TYPE_BCC => Array (),
 	);
 
 	/**
@@ -113,9 +113,9 @@
 		$this->Application->removeObject('u.email-from');
 
 		$this->recipients = Array (
-			EmailEvent::RECIPIENT_TYPE_TO => Array (),
-			EmailEvent::RECIPIENT_TYPE_CC => Array (),
-			EmailEvent::RECIPIENT_TYPE_BCC => Array (),
+			EmailTemplate::RECIPIENT_TYPE_TO => Array (),
+			EmailTemplate::RECIPIENT_TYPE_CC => Array (),
+			EmailTemplate::RECIPIENT_TYPE_BCC => Array (),
 		);
 
 		$this->toEmail = $this->toEmail = '';
@@ -123,7 +123,7 @@
 	}
 
 	/**
-	 * Finds e-mail event matching user data
+	 * Finds e-mail template matching user data
 	 *
 	 * @param string $name
 	 * @param int $type
@@ -131,53 +131,53 @@
 	 * @throws InvalidArgumentException
 	 * @access public
 	 */
-	public function findEvent($name, $type)
+	public function findTemplate($name, $type)
 	{
 		if ( !$name || !preg_match('/^[A-Z\.]+$/', $name) ) {
-			throw new InvalidArgumentException('Invalid e-mail event name "<strong>' . $name . '</strong>". Only <strong>UPPERCASE characters</strong> and <strong>dots</strong> are allowed.');
+			throw new InvalidArgumentException('Invalid e-mail template name "<strong>' . $name . '</strong>". Only <strong>UPPERCASE characters</strong> and <strong>dots</strong> are allowed.');
 		}
 
-		if ( $type != EmailEvent::EVENT_TYPE_ADMIN && $type != EmailEvent::EVENT_TYPE_FRONTEND ) {
-			throw new InvalidArgumentException('Invalid e-mail event type');
+		if ( $type != EmailTemplate::TEMPLATE_TYPE_ADMIN && $type != EmailTemplate::TEMPLATE_TYPE_FRONTEND ) {
+			throw new InvalidArgumentException('Invalid e-mail template type');
 		}
 
-		// use "-item" special prevent error, when e-mail sent out from e-mail events list
-		$this->emailEvent = $this->Application->recallObject('emailevents.-item', null, Array ('skip_autoload' => true));
+		// use "-item" special prevent error, when e-mail sent out from e-mail templates list
+		$this->emailTemplate = $this->Application->recallObject('email-template.-item', null, Array ('skip_autoload' => true));
 
-		if ( !$this->emailEvent->isLoaded() || !$this->_sameEvent($name, $type) ) {
-			// get event parameters by name & type
-			$this->emailEvent->Load(Array ('Event' => $name, 'Type' => $type));
+		if ( !$this->emailTemplate->isLoaded() || !$this->_sameTemplate($name, $type) ) {
+			// get template parameters by name & type
+			$this->emailTemplate->Load(Array ('TemplateName' => $name, 'Type' => $type));
 		}
 
-		return $this->_eventUsable();
+		return $this->_templateUsable();
 	}
 
 	/**
-	 * Detects, that given event data matches currently used event
+	 * Detects, that given e-mail template data matches currently used e-mail template
 	 *
 	 * @param string $name
 	 * @param int $type
 	 * @return bool
 	 * @access protected
 	 */
-	protected function _sameEvent($name, $type)
+	protected function _sameTemplate($name, $type)
 	{
-		return $this->emailEvent->GetDBField('Event') == $name && $this->emailEvent->GetDBField('Type') == $type;
+		return $this->emailTemplate->GetDBField('TemplateName') == $name && $this->emailTemplate->GetDBField('Type') == $type;
 	}
 
 	/**
-	 * Determines if we can use e-mail event we've found based on user data
+	 * Determines if we can use e-mail template we've found based on user data
 	 *
 	 * @return bool
 	 * @access protected
 	 */
-	protected function _eventUsable()
+	protected function _templateUsable()
 	{
-		if ( !$this->emailEvent->isLoaded() || $this->emailEvent->GetDBField('Enabled') == STATUS_DISABLED ) {
+		if ( !$this->emailTemplate->isLoaded() || $this->emailTemplate->GetDBField('Enabled') == STATUS_DISABLED ) {
 			return false;
 		}
 
-		if ( $this->emailEvent->GetDBField('FrontEndOnly') && $this->Application->isAdmin ) {
+		if ( $this->emailTemplate->GetDBField('FrontEndOnly') && $this->Application->isAdmin ) {
 			return false;
 		}
 
@@ -185,7 +185,7 @@
 	}
 
 	/**
-	 * Sets e-mail event params
+	 * Sets e-mail template params
 	 *
 	 * @param Array $params
 	 * @access public
@@ -196,7 +196,7 @@
 	}
 
 	/**
-	 * Returns any custom parameters, that are passed when invoked e-mail event sending
+	 * Returns any custom parameters, that are passed when invoked e-mail template sending
 	 *
 	 * @return Array
 	 * @access protected
@@ -247,8 +247,8 @@
 				'OtherRecipients' => serialize($this->recipients),
 				'Subject' => $message_subject,
 				'SentOn' => TIMENOW,
-				'EventName' => $this->emailEvent->GetDBField('Event'),
-				'EventType' => $this->emailEvent->GetDBField('Type'),
+				'TemplateName' => $this->emailTemplate->GetDBField('TemplateName'),
+				'EventType' => $this->emailTemplate->GetDBField('Type'),
 				'EventParams' => serialize($this->_getCustomParams()),
 			);
 
@@ -324,7 +324,7 @@
 	 */
 	protected function _processSender()
 	{
-		if ( $this->emailEvent->GetDBField('CustomSender') ) {
+		if ( $this->emailTemplate->GetDBField('CustomSender') ) {
 			$this->_processCustomSender();
 		}
 
@@ -350,15 +350,15 @@
 	 */
 	protected function _processCustomSender()
 	{
-		$address = $this->emailEvent->GetDBField('SenderAddress');
-		$address_type = $this->emailEvent->GetDBField('SenderAddressType');
+		$address = $this->emailTemplate->GetDBField('SenderAddress');
+		$address_type = $this->emailTemplate->GetDBField('SenderAddressType');
 
 		switch ($address_type) {
-			case EmailEvent::ADDRESS_TYPE_EMAIL:
+			case EmailTemplate::ADDRESS_TYPE_EMAIL:
 				$this->fromEmail = $address;
 				break;
 
-			case EmailEvent::ADDRESS_TYPE_USER:
+			case EmailTemplate::ADDRESS_TYPE_USER:
 				$sql = 'SELECT FirstName, LastName, Email, PortalUserId
 						FROM ' . TABLE_PREFIX . 'Users
 						WHERE Username = ' . $this->Conn->qstr($address);
@@ -377,8 +377,8 @@
 				break;
 		}
 
-		if ( $this->emailEvent->GetDBField('SenderName') ) {
-			$this->fromName = $this->emailEvent->GetDBField('SenderName');
+		if ( $this->emailTemplate->GetDBField('SenderName') ) {
+			$this->fromName = $this->emailTemplate->GetDBField('SenderName');
 		}
 	}
 
@@ -410,9 +410,9 @@
 		$this->_collectRecipients();
 
 		$header_mapping = Array (
-			EmailEvent::RECIPIENT_TYPE_TO => 'To',
-			EmailEvent::RECIPIENT_TYPE_CC => 'Cc',
-			EmailEvent::RECIPIENT_TYPE_BCC => 'Bcc',
+			EmailTemplate::RECIPIENT_TYPE_TO => 'To',
+			EmailTemplate::RECIPIENT_TYPE_CC => 'Cc',
+			EmailTemplate::RECIPIENT_TYPE_BCC => 'Bcc',
 		);
 
 		$default_email = $this->Application->ConfigValue('DefaultEmailSender');
@@ -424,7 +424,7 @@
 				continue;
 			}
 
-			if ( $recipient_type == EmailEvent::RECIPIENT_TYPE_TO ) {
+			if ( $recipient_type == EmailTemplate::RECIPIENT_TYPE_TO ) {
 				$this->toEmail = $recipients[0]['email'] ? $recipients[0]['email'] : $default_email;
 				$this->toName = $recipients[0]['name'] ? $recipients[0]['name'] : $this->toEmail;
 			}
@@ -448,13 +448,13 @@
 	 */
 	protected function _collectRecipients()
 	{
-		$this->_addRecipientsFromXml($this->emailEvent->GetDBField('Recipients'));
+		$this->_addRecipientsFromXml($this->emailTemplate->GetDBField('Recipients'));
 		$this->_overwriteToRecipient();
 		$this->_addRecipientByUserId();
 		$this->_addRecipientFromParams();
 
-		if ( ($this->emailEvent->GetDBField('Type') == EmailEvent::EVENT_TYPE_ADMIN) && !$this->recipients[EmailEvent::RECIPIENT_TYPE_TO] ) {
-			// admin email event without direct recipient -> send to admin
+		if ( ($this->emailTemplate->GetDBField('Type') == EmailTemplate::TEMPLATE_TYPE_ADMIN) && !$this->recipients[EmailTemplate::RECIPIENT_TYPE_TO] ) {
+			// admin email template without direct recipient -> send to admin
 			$this->_addDefaultRecipient();
 		}
 	}
@@ -495,8 +495,8 @@
 	{
 		$overwrite_to_email = isset($this->params['overwrite_to_email']) ? $this->params['overwrite_to_email'] : false;
 
-		if ( !$this->emailEvent->GetDBField('CustomRecipient') || $overwrite_to_email ) {
-			$this->recipients[EmailEvent::RECIPIENT_TYPE_TO] = Array ();
+		if ( !$this->emailTemplate->GetDBField('CustomRecipient') || $overwrite_to_email ) {
+			$this->recipients[EmailTemplate::RECIPIENT_TYPE_TO] = Array ();
 		}
 	}
 
@@ -519,7 +519,7 @@
 			return;
 		}
 
-		$language_field = $this->emailEvent->GetDBField('Type') == EmailEvent::EVENT_TYPE_FRONTEND ? 'FrontLanguage' : 'AdminLanguage';
+		$language_field = $this->emailTemplate->GetDBField('Type') == EmailTemplate::TEMPLATE_TYPE_FRONTEND ? 'FrontLanguage' : 'AdminLanguage';
 
 		$sql = 'SELECT FirstName, LastName, Email, ' . $language_field . ' AS Language
 				FROM ' . TABLE_PREFIX . 'Users
@@ -531,7 +531,7 @@
 		}
 
 		$add_recipient = Array (
-			'RecipientAddressType' => EmailEvent::ADDRESS_TYPE_EMAIL,
+			'RecipientAddressType' => EmailTemplate::ADDRESS_TYPE_EMAIL,
 			'RecipientAddress' => $user_info['Email'],
 			'RecipientName' => trim($user_info['FirstName'] . ' ' . $user_info['LastName']),
 		);
@@ -540,7 +540,7 @@
 			$this->params['language_id'] = $user_info['Language'];
 		}
 
-		array_unshift($this->recipients[EmailEvent::RECIPIENT_TYPE_TO], $add_recipient);
+		array_unshift($this->recipients[EmailTemplate::RECIPIENT_TYPE_TO], $add_recipient);
 
 		$user = $this->Application->recallObject('u.email-to', null, Array('skip_autoload' => true));
 		/* @var $user UsersItem */
@@ -560,7 +560,7 @@
 
 		if ( isset($this->params['to_email']) && $this->params['to_email'] ) {
 			$add_recipient['RecipientName'] = '';
-			$add_recipient['RecipientAddressType'] = EmailEvent::ADDRESS_TYPE_EMAIL;
+			$add_recipient['RecipientAddressType'] = EmailTemplate::ADDRESS_TYPE_EMAIL;
 			$add_recipient['RecipientAddress'] = $this->params['to_email'];
 		}
 
@@ -569,7 +569,7 @@
 		}
 
 		if ( $add_recipient ) {
-			array_unshift($this->recipients[EmailEvent::RECIPIENT_TYPE_TO], $add_recipient);
+			array_unshift($this->recipients[EmailTemplate::RECIPIENT_TYPE_TO], $add_recipient);
 		}
 	}
 
@@ -586,11 +586,11 @@
 		if ( !$this->_addRecipientsFromXml($xml) ) {
 			$recipient = Array (
 				'RecipientName' => $this->Application->ConfigValue('DefaultEmailSender'),
-				'RecipientAddressType' => EmailEvent::ADDRESS_TYPE_EMAIL,
+				'RecipientAddressType' => EmailTemplate::ADDRESS_TYPE_EMAIL,
 				'RecipientAddress' => $this->Application->ConfigValue('DefaultEmailSender'),
 			);
 
-			array_unshift($this->recipients[EmailEvent::RECIPIENT_TYPE_TO], $recipient);
+			array_unshift($this->recipients[EmailTemplate::RECIPIENT_TYPE_TO], $recipient);
 		}
 	}
 
@@ -615,11 +615,11 @@
 			$recipient_name = $recipient['RecipientName'];
 
 			switch ($address_type) {
-				case EmailEvent::ADDRESS_TYPE_EMAIL:
+				case EmailTemplate::ADDRESS_TYPE_EMAIL:
 					$pairs[] = Array ('email' => $address, 'name' => $recipient_name);
 					break;
 
-				case EmailEvent::ADDRESS_TYPE_USER:
+				case EmailTemplate::ADDRESS_TYPE_USER:
 					$sql = 'SELECT FirstName, LastName, Email
 							FROM ' . TABLE_PREFIX . 'Users
 							WHERE Username = ' . $this->Conn->qstr($address);
@@ -636,7 +636,7 @@
 					}
 					break;
 
-				case EmailEvent::ADDRESS_TYPE_GROUP:
+				case EmailTemplate::ADDRESS_TYPE_GROUP:
 					$sql = 'SELECT u.FirstName, u.LastName, u.Email
 							FROM ' . TABLE_PREFIX . 'UserGroups g
 							JOIN ' . TABLE_PREFIX . 'UserGroupRelations ug ON ug.GroupId = g.GroupId
@@ -698,8 +698,8 @@
 	 */
 	protected function _getHeaders()
 	{
-		$headers = $this->emailEvent->GetDBField('Headers');
-		$headers = 'Subject: ' . $this->emailEvent->GetField('Subject') . ($headers ? "\n" . $headers : '');
+		$headers = $this->emailTemplate->GetDBField('Headers');
+		$headers = 'Subject: ' . $this->emailTemplate->GetField('Subject') . ($headers ? "\n" . $headers : '');
 		$headers = explode("\n", $this->_parseText($headers));
 
 		$ret = Array ();
@@ -710,9 +710,9 @@
 		}
 
 		if ( $this->Application->isDebugMode() ) {
-			// set special header with event name, so it will be easier to determine what's actually was received
-			$event_type = $this->emailEvent->GetDBField('Type') == EmailEvent::EVENT_TYPE_ADMIN ? 'ADMIN' : 'USER';
-			$ret['X-Event-Name'] = $this->emailEvent->GetDBField('Event') . ' - ' . $event_type;
+			// set special header with template name, so it will be easier to determine what's actually was received
+			$template_type = $this->emailTemplate->GetDBField('Type') == EmailTemplate::TEMPLATE_TYPE_ADMIN ? 'ADMIN' : 'USER';
+			$ret['X-Template-Name'] = $this->emailTemplate->GetDBField('TemplateName') . ' - ' . $template_type;
 		}
 
 		return $ret;
@@ -757,11 +757,11 @@
 	 */
 	protected function _getMessageBody($is_html = false)
 	{
-		$message_body = $this->emailEvent->GetField($is_html ? 'HtmlBody' : 'PlainTextBody');
+		$message_body = $this->emailTemplate->GetField($is_html ? 'HtmlBody' : 'PlainTextBody');
 
 		if ( !trim($message_body) && !$is_html ) {
 			// no plain text part available -> make it from html part then
-			$message_body = $this->sender->ConvertToText($this->emailEvent->GetField('HtmlBody'), true);
+			$message_body = $this->sender->ConvertToText($this->emailTemplate->GetField('HtmlBody'), true);
 		}
 
 		if ( !trim($message_body) ) {
@@ -824,7 +824,7 @@
 			'<inp:touser _Field' => '<inp2:u_Field name',
 		);
 
-		$replacement_tags = $this->emailEvent->GetDBField('ReplacementTags');
+		$replacement_tags = $this->emailTemplate->GetDBField('ReplacementTags');
 		$replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array ();
 		$replacement_tags = array_merge($default_replacement_tags, $replacement_tags);
 
Index: core/kernel/utility/logger.php
===================================================================
--- core/kernel/utility/logger.php	(revision 15569)
+++ core/kernel/utility/logger.php	(working copy)
@@ -843,7 +843,7 @@
 		// initialize list outside of e-mail event with right settings
 		$this->Application->recallObject('system-log.email', 'system-log_List', Array ('unique_id' => $unique_id));
 
-		$this->Application->EmailEventAdmin('SYSTEM.LOG.NOTIFY', null, $send_params);
+		$this->Application->emailAdmin('SYSTEM.LOG.NOTIFY', null, $send_params);
 		$this->Application->removeObject('system-log.email');
 	}
 
Index: core/units/categories/categories_event_handler.php
===================================================================
--- core/units/categories/categories_event_handler.php	(revision 15588)
+++ core/units/categories/categories_event_handler.php	(working copy)
@@ -876,7 +876,7 @@
 					if ( $new_status != $old_statuses[$category_id] && in_array($new_status, $process_statuses) ) {
 						$object->Load($category_id);
 						$email_event = $new_status == STATUS_ACTIVE ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY';
-						$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
+						$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'));
 					}
 				}
 			}
@@ -1450,8 +1450,8 @@
 			$perm_prefix = $this->Application->getUnitOption($event->Prefix, 'PermItemPrefix');
 
 			$event_suffix = $is_active ? 'ADD' : 'ADD.PENDING';
-			$this->Application->EmailEventAdmin($perm_prefix . '.' . $event_suffix);
-			$this->Application->EmailEventUser($perm_prefix . '.' . $event_suffix, $object->GetDBField('CreatedById'));
+			$this->Application->emailAdmin($perm_prefix . '.' . $event_suffix);
+			$this->Application->emailUser($perm_prefix . '.' . $event_suffix, $object->GetDBField('CreatedById'));
 		}
 
 		/**
@@ -1545,7 +1545,7 @@
 						$event->status = kEvent::erSUCCESS;
 
 						$email_event = $event->Name == 'OnMassApprove' ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY';
-						$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
+						$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'));
 					}
 					else {
 						$event->status = kEvent::erFAIL;
Index: core/units/configuration/configuration_event_handler.php
===================================================================
--- core/units/configuration/configuration_event_handler.php	(revision 15601)
+++ core/units/configuration/configuration_event_handler.php	(working copy)
@@ -175,7 +175,7 @@
 				}
 			}
 			elseif ( $variable_name == 'DefaultEmailRecipients' ) {
-				$email_event_data = $this->Application->GetVar('emailevents_' . $event->Prefix);
+				$email_event_data = $this->Application->GetVar('email-template_' . $event->Prefix);
 				$object->SetDBField('VariableValue', $email_event_data[0]['Recipients']);
 			}
 
Index: core/units/email_events/email_event_tp.php
===================================================================
--- core/units/email_events/email_event_tp.php	(revision 15437)
+++ core/units/email_events/email_event_tp.php	(working copy)
@@ -1,101 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.org/license for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	class EmailEventTagProcessor extends kDBTagProcessor
-	{
-		/**
-		 * Removes "Enabled" column, when not in debug mode
-		 *
-		 * @param Array $params
-		 */
-		function ModifyUnitConfig($params)
-		{
-			if ( !$this->Application->isDebugMode() ) {
-				$grids = $this->Application->getUnitOption($this->Prefix, 'Grids', Array ());
-				/* @var $grids Array */
-
-				foreach ($grids as $grid_name => $grid_data) {
-					if ( array_key_exists('Enabled', $grid_data['Fields']) ) {
-						unset($grids[$grid_name]['Fields']['Enabled']);
-					}
-				}
-
-				$this->Application->setUnitOption($this->Prefix, 'Grids', $grids);
-			}
-		}
-
-		/**
-		 * Checks, that field can be edited
-		 *
-		 * @param Array $params
-		 * @return string
-		 */
-		function IsEditable($params)
-		{
-			if ($this->Application->isDebugMode()) {
-				return true;
-			}
-
-			$object = $this->getObject($params);
-			/* @var $object kDBItem */
-
-			return $object->GetDBField($params['check_field']);
-		}
-
-		/**
-		 * To recipient read-only
-		 *
-		 * @param Array $params
-		 * @return string
-		 * @access protected
-		 */
-		protected function ToRecipientReadOnly($params)
-		{
-			return !$this->IsEditable(Array ('check_field' => 'AllowChangingRecipient'));
-		}
-
-		/**
-		 * Removes "To" options from possible options in "RecipientType" field
-		 *
-		 * @param Array $params
-		 */
-		function RemoveToRecipientType($params)
-		{
-			$object = $this->getObject($params);
-			/* @var $object kDBItem */
-
-			$field_options = $object->GetFieldOptions('RecipientType');
-			unset($field_options['options'][ EmailEvent::RECIPIENT_TYPE_TO ]);
-			$object->SetFieldOptions('RecipientType', $field_options);
-		}
-
-		/**
-		 * Restores "To" option in possible option list in "RecipientType" field
-		 *
-		 * @param Array $params
-		 */
-		function RestoreRecipientType($params)
-		{
-			$object = $this->getObject($params);
-			/* @var $object kDBItem */
-
-			$field_options = $object->GetFieldOptions('RecipientType');
-			$virtual_fields = $this->Application->getUnitOption($this->Prefix, 'VirtualFields');
-			$field_options['options'] = $virtual_fields['RecipientType']['options'];
-			$object->SetFieldOptions('RecipientType', $field_options);
-		}
-
-	}
\ No newline at end of file
Index: core/units/email_events/email_events_config.php
===================================================================
--- core/units/email_events/email_events_config.php	(revision 15542)
+++ core/units/email_events/email_events_config.php	(working copy)
@@ -1,266 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.org/license for copyright notices and details.
-*/
-
-defined('FULL_PATH') or die('restricted access!');
-
-	$config = Array (
-		'Prefix' => 'emailevents',
-		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
-		'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-		'EventHandlerClass' => Array ('class' => 'EmailEventsEventsHandler', 'file' => 'email_events_event_handler.php', 'build_event' => 'OnBuild'),
-		'TagProcessorClass' => Array ('class' => 'EmailEventTagProcessor', 'file' => 'email_event_tp.php', 'build_event' => 'OnBuild'),
-
-		'AutoLoad' => true,
-
-		'QueryString' => Array (
-			1 => 'id',
-			2 => 'Page',
-			3 => 'PerPage',
-			4 => 'event',
-			5 => 'mode',
-		),
-
-		'IDField' => 'EventId',
-		'StatusField' => Array ('Enabled'),
-		'TitleField' => 'Event',
-
-		'TitlePresets' => Array (
-			'default' => Array (
-				'new_status_labels' => Array ('emailevents' => '!la_title_Adding_E-mail!'),
-				'edit_status_labels' => Array ('emailevents' => '!la_title_EditingEmailEvent!' /*'!la_title_Editing_E-mail!'*/),
-				'new_titlefield' => Array ('emailevents' => '!la_title_NewEmailEvent!'),
-			),
-
-			// for separate grid with email editing
-			'email_message_list' => Array (
-				'prefixes' => Array ('emailevents_List'), 'format' => "!la_title_EmailMessages!",
-				'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'frontend_mail', 'export', 'process', 'view', 'dbl-click'),
-			),
-
-			'email_message_edit' => Array (
-				'prefixes' => Array ('emailevents'),
-				'format' => '#emailevents_status# - #emailevents_titlefield# - !la_section_General!',
-				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
-			),
-
-			'email_message_edit_settings' => Array (
-				'prefixes' => Array ('emailevents'),
-				'format' => '#emailevents_status# - #emailevents_titlefield# - !la_section_Settings!',
-				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
-			),
-
-			// for mass mailing
-			'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!'),
-		),
-
-		'EditTabPresets' => Array (
-			'Default' => Array (
-				'general' => Array ('title' => 'la_tab_General', 't' => 'languages/email_message_edit', 'priority' => 1),
-				'settings' => Array ('title' => 'la_tab_Settings', 't' => 'languages/email_message_settings', 'priority' => 2),
-			),
-		),
-
-		'PermSection' => Array ('main' => 'in-portal:configemail'),
-
-		'Sections' => Array (
-			'in-portal:configemail'	=>	Array (
-				'parent'		=>	'in-portal:site',
-				'icon'			=>	'email_templates',
-				'label'			=>	'la_tab_E-mails',
-				'url'			=>	Array ('t' => 'languages/email_message_list', 'pass' => 'm'),
-				'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
-				'priority'		=>	5,
-				'type'			=>	stTREE,
-			),
-		),
-
-		'TableName' => TABLE_PREFIX . 'EmailEvents',
-
-		'ListSQLs' => Array (
-			'' => '	SELECT %1$s.* %2$s FROM %1$s',
-		),
-
-		'ListSortings' => Array (
-			'' => Array (
-				'ForcedSorting' => Array ('Enabled' => 'desc'),
-				'Sorting' => Array ('Event' => 'asc'),
-			),
-			'module' => Array (
-				'ForcedSorting' => Array ('Enabled' => 'desc'),
-				'Sorting' => Array ('Description' => 'asc')
-			),
-		),
-
-		'Fields' => Array (
-			'EventId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-            'Event' => Array ('type' => 'string', 'not_null' => 1, 'unique' => Array ('Type'), 'required' => 1, 'default' => ''),
-			'Headers' => Array ('type' => 'string', 'default' => NULL),
-            'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),
-
-			'AllowChangingSender' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter',
-				'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-				'not_null' => 1, 'default' => 0
-			),
-			'CustomSender' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_opt_DefaultAddress', 1 => 'la_opt_CustomSender'), 'use_phrases' => 1,
-				'not_null' => 1, 'default' => 0
-			),
-			'SenderName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-			'SenderAddressType' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Email', 2 => 'la_opt_User'), 'use_phrases' => 1,
-				'not_null' => 1, 'error_field' => 'SenderAddress', 'default' => 0
-			),
-			'SenderAddress' => Array (
-				'type' => 'string', 'max_len' => 255,
-				'error_msgs' => Array (
-					'invalid_email' => '!la_err_invalid_format!',
-					'invalid_user' => '!la_error_UserNotFound!',
-				),
-				'not_null' => 1, 'default' => ''
-			),
-			'AllowChangingRecipient' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-				'not_null' => 1, 'default' => 0
-			),
-			'CustomRecipient' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_opt_DefaultAddress', 1 => 'la_opt_CustomRecipients'), 'use_phrases' => 1,
-				'not_null' => 1, 'default' => 0
-			),
-			'Recipients' => Array ('type' => 'string', 'default' => NULL),
-
-            'Subject' => Array (
-				'type' => 'string',
-				'formatter' => 'kMultiLanguage', 'db_type' => 'text',
-				'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
-				'required' => 1, 'default' => null
-			),
-
-			'HtmlBody' => Array (
-				'type' => 'string',
-				'formatter' => 'kMultiLanguage', 'db_type' => 'longtext',
-				'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
-				'default' => null
-			),
-
-			'PlainTextBody' => Array (
-				'type' => 'string',
-				'formatter' => 'kMultiLanguage', 'db_type' => 'longtext',
-				'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
-				'default' => null
-			),
-
-            'Enabled' => Array (
-            	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-            	'not_null' => 1, 'default' => 1
-            ),
-
-            'FrontEndOnly' => Array (
-            	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-            	'not_null' => 1, 'default' => 0
-            ),
-
-            'Module' => Array (
-            	'type' => 'string',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (),
-            	'not_null' => 1, 'required' => 1, 'default' => 'Core'
-            ),
-
-            'Description' => Array ('type' => 'string', 'default' => NULL),
-
-            'Type' => Array (
-            	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1,
-            	'not_null' => 1, 'unique' => Array ('Event'), 'required' => 1, 'default' => 0
-            ),
-			'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
-			'BindToSystemEvent' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-    	),
-
-		'VirtualFields' => Array (
-			'RecipientType' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'To', 2 => 'Cc', 3 => 'Bcc'),
-				'default' => 1
-			),
-			'RecipientName' => Array ('type' => 'string', 'max_len' => 255, 'default' => ''),
-			'RecipientAddressType' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Email', 2 => 'la_opt_User', 3 => 'la_opt_Group'), 'use_phrases' => 1,
-				'error_field' => 'RecipientAddress', 'default' => 0
-			),
-			'RecipientAddress' => Array (
-				'type' => 'string', 'max_len' => 255,
-				'error_msgs' => Array (
-					'invalid_email' => '!la_err_invalid_format!',
-					'invalid_user' => '!la_error_UserNotFound!',
-					'invalid_group' => '!la_error_GroupNotFound!',
-				),
-				'default' => ''
-			),
-
-			'Tag' => Array ('type' => 'string', 'default' => ''),
-			'Replacement' => Array ('type' => 'string', 'default' => ''),
-			'ReplacementTagsXML' => Array ('type' => 'string', 'default' => ''),
-		),
-
-		'Grids'	=> Array (
-			// used on "Email Events" tab in language editing in "Regional" section
-			'Default' => Array (
-				'Icons' => Array (
-					'default' => 'icon16_item.png',
-					0 => 'icon16_disabled.png',
-					1 => 'icon16_item.png',
-				),
-				'Fields' => Array (
-					'EventId' 		=>	Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-					'Description'	=>	Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Event'			=>	Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Module'		=>	Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, ),
-					'Type'			=>	Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
-					'Enabled'		=>	Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
-					'LastChanged'	=>	Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
-				),
-			),
-
-			// used on "Email Templates" section
-			'Emails' => Array (
-				'Icons' => Array (
-					'default' => 'icon16_item.png',
-					0 => 'icon16_disabled.png',
-					1 => 'icon16_item.png',
-				),
-				'Fields' => Array (
-					'EventId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-					'Event' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Subject' => Array ('filter_block' => 'grid_like_filter', 'no_special' => 0, 'width' => 300, ),
-					'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 60, ),
-					'Enabled' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
-					'Module' => Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, ),
-					'FrontEndOnly' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, 'hidden' => 1),
-					'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
-				),
-			),
-		),
-	);
\ No newline at end of file
Index: core/units/email_events/email_events_event_handler.php
===================================================================
--- core/units/email_events/email_events_event_handler.php	(revision 15601)
+++ core/units/email_events/email_events_event_handler.php	(working copy)
@@ -1,756 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.org/license for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	class EmailEventsEventsHandler extends kDBEventHandler
-	{
-		/**
-		 * Allows to override standard permission mapping
-		 *
-		 * @return void
-		 * @access protected
-		 * @see kEventHandler::$permMapping
-		 */
-		protected function mapPermissions()
-		{
-			parent::mapPermissions();
-
-			$permissions = Array (
-				'OnFrontOnly' => Array ('self' => 'edit'),
-				'OnSaveSelected' => Array ('self' => 'view'),
-				'OnProcessEmailQueue' => Array ('self' => 'add|edit'),
-				'OnExportEmailEvents' => Array ('self' => 'view'),
-
-				'OnSuggestAddress' => Array ('self' => 'add|edit'),
-
-				// events only for developers
-				'OnPreCreate' => Array ('self' => 'debug'),
-				'OnDelete' => Array ('self' => 'debug'),
-				'OnDeleteAll' => Array ('self' => 'debug'),
-				'OnMassDelete' => Array ('self' => 'debug'),
-				'OnMassApprove' => Array ('self' => 'debug'),
-				'OnMassDecline' => Array ('self' => 'debug'),
-				'OnSend' => Array ('self' => 'debug'),
-			);
-
-			$this->permMapping = array_merge($this->permMapping, $permissions);
-		}
-
-		/**
-		 * Changes permission section to one from REQUEST, not from config
-		 *
-		 * @param kEvent $event
-		 * @return bool
-		 * @access public
-		 */
-		public function CheckPermission(kEvent $event)
-		{
-			$module = $this->Application->GetVar('module');
-
-			if ( strlen($module) > 0 ) {
-				// checking permission when lising module email events in separate section
-				$module = explode(':', $module, 2);
-
-				if ( count($module) == 1 ) {
-					$main_prefix = $this->Application->findModule('Name', $module[0], 'Var');
-				}
-				else {
-					$exceptions = Array ('Category' => 'c', 'Users' => 'u');
-					$main_prefix = $exceptions[$module[1]];
-				}
-				$section = $this->Application->getUnitOption($main_prefix . '.email', 'PermSection');
-
-				$event->setEventParam('PermSection', $section);
-			}
-
-			// checking permission when listing all email events when editing language
-			return parent::CheckPermission($event);
-		}
-
-		/**
-		 * Apply any custom changes to list's sql query
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 * @see kDBEventHandler::OnListBuild()
-		 */
-		protected function SetCustomQuery(kEvent $event)
-		{
-			parent::SetCustomQuery($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBList */
-
-			if ( $event->Special == 'module' ) {
-				$module = $this->Application->GetVar('module');
-				$object->addFilter('module_filter', '%1$s.Module = ' . $this->Conn->qstr($module));
-			}
-			else {
-				$object->addFilter('module_filter', '%1$s.Module IN (SELECT Name FROM ' . TABLE_PREFIX . 'Modules WHERE Loaded = 1)');
-			}
-
-			if ( !$event->Special && !$this->Application->isDebugMode() ) {
-				// no special
-				$object->addFilter('enabled_filter', '%1$s.Enabled <> ' . STATUS_DISABLED);
-			}
-		}
-
-		/**
-		 * Prepares new kDBItem object
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnNew(kEvent $event)
-		{
-			parent::OnNew($event);
-
-			$mapping = Array ('conf' => 'VariableValue', 'site-domain' => 'DefaultEmailRecipients');
-
-			if ( isset($mapping[$event->Special]) ) {
-				$object = $event->getObject();
-				/* @var $object kDBItem */
-
-				$target_object = $this->Application->recallObject($event->Special);
-				/* @var $target_object kDBList */
-
-				$object->SetDBField('Recipients', $target_object->GetDBField($mapping[$event->Special]));
-			}
-		}
-
-		/**
-		 * Set default headers
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnPreCreate(kEvent $event)
-		{
-			parent::OnPreCreate($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			$object->SetDBField('Headers', $this->Application->ConfigValue('Smtp_DefaultHeaders'));
-			$this->setRequired($event);
-		}
-
-		/**
-		 * Sets status Front-End Only to selected email events
-		 *
-		 * @param kEvent $event
-		 */
-		function OnFrontOnly($event)
-		{
-			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
-				$event->status = kEvent::erFAIL;
-				return;
-			}
-
-			$ids = implode(',', $this->StoreSelectedIDs($event));
-
-			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
-			$sql = 'UPDATE ' . $table_name . '
-					SET FrontEndOnly = 1
-					WHERE EventId IN (' . $ids . ')';
-			$this->Conn->Query($sql);
-
-			$this->clearSelectedIDs($event);
-		}
-
-		/**
-		 * Sets selected user to email events selected
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnSelectUser(kEvent $event)
-		{
-			if ( $event->Special != 'module' ) {
-				parent::OnSelectUser($event);
-				return;
-			}
-
-			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
-				$event->status = kEvent::erFAIL;
-				return;
-			}
-
-			$items_info = $this->Application->GetVar('u');
-			if ( $items_info ) {
-				list ($user_id, ) = each($items_info);
-
-				$ids = $this->Application->RecallVar($event->getPrefixSpecial() . '_selected_ids');
-				$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-				$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
-
-				$sql = 'UPDATE ' . $table_name . '
-						SET ' . $this->Application->RecallVar('dst_field') . ' = ' . $user_id . '
-						WHERE ' . $id_field . ' IN (' . $ids . ')';
-				$this->Conn->Query($sql);
-			}
-
-			$this->finalizePopup($event);
-		}
-
-		/**
-		 * Saves selected ids to session
-		 *
-		 * @param kEvent $event
-		 */
-		function OnSaveSelected($event)
-		{
-			$this->StoreSelectedIDs($event);
-		}
-
-		/**
-		 * Process emails from queue
-		 *
-		 * @param kEvent $event
-		 * @todo Move to MailingList
-		 */
-		function OnProcessEmailQueue($event)
-		{
-			$deliver_count = $event->getEventParam('deliver_count');
-			if ( $deliver_count === false ) {
-				$deliver_count = $this->Application->ConfigValue('MailingListSendPerStep');
-				if ( $deliver_count === false ) {
-					$deliver_count = 10; // 10 emails per script run (if not specified directly)
-				}
-			}
-
-			$processing_type = $this->Application->GetVar('type');
-			if ( $processing_type = 'return_progress' ) {
-				$email_queue_progress = $this->Application->RecallVar('email_queue_progress');
-				if ( $email_queue_progress === false ) {
-					$emails_sent = 0;
-					$sql = 'SELECT COUNT(*)
-							FROM ' . TABLE_PREFIX . 'EmailQueue
-							WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')';
-					$total_emails = $this->Conn->GetOne($sql);
-					$this->Application->StoreVar('email_queue_progress', $emails_sent . ':' . $total_emails);
-				}
-				else {
-					list ($emails_sent, $total_emails) = explode(':', $email_queue_progress);
-				}
-			}
-
-			$sql = 'SELECT *
-					FROM ' . TABLE_PREFIX . 'EmailQueue
-					WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')
-					LIMIT 0,' . $deliver_count;
-			$messages = $this->Conn->Query($sql);
-
-			$message_count = count($messages);
-			if ( !$message_count ) {
-				// no messages left to send in queue
-				if ( $processing_type = 'return_progress' ) {
-					$this->Application->RemoveVar('email_queue_progress');
-					$this->Application->Redirect($this->Application->GetVar('finish_template'));
-				}
-				return;
-			}
-
-			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-			/* @var $mailing_list_helper MailingListHelper */
-
-			$mailing_list_helper->processQueue($messages);
-
-			if ( $processing_type = 'return_progress' ) {
-				$emails_sent += $message_count;
-				if ( $emails_sent >= $total_emails ) {
-					$this->Application->RemoveVar('email_queue_progress');
-					$this->Application->Redirect($this->Application->GetVar('finish_template'));
-				}
-
-				$this->Application->StoreVar('email_queue_progress', $emails_sent . ':' . $total_emails);
-				$event->status = kEvent::erSTOP;
-				echo ($emails_sent / $total_emails) * 100;
-			}
-		}
-
-		/**
-		 * Prefills module dropdown
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnAfterConfigRead(kEvent $event)
-		{
-			parent::OnAfterConfigRead($event);
-
-			$options = Array ();
-
-			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
-				if ( $module_name == 'In-Portal' ) {
-					continue;
-				}
-
-				$options[$module_name] = $module_name;
-			}
-
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
-			$fields['Module']['options'] = $options;
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
-
-			if ( $this->Application->GetVar('regional') ) {
-				$this->Application->setUnitOption($event->Prefix, 'PopulateMlFields', true);
-			}
-		}
-
-		/**
-		 * Prepare temp tables and populate it
-		 * with items selected in the grid
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnEdit(kEvent $event)
-		{
-			parent::OnEdit($event);
-
-			// use language from grid, instead of primary language used by default
-			$event->SetRedirectParam('m_lang', $this->Application->GetVar('m_lang'));
-		}
-
-		/**
-		 * Fixes default recipient type
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnAfterItemLoad(kEvent $event)
-		{
-			parent::OnAfterItemLoad($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			if ( !$this->Application->isDebugMode(false) ) {
-				if ( $object->GetDBField('AllowChangingRecipient') ) {
-					$object->SetDBField('RecipientType', EmailEvent::RECIPIENT_TYPE_TO);
-				}
-				else {
-					$object->SetDBField('RecipientType', EmailEvent::RECIPIENT_TYPE_CC);
-				}
-			}
-
-			// process replacement tags
-			$records = Array ();
-			$replacement_tags = $object->GetDBField('ReplacementTags');
-			$replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array ();
-
-			foreach ($replacement_tags as $tag => $replacement) {
-				$records[] = Array ('Tag' => $tag, 'Replacement' => $replacement);
-			}
-
-			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
-
-			$xml = $minput_helper->prepareMInputXML($records, Array ('Tag', 'Replacement'));
-			$object->SetDBField('ReplacementTagsXML', $xml);
-
-			$this->setRequired($event);
-		}
-
-		/**
-		 * Performs custom validation + keep read-only fields
-		 *
-		 * @param kEvent $event
-		 */
-		function _itemChanged($event)
-		{
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			if ( !$this->Application->isDebugMode(false) ) {
-				// only allow to enable/disable event while in debug mode
-				$to_restore = Array ('Enabled', 'AllowChangingSender', 'AllowChangingRecipient');
-
-				if ( !$object->GetOriginalField('AllowChangingSender') ) {
-					$to_restore = array_merge($to_restore, Array ('CustomSender', 'SenderName', 'SenderAddressType', 'SenderAddress'));
-				}
-
-				if ( !$object->GetOriginalField('AllowChangingRecipient') ) {
-					$to_restore = array_merge($to_restore, Array ('CustomRecipient' /*, 'Recipients'*/));
-				}
-
-				// prevent specific fields from editing
-				foreach ($to_restore as $restore_field) {
-					$original_value = $object->GetOriginalField($restore_field);
-
-					if ( $object->GetDBField($restore_field) != $original_value ) {
-						$object->SetDBField($restore_field, $original_value);
-					}
-				}
-			}
-
-			// process replacement tags
-			if ( $object->GetDBField('ReplacementTagsXML') ) {
-				$minput_helper = $this->Application->recallObject('MInputHelper');
-				/* @var $minput_helper MInputHelper */
-
-				$replacement_tags = Array ();
-				$records = $minput_helper->parseMInputXML($object->GetDBField('ReplacementTagsXML'));
-
-				foreach ($records as $record) {
-					$replacement_tags[trim($record['Tag'])] = trim($record['Replacement']);
-				}
-
-				$object->SetDBField('ReplacementTags', $replacement_tags ? serialize($replacement_tags) : NULL);
-			}
-
-			if ( $this->translationChanged($object) ) {
-				$object->SetDBField('LastChanged_date', TIMENOW);
-				$object->SetDBField('LastChanged_time', TIMENOW);
-			}
-
-			$this->setRequired($event);
-		}
-
-		/**
-		 * Dynamically changes required fields
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function setRequired(kEvent $event)
-		{
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			$language_prefix = 'l' . $this->Application->GetVar('m_lang') . '_';
-
-			$object->setRequired($language_prefix . 'HtmlBody', !$object->GetField('PlainTextBody'));
-			$object->setRequired($language_prefix . 'PlainTextBody', !$object->GetField('HtmlBody'));
-		}
-
-		/**
-		 * Checks, that at least one of phrase's translations was changed
-		 *
-		 * @param kDBItem $object
-		 * @return bool
-		 */
-		function translationChanged($object)
-		{
-			$changed_fields = array_keys($object->GetChangedFields());
-			$translation_fields = Array ('Subject', 'HtmlBody', 'PlainTextBody');
-
-			foreach ($changed_fields as $changed_field) {
-				$changed_field = preg_replace('/^l[\d]+_/', '', $changed_field);
-
-				if ( in_array($changed_field, $translation_fields) ) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * Don't allow to enable/disable events in non-debug mode
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnBeforeItemCreate(kEvent $event)
-		{
-			parent::OnBeforeItemCreate($event);
-
-			$this->_itemChanged($event);
-		}
-
-		/**
-		 * Don't allow to enable/disable events in non-debug mode
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnBeforeItemUpdate(kEvent $event)
-		{
-			parent::OnBeforeItemUpdate($event);
-
-			$this->_itemChanged($event);
-		}
-
-		/**
-		 * Suggest address based on typed address and selected address type
-		 *
-		 * @param kEvent $event
-		 */
-		function OnSuggestAddress($event)
-		{
-			$event->status = kEvent::erSTOP;
-
-			$address_type = $this->Application->GetVar('type');
-			$address = $this->Application->GetVar('value');
-			$limit = $this->Application->GetVar('limit');
-
-			if ( !$limit ) {
-				$limit = 20;
-			}
-
-			switch ($address_type) {
-				case EmailEvent::ADDRESS_TYPE_EMAIL:
-					$field = 'Email';
-					$table_name = TABLE_PREFIX . 'Users';
-					break;
-
-				case EmailEvent::ADDRESS_TYPE_USER:
-					$field = 'Username';
-					$table_name = TABLE_PREFIX . 'Users';
-					break;
-
-				case EmailEvent::ADDRESS_TYPE_GROUP:
-					$field = 'Name';
-					$table_name = TABLE_PREFIX . 'UserGroups';
-					break;
-
-				default:
-					$field = $table_name = '';
-					break;
-			}
-
-			if ( $field ) {
-				$sql = 'SELECT DISTINCT ' . $field . '
-						FROM ' . $table_name . '
-						WHERE ' . $field . ' LIKE ' . $this->Conn->qstr($address . '%') . '
-						ORDER BY ' . $field . ' ASC
-						LIMIT 0,' . $limit;
-				$data = $this->Conn->GetCol($sql);
-			}
-			else {
-				$data = Array ();
-			}
-
-			$this->Application->XMLHeader();
-
-			echo '<suggestions>';
-
-			foreach ($data as $item) {
-				echo '<item>' . htmlspecialchars($item, null, CHARSET) . '</item>';
-			}
-
-			echo '</suggestions>';
-		}
-
-		/**
-		 * Does custom validation
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnBeforeItemValidate(kEvent $event)
-		{
-			parent::OnBeforeItemValidate($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			// validate email subject and body for parsing errors
-			$this->_validateEmailTemplate($object);
-
-			// validate sender and recipient addresses
-			if ( $object->GetDBField('CustomSender') ) {
-				$this->_validateAddress($event, 'Sender');
-			}
-
-			$this->_validateAddress($event, 'Recipient');
-			$this->_validateBindEvent($object);
-		}
-
-		/**
-		 * Validates subject and body fields of Email template
-		 *
-		 * @param kDBItem $object
-		 * @return void
-		 * @access protected
-		 */
-		protected function _validateEmailTemplate($object)
-		{
-			$email_message_helper = $this->Application->recallObject('kEmailMessageHelper');
-			/* @var $email_message_helper kEmailMessageHelper */
-
-			$email_message_helper->parseField($object, 'Subject');
-			$email_message_helper->parseField($object, 'HtmlBody');
-			$email_message_helper->parseField($object, 'PlainTextBody');
-		}
-
-		/**
-		 * Validates address using given field prefix
-		 *
-		 * @param kEvent $event
-		 * @param string $field_prefix
-		 * @return void
-		 * @access protected
-		 */
-		protected function _validateAddress($event, $field_prefix)
-		{
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			$address_type = $object->GetDBField($field_prefix . 'AddressType');
-			$object->setRequired($field_prefix . 'Address', $address_type > 0);
-			$address = $object->GetDBField($field_prefix . 'Address');
-
-			if ( !$address ) {
-				// don't validate against empty address
-				return;
-			}
-
-			switch ($address_type) {
-				case EmailEvent::ADDRESS_TYPE_EMAIL:
-					if ( !preg_match('/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', $address) ) {
-						$object->SetError($field_prefix . 'Address', 'invalid_email');
-					}
-					break;
-
-				case EmailEvent::ADDRESS_TYPE_USER:
-					$sql = 'SELECT PortalUserId
-							FROM ' . TABLE_PREFIX . 'Users
-							WHERE Username = ' . $this->Conn->qstr($address);
-					if ( !$this->Conn->GetOne($sql) ) {
-						$object->SetError($field_prefix . 'Address', 'invalid_user');
-					}
-					break;
-
-				case EmailEvent::ADDRESS_TYPE_GROUP:
-					$sql = 'SELECT GroupId
-							FROM ' . TABLE_PREFIX . 'UserGroups
-							WHERE Name = ' . $this->Conn->qstr($address);
-					if ( !$this->Conn->GetOne($sql) ) {
-						$object->SetError($field_prefix . 'Address', 'invalid_group');
-					}
-					break;
-			}
-		}
-
-		/**
-		 * Checks that bind event is specified in correct format and exists
-		 *
-		 * @param kDBItem $object
-		 */
-		protected function _validateBindEvent($object)
-		{
-			$event_string = $object->GetDBField('BindToSystemEvent');
-
-			if ( !$event_string ) {
-				return;
-			}
-
-			try {
-				$this->Application->eventImplemented(new kEvent($event_string));
-			}
-			catch (Exception $e) {
-				$object->SetError('BindToSystemEvent', 'invalid_event', '+' . $e->getMessage());
-			}
-		}
-
-		/**
-		 * Stores ids of selected phrases and redirects to export language step 1
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnExportEmailEvents(kEvent $event)
-		{
-			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
-				$event->status = kEvent::erFAIL;
-				return;
-			}
-
-			$this->Application->setUnitOption('phrases', 'AutoLoad', false);
-
-			$this->StoreSelectedIDs($event);
-			$this->Application->StoreVar('export_language_ids', $this->Application->GetVar('m_lang'));
-
-			$event->setRedirectParams(
-				Array (
-					'phrases.export_event' => 'OnNew',
-					'pass' => 'all,phrases.export',
-					'export_mode' => $event->Prefix,
-				)
-			);
-		}
-
-		/**
-		 * Deletes all subscribers to e-mail event after it was deleted
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnAfterItemDelete(kEvent $event)
-		{
-			parent::OnAfterItemDelete($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			$sql = 'SELECT SubscriptionId
-					FROM ' . TABLE_PREFIX . 'SystemEventSubscriptions
-					WHERE EmailEventId = ' . $object->GetID();
-			$ids = $this->Conn->GetCol($sql);
-
-			if ( !$ids ) {
-				return;
-			}
-
-			$temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
-
-			$temp_handler->DeleteItems('system-event-subscription', '', $ids);
-		}
-
-		/**
-		 * Sends selected e-mail event
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnSend(kEvent $event)
-		{
-			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
-
-			$ids = $this->StoreSelectedIDs($event);
-
-			foreach ($ids as $id) {
-				$object->Load($id);
-
-				if ( $object->GetDBField('Type') == EmailEvent::EVENT_TYPE_ADMIN ) {
-					$this->Application->EmailEventAdmin($object->GetDBField('Event'));
-				}
-				else {
-					$this->Application->EmailEventUser($object->GetDBField('Event'));
-				}
-			}
-
-			$this->clearSelectedIDs($event);
-		}
-	}
\ No newline at end of file
Index: core/units/email_templates/email_event_tp.php
===================================================================
--- core/units/email_templates/email_event_tp.php	(revision 15437)
+++ core/units/email_templates/email_event_tp.php	(working copy)
@@ -1,101 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.org/license for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	class EmailEventTagProcessor extends kDBTagProcessor
-	{
-		/**
-		 * Removes "Enabled" column, when not in debug mode
-		 *
-		 * @param Array $params
-		 */
-		function ModifyUnitConfig($params)
-		{
-			if ( !$this->Application->isDebugMode() ) {
-				$grids = $this->Application->getUnitOption($this->Prefix, 'Grids', Array ());
-				/* @var $grids Array */
-
-				foreach ($grids as $grid_name => $grid_data) {
-					if ( array_key_exists('Enabled', $grid_data['Fields']) ) {
-						unset($grids[$grid_name]['Fields']['Enabled']);
-					}
-				}
-
-				$this->Application->setUnitOption($this->Prefix, 'Grids', $grids);
-			}
-		}
-
-		/**
-		 * Checks, that field can be edited
-		 *
-		 * @param Array $params
-		 * @return string
-		 */
-		function IsEditable($params)
-		{
-			if ($this->Application->isDebugMode()) {
-				return true;
-			}
-
-			$object = $this->getObject($params);
-			/* @var $object kDBItem */
-
-			return $object->GetDBField($params['check_field']);
-		}
-
-		/**
-		 * To recipient read-only
-		 *
-		 * @param Array $params
-		 * @return string
-		 * @access protected
-		 */
-		protected function ToRecipientReadOnly($params)
-		{
-			return !$this->IsEditable(Array ('check_field' => 'AllowChangingRecipient'));
-		}
-
-		/**
-		 * Removes "To" options from possible options in "RecipientType" field
-		 *
-		 * @param Array $params
-		 */
-		function RemoveToRecipientType($params)
-		{
-			$object = $this->getObject($params);
-			/* @var $object kDBItem */
-
-			$field_options = $object->GetFieldOptions('RecipientType');
-			unset($field_options['options'][ EmailEvent::RECIPIENT_TYPE_TO ]);
-			$object->SetFieldOptions('RecipientType', $field_options);
-		}
-
-		/**
-		 * Restores "To" option in possible option list in "RecipientType" field
-		 *
-		 * @param Array $params
-		 */
-		function RestoreRecipientType($params)
-		{
-			$object = $this->getObject($params);
-			/* @var $object kDBItem */
-
-			$field_options = $object->GetFieldOptions('RecipientType');
-			$virtual_fields = $this->Application->getUnitOption($this->Prefix, 'VirtualFields');
-			$field_options['options'] = $virtual_fields['RecipientType']['options'];
-			$object->SetFieldOptions('RecipientType', $field_options);
-		}
-
-	}
\ No newline at end of file
Index: core/units/email_templates/email_events_config.php
===================================================================
--- core/units/email_templates/email_events_config.php	(revision 15542)
+++ core/units/email_templates/email_events_config.php	(working copy)
@@ -1,266 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.org/license for copyright notices and details.
-*/
-
-defined('FULL_PATH') or die('restricted access!');
-
-	$config = Array (
-		'Prefix' => 'emailevents',
-		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
-		'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-		'EventHandlerClass' => Array ('class' => 'EmailEventsEventsHandler', 'file' => 'email_events_event_handler.php', 'build_event' => 'OnBuild'),
-		'TagProcessorClass' => Array ('class' => 'EmailEventTagProcessor', 'file' => 'email_event_tp.php', 'build_event' => 'OnBuild'),
-
-		'AutoLoad' => true,
-
-		'QueryString' => Array (
-			1 => 'id',
-			2 => 'Page',
-			3 => 'PerPage',
-			4 => 'event',
-			5 => 'mode',
-		),
-
-		'IDField' => 'EventId',
-		'StatusField' => Array ('Enabled'),
-		'TitleField' => 'Event',
-
-		'TitlePresets' => Array (
-			'default' => Array (
-				'new_status_labels' => Array ('emailevents' => '!la_title_Adding_E-mail!'),
-				'edit_status_labels' => Array ('emailevents' => '!la_title_EditingEmailEvent!' /*'!la_title_Editing_E-mail!'*/),
-				'new_titlefield' => Array ('emailevents' => '!la_title_NewEmailEvent!'),
-			),
-
-			// for separate grid with email editing
-			'email_message_list' => Array (
-				'prefixes' => Array ('emailevents_List'), 'format' => "!la_title_EmailMessages!",
-				'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'frontend_mail', 'export', 'process', 'view', 'dbl-click'),
-			),
-
-			'email_message_edit' => Array (
-				'prefixes' => Array ('emailevents'),
-				'format' => '#emailevents_status# - #emailevents_titlefield# - !la_section_General!',
-				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
-			),
-
-			'email_message_edit_settings' => Array (
-				'prefixes' => Array ('emailevents'),
-				'format' => '#emailevents_status# - #emailevents_titlefield# - !la_section_Settings!',
-				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
-			),
-
-			// for mass mailing
-			'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!'),
-		),
-
-		'EditTabPresets' => Array (
-			'Default' => Array (
-				'general' => Array ('title' => 'la_tab_General', 't' => 'languages/email_message_edit', 'priority' => 1),
-				'settings' => Array ('title' => 'la_tab_Settings', 't' => 'languages/email_message_settings', 'priority' => 2),
-			),
-		),
-
-		'PermSection' => Array ('main' => 'in-portal:configemail'),
-
-		'Sections' => Array (
-			'in-portal:configemail'	=>	Array (
-				'parent'		=>	'in-portal:site',
-				'icon'			=>	'email_templates',
-				'label'			=>	'la_tab_E-mails',
-				'url'			=>	Array ('t' => 'languages/email_message_list', 'pass' => 'm'),
-				'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
-				'priority'		=>	5,
-				'type'			=>	stTREE,
-			),
-		),
-
-		'TableName' => TABLE_PREFIX . 'EmailEvents',
-
-		'ListSQLs' => Array (
-			'' => '	SELECT %1$s.* %2$s FROM %1$s',
-		),
-
-		'ListSortings' => Array (
-			'' => Array (
-				'ForcedSorting' => Array ('Enabled' => 'desc'),
-				'Sorting' => Array ('Event' => 'asc'),
-			),
-			'module' => Array (
-				'ForcedSorting' => Array ('Enabled' => 'desc'),
-				'Sorting' => Array ('Description' => 'asc')
-			),
-		),
-
-		'Fields' => Array (
-			'EventId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-            'Event' => Array ('type' => 'string', 'not_null' => 1, 'unique' => Array ('Type'), 'required' => 1, 'default' => ''),
-			'Headers' => Array ('type' => 'string', 'default' => NULL),
-            'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),
-
-			'AllowChangingSender' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter',
-				'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-				'not_null' => 1, 'default' => 0
-			),
-			'CustomSender' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_opt_DefaultAddress', 1 => 'la_opt_CustomSender'), 'use_phrases' => 1,
-				'not_null' => 1, 'default' => 0
-			),
-			'SenderName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-			'SenderAddressType' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Email', 2 => 'la_opt_User'), 'use_phrases' => 1,
-				'not_null' => 1, 'error_field' => 'SenderAddress', 'default' => 0
-			),
-			'SenderAddress' => Array (
-				'type' => 'string', 'max_len' => 255,
-				'error_msgs' => Array (
-					'invalid_email' => '!la_err_invalid_format!',
-					'invalid_user' => '!la_error_UserNotFound!',
-				),
-				'not_null' => 1, 'default' => ''
-			),
-			'AllowChangingRecipient' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-				'not_null' => 1, 'default' => 0
-			),
-			'CustomRecipient' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_opt_DefaultAddress', 1 => 'la_opt_CustomRecipients'), 'use_phrases' => 1,
-				'not_null' => 1, 'default' => 0
-			),
-			'Recipients' => Array ('type' => 'string', 'default' => NULL),
-
-            'Subject' => Array (
-				'type' => 'string',
-				'formatter' => 'kMultiLanguage', 'db_type' => 'text',
-				'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
-				'required' => 1, 'default' => null
-			),
-
-			'HtmlBody' => Array (
-				'type' => 'string',
-				'formatter' => 'kMultiLanguage', 'db_type' => 'longtext',
-				'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
-				'default' => null
-			),
-
-			'PlainTextBody' => Array (
-				'type' => 'string',
-				'formatter' => 'kMultiLanguage', 'db_type' => 'longtext',
-				'error_msgs' => Array ('parsing_error' => '!la_error_ParsingError!'),
-				'default' => null
-			),
-
-            'Enabled' => Array (
-            	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-            	'not_null' => 1, 'default' => 1
-            ),
-
-            'FrontEndOnly' => Array (
-            	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-            	'not_null' => 1, 'default' => 0
-            ),
-
-            'Module' => Array (
-            	'type' => 'string',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (),
-            	'not_null' => 1, 'required' => 1, 'default' => 'Core'
-            ),
-
-            'Description' => Array ('type' => 'string', 'default' => NULL),
-
-            'Type' => Array (
-            	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1,
-            	'not_null' => 1, 'unique' => Array ('Event'), 'required' => 1, 'default' => 0
-            ),
-			'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
-			'BindToSystemEvent' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-    	),
-
-		'VirtualFields' => Array (
-			'RecipientType' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'To', 2 => 'Cc', 3 => 'Bcc'),
-				'default' => 1
-			),
-			'RecipientName' => Array ('type' => 'string', 'max_len' => 255, 'default' => ''),
-			'RecipientAddressType' => Array (
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Email', 2 => 'la_opt_User', 3 => 'la_opt_Group'), 'use_phrases' => 1,
-				'error_field' => 'RecipientAddress', 'default' => 0
-			),
-			'RecipientAddress' => Array (
-				'type' => 'string', 'max_len' => 255,
-				'error_msgs' => Array (
-					'invalid_email' => '!la_err_invalid_format!',
-					'invalid_user' => '!la_error_UserNotFound!',
-					'invalid_group' => '!la_error_GroupNotFound!',
-				),
-				'default' => ''
-			),
-
-			'Tag' => Array ('type' => 'string', 'default' => ''),
-			'Replacement' => Array ('type' => 'string', 'default' => ''),
-			'ReplacementTagsXML' => Array ('type' => 'string', 'default' => ''),
-		),
-
-		'Grids'	=> Array (
-			// used on "Email Events" tab in language editing in "Regional" section
-			'Default' => Array (
-				'Icons' => Array (
-					'default' => 'icon16_item.png',
-					0 => 'icon16_disabled.png',
-					1 => 'icon16_item.png',
-				),
-				'Fields' => Array (
-					'EventId' 		=>	Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-					'Description'	=>	Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Event'			=>	Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Module'		=>	Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, ),
-					'Type'			=>	Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
-					'Enabled'		=>	Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
-					'LastChanged'	=>	Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
-				),
-			),
-
-			// used on "Email Templates" section
-			'Emails' => Array (
-				'Icons' => Array (
-					'default' => 'icon16_item.png',
-					0 => 'icon16_disabled.png',
-					1 => 'icon16_item.png',
-				),
-				'Fields' => Array (
-					'EventId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-					'Event' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Subject' => Array ('filter_block' => 'grid_like_filter', 'no_special' => 0, 'width' => 300, ),
-					'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 60, ),
-					'Enabled' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
-					'Module' => Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, ),
-					'FrontEndOnly' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, 'hidden' => 1),
-					'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
-				),
-			),
-		),
-	);
\ No newline at end of file
Index: core/units/email_templates/email_events_event_handler.php
===================================================================
--- core/units/email_templates/email_events_event_handler.php	(revision 15601)
+++ core/units/email_templates/email_events_event_handler.php	(working copy)
@@ -1,756 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.org/license for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	class EmailEventsEventsHandler extends kDBEventHandler
-	{
-		/**
-		 * Allows to override standard permission mapping
-		 *
-		 * @return void
-		 * @access protected
-		 * @see kEventHandler::$permMapping
-		 */
-		protected function mapPermissions()
-		{
-			parent::mapPermissions();
-
-			$permissions = Array (
-				'OnFrontOnly' => Array ('self' => 'edit'),
-				'OnSaveSelected' => Array ('self' => 'view'),
-				'OnProcessEmailQueue' => Array ('self' => 'add|edit'),
-				'OnExportEmailEvents' => Array ('self' => 'view'),
-
-				'OnSuggestAddress' => Array ('self' => 'add|edit'),
-
-				// events only for developers
-				'OnPreCreate' => Array ('self' => 'debug'),
-				'OnDelete' => Array ('self' => 'debug'),
-				'OnDeleteAll' => Array ('self' => 'debug'),
-				'OnMassDelete' => Array ('self' => 'debug'),
-				'OnMassApprove' => Array ('self' => 'debug'),
-				'OnMassDecline' => Array ('self' => 'debug'),
-				'OnSend' => Array ('self' => 'debug'),
-			);
-
-			$this->permMapping = array_merge($this->permMapping, $permissions);
-		}
-
-		/**
-		 * Changes permission section to one from REQUEST, not from config
-		 *
-		 * @param kEvent $event
-		 * @return bool
-		 * @access public
-		 */
-		public function CheckPermission(kEvent $event)
-		{
-			$module = $this->Application->GetVar('module');
-
-			if ( strlen($module) > 0 ) {
-				// checking permission when lising module email events in separate section
-				$module = explode(':', $module, 2);
-
-				if ( count($module) == 1 ) {
-					$main_prefix = $this->Application->findModule('Name', $module[0], 'Var');
-				}
-				else {
-					$exceptions = Array ('Category' => 'c', 'Users' => 'u');
-					$main_prefix = $exceptions[$module[1]];
-				}
-				$section = $this->Application->getUnitOption($main_prefix . '.email', 'PermSection');
-
-				$event->setEventParam('PermSection', $section);
-			}
-
-			// checking permission when listing all email events when editing language
-			return parent::CheckPermission($event);
-		}
-
-		/**
-		 * Apply any custom changes to list's sql query
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 * @see kDBEventHandler::OnListBuild()
-		 */
-		protected function SetCustomQuery(kEvent $event)
-		{
-			parent::SetCustomQuery($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBList */
-
-			if ( $event->Special == 'module' ) {
-				$module = $this->Application->GetVar('module');
-				$object->addFilter('module_filter', '%1$s.Module = ' . $this->Conn->qstr($module));
-			}
-			else {
-				$object->addFilter('module_filter', '%1$s.Module IN (SELECT Name FROM ' . TABLE_PREFIX . 'Modules WHERE Loaded = 1)');
-			}
-
-			if ( !$event->Special && !$this->Application->isDebugMode() ) {
-				// no special
-				$object->addFilter('enabled_filter', '%1$s.Enabled <> ' . STATUS_DISABLED);
-			}
-		}
-
-		/**
-		 * Prepares new kDBItem object
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnNew(kEvent $event)
-		{
-			parent::OnNew($event);
-
-			$mapping = Array ('conf' => 'VariableValue', 'site-domain' => 'DefaultEmailRecipients');
-
-			if ( isset($mapping[$event->Special]) ) {
-				$object = $event->getObject();
-				/* @var $object kDBItem */
-
-				$target_object = $this->Application->recallObject($event->Special);
-				/* @var $target_object kDBList */
-
-				$object->SetDBField('Recipients', $target_object->GetDBField($mapping[$event->Special]));
-			}
-		}
-
-		/**
-		 * Set default headers
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnPreCreate(kEvent $event)
-		{
-			parent::OnPreCreate($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			$object->SetDBField('Headers', $this->Application->ConfigValue('Smtp_DefaultHeaders'));
-			$this->setRequired($event);
-		}
-
-		/**
-		 * Sets status Front-End Only to selected email events
-		 *
-		 * @param kEvent $event
-		 */
-		function OnFrontOnly($event)
-		{
-			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
-				$event->status = kEvent::erFAIL;
-				return;
-			}
-
-			$ids = implode(',', $this->StoreSelectedIDs($event));
-
-			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
-			$sql = 'UPDATE ' . $table_name . '
-					SET FrontEndOnly = 1
-					WHERE EventId IN (' . $ids . ')';
-			$this->Conn->Query($sql);
-
-			$this->clearSelectedIDs($event);
-		}
-
-		/**
-		 * Sets selected user to email events selected
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnSelectUser(kEvent $event)
-		{
-			if ( $event->Special != 'module' ) {
-				parent::OnSelectUser($event);
-				return;
-			}
-
-			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
-				$event->status = kEvent::erFAIL;
-				return;
-			}
-
-			$items_info = $this->Application->GetVar('u');
-			if ( $items_info ) {
-				list ($user_id, ) = each($items_info);
-
-				$ids = $this->Application->RecallVar($event->getPrefixSpecial() . '_selected_ids');
-				$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-				$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
-
-				$sql = 'UPDATE ' . $table_name . '
-						SET ' . $this->Application->RecallVar('dst_field') . ' = ' . $user_id . '
-						WHERE ' . $id_field . ' IN (' . $ids . ')';
-				$this->Conn->Query($sql);
-			}
-
-			$this->finalizePopup($event);
-		}
-
-		/**
-		 * Saves selected ids to session
-		 *
-		 * @param kEvent $event
-		 */
-		function OnSaveSelected($event)
-		{
-			$this->StoreSelectedIDs($event);
-		}
-
-		/**
-		 * Process emails from queue
-		 *
-		 * @param kEvent $event
-		 * @todo Move to MailingList
-		 */
-		function OnProcessEmailQueue($event)
-		{
-			$deliver_count = $event->getEventParam('deliver_count');
-			if ( $deliver_count === false ) {
-				$deliver_count = $this->Application->ConfigValue('MailingListSendPerStep');
-				if ( $deliver_count === false ) {
-					$deliver_count = 10; // 10 emails per script run (if not specified directly)
-				}
-			}
-
-			$processing_type = $this->Application->GetVar('type');
-			if ( $processing_type = 'return_progress' ) {
-				$email_queue_progress = $this->Application->RecallVar('email_queue_progress');
-				if ( $email_queue_progress === false ) {
-					$emails_sent = 0;
-					$sql = 'SELECT COUNT(*)
-							FROM ' . TABLE_PREFIX . 'EmailQueue
-							WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')';
-					$total_emails = $this->Conn->GetOne($sql);
-					$this->Application->StoreVar('email_queue_progress', $emails_sent . ':' . $total_emails);
-				}
-				else {
-					list ($emails_sent, $total_emails) = explode(':', $email_queue_progress);
-				}
-			}
-
-			$sql = 'SELECT *
-					FROM ' . TABLE_PREFIX . 'EmailQueue
-					WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')
-					LIMIT 0,' . $deliver_count;
-			$messages = $this->Conn->Query($sql);
-
-			$message_count = count($messages);
-			if ( !$message_count ) {
-				// no messages left to send in queue
-				if ( $processing_type = 'return_progress' ) {
-					$this->Application->RemoveVar('email_queue_progress');
-					$this->Application->Redirect($this->Application->GetVar('finish_template'));
-				}
-				return;
-			}
-
-			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-			/* @var $mailing_list_helper MailingListHelper */
-
-			$mailing_list_helper->processQueue($messages);
-
-			if ( $processing_type = 'return_progress' ) {
-				$emails_sent += $message_count;
-				if ( $emails_sent >= $total_emails ) {
-					$this->Application->RemoveVar('email_queue_progress');
-					$this->Application->Redirect($this->Application->GetVar('finish_template'));
-				}
-
-				$this->Application->StoreVar('email_queue_progress', $emails_sent . ':' . $total_emails);
-				$event->status = kEvent::erSTOP;
-				echo ($emails_sent / $total_emails) * 100;
-			}
-		}
-
-		/**
-		 * Prefills module dropdown
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnAfterConfigRead(kEvent $event)
-		{
-			parent::OnAfterConfigRead($event);
-
-			$options = Array ();
-
-			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
-				if ( $module_name == 'In-Portal' ) {
-					continue;
-				}
-
-				$options[$module_name] = $module_name;
-			}
-
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
-			$fields['Module']['options'] = $options;
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
-
-			if ( $this->Application->GetVar('regional') ) {
-				$this->Application->setUnitOption($event->Prefix, 'PopulateMlFields', true);
-			}
-		}
-
-		/**
-		 * Prepare temp tables and populate it
-		 * with items selected in the grid
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnEdit(kEvent $event)
-		{
-			parent::OnEdit($event);
-
-			// use language from grid, instead of primary language used by default
-			$event->SetRedirectParam('m_lang', $this->Application->GetVar('m_lang'));
-		}
-
-		/**
-		 * Fixes default recipient type
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnAfterItemLoad(kEvent $event)
-		{
-			parent::OnAfterItemLoad($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			if ( !$this->Application->isDebugMode(false) ) {
-				if ( $object->GetDBField('AllowChangingRecipient') ) {
-					$object->SetDBField('RecipientType', EmailEvent::RECIPIENT_TYPE_TO);
-				}
-				else {
-					$object->SetDBField('RecipientType', EmailEvent::RECIPIENT_TYPE_CC);
-				}
-			}
-
-			// process replacement tags
-			$records = Array ();
-			$replacement_tags = $object->GetDBField('ReplacementTags');
-			$replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array ();
-
-			foreach ($replacement_tags as $tag => $replacement) {
-				$records[] = Array ('Tag' => $tag, 'Replacement' => $replacement);
-			}
-
-			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
-
-			$xml = $minput_helper->prepareMInputXML($records, Array ('Tag', 'Replacement'));
-			$object->SetDBField('ReplacementTagsXML', $xml);
-
-			$this->setRequired($event);
-		}
-
-		/**
-		 * Performs custom validation + keep read-only fields
-		 *
-		 * @param kEvent $event
-		 */
-		function _itemChanged($event)
-		{
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			if ( !$this->Application->isDebugMode(false) ) {
-				// only allow to enable/disable event while in debug mode
-				$to_restore = Array ('Enabled', 'AllowChangingSender', 'AllowChangingRecipient');
-
-				if ( !$object->GetOriginalField('AllowChangingSender') ) {
-					$to_restore = array_merge($to_restore, Array ('CustomSender', 'SenderName', 'SenderAddressType', 'SenderAddress'));
-				}
-
-				if ( !$object->GetOriginalField('AllowChangingRecipient') ) {
-					$to_restore = array_merge($to_restore, Array ('CustomRecipient' /*, 'Recipients'*/));
-				}
-
-				// prevent specific fields from editing
-				foreach ($to_restore as $restore_field) {
-					$original_value = $object->GetOriginalField($restore_field);
-
-					if ( $object->GetDBField($restore_field) != $original_value ) {
-						$object->SetDBField($restore_field, $original_value);
-					}
-				}
-			}
-
-			// process replacement tags
-			if ( $object->GetDBField('ReplacementTagsXML') ) {
-				$minput_helper = $this->Application->recallObject('MInputHelper');
-				/* @var $minput_helper MInputHelper */
-
-				$replacement_tags = Array ();
-				$records = $minput_helper->parseMInputXML($object->GetDBField('ReplacementTagsXML'));
-
-				foreach ($records as $record) {
-					$replacement_tags[trim($record['Tag'])] = trim($record['Replacement']);
-				}
-
-				$object->SetDBField('ReplacementTags', $replacement_tags ? serialize($replacement_tags) : NULL);
-			}
-
-			if ( $this->translationChanged($object) ) {
-				$object->SetDBField('LastChanged_date', TIMENOW);
-				$object->SetDBField('LastChanged_time', TIMENOW);
-			}
-
-			$this->setRequired($event);
-		}
-
-		/**
-		 * Dynamically changes required fields
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function setRequired(kEvent $event)
-		{
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			$language_prefix = 'l' . $this->Application->GetVar('m_lang') . '_';
-
-			$object->setRequired($language_prefix . 'HtmlBody', !$object->GetField('PlainTextBody'));
-			$object->setRequired($language_prefix . 'PlainTextBody', !$object->GetField('HtmlBody'));
-		}
-
-		/**
-		 * Checks, that at least one of phrase's translations was changed
-		 *
-		 * @param kDBItem $object
-		 * @return bool
-		 */
-		function translationChanged($object)
-		{
-			$changed_fields = array_keys($object->GetChangedFields());
-			$translation_fields = Array ('Subject', 'HtmlBody', 'PlainTextBody');
-
-			foreach ($changed_fields as $changed_field) {
-				$changed_field = preg_replace('/^l[\d]+_/', '', $changed_field);
-
-				if ( in_array($changed_field, $translation_fields) ) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * Don't allow to enable/disable events in non-debug mode
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnBeforeItemCreate(kEvent $event)
-		{
-			parent::OnBeforeItemCreate($event);
-
-			$this->_itemChanged($event);
-		}
-
-		/**
-		 * Don't allow to enable/disable events in non-debug mode
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnBeforeItemUpdate(kEvent $event)
-		{
-			parent::OnBeforeItemUpdate($event);
-
-			$this->_itemChanged($event);
-		}
-
-		/**
-		 * Suggest address based on typed address and selected address type
-		 *
-		 * @param kEvent $event
-		 */
-		function OnSuggestAddress($event)
-		{
-			$event->status = kEvent::erSTOP;
-
-			$address_type = $this->Application->GetVar('type');
-			$address = $this->Application->GetVar('value');
-			$limit = $this->Application->GetVar('limit');
-
-			if ( !$limit ) {
-				$limit = 20;
-			}
-
-			switch ($address_type) {
-				case EmailEvent::ADDRESS_TYPE_EMAIL:
-					$field = 'Email';
-					$table_name = TABLE_PREFIX . 'Users';
-					break;
-
-				case EmailEvent::ADDRESS_TYPE_USER:
-					$field = 'Username';
-					$table_name = TABLE_PREFIX . 'Users';
-					break;
-
-				case EmailEvent::ADDRESS_TYPE_GROUP:
-					$field = 'Name';
-					$table_name = TABLE_PREFIX . 'UserGroups';
-					break;
-
-				default:
-					$field = $table_name = '';
-					break;
-			}
-
-			if ( $field ) {
-				$sql = 'SELECT DISTINCT ' . $field . '
-						FROM ' . $table_name . '
-						WHERE ' . $field . ' LIKE ' . $this->Conn->qstr($address . '%') . '
-						ORDER BY ' . $field . ' ASC
-						LIMIT 0,' . $limit;
-				$data = $this->Conn->GetCol($sql);
-			}
-			else {
-				$data = Array ();
-			}
-
-			$this->Application->XMLHeader();
-
-			echo '<suggestions>';
-
-			foreach ($data as $item) {
-				echo '<item>' . htmlspecialchars($item, null, CHARSET) . '</item>';
-			}
-
-			echo '</suggestions>';
-		}
-
-		/**
-		 * Does custom validation
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnBeforeItemValidate(kEvent $event)
-		{
-			parent::OnBeforeItemValidate($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			// validate email subject and body for parsing errors
-			$this->_validateEmailTemplate($object);
-
-			// validate sender and recipient addresses
-			if ( $object->GetDBField('CustomSender') ) {
-				$this->_validateAddress($event, 'Sender');
-			}
-
-			$this->_validateAddress($event, 'Recipient');
-			$this->_validateBindEvent($object);
-		}
-
-		/**
-		 * Validates subject and body fields of Email template
-		 *
-		 * @param kDBItem $object
-		 * @return void
-		 * @access protected
-		 */
-		protected function _validateEmailTemplate($object)
-		{
-			$email_message_helper = $this->Application->recallObject('kEmailMessageHelper');
-			/* @var $email_message_helper kEmailMessageHelper */
-
-			$email_message_helper->parseField($object, 'Subject');
-			$email_message_helper->parseField($object, 'HtmlBody');
-			$email_message_helper->parseField($object, 'PlainTextBody');
-		}
-
-		/**
-		 * Validates address using given field prefix
-		 *
-		 * @param kEvent $event
-		 * @param string $field_prefix
-		 * @return void
-		 * @access protected
-		 */
-		protected function _validateAddress($event, $field_prefix)
-		{
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			$address_type = $object->GetDBField($field_prefix . 'AddressType');
-			$object->setRequired($field_prefix . 'Address', $address_type > 0);
-			$address = $object->GetDBField($field_prefix . 'Address');
-
-			if ( !$address ) {
-				// don't validate against empty address
-				return;
-			}
-
-			switch ($address_type) {
-				case EmailEvent::ADDRESS_TYPE_EMAIL:
-					if ( !preg_match('/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', $address) ) {
-						$object->SetError($field_prefix . 'Address', 'invalid_email');
-					}
-					break;
-
-				case EmailEvent::ADDRESS_TYPE_USER:
-					$sql = 'SELECT PortalUserId
-							FROM ' . TABLE_PREFIX . 'Users
-							WHERE Username = ' . $this->Conn->qstr($address);
-					if ( !$this->Conn->GetOne($sql) ) {
-						$object->SetError($field_prefix . 'Address', 'invalid_user');
-					}
-					break;
-
-				case EmailEvent::ADDRESS_TYPE_GROUP:
-					$sql = 'SELECT GroupId
-							FROM ' . TABLE_PREFIX . 'UserGroups
-							WHERE Name = ' . $this->Conn->qstr($address);
-					if ( !$this->Conn->GetOne($sql) ) {
-						$object->SetError($field_prefix . 'Address', 'invalid_group');
-					}
-					break;
-			}
-		}
-
-		/**
-		 * Checks that bind event is specified in correct format and exists
-		 *
-		 * @param kDBItem $object
-		 */
-		protected function _validateBindEvent($object)
-		{
-			$event_string = $object->GetDBField('BindToSystemEvent');
-
-			if ( !$event_string ) {
-				return;
-			}
-
-			try {
-				$this->Application->eventImplemented(new kEvent($event_string));
-			}
-			catch (Exception $e) {
-				$object->SetError('BindToSystemEvent', 'invalid_event', '+' . $e->getMessage());
-			}
-		}
-
-		/**
-		 * Stores ids of selected phrases and redirects to export language step 1
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnExportEmailEvents(kEvent $event)
-		{
-			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
-				$event->status = kEvent::erFAIL;
-				return;
-			}
-
-			$this->Application->setUnitOption('phrases', 'AutoLoad', false);
-
-			$this->StoreSelectedIDs($event);
-			$this->Application->StoreVar('export_language_ids', $this->Application->GetVar('m_lang'));
-
-			$event->setRedirectParams(
-				Array (
-					'phrases.export_event' => 'OnNew',
-					'pass' => 'all,phrases.export',
-					'export_mode' => $event->Prefix,
-				)
-			);
-		}
-
-		/**
-		 * Deletes all subscribers to e-mail event after it was deleted
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnAfterItemDelete(kEvent $event)
-		{
-			parent::OnAfterItemDelete($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			$sql = 'SELECT SubscriptionId
-					FROM ' . TABLE_PREFIX . 'SystemEventSubscriptions
-					WHERE EmailEventId = ' . $object->GetID();
-			$ids = $this->Conn->GetCol($sql);
-
-			if ( !$ids ) {
-				return;
-			}
-
-			$temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
-
-			$temp_handler->DeleteItems('system-event-subscription', '', $ids);
-		}
-
-		/**
-		 * Sends selected e-mail event
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnSend(kEvent $event)
-		{
-			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
-
-			$ids = $this->StoreSelectedIDs($event);
-
-			foreach ($ids as $id) {
-				$object->Load($id);
-
-				if ( $object->GetDBField('Type') == EmailEvent::EVENT_TYPE_ADMIN ) {
-					$this->Application->EmailEventAdmin($object->GetDBField('Event'));
-				}
-				else {
-					$this->Application->EmailEventUser($object->GetDBField('Event'));
-				}
-			}
-
-			$this->clearSelectedIDs($event);
-		}
-	}
\ No newline at end of file
Index: core/units/email_templates/email_template_eh.php
===================================================================
--- core/units/email_templates/email_template_eh.php	(revision 15437)
+++ core/units/email_templates/email_template_eh.php	(working copy)
@@ -14,7 +14,7 @@
 
 	defined('FULL_PATH') or die('restricted access!');
 
-	class EmailEventsEventsHandler extends kDBEventHandler
+	class EmailTemplateEventHandler extends kDBEventHandler
 	{
 		/**
 		 * Allows to override standard permission mapping
@@ -31,7 +31,7 @@
 				'OnFrontOnly' => Array ('self' => 'edit'),
 				'OnSaveSelected' => Array ('self' => 'view'),
 				'OnProcessEmailQueue' => Array ('self' => 'add|edit'),
-				'OnExportEmailEvents' => Array ('self' => 'view'),
+				'OnExportEmailTemplates' => Array ('self' => 'view'),
 
 				'OnSuggestAddress' => Array ('self' => 'add|edit'),
 
@@ -162,12 +162,12 @@
 				return;
 			}
 
-			$ids = implode(',', $this->StoreSelectedIDs($event));
+			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
+			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 
-			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 			$sql = 'UPDATE ' . $table_name . '
 					SET FrontEndOnly = 1
-					WHERE EventId IN (' . $ids . ')';
+					WHERE ' . $id_field . ' IN (' . implode(',', $this->StoreSelectedIDs($event)) . ')';
 			$this->Conn->Query($sql);
 
 			$this->clearSelectedIDs($event);
@@ -347,10 +347,10 @@
 
 			if ( !$this->Application->isDebugMode(false) ) {
 				if ( $object->GetDBField('AllowChangingRecipient') ) {
-					$object->SetDBField('RecipientType', EmailEvent::RECIPIENT_TYPE_TO);
+					$object->SetDBField('RecipientType', EmailTemplate::RECIPIENT_TYPE_TO);
 				}
 				else {
-					$object->SetDBField('RecipientType', EmailEvent::RECIPIENT_TYPE_CC);
+					$object->SetDBField('RecipientType', EmailTemplate::RECIPIENT_TYPE_CC);
 				}
 			}
 
@@ -513,17 +513,17 @@
 			}
 
 			switch ($address_type) {
-				case EmailEvent::ADDRESS_TYPE_EMAIL:
+				case EmailTemplate::ADDRESS_TYPE_EMAIL:
 					$field = 'Email';
 					$table_name = TABLE_PREFIX . 'Users';
 					break;
 
-				case EmailEvent::ADDRESS_TYPE_USER:
+				case EmailTemplate::ADDRESS_TYPE_USER:
 					$field = 'Username';
 					$table_name = TABLE_PREFIX . 'Users';
 					break;
 
-				case EmailEvent::ADDRESS_TYPE_GROUP:
+				case EmailTemplate::ADDRESS_TYPE_GROUP:
 					$field = 'Name';
 					$table_name = TABLE_PREFIX . 'UserGroups';
 					break;
@@ -591,12 +591,12 @@
 		 */
 		protected function _validateEmailTemplate($object)
 		{
-			$email_message_helper = $this->Application->recallObject('kEmailMessageHelper');
-			/* @var $email_message_helper kEmailMessageHelper */
+			$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
+			/* @var $email_template_helper kEmailTemplateHelper */
 
-			$email_message_helper->parseField($object, 'Subject');
-			$email_message_helper->parseField($object, 'HtmlBody');
-			$email_message_helper->parseField($object, 'PlainTextBody');
+			$email_template_helper->parseField($object, 'Subject');
+			$email_template_helper->parseField($object, 'HtmlBody');
+			$email_template_helper->parseField($object, 'PlainTextBody');
 		}
 
 		/**
@@ -622,13 +622,13 @@
 			}
 
 			switch ($address_type) {
-				case EmailEvent::ADDRESS_TYPE_EMAIL:
+				case EmailTemplate::ADDRESS_TYPE_EMAIL:
 					if ( !preg_match('/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', $address) ) {
 						$object->SetError($field_prefix . 'Address', 'invalid_email');
 					}
 					break;
 
-				case EmailEvent::ADDRESS_TYPE_USER:
+				case EmailTemplate::ADDRESS_TYPE_USER:
 					$sql = 'SELECT PortalUserId
 							FROM ' . TABLE_PREFIX . 'Users
 							WHERE Username = ' . $this->Conn->qstr($address);
@@ -637,7 +637,7 @@
 					}
 					break;
 
-				case EmailEvent::ADDRESS_TYPE_GROUP:
+				case EmailTemplate::ADDRESS_TYPE_GROUP:
 					$sql = 'SELECT GroupId
 							FROM ' . TABLE_PREFIX . 'UserGroups
 							WHERE Name = ' . $this->Conn->qstr($address);
@@ -676,7 +676,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnExportEmailEvents(kEvent $event)
+		protected function OnExportEmailTemplates(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
@@ -713,7 +713,7 @@
 
 			$sql = 'SELECT SubscriptionId
 					FROM ' . TABLE_PREFIX . 'SystemEventSubscriptions
-					WHERE EmailEventId = ' . $object->GetID();
+					WHERE EmailTemplateId = ' . $object->GetID();
 			$ids = $this->Conn->GetCol($sql);
 
 			if ( !$ids ) {
@@ -743,11 +743,11 @@
 			foreach ($ids as $id) {
 				$object->Load($id);
 
-				if ( $object->GetDBField('Type') == EmailEvent::EVENT_TYPE_ADMIN ) {
-					$this->Application->EmailEventAdmin($object->GetDBField('Event'));
+				if ( $object->GetDBField('Type') == EmailTemplate::TEMPLATE_TYPE_ADMIN ) {
+					$this->Application->emailAdmin($object->GetDBField('TemplateName'));
 				}
 				else {
-					$this->Application->EmailEventUser($object->GetDBField('Event'));
+					$this->Application->emailUser($object->GetDBField('TemplateName'));
 				}
 			}
 
Index: core/units/email_templates/email_template_tp.php
===================================================================
--- core/units/email_templates/email_template_tp.php	(revision 15437)
+++ core/units/email_templates/email_template_tp.php	(working copy)
@@ -14,7 +14,7 @@
 
 	defined('FULL_PATH') or die('restricted access!');
 
-	class EmailEventTagProcessor extends kDBTagProcessor
+	class EmailTemplateTagProcessor extends kDBTagProcessor
 	{
 		/**
 		 * Removes "Enabled" column, when not in debug mode
@@ -78,7 +78,7 @@
 			/* @var $object kDBItem */
 
 			$field_options = $object->GetFieldOptions('RecipientType');
-			unset($field_options['options'][ EmailEvent::RECIPIENT_TYPE_TO ]);
+			unset($field_options['options'][ EmailTemplate::RECIPIENT_TYPE_TO ]);
 			$object->SetFieldOptions('RecipientType', $field_options);
 		}
 
Index: core/units/email_templates/email_templates_config.php
===================================================================
--- core/units/email_templates/email_templates_config.php	(revision 15437)
+++ core/units/email_templates/email_templates_config.php	(working copy)
@@ -15,11 +15,11 @@
 defined('FULL_PATH') or die('restricted access!');
 
 	$config = Array (
-		'Prefix' => 'emailevents',
+		'Prefix' => 'email-template',
 		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 		'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-		'EventHandlerClass' => Array ('class' => 'EmailEventsEventsHandler', 'file' => 'email_events_event_handler.php', 'build_event' => 'OnBuild'),
-		'TagProcessorClass' => Array ('class' => 'EmailEventTagProcessor', 'file' => 'email_event_tp.php', 'build_event' => 'OnBuild'),
+		'EventHandlerClass' => Array ('class' => 'EmailTemplateEventHandler', 'file' => 'email_template_eh.php', 'build_event' => 'OnBuild'),
+		'TagProcessorClass' => Array ('class' => 'EmailTemplateTagProcessor', 'file' => 'email_template_tp.php', 'build_event' => 'OnBuild'),
 
 		'AutoLoad' => true,
 
@@ -31,32 +31,32 @@
 			5 => 'mode',
 		),
 
-		'IDField' => 'EventId',
+		'IDField' => 'TemplateId',
 		'StatusField' => Array ('Enabled'),
-		'TitleField' => 'Event',
+		'TitleField' => 'TemplateName',
 
 		'TitlePresets' => Array (
 			'default' => Array (
-				'new_status_labels' => Array ('emailevents' => '!la_title_Adding_E-mail!'),
-				'edit_status_labels' => Array ('emailevents' => '!la_title_EditingEmailEvent!' /*'!la_title_Editing_E-mail!'*/),
-				'new_titlefield' => Array ('emailevents' => '!la_title_NewEmailEvent!'),
+				'new_status_labels' => Array ('email-template' => '!la_title_AddingEmailTemplate!'),
+				'edit_status_labels' => Array ('email-template' => '!la_title_EditingEmailTemplate!'),
+				'new_titlefield' => Array ('email-template' => '!la_title_NewEmailTemplate!'),
 			),
 
 			// for separate grid with email editing
-			'email_message_list' => Array (
-				'prefixes' => Array ('emailevents_List'), 'format' => "!la_title_EmailMessages!",
+			'email_template_list' => Array (
+				'prefixes' => Array ('email-template_List'), 'format' => "!la_title_EmailTemplates!",
 				'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'frontend_mail', 'export', 'process', 'view', 'dbl-click'),
 			),
 
-			'email_message_edit' => Array (
-				'prefixes' => Array ('emailevents'),
-				'format' => '#emailevents_status# - #emailevents_titlefield# - !la_section_General!',
+			'email_template_edit' => Array (
+				'prefixes' => Array ('email-template'),
+				'format' => '#email-template_status# - #email-template_titlefield# - !la_section_General!',
 				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
 			),
 
-			'email_message_edit_settings' => Array (
-				'prefixes' => Array ('emailevents'),
-				'format' => '#emailevents_status# - #emailevents_titlefield# - !la_section_Settings!',
+			'email_template_edit_settings' => Array (
+				'prefixes' => Array ('email-template'),
+				'format' => '#email-template_status# - #email-template_titlefield# - !la_section_Settings!',
 				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
 			),
 
@@ -68,8 +68,8 @@
 
 		'EditTabPresets' => Array (
 			'Default' => Array (
-				'general' => Array ('title' => 'la_tab_General', 't' => 'languages/email_message_edit', 'priority' => 1),
-				'settings' => Array ('title' => 'la_tab_Settings', 't' => 'languages/email_message_settings', 'priority' => 2),
+				'general' => Array ('title' => 'la_tab_General', 't' => 'languages/email_template_edit', 'priority' => 1),
+				'settings' => Array ('title' => 'la_tab_Settings', 't' => 'languages/email_template_settings', 'priority' => 2),
 			),
 		),
 
@@ -79,15 +79,15 @@
 			'in-portal:configemail'	=>	Array (
 				'parent'		=>	'in-portal:site',
 				'icon'			=>	'email_templates',
-				'label'			=>	'la_tab_E-mails',
-				'url'			=>	Array ('t' => 'languages/email_message_list', 'pass' => 'm'),
+				'label'			=>	'la_title_EmailTemplates',
+				'url'			=>	Array ('t' => 'languages/email_template_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
 				'priority'		=>	5,
 				'type'			=>	stTREE,
 			),
 		),
 
-		'TableName' => TABLE_PREFIX . 'EmailEvents',
+		'TableName' => TABLE_PREFIX . 'EmailTemplates',
 
 		'ListSQLs' => Array (
 			'' => '	SELECT %1$s.* %2$s FROM %1$s',
@@ -96,7 +96,7 @@
 		'ListSortings' => Array (
 			'' => Array (
 				'ForcedSorting' => Array ('Enabled' => 'desc'),
-				'Sorting' => Array ('Event' => 'asc'),
+				'Sorting' => Array ('TemplateName' => 'asc'),
 			),
 			'module' => Array (
 				'ForcedSorting' => Array ('Enabled' => 'desc'),
@@ -105,8 +105,8 @@
 		),
 
 		'Fields' => Array (
-			'EventId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-            'Event' => Array ('type' => 'string', 'not_null' => 1, 'unique' => Array ('Type'), 'required' => 1, 'default' => ''),
+			'TemplateId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+            'TemplateName' => Array ('type' => 'string', 'not_null' => 1, 'unique' => Array ('Type'), 'required' => 1, 'default' => ''),
 			'Headers' => Array ('type' => 'string', 'default' => NULL),
             'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),
 
@@ -191,7 +191,7 @@
             'Type' => Array (
             	'type' => 'int',
             	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1,
-            	'not_null' => 1, 'unique' => Array ('Event'), 'required' => 1, 'default' => 0
+            	'not_null' => 1, 'unique' => Array ('TemplateName'), 'required' => 1, 'default' => 0
             ),
 			'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
 			'BindToSystemEvent' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
@@ -233,9 +233,9 @@
 					1 => 'icon16_item.png',
 				),
 				'Fields' => Array (
-					'EventId' 		=>	Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+					'TemplateId' 		=>	Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
 					'Description'	=>	Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Event'			=>	Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+					'TemplateName'	=>	Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
 					'Module'		=>	Array ('filter_block' => 'grid_multioptions_filter', 'width' => 100, ),
 					'Type'			=>	Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
 					'Enabled'		=>	Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
@@ -251,8 +251,8 @@
 					1 => 'icon16_item.png',
 				),
 				'Fields' => Array (
-					'EventId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-					'Event' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+					'TemplateId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+					'TemplateName' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
 					'Subject' => Array ('filter_block' => 'grid_like_filter', 'no_special' => 0, 'width' => 300, ),
 					'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
 					'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 60, ),
Index: core/units/forms/form_submissions/form_submissions_eh.php
===================================================================
--- core/units/forms/form_submissions/form_submissions_eh.php	(revision 15590)
+++ core/units/forms/form_submissions/form_submissions_eh.php	(working copy)
@@ -248,13 +248,13 @@
 					'to_email' => $notify_email,
 				);
 
-				$this->Application->EmailEventAdmin('FORM.SUBMITTED', null, $send_params);
+				$this->Application->emailAdmin('FORM.SUBMITTED', null, $send_params);
 			}
 			else {
-				$this->Application->EmailEventAdmin('FORM.SUBMITTED');
+				$this->Application->emailAdmin('FORM.SUBMITTED');
 			}
 
-//			$this->Application->EmailEventUser('FORM.SUBMITTED', null, 'to_email' => '');
+//			$this->Application->emailUser('FORM.SUBMITTED', null, Array ('to_email' => ''));
 
 			$event->SetRedirectParam('opener', 's');
 			$event->SetRedirectParam('m_cat_id', 0);
Index: core/units/forms/forms/forms_eh.php
===================================================================
--- core/units/forms/forms/forms_eh.php	(revision 15437)
+++ core/units/forms/forms/forms_eh.php	(working copy)
@@ -230,14 +230,14 @@
 
 		if ( $object->Validate() ) {
 			$event->redirect = $this->Application->GetVar('success_template');
-			$this->Application->EmailEventAdmin($this->Application->GetVar('email_event'));
+			$this->Application->emailAdmin($this->Application->GetVar('email_event'));
 
 			$send_params = Array (
 				'to_email' => $field_values[$this->Application->GetVar('email_field')],
 				'to_name' => $field_values[$this->Application->GetVar('name_field')]
 			);
 
-			$this->Application->EmailEventUser($this->Application->GetVar('email_event'), null, $send_params);
+			$this->Application->emailUser($this->Application->GetVar('email_event'), null, $send_params);
 
 			if ( $field_values['MailingList'] ) {
 				$this->Application->StoreVar('SubscriberEmail', $field_values['Email']);
Index: core/units/forms/submission_log/submission_log_eh.php
===================================================================
--- core/units/forms/submission_log/submission_log_eh.php	(revision 15437)
+++ core/units/forms/submission_log/submission_log_eh.php	(working copy)
@@ -381,7 +381,7 @@
 				}
 			}
 
-			$this->Application->EmailEventAdmin('FORM.SUBMISSION.REPLY.TO.USER', null, $send_params);
+			$this->Application->emailAdmin('FORM.SUBMISSION.REPLY.TO.USER', null, $send_params);
 
 			// mark as sent after sending is finished
 			$object->SetDBField('SentStatus', SUBMISSION_LOG_SENT);
@@ -438,7 +438,7 @@
 
 			if ( $this->Application->GetVar('client_mode') ) {
 				// new reply from client received -> send notification about it
-				$this->Application->EmailEventAdmin('FORM.SUBMISSION.REPLY.FROM.USER');
+				$this->Application->emailAdmin('FORM.SUBMISSION.REPLY.FROM.USER');
 			}
 		}
 
@@ -488,7 +488,7 @@
 			$sent_status = $object->GetDBField('SentStatus');
 
 			if ( $object->GetOriginalField('SentStatus') != $sent_status && $sent_status == SUBMISSION_LOG_BOUNCE ) {
-				$this->Application->EmailEventAdmin('FORM.SUBMISSION.REPLY.FROM.USER.BOUNCED');
+				$this->Application->emailAdmin('FORM.SUBMISSION.REPLY.FROM.USER.BOUNCED');
 			}
 		}
 
Index: core/units/helpers/email_message_helper.php
===================================================================
--- core/units/helpers/email_message_helper.php	(revision 15465)
+++ core/units/helpers/email_message_helper.php	(working copy)
@@ -1,91 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.org/license for copyright notices and details.
-*/
-
-defined('FULL_PATH') or die('restricted access!');
-
-class kEmailMessageHelper extends kHelper {
-
-	/**
-	 * Extracts Subject, Headers, Body fields from email message translation
-	 *
-	 * @param string|SimpleXMLElement $text
-	 * @param string $message_type
-	 * @return Array
-	 */
-	function parseTemplate($text, $message_type = '')
-	{
-		$ret = Array ('Subject' => '', 'Headers' => '', 'HtmlBody' => '', 'PlainTextBody' => '');
-
-		if ( $message_type == '' ) {
-			// this is v5+ e-mail event text as xml node
-			foreach ($ret as $field => $value) {
-				$node_name = strtoupper($field);
-				$ret[$field] = (string)$text->$node_name;
-			}
-
-			return $ret;
-		}
-
-		$line_id = 1;
-		$headers = Array();
-		$lines = explode("\n", $text); // "\n" is lost in process
-
-		foreach ($lines as $line_id => $line) {
-			if ( strlen(trim($line)) == 0 || ($line == '.') ) {
-				break;
-			}
-
-			$parts = explode(':', $line, 2);
-
-			if ( strtolower($parts[0]) == 'subject' ) {
-				$ret['Subject'] = trim($parts[1]);
-			}
-			else {
-				$headers[] = $line;
-			}
-		}
-
-		$ret['Headers'] = $headers ? implode("\n", $headers) : null; // it's null field
-
-		$lines = array_slice($lines, $line_id + 1);
-
-		// add "\n", that was lost before
-		$ret[$message_type == 'html' ? 'HtmlBody' : 'PlainTextBody'] = implode("\n", $lines);
-
-		return $ret;
-	}
-
-	/**
-	 * Parses contents of given object field and sets error, when invalid in-portal tags found
-	 * @param kDBItem $object
-	 * @param string $field
-	 * @return void
-	 * @access public
-	 */
-	public function parseField($object, $field)
-	{
-		$this->Application->InitParser();
-
-		try {
-			$this->Application->Parser->CompileRaw($object->GetField($field), 'email_template');
-		}
-		catch (Exception $e) {
-			if ( $this->Application->isDebugMode() ) {
-				$this->Application->Debugger->appendHTML('<b style="color: red;">Error in Email Template:</b> ' . $e->getMessage() . ' (line: ' . $e->getLine() . ')');
-			}
-
-			$object->SetError($field, 'parsing_error');
-		}
-	}
-}
\ No newline at end of file
Index: core/units/helpers/email_template_helper.php
===================================================================
--- core/units/helpers/email_template_helper.php	(revision 15437)
+++ core/units/helpers/email_template_helper.php	(working copy)
@@ -14,7 +14,7 @@
 
 defined('FULL_PATH') or die('restricted access!');
 
-class kEmailMessageHelper extends kHelper {
+class kEmailTemplateHelper extends kHelper {
 
 	/**
 	 * Extracts Subject, Headers, Body fields from email message translation

Property changes on: core\units\helpers\email_template_helper.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: core/units/helpers/helpers_config.php
===================================================================
--- core/units/helpers/helpers_config.php	(revision 15437)
+++ core/units/helpers/helpers_config.php	(working copy)
@@ -58,7 +58,7 @@
 			Array ('pseudo' => 'BracketsHelper', 'class' => 'kBracketsHelper', 'file' => 'brackets_helper.php', 'build_event' => ''),
 			Array ('pseudo' => 'kXMLHelper', 'class' => 'kXMLHelper', 'file' => 'xml_helper.php', 'build_event' => ''),
 			Array ('pseudo' => 'CatItemExportHelper', 'class' => 'kCatDBItemExportHelper', 'file' => 'cat_dbitem_export_helper.php', 'build_event' => ''),
-			Array ('pseudo' => 'kEmailMessageHelper', 'class' => 'kEmailMessageHelper', 'file' => 'email_message_helper.php', 'build_event' => ''),
+			Array ('pseudo' => 'kEmailTemplateHelper', 'class' => 'kEmailTemplateHelper', 'file' => 'email_template_helper.php', 'build_event' => ''),
 			Array ('pseudo' => 'ListHelper', 'class' => 'ListHelper', 'file' => 'list_helper.php', 'build_event' => ''),
 
 			Array ('pseudo' => 'FormSubmissionHelper', 'class' => 'FormSubmissionHelper', 'file' => 'form_submission_helper.php', 'build_event' => ''),
Index: core/units/helpers/language_import_helper.php
===================================================================
--- core/units/helpers/language_import_helper.php	(revision 15601)
+++ core/units/helpers/language_import_helper.php	(working copy)
@@ -109,7 +109,7 @@
 		 */
 		var $_exportLimits = Array (
 			'phrases' => false,
-			'emailevents' => false,
+			'email-template' => false,
 			'country-state' => false,
 		);
 
@@ -190,7 +190,7 @@
 			// copy data from temp tables to live
 			foreach ($this->_languages as $language_id) {
 				$this->_performUpgrade($language_id, 'phrases', 'PhraseKey', Array ('l%s_Translation', 'l%s_HintTranslation', 'l%s_ColumnTranslation', 'PhraseType'));
-				$this->_performUpgrade($language_id, 'emailevents', 'EventId', Array ('l%s_Subject', 'Headers', 'l%s_HtmlBody', 'l%s_PlainTextBody'));
+				$this->_performUpgrade($language_id, 'email-template', 'TemplateId', Array ('l%s_Subject', 'Headers', 'l%s_HtmlBody', 'l%s_PlainTextBody'));
 				$this->_performUpgrade($language_id, 'country-state', 'CountryStateId', Array ('l%s_Name'));
 			}
 
@@ -262,19 +262,19 @@
 			$module_sql = preg_replace('/(.*),/U', 'INSTR(Module,\'\\1\') OR ', implode(',', $module_ids) . ',');
 
 			// apply event selection limit
-			if ($this->_exportLimits['emailevents']) {
-				$escaped_email_events = $this->Conn->qstrArray($this->_exportLimits['emailevents']);
-				$limit_where = '`Event` IN (' . implode(',', $escaped_email_events) . ')';
+			if ($this->_exportLimits['email-template']) {
+				$escaped_email_templates = $this->Conn->qstrArray($this->_exportLimits['email-template']);
+				$limit_where = 'TemplateName IN (' . implode(',', $escaped_email_templates) . ')';
 			}
 			else {
 				$limit_where = 'TRUE';
 			}
 
 			$sql = 'SELECT *
-					FROM ' . $this->Application->getUnitOption('emailevents', 'TableName') . '
+					FROM ' . $this->Application->getUnitOption('email-template', 'TableName') . '
 					WHERE `Type` IN (' . implode(',', $phrase_types) . ') AND (' . substr($module_sql, 0, -4) . ') AND ' . $limit_where . '
-					ORDER BY `Event`, `Type`';
-			$events = $this->Conn->Query($sql, 'EventId');
+					ORDER BY TemplateName, `Type`';
+			$email_templates = $this->Conn->Query($sql, 'TemplateId');
 
 			if ( in_array('Core', $module_ids) ) {
 				if ($this->_exportLimits['country-state']) {
@@ -388,15 +388,15 @@
 				}
 
 				// email events
-				if ($events) {
+				if ($email_templates) {
 					$ret .= "\t\t" . '<EVENTS>' . "\n";
 
-					foreach ($events as $event_data) {
+					foreach ($email_templates as $template_data) {
 						$fields_hash = Array (
-							'HEADERS' => $event_data['Headers'],
-							'SUBJECT' => $event_data['l' . $language_id . '_Subject'],
-							'HTMLBODY' => $event_data['l' . $language_id . '_HtmlBody'],
-							'PLAINTEXTBODY' => $event_data['l' . $language_id . '_PlainTextBody'],
+							'HEADERS' => $template_data['Headers'],
+							'SUBJECT' => $template_data['l' . $language_id . '_Subject'],
+							'HTMLBODY' => $template_data['l' . $language_id . '_HtmlBody'],
+							'PLAINTEXTBODY' => $template_data['l' . $language_id . '_PlainTextBody'],
 						);
 
 						$data = '';
@@ -408,7 +408,7 @@
 						}
 
 						if ( $data ) {
-							$ret .= "\t\t\t" . '<EVENT Event="' . $event_data['Event'] . '" Type="' . $event_data['Type'] . '">' . "\n" . $data . "\t\t\t" . '</EVENT>' . "\n";
+							$ret .= "\t\t\t" . '<EVENT Event="' . $template_data['TemplateName'] . '" Type="' . $template_data['Type'] . '">' . "\n" . $data . "\t\t\t" . '</EVENT>' . "\n";
 						}
 					}
 
@@ -493,7 +493,7 @@
 		function setExportLimit($prefix, $data = null)
 		{
 			if ( !isset($data) ) {
-				$key_field = $prefix == 'phrases' ? 'Phrase' : 'Event';
+				$key_field = $prefix == 'phrases' ? 'Phrase' : 'TemplateName';
 				$ids = $this->getExportIDs($prefix);
 
 				$sql = 'SELECT ' . $key_field . '
@@ -665,7 +665,7 @@
 		function _initImportTables($drop_only = false)
 		{
 			$this->_tables['phrases'] = $this->_prepareTempTable('phrases', $drop_only);
-			$this->_tables['emailevents'] = $this->_prepareTempTable('emailevents', $drop_only);
+			$this->_tables['email-template'] = $this->_prepareTempTable('email-template', $drop_only);
 			$this->_tables['country-state'] = $this->_prepareTempTable('country-state', $drop_only);
 		}
 
@@ -698,8 +698,8 @@
 						$unique_field = 'PhraseKey';
 						break;
 
-					case 'emailevents':
-						$unique_field = 'EventId';
+					case 'email-template':
+						$unique_field = 'TemplateId';
 						break;
 
 					case 'country-state':
@@ -724,8 +724,8 @@
 		 */
 		function _updateEventsCache()
 		{
-			$sql = 'SELECT EventId, CONCAT(Event,"_",Type) AS EventMix
-					FROM ' . TABLE_PREFIX . 'EmailEvents';
+			$sql = 'SELECT TemplateId, CONCAT(TemplateName,"_",Type) AS EventMix
+					FROM ' . $this->Application->getUnitOption('email-template', 'TableName');
 			$this->events_hash = $this->Conn->GetCol($sql, 'EventMix');
 		}
 
@@ -984,59 +984,59 @@
 				$this->Application->Debugger->profileStart('L[' . $language_id . ']E', 'Language: ' . $language_id . '; Events Import');
 			}
 
-			$email_message_helper = $this->Application->recallObject('kEmailMessageHelper');
-			/* @var $email_message_helper kEmailMessageHelper */
+			$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
+			/* @var $email_template_helper kEmailTemplateHelper */
 
 			foreach ($events as $event_node) {
 				/* @var $event_node SimpleXMLElement */
 
 				$message_type = (string)$event_node['MessageType'];
-				$event_id = $this->_getEventId((string)$event_node['Event'], (int)$event_node['Type']);
+				$email_template_id = $this->_getEmailTemplateId((string)$event_node['Event'], (int)$event_node['Type']);
 
-				if ( !$event_id ) {
+				if ( !$email_template_id ) {
 					continue;
 				}
 
 				$fields_hash = Array (
-					'EventId' => $event_id,
-					'Event' => (string)$event_node['Event'],
+					'TemplateId' => $email_template_id,
+					'TemplateName' => (string)$event_node['Event'],
 					'Type' => (int)$event_node['Type'],
 				);
 
 				if ( $message_type == '' ) {
-					$parsed = $email_message_helper->parseTemplate($event_node, '');
+					$parsed = $email_template_helper->parseTemplate($event_node, '');
 					$parsed = array_map($language_encoding == 'plain' ? 'rtrim' : 'base64_decode', $parsed);
 
 				}
 				else {
 					$template = $language_encoding == 'plain' ? rtrim($event_node) : base64_decode($event_node);
-					$parsed = $email_message_helper->parseTemplate($template, $message_type);
+					$parsed = $email_template_helper->parseTemplate($template, $message_type);
 				}
 
-				if ( !array_key_exists($event_id, $other_translations) ) {
+				if ( !array_key_exists($email_template_id, $other_translations) ) {
 					// ensure translation in every language to make same column count in every insert
-					$other_translations[$event_id] = Array ();
+					$other_translations[$email_template_id] = Array ();
 
 					foreach ($this->_languages as $other_language_id) {
-						$other_translations[$event_id]['l' . $other_language_id . '_Subject'] = '';
-						$other_translations[$event_id]['l' . $other_language_id . '_HtmlBody'] = '';
-						$other_translations[$event_id]['l' . $other_language_id . '_PlainTextBody'] = '';
+						$other_translations[$email_template_id]['l' . $other_language_id . '_Subject'] = '';
+						$other_translations[$email_template_id]['l' . $other_language_id . '_HtmlBody'] = '';
+						$other_translations[$email_template_id]['l' . $other_language_id . '_PlainTextBody'] = '';
 					}
 				}
 
-				$other_translations[$event_id]['l' . $language_id . '_Subject'] = $parsed['Subject'];
-				$other_translations[$event_id]['l' . $language_id . '_HtmlBody'] = $parsed['HtmlBody'];
-				$other_translations[$event_id]['l' . $language_id . '_PlainTextBody'] = $parsed['PlainTextBody'];
+				$other_translations[$email_template_id]['l' . $language_id . '_Subject'] = $parsed['Subject'];
+				$other_translations[$email_template_id]['l' . $language_id . '_HtmlBody'] = $parsed['HtmlBody'];
+				$other_translations[$email_template_id]['l' . $language_id . '_PlainTextBody'] = $parsed['PlainTextBody'];
 
 				if ( $parsed['Headers'] ) {
-					$other_translations[$event_id]['Headers'] = $parsed['Headers'];
+					$other_translations[$email_template_id]['Headers'] = $parsed['Headers'];
 				}
-				elseif ( !$parsed['Headers'] && !array_key_exists('Headers', $other_translations[$event_id]) ) {
-					$other_translations[$event_id]['Headers'] = $parsed['Headers'];
+				elseif ( !$parsed['Headers'] && !array_key_exists('Headers', $other_translations[$email_template_id]) ) {
+					$other_translations[$email_template_id]['Headers'] = $parsed['Headers'];
 				}
 
-				$fields_hash = array_merge($fields_hash, $other_translations[$event_id]);
-				$this->Conn->doInsert($fields_hash, $this->_tables['emailevents'], 'REPLACE', false);
+				$fields_hash = array_merge($fields_hash, $other_translations[$email_template_id]);
+				$this->Conn->doInsert($fields_hash, $this->_tables['email-template'], 'REPLACE', false);
 			}
 
 			if ( $this->Application->isDebugMode() ) {
@@ -1045,7 +1045,7 @@
 
 			if ( isset($fields_hash) ) {
 				// at least one email event in language pack was found in database
-				$this->Conn->doInsert($fields_hash, $this->_tables['emailevents'], 'REPLACE');
+				$this->Conn->doInsert($fields_hash, $this->_tables['email-template'], 'REPLACE');
 			}
 		}
 
@@ -1157,15 +1157,15 @@
 		}
 
 		/**
-		 * Returns event id based on it's name and type
+		 * Returns e-mail template id based on it's name and type
 		 *
-		 * @param string $event_name
-		 * @param string $event_type
+		 * @param string $template_name
+		 * @param string $template_type
 		 * @return int
 		 */
-		function _getEventId($event_name, $event_type)
+		function _getEmailTemplateId($template_name, $template_type)
 		{
-			$cache_key = $event_name . '_' . $event_type;
+			$cache_key = $template_name . '_' . $template_type;
 
 			return array_key_exists($cache_key, $this->events_hash) ? $this->events_hash[$cache_key] : 0;
 		}
Index: core/units/languages/languages_config.php
===================================================================
--- core/units/languages/languages_config.php	(revision 15445)
+++ core/units/languages/languages_config.php	(working copy)
@@ -82,11 +82,11 @@
 			'prefixes' => Array(), 'format' => "!la_title_ExportLanguagePackResults!",
 		),
 		'events_list' => Array (
-			'prefixes' => Array ('lang', 'emailevents_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailEvents!",
+			'prefixes' => Array ('lang', 'email-template_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailTemplates!",
 		),
-		'email_messages_edit' => Array (
-			'prefixes' => Array ('lang', 'emailevents'),
-			'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailevents_titlefield#'",
+		'email_template_edit' => Array (
+			'prefixes' => Array ('lang', 'email-template'),
+			'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailTemplate! '#email-template_titlefield#'",
 			'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next'),
 		),
 		// for separate language list
@@ -99,7 +99,7 @@
 		'Default' => Array (
 			'general' => Array ('title' => 'la_tab_General', 't' => 'regional/languages_edit', 'priority' => 1),
 			'labels' => Array ('title' => 'la_tab_Labels', 't' => 'regional/languages_edit_phrases', 'priority' => 2),
-			'email_events' => Array ('title' => 'la_tab_EmailEvents', 't' => 'regional/languages_edit_email_events', 'priority' => 3),
+			'email_events' => Array ('title' => 'la_tab_EmailTemplates', 't' => 'regional/languages_edit_email_events', 'priority' => 3),
 		),
 	),
 
Index: core/units/languages/languages_event_handler.php
===================================================================
--- core/units/languages/languages_event_handler.php	(revision 15437)
+++ core/units/languages/languages_event_handler.php	(working copy)
@@ -275,11 +275,11 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			$email_message_helper = $this->Application->recallObject('kEmailMessageHelper');
-			/* @var $email_message_helper kEmailMessageHelper */
+			$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
+			/* @var $email_template_helper kEmailTemplateHelper */
 
-			$email_message_helper->parseField($object, 'HtmlEmailTemplate');
-			$email_message_helper->parseField($object, 'TextEmailTemplate');
+			$email_template_helper->parseField($object, 'HtmlEmailTemplate');
+			$email_template_helper->parseField($object, 'TextEmailTemplate');
 
 			$check_field = $object->GetDBField('TextEmailTemplate') ? 'TextEmailTemplate' : 'HtmlEmailTemplate';
 			$check_value = $object->GetDBField($check_field);
@@ -401,7 +401,7 @@
 			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->createFields('phrases');
-			$ml_helper->createFields('emailevents');
+			$ml_helper->createFields('email-template');
 
 			foreach ($pending_actions as $src_language => $dst_language) {
 				// phrases import
@@ -410,7 +410,7 @@
 				$this->Conn->Query($sql);
 
 				// events import
-				$sql = 'UPDATE ' . $this->Application->getUnitOption('emailevents', 'TableName') . '
+				$sql = 'UPDATE ' . $this->Application->getUnitOption('email-template', 'TableName') . '
 						SET
 							l' . $dst_language . '_Subject = l' . $src_language . '_Subject,
 							l' . $dst_language . '_HtmlBody = l' . $src_language . '_HtmlBody,
@@ -643,7 +643,7 @@
 
 				$data_types = Array (
 					'phrases' => 'ExportPhrases',
-					'emailevents' => 'ExportEmailEvents',
+					'email-template' => 'ExportEmailTemplates',
 					'country-state' => 'ExportCountries'
 				);
 
@@ -721,13 +721,13 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			// clean EmailEvents table
+			// clean EmailTemplates table
 			$fields_hash = Array (
 				'l' . $object->GetID() . '_Subject' => NULL,
 				'l' . $object->GetID() . '_HtmlBody' => NULL,
 				'l' . $object->GetID() . '_PlainTextBody' => NULL,
 			);
-			$this->Conn->doUpdate($fields_hash, $this->Application->getUnitOption('emailevents', 'TableName'), 1);
+			$this->Conn->doUpdate($fields_hash, $this->Application->getUnitOption('email-template', 'TableName'), 1);
 
 			// clean Phrases table
 			$fields_hash = Array (
Index: core/units/logs/email_logs/email_log_tp.php
===================================================================
--- core/units/logs/email_logs/email_log_tp.php	(revision 15437)
+++ core/units/logs/email_logs/email_log_tp.php	(working copy)
@@ -36,7 +36,7 @@
 		$block_params['name'] = $params['render_as'];
 
 		foreach ($other_recipients as $recipient_type => $recipients) {
-			if ( $recipient_type == EmailEvent::RECIPIENT_TYPE_TO ) {
+			if ( $recipient_type == EmailTemplate::RECIPIENT_TYPE_TO ) {
 				array_shift($recipients);
 			}
 
@@ -61,9 +61,9 @@
 	protected function RecipientType($params)
 	{
 		$heading_mapping = Array (
-			EmailEvent::RECIPIENT_TYPE_TO => 'To',
-			EmailEvent::RECIPIENT_TYPE_CC => 'Cc',
-			EmailEvent::RECIPIENT_TYPE_BCC => 'Bcc',
+			EmailTemplate::RECIPIENT_TYPE_TO => 'To',
+			EmailTemplate::RECIPIENT_TYPE_CC => 'Cc',
+			EmailTemplate::RECIPIENT_TYPE_BCC => 'Bcc',
 		);
 
 		$recipient_type = $this->Application->Parser->GetParam('recipient_type');
Index: core/units/logs/email_logs/email_logs_config.php
===================================================================
--- core/units/logs/email_logs/email_logs_config.php	(revision 15437)
+++ core/units/logs/email_logs/email_logs_config.php	(working copy)
@@ -82,7 +82,7 @@
 			'HtmlBody' => Array ('type' => 'string', 'default' => NULL),
 			'TextBody' => Array ('type' => 'string', 'default' => NULL),
 			'SentOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
-			'EventName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+			'TemplateName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 			'EventType' => Array (
 				'type' => 'int',
 				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1,
@@ -99,7 +99,7 @@
 					'From' => Array ('title' => 'column:la_fld_Sender', 'filter_block' => 'grid_like_filter', 'width' => 200),
 					'To' => Array ('title' => 'column:la_fld_Recipient', 'filter_block' => 'grid_like_filter', 'width' => 200),
 					'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200),
-					'EventName' => Array ('title' => 'column:la_fld_Event', 'filter_block' => 'grid_like_filter', 'width' => 170),
+					'TemplateName' => Array ('filter_block' => 'grid_like_filter', 'width' => 170),
 					'EventType' => Array ('title' => 'column:la_fld_Type', 'filter_block' => 'grid_options_filter', 'width' => 60),
 					'SentOn' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145),
 //					'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter'),
Index: core/units/logs/system_logs/system_log_eh.php
===================================================================
--- core/units/logs/system_logs/system_log_eh.php	(revision 15552)
+++ core/units/logs/system_logs/system_log_eh.php	(working copy)
@@ -75,7 +75,7 @@
 			'to_email' => $notification_email,
 		);
 
-		$this->Application->EmailEventAdmin('SYSTEM.LOG.NOTIFY', null, $send_params);
+		$this->Application->emailAdmin('SYSTEM.LOG.NOTIFY', null, $send_params);
 		$this->Application->removeObject($event->Prefix . '.email');
 
 		$object = $event->getObject(Array ('skip_autoload' => true));
Index: core/units/phrases/phrase_tp.php
===================================================================
--- core/units/phrases/phrase_tp.php	(revision 15437)
+++ core/units/phrases/phrase_tp.php	(working copy)
@@ -27,7 +27,14 @@
 		return $this->Application->GetVar('simple_mode') && (int)$this->Application->ConfigValue('UsePopups');
 	}
 
-	function PhraseCount($params)
+	/**
+	 * Returns phrase count for given module
+	 *
+	 * @param Array $params
+	 * @return int
+	 * @access protected
+	 */
+	protected function PhraseCount($params)
 	{
 		static $cache = null;
 
@@ -43,13 +50,20 @@
 		return array_key_exists($module, $cache) ? $cache[$module] : 0;
 	}
 
-	function EventCount($params)
+	/**
+	 * Returns e-mail template count for given module
+	 *
+	 * @param Array $params
+	 * @return int
+	 * @access protected
+	 */
+	protected function TemplateCount($params)
 	{
 		static $cache = null;
 
-		if (!isset($cache)) {
+		if ( !isset($cache) ) {
 			$sql = 'SELECT COUNT(*), IF(Module LIKE "Core:%", "Core", Module) AS Module
-					FROM ' . $this->Application->getUnitOption('emailevents', 'TableName') . '
+					FROM ' . $this->Application->getUnitOption('email-template', 'TableName') . '
 					GROUP BY Module';
 			$cache = $this->Conn->GetCol($sql, 'Module');
 		}
Index: core/units/phrases/phrases_config.php
===================================================================
--- core/units/phrases/phrases_config.php	(revision 15437)
+++ core/units/phrases/phrases_config.php	(working copy)
@@ -164,12 +164,12 @@
 				'use_phrases' => 1, 'default' => 0,
 			),
 			'ExportPhrases' => Array ('type' => 'string', 'default' => ''),
-			'ExportEmailEvents' => Array ('type' => 'string', 'default' => ''),
+			'ExportEmailTemplates' => Array ('type' => 'string', 'default' => ''),
 			'ExportCountries' => Array ('type' => 'string', 'default' => ''),
 			'ExportDataTypes' => Array (
 				'type' => 'string',
-				'formatter' => 'kOptionsFormatter', 'options' => Array ('phrases' => 'la_opt_Phrases', 'emailevents' => 'la_opt_EmailEvents', 'country-state' => 'la_opt_Countries'), 'use_phrases' => 1, 'multiple' => 1,
-				'default' => '|phrases|emailevents|country-state|'
+				'formatter' => 'kOptionsFormatter', 'options' => Array ('phrases' => 'la_opt_Phrases', 'email-template' => 'la_opt_EmailTemplates', 'country-state' => 'la_opt_Countries'), 'use_phrases' => 1, 'multiple' => 1,
+				'default' => '|phrases|email-template|country-state|'
 			),
 		),
 
Index: core/units/reviews/reviews_event_handler.php
===================================================================
--- core/units/reviews/reviews_event_handler.php	(revision 15569)
+++ core/units/reviews/reviews_event_handler.php	(working copy)
@@ -360,8 +360,8 @@
 
 				if ( $review_status == STATUS_ACTIVE || $review_status == STATUS_PENDING ) {
 					$email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'ADD' : 'ADD.PENDING');
-					$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
-					$this->Application->EmailEventAdmin($email_event);
+					$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'));
+					$this->Application->emailAdmin($email_event);
 				}
 			}
 		}
@@ -391,7 +391,7 @@
 					$this->_loadMainObject($event);
 
 					$email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'APPROVE' : 'DENY');
-					$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
+					$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'));
 				}
 			}
 		}
Index: core/units/site_domains/site_domain_eh.php
===================================================================
--- core/units/site_domains/site_domain_eh.php	(revision 15437)
+++ core/units/site_domains/site_domain_eh.php	(working copy)
@@ -271,7 +271,7 @@
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
-			$email_event_data = $this->Application->GetVar('emailevents_' . $event->Prefix);
+			$email_event_data = $this->Application->GetVar('email-template_' . $event->Prefix);
 			$object->SetDBField('DefaultEmailRecipients', $email_event_data[0]['Recipients']);
 
 			$this->_setRequired($event);
Index: core/units/spam_reports/spam_report_eh.php
===================================================================
--- core/units/spam_reports/spam_report_eh.php	(revision 15437)
+++ core/units/spam_reports/spam_report_eh.php	(working copy)
@@ -100,7 +100,7 @@
 			$object->SetDBField('ItemName', $item->GetDBField('ReviewText'));
 		}
 
-		$this->Application->EmailEventAdmin('SPAM.REPORT');
+		$this->Application->emailAdmin('SPAM.REPORT');
 	}
 
 	/**
Index: core/units/system_event_subscriptions/system_event_subscription_tp.php
===================================================================
--- core/units/system_event_subscriptions/system_event_subscription_tp.php	(revision 15437)
+++ core/units/system_event_subscriptions/system_event_subscription_tp.php	(working copy)
@@ -224,7 +224,7 @@
 		$event = new kEvent($this->_subscriptions->GetDBField('BindToSystemEvent'));
 
 		if ( !$event->Prefix ) {
-			throw new Exception('Subscription "<strong>#' . $this->_subscriptions->GetID() . '</strong>" is connected to invalid or missing e-mail event "<strong>#' . $this->_subscriptions->GetDBField('EmailEventId') . '</strong>"');
+			throw new Exception('Subscription "<strong>#' . $this->_subscriptions->GetID() . '</strong>" is connected to invalid or missing e-mail template "<strong>#' . $this->_subscriptions->GetDBField('EmailTemplateId') . '</strong>"');
 		}
 
 		return $event->Prefix;
Index: core/units/system_event_subscriptions/system_event_subscriptions_config.php
===================================================================
--- core/units/system_event_subscriptions/system_event_subscriptions_config.php	(revision 15563)
+++ core/units/system_event_subscriptions/system_event_subscriptions_config.php	(working copy)
@@ -71,15 +71,15 @@
 	'ListSQLs' => Array (
 		'' => '	SELECT %1$s.* %2$s
 				FROM %1$s
-				LEFT JOIN ' . TABLE_PREFIX . 'EmailEvents ee ON %1$s.EmailEventId = ee.EventId
+				LEFT JOIN ' . TABLE_PREFIX . 'EmailTemplates et ON %1$s.EmailTemplateId = et.TemplateId
 				LEFT JOIN ' . TABLE_PREFIX . 'Users u ON %1$s.UserId = u.PortalUserId
 				LEFT JOIN ' . TABLE_PREFIX . 'Categories c ON %1$s.CategoryId = c.CategoryId',
 	),
 
 	'CalculatedFields' => Array (
 		'' => Array (
-			'BindToSystemEvent' => 'ee.BindToSystemEvent',
-			'EmailEventName' => 'ee.Event',
+			'BindToSystemEvent' => 'et.BindToSystemEvent',
+			'EmailTemplateName' => 'et.TemplateName',
 			'Username' => 'CASE %1$s.UserId WHEN ' . USER_ROOT . ' THEN "root" WHEN ' . USER_GUEST . ' THEN "Guest" ELSE IF(CONCAT(u.FirstName, u.LastName) <> "", CONCAT(u.FirstName, " ", u.LastName), IF(%1$s.UserId IS NULL, "Guest", IF(u.Username = "", u.Email, u.Username))) END',
 			'CategoryName' => 'c.l%2$s_Name',
 			'ItemName' => '%1$s.ItemId',
@@ -95,9 +95,9 @@
 
 	'Fields' => Array (
 		'SubscriptionId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-		'EmailEventId' => Array (
+		'EmailTemplateId' => Array (
 			'type' => 'int',
-			'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'EmailEvents WHERE BindToSystemEvent <> "" ORDER BY Event ASC', 'option_key_field' => 'EventId', 'option_title_field' => 'BindToSystemEvent',
+			'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'EmailTemplates WHERE BindToSystemEvent <> "" ORDER BY TemplateName ASC', 'option_key_field' => 'TemplateId', 'option_title_field' => 'BindToSystemEvent',
 			'required' => 1, 'default' => NULL
 		),
 		'SubscriberEmail' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
@@ -115,7 +115,7 @@
 
 	'VirtualFields' => Array (
 		'Username' => Array ('type' => 'string', 'default' => ''),
-		'EmailEventName' => Array ('type' => 'string', 'default' => ''),
+		'EmailTemplateName' => Array ('type' => 'string', 'default' => ''),
 		'CategoryName' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => ''),
 	),
 
@@ -123,8 +123,8 @@
 		'Default' => Array (
 			'Fields' => Array (
 				'SubscriptionId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 80),
-				'EmailEventId' => Array ('title' => 'column:la_fld_SystemEvent', 'filter_block' => 'grid_options_filter', 'width' => 170),
-				'EmailEventName' => Array ('title' => 'column:la_fld_EmailEvent', 'filter_block' => 'grid_like_filter', 'width' => 170),
+				'EmailTemplateId' => Array ('title' => 'column:la_fld_SystemEvent', 'filter_block' => 'grid_options_filter', 'width' => 170),
+				'EmailTemplateName' => Array ('filter_block' => 'grid_like_filter', 'width' => 170),
 				'SubscriberEmail' => Array ('title' => 'column:la_fld_Email', 'filter_block' => 'grid_like_filter'),
 				'UserId' => Array ('title' => 'la_col_PortalUserId', 'filter_block' => 'grid_range_filter', 'width' => 80),
 				'Username' => Array ('filter_block' => 'grid_like_filter'),
Index: core/units/users/users_event_handler.php
===================================================================
--- core/units/users/users_event_handler.php	(revision 15590)
+++ core/units/users/users_event_handler.php	(working copy)
@@ -447,7 +447,7 @@
 			if ( ($event->status == kEvent::erSUCCESS) && $event->redirect ) {
 				$this->assignToPrimaryGroup($event);
 
-				$object->SendEmailEvents();
+				$object->sendEmails();
 				$this->autoLoginUser($event);
 			}
 		}
@@ -657,8 +657,8 @@
 	    	);
 
 			$user_id = $this->Application->RecallVar('user_id');
-			$email_sent = $this->Application->EmailEventUser('USER.SUGGEST', $user_id, $send_params);
-			$this->Application->EmailEventAdmin('USER.SUGGEST');
+			$email_sent = $this->Application->emailUser('USER.SUGGEST', $user_id, $send_params);
+			$this->Application->emailAdmin('USER.SUGGEST');
 
 			if ( $email_sent ) {
 				$event->SetRedirectParam('pass', 'all');
@@ -815,8 +815,8 @@
 				$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserGroupRelations');
 			}
 
-			$this->Application->EmailEventAdmin('USER.SUBSCRIBE');
-			$this->Application->EmailEventUser('USER.SUBSCRIBE', $object->GetID());
+			$this->Application->emailAdmin('USER.SUBSCRIBE');
+			$this->Application->emailUser('USER.SUBSCRIBE', $object->GetID());
 		}
 
 		/**
@@ -832,8 +832,8 @@
 					WHERE PortalUserId = ' . $user_id . ' AND GroupId = ' . $group_id;
 			$this->Conn->Query($sql);
 
-			$this->Application->EmailEventAdmin('USER.UNSUBSCRIBE');
-			$this->Application->EmailEventUser('USER.UNSUBSCRIBE', $user_id);
+			$this->Application->emailAdmin('USER.UNSUBSCRIBE');
+			$this->Application->emailUser('USER.UNSUBSCRIBE', $user_id);
 		}
 
 		/**
@@ -876,7 +876,7 @@
 			}
 
 			if ( $found && $allow_reset ) {
-				$this->Application->EmailEventUser('USER.PSWDC', $user->GetID());
+				$this->Application->emailUser('USER.PSWDC', $user->GetID());
 				$event->redirect = $this->Application->GetVar('template_success');
 
 				return;
@@ -1038,8 +1038,8 @@
 			if ($records) {
 				$conditions = Array();
 				foreach ($records as $record) {
-					$this->Application->EmailEventUser('USER.MEMBERSHIP.EXPIRATION.NOTICE', $record['PortalUserId']);
-					$this->Application->EmailEventAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE');
+					$this->Application->emailUser('USER.MEMBERSHIP.EXPIRATION.NOTICE', $record['PortalUserId']);
+					$this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE');
 					$conditions[] = '(PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'].')';
 				}
 				$sql = 'UPDATE '.TABLE_PREFIX.'UserGroupRelations
@@ -1056,8 +1056,8 @@
 			$user_ids = $this->Conn->GetCol($sql);
 			if ($user_ids) {
 				foreach ($user_ids as $id) {
-					$this->Application->EmailEventUser('USER.MEMBERSHIP.EXPIRED', $id);
-					$this->Application->EmailEventAdmin('USER.MEMBERSHIP.EXPIRED');
+					$this->Application->emailUser('USER.MEMBERSHIP.EXPIRED', $id);
+					$this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRED');
 				}
 			}
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroupRelations
@@ -1381,7 +1381,7 @@
 					$object->SetField('Password', $email_passwords[$temp_id]);
 					$object->SetField('VerifyPassword', $email_passwords[$temp_id]);
 
-					$this->Application->EmailEventUser($temp_id > 0 ? 'USER.NEW.PASSWORD': 'USER.ADD.BYADMIN', $object->GetID());
+					$this->Application->emailUser($temp_id > 0 ? 'USER.NEW.PASSWORD': 'USER.ADD.BYADMIN', $object->GetID());
 
 					unset($email_passwords[$temp_id]);
 					$this->Application->StoreVar('email_passwords', serialize($email_passwords));
@@ -1430,8 +1430,8 @@
 			$email_event = isset($status_events[$new_status]) ? $status_events[$new_status] : false;
 
 			if (($prev_status != $new_status) && $email_event) {
-				$this->Application->EmailEventUser($email_event, $user_id);
-				$this->Application->EmailEventAdmin($email_event);
+				$this->Application->emailUser($email_event, $user_id);
+				$this->Application->emailAdmin($email_event);
 			}
 
 			// deletes sessions from users, that are no longer active
@@ -1485,11 +1485,11 @@
 					'to_name' => trim($object->GetDBField('FirstName') . ' ' . $object->GetDBField('LastName')),
 				);
 
-				$this->Application->EmailEventUser('USER.EMAIL.CHANGE.UNDO', null, $send_params);
+				$this->Application->emailUser('USER.EMAIL.CHANGE.UNDO', null, $send_params);
 			}
 
 			if ( $new_email ) {
-				$this->Application->EmailEventUser('USER.EMAIL.CHANGE.VERIFY', $user_id);
+				$this->Application->emailUser('USER.EMAIL.CHANGE.VERIFY', $user_id);
 			}
 
 			// direct DB update, since USER.EMAIL.CHANGE.VERIFY puts verification code in user record, that we don't want to loose
@@ -1903,7 +1903,7 @@
 			$new_root_password = kUtil::generatePassword();
 
 			$this->Application->SetConfigValue('RootPass', $password_formatter->hashPassword($new_root_password));
-			$this->Application->EmailEventAdmin('ROOT.RESET.PASSWORD', null, Array ('password' => $new_root_password));
+			$this->Application->emailAdmin('ROOT.RESET.PASSWORD', null, Array ('password' => $new_root_password));
 
 			$event->SetRedirectParam('reset', 1);
 			$event->SetRedirectParam('pass', 'm');
Index: core/units/users/users_item.php
===================================================================
--- core/units/users/users_item.php	(revision 15454)
+++ core/units/users/users_item.php	(working copy)
@@ -53,18 +53,18 @@
 			return explode(',', $user_groups);
 		}
 
-		function SendEmailEvents()
+		function sendEmails()
 		{
 			switch ( $this->GetDBField('Status') ) {
 				case STATUS_ACTIVE:
 					$event_name = $this->Application->ConfigValue('User_Password_Auto') ? 'USER.VALIDATE' : 'USER.ADD';
-					$this->Application->EmailEventAdmin($event_name);
-					$this->Application->EmailEventUser($event_name, $this->GetID());
+					$this->Application->emailAdmin($event_name);
+					$this->Application->emailUser($event_name, $this->GetID());
 					break;
 
 				case STATUS_PENDING:
-					$this->Application->EmailEventAdmin('USER.ADD.PENDING');
-					$this->Application->EmailEventUser('USER.ADD.PENDING', $this->GetID());
+					$this->Application->emailAdmin('USER.ADD.PENDING');
+					$this->Application->emailUser('USER.ADD.PENDING', $this->GetID());
 					break;
 			}
 		}