Why can't you leave it alone? Can a user still use the second edition? This is NOT user friendly.
Time to switch to another company that knows how to keep it simple. This is way too difficult for multiple users.
I see you were able to reach out to us earlier to get switched back to the older generation editor. If you click on the Create button and then select Email, all of those templates will be in the older generation of the editor. Please let us know if you have any further questions or feedback.