Dammit. Mail.App was fixed by a recent mac update, but the latest mac update seems to break it again.
