Added support for adding a special message at /message