diff --git a/include/class.task.php b/include/class.task.php
index dcb19c81243bc34a73afe4b28e510aa2918259f0..1a5860b0b87595d6a045058a511f79a78c903ef6 100644
--- a/include/class.task.php
+++ b/include/class.task.php
@@ -406,6 +406,9 @@ class Task extends TaskModel implements RestrictedAccess, Threadable {
         $alert = isset($options['alert']) ? $options['alert'] : true;
         switch ($type) {
         case 'N':
+        case 'M':
+            return $this->getThread()->addDescription($vars);
+            break;
         default:
             return $this->postNote($vars, $errors, $poster, $alert);
         }
@@ -1569,7 +1572,8 @@ class TaskThread extends ObjectThread {
     function addDescription($vars, &$errors=array()) {
 
         $vars['threadId'] = $this->getId();
-        $vars['message'] = $vars['description'];
+        if (!isset($vars['message']) && $vars['description'])
+            $vars['message'] = $vars['description'];
         unset($vars['description']);
         return MessageThreadEntry::add($vars, $errors);
     }