Fixed Mail serialization