- updated with Thierrys patch which handles conflicting email addresses between peers