diff --git a/html/js/todo_list.js b/html/js/todo_list.js
index f1a901499..fec381379 100644
--- a/html/js/todo_list.js
+++ b/html/js/todo_list.js
@@ -46,7 +46,7 @@ function todo_list_show_success(request,json) {
     $('p_title').value=answer.tl_title;
 
     $('p_date').value=answer.tl_date;
-    $('p_desc').value=answer.tl_desc;
+    $('p_desc').value=decodeURI(answer.tl_desc);
     $('tl_id').value=answer.tl_id;
     $('add_todo_list').show();
     $('add').hide();
@@ -78,4 +78,4 @@ function todo_list_remove(p_ctl) {
     );
     return false;
 
-}
\ No newline at end of file
+}
diff --git a/include/class_todo_list.php b/include/class_todo_list.php
index 268ae13fd..222fcf187 100644
--- a/include/class_todo_list.php
+++ b/include/class_todo_list.php
@@ -164,11 +164,12 @@ from todo_list where tl_id=$1";
 
   }
   public function toJSON() {
+
     $r='';
     $r.='{';
     $r.='"tl_id":"'.$this->tl_id.'",';
     $r.='"tl_title":"'.$this->tl_title.'",';
-    $r.='"tl_desc":"'.$this->tl_desc.'",';
+    $r.='"tl_desc":"'.urlencode($this->tl_desc).'",';
     $r.='"tl_date":"'.$this->tl_date.'"';
     $r.='}';
     return $r;