Message formatting improved