Rewitten to only import mail