Hide email token if no value is found

When I now use an e-mail token, like first name, and no first name is found this is outputted in the e-mail: [First Name]



It would be nice if no an e-mail token has no value that nothing would be displayed.

When I now use an e-mail token, like first name, and no first name is found this is outputted in the e-mail: [First Name]

It would be nice if no an e-mail token has no value that nothing would be displayed.