Fix MessageController