Index: branches/RC/core/admin_templates/languages/email_message_edit.tpl
===================================================================
diff -u -N -r11677 -r11906
--- branches/RC/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 11677)
+++ branches/RC/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 11906)
@@ -39,17 +39,19 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<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="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!" rows="5" cols="60"/>-->
-		<inp2:m_RenderElement name="subsection" title="!la_section_Message!"/>
 
+			<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!" rows="5" cols="60"/>
+
+		<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="inp_edit_filler"/>
 	</table>