Make the mail import optional