I modified the message templates on one account. That took several attempts. At one point, by mistake, I modified the templates at the folder level instead of the account level. The folder templates override the account templates, and both are now wrong, but differently wrong. I want to do away with the overrides at folder level, so that I have only one set of templates to fix.

I can't find any way to do this. I thought of deleting the folder but I can't because it's the Inbox. Clearing the folder-level templates doesn't help. That just gives me a blank template that overrides the folder template.

Any suggestions?