Fixed mail issues