iOS patch fix for messaging - buggy