Fix unexpected error message for email in import contacts
Merge branch 'MH-540' into dev