Index: branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl
===================================================================
diff -u -r12657 -r13140
--- branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 13140)
@@ -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,48 +11,53 @@
   		<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"/>');
 					}
 			 	) );
 
 				a_toolbar.Render();
 
 			</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>