- fix quoting of message_id