Index: branches/5.2.x/core/admin_templates/site_domains/site_domain_edit.tpl
===================================================================
diff -u -N -r14924 -r14941
--- branches/5.2.x/core/admin_templates/site_domains/site_domain_edit.tpl	(.../site_domain_edit.tpl)	(revision 14924)
+++ branches/5.2.x/core/admin_templates/site_domains/site_domain_edit.tpl	(.../site_domain_edit.tpl)	(revision 14941)
@@ -69,28 +69,39 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
+<inp2:emailevents.site-domain_PresetFormFields/>
+
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="site-domain" field="DomainId" title="la_fld_Id"/>
-		<inp2:m_RenderElement name="inp_edit_regexp_box" prefix="site-domain" field="DomainName" title="la_fld_DomainName"/>
-		<inp2:m_RenderElement name="inp_edit_regexp_box" prefix="site-domain" field="SSLUrl"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="site-domain" field="AdminEmail" title="la_fld_AdminEmail"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="Country" title="la_fld_Country" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="PrimaryLanguageId" title="la_fld_Language" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_edit_picker" prefix="site-domain" field="Languages" title="la_fld_Languages" optprefix="lang" option_key_field="LanguageId" option_value_field="PackName"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="PrimaryThemeId" title="la_fld_Theme" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_edit_picker" prefix="site-domain" field="Themes" title="la_fld_Themes" optprefix="theme" option_key_field="ThemeId" option_value_field="Name"/>
+		<inp2:m_RenderElement name="subsection" title="la_title_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="site-domain" field="DomainId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_regexp_box" prefix="site-domain" field="DomainName" title="la_fld_DomainName"/>
+			<inp2:m_RenderElement name="inp_edit_regexp_box" prefix="site-domain" field="SSLUrl"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="site-domain" field="AdminEmail" title="la_fld_AdminEmail"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="Country" title="la_fld_Country" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="PrimaryLanguageId" title="la_fld_Language" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_picker" prefix="site-domain" field="Languages" title="la_fld_Languages" optprefix="lang" option_key_field="LanguageId" option_value_field="PackName"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="PrimaryThemeId" title="la_fld_Theme" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_picker" prefix="site-domain" field="Themes" title="la_fld_Themes" optprefix="theme" option_key_field="ThemeId" option_value_field="Name"/>
 
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="site-domain" field="RedirectOnIPMatch" title="la_fld_RedirectOnIPMatch"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="site-domain" field="DomainIPRange" allow_html="0"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="site-domain" field="ExternalUrl" title="la_fld_ExternalUrl"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="site-domain" field="RedirectOnIPMatch" title="la_fld_RedirectOnIPMatch"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="site-domain" field="DomainIPRange" allow_html="0"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="site-domain" field="ExternalUrl" title="la_fld_ExternalUrl"/>
 
-		<inp2:m_RenderElement name="inp_edit_box" prefix="site-domain" field="Priority" title="la_fld_Priority" style="width: 50px;"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="site-domain" field="Priority" title="la_fld_Priority" style="width: 50px;"/>
 
+		<inp2:m_RenderElement name="subsection" title="la_section_RecipientsInfo"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailevents.site-domain" field="RecipientType" title="la_fld_RecipientType"/>
+			<inp2:m_RenderElement name="inp_edit_combo_target" prefix="emailevents.site-domain" field="RecipientAddress" title="la_fld_RecipientAddress" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="emailevents.site-domain" field="RecipientName" title="la_fld_RecipientName" style="width: 318px;"/>
+			<inp2:m_RenderElement name="inp_edit_minput" prefix="emailevents.site-domain" field="Recipients" title="la_fld_Recipients" format="auto" style="width: 400px; height: 150px;"/>
+
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
 
+<inp2:m_RenderElement name="email_recipients_js" prefix="emailevents.site-domain" to_readonly="0"/>
+
 <script type="text/javascript">
 	var $field_mask = jq('<inp2:site-domain_InputName name="#FIELD_NAME#" js_escape="1"/>');