diff --git a/sai/modules/saimod_sys_locale/saimod_sys_locale.php b/sai/modules/saimod_sys_locale/saimod_sys_locale.php
index 957a1e2..a7f2bdf 100644
--- a/sai/modules/saimod_sys_locale/saimod_sys_locale.php
+++ b/sai/modules/saimod_sys_locale/saimod_sys_locale.php
@@ -28,10 +28,8 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         }
         while($r = $res->next()){
             $result .= '<tr>'.'<td style="padding-bottom: 5px;">'.$r["id"].'<br><br><input type="submit" class="btn-danger delete_content" value="delete" id="'.$r["id"].'">'.'<input type="submit" class="btn" value="edit" style="margin-left: 3px;" name="'.$r["id"].'">'.'</td>'.'<td>'.$r["category"].'</td>';
-                    foreach ($languages as $columns){
-                        //echo "+tututututututut:".$r[$columns]."nochmal tututututututut";
-                        $result .= '<td>'.utf8_encode($r[$columns]).'</td>';
-                        //$_POST[$r["id"]] = $r[$columns];
+                    foreach ($languages as $columns){                        
+                        $result .= '<td>'.$r[$columns].'</td>';                        
                     }
                     
             $result .= '</tr>';
@@ -42,14 +40,14 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         return $result;
     }
     
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_edit($id, $lang, $newtext){
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_edit($id, $lang, $newtext){         
          $charset = 'utf-8';
          $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
-         $res = null;
+         $res = null;         
         if(\SYSTEM\system::isSystemDbInfoPG()){
             $res = $con->prepare('newText' ,'UPDATE system.locale_string SET "'.$lang.'"=$1 WHERE id=$2;', array($newtext, $id));
         } else {
-            $res = $con->prepare('newText' ,'UPDATE system_locale_string SET '.$lang.'=? WHERE id=?;', array(utf8_decode($newtext), $id));
+            $res = $con->prepare('newText' ,'UPDATE system_locale_string SET '.$lang.'=? WHERE id=?;', array($newtext, $id));
         }
         return $res->affectedRows() == 0 ? \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no rows affected")) : \SYSTEM\LOG\JsonResult::ok();
     }
@@ -114,7 +112,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
             foreach ($languages as $columns){                        
                 $result .= '<td>
                             <div class="dialog" style="padding-bottom: 5px;">'.
-                                '<textarea name="content" class="tinymce" style="width: 100%" id="edit_field_'.$r["id"].'_'.$columns.'">'.utf8_encode($r[$columns]).'</textarea>'.
+                                '<textarea name="content" class="tinymce" style="width: 100%" id="edit_field_'.$r["id"].'_'.$columns.'">'.$r[$columns].'</textarea>'.
                             '</div>
                             <input type="submit" class="btn edit_content" value="edit" lang="'.$columns.'" name="'.$r["id"].'"><br></td>';
             }
@@ -122,7 +120,8 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         }
         $result .=  '<br><input type="submit" class="btn localeMain" value="back">'.'<script>tinymce.init({
     selector: "textarea",
-    entity_encoding : "raw",
+    force_p_newlines : false,
+    forced_root_block : false,    
     theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
     plugins: [
         "advlist autolink lists link image charmap print preview anchor",
@@ -130,7 +129,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         "insertdatetime media table contextmenu paste moxiemanager",
         "textcolor"
     ],
-    toolbar: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent"
+    toolbar: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
 });</script>';
         return $result; 
     }
diff --git a/sai/modules/saimod_sys_locale/saimod_sys_locale_submit.js b/sai/modules/saimod_sys_locale/saimod_sys_locale_submit.js
index 4944f5d..c5978ae 100644
--- a/sai/modules/saimod_sys_locale/saimod_sys_locale_submit.js
+++ b/sai/modules/saimod_sys_locale/saimod_sys_locale_submit.js
@@ -38,10 +38,18 @@ function init__SYSTEM_SAI_saimod_sys_locale_edit(){
         loadModuleContent('.SYSTEM.SAI.saimod_sys_locale');
     });
     $('.edit_content').click(function(){           
-         tinyMCE.triggerSave();
-         $.getJSON(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_locale&action=edit&id='+$(this).attr('name')+'&lang='+$(this).attr('lang')+'&newtext='+$('#edit_field_'+$(this).attr('name')+'_'+$(this).attr('lang')).val(), 
-         function(data){
-             if (data.status == false){ alert("Changes could not be changed."); } else { alert("Changes has been saved.");}
-         });
+         tinyMCE.triggerSave();         
+         $.ajax({
+                url: SAI_ENDPOINT,
+                data: { sai_mod: '.SYSTEM.SAI.saimod_sys_locale',
+                        action: 'edit',                       
+                        id: $(this).attr('name'),
+                        lang: $(this).attr('lang'),
+                        newtext: $('#edit_field_'+$(this).attr('name')+'_'+$(this).attr('lang')).val()},
+                type: 'POST',
+                success: function(data) {                    
+                    if (data.status == false){ alert("Changes could not be changed."); } else { alert("Changes has been saved.");}
+                }
+            });         
     });
 }