fixed messaging for Android, needs update for iOS
Fix for iOS similar to Android.