Hi, 

after save one change in our sales email template ( change in the subscription ) i have the following problem. in the sended mail there are two buttons and header footer in that mail. 

my version and one version in odoo style. When i click on send mail in the quotation i see only my version. but the mail for my customer has both version in the mail. My Version looks like the content part. 

If i get back to an older snapshot everything works like before the change. If i changed it back the error still exists. 

Any ideas? or how can i debug this?