Messaging sync
New merged, with shift-it lib