Various minor fixes
Fix Mail.app imports
Add MailMate import, + various fixes