diff --git a/templates/mail_event.mustache b/templates/mail_event.mustache
index a187f21..6ad77e8 100644
--- a/templates/mail_event.mustache
+++ b/templates/mail_event.mustache
@@ -1,4 +1,3 @@
-Return-Path: {{user.email}}
 From: Fake Reservation System <{{user.email}}>
 Subject: [FRS] {{form_type_uc}} Reservation
 Date: {{email_date}}
@@ -10,6 +9,7 @@ Content-Type: text/html; charset=utf-8
 <body>
 <p>
 <h1>YOUR RESERVATION DETAILS</h1>
+</p>
 <p>
 <div itemscope itemtype="http://schema.org/EventReservation">
     Reservation number: <span itemprop="reservationNumber">{{reservationNumber.value}}</span><br/>
diff --git a/templates/mail_flight.mustache b/templates/mail_flight.mustache
index 4d9c870..46fdaee 100644
--- a/templates/mail_flight.mustache
+++ b/templates/mail_flight.mustache
@@ -10,6 +10,7 @@ Content-Type: text/html; charset=utf-8
 <body>
 <p>
 <h1>YOUR RESERVATION DETAILS</h1>
+</p>
 <p>
 <div itemscope itemtype="http://schema.org/FlightReservation">
     Reservation number: <span itemprop="reservationNumber">{{reservationNumber.value}}</span><br/>
@@ -23,8 +24,8 @@ Content-Type: text/html; charset=utf-8
       <meta itemprop="name" content="{{bookingAgent_name.value}}"/>
       <link itemprop="url" href="{{bookingAgent_url.value}}"/>
   </div>
-  <meta itemprop="bookingTime" content="{{bookingTime.value}}"/>
-  <meta itemprop="modifiedTime" content="{{modifiedTime.value}}"/>
+  <meta itemprop="bookingTime" content="{{bookingTime.value_iso8601}}"/>
+  <meta itemprop="modifiedTime" content="{{modifiedTime.value_iso8601}}"/>
   <div itemprop="programMembership" itemscope itemtype="http://schema.org/ProgramMembership">
       <meta itemprop="memberNumber" content="{{programMembership_memberNumber.value}}"/>
       <meta itemprop="program" content="{{programMembership_program.value}}"/>
@@ -43,18 +44,18 @@ Content-Type: text/html; charset=utf-8
         <meta itemprop="name" content="{{reservationFor_departureAirport_name.value}}"/>
         <meta itemprop="iataCode" content="{{reservationFor_departureAirport_iataCode.value}}"/>
     </div>
-    <meta itemprop="departureTime" content="{{reservationFor_departureTime.value}}"/>
+    <meta itemprop="departureTime" content="{{reservationFor_departureTime.value_iso8601}}"/>
     <meta itemprop="departureGate" content="{{reservationFor_departureGate.value}}"/>
     <meta itemprop="departureTerminal" content="{{reservationFor_departureTerminal.value}}"/>
     <div itemprop="arrivalAirport" itemscope itemtype="http://schema.org/Airport">
         <meta itemprop="name" content="{{reservationFor_arrivalAirport_name.value}}"/>
         <meta itemprop="iataCode" content="{{reservationFor_arrivalAirport_iataCode.value}}"/>
     </div>
-    <meta itemprop="arrivalTime" content="{{reservationFor_arrivalTime.value}}"/>
+    <meta itemprop="arrivalTime" content="{{reservationFor_arrivalTime.value_iso8601}}"/>
     <meta itemprop="arrivalGate" content="{{reservationFor_arrivalGate.value}}"/>
     <meta itemprop="arrivalTerminal" content="{{reservationFor_arrivalTerminal.value}}"/>
-    <meta itemprop="webCheckinTime" content="{{reservationFor_webCheckinTime.value}}"/>
-    <meta itemprop="boardingTime" content="{{reservationFor_boardingTime.value}}"/>
+    <meta itemprop="webCheckinTime" content="{{reservationFor_webCheckinTime.value_iso8601}}"/>
+    <meta itemprop="boardingTime" content="{{reservationFor_boardingTime.value_iso8601}}"/>
   </div>
   <meta itemprop="ticketNumber" content="{{ticketNumber.value}}"/>
   <link itemprop="ticketDownloadUrl" href="{{ticketDownloadUrl.value}}"/>
diff --git a/templates/mail_hotel.mustache b/templates/mail_hotel.mustache
index dd13009..7b0042e 100644
--- a/templates/mail_hotel.mustache
+++ b/templates/mail_hotel.mustache
@@ -10,6 +10,7 @@ Content-Type: text/html; charset=utf-8
 <body>
 <p>
 <h1>YOUR RESERVATION DETAILS</h1>
+</p>
 <p>
 <div itemscope itemtype="http://schema.org/LodgingReservation">
   Reservation number: <span itemprop="reservationNumber">{{reservationNumber.value}}</span><br/>
@@ -38,7 +39,7 @@ Content-Type: text/html; charset=utf-8
   Price: <span itemprop="price">{{price.value}}</span> <span itemprop="priceCurrency">{{priceCurrency.value}}</span><br/>
   <br/>
   Booked with:<br/>
-  <meta itemprop="bookingTime" content="{{bookingTime.value}}"/>
+  <meta itemprop="bookingTime" content="{{bookingTime.value_iso8601}}"/>
   <div itemprop="bookingAgent" itemscope itemtype="http://schema.org/Organization">
     <span itemprop="name">{{bookingAgent_name.value}}</span><br/>
     <a itemprop="url" href="{{bookingAgent_url.value}}">{{bookingAgent_url.value}}</a><br/>
diff --git a/templates/mail_train.mustache b/templates/mail_train.mustache
index 9274e6e..c27e5bd 100644
--- a/templates/mail_train.mustache
+++ b/templates/mail_train.mustache
@@ -10,6 +10,7 @@ Content-Type: text/html; charset=utf-8
 <body>
 <p>
 <h1>YOUR RESERVATION DETAILS</h1>
+</p>
 <p>
 <div itemscope itemtype="http://schema.org/TrainReservation">
     Reservation number: <span itemprop="reservationNumber">{{reservationNumber.value}}</span><br/>
@@ -23,11 +24,11 @@ Content-Type: text/html; charset=utf-8
       <meta itemprop="name" content="{{bookingAgent_name.value}}"/>
       <link itemprop="url" href="{{bookingAgent_url.value}}"/>
   </div>
-  <meta itemprop="bookingTime" content="{{bookingTime.value}}"/>
+  <meta itemprop="bookingTime" content="{{bookingTime.value_iso8601}}"/>
   <link itemprop="cancelReservationUrl" href="{{cancelReservationUrl.value}}"/>
   <link itemprop="checkinUrl" href="{{checkinUrl.value}}"/>
   <link itemprop="confirmReservationUrl" href="{{confirmReservationUrl.value}}"/>
-  <meta itemprop="modifiedTime" content="{{modifiedTime.value}}"/>
+  <meta itemprop="modifiedTime" content="{{modifiedTime.value_iso8601}}"/>
   <link itemprop="modifyReservationUrl" href="{{modifyReservationUrl.value}}"/>
   <div itemprop="programMembership" itemscope itemtype="http://schema.org/ProgramMembership">
       <meta itemprop="memberNumber" content="{{programMembership_memberNumber.value}}"/>
@@ -38,12 +39,12 @@ Content-Type: text/html; charset=utf-8
     <div itemprop="arrivalStation" itemscope itemtype="http://schema.org/TrainStation">
         <meta itemprop="name" content="{{reservationFor_arrivalStation_name.value}}"/>
     </div>
-    <meta itemprop="arrivalTime" content="{{reservationFor_arrivalTime.value}}"/>
+    <meta itemprop="arrivalTime" content="{{reservationFor_arrivalTime.value_iso8601}}"/>
     <meta itemprop="departurePlatform" content="{{reservationFor_departurePlatform.value}}"/>
     <div itemprop="departureStation" itemscope itemtype="http://schema.org/TrainStation">
         <meta itemprop="name" content="{{reservationFor_departureStation_name.value}}"/>
     </div>
-    <meta itemprop="departureTime" content="{{reservationFor_departureTime.value}}"/>
+    <meta itemprop="departureTime" content="{{reservationFor_departureTime.value_iso8601}}"/>
     <meta itemprop="trainCode" content="{{reservationFor_trainCode.value}}"/>
     <meta itemprop="trainCompany" content="{{reservationFor_trainCompany.value}}"/>
     <meta itemprop="trainName" content="{{reservationFor_trainName.value}}"/>
