Mail: Implemented newest changes