diff --git a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js
index 705fb75a6..f185aea59 100644
--- a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js
+++ b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js
@@ -375,12 +375,8 @@ var dynaformEditor={
   saveHtmlCode:function()
   {
     //var htmlCode = getField("HTML");
-    var htmlField = document.getElementById("form[HTML]_ifr");
-    var htmlCode = htmlField.contentWindow.document.body.innerHTML;
+    var response = this.ajax.set_htmlcode(this.A, tinyMCE.activeEditor.getContent());
 
-    todoRefreshHtmlCode = htmlCode === null;
-    if (todoRefreshHtmlCode) return;
-    var response=this.ajax.set_htmlcode(this.A,htmlCode);
     if (response) {
         G.alert(response["*message"],"Error");
         this.responseAction = false;
@@ -454,7 +450,7 @@ var dynaformEditor={
         path: "js/",
         lineNumbers: true,
         continuousScanning: 500 });*/
-        
+
         xmlEditor = CodeMirror.fromTextArea(document.getElementById("form[XML]"), {
         mode: "application/xml",
         styleActiveLine: true,
@@ -519,7 +515,7 @@ var dynaformEditor={
       {
         clientWinSize = getClientWindowSize();
         startJSCodePress();
-        
+
         /*jsEditor = CodeMirror.fromTextArea('form[JS]', {
           height: (clientWinSize.height - 140) + "px",
           width: (_BROWSER.name == 'msie' ? '100%' : '98%'),
@@ -528,7 +524,7 @@ var dynaformEditor={
           path: "js/",
           lineNumbers: true,
           continuousScanning: 500 });*/
-          
+
           jsEditor = CodeMirror.fromTextArea(document.getElementById("form[JS]"), {
           mode: "javascript",
           lineNumbers: true,
diff --git a/workflow/engine/xmlform/processes/processes_FileEdit.xml b/workflow/engine/xmlform/processes/processes_FileEdit.xml
index e0c41a6e4..e71f71001 100755
--- a/workflow/engine/xmlform/processes/processes_FileEdit.xml
+++ b/workflow/engine/xmlform/processes/processes_FileEdit.xml
@@ -12,12 +12,12 @@
 	  <en/>
 	</fcontent>
 
-	<ACCEPT type="button" onclick="saveFile(@@pro_uid, @@filename);">
+	<ACCEPT type="button" onclick="getField('fcontent').value = tinyMCE.activeEditor.getContent(); saveFile(@@pro_uid, @@filename);">
 	  <en>Save</en>
 	</ACCEPT>
     <BTN_CANCEL type="button" onclick="cancel();">
       <en>Cancel</en>
-    </BTN_CANCEL>	
+    </BTN_CANCEL>
 
 
 <JS type="javascript" replacetags="1"><![CDATA[
@@ -28,5 +28,5 @@ function cancel() {
 }
 
 ]]></JS>
-    
-</dynaForm>  
\ No newline at end of file
+
+</dynaForm>
\ No newline at end of file