Improvements to the message template to fit it on one line.