Fixed mail duplicates