diff --git a/pms/data/pms_cancelled_reservation_email_template.xml b/pms/data/pms_cancelled_reservation_email_template.xml
index 31ab04cc0..32f1876ed 100644
--- a/pms/data/pms_cancelled_reservation_email_template.xml
+++ b/pms/data/pms_cancelled_reservation_email_template.xml
@@ -65,7 +65,7 @@
                                             <div>
                                                 Hello ${object.partner_id.name or ''},<br
                                                             />
-                                                Your reservation at ${object.pms_property_id.name} has been successfully canceled.
+                                                Your reservation at ${object.pms_property_id.name} has been cancelled.
                                             </div>
                                         </td></tr>
                                     </table>
diff --git a/pms/data/pms_confirmed_reservation_email_template.xml b/pms/data/pms_confirmed_reservation_email_template.xml
index b4de65eac..35e8273a8 100644
--- a/pms/data/pms_confirmed_reservation_email_template.xml
+++ b/pms/data/pms_confirmed_reservation_email_template.xml
@@ -3,7 +3,7 @@
     <data>
         <record id="confirmed_reservation_email" model="mail.template">
             <field name="name">Confirmed Reservation</field>
-            <field name="model_id" ref="pms.model_pms_reservation" />
+            <field name="model_id" ref="pms.model_pms_folio" />
             <field
                 name="subject"
             >${object.company_id.name} has confirmed your reservation in ${object.pms_property_id.name}</field>
@@ -116,11 +116,9 @@
                                                                     style="margin: 16px 0px 16px 0px; font-size: 14px;"
                                                                 >
                                                         <div><strong
-                                                                        >From</strong> ${object.checkin} <strong
-                                                                        >At</strong> ${object.arrival_hour}</div>
+                                                                        >From</strong> ${object.first_checkin}</div>
                                                         <div><strong
-                                                                        >To</strong> ${object.checkout} <strong
-                                                                        >At</strong> ${object.departure_hour}</div>
+                                                                        >To</strong> ${object.last_checkout}</div>
                                                         <div
                                                                         style="font-size:12px;color:#9e9e9e"
                                                                     ><i><strong
@@ -140,7 +138,12 @@
                                                     <td style="vertical-align:top;">
                                                         <br />
                                                         <div><strong
-                                                                        >Room: </strong> ${object.room_type_id.name}</div>
+                                                                        >Rooms: </strong></div><div
+                                                                    >
+                                                            % for reservation in object.reservation_ids:
+                                                            ${reservation.room_type_id.name}<br
+                                                                        /></div>
+                                                            % endfor
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -158,7 +161,7 @@
                                                                 >
                                                         <br />
                                                         <div><strong
-                                                                        >Price: </strong> ${object.price_room_services_set} ${object.pms_property_id.country_id.currency_id.symbol}</div>
+                                                                        >Price: </strong> ${object.amount_total} ${object.pms_property_id.country_id.currency_id.symbol}</div>
                                                     </td>
                                                 </tr>
                                             </table>
@@ -205,7 +208,7 @@
                                                         <tr>
                                                             <td align="center">
                                                                 <a
-                                                                            href="/my/folios/${object.folio_id.id}/precheckin?access_token=${object.folio_id.access_token}"
+                                                                            href="/my/folios/${object.id}/precheckin?access_token=${object.access_token}"
                                                                             target="_blank"
                                                                             style="text-decoration: none; color: #FFFFFF; font-size: 2em; padding: 10px 20px 10px 20px;"
                                                                         >
diff --git a/pms/data/pms_modified_reservation_email_template.xml b/pms/data/pms_modified_reservation_email_template.xml
index 9ca3a0942..6fb107c67 100644
--- a/pms/data/pms_modified_reservation_email_template.xml
+++ b/pms/data/pms_modified_reservation_email_template.xml
@@ -3,7 +3,7 @@
     <data>
         <record id="modified_reservation_email" model="mail.template">
             <field name="name">Modified Reservation</field>
-            <field name="model_id" ref="pms.model_pms_reservation" />
+            <field name="model_id" ref="pms.model_pms_folio" />
             <field
                 name="subject"
             >Your reservation in ${object.pms_property_id.name} has been modified</field>
@@ -106,7 +106,7 @@
                                             >
                                         <tr><td valign="top" style="font-size: 14px;">
                                             <table style="width:50%;">
-                                                <tr>
+                                                 <tr>
                                                     <td>
                                                         <div
                                                                         class="far fa-calendar-alt fa-2x"
@@ -117,11 +117,9 @@
                                                                     style="margin: 16px 0px 16px 0px; font-size: 14px;"
                                                                 >
                                                         <div><strong
-                                                                        >From</strong> ${object.checkin} <strong
-                                                                        >At</strong> ${object.arrival_hour}</div>
+                                                                        >From</strong> ${object.first_checkin}</div>
                                                         <div><strong
-                                                                        >To</strong> ${object.checkout} <strong
-                                                                        >At</strong> ${object.departure_hour}</div>
+                                                                        >To</strong> ${object.last_checkout}</div>
                                                         <div
                                                                         style="font-size:12px;color:#9e9e9e"
                                                                     ><i><strong
@@ -141,7 +139,12 @@
                                                     <td style="vertical-align:top;">
                                                         <br />
                                                         <div><strong
-                                                                        >Room: </strong> ${object.room_type_id.name}</div>
+                                                                        >Rooms: </strong></div><div
+                                                                    >
+                                                            % for reservation in object.reservation_ids:
+                                                            ${reservation.room_type_id.name}<br
+                                                                        /></div>
+                                                            % endfor
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -158,8 +161,8 @@
                                                                     style="margin: 16px 0px 16px 0px; font-size: 14px;"
                                                                 >
                                                         <br />
-                                                        <div><strong
-                                                                        >Price: </strong> ${object.price_total} ${object.pms_property_id.country_id.currency_id.symbol}</div>
+                                                            <div><strong
+                                                                        >Price: </strong> ${object.amount_total} ${object.pms_property_id.country_id.currency_id.symbol}</div>
                                                     </td>
                                                 </tr>
                                             </table>
diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml
index 9cf82c060..581403495 100644
--- a/pms/views/pms_reservation_views.xml
+++ b/pms/views/pms_reservation_views.xml
@@ -1118,7 +1118,7 @@
         <field name="res_model">mail.compose.message</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
-        <field name="binding_model_id" ref="pms.model_pms_reservation" />
+        <field name="binding_model_id" ref="pms.model_pms_folio" />
         <field name="binding_view_types">form</field>
         <field
             name="context"
@@ -1132,7 +1132,7 @@
         <field name="res_model">mail.compose.message</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
-        <field name="binding_model_id" ref="pms.model_pms_reservation" />
+        <field name="binding_model_id" ref="pms.model_pms_folio" />
         <field name="binding_view_types">form</field>
         <field
             name="context"