We are having the same problem. It seems like there is a gap between what you put in the messages from the customize email template form and the account setting-->sales--> messages form.
Please help. We are having a similar issue with our payments not coming through.
