added better message decoration