diff --git a/commerce_billy_mail.module b/commerce_billy_mail.module
index 36deeaa4ed2c3886deb82b18d9ff77d87ed1d359..4c474892fc5b7d29c3c8708093c3051b306c36b8 100644
--- a/commerce_billy_mail.module
+++ b/commerce_billy_mail.module
@@ -102,8 +102,8 @@ function _commerce_billy_mail_send_order_invoice($order) {
   }
 
   // Replace tokens
-  $subject = token_replace($subject, array('user' => $order_account, 'commerce_order' => $order), array('language' => $order_account_language));
-  $body = token_replace($body, array('user' => $order_account, 'commerce_order' => $order), array('language' => $order_account_language));
+  $subject = token_replace($subject, array('user' => $order_account, 'commerce_order' => $order), array('language' => $order_account_language, 'clear' => TRUE));
+  $body = token_replace($body, array('user' => $order_account, 'commerce_order' => $order), array('language' => $order_account_language, 'clear' => TRUE));
 
   // Set values in mail:
   $plaintext = variable_get('commerce_billy_mail_plaintext', FALSE);