diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html
index 06352fb69..dd36667a1 100755
--- a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html
+++ b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html
@@ -6,16 +6,16 @@
       <tr>
         <td valign='top'>
            <table cellspacing="0" cellpadding="0" border="0" width="100%">
-             <tr>
-              <td class='FormLabel' width="{$form_labelWidth}">{$HTML}</td>
-              <td class='FormFieldContent' >{$form.HTML}</td>
-              </tr>
              <tr>
               <td class='FormLabel' width="{$form_labelWidth}"></td>
               <td class='FormButton'>
                <span style="float:left;">{$form.PME_HTML_ENABLETEMPLATE}{$PME_HTML_ENABLETEMPLATE}</span><span style="float:right;">{$form.PME_REFRESH_VIEW}</span><span style="float:right;">{$form.PME_RESTORE_HTML}</span>
               </td>
              </tr>
+             <tr>
+              <td class='FormLabel' width="{$form_labelWidth}">{$HTML}</td>
+              <td class='FormFieldContent' >{$form.HTML}</td>
+              </tr>
              <tr>
               <td class='FormLabel' width="{$form_labelWidth}">{$HTML2}</td>
               <td class='FormFieldContent' >{$form.HTML2}</td>
diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml
index 02cbbda2d..bb743aeec 100755
--- a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml
+++ b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml
@@ -5,10 +5,6 @@
 <URL type="phpvariable"/>
 
 
-<HTML type="html" width="100%" height="350px" toolbarSet="toolbar2lines">
-<en>HTML View</en>
-</HTML>
-
 <PME_HTML_ENABLETEMPLATE type="checkbox" value="1" defaultvalue="0" labelOnRight="0">
   <en>Enable HTML Editing</en>
 </PME_HTML_ENABLETEMPLATE>
@@ -21,6 +17,10 @@
 <en>Refresh View</en>
 </PME_REFRESH_VIEW>
 
+<HTML type="html" width="100%" height="300px" toolbarSet="toolbar2lines">
+<en>HTML View</en>
+</HTML>
+
 <HTML2 type="textarea" cols="120" rows="16" style="width:100%;" className="htmleditor">
 <en>HTML Code</en>
 </HTML2>
@@ -73,7 +73,18 @@ getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").onclick=function()
 {
 	/*getField("ENABLETEMPLATE","dynaforms_Properties").checked=this.checked;
 	dynaformEditor.saveProperties();*/
-	dynaformEditor.setEnableTemplate( this.checked );
+    if (getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked == true) {
+        new leimnud.module.app.confirm().make(
+        {
+            label: "@G::LoadTranslation(ID_MSG_ENABLE_HTML_EDITING)",
+            size:{ w: 350, h: 150 },
+            action: function() { },
+            cancel: function() { 
+                getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked = false;
+            }
+        });
+        dynaformEditor.setEnableTemplate( this.checked ); 
+    }
 }
 ]]></PME_RESIZE_JS>
 

{$HTML}	{$form.HTML}
	{$form.PME_HTML_ENABLETEMPLATE}{$PME_HTML_ENABLETEMPLATE}{$form.PME_REFRESH_VIEW}{$form.PME_RESTORE_HTML}
{$HTML}	{$form.HTML}
{$HTML2}	{$form.HTML2}