The mechanism, which substitutes variable names with values in EML message body has also been redesigned. Apart from performance improvements, it now allows to maintain correct character encoding both if content is changed in the message header as well as in the alternative, text version of the message.