diff --git a/module/bug/control.php b/module/bug/control.php
index bd044be728..d8d85066a2 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -740,7 +740,7 @@ class bug extends control
         $mailContent = $this->parse($this->moduleName, 'sendmail');
 
         /* Send it. */
-        $this->loadModel('mail')->send($toList, $productName. ':'. 'BUG #'. $bug->id . $this->lang->colon . $bug->title, $mailContent, $ccList);
+        $this->loadModel('mail')->send($toList, $productName . ':' . 'BUG #'. $bug->id . $this->lang->colon . $bug->title, $mailContent, $ccList);
         if($this->mail->isError()) echo js::error($this->mail->getError());
     }
 }
diff --git a/module/story/control.php b/module/story/control.php
index 9359be0157..ecdc09b81d 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -23,7 +23,6 @@ class story extends control
         $this->loadModel('product');
         $this->loadModel('tree');
         $this->loadModel('user');
-        $this->products = $this->product->getPairs();
     }
 
     /**
@@ -425,7 +424,7 @@ class story extends control
 
         /* Set toList and ccList. */
         $story       = $this->story->getById($storyID);
-        $productName = $this->products[$story->product];
+        $productName = $this->product->getById($story->product)->name;
         $toList      = $story->assignedTo;
         $ccList      = str_replace(' ', '', trim($story->mailto, ','));
 
@@ -467,7 +466,7 @@ class story extends control
         $mailContent = $this->parse($this->moduleName, 'sendmail');
 
         /* Send it. */
-        $this->loadModel('mail')->send($toList, $productName. ':'. 'STORY #' . $story->id . $this->lang->colon . $story->title, $mailContent, $ccList);
+        $this->loadModel('mail')->send($toList, $productName . ':' . 'STORY #' . $story->id . $this->lang->colon . $story->title, $mailContent, $ccList);
         if($this->mail->isError()) echo js::error($this->mail->getError());
     }
 }
diff --git a/module/task/control.php b/module/task/control.php
index e060d29b82..4298d4ae7a 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -415,8 +415,8 @@ class task extends control
     private function sendmail($taskID, $actionID)
     {
         /* Set toList and ccList. */
-        $task        = $this->task->getByID($taskID);
-        $projectName = $this->project->getByID($task->project)->name;
+        $task        = $this->task->getById($taskID);
+        $projectName = $this->project->getById($task->project)->name;
         $toList      = $task->assignedTo;
         $ccList      = trim($task->mailto, ',');
 
@@ -452,7 +452,7 @@ class task extends control
         $mailContent = $this->parse($this->moduleName, 'sendmail');
 
         /* Send emails. */
-        $this->loadModel('mail')->send($toList, $projectName. ':'. 'TASK#' . $task->id . $this->lang->colon . $task->name, $mailContent, $ccList);
+        $this->loadModel('mail')->send($toList, $projectName . ':' . 'TASK#' . $task->id . $this->lang->colon . $task->name, $mailContent, $ccList);
         if($this->mail->isError()) echo js::error($this->mail->getError());
     }