msg-template layout fix
Merge pull request #3864 from colemanw/msg-template

msg-template layout fix