In the next version, currently scheduled to be released Monday, I've made it so that if you open a Template and save as Draft, it'll leave the original template intact and instead save the new email as a Draft. The same applies for saving a Draft as a Template, it'll leave the original Draft alone.