diff --git a/ext/default-mail-templates/booking-request-accepted/booking-request-accepted-html.html b/ext/default-mail-templates/booking-request-accepted/booking-request-accepted-html.html
index f89326ab..0d3864f3 100644
--- a/ext/default-mail-templates/booking-request-accepted/booking-request-accepted-html.html
+++ b/ext/default-mail-templates/booking-request-accepted/booking-request-accepted-html.html
@@ -25,16 +25,49 @@
       <tbody>
       {{#each tx-line-items}}
         {{#contains include-for "customer"}}
-          <tr>
-            {{#eq "line-item/day" code}}
-            <td>{{> format-money money=unit-price}} &times; {{number quantity}} {{inflect quantity "day" "days"}}</td>
-            <td style="padding-left: 20px;">{{> format-money money=line-total}}</td>
-            {{/eq}}
-            {{#eq "line-item/night" code}}
-            <td>{{> format-money money=unit-price}} &times; {{number quantity}} {{inflect quantity "night" "nights"}}</td>
-            <td style="padding-left: 20px;">{{> format-money money=line-total}}</td>
-            {{/eq}}
-          </tr>
+          {{#eq "line-item/day" code}}
+              <tr>
+                <td>Price per day</td>
+                <td style="text-align: right; padding-left: 20px">{{> format-money money=unit-price}}</td>
+              </tr>
+              {{#if seats}}
+              <tr>
+                <td>Days</td>
+                <td style="text-align: right; padding-left: 20px">&times; {{number units}}</td>
+              </tr>
+              <tr>
+                <td>Seats</td>
+                <td style="text-align: right; padding-left: 20px">&times; {{number seats}}</td>
+              </tr>
+              {{else}}
+              <tr>
+                <td>Days</td>
+                <td style="text-align: right; padding-left: 20px">&times; {{number quantity}}</td>
+              </tr>
+              {{/if}}
+          {{/eq}}
+
+          {{#eq "line-item/night" code}}
+            <tr>
+              <td>Price per night</td>
+              <td style="text-align: right; padding-left: 20px">{{> format-money money=unit-price}}</td>
+            </tr>
+            {{#if seats}}
+            <tr>
+              <td>Nights</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number units}}</td>
+            </tr>
+            <tr>
+              <td>Seats</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number seats}}</td>
+            </tr>
+            {{else}}
+            <tr>
+              <td>Nights</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number quantity}}</td>
+            </tr>
+            {{/if}}
+          {{/eq}}
         {{/contains}}
       {{/each}}
       </tbody>
diff --git a/ext/default-mail-templates/money-paid/money-paid-html.html b/ext/default-mail-templates/money-paid/money-paid-html.html
index f4afe5d1..0737a797 100644
--- a/ext/default-mail-templates/money-paid/money-paid-html.html
+++ b/ext/default-mail-templates/money-paid/money-paid-html.html
@@ -25,22 +25,64 @@
       <tbody>
       {{#each tx-line-items}}
         {{#contains include-for "provider"}}
-          <tr>
-            {{#eq "line-item/day" code}}
-            <td>{{> format-money money=unit-price}} &times; {{number quantity}} {{inflect quantity "day" "days"}}</td>
-            <td style="text-align: right; padding-left: 20px">{{> format-money money=line-total}}</td>
-            {{/eq}}
+          {{#eq "line-item/day" code}}
+            <tr>
+              <td>Price per day</td>
+              <td style="text-align: right; padding-left: 20px">{{> format-money money=unit-price}}</td>
+            </tr>
+            {{#if seats}}
+            <tr>
+              <td>Days</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number units}}</td>
+            </tr>
+            <tr>
+              <td>Seats</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number seats}}</td>
+            </tr>
+            {{else}}
+            <tr>
+              <td>Days</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number quantity}}</td>
+            </tr>
+            {{/if}}
+            <tr>
+              <th style="text-align: left;">Subtotal</th>
+              <th style="text-align: right; padding-left: 20px">{{> format-money money=line-total}}</th>
+            </tr>
+          {{/eq}}
 
-            {{#eq "line-item/night" code}}
-            <td>{{> format-money money=unit-price}} &times; {{number quantity}} {{inflect quantity "night" "nights"}}</td>
-            <td style="text-align: right; padding-left: 20px">{{> format-money money=line-total}}</td>
-            {{/eq}}
+          {{#eq "line-item/night" code}}
+            <tr>
+              <td>Price per night</td>
+              <td style="text-align: right; padding-left: 20px">{{> format-money money=unit-price}}</td>
+            </tr>
+            {{#if seats}}
+            <tr>
+              <td>Nights</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number units}}</td>
+            </tr>
+            <tr>
+              <td>Seats</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number seats}}</td>
+            </tr>
+            {{else}}
+            <tr>
+              <td>Nights</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number quantity}}</td>
+            </tr>
+            {{/if}}
+            <tr>
+              <th style="text-align: left;">Subtotal</th>
+              <th style="text-align: right; padding-left: 20px">{{> format-money money=line-total}}</th>
+            </tr>
+          {{/eq}}
 
             {{#eq "line-item/provider-commission" code}}
+            </tr>
             <td>{{marketplace.name}} fee:</td>
             <td style="text-align: right; padding-left: 20px;">{{> format-money money=line-total}}</td>
+            </tr>
             {{/eq}}
-          </tr>
         {{/contains}}
       {{/each}}
       </tbody>
diff --git a/ext/default-mail-templates/new-booking-request/new-booking-request-html.html b/ext/default-mail-templates/new-booking-request/new-booking-request-html.html
index 9a24198d..10700c79 100644
--- a/ext/default-mail-templates/new-booking-request/new-booking-request-html.html
+++ b/ext/default-mail-templates/new-booking-request/new-booking-request-html.html
@@ -23,22 +23,64 @@
       <tbody>
       {{#each tx-line-items}}
         {{#contains include-for "provider"}}
-          <tr>
-            {{#eq "line-item/day" code}}
-            <td>{{> format-money money=unit-price}} &times; {{number quantity}} {{inflect quantity "day" "days"}}</td>
-            <td style="text-align: right; padding-left: 20px">{{> format-money money=line-total}}</td>
-            {{/eq}}
+          {{#eq "line-item/day" code}}
+            <tr>
+              <td>Price per day</td>
+              <td style="text-align: right; padding-left: 20px">{{> format-money money=unit-price}}</td>
+            </tr>
+            {{#if seats}}
+            <tr>
+              <td>Days</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number units}}</td>
+            </tr>
+            <tr>
+              <td>Seats</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number seats}}</td>
+            </tr>
+            {{else}}
+            <tr>
+              <td>Days</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number quantity}}</td>
+            </tr>
+            {{/if}}
+            <tr>
+              <th style="text-align: left;">Subtotal</th>
+              <th style="text-align: right; padding-left: 20px">{{> format-money money=line-total}}</th>
+            </tr>
+          {{/eq}}
 
-            {{#eq "line-item/night" code}}
-            <td>{{> format-money money=unit-price}} &times; {{number quantity}} {{inflect quantity "night" "nights"}}</td>
-            <td style="text-align: right; padding-left: 20px">{{> format-money money=line-total}}</td>
-            {{/eq}}
+          {{#eq "line-item/night" code}}
+            <tr>
+              <td>Price per night</td>
+              <td style="text-align: right; padding-left: 20px">{{> format-money money=unit-price}}</td>
+            </tr>
+            {{#if seats}}
+            <tr>
+              <td>Nights</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number units}}</td>
+            </tr>
+            <tr>
+              <td>Seats</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number seats}}</td>
+            </tr>
+            {{else}}
+            <tr>
+              <td>Nights</td>
+              <td style="text-align: right; padding-left: 20px">&times; {{number quantity}}</td>
+            </tr>
+            {{/if}}
+            <tr>
+              <th style="text-align: left;">Subtotal</th>
+              <th style="text-align: right; padding-left: 20px">{{> format-money money=line-total}}</th>
+            </tr>
+          {{/eq}}
 
-            {{#eq "line-item/provider-commission" code}}
-            <td>{{marketplace.name}} fee:</td>
-            <td style="text-align: right; padding-left: 20px;">{{> format-money money=line-total}}</td>
-            {{/eq}}
-          </tr>
+          {{#eq "line-item/provider-commission" code}}
+            <tr>
+              <td>{{marketplace.name}} fee</td>
+              <td style="text-align: right; padding-left: 20px;">{{> format-money money=line-total}}</td>
+            </tr>
+          {{/eq}}
         {{/contains}}
       {{/each}}
       </tbody>