Improved mechanism which avoids address books and calendars being added twice.