Index: branches/5.2.x/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -N -r14244 -r14585
--- branches/5.2.x/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 14585)
@@ -109,8 +109,17 @@
 
 	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 		<inp2:m_inc param="tab_index" by="1"/>
+		<inp2:Field field="Prompt" result_to_var="title"/>
 		<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>', '<inp2:m_Param name="virtual_field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>')">
-			<inp2:m_RenderElement name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
+			<span class="<inp2:m_if check='{$SourcePrefix}_HasError' field='$virtual_field'>error-cell</inp2:m_if>"><inp2:Field field="Prompt" as_label="1"/></span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="field-required">&nbsp;*</span></inp2:m_if>:<inp2:m_if check="FieldHintLabel" title_label="$title"><span>&nbsp;<img src="<inp2:m_TemplatesBase/>/img/hint_icon.png" width="12" height="13" title="<inp2:FieldHintLabel title_label='$title' html_escape='1'/>" alt="<inp2:FieldHintLabel title_label='$title' html_escape='1'/>"/></inp2:m_if>
+
+			<inp2:m_if check="FieldEquals" field="ElementType" value="textarea">
+				<br/>
+				<inp2:{$SourcePrefix}_InputName field="$virtual_field" result_to_var="input_name"/>
+				<a href="<inp2:m_Link template='popups/editor' TargetField='$input_name' pass_through='TargetField' pass='m,$SourcePrefix'/>" onclick="openSelector('<inp2:m_Param name='SourcePrefix' js_escape='1'/>', this.href, '', '800x575'); return false;">
+					<img src="img/icons/icon24_link_editor.gif" border="0">
+				</a>
+			</inp2:m_if>
 		</td>
 		<td class="control-mid">&nbsp;</td>
 		<script type="text/javascript">