* Don't try to re-load avatars.
* Set a contact id on Zeroconf peers.