MailBundle fixes