Fixed the Message Indicator issues.