Fix detecting < as a delimiter
Don't display e-mail addresses if there is a personal part of the name