Fixed Messaging System Bug