Index: branches/5.1.x/core/admin_templates/submissions/submission_view.tpl
===================================================================
diff -u -N -r13390 -r13824
--- branches/5.1.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 13390)
+++ branches/5.1.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 13824)
@@ -109,6 +109,23 @@
 	<inp2:SubmissionTag tag="PredefinedOptions" field="$field" block="form_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_merge_to" caption_render_as="default_field_caption_element" is_last="" field_class="" onchange="" hint_label="" onclick="">
+	<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" is_last="$is_last" NamePrefix="_cb_"/>
+			<td class="control-cell">
+				<input type="hidden" id="<inp2:{$prefix}_InputName field='Is{$field}'/>" name="<inp2:{$prefix}_InputName field='Is{$field}'/>" value="<inp2:{$prefix}_Field field='Is{$field}' db='db'/>">
+				<input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='Is{$field}'/>" name="_cb_<inp2:{$prefix}_InputName field='Is{$field}'/>" <inp2:{$prefix}_Field field="Is{$field}" checked="checked" db="db"/> class="<inp2:m_param name='field_class'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='Is{$field}'/>'));<inp2:m_param name='onchange'/>" onclick="<inp2:m_param name='onclick'/>">
+
+				<select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" onchange="<inp2:m_Param name='onchange'/>" style="width: 400px;">
+					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="1"/>
+				</select>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+		</tr>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
 <inp2:formsubs_SaveWarning name="grid_save_warning"/>
 <inp2:formsubs_ErrorWarning name="form_error_warning"/>
 
@@ -130,6 +147,11 @@
 				<inp2:m_RenderElement name="inp_label" prefix="formsubs" field="LastUpdatedOn" title="la_fld_LastUpdatedOn" />
 			</inp2:m_if>
 
+			<inp2:m_if check="form_Field" name="EnableEmailCommunication" db="db">
+				<inp2:m_ifnot check="submission-log_TotalRecords">
+					<inp2:m_RenderElement name="inp_edit_merge_to" prefix="formsubs" field="MergeToSubmission" title="la_fld_MergeToSubmission"/>
+				</inp2:m_ifnot>
+			</inp2:m_if>
 		<inp2:m_RenderElement name="subsection" title="la_section_Data"/>
 
 			<inp2:m_DefineElement name="form_field" prefix="formsubs">
@@ -163,4 +185,35 @@
 	</table>
 </div>
 
+<inp2:m_ifnot check="submission-log_TotalRecords">
+	<script language="javascript" type="text/javascript">
+		var $field_mask = '<inp2:formsubs_InputName name="#FIELD_NAME#" js_escape="1"/>';
+
+		$(document).ready(
+			function () {
+				processMergeToSubmission();
+				$( get_control($field_mask, 'IsMergeToSubmission', undefined, '_cb') ).click(processMergeToSubmission);
+			}
+		);
+
+		function processMergeToSubmission() {
+			var $do_merge = get_control($field_mask, 'IsMergeToSubmission', undefined, '_cb').checked;
+			var $merge_to_submission = get_control($field_mask, 'MergeToSubmission');
+
+			if (!$do_merge) {
+				$merge_to_submission.selectedIndex = 0;
+			}
+
+			$merge_to_submission.disabled = !$do_merge;
+
+			if ($do_merge) {
+				$('#merge_submission').removeClass('button-disabled').addClass('button').attr('disabled', '');
+			}
+			else {
+				$('#merge_submission').removeClass('button').addClass('button-disabled').attr('disabled', 'disabled');
+			}
+		}
+	</script>
+</inp2:m_ifnot>
+
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file