Index: branches/5.1.x/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -N -r12657 -r13140
--- branches/5.1.x/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 13140)
@@ -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>