Address book plus messages

Merge address book and simplified messages api