diff --git a/lib.php b/lib.php
index 92d1827..d1e53cf 100644
--- a/lib.php
+++ b/lib.php
@@ -343,8 +343,6 @@ function driprelease_calculate_availability(\stdClass $driprelease, int $session
     $row['sessioncounter'] = $sessioncounter + 1;
     $row['start'] = $start;
     $row['end'] = $end;
-    $row['startformatted'] = userdate($start, '%a %d %b %Y %H:%M');
-    $row['endformatted'] = userdate($end, '%a %d %b %Y %H:%M');
     return $row;
 }
 
diff --git a/templates/quiz.mustache b/templates/quiz.mustache
index 42bc2bb..7e4321c 100644
--- a/templates/quiz.mustache
+++ b/templates/quiz.mustache
@@ -75,7 +75,17 @@
 
         {{#isheader}}
             <tr>
-            <td colspan="6 ">{{#str}} session, tool_driprelease {{/str}} {{{calculatedavailability.sessioncounter}}}: {{calculatedavailability.startformatted}} - {{calculatedavailability.endformatted}}</td>
+            <td colspan="6 ">
+                {{#str}} session, tool_driprelease {{/str}} {{{calculatedavailability.sessioncounter}}}:
+                {{< core/time_element }}
+                {{$timestampval}}{{calculatedavailability.start}}{{/timestampval}}
+                {{$userdateformatval}}%a %d %b %Y %H:%M{{/userdateformatval}}
+                {{/core/time_element}}
+                -
+                {{< core/time_element }}
+                {{$timestampval}}{{calculatedavailability.end}}{{/timestampval}}
+                {{$userdateformatval}}%a %d %b %Y %H:%M{{/userdateformatval}}
+                {{/core/time_element}}
             </tr>
         {{/isheader}}