Update to new version of Messages.
Plus a small change that was killing me.