More bugs  related to unread messages badge is fixed.