Index: branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl
===================================================================
diff -u -N -r13140 -r13151
--- branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 13140)
+++ branches/5.1.x/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 13151)
@@ -45,8 +45,8 @@
 		<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_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"/>
@@ -56,8 +56,8 @@
 			<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" 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_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_RenderElement name="inp_edit_filler" control_options="{max_height: 8}"/>
 	</table>
 </div>