Replace the internal ContactInfo with MessageContact, so we can use the same type throughout.
Plus dependents.