fix bugs in message controller
fix bugs in message controller
Merge branch 'master' of https://github.com/cosimo-dw/NamingSaaS