Index: branches/5.1.x/core/admin_templates/languages/email_message_settings.tpl
===================================================================
diff -u -N -r13635 -r13926
--- branches/5.1.x/core/admin_templates/languages/email_message_settings.tpl	(.../email_message_settings.tpl)	(revision 13635)
+++ branches/5.1.x/core/admin_templates/languages/email_message_settings.tpl	(.../email_message_settings.tpl)	(revision 13926)
@@ -54,60 +54,56 @@
 <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_if check="{$prefix}_FieldVisible" field="$field">
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" id="<inp2:$prefix_InputName field='$field'/>_row">
-			<inp2:m_RenderElement name="inp_edit_field_caption" caption_render_as="$caption_render_as" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label"/>
-			<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>
+	<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>
+				<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"/>'
+			<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();
+				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"/>';
+						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;
+							return $url.replace('#VALUE#', encodeURIComponent(cur_value)).replace('#TYPE#', encodeURIComponent($type));
 						}
-					);
 
-					$(document).ready(
-						function () {
-							$( jq('#<inp2:$prefix_InputName name="{$field}Type"/>') ).change(
-								function ($e) {
-									var $me = $(this);
+						return false;
+					}
+				);
 
-									if ($me.attr('disabled')) {
-										return ;
-									}
+				$(document).ready(
+					function () {
+						$( jq('#<inp2:$prefix_InputName name="{$field}Type"/>') ).change(
+							function ($e) {
+								var $me = $(this);
 
-									var $type_selected = !isNaN( parseInt( $me.val() ) );
-									$( jq('#<inp2:$prefix_InputName name="$field"/>') ).attr('disabled', $type_selected ? '' : 'disabled');
+								if ($me.attr('disabled')) {
+									return ;
 								}
-							)
-							.change();
-						}
-					);
-				</script>
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
+
+								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">