Update EmailContacts to v4.0.21