Use new API for resolving Email addresses.

Also fix case where Fast-Track window would end up hanging
when the background query failed.
1 file changed