Index: branches/5.3.x/admin_templates/topics/topics_edit.tpl
===================================================================
diff -u -r15670 -r15686
--- branches/5.3.x/admin_templates/topics/topics_edit.tpl	(.../topics_edit.tpl)	(revision 15670)
+++ branches/5.3.x/admin_templates/topics/topics_edit.tpl	(.../topics_edit.tpl)	(revision 15686)
@@ -63,7 +63,7 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="TopicText" title="la_fld_Subject" size="70"/>
 
 			<inp2:m_if check="bb_FieldEquals" name="Posts" value="0">
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="bb" field="PostingText" title="la_fld_MessageBody" control_options="{min_height: 100}" allow_html="1" cols="70" rows="8"/>
+				<inp2:m_RenderElement name="inp_edit_codemirror" prefix="bb" field="PostingText" title="la_fld_MessageBody" control_options="{min_height: 100}" allow_html="1" language="text/html"/>
 			</inp2:m_if>
 
 			<inp2:m_RenderElement name="inp_edit_user" prefix="bb" field="OwnerId" title="la_fld_PostedBy" size="40"/>
Index: branches/5.3.x/admin_templates/polls/poll_edit.tpl
===================================================================
diff -u -r15670 -r15686
--- branches/5.3.x/admin_templates/polls/poll_edit.tpl	(.../poll_edit.tpl)	(revision 15670)
+++ branches/5.3.x/admin_templates/polls/poll_edit.tpl	(.../poll_edit.tpl)	(revision 15686)
@@ -86,7 +86,7 @@
 			<inp2:m_RenderElement name="inp_label" prefix="poll" field="PollId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="poll" field="Name" title="la_fld_Name" size="50"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="poll" field="Question" title="la_fld_Question" control_options="{min_height: 100}" allow_html="1" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_codemirror" prefix="poll" field="Question" title="la_fld_Question" control_options="{min_height: 100}" allow_html="1" language="text/html"/>
 
 			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="poll" field="Image" title="la_fld_Image"/>