Index: branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl
===================================================================
diff -u -N -r13840 -r14092
--- branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 13840)
+++ branches/5.2.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 14092)
@@ -71,28 +71,6 @@
 	<a href="<inp2:Field field='$field' format='full_url'/>" target="_blank"><inp2:Field field="$field"/></a><br/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_upload_label" is_last="">
-	<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" is_last="$is_last"/>
-		<td class="control-cell">
-			<inp2:$prefix_IterateFiles render_as="file_element" field="$field"/>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_draft" is_last="">
-	<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="la_DraftAvailableFrom" is_last="$is_last"/>
-		<td class="control-cell">
-			<inp2:draft.related_Field name="CreatedOn"/>
-			[<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnUseDraft'); return false;"><inp2:m_Phrase name="la_btn_UseDraft"/></a>]
-			&nbsp;[<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnDeleteDraft'); return false;"><inp2:m_Phrase name="la_btn_DeleteDraft"/></a>]
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
-</inp2:m_DefineElement>
-
 <input type="hidden" name="client_mode" value="<inp2:m_Get name='client_mode'/>"/>
 
 <inp2:submission-log_SaveWarning name="grid_save_warning"/>
@@ -112,7 +90,13 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="submission-log" field="Subject" size="80" title="la_fld_Subject"/>
 
 			<inp2:m_if check="submission-log_HasDraft">
-				<inp2:m_RenderElement name="inp_edit_draft" prefix="submission-log" field="DraftId"/>
+				<inp2:m_RenderElement design="form_row" prefix="submission-log" field="DraftId" title="la_DraftAvailableFrom">
+					<td class="control-cell">
+						<inp2:draft.related_Field name="CreatedOn"/>
+						[<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnUseDraft'); return false;"><inp2:m_Phrase name="la_btn_UseDraft"/></a>]
+						&nbsp;[<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnDeleteDraft'); return false;"><inp2:m_Phrase name="la_btn_DeleteDraft"/></a>]
+					</td>
+				</inp2:m_RenderElement>
 			</inp2:m_if>
 
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="submission-log" field="Message" rows="30" cols="100" title="la_fld_Message" allow_html="0"/>
@@ -124,8 +108,13 @@
 			<inp2:m_RenderElement name="inp_label" prefix="submission-log" field="RepliedOn" title="la_fld_RepliedOn"/>
 			<inp2:m_RenderElement name="inp_label" prefix="submission-log" field="SentStatus" title="la_fld_SentStatus"/>
 			<inp2:m_RenderElement name="inp_label" prefix="submission-log" field="SentOn" title="la_fld_SentOn"/>
-			<inp2:m_RenderElement name="inp_edit_upload_label" prefix="submission-log" field="Attachment" title="la_fld_Attachment"/>
 
+			<inp2:m_RenderElement design="form_row" prefix="submission-log" field="Attachment" title="la_fld_Attachment">
+				<td class="control-cell">
+					<inp2:$prefix_IterateFiles render_as="file_element" field="$field"/>
+				</td>
+			</inp2:m_RenderElement>
+
 			<inp2:m_if check="submission-log_Field" name="BounceInfo">
 				<inp2:m_RenderElement name="inp_label" prefix="submission-log" field="BounceInfo" title="la_fld_BounceInfo" nl2br="1"/>
 			</inp2:m_if>