[bug 967419] Use display names in emails

I think I got 'em all...

r?