MSINM-84: Added support for message references