diff --git a/module/action/model.php b/module/action/model.php
index 45ca10c780..9ae18ab770 100644
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -38,7 +38,7 @@ class actionModel extends model
         $action->actor      = $this->app->user->account;
         $action->action     = strtolower($actionType);
         $action->date       = helper::now();
-        $action->comment    = htmlspecialchars($comment);
+        $action->comment    = $comment;
         $action->extra      = $extra;
 
         /* Get product and project for this object. */
diff --git a/module/bug/config.php b/module/bug/config.php
index bfe09aa2c4..a17eeb0748 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -117,4 +117,5 @@ $config->bug->list->exportFields = 'id, product, module, project, story, task,
 
 $config->bug->editor = new stdclass();
 $config->bug->editor->create = array('id' => 'steps', 'tools' => 'bugTools');
-$config->bug->editor->edit   = array('id' => 'steps', 'tools' => 'bugTools');
+$config->bug->editor->edit   = array('id' => 'steps,comment', 'tools' => 'bugTools');
+$config->bug->editor->view   = array('id' => 'comment', 'tools' => 'bugTools');
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 976953d491..12608a0f2b 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <div id='titlebar'>
   <div id='main' <?php if($bug->deleted) echo "class='deleted'";?>>BUG #<?php echo $bug->id . ' ' . $bug->title;?></div>
   <div>
@@ -62,7 +63,7 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='a-center actionlink'><?php if(!$bug->deleted) echo $actionLinks;?></div>
-      <div id='comment' class='hidden'>
+      <div id='commentBox' class='hidden'>
         <fieldset>
           <legend><?php echo $lang->comment;?></legend>
           <form method='post' action='<?php echo inlink('edit', "bugID=$bug->id&comment=true")?>'>
diff --git a/module/common/control.php b/module/common/control.php
index c8c6f6b274..6405b3a690 100644
--- a/module/common/control.php
+++ b/module/common/control.php
@@ -233,7 +233,7 @@ class common extends control
 
         if(!common::hasPriv($module, 'edit')) return false;
         echo "<span class='link-button'>";
-        echo html::a('#comment', '&nbsp;', '', "class='icon-green-common-comment' title='$lang->comment' onclick='setComment()'");
+        echo html::a('#commentBox', '&nbsp;', '', "class='icon-green-common-comment' title='$lang->comment' onclick='setComment()'");
         echo "</span>";
     }
 
diff --git a/module/doc/config.php b/module/doc/config.php
index 69cb8e1471..7620c069bd 100644
--- a/module/doc/config.php
+++ b/module/doc/config.php
@@ -14,7 +14,7 @@ $config->doc->edit->requiredFields   = 'title';
 
 $config->doc->editor = new stdclass();
 $config->doc->editor->create = array('id' => 'content', 'tools' => 'fullTools');
-$config->doc->editor->edit   = array('id' => 'content', 'tools' => 'fullTools');
+$config->doc->editor->edit   = array('id' => 'content,comment', 'tools' => 'fullTools');
 
 $config->doc->search['module']                   = 'doc';
 $config->doc->search['fields']['title']          = $lang->doc->title;
diff --git a/module/story/config.php b/module/story/config.php
index cb0ec9600d..8b5cd28289 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -17,7 +17,9 @@ $config->story->review->requiredFields = 'assignedTo,reviewedBy,result';
 
 $config->story->editor = new stdclass();
 $config->story->editor->create = array('id' => 'spec,verify', 'tools' => 'simpleTools');
-$config->story->editor->change = array('id' => 'spec,verify', 'tools' => 'simpleTools');
+$config->story->editor->change = array('id' => 'spec,verify,comment', 'tools' => 'simpleTools');
+$config->story->editor->edit   = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->story->editor->view   = array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->story->list = new stdclass();
 $config->story->list->exportFields = '
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 08372052a3..39ba5b44de 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include './header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
 <div id='titlebar'>
   <div id='main'>STORY #<?php echo $story->id . $lang->colon . $story->title;?></div>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 7f06328b4f..b4094cf0f6 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <div id='titlebar'>
   <div id='main' <?php if($story->deleted) echo "class='deleted'";?>>STORY #<?php echo $story->id . ' ' . $story->title;?></div>
   <div>
@@ -66,7 +67,7 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $story->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='a-center actionlink'><?php if(!$story->deleted) echo $actionLinks;?></div>
-      <div id='comment' class='hidden'>
+      <div id='commentBox' class='hidden'>
         <fieldset>
           <legend><?php echo $lang->comment;?></legend>
           <form method='post' action='<?php echo inlink('edit', "storyID=$story->id")?>'>
diff --git a/module/task/config.php b/module/task/config.php
index f9eea0f9ad..05179fe5cc 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -16,7 +16,8 @@ $config->task->activate->requiredFields    = 'left';
 
 $config->task->editor = new stdclass();
 $config->task->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
-$config->task->editor->edit   = array('id' => 'desc', 'tools' => 'simpleTools');
+$config->task->editor->edit   = array('id' => 'desc,comment', 'tools' => 'simpleTools');
+$config->task->editor->view   = array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->task->exportFields = '
     id, project, module, story,
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 43863737dd..a00719ad04 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <div id='titlebar'>
   <?php 
   $name = "TASK #$task->id $task->name"; 
@@ -62,7 +63,7 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='a-center actionlink'> <?php if(!$task->deleted) echo $actionLinks;?></div>
-      <div id='comment' class='hidden'>
+      <div id='commentBox' class='hidden'>
         <fieldset>
           <legend><?php echo $lang->comment;?></legend>
           <form method='post' action='<?php echo inlink('edit', "taskID=$task->id&comment=true")?>'>
diff --git a/module/testcase/config.php b/module/testcase/config.php
index 7accc985db..b27df21fa6 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -40,6 +40,10 @@ $config->testcase->edit   = new stdclass();
 $config->testcase->create->requiredFields = 'title,type';
 $config->testcase->edit->requiredFields   = 'title,type';
 
+$config->testcase->editor = new stdclass();
+$config->testcase->editor->edit = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->testcase->editor->view = array('id' => 'comment', 'tools' => 'simpleTools');
+
 $config->testcase->exportFields = '
     id, product, module, story,
     title, precondition, stepDesc, stepExpect, keywords,
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 3f6a4f53cb..c0499ae0af 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include './header.html.php';?>
 <?php include '../../common/view/chosen.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
 <div id='titlebar'>
   <div id='main'>
@@ -55,7 +56,7 @@
 
       <fieldset>
         <legend><?php echo $lang->testcase->legendComment;?></legend>
-        <textarea name='comment' rows='6' class='w-p100'></textarea>
+        <?php echo html::textarea('comment', '',  "rows='5' class='area-1'");?>
       </fieldset>
       <fieldset>
         <legend><?php echo $lang->testcase->legendAttatch;?></legend>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 8e1377eb64..648b377881 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <div id='titlebar'>
   <div id='main' <?php if($case->deleted) echo "class='deleted'";?>>CASE #<?php echo $case->id . ' ' . $case->title;?></div>
   <div>
@@ -81,7 +82,7 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='a-center actionlink'><?php echo $actionLinks;?></div>
-      <div id='comment' class='hidden'>
+      <div id='commentBox' class='hidden'>
         <fieldset>
           <legend><?php echo $lang->comment;?></legend>
           <form method='post' action='<?php echo inlink('edit', "caseID=$case->id&comment=true")?>'>
diff --git a/module/testtask/config.php b/module/testtask/config.php
index 63dfde2dae..2bdb5e828b 100644
--- a/module/testtask/config.php
+++ b/module/testtask/config.php
@@ -8,4 +8,4 @@ $config->testtask->edit->requiredFields   = 'project,build,begin,end,name';
 $config->testtask->editor = new stdclass();
 $config->testtask->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
 $config->testtask->editor->edit   = array('id' => 'desc,report', 'tools' => 'simpleTools');
-$config->testtask->editor->close  = array('id' => 'report', 'tools' => 'simpleTools');
+$config->testtask->editor->close  = array('id' => 'report,comment', 'tools' => 'simpleTools');
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 1ddbb7a50c..cc8f4548cd 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -556,8 +556,9 @@ function setMailto(mailto, contactListID)
  */
 function setComment()
 {
-    $('#comment').toggle();
-    setTimeout(function() { $('#comment textarea').focus(); }, 50);
+    $('#commentBox').toggle();
+    $('.ke-container').css('width', '100%');
+    setTimeout(function() { $('#commentBox textarea').focus(); }, 50);
 }
 
 /**