Display the right contact photo #1264 (#1375)

In case different contacts share the same phone number, the displayed
photo got mixed-up.
This bug was due to the fact that the contact's first phone number was
always used. This commit makes sure we keep using the right combination
of phone/contact.