Changes to add Messages to Android app