diff --git a/main/inc/ajax/message.ajax.php b/main/inc/ajax/message.ajax.php
index b49225d4d1..d4f35d3cac 100755
--- a/main/inc/ajax/message.ajax.php
+++ b/main/inc/ajax/message.ajax.php
@@ -22,7 +22,7 @@ switch ($action) {
         $count_unread_message = 0;
         if (api_get_setting('allow_message_tool') === 'true') {
             // get count unread message and total invitations
-            $count_unread_message = MessageManager::getNumberOfMessages(['message_status' => [MESSAGE_STATUS_UNREAD]]);
+            $count_unread_message = MessageManager::getCountNewMessagesFromDB($userId);
         }
 
         if (api_get_setting('allow_social_tool') === 'true') {
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 1158e03e4c..c3df9a35e6 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -2921,11 +2921,11 @@ class MessageManager
         $sql = "SELECT COUNT(id) as count 
                 FROM $table
                 WHERE
-                    user_receiver_id=".$userId." AND
+                    user_receiver_id = $userId AND
                     msg_status = ".MESSAGE_STATUS_UNREAD;
         $result = Database::query($sql);
         $row = Database::fetch_assoc($result);
 
-        return $row['count'];
+        return (int) $row['count'];
     }
 }