Index: branches/5.2.x/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -N -r14572 -r15222
--- branches/5.2.x/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 14572)
+++ branches/5.2.x/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 15222)
@@ -21,19 +21,19 @@
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				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_if check="emailevents_IsSingle">
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
@@ -64,11 +64,11 @@
 
 			<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_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_textarea_ml" prefix="emailevents" field="l{$language_id}_HtmlBody" title="la_fld_HtmlVersion" control_options="{min_height: 200}" rows="20" cols="85"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="emailevents" field="l{$language_id}_PlainTextBody" title="la_fld_TextVersion" control_options="{min_height: 200}" allow_html="0" rows="20" cols="85"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>