Make the mail import optional
Merge pull request #1277 from markewallace/MailImportOption

Make the mail import optional