diff --git a/local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.html b/local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.html
new file mode 100644
index 00000000..86928065
--- /dev/null
+++ b/local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.html
@@ -0,0 +1,29 @@
+{extends file="email-layout.tpl"}
+
+{default_translation_domain domain='mondialrelay.email.default'}
+
+{* Do not provide a "Open in browser" link  *}
+{block name="browser"}{/block}
+{* No pre-header *}
+{block name="pre-header"}{/block}
+
+{* Subject  *}
+{block name="email-subject"}{intl l="Your %ref order has been shipped" ref=$REF}{/block}
+
+{* Title  *}
+{block name="email-title"}{intl l="Your %ref order has been shipped" ref=$REF}{/block}
+
+{* Content  *}
+{block name="email-content"}
+
+{loop type="order" name="order" customer="*" id=$order_id backend_context=true}
+    {loop type="customer" name="customer.order" current=false id=$CUSTOMER backend_context="1"}
+        <p>{intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},</p>
+    {/loop}
+
+    <p>{intl l="Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Please <a href=\"https://www.mondialrelay.fr/suivi-de-colis\">click here</a> to track the delivery." order_ref=$REF tracking_ref=$DELIVERY_REF}</p>
+    <p>{intl l="Details about this order are available <a href=\"%account_url\">in your customer account</a>." account_url={url path="/account"}}</p>
+    <p>{intl l="See you soon at <a href=\"%url\">%store</a>" url={navigate to='index'} store={config key="store_name"}}</p>
+    <p>{intl l="The %store team." store={config key="store_name"}}</p>
+{/loop}
+{/block}
diff --git a/local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.txt b/local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.txt
new file mode 100644
index 00000000..ceb27ef0
--- /dev/null
+++ b/local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.txt
@@ -0,0 +1,11 @@
+{default_translation_domain domain='mondialrelay.email.default'}
+{default_locale locale={$locale}}
+{loop type="order" name="order" customer="*" id=$order_id}
+{loop type="customer" name="customer.order" current=false id=$CUSTOMER backend_context="1"}
+{intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},<br>
+{/loop}
+{intl l="Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Tracking data is available at this address: https://www.mondialrelay.fr/suivi-de-colis" order_ref=$REF tracking_ref=$DELIVERY_REF}<br>
+{intl l="Details about this order are available in your customer account:  %account_url." account_url={url path="/account"}}<br>
+{intl l="See you soon at %store at the following address: %url" url={navigate to='index'} store={config key="store_name"}}<br>
+{intl l="The %store team." store={config key="store_name"}}
+{/loop}
diff --git a/local/modules/MondialRelay/templates/email/default2020/mondialrelay/opening-hours-html.html b/local/modules/MondialRelay/templates/email/default2020/mondialrelay/opening-hours-html.html
new file mode 100644
index 00000000..f5e5cd61
--- /dev/null
+++ b/local/modules/MondialRelay/templates/email/default2020/mondialrelay/opening-hours-html.html
@@ -0,0 +1,26 @@
+{strip}
+    {loop type="mondialrelay.selected-pickup-point" name="avec-pickup" order_id=$order_id}
+        {if count($OPENINGS) > 0}
+            <div class="opening hours">
+                <p>{intl l="Pickup relay opening hours:" d="mondialrelay.email.default"}</p>
+                <table>
+                    {foreach $OPENINGS as $opening}
+                    <tr>
+                        <td><b>{$opening.day}</b></td>
+                        {if $opening.opening_time_1}
+                            <td>{$opening.opening_time_1} - {$opening.closing_time_1}</td>
+                        {else}
+                            <td>&nbsp;</td>
+                        {/if}
+                        {if $opening.opening_time_2}
+                            <td>{$opening.opening_time_2} - {$opening.closing_time_2}</td>
+                        {else}
+                            <td>&nbsp;</td>
+                        {/if}
+                    </tr>
+                {/foreach}
+                </table>
+            </div>
+        {/if}
+    {/loop}
+{/strip}
diff --git a/local/modules/MondialRelay/templates/email/default2020/mondialrelay/opening-hours-text.html b/local/modules/MondialRelay/templates/email/default2020/mondialrelay/opening-hours-text.html
new file mode 100644
index 00000000..883169ed
--- /dev/null
+++ b/local/modules/MondialRelay/templates/email/default2020/mondialrelay/opening-hours-text.html
@@ -0,0 +1,8 @@
+{strip}
+{loop type="mondialrelay.selected-pickup-point" name="avec-pickup" order_id=$order_id}
+{if count($OPENINGS) > 0}{foreach $OPENINGS as $opening}
+{intl l="Pickup relay opening hours:" d="mondialrelay.email.default"}
+{$opening.day}: {if $opening.opening_time_1}{$opening.opening_time_1} - {$opening.closing_time_1}{/if}   {if $opening.opening_time_2}{$opening.opening_time_2} - {$opening.closing_time_2}{/if}
+{/foreach}{/if}
+{/loop}
+{/strip}
diff --git a/local/modules/MondialRelay/templates/email/default2020/mondialrelay/order-delivery-address.html b/local/modules/MondialRelay/templates/email/default2020/mondialrelay/order-delivery-address.html
new file mode 100644
index 00000000..c5752c23
--- /dev/null
+++ b/local/modules/MondialRelay/templates/email/default2020/mondialrelay/order-delivery-address.html
@@ -0,0 +1,13 @@
+{strip}
+    {loop type="mondialrelay.selected-pickup-point" name="avec-pickup" order_id=$order_id}
+        {intl l="Mondial Relay pickup location #%num" num=$ID d="mondialrelay.email.default"}<br>
+        {format_address
+            country_code=$COUNTRY
+            locality=$CITY
+            postal_code=$ZIPCODE
+            address_line1=$ADDRESS
+            organization=$NAME
+            html=$html_mode
+        }
+    {/loop}
+{/strip}