Message template form different from email composition form

When composing templates, the plain-text version is presented first, followed by HTML and PDF formatting. When composing an email, the layout is reversed, with the HTML version followed by the plain-text version.

I think it would make sense to have the template layout mirror the email composition layout.