Fixing non-ascii char support in mail model