diff --git a/lib/SimpleSAML/Utils/EMail.php b/lib/SimpleSAML/Utils/EMail.php
index 1bfd67b86950d4fd1a96fbf62d799cb7047a4b0a..add2e6503e04592f869510112e8048b83089208a 100644
--- a/lib/SimpleSAML/Utils/EMail.php
+++ b/lib/SimpleSAML/Utils/EMail.php
@@ -252,6 +252,9 @@ class EMail
      */
     public function generateBody($template)
     {
+        // Force mail template to be rendered by Twig, even when using oldui
+        // Replace this with the following line of code in 2.0
+        // $config = Configuration::getInstance();
         $config = Configuration::loadFromArray([
             'usenewui' => true,
         ]);