Added support for MAIL_URL to be set