Editing: MessageHandler.php