Fix for broken Apple Mail messages