Fixes #0000704: Improvements to "E-mail Template" editing
Reintegrate merge of "in-portal/releases/5.0.1@12617" to "in-portal/branches/5.1.x@12453".
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.