alan_m wrote:

I don't seem to be able to re-order the buttons

The old way of editing toolbars no longer exists, but there's an add-on
that allows it (it's a bit basic but it does work)

"Message Header Toolbar Customize"
https://hogi.sakura.ne.jp/en/