Bug 809725 - Part 3: Export Email to contact. r=gwagner, a=tef+
Bug 843913 - Set DBus watch function to null on event loop exit. r=tzimmermann, a=tef+