fix new message
Merge branch 'group_messaging' into testing