Combine header and message templates to avoid reflow

This keeps the progress message on the same line as the no-new-messages message.