[OE-4077] Move email field from address to contact.