Fix message type to be as it is on master:
- We add the "Type" field in addIdentityFields for telling whether it is an OwnIdentity or non-own Identity