Imroving group message handling (WIP) (2)