Improve message generator
Temporarly disable random messages