Fix Mail model bug