Fixed Mail entity
Fixed Mail entity