Revert "the last change can be less invasive"

This reverts commit bc909106cd375d5cb1bc0b852dbad3d3f4ffdfb7.
Revert "visual change"

This reverts commit 66c13440bbca4f6add8143d54cb7fee7564e7fa6.
Revert "message templates: save some space in form"

This reverts commit 0cf3a9de08431d98156c729e116ba7c4390158ac.