Index: branches/5.3.x/core/admin_templates/js/forms.js
===================================================================
--- branches/5.3.x/core/admin_templates/js/forms.js	(revision 16594)
+++ branches/5.3.x/core/admin_templates/js/forms.js	(revision 16595)
@@ -1,439 +1,451 @@
 var last_shown_error = false;
 var errors = {};
 var first_error = {};
 var fields = {};
 
 function show_form_error(prefix, field, sticky) {
 	if ( isset(errors[prefix]) && isset(errors[prefix][field]) ) {
 		span = document.getElementById('error_msg_' + prefix);
 		span.innerHTML = fields[prefix][field] + ' - ' + errors[prefix][field];
 
 		if ( sticky ) {
 			last_shown_error = field;
 		}
 	}
 }
 
 function hide_form_error(prefix) {
 	span = document.getElementById('error_msg_' + prefix);
 
 	if ( !span ) {
 		return;
 	}
 
 	span.innerHTML = '<br/>';
 
 	if ( typeof(last_shown_error) != 'undefined' && last_shown_error ) {
 		show_form_error(prefix, last_shown_error);
 	}
 }
 
 function add_form_error(prefix, field, element, error_msg, block_name) {
 	if ( error_msg == '' ) {
 		// no error message - do nothing
 		return;
 	}
 
 	if ( typeof(errors[prefix]) == 'undefined' ) {
 		errors[prefix] = {};
 	}
 
 	errors[prefix][field] = error_msg;
 
 	var $input_fields = $('#' + jq(element));
 
 	switch (block_name) {
 		case 'inp_edit_timezone':
 			$input_fields = $input_fields.add('#timezone_group');
 			break;
 
 		case 'cf:datetime':
 		case 'inp_edit_date_time':
 			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + '_date')));
 			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + '_time')));
 			break;
 
 		case 'inp_edit_combo_target':
 			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + 'Type')));
 			break;
 
 		case 'cf:multiselect':
 		case 'inp_edit_multioptions':
 			$input_fields = $('#' + jq(element) + '_select');
 			break;
 
 		case 'cf:checkbox':
 		case 'inp_edit_checkbox':
 			$input_fields = $('#_cb_' + jq(element));
 			break;
 
 		case 'cf:radio':
 		case 'inp_edit_radio':
 		case 'inp_edit_checkboxes':
 			$input_fields = $("input[id^='" + jq(element) + "_']");
 			break;
 
 		case 'inp_edit_weight':
 			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + '_a')));
 			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + '_b')));
 			break;
 
 		case 'inp_edit_picker':
 			$input_fields = $('#' + jq(element) + '_selected');
 			break;
 
 		case 'inp_edit_cron_box':
 			$input_fields = $input_fields.add('#' + jq(element.replace(field, field + 'Hints')));
 			break;
 	}
 
 	if ( $input_fields.length > 0 ) {
 		// some controls don't have element to focus on (e.g. swf uploader)
 		$input_fields.focus(function ($e) {
 			show_form_error(prefix, field, true);
 		});
 
 		$input_fields.blur(function ($e) {
 			last_shown_error = false;
 		});
 	}
 	/*else {
 		console.log('error: focusing failed for [', prefix, '.', field, '] = ', element);
 	}*/
 
 	if ( typeof(first_error[prefix]) == 'undefined' || first_error[prefix] == false ) {
 		first_error[prefix] = [field, element];
 	}
 }
 
 function FCKeditor_OnComplete( editor )
 {
 	Form.Resize();
 }
 
 function InitEditors() {
 	if ( !$.isEmptyObject($CKEditors) ) {
 		// process all CKEditor instances
 		CKEDITOR.on(
 			'instanceReady',
 			function( ev ) {
 				FCKeditor_OnComplete( CKEDITOR.instances[ ev.editor.name ] );
 			}
 		);
 
 		ckeditors_apply_typekit();
 
 		for (var $editor_id in $CKEditors) {
 			CKEDITOR.replace($editor_id, $CKEditors[$editor_id]);
 		}
 	}
 
 	// process all CodePress instances
 	if ($.isFunction(window.CodePress)) {
 		CodePress.run(/*FCKeditor_OnComplete*/);
 	}
 
 	if ( !$.isEmptyObject($CodeMirrorEditors) ) {
-		var $editor;
-
-		for (var $editor_id in $CodeMirrorEditors) {
-			var $textarea_element = $('#' + jq($editor_id)),
+		$.each($CodeMirrorEditors, function ($editor_id, $editor_options) {
+			var $editor,
+				$textarea_element = $('#' + jq($editor_id)),
 				$height = parseInt($textarea_element.height(), 10);
 
-			$editor = CodeMirror.fromTextArea($textarea_element.get(0), $CodeMirrorEditors[$editor_id]);
+			if ( $textarea_element.is(':disabled') ) {
+				$editor_options.readOnly = 'nocursor';
+			}
+
+			$editor = CodeMirror.fromTextArea($textarea_element.get(0), $editor_options);
 			$editor.setSize(null, $height);
-		}
+
+			$textarea_element
+				.on('change', function ($e) {
+					$editor.getDoc().setValue($textarea_element.val());
+				})
+				.on('refresh', function ($e) {
+					$editor.setOption('readOnly', $textarea_element.is(':disabled') ? 'nocursor' : '');
+				})
+			;
+		});
 	}
 }
 
 function Form() {}
 
 Form = new Form();
 
 Form.Controls = new Array();
 Form.Div = false;
 Form.MinControlsHeight = 0;
 Form.Options = new Object();
 Form.FlexibleCount = 0;
 
 Form.ScrollerW = 17;
 Form.ScrollerH = 17;
 Form.HasChanged = false;
 
 Form.Init = function(id) {
 	this.Div = document.getElementById(id);
 	if (!this.Div) {
 		return ;
 	}
 
 	for (var i = 0; i < this.Controls.length; i++) {
 		dim = getDimensions( document.getElementById(this.Controls[i]) );
 		options = this.Options[this.Controls[i]];
 
 		if (options.height) { // fixed height
 			options.min_height = options.height;
 			options.max_height = options.height;
 		}
 
 		if (!options.min_height) {
 			options.min_height = $( jq('#' + this.Controls[i]) ).outerHeight(); // dim.innerHeight
 		}
 
 //		if ( $( jq('#' + this.Controls[i]) ).parents('tr:first').is(':visible') ) {
 			this.MinControlsHeight += options.min_height;
 //		}
 
 		if (dim.innerHeight < options.min_height) {
 			document.getElementById(this.Controls[i]).style.height = options.min_height+'px';
 		}
 //		alert('adding element '+this.Controls[i]+' height: '+options.min_height+' total: '+this.MinControlsHeight)
 	}
 
 	// all <script> tags will be executed again after wrap method is called, so remove them to prevent that
 	$('script', this.Div).remove();
 	$(this.Div).wrap('<div id="' + this.Div.id + '_container" style="position: relative; overflow: auto; width: 100%;"></div>');
 
 	Application.removeDebuggerStatistics();
 
 	this.Table = $('table:first', this.Div).get(0);
 	this.Table.style.height = 'auto';
 //	this.Table.style.width = 'auto';
 	this.MinHeight = this.Table.offsetHeight;
 	this.MinWidth = this.Table.offsetWidth;
 
 //	alert('Measuring min width now')
 
 	addEvent(window, 'resize', function() {Form.Resize()})
 
 	this.Resize(false);
 
 	this.displayFirstError();
 
 	if (_Simultaneous_Edit_Message != '') {
 		alert(_Simultaneous_Edit_Message);
 	}
 
 	this.InitOnChange();
 
 	Application.processHooks('m:OnAfterFormInit');
 	InitEditors();
 };
 
 Form.displayFirstError = function () {
 	if (isset(first_error)) {
 		for (var i in first_error) {
 			if (first_error[i] != false) {
 				if (document.getElementById(first_error[i][1])) {
 					// some controls don't have element to focus on (e.g. swf uploader)
 					document.getElementById(first_error[i][1]).focus();
 				}
 				show_form_error(i, first_error[i][0], true);
 //				alert('focused on '+first_error[i][1])
 			}
 		}
 	}
 };
 
 Form.InitOnChange = function()
 {
 	var inputs = window.document.getElementsByTagName('INPUT');
 	var selects = window.document.getElementsByTagName('SELECT');
 	var textareas = window.document.getElementsByTagName('TEXTAREA');
 
 	var groups = [inputs, selects, textareas];
 
 	for (var g=0; g<groups.length; g++) {
 		for (var i=0; i<groups[g].length; i++) {
 			var elem = groups[g][i];
 			if (elem.tagName == 'INPUT' && elem.type == 'hidden') continue;
 			addEvent(elem, elem.type=='button' ? 'click' : 'change', function() {Form.Changed()});
 		}
 	}
 };
 
 Form.Changed = function()
 {
 	this.HasChanged = true;
 };
 
 Form.addControl = function(id, options) {
 	this.Controls.push(id);
 	if (!options) {
 		options = {coeff: 1, max_height: 0, min_height: 0};
 	}
 	else {
 		if (typeof(options['coeff']) == 'undefined') options['coeff'] = 1;
 		if (typeof(options['max_height']) == 'undefined') options['max_height'] = 0;
 		if (typeof(options['min_height']) == 'undefined') options['min_height'] = 0;
 	}
 	options['real_height'] = 0;
 	this.Options[id] = options; // for future use
 //	print_pre(this.Options[id]);
 };
 
 Form._parseSize = function ($size) {
 	if ($size.toString().match(/^([\d]+)px$/)) {
 		return parseInt(RegExp.$1);
 	}
 
 	return parseInt($size);
 };
 
 Form.Resize = function($init_done) {
 	if (!this.Div) {
 		return ;
 	}
 
 	if ( ($init_done === true || $init_done === undefined) && !$.isEmptyObject($CKEditors) ) {
 		// process all CKEditor instances
 		for (var $editor_id in $CKEditors) {
 			var $ckeditor_textarea = $( '#' + jq($editor_id) );
 			CKEDITOR.instances[ $editor_id ].resize( $ckeditor_textarea.width(), $ckeditor_textarea.height() );
 		}
 	}
 
 	var h = (document.all ? window.document.body.offsetHeight : window.innerHeight);
 
 	var $div = $(this.Div);
 	var pos = $div.offset();
 
 	h -= pos.top;
 
 	if (this.Div.style.height.length) {
 		// height set for scroll_container overrides automatic container height detection
 		h = this._parseSize(this.Div.style.height);
 	}
 
 	if ($div.attr('mode') == 'minimal') {
 		// height will become minimal required (when data height is smaller, then window)
 		h = this.MinHeight;
 	}
 
 	h -= ($div.outerHeight() - $div.height());
 
 	//	alert('h after correction is '+h);
 
 	/*
 	// use this 2 lines, instead of next 3 lines, when scrolling without popups needed
 	var w = $(window.document.body).outerWidth(false);
 	w -= ($div.outerWidth() - $div.width());*/
 
 	window.document.body.style.width = '100%';
 	var w = (document.all ? window.document.body.offsetWidth : window.innerWidth);
 
 	w -= pos.left + ($div.outerWidth() - $div.width());
 
 	scroller_height = this.MinWidth > w ? this.ScrollerH : 0; // width of 1st table in scroll_container is larger, then window width?
 	scroller_width =  this.MinHeight > h - scroller_height ? this.ScrollerW : 0; // table height > total height - scroller_height -> vertical scroller is found
 	scroller_height = this.MinWidth > w - scroller_width ? this.ScrollerH : 0; // table width > total width - scroller_width -> horizontal scroller is found
 
 	var st = document.getElementById('width_status');
 	if (st) st.innerHTML = 'minWdith: '+this.MinWidth+' minHeight: '+this.MinHeight+' w: '+w+' h: '+h+' scroll_w: '+scroller_width+' scroll_h: '+scroller_height;
 
 //	alert('scroller W x H = '+scroller_width+' x '+scroller_height);
 
 //	alert('resize: '+w+'x'+h)
 
 	this.Table.style.width = (w-scroller_width) + 'px';
 
 	this.Div.parentNode.style.width = w + 'px';
 	this.Div.style.width = (w-scroller_width) + 'px';
 	this.Div.parentNode.style.height = h + 'px';
 
 	var count = this.Controls.length;
 
 	// -count here is adjustment - 1px for each control
 	var split = h /*- (count * 2)*/ - this.MinHeight + this.MinControlsHeight;
 
 	if (split < this.MinControlsHeight) {
 		split = this.MinControlsHeight;
 	}
 
 	this.ResetHeights();
 	var used = this.SetMinHeights();
 
 	split -= used;
 
 	var cur_diff = 0;
 	var iterations = 0;
 	do {
 		var prev_diff = cur_diff;
 		var cur_diff = this.SplitExtra(split);
 		split = cur_diff;
 		iterations++;
 	} while (cur_diff != 0 && cur_diff != prev_diff && iterations < 10);
 
 	for (var i = 0; i < this.Controls.length; i++) {
 		document.getElementById(this.Controls[i]).style.height = this.Options[ this.Controls[i] ]['real_height'] + 'px';
 //		document.getElementById(this.Controls[i]).value = this.Options[this.Controls[i]]['real_height'];
 	}
 
 //	alert('h is: '+h+' min height is '+this.MinHeight+' MinControlsHeight is '+this.MinControlsHeight+' -> '+split+' to split between '+count);
 //	print_pre(this.Controls)
 };
 
 Form.ResetHeights = function()
 {
 	for (var i = 0; i < this.Controls.length; i++) {
 		var options = this.Options[this.Controls[i]]
 		options['real_height'] = 0;
 		options.fixed = false;
 	}
 	this.FlexibleCount = this.Controls.length;
 };
 
 // Enlarge heights when possible
 // Return any not split pixels number
 Form.SplitExtra = function(split) {
 	var number = 0;
 
 	for (var i = 0; i < this.Controls.length; i++) {
 		var options = this.Options[ this.Controls[i] ];
 		if (options['max_height'] == 0 || options['real_height'] < options.max_height) {
 			number++;
 		}
 	}
 
 	if (number == 0) {
 		return 0;
 	}
 
 	var delta = Math.floor(split / number);
 //	alert('splitting '+split+' between '+number+' delta is '+delta)
 	var added = 0;
 	for (var i = 0; i < this.Controls.length; i++) {
 		var options = this.Options[this.Controls[i]];
 		var to_add;
 		if (options['max_height'] != 0 && options['real_height'] + delta > options['max_height']) {
 			to_add = options['max_height'] - options['real_height'];
 		}
 		else {
 			to_add = delta;
 		}
 //		alert('delta: '+delta+' current real: '+options['real_height']+' min: '+options['min_height']+' max:'+options['max_height']+' to_add: '+to_add)
 		options['real_height'] = options['real_height'] + to_add;
 		added += to_add;
 	}
 //	alert('added total '+added)
 
 	// removing extra added from the last (any) control
 	if (added > split) {
 		extra = added - split;
 		options['real_height'] -= extra;
 		added -= extra;
 	}
 	return split - added;
 };
 
 Form.SetMinHeights = function()
 {
 	var used = 0;
 	for (var i = 0; i < this.Controls.length; i++) {
 		var options = this.Options[this.Controls[i]]
 		if (options['real_height'] < options['min_height']) {
 			options['real_height'] = options.min_height;
 			used += options.min_height;
 		}
 	}
 	return used;
 };
Index: branches/5.3.x/core/admin_templates/popups/editor.tpl
===================================================================
--- branches/5.3.x/core/admin_templates/popups/editor.tpl	(revision 16594)
+++ branches/5.3.x/core/admin_templates/popups/editor.tpl	(revision 16595)
@@ -1,89 +1,92 @@
 <inp2:m_include t="incs/header"/>
 
 <inp2:m_NoDebug/>
 <inp2:m_Set skip_last_template="1"/>
 <inp2:m_RenderElement name="combined_header" prefix="trans" section="in-portal:root" title_preset="trans_edit"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 	<tbody>
 		<tr>
 		  	<td>
 		  		<script type="text/javascript">
 			  		a_toolbar = new ToolBar();
 			  		var $TargetField = '<inp2:m_Get name="TargetField" js_escape="1"/>';
 
 	  				a_toolbar.AddButton(
 	  					new ToolBarButton(
 	  						'select',
 	  						'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
 	  						function() {
 								var $opener = getWindowOpener(window);
 
 								if (!$opener) {
 									return;
 								}
 
 								if (!$opener.closed) {
-									$opener.document.getElementById($TargetField).value = CKEDITOR.instances['Content'].getData();
+									$opener.$($opener.document.getElementById($TargetField))
+										.val(CKEDITOR.instances['Content'].getData())
+										.change()
+									;
 								}
 
 								window_close();
 							}
 						)
 					);
 
 					a_toolbar.AddButton(
 						new ToolBarButton(
 							'cancel',
 							'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
 							function() {
 								window_close();
 							}
 						)
 					);
 
 					a_toolbar.Render();
 				</script>
 
 			</td>
 		</tr>
 	</tbody>
 </table>
 
 <inp2:adm_FCKEditor name="Content" width="99%" height="100"/>
 
 <script type="text/javascript">
 	CKEDITOR.on(
 		'instanceReady',
 		function( ev ) {
 			var $opener = getWindowOpener(window);
 			var $editor_instance = CKEDITOR.instances[ ev.editor.name ];
 
 			if ($opener && !$opener.closed) {
 				$editor_instance.setData( $opener.document.getElementById($TargetField).value );
 				$editor_instance.resize( '100%', $(window).height() - $('#cke_Content').offset().top );
 			}
 			else {
 				window_close();
 			}
 		}
 	);
 
 	ckeditors_apply_typekit();
 
 	$(document).ready(
 		function () {
 			$(window).resize(
 				function ($e) {
 					for (var $index in CKEDITOR.instances) {
 						CKEDITOR.instances[$index].resize( '100%', $(window).height() - $('#cke_Content').offset().top );
 					}
 				}
 			);
 		}
 	);
 </script>
 
 <inp2:m_Set _force_popup="1"/>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: branches/5.3.x/core/admin_templates/forms/form_edit_emails.tpl
===================================================================
--- branches/5.3.x/core/admin_templates/forms/form_edit_emails.tpl	(revision 16594)
+++ branches/5.3.x/core/admin_templates/forms/form_edit_emails.tpl	(revision 16595)
@@ -1,108 +1,109 @@
 <inp2:adm_SetPopupSize width="800" height="500"/>
 <inp2:m_include t="incs/header" />
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:forms" prefix="form" title_preset="form_edit_emails" tab_preset="Default"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('form','<inp2:form_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('form','OnCancelEdit');
 						}
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('form', '<inp2:form_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('form', '<inp2:form_NextId/>');
 						}
 				 ) );
 
 				//a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				a_toolbar.Render();
 
 				<inp2:m_if check="form_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="form_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
 					<inp2:m_if check="form_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
 </tbody>
 </table>
 
 <inp2:form_SaveWarning name="grid_save_warning"/>
 <inp2:form_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="la_title_General"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="form" field="EnableEmailCommunication" title="la_fld_Enable" onclick="reflectFromFields();"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="form" field="ProcessUnmatchedEmails" title="la_fld_ProcessUnmatchedEmails"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyFromName" title="la_fld_ReplyFromName"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyCc" title="la_fld_ReplyCc"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyBcc" title="la_fld_ReplyBcc"/>
 			<inp2:m_RenderElement name="inp_edit_codemirror" prefix="form" field="ReplyMessageSignature" title="la_fld_ReplyMessageSignature" allow_html="1" language="text/html"/>
 
 		<inp2:m_RenderElement name="subsection" title="la_title_ReplySettings"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyFromEmail" title="la_fld_ReplyFromEmail"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyServer" title="la_fld_Server" hint_label="la_hint_PopServer"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyPort" title="la_fld_Port" hint_label="la_hint_PopPort"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyUsername" title="la_fld_Username"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="ReplyPassword" title="la_fld_Password"/>
 
 		<inp2:m_RenderElement name="subsection" title="la_title_BounceSettings"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="BounceEmail" title="la_fld_BounceEmail"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="BounceServer" title="la_fld_Server" hint_label="la_hint_PopServer"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="BouncePort" title="la_fld_Port" hint_label="la_hint_PopPort"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="BounceUsername" title="la_fld_Username"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="form" field="BouncePassword" title="la_fld_Password"/>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
 
 <script type="text/javascript">
 	var $field_mask = '<inp2:form_InputName field="#FIELD_NAME#" js_escape="1"/>';
 
 	function reflectFromFields() {
 		var $enabled = get_control($field_mask, 'EnableEmailCommunication', undefined, '_cb').checked;
 		var $fields = [
 			'ReplyFromEmail', 'ReplyServer', 'ReplyPort', 'ReplyUsername', 'ReplyPassword',
 			'BounceEmail', 'BounceServer', 'BouncePort', 'BounceUsername', 'BouncePassword',
 			'ReplyFromName',  'ReplyCc', 'ReplyBcc', 'ReplyMessageSignature'
 		];
 
 		for (var $i = 0; $i < $fields.length; $i++) {
 			get_control($field_mask, $fields[$i]).disabled = !$enabled;
 		}
 
+		$(get_control($field_mask, 'ReplyMessageSignature')).trigger('refresh');
 		get_control($field_mask, 'ProcessUnmatchedEmails', undefined, '_cb').disabled = !$enabled;
 	}
 
 	reflectFromFields();
 </script>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>