Index: branches/5.3.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r15584 -r15677
--- branches/5.3.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15584)
+++ branches/5.3.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15677)
@@ -493,16 +493,16 @@
 <inp2:m_DefineElement name="textarea_field_caption_element">
 	<inp2:m_RenderElement name="default_field_caption_element" pass_params="1"/>
 
-	<br>
-	<inp2:m_if check="m_ParamEquals" name="allow_html" value="allow_html">
+	<inp2:m_if check="m_Param" name="allow_html">
+		<br>
 		<inp2:{$prefix}_InputName field="$field" result_to_var="input_name"/>
 		<a href="<inp2:m_Link template='$edit_template' TargetField='$input_name' pass_through='TargetField' pass='m,$prefix'/>" onclick="openSelector('<inp2:m_Param name='prefix' js_escape='1'/>', this.href, '', '800x575'); return false;">
 			<img src="img/icons/icon24_link_editor.gif" border="0">
 		</a>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea" caption_render_as="textarea_field_caption_element" class="" format="" edit_template="popups/editor" allow_html="allow_html" style="text-align: left; width: 100%; height: 100px;" control_options="false" row_style="height: auto">
+<inp2:m_DefineElement name="inp_edit_textarea" caption_render_as="textarea_field_caption_element" class="" format="" edit_template="popups/editor" allow_html="" style="text-align: left; width: 100%; height: 100px;" control_options="false" row_style="height: auto">
 	<inp2:m_RenderElement design="form_row" pass_params="1">
 		<td class="control-cell">
 			<textarea style="<inp2:m_Param name='style'/>" tabindex="<inp2:m_Get name='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" ><inp2:{$prefix}_Field field="$field" format="fck_ready;{$format}"/></textarea>
@@ -513,7 +513,7 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_fck" class="" maxlength="" bgcolor="" body_class="" body_id="" onblur="" format="" size="" onkeyup="" style="" has_caption="0" control_options="false">
+<inp2:m_DefineElement name="inp_edit_fck" class="" title="la_fld_{$field}" maxlength="" bgcolor="" body_class="" body_id="" onblur="" format="" size="" onkeyup="" style="" has_caption="0" control_options="false">
 	<inp2:m_RenderElement design="form_row" pass_params="1">
 		<td class="control-cell" style="padding: 0px;" colspan="3" onmouseover="show_form_error('<inp2:m_Param name='prefix' js_escape='1'/>', '<inp2:m_Param name='field' js_escape='1'/>')" onmouseout="hide_form_error('<inp2:m_Param name='prefix' js_escape='1'/>')">
 			<inp2:FCKEditor field="$field" width="100%" height="200" bgcolor="$bgcolor" body_class="$body_class" body_id="$body_id" format="$format" late_load="1"/>
@@ -737,7 +737,7 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="email_recipients_js" prefix="emailevents" to_readonly="auto">
+<inp2:m_DefineElement name="email_recipients_js" prefix="email-template" to_readonly="auto">
 	<script type="text/javascript">
 		Recipients.formatLine = function($record_index) {
 			if (this.Records[$record_index]['RecipientName']) {
@@ -780,11 +780,11 @@
 
 		<inp2:m_if check="m_Param" name="to_readonly">
 			Recipients.isReadOnly = function($record_index) {
-				return this.Records[$record_index]['RecipientType'] == <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_TO"/>;
+				return this.Records[$record_index]['RecipientType'] == <inp2:m_GetConst name="EmailTemplate::RECIPIENT_TYPE_TO"/>;
 			}
 
 			<inp2:$prefix_RestoreRecipientType/>
-			Recipients.registerControl('RecipientType', {type: 'radio', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="$prefix" field="RecipientType" strip_nl="2"/>, 'default': <inp2:m_GetConst name="EmailEvent::RECIPIENT_TYPE_CC"/>});
+			Recipients.registerControl('RecipientType', {type: 'radio', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="$prefix" field="RecipientType" strip_nl="2"/>, 'default': <inp2:m_GetConst name="EmailTemplate::RECIPIENT_TYPE_CC"/>});
 		<inp2:m_else/>
 			Recipients.registerControl('RecipientType', {type: 'radio', required: true, options: <inp2:m_RenderElement name="inp_json_options" prefix="$prefix" field="RecipientType" strip_nl="2"/>, 'default': <inp2:$prefix_FieldOption field="RecipientType" option="default"/>});
 		</inp2:m_if>