Support commas in names

Bad things happen when an email header has a comma in the name, this fixes that.