Use proper token for comments in oa_messages