Bug 995097 - Contact photos are not always imported. Bug 970832 did not ...

...fix the problem