Fix Mail's property names.