Imroving group message handling (WIP)