diff --git a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js
index deb3dbf09..dfad059a5 100755
--- a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js
+++ b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js
@@ -150,7 +150,7 @@ var dynaformEditor={
     var xmlCode = this.getXMLCode();
     var todoRefreshXmlCode = xmlCode === null;
     if (todoRefreshXmlCode) return;
-    var res = this.ajax.set_xmlcode(this.A,xmlCode.replace(/\+/g, '%2B'));
+    var res = this.ajax.set_xmlcode(this.A, encodeURIComponent(xmlCode));
     if (res!=="") G.alert(res);
   },
   saveHtmlCode:function()
@@ -168,7 +168,7 @@ var dynaformEditor={
     
     if (field.value)
     {
-      var res=this.ajax.set_javascript(this.A,field.value,code.replace(/\+/g, '%2B'));
+      var res = this.ajax.set_javascript(this.A,field.value, encodeURIComponent(code));
       if (typeof(res["*message"])==="string")
       {
         G.alert(res["*message"]);