Better support for sending mails