Rolled back change to message display, didn't work.