diff --git a/module/project/config.php b/module/project/config.php
index 3ba7ba88ce..0a077854fc 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -1,3 +1,6 @@
 <?php
 $config->project->create->requiredFields = 'name,code,team,begin,end';
 $config->project->edit->requiredFields   = 'name,code,team,begin,end';
+
+$config->project->editor->create = array('id' => 'desc,goal', 'tools' => 'simpleTools');
+$config->project->editor->edit   = array('id' => 'desc,goal', 'tools' => 'simpleTools');
diff --git a/module/project/model.php b/module/project/model.php
index efc14424fb..92f65474ed 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -103,7 +103,6 @@ class projectModel extends model
         $this->lang->project->team = $this->lang->project->teamname;
         $project = fixer::input('post')
             ->stripTags('name, code, team')
-            ->specialChars('goal, desc')
             ->setIF($this->post->acl != 'custom', 'whitelist', '')
             ->join('whitelist', ',')
             ->remove('products')
@@ -144,7 +143,6 @@ class projectModel extends model
         $projectID = (int)$projectID;
         $project = fixer::input('post')
             ->stripTags('name, code, team')
-            ->specialChars('goal, desc')
             ->setIF($this->post->begin == '0000-00-00', 'begin', '')
             ->setIF($this->post->end   == '0000-00-00', 'end', '')
             ->setIF($this->post->acl != 'custom', 'whitelist', '')
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index e9fac0a123..683d165385 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <script language='Javascript'>
 function setWhite(acl)
 {
@@ -48,12 +49,12 @@ function setWhite(acl)
       </tr>
       <tr>
         <th class='rowhead'><?php echo $lang->project->goal;?></th>
-        <td><?php echo html::textarea('goal', '', "rows='5' class='area-1'");?></td>
+        <td><?php echo html::textarea('goal', '', "rows='6' class='area-1'");?></td>
       </tr>  
 
       <tr>
         <th class='rowhead'><?php echo $lang->project->desc;?></th>
-        <td><?php echo html::textarea('desc', '', "rows='5' class='area-1'");?></td>
+        <td><?php echo html::textarea('desc', '', "rows='6' class='area-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->project->acl;?></th>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 1e22fcec90..957c60bb4c 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <script language='Javascript'>
 function setWhite(acl)
 {
@@ -69,11 +70,11 @@ function setWhite(acl)
       </tr>
       <tr>
         <th class='rowhead'><?php echo $lang->project->goal;?></th>
-        <td><?php echo html::textarea('goal', $project->goal, "rows='5' class='area-1'");?></td>
+        <td><?php echo html::textarea('goal', htmlspecialchars($project->goal), "rows='6' class='area-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->project->desc;?></th>
-        <td><?php echo html::textarea('desc', $project->desc, "rows='5' class='area-1'");?></td>
+        <td><?php echo html::textarea('desc', htmlspecialchars($project->desc), "rows='6' class='area-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->project->acl;?></th>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 72cb1ef127..0df8d5b4c6 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -28,11 +28,11 @@
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->project->goal;?></th>
-      <td><?php echo nl2br($project->goal);?></td>
+      <td class='content'><?php echo $project->goal;?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->project->desc;?></th>
-      <td><?php echo nl2br($project->desc);?></td>
+      <td class='content'><?php echo $project->desc;?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->project->status;?></th>