bugfix in messaging