diff --git a/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html b/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html
index 19182d50..185a1aa5 100644
--- a/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html
+++ b/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html
@@ -16,13 +16,13 @@
{* Content *}
{block name="email-content"}
{loop type="order" name="order" 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},
- {/loop}
-
- {intl l="Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Please click here to track the delivery." order_ref=$REF tracking_ref=$DELIVERY_REF}
- {intl l="Details about this order are available in your customer account." account_url={url path="/account"}}
- {intl l="See you soon at %store" url={navigate to='index'} store={config key="store_name"}}
- {intl l="The %store team." store={config key="store_name"}}
+{loop type="customer" name="customer.order" current=false id=$CUSTOMER backend_context="1"}
+{intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},
{/loop}
-{/block}
+
+{intl l="Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Please click here to track the delivery." order_ref=$REF tracking_ref=$DELIVERY_REF}
+{intl l="Details about this order are available in your customer account." account_url={url path="/account"}}
+{intl l="See you soon at %store" url={navigate to='index'} store={config key="store_name"}}
+{intl l="The %store team." store={config key="store_name"}}
+{/loop}
+{/block}
\ No newline at end of file
diff --git a/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.txt b/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.txt
index 2ae098dc..22e46cd7 100644
--- a/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.txt
+++ b/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.txt
@@ -8,4 +8,4 @@
{intl l="Details about this order are available in your customer account: %account_url." account_url={url path="/account"}}
{intl l="See you soon at %store at the following address: %url" url={navigate to='index'} store={config key="store_name"}}
{intl l="The %store team." store={config key="store_name"}}
-{/loop}
+{/loop}
\ No newline at end of file
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..43522bd0
--- /dev/null
+++ b/local/modules/MondialRelay/templates/email/default2020/mondial-relay-tracking-message.html
@@ -0,0 +1,28 @@
+{extends file="email-layout.tpl"}
+
+{default_translation_domain domain='mondialrelay.email.default2020'}
+
+{* 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" id=$order_id customer="*" backend_context=true}
+ {loop type="customer" name="customer.order" current=false id=$CUSTOMER backend_context="1"}
+ {intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},
+ {/loop}
+
+ {intl l="Your order %order_ref has just been shipped from our store. The tracking number for this order is %tracking_ref. Please click here to track the delivery." order_ref=$REF tracking_ref=$DELIVERY_REF}
+ {intl l="Details about this order are available in your customer account." account_url={url path="/account"}}
+ {intl l="See you soon at %store" url={navigate to='index'} store={config key="store_name"}}
+ {intl l="The %store team." store={config key="store_name"}}
+ {/loop}
+{/block}
\ No newline at end of file
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..22e46cd7
--- /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" 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},
+{/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}
+{intl l="Details about this order are available in your customer account: %account_url." account_url={url path="/account"}}
+{intl l="See you soon at %store at the following address: %url" url={navigate to='index'} store={config key="store_name"}}
+{intl l="The %store team." store={config key="store_name"}}
+{/loop}
\ No newline at end of file
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}
+
+
{intl l="Pickup relay opening hours:" d="mondialrelay.email.default"}
+
+ {foreach $OPENINGS as $opening}
+
+ | {$opening.day} |
+ {if $opening.opening_time_1}
+ {$opening.opening_time_1} - {$opening.closing_time_1} |
+ {else}
+ |
+ {/if}
+ {if $opening.opening_time_2}
+ {$opening.opening_time_2} - {$opening.closing_time_2} |
+ {else}
+ |
+ {/if}
+
+ {/foreach}
+
+
+ {format_address
+ country_code=$COUNTRY
+ locality=$CITY
+ postal_code=$ZIPCODE
+ address_line1=$ADDRESS
+ organization=$NAME
+ html=$html_mode
+ }
+ {/loop}
+{/strip}