Support commas in names

Bad things happen when an email header has a comma in the name, this fixes that.
Anyway, I'm gonna take a look at a possible regex solution later today.