Mail's "From" header fixed but commented since it won't work with GMail during development.