fixed a problems with automatically added messages