Fixed mail functionality.