diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 04e394d65..4308e668b 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -403,8 +403,7 @@ class processMap
                     case 'text':
                         $oText = null;
                         $oText->uid = $aRow['SWI_UID'];
-                        $oText->label = htmlentities(($aRow['CON_VALUE'] != '' ? str_replace(chr(92), '&#92;', str_replace('<', '&lt;', $aRow['CON_VALUE'])) : '-'), ENT_QUOTES, 'UTF-8');
-                        // $oText->label       = '->' . $aRow ['CON_VALUE'] . '<-' ;
+                        $oText->label       = $aRow ['CON_VALUE'];
                         $oText->position->x = $aRow['SWI_X'];
                         $oText->position->y = $aRow['SWI_Y'];
                         $oPM->text[] = $oText;
diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js
index 68dc082bc..e9897e94c 100755
--- a/workflow/engine/js/processmap/core/processmap.js
+++ b/workflow/engine/js/processmap/core/processmap.js
@@ -2112,7 +2112,8 @@ var processmap=function(){
           left:text.position.x,
           cursor:((this.options.rw===true)?"move":"default")
         });
-        a.innerHTML=text.label;
+        a.appendChild(document.createTextNode(''));
+        a.childNodes[0].data=text.label;
         this.panels.editor.elements.content.appendChild(a);
         if(this.options.rw===true)
         {
@@ -2136,14 +2137,14 @@ var processmap=function(){
                 }*/
                 new this.parent.module.app.prompt().make({
                   label:G_STRINGS.ID_PROCESSMAP_EDIT_TEXT_CHANGE_TO,
-                  value:text.label.escapeHTML(),
+                  value:text.label,
                   action:function(text,tObj){
                     if(text.trim()!=="" && tObj.label!=text)
                     {
-                      tObj.label = tObj.object.elements.label.innerHTML=text.escapeHTML();
+                      tObj.label = tObj.object.elements.label.childNodes[0].data = text;
                       var r = new leimnud.module.rpc.xmlhttp({
                         url : this.options.dataServer,
-                        args  : "action=updateText&data="+{uid:tObj.uid,label:tObj.label.unescapeHTML()}.toJSONString()
+                        args  : "action=updateText&data="+{uid:tObj.uid,label:tObj.label}.toJSONString()
                       });
                       r.make();
                     }