Update chat stuff to 1.6

Yeh, new to this so revert the commit if this is wrong ;)