diff --git a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin.js b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin.js
index 050c881ff..924681b9a 100644
--- a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin.js
+++ b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin.js
@@ -101,6 +101,6 @@ function updateEditorContent(serializedHTML){
  * @param serializedHTML String the html code to be added. 
  */
 function insertFormVar(fieldName,serializedHTML){
-        tinyMCEPopup.execCommand('mceInsertContent', false, serializedHTML);
+    tinyMCEPopup.execCommand('mceInsertContent', false, serializedHTML);
     closePluginPopup();
 }
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Edit.xml b/workflow/engine/xmlform/outputdocs/outputdocs_Edit.xml
index 427f8bd7e..38e7bfc69 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Edit.xml
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Edit.xml
@@ -19,6 +19,7 @@
 <JS type="JavaScript"><![CDATA[
 
     function cancel(){
+        tinyMCE.execCommand('mceRemoveControl',false,'form[OUT_DOC_TEMPLATE]');
         outputdocsEditor.remove();
     }
 
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml b/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml
index 7150481d4..eb901c596 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml
@@ -92,6 +92,7 @@ var outputdocsEditor;
   }
   
   function outputdocsSave( form ) {
+    tinyMCE.execCommand('mceRemoveControl',false,'form[OUT_DOC_TEMPLATE]');
     form.action = '../outputdocs/outputdocs_Save';
     ajax_post( form.action, form, 'POST' );
     outputdocsEditor.remove();
diff --git a/workflow/engine/xmlform/processes/processes_FileEdit.xml b/workflow/engine/xmlform/processes/processes_FileEdit.xml
index 40719cc3b..e0c41a6e4 100755
--- a/workflow/engine/xmlform/processes/processes_FileEdit.xml
+++ b/workflow/engine/xmlform/processes/processes_FileEdit.xml
@@ -23,6 +23,7 @@
 <JS type="javascript" replacetags="1"><![CDATA[
 
 function cancel() {
+    tinyMCE.execCommand('mceRemoveControl',false,'form[fcontent]');
     oPanel.remove();
 }
 
diff --git a/workflow/engine/xmlform/processes/processes_FilesOptions.xml b/workflow/engine/xmlform/processes/processes_FilesOptions.xml
index 0f8147ab7..d5c7da7fe 100755
--- a/workflow/engine/xmlform/processes/processes_FilesOptions.xml
+++ b/workflow/engine/xmlform/processes/processes_FilesOptions.xml
@@ -109,6 +109,7 @@ function editFile(pro_uid, fileName){
 function saveFile(pro_uid, fileName){
     
     var fc64 = base64_encode(getField('fcontent').value);
+    tinyMCE.execCommand('mceRemoveControl',false,'form[fcontent]');
     fc64 = fc64.replace(/&amp;/g, "@amp@");
     fc64 = fc64.replace(/\+/g, '%2B');