Updated the unread messages behavior