fixed messaging for Android, needs update for iOS