Correctly parse email addresses (from contacts). Could be of the form "User...

Correctly parse email addresses (from contacts). Could be of the form "User name <user@example.com>".

Fixes issue 2920