Fix bug with comma in display-name.

Fixes https://github.com/pagekite/Mailpile/issues/778

Sorry for the random merging of master branches. Sometimes I don't understand my own git.