Fix messages not working on adbooker
Merge branch 'WIP'