Added support for "mail" in addition to "smtp" in `Mail`.