Index: branches/RC/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -N -r8929 -r10194
--- branches/RC/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 10194)
@@ -31,16 +31,19 @@
 </table>
 
 <inp2:lang_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
-	<inp2:m_RenderElement name="subsection" 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="Type" title="!la_fld_EventType!"/> -->
-		<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_textarea" prefix="emailmessages" field="Body" title="!la_fld_MessageBody!" rows="20" cols="85"/>
-</table>
 
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" 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="Type" title="!la_fld_EventType!"/> -->
+			<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="{min_height: 100}" rows="5" cols="60"/>
+		<inp2:m_RenderElement name="subsection" title="!la_section_Message!"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="Body" title="!la_fld_MessageBody!" control_options="{min_height: 200}" rows="20" cols="85"/>
+	</table>
+</div>
+
 <inp2:m_include t="incs/footer"/>