fixing #6361 new layout/messages