Fixed message part in layout ;x