addcontact-bugfix
trunk
Also a few checks to prevent post-acceptence onChange events from breaking context.