Index: admin_templates/config/config_email_edit.tpl
===================================================================
--- admin_templates/config/config_email_edit.tpl	(revision 13128)
+++ admin_templates/config/config_email_edit.tpl	(working copy)
@@ -71,7 +71,7 @@
 		<inp2:m_RenderElement name="inp_edit_user" prefix="emailevents" field="FromUserId" title="la_fld_FromToUser"/>
 
 		<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Module" title="la_fld_Module"/>
-		<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Description" title="la_fld_Description" as_label="1"/>
+		<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Description" title="la_fld_Description"/>
 		<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Type" title="la_fld_Type"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: admin_templates/emails/mass_mail.tpl
===================================================================
--- admin_templates/emails/mass_mail.tpl	(revision 13128)
+++ admin_templates/emails/mass_mail.tpl	(working copy)
@@ -1,64 +0,0 @@
-<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_form"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-	  	<td>
-	  		<script type="text/javascript">
-	  			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_SendEmail" escape="1"/>', function() {
-							submit_event('emailmessages', 'OnMassMail');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('emailmessages', 'OnGoBack');
-						}
-				 ) );
-
-				a_toolbar.Render();
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:emailmessages_SaveWarning name="grid_save_warning"/>
-<inp2:emailmessages_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
-
-			<!-- recipients list -->
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_inc param="tab_index" by="1"/>
-				<td class="label-cell">
-					<inp2:m_phrase label="la_fld_To"/>:
-				</td>
-				<td class="control-mid">&nbsp;</td>
-				<td class="control-cell">
-					<inp2:m_DefineElement name="recipient_element">
-						&lt;<inp2:m_Param name="recipient_name"/>&gt;
-						<inp2:m_if check="m_Param" name="not_last">
-						;
-						</inp2:m_if>
-					</inp2:m_DefineElement>
-
-					<inp2:emailmessages_PrintRecipients render_as="recipient_element" strip_nl="2"/>
-				</td>
-			</tr>
-			<!-- // recipients list -->
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailmessages" field="MassSubject" title="la_fld_Subject" size="60"/>
-			<inp2:m_RenderElement name="inp_edit_upload" prefix="emailmessages" field="MassAttachment" title="la_fld_Attachment" size="60"/>
-		<inp2:m_RenderElement name="subsection" title="la_section_Message"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="MassHtmlMessage" title="la_fld_HtmlVersion" rows="10" cols="100"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="MassTextMessage" allow_html="0" title="la_fld_TextVersion" rows="10" cols="100"/>
-	</table>
-</div>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: admin_templates/emails/prepare_queue.tpl
===================================================================
--- admin_templates/emails/prepare_queue.tpl	(revision 13128)
+++ admin_templates/emails/prepare_queue.tpl	(working copy)
@@ -1,15 +0,0 @@
-<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_prepare"/>
-
-	<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
-	<script type="text/javascript">
-		function cancel_action() {
-			redirect('<inp2:m_Link template="emails/send_complete"/>');
-		}
-
-		$QueueProcessor = new AjaxProgressBar('<inp2:m_t template="index" emailmessages_event="OnPrepareEmailQueue" finish_template="emails/send_queue" pass="m,emailmessages" no_amp="1"/>');
-	</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: admin_templates/emails/send_complete.tpl
===================================================================
--- admin_templates/emails/send_complete.tpl	(revision 13128)
+++ admin_templates/emails/send_complete.tpl	(working copy)
@@ -1,28 +0,0 @@
-<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"/>
-
-<script type="text/javascript">
-	function close_window() {
-		var $opener = getWindowOpener(window);
-		if ($opener) {
-			$opener.location.reload();
-		}
-
-		window_close();
-	}
-</script>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_prompt_EmailCompleteMessage"/>
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<td colspan="3" align="center">
-				<input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="close_window();"/>
-			</td>
-		</tr>
-	</table>
-</div>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: admin_templates/emails/send_queue.tpl
===================================================================
--- admin_templates/emails/send_queue.tpl	(revision 13128)
+++ admin_templates/emails/send_queue.tpl	(working copy)
@@ -1,15 +0,0 @@
-<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="ajax_progress_bar" cancel_action="cancel_action();"/>
-<script type="text/javascript">
-	function cancel_action() {
-		redirect('<inp2:m_Link template="emails/send_complete"/>');
-	}
-
-	$QueueProcessor = new AjaxProgressBar('<inp2:m_t template="index" emailevents_event="OnProcessEmailQueue" type="return_progress" finish_template="emails/send_complete" pass="m,emailevents" no_amp="1"/>');
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: admin_templates/groups/groups_list.tpl
===================================================================
--- admin_templates/groups/groups_list.tpl	(revision 13128)
+++ admin_templates/groups/groups_list.tpl	(working copy)
@@ -30,15 +30,6 @@
 
 					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-					/*<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
-						<inp2:m_if check="m_Recall" name="user_id" equals_to="-1">
-							a_toolbar.AddButton( new ToolBarButton('e-mail', '<inp2:m_phrase label="la_ToolTip_SendMail" escape="1"/>', function() {
-								openSelector('emailmessages', '<inp2:m_Link template="emails/mass_mail"/>', 'UserEmail', null, 'OnPrepareMassRecipients');
-								}
-							) );
-						</inp2:m_if>
-					</inp2:m_if>*/
-
 					<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
 						a_toolbar.AddButton(
 							new ToolBarButton(
Index: admin_templates/incs/grid_blocks.tpl
===================================================================
--- admin_templates/incs/grid_blocks.tpl	(revision 13128)
+++ admin_templates/incs/grid_blocks.tpl	(working copy)
@@ -885,4 +885,21 @@
 	<inp2:m_RenderElement name="nlsmenu_declaration" pass_params="true"/>
 
 	$ViewMenus = new Array('<inp2:m_param name="PrefixSpecial"/>');
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_ml_selector">
+	<inp2:m_if check="lang_IsMultiLanguage">
+		<inp2:m_phrase name="la_fld_Language"/>:
+		<select name="language" onchange="submit_event('<inp2:m_param name='prefix'/>', 'OnPreSaveAndChangeLanguage');">
+			<inp2:m_DefineElement name="lang_elem">
+				<option value="<inp2:Field name='LanguageId'/>" <inp2:m_if check="SelectedLanguage" type="data">selected="selected"</inp2:m_if> ><inp2:Field name="LocalName" no_special='no_special' /></option>
+			</inp2:m_DefineElement>
+			<inp2:lang_PrintList render_as="lang_elem"/>
+		</select>
+	<inp2:m_else/>
+		<inp2:m_if check="m_Param" name="pagination">
+			<inp2:$prefix_SelectParam possible_names="pagination_prefix,prefix" result_to_var="pagination_prefix"/>
+			<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$pagination_prefix" pass_params="1"/>
+		</inp2:m_if>
+	</inp2:m_if>
 </inp2:m_DefineElement>
\ No newline at end of file
Index: admin_templates/languages/email_message_edit.tpl
===================================================================
--- admin_templates/languages/email_message_edit.tpl	(revision 13128)
+++ admin_templates/languages/email_message_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="emailmessages" title_preset="email_messages_edit_direct"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="emailevents" title_preset="email_messages_edit_direct"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,18 +11,18 @@
   		<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('emailmessages','<inp2:emailmessages_SaveEvent/>');
+							submit_event('emailevents','<inp2:emailevents_SaveEvent/>');
 						}
 					) );
 
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							cancel_edit('emailmessages','OnCancelEdit','<inp2:emailmessages_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+							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('emailmessages', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+						reset_form('emailevents', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
 					}
 			 	) );
 
@@ -30,29 +30,34 @@
 
 			</script>
 		</td>
+
+		<inp2:m_RenderElement name="ml_selector" prefix="emailevents"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:emailmessages_SaveWarning name="grid_save_warning"/>
-<inp2:emailmessages_ErrorWarning name="form_error_warning"/>
+<inp2:emailevents_SaveWarning name="grid_save_warning"/>
+<inp2:emailevents_ErrorWarning name="form_error_warning"/>
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailevents" field="EventId"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="emailmessages" fields="Description,Subject,MessageType,Headers" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="LanguageId"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="EventId"/>
+		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="EventId,Event,Subject,Enabled,FrontEndOnly,FromUserId,Module,Description,Type,MessageType,Headers" title="!la_section_General!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="emailevents" field="EventId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="Event" title="la_fld_Event"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="Subject" title="la_fld_Subject"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="Description" title="la_fld_Description" control_options="{max_height: 50}"/>
+			<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_checkbox" prefix="emailevents" field="Enabled" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="emailevents" field="FrontEndOnly" title="la_fld_FrontEndOnly"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="emailevents" field="FromUserId" title="la_fld_FromToUser"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="Type" title="la_fld_Type"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="emailevents" field="Module" title="la_fld_Module" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents" field="MessageType" title="la_fld_MessageType"/>
 
-			<inp2:m_RenderElement name="inp_label" prefix="emailmessages" field="Description" title="!la_fld_Description!" as_label="1"/>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailmessages" field="Subject" title="!la_fld_Subject!" size="60"/>
-
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailmessages" field="MessageType" title="!la_fld_MessageType!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="Headers" title="!la_fld_ExtraHeaders!" control_options="{max_height: 50}"/>
-
-		<inp2:m_RenderElement name="subsection" prefix="emailmessages" fields="Body" title="!la_section_Message!"/>
-
-		<inp2:m_RenderElement name="inp_edit_fck" prefix="emailmessages" field="Body" title="!la_fld_ExtraHeaders!" rows="5" cols="60" control_options="{min_height: 200}"/>
+		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="Body" title="!la_section_Message!"/>
+			<inp2:m_RenderElement name="inp_edit_fck" prefix="emailevents" field="Body" title="la_fld_MessageBody" rows="5" cols="60" control_options="{min_height: 200}"/>
+			<!-- <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="Body" title="la_fld_MessageBody" control_options="{min_height: 200}"/>  -->
 		<inp2:m_RenderElement name="inp_edit_filler" control_options="{max_height: 8}"/>
 	</table>
 </div>
Index: admin_templates/languages/email_message_list.tpl
===================================================================
--- admin_templates/languages/email_message_list.tpl	(revision 13128)
+++ admin_templates/languages/email_message_list.tpl	(working copy)
@@ -1,21 +1,39 @@
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="emailmessages.st" grid="Emails" title_preset="email_messages_direct_list"/>
 
+<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="emailevents" grid="Emails" title_preset="email_messages_direct_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()
-	  			{
-	  				set_hidden_field('remove_specials[emailmessages.st]', 1);
-	  				std_edit_item('emailmessages.st', 'languages/email_message_edit');
+  				function edit() {
+	  				std_edit_item('emailevents', 'languages/email_message_edit');
 	  			}
 
   				a_toolbar = new ToolBar();
+
+  				a_toolbar.AddButton(
+  		  			new ToolBarButton(
+  		  		  		'new_item',
+  		  		  		'<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('emailevents', 'languages/email_message_edit');
+						}
+					)
+				);
+
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'delete',
+						'<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('emailevents');
+						}
+					)
+				);
 
 				<inp2:m_if check="m_IsDebugMode">
 					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
@@ -25,8 +43,7 @@
 							'approve',
 							'<inp2:m_phrase label="la_ToolTip_Enable" escape="1"/>',
 							function() {
-								set_hidden_field('remove_specials[emailmessages.st]', 1);
-								submit_event('emailmessages.st', 'OnMassApprove');
+								submit_event('emailevents', 'OnMassApprove');
 							}
 						)
 					);
@@ -36,8 +53,7 @@
 							'decline',
 							'<inp2:m_phrase label="la_ToolTip_Disable" escape="1"/>',
 							function() {
-								set_hidden_field('remove_specials[emailmessages.st]', 1);
-								submit_event('emailmessages.st', 'OnMassDecline');
+								submit_event('emailevents', 'OnMassDecline');
 							}
 						)
 					);
@@ -54,7 +70,7 @@
 
 			</script>
 		</td>
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailmessages.st" grid="Emails"/>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailevents" grid="Emails"/>
 	</tr>
 </tbody>
 </table>
@@ -75,8 +91,8 @@
 	</inp2:m_ifnot>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="emailmessages.st" IdField="EmailMessageId" grid="Emails" row_class_render_as="row_class"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="emailevents" IdField="EventId" grid="Emails" row_class_render_as="row_class"/>
 <script type="text/javascript">
-	Grids['emailmessages.st'].SetDependantToolbarButtons( new Array('edit', 'approve', 'decline') );
+	Grids['emailevents'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline') );
 </script>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: admin_templates/logs/email_logs/email_queue_list.tpl
===================================================================
--- admin_templates/logs/email_logs/email_queue_list.tpl	(revision 13128)
+++ 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('emailmessages', null, 'emails/send_queue');
+										open_popup('emailevents', null, 'mailing_lists/send_queue');
 									}
 				 				)
 				 			);
Index: admin_templates/mailing_lists/send_queue.tpl
===================================================================
--- admin_templates/mailing_lists/send_queue.tpl	(revision 13128)
+++ admin_templates/mailing_lists/send_queue.tpl	(working copy)
@@ -6,10 +6,10 @@
 <inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 <script type="text/javascript">
 	function cancel_action() {
-		redirect('<inp2:m_Link template="emails/send_complete"/>');
+		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="emails/send_complete" pass="m,emailevents" no_amp="1"/>');
+	$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"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: admin_templates/regional/email_messages_edit.tpl
===================================================================
--- admin_templates/regional/email_messages_edit.tpl	(revision 13128)
+++ admin_templates/regional/email_messages_edit.tpl	(working copy)
@@ -11,12 +11,12 @@
   		<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('emailmessages','<inp2:m_if check="emailmessages_PropertyEquals" property="ID" value="0" >OnCreate<inp2:m_else/>OnUpdate</inp2:m_if>');
+							submit_event('emailevents','<inp2:emailevents_SaveEvent/>');
 						}
 					) );
 
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('emailmessages','OnCancel');
+							submit_event('emailevents','OnCancel');
 						}
 				 ) );
 
@@ -28,20 +28,23 @@
 </tbody>
 </table>
 
-<inp2:emailmessages_SaveWarning name="grid_save_warning"/>
-<inp2:emailmessages_ErrorWarning name="form_error_warning"/>
+<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" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="LanguageId"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="EventId"/>
-			<!-- <inp2:m_RenderElement name="inp_label" prefix="emailmessages" field="Type" title="!la_fld_EventType!"/> -->
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailmessages" field="Subject" title="!la_fld_Subject!" size="60"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailmessages" field="MessageType" title="!la_fld_MessageType!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="Headers" title="!la_fld_ExtraHeaders!" allow_html="0" control_options="{min_height: 50}" rows="3" cols="60"/>
+			<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_EventType!"/> ##-->
+
+			<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_radio" prefix="emailevents" field="MessageType" title="!la_fld_MessageType!"/>
+			<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" prefix="emailmessages" field="Body" title="!la_fld_MessageBody!" control_options="{min_height: 200}" rows="20" cols="85"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="l{$language_id}_Body" title="!la_fld_MessageBody!" control_options="{min_height: 200}" rows="20" cols="85"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
 
Index: admin_templates/users/users_list.tpl
===================================================================
--- admin_templates/users/users_list.tpl	(revision 13128)
+++ admin_templates/users/users_list.tpl	(working copy)
@@ -55,16 +55,6 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				/*<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
-					<inp2:m_if check="m_Recall" name="user_id" equals_to="-1">
-						a_toolbar.AddButton( new ToolBarButton('e-mail', '<inp2:m_phrase label="la_ToolTip_SendMail" escape="1"/>', function() {
-									set_hidden_field('remove_specials[u.regular]', 1);
-									openSelector('emailmessages', '<inp2:m_Link template="emails/mass_mail"/>', 'UserEmail', null, 'OnPrepareMassRecipients');
-								}
-						 ) );
-					</inp2:m_if>
-				</inp2:m_if>*/
-
 				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
 					a_toolbar.AddButton(
 						new ToolBarButton(
Index: install/english.lang
===================================================================
--- install/english.lang	(revision 13128)
+++ install/english.lang	(working copy)
@@ -535,32 +535,6 @@
 			<PHRASE Label="la_err_required" Module="Core" Type="1">RmllbGQgaXMgcmVxdWlyZWQ=</PHRASE>
 			<PHRASE Label="la_err_unique" Module="Core" Type="1">RmllbGQgdmFsdWUgbXVzdCBiZSB1bmlxdWU=</PHRASE>
 			<PHRASE Label="la_err_value_out_of_range" Module="Core" Type="1">RmllbGQgaXMgb3V0IG9mIHJhbmdlLCBwb3NzaWJsZSB2YWx1ZXMgZnJvbSAlcyB0byAlcw==</PHRASE>
-			<PHRASE Label="la_event_category.add" Module="Core" Type="1">QWRkIENhdGVnb3J5</PHRASE>
-			<PHRASE Label="la_event_category.add.pending" Module="Core" Type="1">QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=</PHRASE>
-			<PHRASE Label="la_event_category.approve" Module="Core" Type="1">QXBwcm92ZSBDYXRlZ29yeQ==</PHRASE>
-			<PHRASE Label="la_event_category.deny" Module="Core" Type="1">RGVueSBDYXRlZ29yeQ==</PHRASE>
-			<PHRASE Label="la_event_common.footer" Module="Core" Type="1">Q29tbW9uIEZvb3RlciBUZW1wbGF0ZQ==</PHRASE>
-			<PHRASE Label="la_event_FormSubmitted" Module="Core" Type="1">VGhpcyBlLW1haWwgaXMgc2VudCB0byBhIHVzZXIgYWZ0ZXIgZmlsbGluZyBpbiB0aGUgQ29udGFjdCBVcyBmb3Jt</PHRASE>
-			<PHRASE Label="la_event_link.add" Module="Core" Type="1">QWRkIExpbms=</PHRASE>
-			<PHRASE Label="la_event_link.add.pending" Module="Core" Type="1">QWRkIFBlbmRpbmcgTGluaw==</PHRASE>
-			<PHRASE Label="la_event_link.approve" Module="Core" Type="1">QXBwcm92ZSBQZW5kaW5nIExpbms=</PHRASE>
-			<PHRASE Label="la_event_link.deny" Module="Core" Type="1">RGVueSBMaW5r</PHRASE>
-			<PHRASE Label="la_event_link.modify.approve" Module="Core" Type="1">QXBwcm92ZSBMaW5rIE1vZGlmaWNhdGlvbg==</PHRASE>
-			<PHRASE Label="la_event_link.modify.deny" Module="Core" Type="1">RGVjbGluZSBsaW5rIG1vZGlmaWNhdGlvbg==</PHRASE>
-			<PHRASE Label="la_event_link.modify.pending" Module="Core" Type="1">TGluayBNb2RpZmljYXRpb24gUGVuZGluZw==</PHRASE>
-			<PHRASE Label="la_event_pm.add" Module="Core" Type="1">TmV3IFByaXZhdGUgTWVzc2FnZQ==</PHRASE>
-			<PHRASE Label="la_event_user.add" Module="Core" Type="1">QWRkIFVzZXI=</PHRASE>
-			<PHRASE Label="la_event_user.add.pending" Module="Core" Type="1">QWRkIFBlbmRpbmcgVXNlcg==</PHRASE>
-			<PHRASE Label="la_event_user.approve" Module="Core" Type="1">QXBwcm92ZSBVc2Vy</PHRASE>
-			<PHRASE Label="la_event_user.deny" Module="Core" Type="1">RGVueSBVc2Vy</PHRASE>
-			<PHRASE Label="la_event_user.forgotpw" Module="Core" Type="1">Rm9yZ290IFBhc3N3b3Jk</PHRASE>
-			<PHRASE Label="la_event_user.membership_expiration_notice" Module="Core" Type="1">TWVtYmVyc2hpcCBleHBpcmF0aW9uIG5vdGljZQ==</PHRASE>
-			<PHRASE Label="la_event_user.membership_expired" Module="Core" Type="1">TWVtYmVyc2hpcCBleHBpcmVk</PHRASE>
-			<PHRASE Label="la_event_user.pswd_confirm" Module="Core" Type="1">UGFzc3dvcmQgQ29uZmlybWF0aW9u</PHRASE>
-			<PHRASE Label="la_event_user.subscribe" Module="Core" Type="1">VXNlciBzdWJzY3JpYmVk</PHRASE>
-			<PHRASE Label="la_event_user.suggest" Module="Core" Type="1">U3VnZ2VzdCB0byBhIGZyaWVuZA==</PHRASE>
-			<PHRASE Label="la_event_user.unsubscribe" Module="Core" Type="1">VXNlciB1bnN1YnNjcmliZWQ=</PHRASE>
-			<PHRASE Label="la_event_user.validate" Module="Core" Type="1">VmFsaWRhdGUgVXNlcg==</PHRASE>
 			<PHRASE Label="la_exportfoldernotwritable" Module="Core" Type="1">RXhwb3J0IGZvbGRlciBpcyBub3Qgd3JpdGFibGU=</PHRASE>
 			<PHRASE Label="la_fck_ErrorCreatingFolder" Module="Core" Type="1">RXJyb3IgY3JlYXRpbmcgZm9sZGVyLiBFcnJvciBudW1iZXI6</PHRASE>
 			<PHRASE Label="la_fck_ErrorFileName" Module="Core" Type="1">UGxlYXNlIG5hbWUgeW91ciBmaWxlcyB0byBiZSB3ZWItZnJpZW5kbHkuIFdlIHJlY29tbWVuZCB1c2luZyBvbmx5IHRoZXNlIGNoYXJhY3RlcnMgaW4gZmlsZSBuYW1lczogDQpMZXR0ZXJzIGEteiwgQS1aLCBOdW1iZXJzIDAtOSwgIl8iICh1bmRlcnNjb3JlKSwgIi0iIChkYXNoKSwgIiAiIChzcGFjZSksICIuIiAocGVyaW9kKQ0KUGxlYXNlIGF2b2lkIHVzaW5nIGFueSBvdGhlciBjaGFyYWN0ZXJzIGxpa2UgcXVvdGVzLCBicmFja2V0cywgcXVvdGF0aW9uIG1hcmtzLCAiPyIsICIhIiwgIj0iLCBmb3JlaWduIHN5bWJvbHMsIGV0Yy4=</PHRASE>
@@ -1380,6 +1354,7 @@
 			<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>
Index: install/install_data.sql
===================================================================
--- install/install_data.sql	(revision 13128)
+++ install/install_data.sql	(working copy)
@@ -239,38 +239,38 @@
 INSERT INTO ItemTypes VALUES (1, 'In-Portal', 'c', 'Category', 'Name', 'CreatedById', NULL, NULL, 'la_ItemTab_Categories', 1, 'admin/category/addcategory.php', 'clsCategory', 'Category');
 INSERT INTO ItemTypes VALUES (6, 'In-Portal', 'u', 'PortalUser', 'Login', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User');
 
-INSERT INTO Events VALUES(DEFAULT, 'USER.ADD', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.add', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.ADD', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.add', 1);
-INSERT INTO Events VALUES(DEFAULT, 'USER.APPROVE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.approve', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.APPROVE', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.approve', 1);
-INSERT INTO Events VALUES(DEFAULT, 'USER.VALIDATE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.validate', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.VALIDATE', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.validate', 1);
-INSERT INTO Events VALUES(DEFAULT, 'USER.DENY', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.deny', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.DENY', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.deny', 1);
-INSERT INTO Events VALUES(DEFAULT, 'USER.PSWD', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.forgotpw', 1);
-INSERT INTO Events VALUES(DEFAULT, 'USER.PSWD', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.forgotpw', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.ADD.PENDING', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.add.pending', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.ADD.PENDING', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.add.pending', 1);
-INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.add', 0);
-INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.add.pending', 0);
-INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.add.pending', 1);
-INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 1, NULL, 'Core:Category', 'la_event_category.add', 1);
-INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.APPROVE', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.approve', 0);
-INSERT INTO Events VALUES(DEFAULT, 'CATEGORY.DENY', NULL, 1, 0, NULL, 'Core:Category', 'la_event_category.deny', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.subscribe', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.subscribe', 1);
-INSERT INTO Events VALUES(DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.unsubscribe', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.unsubscribe', 1);
-INSERT INTO Events VALUES(DEFAULT, 'USER.SUGGEST', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.suggest', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.SUGGEST', NULL, 1, 1, NULL, 'Core:Users', 'la_event_user.suggest', 1);
-INSERT INTO Events VALUES(DEFAULT, 'USER.PSWDC', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.pswd_confirm', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.membership_expired', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.membership_expired', 1);
-INSERT INTO Events VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.membership_expiration_notice', 0);
-INSERT INTO Events VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, NULL, 'Core:Users', 'la_event_user.membership_expiration_notice', 1);
-INSERT INTO Events VALUES(DEFAULT, 'COMMON.FOOTER', NULL, 1, 0, NULL, 'Core', 'la_event_common.footer', 1);
-INSERT INTO Events VALUES(DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, NULL, 'Core:Category', 'la_event_FormSubmitted', 1);
-INSERT INTO Events VALUES(DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, NULL, 'Core:Category', 'la_event_FormSubmitted', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.ADD', NULL, 1, 0, NULL, 'Core:Users', 'Add User', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.ADD', NULL, 1, 1, NULL, 'Core:Users', 'Add User', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.APPROVE', NULL, 1, 0, NULL, 'Core:Users', 'Approve User', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.APPROVE', NULL, 1, 1, NULL, 'Core:Users', 'Approve User', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.VALIDATE', NULL, 1, 0, NULL, 'Core:Users', 'Validate User', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.VALIDATE', NULL, 1, 1, NULL, 'Core:Users', 'Validate User', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.DENY', NULL, 1, 0, NULL, 'Core:Users', 'Deny User', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.DENY', NULL, 1, 1, NULL, 'Core:Users', 'Deny User', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.PSWD', NULL, 1, 1, NULL, 'Core:Users', 'Forgot Password', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.PSWD', NULL, 1, 0, NULL, 'Core:Users', 'Forgot Password', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.ADD.PENDING', NULL, 1, 0, NULL, 'Core:Users', 'Add Pending User', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.ADD.PENDING', NULL, 1, 1, NULL, 'Core:Users', 'Add Pending User', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 0, NULL, 'Core:Category', 'Add Category', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 0, NULL, 'Core:Category', 'Add Pending Category', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 1, NULL, 'Core:Category', 'Add Pending Category', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'CATEGORY.ADD', NULL, 1, 1, NULL, 'Core:Category', 'Add Category', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'CATEGORY.APPROVE', NULL, 1, 0, NULL, 'Core:Category', 'Approve Category', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'CATEGORY.DENY', NULL, 1, 0, NULL, 'Core:Category', 'Deny Category', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 0, NULL, 'Core:Users', 'User subscribed', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 1, NULL, 'Core:Users', 'User subscribed', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 0, NULL, 'Core:Users', 'User unsubscribed', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 1, NULL, 'Core:Users', 'User unsubscribed', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.SUGGEST', NULL, 1, 0, NULL, 'Core:Users', 'Suggest to a friend', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.SUGGEST', NULL, 1, 1, NULL, 'Core:Users', 'Suggest to a friend', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.PSWDC', NULL, 1, 0, NULL, 'Core:Users', 'Password Confirmation', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, NULL, 'Core:Users', 'Membership expired', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, NULL, 'Core:Users', 'Membership expired', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, NULL, 'Core:Users', 'Membership expiration notice', 0);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, NULL, 'Core:Users', 'Membership expiration notice', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'COMMON.FOOTER', NULL, 1, 0, NULL, 'Core', 'Common Footer Template', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, NULL, 'Core:Category', 'This e-mail is sent to a user after filling in the Contact Us form', 1);
+INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, FromUserId, Module, l1_Description, Type) VALUES(DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, NULL, 'Core:Category', 'This e-mail is sent to a user after filling in the Contact Us form', 0);
 
 INSERT INTO IdGenerator VALUES ('100');
 
@@ -637,7 +637,9 @@
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:phrases.delete', 11, 1, 1, 0);
 
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configemail.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configemail.add', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configemail.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configemail.delete', 11, 1, 1, 0);
 
 INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 11, 1, 0, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.ADD', 11, 1, 0, 0);
Index: install/install_schema.sql
===================================================================
--- install/install_schema.sql	(revision 13128)
+++ install/install_schema.sql	(working copy)
@@ -69,16 +69,6 @@
   UNIQUE KEY VariableName (VariableName)
 );
 
-CREATE TABLE EmailMessage (
-  EmailMessageId int(10) NOT NULL auto_increment,
-  Template longtext,
-  MessageType enum('html','text') NOT NULL default 'text',
-  LanguageId int(11) NOT NULL default '0',
-  EventId int(11) NOT NULL default '0',
-  `Subject` text,
-  PRIMARY KEY  (EmailMessageId)
-);
-
 CREATE TABLE EmailQueue (
   EmailQueueId int(10) unsigned NOT NULL AUTO_INCREMENT,
   ToEmail varchar(255) NOT NULL DEFAULT '',
@@ -103,19 +93,35 @@
 );
 
 CREATE TABLE Events (
-  EventId int(11) NOT NULL auto_increment,
-  Event varchar(40) NOT NULL default '',
+  EventId int(11) NOT NULL AUTO_INCREMENT,
+  `Event` varchar(40) NOT NULL DEFAULT '',
   ReplacementTags text,
-  Enabled int(11) NOT NULL default '1',
-  FrontEndOnly tinyint(3) unsigned NOT NULL default '0',
-  FromUserId int(11) default NULL,
-  Module varchar(40) NOT NULL default '',
-  Description varchar(255) NOT NULL default '',
-  `Type` int(11) NOT NULL default '0',
-  PRIMARY KEY  (EventId),
+  l1_Subject text,
+  l2_Subject text,
+  l3_Subject text,
+  l4_Subject text,
+  l5_Subject text,
+  l1_Body longtext,
+  l2_Body longtext,
+  l3_Body longtext,
+  l4_Body longtext,
+  l5_Body longtext,
+  Headers text,
+  MessageType varchar(4) NOT NULL DEFAULT 'text',
+  Enabled int(11) NOT NULL DEFAULT '1',
+  FrontEndOnly tinyint(3) unsigned NOT NULL DEFAULT '0',
+  FromUserId int(11) DEFAULT NULL,
+  Module varchar(40) NOT NULL DEFAULT '',
+  l1_Description text,
+  l2_Description text,
+  l3_Description text,
+  l4_Description text,
+  l5_Description text,
+  `Type` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (EventId),
   KEY `Type` (`Type`),
   KEY Enabled (Enabled),
-  KEY Event (Event),
+  KEY `Event` (`Event`),
   KEY FrontEndOnly (FrontEndOnly)
 );
 
Index: install/remove_schema.sql
===================================================================
--- install/remove_schema.sql	(revision 13128)
+++ install/remove_schema.sql	(working copy)
@@ -3,7 +3,6 @@
 DROP TABLE CustomField;
 DROP TABLE ConfigurationAdmin;
 DROP TABLE ConfigurationValues;
-DROP TABLE EmailMessage;
 DROP TABLE EmailQueue;
 DROP TABLE EmailSubscribers;
 DROP TABLE Events;
Index: install/upgrades.php
===================================================================
--- install/upgrades.php	(revision 13128)
+++ install/upgrades.php	(working copy)
@@ -1318,4 +1318,60 @@
 				}
 			}
 		}
+
+		/**
+		 * Update to 5.1.0-B1; Makes email message fields multilingual
+		 *
+		 * @param string $mode when called mode {before, after)
+		 */
+		function Upgrade_5_1_0_B1($mode)
+		{
+			if ($mode == 'before') {
+				$table_structure = $this->Conn->Query('DESCRIBE ' . TABLE_PREFIX . 'Events', 'Field');
+
+				if (!array_key_exists('Headers', $table_structure)) {
+					$sql = 'ALTER TABLE ' . TABLE_PREFIX . 'Events
+							ADD `Headers` TEXT NULL AFTER `ReplacementTags`,
+							ADD `MessageType` VARCHAR(4) NOT NULL default "text" AFTER `Headers`';
+					$this->Conn->Query($sql);
+				}
+
+				// create multilingual Subject and Template fields
+				$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+				$ml_helper->createFields('emailevents');
+
+				$email_message_helper =& $this->Application->recallObject('EmailMessageHelper');
+				/* @var $email_message_helper EmailMessageHelper */
+
+				for ($language_id = 1; $language_id <= $ml_helper->languageCount; $language_id++) {
+					if (!$ml_helper->LanguageFound($language_id)) {
+						continue;
+					}
+
+					$sql = 'SELECT EmailMessageId, Template, EventId
+							FROM ' . TABLE_PREFIX . 'EmailMessage
+							WHERE LanguageId = ' . $language_id;
+					$translations = $this->Conn->Query($sql, 'EventId');
+
+					foreach ($translations as $event_id => $translation_data) {
+						$parsed = $email_message_helper->parseTemplate($translation_data['Template']);
+
+						$fields_hash = Array (
+							'l' . $language_id . '_Subject' => $parsed['Subject'],
+							'l' . $language_id . '_Body' => $parsed['Body'],
+						);
+
+						if ($parsed['Headers']) {
+							$fields_hash['Headers'] = $parsed['Headers'];
+						}
+
+						$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Events', 'EventId = ' . $event_id);
+
+						$sql = 'DELETE FROM ' . TABLE_PREFIX . 'EmailMessage
+								WHERE EmailMessageId = ' . $translation_data['EmailMessageId'];
+						$this->Conn->Query($sql);
+					}
+				}
+			}
+		}
 	}
\ No newline at end of file
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql	(revision 13128)
+++ install/upgrades.sql	(working copy)
@@ -1620,4 +1620,28 @@
 
 # ===== v 5.0.2-RC1 =====
 
-# ===== v 5.0.2 =====
\ No newline at end of file
+# ===== v 5.0.2 =====
+
+# ===== v 5.1.0-B1 =====
+DROP TABLE EmailMessage;
+DELETE FROM PersistantSessionData WHERE VariableName = 'emailevents_columns_.';
+
+INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId)
+SELECT 'in-portal:configemail.add' AS Permission, GroupId, PermissionValue, Type, CatId
+FROM <%TABLE_PREFIX%>Permissions
+WHERE Permission = 'in-portal:configemail.edit';
+
+INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId)
+SELECT 'in-portal:configemail.delete' AS Permission, GroupId, PermissionValue, Type, CatId
+FROM <%TABLE_PREFIX%>Permissions
+WHERE Permission = 'in-portal:configemail.edit';
+
+UPDATE Events e
+SET e.l1_Description = (
+	SELECT p.Translation
+	FROM <%TABLE_PREFIX%>Phrase p
+	WHERE (p.Phrase = e.Description) AND (p.LanguageId = 1)
+);
+
+ALTER TABLE Events DROP Description;
+DELETE FROM Phrase WHERE Phrase LIKE 'la_event_%';
Index: kernel/db/db_event_handler.php
===================================================================
--- kernel/db/db_event_handler.php	(revision 13128)
+++ kernel/db/db_event_handler.php	(working copy)
@@ -71,6 +71,8 @@
 		 */
 		function CheckPermission(&$event)
 		{
+			$section = $event->getSection();
+
 			if (!$this->Application->isAdmin) {
 				$allow_events = Array('OnSearch', 'OnSearchReset', 'OnNew');
 				if (in_array($event->Name, $allow_events)) {
@@ -78,8 +80,11 @@
 					return true;
 				}
 			}
+			elseif (($event->Name == 'OnPreSaveAndChangeLanguage') && !$this->UseTempTables($event)) {
+				// allow changing language in grids, when not in editing mode
+				return $this->Application->CheckPermission($section . '.view', 1);
+			}
 
-			$section = $event->getSection();
 			if (!preg_match('/^CATEGORY:(.*)/', $section)) {
 				// only if not category item events
 				if ((substr($event->Name, 0, 9) == 'OnPreSave') || ($event->Name == 'OnSave')) {
@@ -2308,17 +2313,17 @@
 		 */
 		function OnPreSaveAndChangeLanguage(&$event)
 		{
-			$event->CallSubEvent('OnPreSave');
+			if ($this->UseTempTables($event)) {
+				$event->CallSubEvent('OnPreSave');
+			}
 
 			if ($event->status == erSUCCESS) {
 				$this->Application->SetVar('m_lang', $this->Application->GetVar('language'));
 
-				$pass_vars = Array ('st_id', 'cms_id');
-				foreach ($pass_vars as $pass_var) {
-					$data = $this->Application->GetVar($pass_var);
-					if ($data) {
-						$event->SetRedirectParam($pass_var, $data);
-					}
+				$data = $this->Application->GetVar('st_id');
+
+				if ($data) {
+					$event->SetRedirectParam('st_id', $data);
 				}
 			}
 		}
Index: units/email_events/email_event_tp.php
===================================================================
--- units/email_events/email_event_tp.php	(revision 0)
+++ units/email_events/email_event_tp.php	(revision 0)
@@ -0,0 +1,24 @@
+<?php
+
+	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');
+
+				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);
+			}
+		}
+	}
\ No newline at end of file
Index: units/email_events/email_events_config.php
===================================================================
--- units/email_events/email_events_config.php	(revision 13128)
+++ units/email_events/email_events_config.php	(working copy)
@@ -19,7 +19,7 @@
 		'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' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+		'TagProcessorClass' => Array ('class' => 'EmailEventTagProcessor', 'file' => 'email_event_tp.php', 'build_event' => 'OnBuild'),
 
 		'AutoLoad' => true,
 
@@ -36,9 +36,12 @@
 
 		'TitlePresets' => Array (
 			'default' => Array (
+				'new_status_labels' => Array ('emailevents' => '!la_title_Adding_E-mail!'),
+				'edit_status_labels' => Array ('emailevents' => '!la_title_Editing_E-mail!'),
 				'edit_status_labels' => Array ('emailevents' => '!la_title_EditingEmailEvent!'),
 			),
 
+			// for editing in Regional section
 			'email_settings_list' => Array ('prefixes'	=> Array ('emailevents.module_List'), 'format' => '!la_title_EmailSettings!'),
 
 			'email_settings_edit' => Array (
@@ -46,14 +49,39 @@
 				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
 			),
 
+			// for separate grid with email editing
+			'email_messages_direct_list' => Array (
+				'prefixes' => Array ('emailevents_List'), 'format' => "!la_title_EmailMessages!",
+				'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'),
+			),
+
+			'email_messages_edit_direct' => Array (
+				'prefixes' => Array ('emailevents'),
+				'format' => '#emailevents_status# - #emailevents_titlefield#',
+				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit'),
+			),
+
+			// for mass mailing
 			'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
 			'email_prepare' => Array ('prefixes' => Array (), 'format' => '!la_title_PreparingEmailsForSending!. !la_title_PleaseWait!'),
 			'email_send' => Array ('prefixes' => Array (), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'),
 			'email_send_complete' => Array ('prefixes' => Array (), 'format' => '!la_title_SendMailComplete!'),
 		),
 
-		'PermSection' => Array ('main' => 'in-portal:configure_lang'),
+		'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,
+			),
+		),
+
 		'FilterMenu' => Array (
 			'Groups' => Array (
 				Array ('mode' => 'AND', 'filters' => Array ('show_enabled', 'show_disabled', 'show_frontonly'), 'type' => WHERE_FILTER),
@@ -81,15 +109,42 @@
 		),
 
 		'ListSortings' => Array (
-			'' => Array ('Sorting' => Array ('Module' => 'asc', 'Description'	=> 'asc')),
-			'module' => Array ('Sorting' => Array ('Description' => 'asc') ),
+			'' => Array (
+				'ForcedSorting' => Array ('Enabled' => 'desc'),
+				'Sorting' => Array ('Module' => 'asc', 'Description' => 'asc'),
+			),
+			'module' => Array (
+				'ForcedSorting' => Array ('Enabled' => 'desc'),
+				'Sorting' => Array ('Description' => 'asc')
+			),
 		),
 
+		'PopulateMlFields' => true,
+
 		'Fields' => Array (
 			'EventId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-            'Event' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''),
+            '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),
 
+            'Subject' => Array (
+				'type' => 'string',
+				'formatter' => 'kMultiLanguage', 'db_type' => 'text',
+				'required' => 1, 'default' => null
+			),
+
+			'Body' => Array (
+				'type' => 'string',
+				'formatter' => 'kMultiLanguage', 'db_type' => 'longtext',
+				'required' => 1, 'default' => null
+			),
+
+			'MessageType' => Array (
+				'type' => 'string',
+				'formatter' => 'kOptionsFormatter', 'options' => Array ('text' => 'la_Text', 'html' => 'la_Html'), 'use_phrases' => 1,
+				'not_null' => 1, 'required' => 1, 'default' => 'text'
+			),
+
             'Enabled' => Array (
             	'type' => 'int',
             	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
@@ -108,12 +163,20 @@
             	'default' => NULL
             ),
 
-            'Module' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''),
-            'Description' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''),
+            'Module' => Array (
+            	'type' => 'string',
+            	'formatter' => 'kOptionsFormatter', 'options' => Array (),
+            	'not_null' => 1, 'required' => 1, 'default' => ''
+            ),
+            'Description' => Array (
+            	'type' => 'string',
+            	'formatter' => 'kMultiLanguage',
+            	'not_null' => 1, 'default' => '', 'db_type' => 'text',
+            ),
             'Type' => Array (
             	'type' => 'int',
             	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1,
-            	'not_null' => 1, 'required' => 1, 'default' => 0
+            	'not_null' => 1, 'unique' => Array ('Event'), 'required' => 1, 'default' => 0
             ),
     	),
 
@@ -122,6 +185,7 @@
 		),
 
 		'Grids'	=> Array (
+			// used on "Email Events" tab in language editing in "Regional" section
 			'Default' => Array (
 				'Icons' => Array (
 					'default' => 'icon16_item.png',
@@ -130,14 +194,33 @@
 				),
 				'Fields' => Array (
 					'EventId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-					'Description'	=>	Array ( 'title' => 'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+					'Description'	=>	Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
 					'Event'			=>	Array ( 'title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Module'		=>	Array ( 'title' => 'la_col_Module', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+					'Module'		=>	Array ( 'title' => 'la_col_Module', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
 					'Type'			=>	Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
 					'Enabled'		=>	Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
 				),
 			),
 
+			// 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' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+					'Event' => Array ( 'title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+					'Subject' => Array ( 'title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'no_special' => 0, 'width' => 300, ),
+					'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+					'Type' => Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
+					'Enabled' => Array ( 'title' => 'la_col_Enabled', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+					'Module' => Array ( 'title' => 'la_col_Module', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+				),
+			),
+
+			// used on "E-Mail" section in each module
 			'EmailSettings' => Array (
 				'Icons' => Array (
 					'default' => 'icon16_item.png',
@@ -146,7 +229,7 @@
 				),
 				'Fields' => Array (
 					'EventId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-					'Description' => Array ('title' => 'la_col_EventDescription', 'data_block' => 'label_grid_checkbox_td', 'width' => 250, ),
+					'Description' => Array ('title' => 'la_col_EventDescription', 'width' => 250, ),
 					'FromUser' => Array ('title' => 'la_col_FromToUser', 'data_block' => 'from_user_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
         			'Type' => Array ('title' => 'la_col_RecipientType', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
 					'FrontEndOnly' => Array ('title' => 'la_col_FrontEndOnly', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
Index: units/email_events/email_events_event_handler.php
===================================================================
--- units/email_events/email_events_event_handler.php	(revision 13128)
+++ units/email_events/email_events_event_handler.php	(working copy)
@@ -16,7 +16,6 @@
 
 	class EmailEventsEventsHandler extends kDBEventHandler
 	{
-
 		/**
 		 * Allows to override standart permission mapping
 		 *
@@ -71,14 +70,36 @@
 		 */
 		function SetCustomQuery(&$event)
 		{
+			$object =& $event->getObject();
+			/* @var $object kDBList */
+
 			if ($event->Special == 'module') {
-				$object =& $event->getObject();
 				$module = $this->Application->GetVar('module');
 				$object->addFilter('module_filter', '%1$s.Module = '.$this->Conn->qstr($module));
 			}
+
+			if (!$event->Special && !$this->Application->isDebugMode()) {
+				// no special
+				$object->addFilter('enabled_filter', '%1$s.Enabled <> ' . STATUS_DISABLED);
+			}
 		}
 
 		/**
+		 * Sets event id
+		 *
+		 * @param kEvent $event
+		 */
+		function OnPreCreate(&$event)
+		{
+			parent::OnPreCreate($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$object->SetDBField('Headers', $this->Application->ConfigValue('Smtp_DefaultHeaders'));
+		}
+
+		/**
 		 * Sets status Front-End Only to selected email events
 		 *
 		 * @param kEvent $event
@@ -147,46 +168,58 @@
 		}
 
 		/**
-		 * Returns sender & recipients ids plus event_id (as parameter by reference)
+		 * Returns email event object based on given kEvent object
 		 *
 		 * @param kEvent $event
-		 * @param int $event_id id of email event used
-		 *
-		 * @return mixed
+		 * @return kDBItem
 		 */
-		function GetMessageRecipients(&$event, &$event_id)
+		function &_getEmailEvent(&$event)
 		{
-			$email_event =& $event->getObject( Array('skip_autoload' => true) );
-			/* @var $email_event kDBItem */
+			$false = false;
+			$name = $event->getEventParam('EmailEventName');
+			$type = $event->getEventParam('EmailEventType');
 
-			// get event parameters by name & type
-			$load_keys = Array (
-				'Event'	=>	$event->getEventParam('EmailEventName'),
-				'Type'	=>	$event->getEventParam('EmailEventType'),
-			);
-			$email_event->Load($load_keys);
+			$object =& $event->getObject( Array('skip_autoload' => true) );
+			/* @var $object kDBItem */
 
-			if (!$email_event->isLoaded()) {
-				// event record not found
-				return false;
-			}
+			if (!$object->isLoaded() || (($object->GetDBField('Event') != $name) && ($object->GetDBField('Type') != $type))) {
+				// get event parameters by name & type
+				$load_keys = Array ('Event' => $name, 'Type' => $type);
+				$object->Load($load_keys);
 
-			if ($email_event->GetDBField('Enabled') == STATUS_DISABLED) {
-				return false;
-			}
+				if (!$object->isLoaded() || ($object->GetDBField('Enabled') == STATUS_DISABLED)) {
+					// event record not found OR is disabled
+					return $false;
+				}
 
-			if ($email_event->GetDBField('FrontEndOnly') && $this->Application->isAdmin) {
-				return false;
+				if ($object->GetDBField('FrontEndOnly') && $this->Application->isAdmin) {
+					return $false;
+				}
 			}
 
+			return $object;
+		}
+
+		/**
+		 * Returns sender & recipients ids plus event_id (as parameter by reference)
+		 *
+		 * @param kEvent $event
+		 *
+		 * @return mixed
+		 */
+		function GetMessageRecipients(&$event)
+		{
+			$object =& $this->_getEmailEvent($event);
+			/* @var $object kDBItem */
+
 			// initial values
 			$to_user_id = $event->getEventParam('EmailEventToUserId');
 			if ( !is_numeric($to_user_id) ) {
 				$to_user_id = -1; // when not specified, then send to "root"
             }
-			$from_user_id = $email_event->GetDBField('FromUserId');
+			$from_user_id = $object->GetDBField('FromUserId');
 
-			if ($email_event->GetDBField('Type') == EVENT_TYPE_ADMIN) {
+			if ($object->GetDBField('Type') == EVENT_TYPE_ADMIN) {
 				// For type "Admin" recipient is a user from field FromUserId which means From/To user in Email events list
 				if ($to_user_id == -1) {
 					$to_user_id = $from_user_id;
@@ -194,8 +227,6 @@
 				$from_user_id = -1;
 			}
 
-			$event_id = $email_event->GetDBField('EventId');
-
 			return Array ($from_user_id, $to_user_id);
 		}
 
@@ -245,56 +276,28 @@
 		/**
 		 * Returns email event message by ID (headers & body in one piece)
 		 *
-		 * @param int $event_id
-		 * @param string $message_type contains message type = {text,html}
+		 * @param kEvent $event
 		 * @param int $language_id
 		 */
-		function GetMessageBody($event_id, &$message_type, $language_id = null)
+		function GetMessageBody(&$event, $language_id = null)
 		{
 			if (!isset($language_id)) {
 				$language_id = $this->Application->GetVar('m_lang');
 			}
 
-			$message =& $this->Application->recallObject('emailmessages', null, Array('skip_autoload' => true));
-			/* @var $message kDBItem */
+			$object =& $this->_getEmailEvent($event);
 
-			$message->Load( Array('EventId' => $event_id, 'LanguageId' => $language_id) );
-			if (!$message->isLoaded()) {
-				// event translation on required language not found
-				return false;
-			}
-
-			$message_type = $message->GetDBField('MessageType');
-
 			// 1. get message body
-			$message_body = $message->GetDBField('Template');
+			$message_body = $this->_formMessageBody($object, $language_id, $object->GetDBField('MessageType'));
 
-			// 2. add footer
-			$sql = 'SELECT em.Template
-           			FROM '.$message->TableName.' em
-           			LEFT JOIN '.TABLE_PREFIX.'Events e ON e.EventId = em.EventId
-           			WHERE em.LanguageId = '.$language_id.' AND e.Event = "COMMON.FOOTER"';
-
-			list (, $footer) = explode("\n\n", $this->Conn->GetOne($sql));
-			if ($message_type == 'text') {
-				$esender =& $this->Application->recallObject('EmailSender');
-				/* @var $esender kEmailSendingHelper */
-
-				$footer = $esender->ConvertToText($footer);
-			}
-
-			if ($footer) {
-				$message_body .= "\r\n".$footer;
-			}
-
-			// 3. replace tags if needed
+			// 2. replace tags if needed
 			$default_replacement_tags = Array (
 				'<inp:touser _Field="password"' => '<inp2:u_Field name="Password_plain"',
 				'<inp:touser _Field="UserName"' => '<inp2:u_Field name="Login"',
 				'<inp:touser _Field' => '<inp2:u_Field name',
 			);
 
-			$replacement_tags = $message->GetDBField('ReplacementTags');
+			$replacement_tags = $object->GetDBField('ReplacementTags');
 			$replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array ();
 			$replacement_tags = array_merge_recursive2($default_replacement_tags, $replacement_tags);
 
@@ -306,6 +309,90 @@
 		}
 
 		/**
+		 * Prepare email message body
+		 *
+		 * @param kDBItem $object
+		 * @param int $language_id
+		 * @return string
+		 */
+		function _formMessageBody(&$object, $language_id)
+		{
+			$default_language_id = $this->Application->GetDefaultLanguageId();
+
+			$fields_hash = Array (
+				'Headers' => $object->GetDBField('Headers'),
+			);
+
+			// prepare subject
+			$subject = $object->GetDBField('l' . $language_id . '_Subject');
+
+			if (!$subject) {
+				$subject = $object->GetDBField('l' . $default_language_id . '_Subject');
+			}
+
+			$fields_hash['Subject'] = $subject;
+
+			// prepare body
+			$body = $object->GetDBField('l' . $language_id . '_Body');
+
+			if (!$body) {
+				$body = $object->GetDBField('l' . $default_language_id . '_Body');
+			}
+
+			$fields_hash['Body'] = $body;
+
+			$email_message_helper =& $this->Application->recallObject('EmailMessageHelper');
+			/* @var $email_message_helper EmailMessageHelper */
+
+			$ret = $email_message_helper->buildTemplate($fields_hash);
+
+			// add footer
+			$footer = $this->_getFooter($language_id, $object->GetDBField('MessageType'));
+
+			if ($ret && $footer) {
+				$ret .= "\r\n" . $footer;
+			}
+
+			return $ret;
+		}
+
+		/**
+		 * Returns email footer
+		 *
+		 * @param int $language_id
+		 * @param string $message_type
+		 * @return string
+		 */
+		function _getFooter($language_id, $message_type)
+		{
+			static $footer = null;
+
+			if (!isset($footer)) {
+				$default_language_id = $this->Application->GetDefaultLanguageId();
+
+				$sql = 'SELECT l' . $language_id . '_Body, l' . $default_language_id . '_Body
+	           			FROM ' . $this->Application->getUnitOption('emailevents', 'TableName') . ' em
+	           			WHERE Event = "COMMON.FOOTER"';
+				$footer_data = $this->Conn->GetRow($sql);
+
+				$footer = $footer_data['l' . $language_id . '_Body'];
+
+				if (!$footer) {
+					$footer = $footer_data['l' . $default_language_id . '_Body'];
+				}
+
+				if ($message_type == 'text') {
+					$esender =& $this->Application->recallObject('EmailSender');
+					/* @var $esender kEmailSendingHelper */
+
+					$footer = $esender->ConvertToText($footer);
+				}
+			}
+
+			return $footer;
+		}
+
+		/**
 		 * Parse message template and return headers (as array) and message body part
 		 *
 		 * @param string $message
@@ -365,15 +452,18 @@
 				trigger_error('<span class="debug_error">Invalid email event name</span> <b>'.$email_event_name.'</b>. Use only <b>UPPERCASE characters</b> and <b>dots</b> as email event names', E_USER_ERROR);
 			}
 
+			$object =& $this->_getEmailEvent($event);
+
+			if (!is_object($object)) {
+				// email event not found OR it's won't be send under given circumstances
+				return false;
+			}
+
 			// additional parameters from kApplication->EmailEvent
 			$send_params = $event->getEventParam('DirectSendParams');
 
 			// 1. get information about message sender and recipient
-			$recipients = $this->GetMessageRecipients($event, $event_id);
-			if ($recipients === false) {
-				// if not valid recipients found, then don't send event
-				return false;
-			}
+			$recipients = $this->GetMessageRecipients($event);
 
 			list ($from_id, $to_id) = $recipients;
 			list ($from_email, $from_name) = $this->GetRecipientInfo($from_id, 'from', $send_params);
@@ -381,7 +471,7 @@
 
 			// 2. prepare message to be sent
 			$message_language = $this->_getSendLanguage($send_params);
-			$message_template = $this->GetMessageBody($event_id, $message_type, $message_language);
+			$message_template = $this->GetMessageBody($event, $message_language);
 			if (!trim($message_template)) {
 				trigger_error('Message template is empty', E_USER_WARNING);
 				return false;
@@ -405,18 +495,18 @@
 
 			if ($this->Application->isDebugMode()) {
 				// set special header with event name, so it will be easier to determite what's actually was received
-				$message_headers['X-Event-Name'] = $email_event_name . ' - ' . ($event->getEventParam('EmailEventType') == 1 ? 'ADMIN' : 'USER');
+				$message_headers['X-Event-Name'] = $email_event_name . ' - ' . ($event->getEventParam('EmailEventType') == EVENT_TYPE_ADMIN ? 'ADMIN' : 'USER');
 			}
 
 			foreach ($message_headers as $header_name => $header_value) {
 				$esender->SetEncodedHeader($header_name, $header_value);
 			}
 
-			$esender->CreateTextHtmlPart($message_body, $message_type == 'html');
+			$esender->CreateTextHtmlPart($message_body, $object->GetDBField('MessageType') == 'html');
 
 			$event->status = $esender->Deliver() ? erSUCCESS : erFAIL;
 
-			if ($event->status == erSUCCESS){
+			if ($event->status == erSUCCESS) {
 				// all keys, that are not used in email sending are written to log record
 				$send_keys = Array ('from_email', 'from_name', 'to_email', 'to_name', 'message');
 				foreach ($send_keys as $send_key) {
@@ -534,4 +624,39 @@
 				echo ($emails_sent / $total_emails) * 100;
 			}
 		}
+
+		/**
+		 * Prefills module dropdown
+		 *
+		 * @param kEvent $event
+		 */
+		function OnAfterConfigRead(&$event)
+		{
+			parent::OnAfterConfigRead($event);
+
+			$options = Array ('Core:Users' => 'Core - Users', 'Core:Category' => 'Core - Categories');
+
+			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
+				if (($module_name == 'In-Portal') || ($module_name == 'Core')) {
+					continue;
+				}
+
+				$options[$module_name] = $module_name;
+			}
+
+			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+			$fields['Module']['options'] = $options;
+			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+
+			// make grid on "Email Events" tab in "Regional" section show columns of editable language, not admin language
+			$language_id = $this->Application->GetVar('lang_id');
+
+			if ($language_id) {
+				$grids = $this->Application->getUnitOption($event->Prefix, 'Grids');
+				// used by column picker to track column position
+				$grids['Default']['Fields']['Description']['formatter_renamed'] = true;
+				array_rename_key($grids['Default']['Fields'], 'Description', 'l' . $language_id . '_Description');
+				$this->Application->setUnitOption($event->Prefix, 'Grids', $grids);
+			}
+		}
 	}
\ No newline at end of file
Index: units/email_messages/email_message_tp.php
===================================================================
--- units/email_messages/email_message_tp.php	(revision 13128)
+++ units/email_messages/email_message_tp.php	(working copy)
@@ -1,71 +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 EmailMessageTagProcessor extends kDBTagProcessor {
-
-		function PrintRecipients($params)
-		{
-			$recipient_type = $this->Application->RecallVar('recipient_type');
-
-			$block_params = $this->prepareTagParams($params);
-			$block_params['name'] = $params['render_as'];
-
-			$recipients = $this->getRecipients($recipient_type);
-			$recipient_count = count($recipients);
-			$ret = '';
-
-			foreach ($recipients as $recipient_index => $recipient_name) {
-				$block_params['recipient_name'] = $recipient_name;
-				$block_params['not_last'] = $recipient_index < $recipient_count - 1;
-
-				$ret .= $this->Application->ParseBlock($block_params);
-			}
-
-			return $ret;
-		}
-
-		function getRecipients($prefix)
-		{
-			$id_field = $this->Application->getUnitOption($prefix, 'IDField');
-			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
-			$recipient_ids = $this->Application->RecallVar('recipient_ids');
-
-			$sql = 'SELECT '.($prefix == 'u' ? 'Email' : 'Name').'
-					FROM '.$table_name.'
-					WHERE '.$id_field.' IN ('.$recipient_ids.')';
-			return $this->Conn->GetCol($sql);
-		}
-
-		/**
-		 * 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');
-
-				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);
-			}
-		}
-	}
\ No newline at end of file
Index: units/email_messages/email_messages_config.php
===================================================================
--- units/email_messages/email_messages_config.php	(revision 13128)
+++ units/email_messages/email_messages_config.php	(working copy)
@@ -1,155 +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' => 'emailmessages',
-		'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
-		'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-		'EventHandlerClass' => Array('class' => 'EmailMessagesEventHandler', 'file' => 'email_messages_event_handler.php', 'build_event' => 'OnBuild'),
-		'TagProcessorClass' => Array('class' => 'EmailMessageTagProcessor', 'file' => 'email_message_tp.php', 'build_event' => 'OnBuild'),
-
-		'AutoLoad' => true,
-
-		'QueryString' => Array (
-			1 => 'id',
-			2 => 'page',
-			3 => 'event',
-			4 => 'mode',
-		),
-
-		'IDField' => 'EmailMessageId',
-		'TitleField' => 'Subject',
-		'StatusField' => Array ('Enabled'),
-
-		'TitlePresets' => Array (
-			'email_messages_direct_list' => Array (
-				'prefixes' => Array ('emailmessages.st_List'), 'format' => "!la_title_EmailMessages!",
-				'toolbar_buttons' => Array ('edit', 'approve', 'decline', 'view', 'dbl-click'),
-				),
-			'email_messages_edit_direct' => Array (
-				'prefixes' => Array ('emailmessages'),
-				'new_status_labels' => Array ('emailmessages' => '!la_title_Adding_E-mail!'),
-				'edit_status_labels' => Array ('emailmessages' => '!la_title_Editing_E-mail!'),
-				'format' => '#emailmessages_status# - #emailmessages_titlefield#',
-				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit'),
-			),
-		),
-
-		'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', 'edit'),
-				'priority'		=>	5,
-				'type'			=>	stTREE,
-			),
-		),
-
-		'TableName' => TABLE_PREFIX.'EmailMessage',
-
-		'ListSQLs' => Array (
-			'' => '	SELECT %1$s.* %2$s
-					FROM %1$s
-			 		LEFT JOIN '.TABLE_PREFIX.'Events ON '.TABLE_PREFIX.'Events.EventId = %1$s.EventId'
-		),
-
-		'ListSortings' => Array (
-			'' => Array (
-				'ForcedSorting' => Array ('Enabled' => 'desc'),
-				'Sorting' => Array ('Description' => 'asc')
-			),
-		),
-
-		'ForeignKey' => 'LanguageId',
-		'ParentTableKey' => 'LanguageId',
-		'ParentPrefix' => 'lang',
-		'AutoDelete' => true,
-		'AutoClone' => true,
-
-		'CalculatedFields' => Array (
-			'' => Array (
-				'Description' => TABLE_PREFIX.'Events.Description',
-				'Module' => TABLE_PREFIX.'Events.Module',
-				'Type' => TABLE_PREFIX.'Events.Type',
-				'ReplacementTags' => TABLE_PREFIX.'Events.ReplacementTags',
-				'Enabled' => TABLE_PREFIX.'Events.Enabled',
-			),
-		),
-
-		'Fields' => Array (
-			'EmailMessageId'	=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-			'Template'			=>	Array('type' => 'string', 'default' => null),
-			'MessageType'		=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text'=>'la_Text','html'=>'la_Html'), 'use_phrases' => 1, 'not_null' => '1','default' => 'text'),
-			'LanguageId'		=>	Array(
-				'type' => 'int',
-				'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Language ORDER BY PackName', 'option_key_field' => 'LanguageId', 'option_title_field' => 'PackName',
-				'not_null' => 1, 'default' => 0
-			),
-			'EventId'			=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-			'Subject'			=>	Array('type' => 'string', 'default' => null),
-		),
-
-		'VirtualFields' => Array (
-			'Headers'			=>	Array('type' => 'string', 'default' => ''),
-			'Body'				=>	Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => ''),
-			'ReplacementTags'	=>	Array ('type' => 'string', 'default' => null),
-			'Description'		=>	Array('type'=>'string', 'sql_filter_type'=>'having'),
-			'Module' 			=>	Array('type' => 'string','not_null' => '1','default' => ''),
-			'Type' 				=>	Array('formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1),
-
-			'Enabled' => Array (
-            	'type' => 'int',
-            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-            	'not_null' => 1, 'default' => 1
-            ),
-
-			// for mass mail sending
-			'MassSubject'		=>	Array ('type' => 'string', 'default' => ''),
-			'MassAttachment'	=>	Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'upload_dir' => ITEM_FILES_PATH, 'max_size' => 50000000, 'default' => ''),
-			'MassHtmlMessage'	=>	Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => 'Type your Message Here'),
-			'MassTextMessage'	=>	Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => 'Type your Message Here'),
-		),
-
-		'Grids'	=> Array(
-			'Default'		=>	Array(
-//				'Icons' => Array('default'=>'icon16_item.png'),
-				'Fields' => Array(
-					'Subject'		=>	Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 60, ),
-					'Description'	=>	Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 60, ),
-					'Type'			=>	Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
-				),
-
-			),
-
-			'Emails' => Array(
-				'Icons' => Array (
-					'default' => 'icon16_item.png',
-					0 => 'icon16_disabled.png',
-					1 => 'icon16_item.png',
-				),
-				'Fields' => Array(
-					'EventId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-					'Subject' => Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
-					'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
-					'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
-					'LanguageId' => Array( 'title'=>'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
-					'Enabled' => Array( 'title'=>'la_col_Enabled', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-				),
-
-			),
-		),
-	);
\ No newline at end of file
Index: units/email_messages/email_messages_event_handler.php
===================================================================
--- units/email_messages/email_messages_event_handler.php	(revision 13128)
+++ units/email_messages/email_messages_event_handler.php	(working copy)
@@ -1,412 +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 EmailMessagesEventHandler extends kDBEventHandler
-	{
-
-		/**
-		 * Replace id passed with id of email message
-		 *
-		 * @param kEvent $event
-		 */
-		function getPassedID(&$event)
-		{
-			$event->setEventParam('raise_warnings', 0);
-
-			$parent = parent::getPassedID($event);
-			if ($parent) {
-				return $parent;
-			}
-
-			$email_event_id = (int)$this->getEmailEventId();
-			$object =& $event->getObject();
-
-			$parent_info = $object->getLinkedInfo();
-
-			$sql = 'SELECT '.$object->IDField.'
-					FROM '.$object->TableName.'
-					WHERE ('.$parent_info['ForeignKey'].' = '.$parent_info['ParentId'].') AND (EventId = '.$email_event_id.')';
-
-			return (int)$this->Conn->GetOne($sql);
-		}
-
-		function getEmailEventId()
-		{
-			return parent::getPassedID( new kEvent('emailevents:OnDummy') );
-		}
-
-		/**
-		 * Apply any custom changes to list's sql query
-		 *
-		 * @param kEvent $event
-		 * @access protected
-		 * @see OnListBuild
-		 */
-		function SetCustomQuery(&$event)
-		{
-			$object =& $event->getObject();
-			/* @var $object kDBList */
-
-			if ($event->Special == 'module') {
-				$module = $this->Application->GetVar('module');
-				$object->addFilter('module_filter', 'Module = ' . $this->Conn->qstr($module));
-			}
-
-			if (($event->Special == 'st') && !$this->Application->isDebugMode()) {
-				$object->addFilter('enabled_filter', TABLE_PREFIX . 'Events.Enabled <> ' . STATUS_DISABLED);
-			}
-		}
-
-		/**
-		 * If loading empty item, then set parent id
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemLoad(&$event)
-		{
-			if (!$event->getEventParam('id')) {
-				$this->OnNew($event);
-
-				$event->status = erFATAL;
-			}
-		}
-
-		/**
-		 * Sets event id
-		 *
-		 * @param kEvent $event
-		 */
-		function OnNew(&$event)
-		{
-			parent::OnNew($event);
-
-			$object =& $event->getObject();
-			/* @var $object kDBItem */
-
-			$object->SetDBField('EventId', $this->getEmailEventId());
-			$object->SetDBField('Headers', $this->Application->ConfigValue('Smtp_DefaultHeaders') );
-		}
-
-		/**
-		 * Parse message template (split into header, subject & body)
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemLoad(&$event)
-		{
-			$object =& $event->getObject();
-			/* @var $object kDBItem */
-			
-			$email_message_helper =& $this->Application->recallObject('EmailMessageHelper');
-			/* @var $email_message_helper EmailMessageHelper */
-			
-			$fields_hash = $email_message_helper->parseTemplate( $object->GetDBField('Template') );
-			
-			$object->SetDBFieldsFromHash($fields_hash);
-		}
-
-		/**
-		 * Merge body+subject+headers into message template
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemUpdate(&$event)
-		{
-			$this->parseVirtualFields($event);
-		}
-
-		/**
-		 * Merge body+subject+headers into message template
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemCreate(&$event)
-		{
-			$this->parseVirtualFields($event);
-		}
-
-		/**
-		 * Enabled/disables actual email event
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemUpdate(&$event)
-		{
-			parent::OnAfterItemUpdate($event);
-
-			$object =& $event->getObject();
-			/* @var $object kDBItem */
-
-			if ($object->GetDBField('Enabled') != $object->GetOriginalField('Enabled')) {
-				$email_event =& $this->Application->recallObject('emailevents.-item', null, Array ('skip_autoload' => true));
-				/* @var $email_event kDBItem */
-
-				$email_event->Load( $object->GetDBField('EventId') );
-				if ($email_event->isLoaded()) {
-					$email_event->SetDBField('Enabled', $object->GetDBField('Enabled'));
-					$email_event->Update();
-				}
-			}
-		}
-
-		/**
-		 * Merge body+subject+headers into message template
-		 *
-		 * @param kEvent $event
-		 */
-		function parseVirtualFields(&$event)
-		{
-			$object =& $event->getObject();
-			if( $object->GetDBField('Headers') || $object->GetDBField('Subject') || $object->GetDBField('Body') )
-			{
-				$ret = $object->GetDBField('Headers');
-				if($ret) $ret .= "\n";
-
-				$ret = $this->removeTrailingCRLF($ret);
-				$ret .= 'Subject: '.$object->GetDBField('Subject')."\n\n";
-				$ret .= $object->GetDBField('Body');
-				$object->SetDBField('Template', $ret);
-			}
-		}
-
-		/**
-		 * Remove trailing CR/LF chars from string
-		 *
-		 * @param string $string
-		 * @return string
-		 */
-		function removeTrailingCRLF($string)
-		{
-			return preg_replace('/(\n|\r)+/',"\\1",$string);
-		}
-
-		/**
-		 * Prepares selected user(-s) or group(-s) for message sending
-		 *
-		 * @param kEvent $event
-		 */
-		function OnPrepareMassRecipients(&$event)
-		{
-			$object =& $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
-
-			$object->Clear(0);
-
-			$event->redirect = false;
-
-			$this->Application->RemoveVar('recipient_ids');
-			$this->Application->RemoveVar('recipient_type');
-
-			$this->saveMassRecipients('u');
-			$this->saveMassRecipients('g', 'total');
-		}
-
-		function saveMassRecipients($prefix, $special = '')
-		{
-			$recipients = $this->Application->GetVar(rtrim($prefix.'_'.$special, '_'));
-			if ($recipients) {
-				$this->Application->StoreVar('recipient_ids', implode(',', array_keys($recipients)));
-				$this->Application->StoreVar('recipient_type', $prefix);
-			}
-		}
-
-		/**
-		 * Sends mass mail
-		 *
-		 * @param kEvent $event
-		 */
-		function OnMassMail(&$event)
-		{
-			$object =& $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
-
-			$object->setRequired('MassSubject', true);
-
-			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-			if ($items_info) {
-				list($id, $field_values) = each($items_info);
-				$object->SetFieldsFromHash($field_values);
-			}
-
-			if (!$object->Validate()) {
-				$event->redirect = false;
-				$event->status = erFAIL;
-				$object->setID($id);
-				return ;
-			}
-
-			$fields_hash = $object->GetFieldValues();
-			list ($fields_hash['FromEmail'], $fields_hash['FromName']) = $this->getSenderData();
-
-			if ($fields_hash['MassAttachment']) {
-				$field_options = $object->GetFieldOptions('MassAttachment');
-				$fields_hash['MassAttachment'] = $field_options['upload_dir'].$fields_hash['MassAttachment'];
-			}
-
-			$this->Application->RemoveVar('email_prepare_progress');
-			$this->Application->StoreVar('email_prepare_fields', serialize($fields_hash));
-
-			$event->redirect = 'emails/prepare_queue';
-		}
-
-		/**
-		 * Generates email queue using progress bar
-		 *
-		 * @param kEvent $event
-		 * @todo Move to MailingList
-		 */
-		function OnPrepareEmailQueue(&$event)
-		{
-			$prepare_count = $this->Application->ConfigValue('MailingListQueuePerStep');
-			if ($prepare_count === false) {
-				// 10 recipients per script run (if none defined in config)
-				$prepare_count = 10;
-			}
-
-			$email_prepare_progress = $this->Application->RecallVar('email_prepare_progress');
-			if ($email_prepare_progress === false) {
-				$emails_prepared = 0;
-				$total_emails = $this->getRecipientEmails(true);
-				$this->Application->StoreVar('email_prepare_progress', $emails_prepared.':'.$total_emails);
-			}
-			else {
-				list ($emails_prepared, $total_emails) = explode(':', $email_prepare_progress);
-			}
-
-			$recipient_emails = $this->getRecipientEmails(false, $emails_prepared.','.$prepare_count);
-			$recipient_email_count = count($recipient_emails);
-
-			if (!$recipient_email_count) {
-				// no recipients left to prepare
-				$this->finalizeQueuePreparing($fields_hash['MassAttachment']);
-			}
-
-			$fields_hash = unserialize($this->Application->RecallVar('email_prepare_fields'));
-
-			$esender =& $this->Application->recallObject('EmailSender');
-			/* @var $esender kEmailSendingHelper */
-
-			// 1. set headers same for all emails
-			$esender->SetFrom($fields_hash['FromEmail'], $fields_hash['FromName']);
-			$esender->SetSubject($fields_hash['MassSubject']);
-			$esender->SetBody($fields_hash['MassHtmlMessage'], $fields_hash['MassTextMessage']);
-
-	    	// 2. add attachment if any
-			if ($fields_hash['MassAttachment']) {
-				$esender->AddAttachment(FULL_PATH.$fields_hash['MassAttachment']);
-			}
-
-			foreach ($recipient_emails as $recipient_email) {
-				// 3. set recipient specific fields
-				$esender->SetTo($recipient_email, $recipient_email);
-				$esender->Deliver(null, false, false);
-
-				// 4. write to log
-				$log_fields_hash = Array (
-					'fromuser'	=>	$fields_hash['FromName'],
-					'addressto'	=>	$recipient_email,
-					'subject'	=>	$fields_hash['MassSubject'],
-					'timestamp'	=>	adodb_mktime(),
-					'event'		=>	'',
-				);
-
-				$this->Conn->doInsert($log_fields_hash, TABLE_PREFIX.'EmailLog');
-			}
-
-			$emails_prepared += $recipient_email_count;
-			if ($emails_prepared >= $total_emails) {
-				$this->finalizeQueuePreparing($fields_hash['MassAttachment']);
-			}
-
-			$this->Application->StoreVar('email_prepare_progress', $emails_prepared.':'.$total_emails);
-			$event->status = erSTOP;
-			echo ($emails_prepared / $total_emails) * 100;
-		}
-
-		function finalizeQueuePreparing($attachment_file = null)
-		{
-			// variables from users/groups grid
-			$this->Application->RemoveVar('recipient_ids');
-			$this->Application->RemoveVar('recipient_type');
-
-			if ($attachment_file) {
-				unlink(FULL_PATH.$attachment_file);
-			}
-
-			// variables from email preparing process
-//			$this->Application->RemoveVar('email_prepare_progress');
-//			$this->Application->RemoveVar('email_prepare_fields');
-
-			// variables from email delivering process (not yet executed)
-			$this->Application->RemoveVar('email_queue_progress');
-
-			$this->Application->Redirect($this->Application->GetVar('finish_template'));
-		}
-
-		function getRecipientEmails($for_counting = false, $limit = null)
-		{
-			$recipient_type = $this->Application->RecallVar('recipient_type');
-			$recipient_ids = $this->Application->RecallVar('recipient_ids');
-
-			if (!$recipient_ids) {
-				return $for_counting ? 0 : Array ();
-			}
-
-			if ($recipient_type == 'u') {
-				$sql = 'SELECT '.($for_counting ? 'COUNT(*)' : 'Email').'
-						FROM '.TABLE_PREFIX.'PortalUser
-						WHERE PortalUserId IN ('.$recipient_ids.')';
-			}
-			else {
-				$sql = 'SELECT '.($for_counting ? 'COUNT(*)' : 'u.Email').'
-						FROM '.TABLE_PREFIX.'UserGroup ug
-						LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON ug.PortalUserId = u.PortalUserId
-						WHERE ug.GroupId IN ('.$recipient_ids.')';
-			}
-
-			if ($for_counting) {
-				return $this->Conn->GetOne($sql);
-			}
-
-			if (isset($limit)) {
-				$sql .= ' LIMIT '.$limit;
-			}
-
-			return $this->Conn->GetCol($sql);
-		}
-
-		/**
-		 * Returns mass mail sender name & email
-		 *
-		 * @return Array
-		 */
-		function getSenderData()
-		{
-			$user =& $this->Application->recallObject('u.current');
-			/* @var $user UsersItem */
-
-			if ($user->GetID() > 0) {
-				$email_address = $user->GetDBField('Email');
-				$name = $user->GetDBField('FirstName').' '.$user->GetDBField('LastName');
-			}
-			else {
-				$email_address = $this->Application->ConfigValue('Smtp_AdminMailFrom');
-				$name = strip_tags( $this->Application->ConfigValue('Site_Name') );
-			}
-
-			return Array ($email_address, $name);
-		}
-	}
\ No newline at end of file
Index: units/helpers/email_message_helper.php
===================================================================
--- units/helpers/email_message_helper.php	(revision 13128)
+++ units/helpers/email_message_helper.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 
 	class EmailMessageHelper extends kHelper {
-	
+
 		/**
 		 * Extracts Subject, Headers, Body fields from email message translation
 		 *
@@ -27,17 +27,51 @@
 					$headers[] = $line;
 				}
 			}
-			
+
 			$ret['Headers'] = implode("\n", $headers);
 
 			$message_body = '';
 			while ((list($line_id,$line) = each($lines))) {
 				$message_body .= $line;
 			}
-			
+
 			$ret['Body'] = $message_body;
-			
+
 			return $ret;
 		}
-		
+
+		/**
+		 * Prepares email event content for language pack export
+		 *
+		 * @param Array $fields_hash
+		 * @return string
+		 */
+		function buildTemplate($fields_hash)
+		{
+			if (!implode('', $fields_hash)) {
+				return '';
+			}
+
+			$ret = array_key_exists('Headers', $fields_hash) ? $fields_hash['Headers'] : '';
+			if ($ret) {
+				$ret .= "\n";
+			}
+
+			$ret = $this->_removeTrailingCRLF($ret);
+			$ret .= 'Subject: ' . $fields_hash['Subject'] . "\n\n";
+			$ret .= $fields_hash['Body'];
+
+			return $ret;
+		}
+
+		/**
+		 * Remove trailing CR/LF chars from string
+		 *
+		 * @param string $string
+		 * @return string
+		 */
+		function _removeTrailingCRLF($string)
+		{
+			return preg_replace('/(\n|\r)+/',"\\1",$string);
+		}
 	}
\ No newline at end of file
Index: units/helpers/language_import_helper.php
===================================================================
--- units/helpers/language_import_helper.php	(revision 13128)
+++ units/helpers/language_import_helper.php	(working copy)
@@ -12,6 +12,20 @@
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
+/**
+* Language pack format version description
+*
+* v1
+* ==========
+* All language properties are separate nodes inside <LANGUAGE> node. There are
+* two more nodes PHRASES and EVENTS for phrase and email event translations.
+*
+* v2
+* ==========
+* All data, that will end up in Language table is now attributes of LANGUAGE node
+* and is name exactly as field name, that will be used to store that data.
+*/
+
 	defined('FULL_PATH') or die('restricted access!');
 
 	define('LANG_OVERWRITE_EXISTING', 1);
@@ -82,6 +96,13 @@
 		 */
 		var $_debugMode = false;
 
+		/**
+		 * Latest version of language pack format. Versions are not backwards compatible!
+		 *
+		 * @var int
+		 */
+		var $_latestVersion = 2;
+
 		function LanguageImportHelper()
 		{
 			parent::kHelper();
@@ -141,7 +162,7 @@
 			// copy data from temp tables to live
 			foreach ($this->_languages as $language_id) {
 				$this->_performUpgrade($language_id, 'phrases', 'PhraseKey');
-				$this->_performUpgrade($language_id, 'emailmessages', 'EventId');
+				$this->_performUpgrade_v2($language_id, 'emailevents', 'EventId', Array ('l%s_Subject', 'Headers', 'l%s_Body'));
 			}
 
 			$this->_initImportTables(true);
@@ -175,22 +196,33 @@
 
 			$lang_table = $this->Application->getUnitOption('lang','TableName');
 			$phrases_table = $this->Application->getUnitOption('phrases','TableName');
-			$emailevents_table = $this->Application->getUnitOption('emailmessages','TableName');
-			$mainevents_table = $this->Application->getUnitOption('emailevents','TableName');
+			$events_table = $this->Application->getUnitOption('emailevents','TableName');
 
 			$phrase_tpl = "\t\t\t".'<PHRASE Label="%s" Module="%s" Type="%s">%s</PHRASE>'."\n";
 			$event_tpl = "\t\t\t".'<EVENT MessageType="%s" Event="%s" Type="%s">%s</EVENT>'."\n";
 			$sql = 'SELECT * FROM %s WHERE LanguageId = %s';
-			$ret = '<LANGUAGES>'."\n";
+			$ret = '<LANGUAGES Version="' . $this->_latestVersion . '">'."\n";
+
+			$export_fields = $this->_getExportFields();
+
+			$email_message_helper =& $this->Application->recallObject('EmailMessageHelper');
+			/* @var $email_message_helper EmailMessageHelper */
+
 			foreach ($language_ids as $language_id) {
 				// languages
 				$row = $this->Conn->GetRow( sprintf($sql, $lang_table, $language_id) );
-				$ret .= "\t".'<LANGUAGE PackName="'.$row['PackName'].'" Encoding="'.$this->_exportEncoding.'"><DATEFORMAT>'.$row['DateFormat'].'</DATEFORMAT>';
-				$ret .= '<TIMEFORMAT>'.$row['TimeFormat'].'</TIMEFORMAT><INPUTDATEFORMAT>'.$row['InputDateFormat'].'</INPUTDATEFORMAT>';
-				$ret .= '<INPUTTIMEFORMAT>'.$row['InputTimeFormat'].'</INPUTTIMEFORMAT><DECIMAL>'.$row['DecimalPoint'].'</DECIMAL>';
-				$ret .= '<THOUSANDS>'.$row['ThousandSep'].'</THOUSANDS><CHARSET>'.$row['Charset'].'</CHARSET><DOCS_URL>'.$row['UserDocsUrl'].'</DOCS_URL>';
-				$ret .= '<UNITSYSTEM>'.$row['UnitSystem'].'</UNITSYSTEM>'."\n";
+				$ret .= "\t" . '<LANGUAGE Encoding="' . $this->_exportEncoding . '"';
 
+				foreach ($export_fields	as $export_field) {
+					$ret .= ' ' . $export_field . '="' . htmlspecialchars($row[$export_field]) . '"';
+				}
+
+				$ret .= '>'."\n";
+
+				$ret .= '<REPLACEMENTS>';
+				$ret .= $this->_exportEncoding == 'base64' ? base64_encode($row['FilenameReplacements']) : '<![CDATA[' . $row['FilenameReplacements'] . ']]>';
+				$ret .= '</REPLACEMENTS>' . "\n";
+
 				// phrases
 				$phrases_sql = 'SELECT * FROM '.$phrases_table.' WHERE LanguageId = %s AND PhraseType IN (%s) AND Module IN (%s) ORDER BY Phrase';
 				if( in_array('In-Portal',$module_ids) ) array_push($module_ids, ''); // for old language packs
@@ -214,31 +246,29 @@
 				$module_sql = preg_replace('/(.*),/U', 'INSTR(Module,\'\\1\') OR ', implode(',', $module_ids).',');
 				$module_sql = substr($module_sql, 0, -4);
 
-				$sql = 'SELECT EventId FROM '.$mainevents_table.' WHERE '.$module_sql;
-				$event_ids = $this->Conn->GetCol($sql);
+				$ret .= "\t\t".'<EVENTS>'."\n";
 
-				if($event_ids)
-				{
-					$ret .= "\t\t".'<EVENTS>'."\n";
-					$event_sql = '	SELECT em.*
-									FROM '.$emailevents_table.' em
-									LEFT JOIN '.$mainevents_table.' e ON e.EventId = em.EventId
-									WHERE em.LanguageId = %s AND em.EventId IN (%s)
-									ORDER BY e.Event, e.Type';
-					$rows = $this->Conn->Query( sprintf($event_sql,$language_id, $event_ids ? implode(',',$event_ids) : '' ) );
-					foreach($rows as $row)
-					{
-						if (!array_key_exists($row['EventId'], $this->events_hash)) {
-							// don't export existing translations of missing events
-							continue;
-						}
+				$event_sql = '	SELECT *
+								FROM ' . $events_table . '
+								WHERE ' . $module_sql . '
+								ORDER BY `Event`, `Type`';
+				$rows = $this->Conn->Query($event_sql);
 
-						list($event_name, $event_type) = explode('_', $this->events_hash[ $row['EventId'] ] );
-						$data = $this->_exportEncoding == 'base64' ? base64_encode($row['Template']) : '<![CDATA['.$row['Template'].']]>';
-						$ret .= sprintf($event_tpl, $row['MessageType'], $event_name, $event_type, $data );
-					}
-					$ret .= "\t\t".'</EVENTS>'."\n";
+				foreach ($rows as $row) {
+					$fields_hash = Array (
+						'Headers' => $row['Headers'],
+						'Subject' => $row['l' . $language_id . '_Subject'],
+						'Body' => $row['l' . $language_id . '_Body'],
+					);
+
+					$template = $email_message_helper->buildTemplate($fields_hash);
+
+					list($event_name, $event_type) = explode('_', $this->events_hash[ $row['EventId'] ] );
+					$data = $this->_exportEncoding == 'base64' ? base64_encode($template) : '<![CDATA[' . $template . ']]>';
+					$ret .= sprintf($event_tpl, $row['MessageType'], $event_name, $event_type, $data);
 				}
+				$ret .= "\t\t".'</EVENTS>'."\n";
+
 				$ret .= "\t".'</LANGUAGE>'."\n";
 			}
 
@@ -268,7 +298,6 @@
 		 */
 		function _performUpgrade($language_id, $prefix, $unique_field)
 		{
-			// TODO: find a way to compare (intersect,diff) phrases in non-case sensitive way, but keeping original case in result
 			$live_records = $this->_getTableData($language_id, $prefix, $unique_field, false);
 			$temp_records = $this->_getTableData($language_id, $prefix, $unique_field, true);
 
@@ -308,6 +337,77 @@
 		}
 
 		/**
+		 * Performs upgrade of given language pack part
+		 *
+		 * @param int $language_id
+		 * @param string $prefix
+		 * @param string $unique_field
+		 * @param string $data_fields
+		 */
+		function _performUpgrade_v2($language_id, $prefix, $unique_field, $data_fields)
+		{
+			$live_records = $this->_getTableData_v2($language_id, $prefix, $unique_field, $data_fields[0], false);
+			$temp_records = $this->_getTableData_v2($language_id, $prefix, $unique_field, $data_fields[0], true);
+
+			if (!$temp_records) {
+				// no data for given language
+				return ;
+			}
+
+			// perform insert for records, that are missing in live table
+			$to_insert = array_diff($temp_records, $live_records);
+
+			if ($to_insert) {
+				$to_insert = array_map(Array (&$this->Conn, 'qstr'), $to_insert);
+
+				$sql = 'INSERT INTO ' . $this->Application->getUnitOption($prefix, 'TableName') . '
+						SELECT *
+						FROM ' . $this->_tables[$prefix] . '
+						WHERE ' . $unique_field . ' IN (' . implode(',', $to_insert) . ')';
+				$this->Conn->Query($sql);
+			}
+
+			// perform update for records, that are present in live table
+			$to_update = array_diff($temp_records, $to_insert);
+
+			if ($to_update) {
+				$to_update = array_map(Array (&$this->Conn, 'qstr'), $to_update);
+
+				$sql = 'UPDATE ' . $this->Application->getUnitOption($prefix, 'TableName') . ' live
+						SET ';
+
+				foreach ($data_fields as $index => $data_field) {
+					$data_field = sprintf($data_field, $language_id);
+
+					$sql .= '	live.' . $data_field . ' = (
+									SELECT temp' . $index . '.' . $data_field . '
+									FROM ' . $this->_tables[$prefix] . ' temp' . $index . '
+									WHERE temp' . $index . '.' . $unique_field . ' = live.' . $unique_field . '
+								),';
+				}
+
+				$sql = substr($sql, 0, -1); // cut last comma
+
+				$where_clause = Array (
+					// this won't make any difference, but just in case
+					$unique_field . ' IN (' . implode(',', $to_update) . ')',
+				);
+
+				if ($this->import_mode == LANG_SKIP_EXISTING) {
+					// empty OR not set
+					$data_field = sprintf($data_fields[0], $language_id);
+					$where_clause[] = '(' . $data_field . ' = "") OR (' . $data_field . ' IS NULL)';
+				}
+
+				if ($where_clause) {
+					$sql .= "\n" . 'WHERE (' . implode(') AND (', $where_clause) . ')';
+				}
+
+				$this->Conn->Query($sql);
+			}
+		}
+
+		/**
 		 * Returns data from given table used for language pack upgrade
 		 *
 		 * @param int $language_id
@@ -330,6 +430,35 @@
 			return $this->Conn->GetCol($sql);
 		}
 
+		/**
+		 * Returns data from given table used for language pack upgrade
+		 *
+		 * @param int $language_id
+		 * @param string $prefix
+		 * @param string $unique_field
+		 * @param bool $temp_mode
+		 * @return Array
+		 */
+		function _getTableData_v2($language_id, $prefix, $unique_field, $data_field, $temp_mode = false)
+		{
+			$data_field = sprintf($data_field, $language_id);
+			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
+
+			if ($temp_mode) {
+				// for temp table get only records, that have contents on given language (not empty and isset)
+				$sql = 'SELECT ' . $unique_field . '
+						FROM ' . $this->Application->GetTempName($table_name, 'prefix:' . $prefix) . '
+						WHERE (' . $data_field . ' <> "") AND (' . $data_field . ' IS NOT NULL)';
+			}
+			else {
+				// for live table get all records, no matter on what language
+				$sql = 'SELECT ' . $unique_field . '
+						FROM ' . $table_name;
+			}
+
+			return $this->Conn->GetCol($sql);
+		}
+
 		function _parseXML($filename)
 		{
 			if ($this->_debugMode) {
@@ -367,7 +496,7 @@
 		function _initImportTables($drop_only = false)
 		{
 			$this->_tables['phrases'] = $this->_prepareTempTable('phrases', $drop_only);
-			$this->_tables['emailmessages'] = $this->_prepareTempTable('emailmessages', $drop_only);
+			$this->_tables['emailevents'] = $this->_prepareTempTable('emailevents', $drop_only);
 		}
 
 		/**
@@ -407,24 +536,56 @@
 		}
 
 		/**
+		 * Returns language fields to be exported
+		 *
+		 * @return Array
+		 */
+		function _getExportFields()
+		{
+			return Array (
+				'PackName', 'LocalName', 'DateFormat', 'TimeFormat', 'InputDateFormat', 'InputTimeFormat',
+				'DecimalPoint', 'ThousandSep', 'Charset', 'UnitSystem', 'Locale', 'UserDocsUrl'
+			);
+		}
+
+		/**
 		 * Processes parsed XML
 		 *
 		 * @param kXMLNode $language_node
 		 */
 		function _processLanguages(&$language_node)
 		{
-			$field_mapping = Array (
-				'DATEFORMAT' => 'DateFormat',
-				'TIMEFORMAT' => 'TimeFormat',
-				'INPUTDATEFORMAT' => 'InputDateFormat',
-				'INPUTTIMEFORMAT' => 'InputTimeFormat',
-				'DECIMAL' => 'DecimalPoint',
-				'THOUSANDS' => 'ThousandSep',
-				'CHARSET' => 'Charset',
-				'UNITSYSTEM' => 'UnitSystem',
-				'DOCS_URL' => 'UserDocsUrl',
-			);
+			if (array_key_exists('VERSION', $language_node->Parent->Attributes)) {
+				// version present -> use it
+				$version = $language_node->Parent->Attributes['VERSION'];
+			}
+			else {
+				// version missing -> guess it
+				if (is_object($language_node->FindChild('DATEFORMAT'))) {
+					$version = 1;
+				}
+				elseif (array_key_exists('CHARSET', $language_node->Attributes)) {
+					$version = 2;
+				}
+			}
 
+			if ($version == 1) {
+				$field_mapping = Array (
+					'DATEFORMAT' => 'DateFormat',
+					'TIMEFORMAT' => 'TimeFormat',
+					'INPUTDATEFORMAT' => 'InputDateFormat',
+					'INPUTTIMEFORMAT' => 'InputTimeFormat',
+					'DECIMAL' => 'DecimalPoint',
+					'THOUSANDS' => 'ThousandSep',
+					'CHARSET' => 'Charset',
+					'UNITSYSTEM' => 'UnitSystem',
+					'DOCS_URL' => 'UserDocsUrl',
+				);
+			}
+			else {
+				$export_fields = $this->_getExportFields();
+			}
+
 			do {
 				$language_id = false;
 
@@ -432,9 +593,19 @@
 					'PackName' => $language_node->Attributes['PACKNAME'],
 					'LocalName' => $language_node->Attributes['PACKNAME'],
 					'Encoding' => $language_node->Attributes['ENCODING'],
-					'Charset' => 'iso-8859-1',
+					'Charset' => 'utf-8',
 				);
 
+				if ($version > 1) {
+					foreach ($export_fields as $export_field) {
+						$attribute_name = strtoupper($export_field);
+
+						if (array_key_exists($attribute_name, $language_node->Attributes)) {
+							$fields_hash[$export_field] = $language_node->Attributes[$attribute_name];
+						}
+					}
+				}
+
 				$sub_node =& $language_node->firstChild;
 				/* @var $sub_node kXMLNode */
 
@@ -468,8 +639,21 @@
 							}
 							break;
 
+						case 'REPLACEMENTS':
+							// added since v2
+							$replacements = $sub_node->Data;
+
+							if ($fields_hash['Encoding'] != 'plain') {
+								$replacements = base64_decode($replacements);
+							}
+
+							$fields_hash['FilenameReplacements'] = $replacements;
+							break;
+
 						default:
-							$fields_hash[ $field_mapping[$sub_node->Name] ] = $sub_node->Data;
+							if ($version == 1) {
+								$fields_hash[ $field_mapping[$sub_node->Name] ] = $sub_node->Data;
+							}
 							break;
 					}
 				} while (($sub_node =& $sub_node->NextSibling()));
@@ -518,36 +702,45 @@
 		 */
 		function _processEvents(&$event_node, $language_id, $language_encoding)
 		{
+			static $events_added = Array ();
+
 			$email_message_helper =& $this->Application->recallObject('EmailMessageHelper');
 			/* @var $email_message_helper EmailMessageHelper */
 
 			do {
 				$event_id = $this->_getEventId($event_node->Attributes['EVENT'], $event_node->Attributes['TYPE']);
 				if ($event_id) {
+					if ($language_encoding == 'plain') {
+						$template = rtrim($event_node->Data);
+					}
+					else {
+						$template = base64_decode($event_node->Data);
+					}
+
+					$parsed = $email_message_helper->parseTemplate($template);
+
 					$fields_hash = Array (
-						'LanguageId' => $language_id,
 						'EventId' => $event_id,
+						'Event' => $event_node->Attributes['EVENT'],
+						'Type' => $event_node->Attributes['TYPE'],
 						'MessageType' => $event_node->Attributes['MESSAGETYPE'],
+						'l' . $language_id . '_Subject' => $parsed['Subject'],
+						'l' . $language_id . '_Body' => $parsed['Body'],
 					);
 
-					if ($language_encoding == 'plain') {
-						$fields_hash['Template'] = rtrim($event_node->Data);
+					if ($parsed['Headers']) {
+						$fields_hash['Headers'] = $parsed['Headers'];
 					}
+
+					if (!in_array($event_id, $events_added)) {
+						$events_added[] = $event_id;
+						$this->Conn->doInsert($fields_hash, $this->_tables['emailevents']);
+					}
 					else {
-						$fields_hash['Template'] = base64_decode($event_node->Data);
+						$this->Conn->doUpdate($fields_hash, $this->_tables['emailevents'], 'EventId = ' . $event_id);
 					}
-
-					$parsed = $email_message_helper->parseTemplate($fields_hash['Template']);
-					$fields_hash['Subject'] = $parsed['Subject'];
-
-					$this->Conn->doInsert($fields_hash, $this->_tables['emailmessages'], 'INSERT', false);
 				}
 			} while (($event_node =& $event_node->NextSibling()));
-
-			if ($fields_hash) {
-				// at least one corresponding event declaration found by email event name+type given in translation
-				$this->Conn->doInsert($fields_hash, $this->_tables['emailmessages'], 'INSERT');
-			}
 		}
 
 		/**
Index: units/languages/languages_config.php
===================================================================
--- units/languages/languages_config.php	(revision 13128)
+++ units/languages/languages_config.php	(working copy)
@@ -23,51 +23,29 @@
 
 					'AutoLoad'			=>	true,
 					'Hooks'	=>	Array(
-												Array(
-													'Mode' => hAFTER,
-													'Conditional' => false,
-													'HookToPrefix' => 'lang',
-													'HookToSpecial' => '',
-													'HookToEvent' => Array('OnSave'),
-													'DoPrefix' => '',
-													'DoSpecial' => '',
-													'DoEvent' => 'OnReflectMultiLingualFields',
-												),
+						Array(
+							'Mode' => hAFTER,
+							'Conditional' => false,
+							'HookToPrefix' => 'lang',
+							'HookToSpecial' => '*',
+							'HookToEvent' => Array('OnSave'),
+							'DoPrefix' => '',
+							'DoSpecial' => '',
+							'DoEvent' => 'OnUpdatePrimary',
+						),
 
-												Array(
-													'Mode' => hAFTER,
-													'Conditional' => false,
-													'HookToPrefix' => 'lang',
-													'HookToSpecial' => '',
-													'HookToEvent' => Array('OnPreSave'),
-													'DoPrefix' => '',
-													'DoSpecial' => '',
-													'DoEvent' => 'OnCopyLabels',
-												),
+						Array(
+							'Mode' => hAFTER,
+							'Conditional' => false,
+							'HookToPrefix' => 'lang',
+							'HookToSpecial' => '*',
+							'HookToEvent' => Array('OnSave','OnMassDelete'),
+							'DoPrefix' => '',
+							'DoSpecial' => '',
+							'DoEvent' => 'OnScheduleTopFrameReload',
+						),
 
-												Array(
-													'Mode' => hAFTER,
-													'Conditional' => false,
-													'HookToPrefix' => 'lang',
-													'HookToSpecial' => '*',
-													'HookToEvent' => Array('OnSave'),
-													'DoPrefix' => '',
-													'DoSpecial' => '',
-													'DoEvent' => 'OnUpdatePrimary',
-												),
-
-												Array(
-													'Mode' => hAFTER,
-													'Conditional' => false,
-													'HookToPrefix' => 'lang',
-													'HookToSpecial' => '*',
-													'HookToEvent' => Array('OnSave','OnMassDelete'),
-													'DoPrefix' => '',
-													'DoSpecial' => '',
-													'DoEvent' => 'OnScheduleTopFrameReload',
-												),
-
-											),
+					),
 					'QueryString'		=>	Array(
 												1	=>	'id',
 												2	=>	'page',
@@ -116,9 +94,8 @@
 																						'edit_status_labels'	=>	Array('emailevents'	=>	'!la_title_Editing_EmailEvent!'),
 																						'format' 				=> 	'#emailevents_status# - #emailevents_titlefield#'),
 
-												'email_messages_edit'		=>	Array(	'prefixes'	=>	Array('lang','emailmessages'),
-																						'new_titlefield'	=>	Array('emailmessages' => ''),
-																						'format'	=>	"#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailmessages_titlefield#'"),
+												'email_messages_edit'		=>	Array(	'prefixes'	=>	Array('lang','emailevents'),
+																						'format'	=>	"#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailevents_titlefield#'"),
 
 												// for separate language list
 												'languages_list_st' => Array ('prefixes' => Array ('lang_List'), 'format' => "!la_title_LanguagesManagement!"),
@@ -159,7 +136,7 @@
 					),
 
 					'TableName'			=>	TABLE_PREFIX.'Language',
-					'SubItems' => Array('phrases','emailmessages'),
+					'SubItems' => Array('phrases',/*'emailmessages'*/),
 
 					'FilterMenu'		=>	Array(
 												'Groups' => Array(
Index: units/languages/languages_event_handler.php
===================================================================
--- units/languages/languages_event_handler.php	(revision 13128)
+++ units/languages/languages_event_handler.php	(working copy)
@@ -173,43 +173,38 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnCopyLabels(&$event)
+		function OnAfterItemCreate(&$event)
 		{
+			parent::OnAfterItemCreate($event);
+
 			$object =& $event->getObject();
-			$from_lang_id = $object->GetDBField('CopyFromLanguage');
+			/* @var $object kDBItem */
 
-			if( ($event->MasterEvent->status == erSUCCESS) && $object->GetDBField('CopyLabels') == 1 && ($from_lang_id > 0) )
-			{
-				$lang_id = $object->GetID();
+			$src_language = $object->GetDBField('CopyFromLanguage');
 
-				// 1. phrases import
-				$phrases_live = $this->Application->getUnitOption('phrases','TableName');
-				$phrases_temp = $this->Application->GetTempName($phrases_live, 'prefix:phrases');
-				$sql = 'INSERT INTO '.$phrases_temp.'
-						SELECT Phrase, Translation, PhraseType, 0-PhraseId, '.$lang_id.', '.adodb_mktime().', "", Module
-						FROM '.$phrases_live.'
-						WHERE LanguageId='.$from_lang_id;
-				$this->Conn->Query($sql);
+			if ($object->GetDBField('CopyLabels') && $src_language) {
+				$dst_language = $object->GetID();
 
-				// 2. events import
-				$em_table_live = $this->Application->getUnitOption('emailmessages','TableName');
-				$em_table_temp = $this->Application->GetTempName($em_table_live, 'prefix:emailmessages');
+				// 1. schedule data copy after OnSave event is executed
+				$var_name = $event->getPrefixSpecial() . '_copy_data' . $this->Application->GetVar('m_wid');
+				$pending_actions = $this->Application->RecallVar($var_name, Array ());
 
-				$sql = 'SELECT * FROM '.$em_table_live.' WHERE LanguageId = '.$from_lang_id;
-				$email_messages = $this->Conn->Query($sql);
-				if($email_messages)
-				{
-					$id = $this->Conn->GetOne('SELECT MIN(EmailMessageId) FROM '.$em_table_live);
-					if($id > 0) $id = 0;
-					$id--;
+				if ($pending_actions) {
+					$pending_actions = unserialize($pending_actions);
+				}
 
-					$sqls = Array();
-					foreach($email_messages as $email_message)
-					{
-						$sqls[] = $id.','.$this->Conn->qstr($email_message['Template']).','.$this->Conn->qstr($email_message['MessageType']).','.$lang_id.','.$email_message['EventId'];
-						$id--;
-					}
-					$sql = 'INSERT INTO '.$em_table_temp.'(EmailMessageId,Template,MessageType,LanguageId,EventId) VALUES ('.implode('),(',$sqls).')';
+				$pending_actions[$src_language] = $dst_language;
+				$this->Application->StoreVar($var_name, serialize($pending_actions));
+
+				if ($object->IsTempTable()) {
+					// 2. phrases import
+					$phrases_live = $this->Application->getUnitOption('phrases','TableName');
+					$phrases_temp = $this->Application->GetTempName($phrases_live, 'prefix:phrases');
+
+					$sql = 'INSERT INTO ' . $phrases_temp . '(Phrase, PhraseKey, Translation, PhraseType, PhraseId, LanguageId, LastChanged, LastChangeIP, Module)
+							SELECT Phrase, PhraseKey, Translation, PhraseType, 0-PhraseId, ' . $dst_language . ', ' . adodb_mktime() . ', "", Module
+							FROM ' . $phrases_live . '
+							WHERE LanguageId = ' . $src_language;
 					$this->Conn->Query($sql);
 				}
 
@@ -218,6 +213,51 @@
 		}
 
 		/**
+		 * Saves language from temp table to live
+		 *
+		 * @param kEvent $event
+		 */
+		function OnSave(&$event)
+		{
+			parent::OnSave($event);
+
+			if ($event->status != erSUCCESS) {
+				return ;
+			}
+
+			$var_name = $event->getPrefixSpecial() . '_copy_data' . $this->Application->GetVar('m_wid');
+			$pending_actions = $this->Application->RecallVar($var_name, Array ());
+
+			if ($pending_actions) {
+				$pending_actions = unserialize($pending_actions);
+			}
+
+			// create multilingual columns for phrases & email events table first (actual for 6+ language)
+			$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+//			$ml_helper->createFields('phrases');
+			$ml_helper->createFields('emailevents');
+
+			foreach ($pending_actions as $src_language => $dst_language) {
+				// phrases import
+				/*$sql = 'UPDATE ' . $this->Application->getUnitOption('phrases', 'TableName') . '
+						SET l' . $dst_language . '_Translation = l' . $src_language . '_Translation';
+				$this->Conn->Query($sql);*/
+
+				// events import
+				$sql = 'UPDATE ' . $this->Application->getUnitOption('emailevents', 'TableName') . '
+						SET
+							l' . $dst_language . '_Subject = l' . $src_language . '_Subject,
+							l' . $dst_language . '_Body = l' . $src_language . '_Body,
+							l' . $dst_language . '_Description = l' . $src_language . '_Description';
+				$this->Conn->Query($sql);
+			}
+
+			$this->Application->RemoveVar($var_name);
+
+			$event->CallSubEvent('OnReflectMultiLingualFields');
+		}
+
+		/**
 		 * Prepare temp tables for creating new item
 		 * but does not create it. Actual create is
 		 * done in OnPreSaveCreated
@@ -425,6 +465,27 @@
 		}
 
 		/**
+		 * Deletes phrases and email events on given language
+		 *
+		 * @param kEvent $event
+		 */
+		function OnAfterItemDelete(&$event)
+		{
+			parent::OnAfterItemDelete($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$fields_hash = Array (
+				'l' . $object->GetID() . '_Subject' => NULL,
+				'l' . $object->GetID() . '_Body' => NULL,
+				'l' . $object->GetID() . '_Description' => NULL,
+			);
+
+			$this->Conn->doUpdate($fields_hash, $this->Application->getUnitOption('emailevents', 'TableName'), 1);
+		}
+
+		/**
 		 * Copy missing phrases across all system languages (starting from primary)
 		 *
 		 * @param kEvent $event