AGPUSH-631: Criteria options for compose message