If making any edits to an email template inside the pop up email function PLEASE make sure you have un-checked the MailMerge box as unless this is unchecked any edits you have made cannot be saved. 

Save any changes you make using the Manage Templates link where you will see the Save option.