Fix messaging system

Latest messaging code
Android example project updated