Index: branches/5.2.x/core/admin_templates/languages/email_message_settings.tpl
===================================================================
diff -u -N -r14244 -r14941
--- branches/5.2.x/core/admin_templates/languages/email_message_settings.tpl	(.../email_message_settings.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/languages/email_message_settings.tpl	(.../email_message_settings.tpl)	(revision 14941)
@@ -53,59 +53,6 @@
 <inp2:emailevents_SaveWarning name="grid_save_warning"/>
 <inp2:emailevents_ErrorWarning name="form_error_warning"/>
 
-<inp2:m_DefineElement name="inp_edit_combo_target" caption_render_as="default_field_caption_element" read_only="0" has_empty="" hint_label="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
-		<td class="control-cell">
-			<inp2:m_if check="m_Param" name="read_only">
-				<inp2:$prefix_Field name="{$field}Type"/>: "<inp2:$prefix_Field name="$field"/>"
-			<inp2:m_else/>
-				<select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='{$field}Type'/>" id="<inp2:{$prefix}_InputName field='{$field}Type'/>">
-					<inp2:{$prefix}_PredefinedOptions field="{$field}Type" block="inp_option_phrase" selected="selected" has_empty="$has_empty"/>
-				</select>
-
-				<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" style="width: 250px;"/>
-			</inp2:m_if>
-
-			<script type="text/javascript">
-				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>Type'] = '<inp2:m_phrase label="{$title}Type" js_escape="1"/>'
-
-				new AJAXDropDown(
-					'<inp2:$prefix_InputName name="$field" js_escape="1"/>',
-					function(cur_value) {
-						var $type = $( jq('#<inp2:$prefix_InputName name="{$field}Type" js_escape="1"/>') ).val();
-
-						if ( !isNaN( parseInt($type) ) ) {
-							var $url = '<inp2:m_Link template="dummy" pass="m,$prefix" {$prefix}_event="OnSuggestAddress" value="#VALUE#" type="#TYPE#" no_amp="1"/>';
-
-							return $url.replace('#VALUE#', encodeURIComponent(cur_value)).replace('#TYPE#', encodeURIComponent($type));
-						}
-
-						return false;
-					}
-				);
-
-				$(document).ready(
-					function () {
-						$( jq('#<inp2:$prefix_InputName name="{$field}Type"/>') ).change(
-							function ($e) {
-								var $me = $(this);
-
-								if ($me.attr('disabled')) {
-									return ;
-								}
-
-								var $type_selected = !isNaN( parseInt( $me.val() ) );
-								$( jq('#<inp2:$prefix_InputName name="$field"/>') ).attr('disabled', $type_selected ? '' : 'disabled');
-							}
-						)
-						.change();
-					}
-				);
-			</script>
-		</td>
-	</inp2:m_RenderElement>
-</inp2:m_DefineElement>
-
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" prefix="emailevents" fields="AllowChangingSender,CustomSender,SenderAddress,SenderAddressType,SenderName" title="la_section_SenderInfo"/>
@@ -160,61 +107,11 @@
 	</table>
 </div>
 
-<script type="text/javascript">
-	<inp2:m_if check="emailevents_FieldVisible" field="Recipients">
-		// recipients
-		Recipients.formatLine = function($record_index) {
-			if (this.Records[$record_index]['RecipientName']) {
-				// name specified
-				if (this.Records[$record_index]['RecipientAddressType'] == 1) {
-					// email
-					this.ResultMask = '#RecipientType#: "#RecipientName#" <#RecipientAddress#>';
-				}
-				else {
-					// other
-					this.ResultMask = '#RecipientType#: "#RecipientName#" <#RecipientAddress#> - #RecipientAddressType#';
-				}
-			}
-			else {
-				// name not specified
-				this.ResultMask = '#RecipientType#: #RecipientAddress# - #RecipientAddressType#';
-			}
+<inp2:m_if check="emailevents_FieldVisible" field="Recipients">
+	<inp2:m_RenderElement name="email_recipients_js"/>
+</inp2:m_if>
 
-			return MultiInputControl.prototype.formatLine.call(this, $record_index);
-		}
-
-		Recipients.compareRecords = function($record_a, $record_b) {
-			var $equals = true;
-			var $compare_fields = ['RecipientAddressType', 'RecipientAddress'];
-
-			for (var $i = 0; $i < $compare_fields.length; $i++) {
-				var $field_name = $compare_fields[$i];
-
-				if ($record_a[$field_name] !== $record_b[$field_name]) {
-					return false;
-				}
-			}
-
-			return $equals;
-		}
-
-		<inp2:m_ifnot check="emailevents_IsEditable" check_field="AllowChangingRecipient">
-			Recipients.isReadOnly = function($record_index) {
-				return this.Records[$record_index]['RecipientType'] == <inp2:m_GetConst name="RECIPIENT_TYPE_TO"/>;
-			}
-
-			<inp2:emailevents_RestoreRecipientType/>
-			Recipients.registerControl('RecipientType', {type: 'radio', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="emailevents" field="RecipientType" strip_nl="2"/>, 'default': <inp2:m_GetConst name="RECIPIENT_TYPE_CC"/>});
-		<inp2:m_else/>
-			Recipients.registerControl('RecipientType', {type: 'radio', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="emailevents" field="RecipientType" strip_nl="2"/>, 'default': <inp2:emailevents_FieldOption field="RecipientType" option="default"/>});
-		</inp2:m_ifnot>
-
-		Recipients.registerControl('RecipientAddressType', {type: 'select', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="emailevents" field="RecipientAddressType" strip_nl="2"/>, 'default': <inp2:emailevents_FieldOption field="RecipientAddressType" option="default"/>});
-		Recipients.registerControl('RecipientAddress', {type: 'textbox', required: true, 'default': '<inp2:emailevents_FieldOption field="RecipientAddress" option="default" js_escape="1"/>'});
-		Recipients.registerControl('RecipientName', {type: 'textbox', required: false, 'default': '<inp2:emailevents_FieldOption field="RecipientName" option="default" js_escape="1"/>'});
-		Recipients.LoadValues();
-	</inp2:m_if>
-
+<script type="text/javascript">
 	<inp2:m_if check="emailevents_FieldVisible" field="ReplacementTagsXML">
 		// replacement tags
 		ReplacementTagsXML.formatLine = function($record_index) {
@@ -253,22 +150,22 @@
 	function reflectCustomRecipient() {
 		<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">
 			var $default_recipient = get_control($field_mask, 'CustomRecipient', '0').checked;
-			var $to_recipient = get_control($field_mask, 'RecipientType', <inp2:m_GetConst name="RECIPIENT_TYPE_TO"/>);
+			var $to_recipient = get_control($field_mask, 'RecipientType', <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_TO"/>);
 		<inp2:m_else/>
 			var $default_recipient = <inp2:m_if check="emailevents_Field" name="CustomRecipient" db="db" equals_to="0">true<inp2:m_else/>false</inp2:m_if>;
 		</inp2:m_if>
 
 		if ($default_recipient) {
 			<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">
 				if ($to_recipient.checked) {
-					get_control($field_mask, 'RecipientType', <inp2:m_GetConst name="RECIPIENT_TYPE_CC"/>).checked = true;
+					get_control($field_mask, 'RecipientType', <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_CC"/>).checked = true;
 				}
 			</inp2:m_if>
 
-			Recipients.registerControl('RecipientType', {'default': <inp2:m_GetConst name="RECIPIENT_TYPE_CC"/>}, true);
+			Recipients.registerControl('RecipientType', {'default': <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_CC"/>}, true);
 		}
 		else {
-			Recipients.registerControl('RecipientType', {'default': <inp2:m_GetConst name="RECIPIENT_TYPE_TO"/>}, true);
+			Recipients.registerControl('RecipientType', {'default': <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_TO"/>}, true);
 		}
 
 		<inp2:m_if check="emailevents_IsEditable" check_field="AllowChangingRecipient">