Try the addon, Message header Toolbar Customize. I think it does exactly what you want.

Try the addon, Message header Toolbar Customize. I think it does exactly what you want.