Backport fix for group messages.