Reduce scope of special case for matching '@' in display name - was matching in case of multiple addresses with unquoted display names.
Merge remote-tracking branch 'crowbot/master'