Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r14936 -r14941
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 14936)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 14941)
@@ -598,6 +598,118 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
+<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>
+
+<inp2:m_DefineElement name="email_recipients_js" prefix="emailevents" to_readonly="auto">
+	<script type="text/javascript">
+		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#';
+			}
+
+			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_if check="m_Param" name="to_readonly" equals_to="auto">
+			<inp2:$prefix_ToRecipientReadOnly result_to_var="to_readonly"/>
+		</inp2:m_if>
+
+		<inp2:m_if check="m_Param" name="to_readonly">
+			Recipients.isReadOnly = function($record_index) {
+				return this.Records[$record_index]['RecipientType'] == <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_TO"/>;
+			}
+
+			<inp2:$prefix_RestoreRecipientType/>
+			Recipients.registerControl('RecipientType', {type: 'radio', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="$prefix" field="RecipientType" strip_nl="2"/>, 'default': <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_CC"/>});
+		<inp2:m_else/>
+			Recipients.registerControl('RecipientType', {type: 'radio', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="$prefix" field="RecipientType" strip_nl="2"/>, 'default': <inp2:$prefix_FieldOption field="RecipientType" option="default"/>});
+		</inp2:m_if>
+
+		Recipients.registerControl('RecipientAddressType', {type: 'select', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="$prefix" field="RecipientAddressType" strip_nl="2"/>, 'default': <inp2:$prefix_FieldOption field="RecipientAddressType" option="default"/>});
+		Recipients.registerControl('RecipientAddress', {type: 'textbox', required: true, 'default': '<inp2:$prefix_FieldOption field="RecipientAddress" option="default" js_escape="1"/>'});
+		Recipients.registerControl('RecipientName', {type: 'textbox', required: false, 'default': '<inp2:$prefix_FieldOption field="RecipientName" option="default" js_escape="1"/>'});
+		Recipients.LoadValues();
+	</script>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_option_item">
 	<option value="<inp2:m_param name='key'/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
 </inp2:m_DefineElement>