Index: branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl
===================================================================
diff -u -N -r13151 -r13635
--- branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 13151)
+++ branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 13635)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="875" height="650"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="emailevents" title_preset="email_messages_edit_direct"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="emailevents" title_preset="email_message_edit" tab_preset="Default"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -26,8 +26,22 @@
 					}
 			 	) );
 
+			 	<inp2:m_if check="emailevents_IsSingle" inverse="inverse">
+					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+				</inp2:m_if>
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('emailevents', '<inp2:emailevents_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('emailevents', '<inp2:emailevents_NextId/>');
+						}
+				 ) );
+
 				a_toolbar.Render();
 
+				<inp2:m_RenderElement name="edit_navigation" prefix="emailevents"/>
 			</script>
 		</td>
 
@@ -38,26 +52,28 @@
 
 <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="emailevents" fields="EventId,Event,Subject,Enabled,FrontEndOnly,FromUserId,Module,Description,Type,MessageType,Headers" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="EventId,Description,Subject" title="!la_section_General!"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="emailevents" field="EventId" title="la_fld_Id"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="Event" title="la_fld_Event"/>
+
+			<inp2:m_if check="m_IsDebugMode">
+				<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents" field="Event" title="la_fld_Event"/>
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Event" title="la_fld_Event"/>
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_label" prefix="emailevents" field="Description" title="la_fld_Description"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="emailevents" field="Subject" format="no_default" title="la_fld_Subject"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" 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="subsection" prefix="emailevents" fields="Body" title="!la_section_Message!"/>
-			<inp2:m_RenderElement name="inp_edit_fck" prefix="emailevents" field="Body" format="no_default" 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" format="no_default" title="la_fld_MessageBody" control_options="{min_height: 200}"/>  -->
+			<inp2:m_if check="m_IsDebugMode">
+				<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="Body" format="no_default" title="la_fld_MessageBody" control_options="{min_height: 200}"/>
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_edit_fck" prefix="emailevents" field="Body" format="no_default" title="la_fld_MessageBody" rows="5" cols="60" control_options="{min_height: 200}"/>
+			</inp2:m_if>
+
 		<inp2:m_RenderElement name="inp_edit_filler" control_options="{max_height: 8}"/>
 	</table>
 </div>