Index: branches/RC/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -N -r10194 -r11538
--- branches/RC/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 10194)
+++ branches/RC/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 11538)
@@ -1,10 +1,8 @@
 <inp2:adm_SetPopupSize width="827" height="400"/>
-<inp2:m_RequireLogin permissions="in-portal:configure_lang.view" system="1"/>
+
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="section_header" icon="icon46_conf_regional" title="!la_title_Regional!"/>
+<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="email_messages_edit"/>
 
-<inp2:m_RenderElement name="blue_bar" prefix="lang" title_preset="email_messages_edit" module="in-portal" icon="icon46_conf_regional"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -30,7 +28,8 @@
 </tbody>
 </table>
 
-<inp2:lang_SaveWarning name="grid_save_warning"/>
+<inp2:emailmessages_SaveWarning name="grid_save_warning"/>
+<inp2:emailmessages_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
@@ -46,4 +45,4 @@
 	</table>
 </div>
 
-<inp2:m_include t="incs/footer"/>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file