Index: branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
diff -u -N -r13664 -r13926
--- branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 13664)
+++ branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 13926)
@@ -86,30 +86,23 @@
 	<inp2:m_if check="m_Param" name="not_last">; </inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_recipient_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" hint_label="" style="width: 100%">
-	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
-			<td class="control-cell">
-				<inp2:m_if check="{$prefix}_IsManualRecipient">
-					<input style="<inp2:m_Param name="style"/>" type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" format="$format"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>">
-				<inp2:m_else/>
-					<inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>
-					<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
-				</inp2:m_if>
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
 <div id="scroll_container">
 	<table class="edit-form">
 
 		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="mailing-list" field="MailingId" title="la_fld_Id"/>
-			<inp2:m_RenderElement name="inp_recipient_box" prefix="mailing-list" field="To" title="la_fld_To" size="60"/>
 
+			<inp2:m_RenderElement design="form_row" prefix="mailing-list" field="To" title="la_fld_To" size="60">
+				<td class="control-cell">
+					<inp2:m_if check="{$prefix}_IsManualRecipient">
+						<input style="width: 100%;" 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"/>" size="<inp2:m_param name="size"/>">
+					<inp2:m_else/>
+						<inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>
+						<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
+					</inp2:m_if>
+				</td>
+			</inp2:m_RenderElement>
+
 			<inp2:m_if check="mailing-list_IsNewItem">
 				<inp2:m_RenderElement name="inp_edit_box" prefix="mailing-list" field="Subject" title="la_fld_Subject" size="60"/>
 				<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="mailing-list" field="Attachments" title="la_fld_Attachment"/>