shortcircuit rendering if no messages
shortcircuit rendering if no messages

fix git editor whitespace
Merge pull request #5749