Mattermost fixes

After a refactor the messages could not be found. The first commit, removing a #, led me to this. Thats why its included.

cc @felipe_artur