diff --git a/templates/mail_event.mustache b/templates/mail_event.mustache
index b5f8d69..16b7947 100644
--- a/templates/mail_event.mustache
+++ b/templates/mail_event.mustache
@@ -1,5 +1,5 @@
 From: Fake Reservation System <{{user.email}}>
-Subject: [FRS] {{form_type_uc}} Reservation
+Subject: [FRS] {{reservationFor_name.value}} - {{reservationFor_startDate.value_human}} - {{form_type_uc}} Reservation
 Date: {{email_date}}
 X-Mailer: FRS/1.0
 MIME-Version: 1.0
@@ -30,6 +30,7 @@ Content-Type: text/html; charset=utf-8
   </div>
   <div itemprop="reservationFor" itemscope itemtype="http://schema.org/{{reservationFor_type.value}}">
     Event: <strong><span itemprop="name">{{reservationFor_name.value}}</span></strong><br/>
+    {{reservationFor_description.value}}<br/>
     (<a itemprop="url" href="{{reservationFor_url.value}}">{{reservationFor_url.value}}</a>)<br/>
     <link itemprop="image" href="{{reservationFor_image.value}}"/>
     <div itemprop="performer" itemscope itemtype="http://schema.org/Person">
diff --git a/templates/mail_flight.mustache b/templates/mail_flight.mustache
index 46fdaee..6918dd8 100644
--- a/templates/mail_flight.mustache
+++ b/templates/mail_flight.mustache
@@ -1,6 +1,6 @@
 Return-Path: {{user.email}}
 From: Fake Reservation System <{{user.email}}>
-Subject: [FRS] {{form_type_uc}} Reservation
+Subject: [FRS] {{reservationFor_airline_iataCode.value}}{{reservationFor_flightNumber.value}} {{reservationFor_departureAirport_iataCode.value}} to {{reservationFor_arrivalAirport_iataCode.value}} - {{reservationFor_departureTime.value_human}} - {{form_type_uc}} Reservation
 Date: {{email_date}}
 X-Mailer: FRS/1.0
 MIME-Version: 1.0
diff --git a/templates/mail_hotel.mustache b/templates/mail_hotel.mustache
index 7b0042e..0827601 100644
--- a/templates/mail_hotel.mustache
+++ b/templates/mail_hotel.mustache
@@ -1,6 +1,6 @@
 Return-Path: {{user.email}}
 From: Fake Reservation System <{{user.email}}>
-Subject: [FRS] {{form_type_uc}} Reservation
+Subject: [FRS] {{reservationFor_name.value}} - {{checkinDate.value_human}} - {{form_type_uc}} Reservation
 Date: {{email_date}}
 X-Mailer: FRS/1.0
 MIME-Version: 1.0