Fixed Mail Logic