Messaging fix for iOS