Added workaround for msg-id tokens with multiple domains