Add back in group messages