diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
index bfc91a62e..7f1f2fb6d 100644
--- a/application/libraries/MessageLib.php
+++ b/application/libraries/MessageLib.php
@@ -365,7 +365,7 @@ class MessageLib
 								if ($this->getEmailCfgItem("email_send_immediately") === true)
 								{
 									// Send message by email!
-									$result = $this->sendOne($msg_id, $subject, $parsedText);
+									$resultSendEmail = $this->sendOne($msg_id, $subject, $parsedText);
 								}
 							}
 						}
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 56c2fcb77..33cbc788f 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -97,6 +97,11 @@ class Message_model extends DB_Model
 						) s ON (m.message_id = s.message_id AND r.person_id = s.person_id)
 				 WHERE r.person_id = ?";
 		
+		if ($all != "true")
+		{
+			$sql .= " AND (s.status < 3 OR s.status IS NULL)";
+		}
+		
 		$result = $this->db->query($sql, array($person_id));
 		if (is_object($result))
 			return $this->_success($result->result());