Fixed mail issue