Ensure /echo includes message_id