[z2433] Fix Chat system after chat refactoring backport

Thanks to all involved.