Index: branches/5.3.x/core/admin_templates/languages/email_template_edit.tpl
===================================================================
diff -u -N -r15690 -r16323
--- branches/5.3.x/core/admin_templates/languages/email_template_edit.tpl	(.../email_template_edit.tpl)	(revision 15690)
+++ branches/5.3.x/core/admin_templates/languages/email_template_edit.tpl	(.../email_template_edit.tpl)	(revision 16323)
@@ -11,10 +11,26 @@
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							Application.SetVar('translation_save_mode', 1);
 							submit_event('email-template','<inp2:email-template_SaveEvent/>');
 						}
 					) );
 
+				<inp2:m_if check="lang_IsMultiLanguage">
+					a_toolbar.AddButton(
+						new ToolBarButton(
+							'setprimary',
+							'<inp2:m_Phrase label="hint:la_ToolTip_SetPrimaryTranslation" escape="1"/>::<inp2:m_Phrase label="la_ToolTip_SetPrimaryTranslation" escape="1"/>',
+							function() {
+								Application.SetVar('translation_save_mode', 2);
+								submit_event('email-template','<inp2:email-template_SaveEvent/>');
+							}
+						)
+					);
+				</inp2:m_if>
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							cancel_edit('email-template','OnCancelEdit','<inp2:email-template_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
 						}
@@ -27,7 +43,7 @@
 			 	) );
 
 			 	<inp2:m_if check="email-template_IsSingle" inverse="inverse">
-					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 				</inp2:m_if>
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
@@ -53,6 +69,16 @@
 <inp2:email-template_SaveWarning name="grid_save_warning"/>
 <inp2:email-template_ErrorWarning name="form_error_warning"/>
 
+<inp2:m_DefineElement name="inp_primary_label">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<td class="control-cell" valign="top">
+			<div class="highlight-area" style="width: 735px; height: 234px;">
+				<inp2:{$prefix}_Field field="$field" nl2br="$nl2br"/>
+			</div>
+		</td>
+	</inp2:m_RenderElement>
+</inp2:m_DefineElement>
+
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" prefix="email-template" fields="TemplateId,Description,Subject" title="la_section_General"/>
@@ -65,18 +91,34 @@
 			</inp2:m_if>
 
 			<inp2:m_RenderElement name="inp_label" prefix="email-template" field="Description" title="la_fld_Description"/>
+
+			<inp2:m_if check="email-template_ShowSourceLanguage">
+				<inp2:m_RenderElement name="inp_label" prefix="email-template" field="TranslationInSync"/>
+			</inp2:m_if>
+
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="email-template" field="Subject" format="no_default" title="la_fld_Subject"/>
 
+			<inp2:m_if check="email-template_ShowSourceLanguage">
+				<inp2:m_RenderElement name="inp_label" prefix="email-template" field="SourceSubject" caption_render_as="source_language_field_caption_element"/>
+			</inp2:m_if>
 		<inp2:m_RenderElement name="subsection" prefix="email-template" fields="HtmlBody,PlainTextBody" title="la_section_Message"/>
 			<inp2:m_if check="m_IsDebugMode">
 				<inp2:m_RenderElement name="inp_edit_codemirror" prefix="email-template" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" language="text/html" allow_html="1" control_options="{min_height: 200}"/>
 			<inp2:m_else/>
 				<inp2:m_RenderElement name="inp_edit_fck" prefix="email-template" field="HtmlBody" format="no_default" title="la_fld_HtmlVersion" rows="5" cols="60" control_options="{min_height: 200}"/>
 			</inp2:m_if>
 
+			<inp2:m_if check="email-template_ShowSourceLanguage">
+				<inp2:m_RenderElement name="inp_primary_label" prefix="email-template" field="SourceHtmlBody" caption_render_as="source_language_field_caption_element" nl2br="1"/>
+			</inp2:m_if>
+
 			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="email-template" field="PlainTextBody" format="no_default" title="la_fld_TextVersion" control_options="{min_height: 200}"/>
+
+			<inp2:m_if check="email-template_ShowSourceLanguage">
+				<inp2:m_RenderElement name="inp_primary_label" prefix="email-template" field="SourcePlainTextBody" caption_render_as="source_language_field_caption_element" nl2br="1"/>
+			</inp2:m_if>
 		<inp2:m_RenderElement name="inp_edit_filler" control_options="{max_height: 8}"/>
 	</table>
 </div>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>