Some fixes on Automailer. (JD)