minor fixes to message display - fixes #7806