diff --git a/src/app/data/beyond/app-language-ca.ts b/src/app/data/beyond/app-language-ca.ts
index 52d7d09..4f7032d 100644
--- a/src/app/data/beyond/app-language-ca.ts
+++ b/src/app/data/beyond/app-language-ca.ts
@@ -29,7 +29,7 @@ export const LANGUAGE_CA = {
   footer: {
     html: `
 {% set languageSheet = {
-  moreInfo: 'Per més informació, llegeixi la nostra <a href="' ~ general.privacyPolicyLink ~ '">política de privacitat</a> i les <a href="' ~ general.termsOfUseLink ~ '">condicions d\\'ús</a>.'
+  moreInfo: "Per més informació, llegeixi la nostra <a href='{{privacyPolicyLink}}'>política de privacitat</a> i les <a href='{{termsOfUseLink}}'>condicions d'ús</a>."
 } %}
         <tr>
           <td bgcolor="#fff" style="background-color: #fff; padding: 20px 20px 20px 20px;">
@@ -94,7 +94,7 @@ export const LANGUAGE_CA = {
               {% endif %}
               <tr>
                 <td align="center" heigth="50" style="font-family: Arial, Helvetica, sans-serif; font-size: 11px; color: #999; height: 20px;">
-                  {{ languageSheet.moreInfo }}
+                  {{ replace(languageSheet.moreInfo, { '{{privacyPolicyLink}}': general.privacyPolicyLink, '{{termsOfUseLink}}': general.termsOfUseLink }) }}
                 </td>
               </tr>
             </table>
@@ -122,22 +122,22 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - Gràcies per donar-te d'alta`,
       html: `
 {% set languageSheet = {
-  premessage: 'Benvingut/da a ' ~ general.ecommerceName ~ '!',
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Ens complau confirmar-te la creació del teu compte de client a <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageBody2: 'Gràcies al teu compte de client podràs actualitzar el teu perfil i contrasenya, consultar el teu historial de comandes i altra informació del teu interès.',
-  messageBody3: "Esperem veure't aviat a " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  premessage: "Benvingut/da a {{ecommerceName}}!",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "Ens complau confirmar-te la creació del teu compte de client a <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageBody2: "Gràcies al teu compte de client podràs actualitzar el teu perfil i contrasenya, consultar el teu historial de comandes i altra informació del teu interès.",
+  messageBody3: "Esperem veure't aviat a <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{ecommerceName}}': general.ecommerceName }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -148,18 +148,18 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - Baixa d'usuari`,
       html: `
 {% set languageSheet = {
-  premessage: 'Confirmació de compte eliminat',
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody: 'Tal i com ens has sol·licitat al web ' ~ general.ecommerceName ~ ", confirmem que el teu compte d'usuari " ~ user.email ~ " ha estat eliminat de la nostra base de dades.",
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  premessage: "Confirmació de compte eliminat",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody: "Tal i com ens has sol·licitat al web {{ecommerceName}}, confirmem que el teu compte d'usuari {{userEmail}} ha estat eliminat de la nostra base de dades.",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{userEmail}}': user.email }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -170,24 +170,24 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - Recordar contrasenya`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recordar contrasenya',
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: "D'acord a la sol·licitud durant la teva recent visita a " ~ general.ecommerceName ~ ", aquí tens la teva direcció d'accés a la zona de recuperació de contrasenya:",
-  messageBody2: '<a href="' ~ user.lostPasswordLink ~ '" style="color:#000">Fes clic aquí per recuperar la teva contrasenya</a>',
-  messageBody3: 'Aquest enllaç només serà vàlid durant les 24 hores següents al moment del seu enviament.',
-  messageBody4: "Esperem veure't aviat a " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  premessage: "Recordar contrasenya",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "D'acord a la sol·licitud durant la teva recent visita a {{ecommerceName}}, aquí tens la teva direcció d'accés a la zona de recuperació de contrasenya:",
+  messageBody2: "<a href='{{lostPasswordLink}}' style='color:#000'>Fes clic aquí per recuperar la teva contrasenya</a>",
+  messageBody3: "Aquest enllaç només serà vàlid durant les 24 hores següents al moment del seu enviament.",
+  messageBody4: "Esperem veure't aviat a <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceName}}': general.ecommerceName }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{lostPasswordLink}}': user.lostPasswordLink }) }}<br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageBody4 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody4, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -198,22 +198,22 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - Canvi de contrasenya`,
       html: `
 {% set languageSheet = {
-  premessage: 'Canvi de contrasenya',
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Et confirmem que la teva contrasenya ha sigut modificada.',
+  premessage: "Canvi de contrasenya",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "Et confirmem que la teva contrasenya ha sigut modificada.",
   messageBody2: "Assegura't d'anotar les teves credencials en un lloc segur per futures referències.",
-  messageBody3: "Esperem veure't aviat a " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  messageBody3: "Esperem veure't aviat a <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -230,24 +230,24 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - {{ wishlist.user.name }} et recomana els seus productes favorits`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recomanació de favorits',
-  messageHeader1: 'Hola ' ~ wishlist.toName ~ ',',
-  messageHeader2: "El teu amic/ga " ~ wishlist.user.firstName ~ " " ~ wishlist.user.lastName ~ " (" ~ wishlist.user.email ~ ") t'envia aquests productes que poden resultar del teu interès.",
-  messageBody: 'Si necessites més informació sobre aquests productes pots contactar amb nosaltres a <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName,
-  recommendedProducts: 'Productes recomanats',
-  product: 'Producte',
-  price: 'Preu',
-  comments: 'Missatge del teu amic/ga:'
+  premessage: "Recomanació de favorits",
+  messageHeader1: "Hola {{toName}},",
+  messageHeader2: "El teu amic/ga {{firstName}} {{lastName}} ({{email}}) t'envia aquests productes que poden resultar del teu interès.",
+  messageBody: "Si necessites més informació sobre aquests productes pots contactar amb nosaltres a <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}",
+  recommendedProducts: "Productes recomanats",
+  product: "Producte",
+  price: "Preu",
+  comments: "Missatge del teu amic/ga:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageHeader2 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{toName}}': wishlist.toName }) }}<br><br>
+      {{ replace(languageSheet.messageHeader2, { '{{firstName}}': wishlist.user.firstName, '{{lastName}}': wishlist.user.lastName, '{{email}}': wishlist.user.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -281,9 +281,13 @@ export const LANGUAGE_CA = {
                         </tr>
                       </table>
                     </td>
-                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;"><span><span>
-                      {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
-                    </span></span></td>
+                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;">
+                      <span>
+                        <span>
+                          {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
+                        </span>
+                      </span>
+                    </td>
                   </tr>
                   {% endfor %}
                 </tbody>
@@ -316,22 +320,22 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - {{ recommend.name }} et recomana un producte`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recomanació de producte',
-  messageHeader1: "El teu amic/ga " ~ recommend.name ~ " (" ~ recommend.email ~ ") t'envia aquest producte que pot resultar del teu interès.",
-  messageBody: 'Si necessites més informació sobre aquest producte pots contactar amb nosaltres a <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName,
-  recommendedProducts: 'Productes recomanats',
-  product: 'Producte',
-  price: 'Preu',
-  comments: 'Missatge del teu amic/ga:'
+  premessage: "Recomanació de producte",
+  messageHeader1: "El teu amic/ga {{name}} ({{email}}) t'envia aquest producte que pot resultar del teu interès.",
+  messageBody: "Si necessites més informació sobre aquest producte pots contactar amb nosaltres a <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}",
+  recommendedProducts: "Productes recomanats",
+  product: "Producte",
+  price: "Preu",
+  comments: "Missatge del teu amic/ga:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{name}}': recommend.name, '{{email}}': recommend.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -396,13 +400,13 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - Formulari de contacte`,
       html: `
 {% set languageSheet = {
-  premessage: 'Formulari de contacte',
-  name: 'Nom:',
-  email: 'Email:',
-  phone: 'Telèfon:',
-  motive: 'Motiu de consulta:',
-  comments: 'Missatge:',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  premessage: "Formulari de contacte",
+  name: "Nom:",
+  email: "Email:",
+  phone: "Telèfon:",
+  motive: "Motiu de consulta:",
+  comments: "Missatge:",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -424,7 +428,7 @@ export const LANGUAGE_CA = {
         {{ languageSheet.comments }} {{ contact.comments }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -435,14 +439,14 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - Consulta sobre producte`,
       html: `
 {% set languageSheet = {
-  premessage: 'Consulta sobre producte',
-  name: 'Nom:',
-  email: 'Email:',
-  phone: 'Telèfon:',
-  comments: 'Missatge:',
-  productName: 'Nom del producte:',
-  productSku: 'Referència del producte:',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  premessage: "Consulta sobre producte",
+  name: "Nom:",
+  email: "Email:",
+  phone: "Telèfon:",
+  comments: "Missatge:",
+  productName: "Nom del producte:",
+  productSku: "Referència del producte:",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -467,7 +471,7 @@ export const LANGUAGE_CA = {
         {{ languageSheet.productSku }} {{ data.product.sku }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -478,29 +482,29 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - {{ (sales.reserve) ? ('Comanda rebuda') : ('Confirmació de comanda') }} {{ sales.documentNumber }}`,
       html: `
 {% set languageSheet = {
-  premessage: 'Confirmació de comanda',
-  premessageReserve: 'Comanda rebuda',
-  messageHeader: 'Moltes gràcies per confiar en nosaltres. La vostra compra s\\'ha processat correctament. Podeu trobar aquesta comanda al fitxer PDF adjunt.',
-  messageHeaderReserve: 'Moltes gràcies per confiar en nosaltres. Hem rebut la vostra comanda, al tenir un producte per encàrrec, la tenim pendent de revisió.',
-  messageBody1: 'A continuació, us mostrem les dades de la comanda.',
-  messageBody2: 'Gràcies per comprar <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName,
-  orderNumber: 'Número de comanda:',
-  orderDate: 'Data de la comanda:',
-  paymentSystem: 'Mètode de pagament:',
-  shippingName: 'Mètode d\\'enviament:',
-  address: 'Direcció',
-  addressBilling: 'Adreça de facturació',
-  addressShipping: 'Adreça d\\'enviament',
-  orderResume: 'Resum de la comanda',
-  quantity: 'Quantitat:',
-  product: 'Producte',
-  gift: 'Regal',
-  total: 'Total:',
-  comment: 'Comentaris:',
-  pickup: 'Heu triat el lliurament a la botiga',
-  pickupMessage: 'Us notificarem per correu quan la vostra comanda estigui disponible per recollir-la.',
-  rewardPoints: 'El total de {{name}} que obtindrà per la seva pròxima compra és de {{value}}'
+  premessage: "Confirmació de comanda",
+  premessageReserve: "Comanda rebuda",
+  messageHeader: "Moltes gràcies per confiar en nosaltres. La vostra compra s'ha processat correctament. Podeu trobar aquesta comanda al fitxer PDF adjunt.",
+  messageHeaderReserve: "Moltes gràcies per confiar en nosaltres. Hem rebut la vostra comanda, al tenir un producte per encàrrec, la tenim pendent de revisió.",
+  messageBody1: "A continuació, us mostrem les dades de la comanda.",
+  messageBody2: "Gràcies per comprar <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}",
+  orderNumber: "Número de comanda:",
+  orderDate: "Data de la comanda:",
+  paymentSystem: "Mètode de pagament:",
+  shippingName: "Mètode d'enviament:",
+  address: "Direcció",
+  addressBilling: "Adreça de facturació",
+  addressShipping: "Adreça d'enviament",
+  orderResume: "Resum de la comanda",
+  quantity: "Quantitat:",
+  product: "Producte",
+  gift: "Regal",
+  total: "Total:",
+  comment: "Comentaris:",
+  pickup: "Heu triat el lliurament a la botiga",
+  pickupMessage: "Us notificarem per correu quan la vostra comanda estigui disponible per recollir-la.",
+  rewardPoints: "El total de {{ecommerceName}} que obtindrà per la seva pròxima compra és de {{value}}"
 } %}
 <tr>
   <td style="vertical-align: middle;font-family: sans-serif; padding: 20px" align="center">
@@ -730,13 +734,13 @@ export const LANGUAGE_CA = {
                 <div style="padding: 10px 12px;border: 1px solid #dee2e6;">
                   <p style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
                     <strong>{{ rewardPoint.language.name }}</strong><br>
-                    {{ replace(languageSheet.rewardPoints, { '{{name}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
+                    {{ replace(languageSheet.rewardPoints, { '{{ecommerceName}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
                   </p>
                 </div>
               {% endfor %}
             {% endif %}
             <div style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
-              {{ languageSheet.messageBody2 }}<br>{{ languageSheet.messageSignature }}
+              {{ replace(languageSheet.messageBody2, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>{{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
             </div>
           </td>
         </tr>
@@ -770,11 +774,11 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - Petició de devolució`,
       html: `
 {% set languageSheet = {
-  premessage: 'Informació de la petició de devolució',
-  messageHeader: 'Hola ' ~ sales.user.billingAddress.firstName ~ ' ' ~ sales.user.billingAddress.lastName ~ ',',
-  messageBody1: 'T\\'informem que hem rebut la teva petició de devolució.',
-  messageBody2: 'Si tens algun dubte sobre la teva devolució o algun altre qüestió, pots posar-te en contacte amb nosaltres.',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  premessage: "Informació de la petició de devolució",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "T'informem que hem rebut la teva petició de devolució de la comanda {{documentNumber}}.",
+  messageBody2: "Si tens algun dubte sobre la teva devolució o algun altre qüestió, pots posar-te en contacte amb nosaltres.",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 
 <tr>
@@ -782,9 +786,9 @@ export const LANGUAGE_CA = {
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
       {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageBody1, { '{{documentNumber}}': first(sales.documentParents).documentNumber }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -796,19 +800,19 @@ export const LANGUAGE_CA = {
       html: `
 {% set languageSheet = {
   premessage: "Informació de la comanda no completada",
-  messageHeader: 'Hola ' ~ abandonedCart.user.firstName ~ ' ' ~ abandonedCart.user.lastName ~ ',',
-  messageBody1: 'A la teva ultima visita a la nostra botiga, vas afegir els següents productes a la cistella de la compra, però no has completat la comanda.',
-  messageBody2: 'Fes clic <a target="_blank" href="' ~ abandonedCart.link ~ '" style="color: #000;">aquí</a> si desitges recuperar la teva comanda.',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "A la teva ultima visita a la nostra botiga, vas afegir els següents productes a la cistella de la compra, però no has completat la comanda.",
+  messageBody2: "Fes clic <a target='_blank' href='{{url}}' style='color: #000;'>aquí</a> si desitges recuperar la teva comanda.",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': abandonedCart.user.firstName, '{{lastName}}': abandonedCart.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody2, { '{{url}}': abandonedCart.link }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -826,19 +830,19 @@ export const LANGUAGE_CA = {
       html: `
 {% set languageSheet = {
   premessage: "Verificació de correu",
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Gràcies per registrar-te a ' ~ general.ecommerceUrl ~ '. Si us plau, activa el teu compte fent clic <a href="' ~ user.verifyAccountLink ~ '" style="color: #000;">aquí</a>.',
-  messageBody2: "Esperem veure't aviat a " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "Gràcies per registrar-te a {{ecommerceUrl}}. Si us plau, activa el teu compte fent clic <a href='{{verifyAccountLink}}' style='color: #000;'>aquí</a>.",
+  messageBody2: "Esperem veure't aviat a <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br><br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{verifyAccountLink}}': user.verifyAccountLink }) }}<br><br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -849,22 +853,22 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - Activació del compte`,
       html: `
 {% set languageSheet = {
-  premessage: 'Activació del compte',
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Et notifiquem que el teu compte a ' ~ general.ecommerceUrl ~ ' ha sigut activat correctament.',
-  messageBody2: 'Per veure les teves dades i tota la informació referent al teu compte accedeix a través del panell de control: <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">Editar el teu perfil</a>',
-  messageBody3: "Esperem veure't aviat a " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  premessage: "Activació del compte",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "Et notifiquem que el teu compte a {{ecommerceUrl}} ha sigut activat correctament.",
+  messageBody2: "Per veure les teves dades i tota la informació referent al teu compte accedeix a través del panell de control: <a href='{{ecommerceUrl}}' style='color: #000;'>Editar el teu perfil</a>",
+  messageBody3: "Esperem veure't aviat a <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -881,22 +885,22 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - Estoc disponible`,
       html: `
 {% set languageSheet = {
-  premessage: 'Estoc disponible del producte <a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Hola ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
+  premessage: "Estoc disponible del producte <a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
   messageBody1: "L'article que tant volíes ja està disponible!",
   messageBody2: "Volem recordar-te que aquest email aporta informació orientativa sobre la disponibilitat d'aquest artícle i depen de molts factors (persones interesades, unitats disponibles).",
   messageBody3: "Hem enviat aquest email a tots els clients interessats en l'artícle, per tant es posible que s'esgoti molt aviat.",
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -925,20 +929,20 @@ export const LANGUAGE_CA = {
       subject: `{{ general.ecommerceName }} - Subscripció de estoc`,
       html: `
 {% set languageSheet = {
-  premessage: 'Subscripció de estoc del producte <br><a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Hola ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
-  messageBody1: "T'has subscrit als avisos de stock de " ~ stockAlert.product.name,
+  premessage: "Subscripció de estoc del producte <br><a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "T'has subscrit als avisos de stock de {{name}}",
   messageBody2: "En cas de que tornem a rebre aquest artícle t'avisarem d'inmediat per a que no se t'escapi.",
-  product: 'Producte',
-  price: 'Preu',
-  messageSignature: 'Atentament, l\\'equip de ' ~ general.ecommerceName
+  product: "Producte",
+  price: "Preu",
+  messageSignature: "Atentament, l'equip de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1. { '{{name}}': stockAlert.product.name }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
     </span>
   </td>
@@ -979,7 +983,7 @@ export const LANGUAGE_CA = {
         <tr>
           <td style="text-align: center;">
             <br><br>
-            {{ languageSheet.messageSignature }}
+            {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
           </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
diff --git a/src/app/data/beyond/app-language-de.ts b/src/app/data/beyond/app-language-de.ts
index 6938076..a65a597 100644
--- a/src/app/data/beyond/app-language-de.ts
+++ b/src/app/data/beyond/app-language-de.ts
@@ -29,7 +29,7 @@ export const LANGUAGE_DE = {
   footer: {
     html: `
 {% set languageSheet = {
-  moreInfo: 'Für weitere Informationen lesen Sie bitte unsere <a href="' ~ general.privacyPolicyLink ~ '">Datenschutzbestimmungen</a> y <a href="' ~ general.termsOfUseLink ~ '">Benutzungsbedingungen</a>.'
+  moreInfo: "Für weitere Informationen lesen Sie bitte unsere <a href='{{privacyPolicyLink}}'>Datenschutzbestimmungen</a> y <a href='{{termsOfUseLink}}'>Benutzungsbedingungen</a>."
 } %}
         <tr>
           <td bgcolor="#fff" style="background-color: #fff; padding: 20px 20px 20px 20px;">
@@ -94,7 +94,7 @@ export const LANGUAGE_DE = {
               {% endif %}
               <tr>
                 <td align="center" heigth="50" style="font-family: Arial, Helvetica, sans-serif; font-size: 11px; color: #999; height: 20px;">
-                  {{ languageSheet.moreInfo }}
+                  {{ replace(languageSheet.moreInfo, { '{{privacyPolicyLink}}': general.privacyPolicyLink, '{{termsOfUseLink}}': general.termsOfUseLink }) }}
                 </td>
               </tr>
             </table>
@@ -122,22 +122,22 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - Vielen Dank für Ihre Anmeldung`,
       html: `
 {% set languageSheet = {
-  premessage: 'Willkommen bei ' ~ general.ecommerceName,
-  messageHeader: 'Hallo ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Wir freuen uns, Ihnen die Einrichtung Ihres Kundenkontos bei <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageBody2: 'Dank Ihres Kundenkontos können Sie Ihr Profil und Ihr Passwort aktualisieren, Ihre Bestellhistorie einsehen und andere Informationen, die Sie interessieren, abrufen.',
-  messageBody3: "Wir hoffen, dass wir Sie bald in " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  premessage: "Willkommen bei {{ecommerceName}}",
+  messageHeader: "Hallo {{firstName}} {{lastName}},",
+  messageBody1: "Wir freuen uns, Ihnen die Einrichtung Ihres Kundenkontos bei <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageBody2: "Dank Ihres Kundenkontos können Sie Ihr Profil und Ihr Passwort aktualisieren, Ihre Bestellhistorie einsehen und andere Informationen, die Sie interessieren, abrufen.",
+  messageBody3: "Wir hoffen, dass wir Sie bald in <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{ecommerceName}}': general.ecommerceName }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -148,18 +148,18 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - Abmeldung eines Benutzers`,
       html: `
 {% set languageSheet = {
-  premessage: 'Bestätigung des gelöschten Kontos',
-  messageHeader: 'Hallo ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody: 'Wie bei Ihrem jüngsten Besuch bei ' ~ general.ecommerceName ~ ", wir bestätigen, dass Ihr Benutzerkonto " ~ user.email ~ " wurde aus unserer Datenbank entfernt.",
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  premessage: "Bestätigung des gelöschten Kontos",
+  messageHeader: "Hallo {{firstName}} {{lastName}},",
+  messageBody: "Wie bei Ihrem jüngsten Besuch bei {{ecommerceName}}, wir bestätigen, dass Ihr Benutzerkonto {{userEmail}} wurde aus unserer Datenbank entfernt.",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{userEmail}}': user.email }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -170,24 +170,24 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - Passwort merken`,
       html: `
 {% set languageSheet = {
-  premessage: 'Passwort merken',
-  messageHeader: 'Hallo ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: "Wie bei Ihrem jüngsten Besuch bei " ~ general.ecommerceName ~ ", hier ist Ihre Zugangsadresse zum Bereich für die Passwortwiederherstellung:",
-  messageBody2: '<a href="' ~ user.lostPasswordLink ~ '" style="color:#000">Klicken Sie hier, um das Passwort wiederherzustellen</a>',
-  messageBody3: 'Dieser Link ist nur für 24 Stunden ab dem Zeitpunkt der Übermittlung gültig.',
-  messageBody4: "Wir hoffen, dass wir Sie bald in " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  premessage: "Passwort merken",
+  messageHeader: "Hallo {{firstName}} {{lastName}},",
+  messageBody1: "Wie bei Ihrem jüngsten Besuch bei {{ecommerceName}}, hier ist Ihre Zugangsadresse zum Bereich für die Passwortwiederherstellung:",
+  messageBody2: "<a href='{{lostPasswordLink}}' style='color:#000'>Klicken Sie hier, um das Passwort wiederherzustellen</a>",
+  messageBody3: "Dieser Link ist nur für 24 Stunden ab dem Zeitpunkt der Übermittlung gültig.",
+  messageBody4: "Wir hoffen, dass wir Sie bald in <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
       {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceName}}': general.ecommerceName }) }}<br>
+      {{ repalce(languageSheet.messageBody2, { '{{lostPasswordLink}}': user.lostPasswordLink }) }}<br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageBody4 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody4, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -198,22 +198,22 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - Änderung des Passworts`,
       html: `
 {% set languageSheet = {
-  premessage: 'Änderung des Passworts',
-  messageHeader: 'Hallo ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Wir bestätigen, dass Ihr Passwort geändert worden ist.',
+  premessage: "Änderung des Passworts",
+  messageHeader: "Hallo {{firstName}} {{lastName}},",
+  messageBody1: "Wir bestätigen, dass Ihr Passwort geändert worden ist.",
   messageBody2: "Notieren Sie sich Ihre Anmeldedaten an einem sicheren Ort, damit Sie sie bei Bedarf nachlesen können.",
-  messageBody3: "Wir hoffen, dass wir Sie bald in " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  messageBody3: "Wir hoffen, dass wir Sie bald in <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -230,11 +230,11 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - {{ wishlist.user.name }} er empfiehlt seine Lieblingsprodukte`,
       html: `
 {% set languageSheet = {
-  premessage: 'Empfehlung für Favoriten',
-  messageHeader1: 'Hallo ' ~ wishlist.toName ~ ',',
-  messageHeader2: "Ihr Freund " ~ wishlist.user.firstName ~ " " ~ wishlist.user.lastName ~ " (" ~ wishlist.user.email ~ ") schickt Ihnen diese Produkte, die für Sie von Interesse sein könnten.",
-  messageBody: 'Wenn Sie weitere Informationen über dieses Produkt benötigen, können Sie uns kontaktieren unter <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName,
+  premessage: "Empfehlung für Favoriten",
+  messageHeader1: "Hallo {{toName}},",
+  messageHeader2: "Ihr Freund {{firstName}} {{lastName}} ({{email}}) schickt Ihnen diese Produkte, die für Sie von Interesse sein könnten.",
+  messageBody: "Wenn Sie weitere Informationen über dieses Produkt benötigen, können Sie uns kontaktieren unter <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: 'Mit freundlichen Grüßen, das Team von {{ecommerceName}}',
   recommendedProducts: 'Empfohlene Produkte',
   product: 'Produkt',
   price: 'Preis',
@@ -244,10 +244,10 @@ export const LANGUAGE_DE = {
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageHeader2 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{toName}}': wishlist.toName }) }}<br><br>
+      {{ replace(languageSheet.messageHeader2, { '{{firstName}}': wishlist.user.firstName, '{{lastName}}': wishlist.user.lastName, '{{email}}': wishlist.user.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -316,22 +316,22 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - {{ recommend.name }} empfiehlt ein Produkt`,
       html: `
 {% set languageSheet = {
-  premessage: 'Empfehlung des Produkts',
-  messageHeader1: "Ihr Freund " ~ recommend.name ~ " (" ~ recommend.email ~ ") schickt Ihnen dieses Produkt, das Sie interessieren könnte.",
-  messageBody: 'Wenn Sie weitere Informationen über dieses Produkt benötigen, können Sie uns kontaktieren unter <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName,
-  recommendedProducts: 'Empfohlene Produkte',
-  product: 'Produkt',
-  price: 'Preis',
-  comments: 'Nachricht von deinem Freund:'
+  premessage: "Empfehlung des Produkts",
+  messageHeader1: "Ihr Freund {{name}} ({{email}}) schickt Ihnen dieses Produkt, das Sie interessieren könnte.",
+  messageBody: "Wenn Sie weitere Informationen über dieses Produkt benötigen, können Sie uns kontaktieren unter <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}",
+  recommendedProducts: "Empfohlene Produkte",
+  product: "Produkt",
+  price: "Preis",
+  comments: "Nachricht von deinem Freund:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{name}}': recommend.name, '{{email}}': recommend.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -396,13 +396,13 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - Kontakt-Formular`,
       html: `
 {% set languageSheet = {
-  premessage: 'Kontakt-Formular',
-  name: 'Name:',
-  email: 'E-Mail:',
-  phone: 'Telefon:',
-  motive: 'Grund für die Konsultation:',
-  comments: 'Nachricht:',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  premessage: "Kontakt-Formular",
+  name: "Name:",
+  email: "E-Mail:",
+  phone: "Telefon:",
+  motive: "Grund für die Konsultation:",
+  comments: "Nachricht:",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -424,7 +424,7 @@ export const LANGUAGE_DE = {
         {{ languageSheet.comments }} {{ contact.comments }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -435,14 +435,14 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - Produkt-Anfrage`,
       html: `
 {% set languageSheet = {
-  premessage: 'Produkt-Anfrage',
-  name: 'Name:',
-  email: 'E-Mail:',
-  phone: 'Telefon:',
-  comments: 'Nachricht:',
-  productName: 'Name des Produkts:',
-  productSku: 'Produktbezeichnung:',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  premessage: "Produkt-Anfrage",
+  name: "Name:",
+  email: "E-Mail:",
+  phone: "Telefon:",
+  comments: "Nachricht:",
+  productName: "Name des Produkts:",
+  productSku: "Produktbezeichnung:",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -467,7 +467,7 @@ export const LANGUAGE_DE = {
         {{ languageSheet.productSku }} {{ data.product.sku }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -478,29 +478,29 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - {{ (sales.reserve) ? ('Bestellung erhalten') : ('Bestätigung der Bestellung') }} {{ sales.documentNumber }}`,
       html: `
 {% set languageSheet = {
-  premessage: 'Bestätigung der Bestellung',
-  premessageReserve: 'Bestellung erhalten',
-  messageHeader: 'Vielen Dank, dass Sie uns Ihr Vertrauen geschenkt haben. Ihr Kauf wurde korrekt abgewickelt. Diesen Auftrag finden Sie in der beigefügten PDF-Datei.',
-  messageHeaderReserve: 'Vielen Dank, dass Sie uns Ihr Vertrauen geschenkt haben. Wir haben Ihre Bestellung erhalten, da wir einige Produkte auf Bestellung haben, die wir noch überprüfen müssen.',
-  messageBody1: 'Nachstehend finden Sie die Einzelheiten der Bestellung.',
-  messageBody2: 'Vielen Dank für Ihren Einkauf bei <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName,
-  orderNumber: 'Bestellnummer:',
-  orderDate: 'Datum der Bestellung:',
-  paymentSystem: 'Art der Bezahlung:',
-  shippingName: 'Versandart:',
-  address: 'Adresse',
-  addressBilling: 'Factuuradres',
-  addressShipping: 'Verzendadres',
-  orderResume: 'Zusammenfassung der Bestellung',
-  quantity: 'Menge:',
-  product: 'Product',
-  gift: 'Geschenk',
-  total: 'Insgesamt:',
-  comment: 'Kommentare:',
-  pickup: 'Sie haben Shop-Lieferung gewählt',
-  pickupMessage: 'Wir werden Sie per E-Mail benachrichtigen, wenn Ihre Bestellung zur Abholung bereitsteht.',
-  rewardPoints: 'Sie erhalten eine Summe von {{name}} bei Ihrem nächsten Einkauf {{value}}'
+  premessage: "Bestätigung der Bestellung",
+  premessageReserve: "Bestellung erhalten",
+  messageHeader: "Vielen Dank, dass Sie uns Ihr Vertrauen geschenkt haben. Ihr Kauf wurde korrekt abgewickelt. Diesen Auftrag finden Sie in der beigefügten PDF-Datei.",
+  messageHeaderReserve: "Vielen Dank, dass Sie uns Ihr Vertrauen geschenkt haben. Wir haben Ihre Bestellung erhalten, da wir einige Produkte auf Bestellung haben, die wir noch überprüfen müssen.",
+  messageBody1: "Nachstehend finden Sie die Einzelheiten der Bestellung.",
+  messageBody2: "Vielen Dank für Ihren Einkauf bei <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}",
+  orderNumber: "Bestellnummer:",
+  orderDate: "Datum der Bestellung:",
+  paymentSystem: "Art der Bezahlung:",
+  shippingName: "Versandart:",
+  address: "Adresse",
+  addressBilling: "Factuuradres",
+  addressShipping: "Verzendadres",
+  orderResume: "Zusammenfassung der Bestellung",
+  quantity: "Menge:",
+  product: "Product",
+  gift: "Geschenk",
+  total: "Insgesamt:",
+  comment: "Kommentare:",
+  pickup: "Sie haben Shop-Lieferung gewählt",
+  pickupMessage: "Wir werden Sie per E-Mail benachrichtigen, wenn Ihre Bestellung zur Abholung bereitsteht.",
+  rewardPoints: "Sie erhalten eine Summe von {{ecommerceName}} bei Ihrem nächsten Einkauf {{value}}"
 } %}
 <tr>
   <td style="vertical-align: middle;font-family: sans-serif; padding: 20px" align="center">
@@ -713,7 +713,6 @@ export const LANGUAGE_DE = {
     </tr>
   {% endif %}
 {% endif %}
-
 <tr><td>&nbsp;</td></tr>
 <tr>
   <td>
@@ -731,13 +730,13 @@ export const LANGUAGE_DE = {
                 <div style="padding: 10px 12px;border: 1px solid #dee2e6;">
                   <p style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
                     <strong>{{ rewardPoint.language.name }}</strong><br>
-                    {{ replace(languageSheet.rewardPoints, { '{{name}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
+                    {{ replace(languageSheet.rewardPoints, { '{{ecommerceName}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
                   </p>
                 </div>
               {% endfor %}
             {% endif %}
             <div style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
-              {{ languageSheet.messageBody2 }}<br>{{ languageSheet.messageSignature }}
+              {{ replace(languageSheet.messageBody2, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>{{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
             </div>
           </td>
         </tr>
@@ -771,11 +770,11 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - Antrag auf Rückgabe`,
       html: `
 {% set languageSheet = {
-  premessage: 'Informationen über den Rückgabeantrag',
-  messageHeader: 'Hallo ' ~ sales.user.billingAddress.firstName ~ ' ' ~ sales.user.billingAddress.lastName ~ ',',
-  messageBody1: 'Bitte beachten Sie, dass wir Ihren Antrag auf Rückerstattung erhalten haben.',
-  messageBody2: 'Wenn Sie Fragen zu Ihrer Rücksendung oder einem anderen Problem haben, können Sie uns kontaktieren.',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  premessage: "Informationen über den Rückgabeantrag",
+  messageHeader: "Hallo {{firstName}} {{lastName}},",
+  messageBody1: "Bitte beachten Sie, dass wir Ihren Antrag auf Rückerstattung erhalten haben der Bestellung' ~ first(sales.documentParents).documentNumber ~ '.",
+  messageBody2: "Wenn Sie Fragen zu Ihrer Rücksendung oder einem anderen Problem haben, können Sie uns kontaktieren.",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 
 <tr>
@@ -783,9 +782,9 @@ export const LANGUAGE_DE = {
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
       {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageBody1, { '{{documentNumber}}': first(sales.documentParents).documentNumber }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -797,19 +796,19 @@ export const LANGUAGE_DE = {
       html: `
 {% set languageSheet = {
   premessage: "Unvollständige Bestellinformationen",
-  messageHeader: 'Hallo ' ~ abandonedCart.user.firstName ~ ' ' ~ abandonedCart.user.lastName ~ ',',
-  messageBody1: 'Bei Ihrem letzten Besuch in unserem Shop haben Sie die folgenden Produkte in den Warenkorb gelegt, aber Ihre Bestellung nicht abgeschlossen.',
-  messageBody2: 'Klicken Sie hier <a target="_blank" href="' ~ abandonedCart.link ~ '" style="color: #000;">hier</a> wenn Sie Ihre Bestellung abrufen möchten.',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  messageHeader: "Hallo {{firstName}} {{lastName}},",
+  messageBody1: "Bei Ihrem letzten Besuch in unserem Shop haben Sie die folgenden Produkte in den Warenkorb gelegt, aber Ihre Bestellung nicht abgeschlossen.",
+  messageBody2: "Klicken Sie hier <a target='_blank' href='{{link}}' style='color: #000;'>hier</a> wenn Sie Ihre Bestellung abrufen möchten.",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': abandonedCart.user.firstName, '{{lastName}}': abandonedCart.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody2, { '{{link}}': abandonedCart.link }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -827,19 +826,19 @@ export const LANGUAGE_DE = {
       html: `
 {% set languageSheet = {
   premessage: "Überprüfung per E-Mail",
-  messageHeader: 'Hallo ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Vielen Dank für Ihre Anmeldung bei ' ~ general.ecommerceUrl ~ '. Bitte aktivieren Sie Ihr Konto, indem Sie auf <a href="' ~ user.verifyAccountLink ~ '" style="color: #000;">hier</a>.',
-  messageBody2: "Wir hoffen, dass wir Sie bald in " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  messageHeader: "Hallo {{firstName}} {{lastName}},",
+  messageBody1: "Vielen Dank für Ihre Anmeldung bei {{ecommerceUrl}}. Bitte aktivieren Sie Ihr Konto, indem Sie auf <a href='{{verifyAccountLink}}' style='color: #000;'>hier</a>.",
+  messageBody2: "Wir hoffen, dass wir Sie bald in <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>',
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br><br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{verifyAccountLink}}': user.verifyAccountLink }) }}<br><br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -850,22 +849,22 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - Aktivierung des Kontos`,
       html: `
 {% set languageSheet = {
-  premessage: 'Aktivierung des Kontos',
-  messageHeader: 'Hallo ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Wir benachrichtigen Sie, dass Ihr Konto in ' ~ general.ecommerceUrl ~ ' korrekt aktiviert wurde.',
-  messageBody2: 'Um Ihre Daten und alle Informationen über Ihr Konto einzusehen, loggen Sie sich über das Bedienfeld ein: <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">Ihr Profil bearbeiten</a>',
-  messageBody3: "Wir hoffen, dass wir Sie bald in " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  premessage: "Aktivierung des Kontos",
+  messageHeader: "Hallo {{firstName}} {{lastName}},",
+  messageBody1: "Wir benachrichtigen Sie, dass Ihr Konto in {{ecommerceUrl}} korrekt aktiviert wurde.",
+  messageBody2: "Um Ihre Daten und alle Informationen über Ihr Konto einzusehen, loggen Sie sich über das Bedienfeld ein: <a href='{{ecommerceUrl}}' style='color: #000;'>Ihr Profil bearbeiten</a>",
+  messageBody3: "Wir hoffen, dass wir Sie bald in <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -882,22 +881,22 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - Vorrat an Waren`,
       html: `
 {% set languageSheet = {
-  premessage: 'Produkt auf Lager <a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Hallo ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
+  premessage: "Produkt auf Lager <a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Hallo {{firstName}} {{lastName}},",
   messageBody1: "Der Artikel, den Sie sich so sehr gewünscht haben, ist jetzt verfügbar!",
   messageBody2: "Wir möchten Sie daran erinnern, dass diese E-Mail eine unverbindliche Information über die Verfügbarkeit dieses Artikels enthält und von vielen Faktoren abhängt (Interessenten, verfügbare Einheiten).",
   messageBody3: "Wir haben diese E-Mail an alle Kunden geschickt, die an diesem Artikel interessiert sind, so dass er sehr bald ausverkauft sein könnte.",
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -926,20 +925,20 @@ export const LANGUAGE_DE = {
       subject: `{{ general.ecommerceName }} - Aktienzeichnung`,
       html: `
 {% set languageSheet = {
-  premessage: 'Abonnement des Produktbestands <br><a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Hallo ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
-  messageBody1: "Sie haben Aktienwarnungen abonniert von " ~ stockAlert.product.name,
+  premessage: "Abonnement des Produktbestands <br><a href='{{productLink}}' style='color: #000;'>{{name}}</a>',
+  messageHeader: "Hallo {{firstName}} {{lastName}},",
+  messageBody1: "Sie haben Aktienwarnungen abonniert von {{name}}",
   messageBody2: "Wenn wir diesen Artikel wieder erhalten, werden wir Sie sofort informieren, damit Sie ihn nicht verpassen.",
-  product: 'Produkt',
-  price: 'Preis',
-  messageSignature: 'Mit freundlichen Grüßen, das Team von ' ~ general.ecommerceName
+  product: "Produkt",
+  price: "Preis",
+  messageSignature: "Mit freundlichen Grüßen, das Team von {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{name}}': stockAlert.product.name }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
     </span>
   </td>
@@ -980,7 +979,7 @@ export const LANGUAGE_DE = {
         <tr>
           <td style="text-align: center;">
             <br><br>
-            {{ languageSheet.messageSignature }}
+            {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
           </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
diff --git a/src/app/data/beyond/app-language-en.ts b/src/app/data/beyond/app-language-en.ts
index c75c4c5..25701b9 100644
--- a/src/app/data/beyond/app-language-en.ts
+++ b/src/app/data/beyond/app-language-en.ts
@@ -29,7 +29,7 @@ export const LANGUAGE_EN = {
   footer: {
     html: `
 {% set languageSheet = {
-  moreInfo: 'For more information, read our <a href="' ~ general.privacyPolicyLink ~ '">privacy policy</a> and <a href="' ~ general.termsOfUseLink ~ '">terms of use</a>.'
+  moreInfo: "For more information, read our <a href='{{privacyPolicyLink}}'>privacy policy</a> and <a href='{{termsOfUseLink}}'>terms of use</a>."
 } %}
         <tr>
           <td bgcolor="#fff" style="background-color: #fff; padding: 20px 20px 20px 20px;">
@@ -94,7 +94,7 @@ export const LANGUAGE_EN = {
               {% endif %}
               <tr>
                 <td align="center" heigth="50" style="font-family: Arial, Helvetica, sans-serif; font-size: 11px; color: #999; height: 20px;">
-                  {{ languageSheet.moreInfo }}
+                  {{ replace(languageSheet.moreInfo, { '{{privacyPolicyLink}}': general.privacyPolicyLink, '{{termsOfUseLink}}': general.termsOfUseLink }) }}
                 </td>
               </tr>
             </table>
@@ -122,22 +122,22 @@ export const LANGUAGE_EN = {
       subject: `{{ general.ecommerceName }} - Thank you for signup`,
       html: `
 {% set languageSheet = {
-  premessage: 'Welcome to ' ~ general.ecommerceName ~ '!',
-  messageHeader: 'Hello ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'We are pleased to inform you that your customer account in <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a> has been successfully created.',
-  messageBody2: 'Thanks to your customer account now you can update your profile and password, view your order history and other details that may be of your interest.',
-  messageBody3: "We hope to see you soon in " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  premessage: 'Welcome to '{{ecommerceName}}'!',
+  messageHeader: "Hello {{firstName}} {{lastName}} ,",
+  messageBody1: "We are pleased to inform you that your customer account in <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a> has been successfully created.",
+  messageBody2: "Thanks to your customer account now you can update your profile and password, view your order history and other details that may be of your interest.",
+  messageBody3: "We hope to see you soon in <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{ecommerceName}}': general.ecommerceName }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -149,17 +149,17 @@ export const LANGUAGE_EN = {
       html: `
 {% set languageSheet = {
   premessage: 'Confirmation deleted account',
-  messageHeader: 'Hello ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody: 'As requested during your recent visit to ' ~ general.ecommerceName ~ ", we confirm that your user account " ~ user.email ~ " has been removed from our database.",
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  messageHeader: "Hello {{firstName}} {{lastName}} ,",
+  messageBody: "As requested during your recent visit to {{ecommerceName}}, we confirm that your user account {{userEmail}} has been removed from our database.",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{userEmail}}': user.email }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -171,23 +171,23 @@ export const LANGUAGE_EN = {
       html: `
 {% set languageSheet = {
   premessage: 'Password recovery',
-  messageHeader: 'Hello ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: "As requested during your recent visit to " ~ general.ecommerceName ~ ", here's your address to access the password recovery zone:",
-  messageBody2: '<a href="' ~ user.lostPasswordLink ~ '" style="color:#000">Click here</a>',
-  messageBody3: 'Este enlace solamente será válido durante las 24 horas siguientes al momento de su envío.',
-  messageBody4: "We hope to see you soon in " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  messageHeader: "Hello {{firstName}} {{lastName}} ,",
+  messageBody1: "As requested during your recent visit to {{ecommerceName}}, here's your address to access the password recovery zone:",
+  messageBody2: "<a href='{{lostPasswordLink}}' style='color:#000'>Click here</a>",
+  messageBody3: "This link will only be valid for 24 hours from the time it is sent.",
+  messageBody4: "We hope to see you soon in <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceName}}': general.ecommerceName }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{lostPasswordLink}}': user.lostPasswordLink }) }}<br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageBody4 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody4, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -198,22 +198,22 @@ export const LANGUAGE_EN = {
       subject: `{{ general.ecommerceName }} - Password change`,
       html: `
 {% set languageSheet = {
-  premessage: 'Password change',
-  messageHeader: 'Hello ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'This email is to inform you that your customer account password has been changed.',
+  premessage: "Password change",
+  messageHeader: "Hello {{firstName}} {{lastName}} ,",
+  messageBody1: "This email is to inform you that your customer account password has been changed.",
   messageBody2: "Be sure to note your credentials in a safe place for future reference.",
-  messageBody3: "We hope to see you soon in " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  messageBody3: "We hope to see you soon in <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -231,23 +231,23 @@ export const LANGUAGE_EN = {
       html: `
 {% set languageSheet = {
   premessage: 'Wishlist recommend',
-  messageHeader1: 'Hello ' ~ wishlist.toName ~ ',',
-  messageHeader2: "Your friend " ~ wishlist.user.firstName ~ " " ~ wishlist.user.lastName ~ " (" ~ wishlist.user.email ~ ") sends you this product that may be of interest for you.",
-  messageBody: 'If you need more information about this product you can contact us on <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team',
-  recommendedProducts: 'Recommended products',
-  product: 'Product',
-  price: 'Price',
-  comments: 'Message from your friend:'
+  messageHeader1: "Hello {{toName}},",
+  messageHeader2: "Your friend {{firstName}} {{lastName}} ({{email}}) sends you this product that may be of interest for you.",
+  messageBody: "If you need more information about this product you can contact us on <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "The {{ecommerceName}} Team",
+  recommendedProducts: "Recommended products",
+  product: "Product",
+  price: "Price",
+  comments: "Message from your friend:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageHeader2 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{toName}}': wishlist.toName }) }}<br><br>
+      {{ replace(languageSheet.messageHeader2, { '{{firstName}}': wishlist.user.firstName, '{{lastName}}': wishlist.user.lastName, '{{email}}': wishlist.user.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -281,9 +281,13 @@ export const LANGUAGE_EN = {
                         </tr>
                       </table>
                     </td>
-                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;"><span><span>
-                      {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
-                    </span></span></td>
+                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;">
+                      <span>
+                        <span>
+                          {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
+                        </span>
+                      </span>
+                    </td>
                   </tr>
                   {% endfor %}
                 </tbody>
@@ -316,22 +320,22 @@ export const LANGUAGE_EN = {
       subject: `{{ general.ecommerceName }} - {{ recommend.name }} recommends you a product`,
       html: `
 {% set languageSheet = {
-  premessage: 'Product recommendation',
-  messageHeader1: "Your friend " ~ recommend.name ~ " (" ~ recommend.email ~ ") thinks this item could be of your interest.",
-  messageBody: 'If you need further information about this item you can contact us at <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team',
-  recommendedProducts: 'Recommended products',
-  product: 'Product',
-  price: 'Price',
-  comments: 'Message from your friend:'
+  premessage: "Product recommendation",
+  messageHeader1: "Your friend {{name}} ({{email}}) thinks this item could be of your interest.",
+  messageBody: "If you need further information about this item you can contact us at <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "The {{ecommerceName}} Team",
+  recommendedProducts: "Recommended products",
+  product: "Product",
+  price: "Price",
+  comments: "Message from your friend:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{name}}': recommend.name, '{{email}}': recommend.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -396,13 +400,13 @@ export const LANGUAGE_EN = {
       subject: `{{ general.ecommerceName }} - Contact form`,
       html: `
 {% set languageSheet = {
-  premessage: 'Contact form',
-  name: 'Name:',
-  email: 'Email:',
-  phone: 'Phone:',
-  motive: 'Query motive:',
-  comments: 'Message:',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  premessage: "Contact form",
+  name: "Name:",
+  email: "Email:",
+  phone: "Phone:",
+  motive: "Query motive:",
+  comments: "Message:",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -424,7 +428,7 @@ export const LANGUAGE_EN = {
         {{ languageSheet.comments }} {{ contact.comments }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -435,14 +439,14 @@ export const LANGUAGE_EN = {
       subject: `{{ general.ecommerceName }} - Product enquiry`,
       html: `
 {% set languageSheet = {
-  premessage: 'Product enquiry',
-  name: 'Name:',
-  email: 'Email:',
-  phone: 'Phone:',
-  comments: 'Message:',
-  productName: 'Product name:',
-  productSku: 'Product reference:',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  premessage: "Product enquiry",
+  name: "Name:",
+  email: "Email:",
+  phone: "Phone:",
+  comments: "Message:",
+  productName: "Product name:",
+  productSku: "Product reference:",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -467,7 +471,7 @@ export const LANGUAGE_EN = {
         {{ languageSheet.productSku }} {{ data.product.sku }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -478,29 +482,29 @@ export const LANGUAGE_EN = {
       subject: `{{ general.ecommerceName }} - {{ (sales.reserve) ? ('Order received') : ('Order confirmation') }} {{ sales.documentNumber }}`,
       html: `
 {% set languageSheet = {
-  premessage: 'Order confirmation',
-  premessageReserve: 'Order received',
-  messageHeader: 'Thank you very much for trusting us. We confirm your order has been processed correctly. Please find your order attached as a PDF file.',
-  messageHeaderReserve: 'Thank you very much for trusting us. We have received your order, as we have some products on order we have it pending review.',
-  messageBody1: 'Below you will find the order details.',
-  messageBody2: 'Thank you for shopping at <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team',
-  orderNumber: 'Order number:',
-  orderDate: 'Order date:',
-  paymentSystem: 'Payment system:',
-  shippingName: 'Shipping method:',
-  address: 'Address',
-  addressBilling: 'Billing Address',
-  addressShipping: 'Shipping Address',
-  orderResume: 'Order summary',
-  quantity: 'Quantity:',
-  product: 'Product',
-  gift: 'Gift',
-  total: 'Total:',
-  comment: 'Comments:',
-  pickup: 'You have chosen store delivery',
-  pickupMessage: 'We will notify you by email when your order is available for pick up.',
-  rewardPoints: 'The total {{name}} you will get for your next purchase is {{value}}'
+  premessage: "Order confirmation",
+  premessageReserve: "Order received",
+  messageHeader: "Thank you very much for trusting us. We confirm your order has been processed correctly. Please find your order attached as a PDF file.",
+  messageHeaderReserve: "Thank you very much for trusting us. We have received your order, as we have some products on order we have it pending review.",
+  messageBody1: "Below you will find the order details.",
+  messageBody2: "Thank you for shopping at <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "The {{ecommerceName}} Team",
+  orderNumber: "Order number:",
+  orderDate: "Order date:",
+  paymentSystem: "Payment system:",
+  shippingName: "Shipping method:",
+  address: "Address",
+  addressBilling: "Billing Address",
+  addressShipping: "Shipping Address",
+  orderResume: "Order summary",
+  quantity: "Quantity:",
+  product: "Product",
+  gift: "Gift",
+  total: "Total:",
+  comment: "Comments:",
+  pickup: "You have chosen store delivery",
+  pickupMessage: "We will notify you by email when your order is available for pick up.",
+  rewardPoints: "The total {{ecommerceName}} you will get for your next purchase is {{value}}"
 } %}
 <tr>
   <td style="vertical-align: middle;font-family: sans-serif; padding: 20px" align="center">
@@ -548,9 +552,9 @@ export const LANGUAGE_EN = {
             {% endif %}
           </td>
           <td style="vertical-align: middle; background:#e2e6eb;padding:15px 15px;line-height:20px;font-family: Arial, Helvetica, sans-serif;font-size:14px;color:#454545;padding-right: 40px;" width="50%">
-            
+
             {% if sales.delivery.physicalLocation %}
-              <strong>{{ languageSheet.pickup }}:</strong><br><br>
+              <strong>{{ languageSheet.pickup }}:</strong><br>
               <div style="font-size:13px; display:block;line-height:13px;margin-bottom: 5px;">
                 {{ languageSheet.pickupMessage }}
               </div>
@@ -597,35 +601,85 @@ export const LANGUAGE_EN = {
             </td>
           </tr>
           {% for item in sales.items %}
-            <tr>
-              <td style="text-align: left;font-family:Arial, Helvetica, sans-serif;font-size:14px;border-bottom:1px solid #dcdcdc;">
-                <table style="color: #454545; font-family: sans-serif; font-size: 14px; vertical-align: middle;">
-                  <tbody>
-                    <tr>
-                      <td style="padding: 10px 0px;">
-                        <img src="{{ item.image }}" alt="{{ item.name }}" width="60">
-                      </td>
-                      <td style="padding: 10px 0px;">
-                        <a href="{{ item.link }}" title="{{ item.name }}" target="_blank" rel="noreferrer" style="text-decoration:none;">
-                          <span style="color: #454545; text-decoration: none">{{ item.name }}</b>{% if item.type == "GIFT" %} ({{ languageSheet.gift }}){% endif %}</span>
-                        </a>
-                        {% if item.options|length %}
-                          <div style="font-size: 14px; line-height: 20px; color: #666;">
-                            {% for option in item.options %}
-                              <div>{{ option.name }}: {{ option.value }}</div>
-                            {% endfor %}
-                          </div>
-                          <br>
-                        {% endif %}
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </td>
-              <td style="text-align: center;padding-right:8px;border-bottom:1px solid #dcdcdc;text-align:right;">
-                {{ item.quantity }}
-              </td>
-            </tr>
+            {% if item.type == 'BUNDLE' %}
+              <tr>
+                <td style="text-align: left;font-family:Arial, Helvetica, sans-serif;font-size:14px;">
+                  <table style="color: #454545; font-family: sans-serif; font-size: 14px; vertical-align: middle;">
+                    <tbody>
+                      <tr>
+                        <td style="padding: 10px 0px;">
+                          <b>{{ item.name }}</b>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </td>
+                <td style="text-align: center;padding-right:8px;text-align:right;">
+                  {{ item.quantity }}
+                </td>
+              </tr>
+              {% for bundleItem in item.items %}
+                <tr>
+                  <td style="text-align: left;font-family:Arial, Helvetica, sans-serif;font-size:14px;{% if loop.last %}border-bottom:1px solid #dcdcdc;{% endif %}">
+                    <table style="color: #454545; font-family: sans-serif; font-size: 14px; vertical-align: middle;">
+                      <tbody>
+                        <tr>
+                          <td style="padding: 10px 0px;">
+                            <img src="{{ bundleItem.image }}" alt="{{ bundleItem.name }}" width="60">
+                          </td>
+                          <td style="padding: 10px 0px 0px 10px;">
+                            <a href="{{ bundleItem.link }}" title="{{ bundleItem.name }}" target="_blank" rel="noreferrer" style="text-decoration:none;">
+                              <span style="color: #454545; text-decoration: none">{{ bundleItem.name }}</b></span>
+                            </a>
+                            {% if bundleItem.options|length %}
+                              <div style="font-size: 14px; line-height: 20px; color: #666;">
+                                {% for option in bundleItem.options %}
+                                  <div>{{ option.name }}: {{ option.value }}</div>
+                                {% endfor %}
+                              </div>
+                              <br>
+                            {% endif %}
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </td>
+                  <td style="text-align: center;padding-right:8px;text-align:right;{% if loop.last %}border-bottom:1px solid #dcdcdc;{% endif %}">
+                    &nbsp;
+                  </td>
+                </tr>
+              {% endfor %}
+            {% else %}
+              <tr>
+                <td style="text-align: left;font-family:Arial, Helvetica, sans-serif;font-size:14px;border-bottom:1px solid #dcdcdc;">
+                  <table style="color: #454545; font-family: sans-serif; font-size: 14px; vertical-align: middle;">
+                    <tbody>
+                      <tr>
+                        <td style="padding: 10px 0px;">
+                          <img src="{{ item.image }}" alt="{{ item.name }}" width="60">
+                        </td>
+                        <td style="padding: 10px 0px 0px 10px;">
+                          <a href="{{ item.link }}" title="{{ item.name }}" target="_blank" rel="noreferrer" style="text-decoration:none;">
+                            <span style="color: #454545; text-decoration: none">{{ item.name }}</b>{% if item.type == "GIFT" %} ({{ languageSheet.gift }}){% endif %}</span>
+                          </a>
+                          {% if item.options|length %}
+                            <div style="font-size: 14px; line-height: 20px; color: #666;">
+                              {% for option in item.options %}
+                                <div>{{ option.name }}: {{ option.value }}</div>
+                              {% endfor %}
+                            </div>
+                            <br>
+                          {% endif %}
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </td>
+                <td style="text-align: center;padding-right:8px;border-bottom:1px solid #dcdcdc;text-align:right;">
+                  {{ item.quantity }}
+                </td>
+              </tr>
+            {% endif %}
           {% endfor %}
         </tbody>
       </table>
@@ -680,13 +734,13 @@ export const LANGUAGE_EN = {
                 <div style="padding: 10px 12px;border: 1px solid #dee2e6;">
                   <p style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
                     <strong>{{ rewardPoint.language.name }}</strong><br>
-                    {{ replace(languageSheet.rewardPoints, { '{{name}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
+                    {{ replace(languageSheet.rewardPoints, { '{{ecommerceName}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
                   </p>
                 </div>
               {% endfor %}
             {% endif %}
             <div style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
-              {{ languageSheet.messageBody2 }}<br>{{ languageSheet.messageSignature }}
+              {{ replace(languageSheet.messageBody2, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>{{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
             </div>
           </td>
         </tr>
@@ -694,7 +748,7 @@ export const LANGUAGE_EN = {
     </table>
   </td>
 </tr>
-<tr><td>&nbsp;</td></tr>`,
+<tr><td>&nbsp;</td></tr>`, // end 10
     },
 
     11: {
@@ -720,11 +774,11 @@ export const LANGUAGE_EN = {
       subject: `{{ general.ecommerceName }} - Request for return`,
       html: `
 {% set languageSheet = {
-  premessage: 'Information on the return request',
-  messageHeader: 'Hello ' ~ sales.user.billingAddress.firstName ~ ' ' ~ sales.user.billingAddress.lastName ~ ',',
-  messageBody1: 'Please note that we have received your request for a refund.',
-  messageBody2: 'If you have any questions about your return or any other issue, you can contact us.',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  premessage: "Information on the return request",
+  messageHeader: "Hello {{firstName}} {{lastName}},",
+  messageBody1: "Please note that we have received your request for a refund of your order {{documentNumber}}.",
+  messageBody2: "If you have any questions about your return or any other issue, you can contact us.",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 
 <tr>
@@ -732,9 +786,9 @@ export const LANGUAGE_EN = {
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
       {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageBody1, { '{{documentNumber}}': first(sales.documentParents).documentNumber }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -746,19 +800,19 @@ export const LANGUAGE_EN = {
       html: `
 {% set languageSheet = {
   premessage: "Incomplete order information",
-  messageHeader: 'Hello ' ~ abandonedCart.user.firstName ~ ' ' ~ abandonedCart.user.lastName ~ ',',
-  messageBody1: 'In your last visit to our store %%ecommerceName%% you placed the following item(s) in the shopping cart, but you did not complete the order.',
-  messageBody2: 'Click <a target="_blank" href="' ~ abandonedCart.link ~ '" style="color: #000;">here</a> to recover your cart.',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  messageHeader: "Hello {{ abandonedCart.user.firstName }}  {{ abandonedCart.user.lastName }},",
+  messageBody1: "In your last visit to our store you placed the following item(s) in the shopping cart, but you did not complete the order.",
+  messageBody2: "Click <a target='_blank' href='{{url}}' style='color: #000;'>here</a> to recover your cart.",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': abandonedCart.user.firstName, '{{lastName}}': abandonedCart.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody2, { '{{url}}': abandonedCart.link }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -776,19 +830,19 @@ export const LANGUAGE_EN = {
       html: `
 {% set languageSheet = {
   premessage: "Email verification",
-  messageHeader: 'Hello ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Thanks for registering on ' ~ general.ecommerceUrl ~ '. Please, follow the link in order to verify your e-mail account: <a href="' ~ user.verifyAccountLink ~ '" style="color: #000;">Click here</a>.',
-  messageBody2: "We hope to see you soon in " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  messageHeader: "Hello {{firstName}} {{lastName}} ,",
+  messageBody1: "Thanks for registering on {{ecommerceUrl}}. Please, follow the link in order to verify your e-mail account: <a href='{{verifyAccountLink}}' style='color: #000;'>Click here</a>.",
+  messageBody2: "We hope to see you soon in <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br><br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{verifyAccountLink}}': user.verifyAccountLink }) }}<br><br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -799,22 +853,22 @@ export const LANGUAGE_EN = {
       subject: `{{ general.ecommerceName }} - Account activation`,
       html: `
 {% set languageSheet = {
-  premessage: 'Account activation',
-  messageHeader: 'Hello ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'We are pleased to inform you that your customer account in ' ~ general.ecommerceUrl ~ ' has been successfully activated',
-  messageBody2: 'You can view and modify all your details at any time by accessing this control panel: <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">Edit your profile</a>',
-  messageBody3: "We hope to see you soon in " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  premessage: "Account activation",
+  messageHeader: "Hello {{firstName}} {{lastName}} ,",
+  messageBody1: "We are pleased to inform you that your customer account in {{general.ecommerceUrl}} has been successfully activated",
+  messageBody2: "You can view and modify all your details at any time by accessing this control panel: <a href='{{ecommerceUrl}}' style='color: #000;'>Edit your profile</a>",
+  messageBody3: "We hope to see you soon in <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -831,22 +885,22 @@ export const LANGUAGE_EN = {
       subject: `{{ general.ecommerceName }} - Stock available`,
       html: `
 {% set languageSheet = {
-  premessage: 'Stock available of product <a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Hello ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
+  premessage: "Stock available of product <a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Hello {{firstName}} {{lastName}},",
   messageBody1: "The article that you want so much is already available!",
   messageBody2: "We would like to remind you that this email provides guidance on the availability of this article and depends on many factors (people interested, available units).",
   messageBody3: "We have sent this email to all the customers interested in the article, so it is possible to be exhausted very soon.",
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -875,20 +929,20 @@ export const LANGUAGE_EN = {
       subject: `{{ general.ecommerceName }} - Stock subscription`,
       html: `
 {% set languageSheet = {
-  premessage: 'Stock subscription of product <br><a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Hello ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
-  messageBody1: "You have subscribed to the " ~ stockAlert.product.name ~ " stock notices.",
+  premessage: "Stock subscription of product <br><a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Hello {{firstName}} {{ lastName }},",
+  messageBody1: "You have subscribed to the {{name}} stock notices.",
   messageBody2: "In case we receive this article again we will notify you immediately.",
-  product: 'Product',
-  price: 'Price',
-  messageSignature: 'The ' ~ general.ecommerceName ~ ' Team'
+  product: "Product",
+  price: "Price",
+  messageSignature: "The {{ecommerceName}} Team"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1. { '{{name}}': stockAlert.product.name }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
     </span>
   </td>
@@ -929,7 +983,7 @@ export const LANGUAGE_EN = {
         <tr>
           <td style="text-align: center;">
             <br><br>
-            {{ languageSheet.messageSignature }}
+            {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
           </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
diff --git a/src/app/data/beyond/app-language-es.ts b/src/app/data/beyond/app-language-es.ts
index 070bf64..14e6428 100644
--- a/src/app/data/beyond/app-language-es.ts
+++ b/src/app/data/beyond/app-language-es.ts
@@ -29,7 +29,7 @@ export const LANGUAGE_ES = {
   footer: {
     html: `
 {% set languageSheet = {
-  moreInfo: 'Para obtener más información, lea nuestra <a href="' ~ general.privacyPolicyLink ~ '">política de privacidad</a> y <a href="' ~ general.termsOfUseLink ~ '">términos de uso</a>.'
+  moreInfo: "Para obtener más información, lea nuestra <a href='{{privacyPolicyLink}}'>política de privacidad</a> y <a href='{{termsOfUseLink}}'>términos de uso</a>."
 } %}
         <tr>
           <td bgcolor="#fff" style="background-color: #fff; padding: 20px 20px 20px 20px;">
@@ -94,7 +94,7 @@ export const LANGUAGE_ES = {
               {% endif %}
               <tr>
                 <td align="center" heigth="50" style="font-family: Arial, Helvetica, sans-serif; font-size: 11px; color: #999; height: 20px;">
-                  {{ languageSheet.moreInfo }}
+                  {{ replace(languageSheet.moreInfo, { '{{privacyPolicyLink}}': general.privacyPolicyLink, '{{termsOfUseLink}}': general.termsOfUseLink }) }}
                 </td>
               </tr>
             </table>
@@ -122,22 +122,22 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - Gracias por darte de alta`,
       html: `
 {% set languageSheet = {
-  premessage: '¡Bienvenido/a a ' ~ general.ecommerceName ~ '!',
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Nos complace confirmarte la creación de tu cuenta de cliente en <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageBody2: 'Gracias a tu cuenta de cliente podrás actualizar tu perfil y contraseña, consultar tu historial de pedidos y otra información de tu interés.',
-  messageBody3: "Esperamos verte pronto en " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  premessage: "¡Bienvenido/a a {{ecommerceName}}!",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "Nos complace confirmarte la creación de tu cuenta de cliente en <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageBody2: "Gracias a tu cuenta de cliente podrás actualizar tu perfil y contraseña, consultar tu historial de pedidos y otra información de tu interés.",
+  messageBody3: "Esperamos verte pronto en <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{ecommerceName}}': general.ecommerceName }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -148,18 +148,18 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - Baja de usuario`,
       html: `
 {% set languageSheet = {
-  premessage: 'Confirmación de cuenta eliminada',
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody: 'Conforme a lo solicitado durante tu reciente visita a ' ~ general.ecommerceName ~ ", confirmamos que tu cuenta de usuario " ~ user.email ~ " ha sido eliminada de nuestra base de datos.",
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  premessage: "Confirmación de cuenta eliminada",
+  messageHeader: "Hola {{firstName}} {{lastName}},"
+  messageBody: "Conforme a lo solicitado durante tu reciente visita a {{ecommerceName}}, confirmamos que tu cuenta de usuario {{email}} ha sido eliminada de nuestra base de datos.",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{userEmail}}': user.email }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -170,24 +170,24 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - Recordar contraseña`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recordar contraseña',
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: "Conforme a lo solicitado durante tu reciente visita a " ~ general.ecommerceName ~ ", aquí tienes tu dirección de acceso a la zona de recuperación de contraseña:",
-  messageBody2: '<a href="' ~ user.lostPasswordLink ~ '" style="color:#000">Click aquí para recuperar contraseña</a>',
-  messageBody3: 'Este enlace solamente será válido durante las 24 horas siguientes al momento de su envío.',
-  messageBody4: "Esperamos verte pronto en " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  premessage: "Recordar contraseña",
+  messageHeader: "Hola {{firstName}} {{lastName}},"
+  messageBody1: "Conforme a lo solicitado durante tu reciente visita a {{ecommerceName}}, aquí tienes tu dirección de acceso a la zona de recuperación de contraseña:",
+  messageBody2: "<a href='{{lostPasswordLink}}' style='color:#000'>Click aquí para recuperar contraseña</a>",
+  messageBody3: "Este enlace solamente será válido durante las 24 horas siguientes al momento de su envío.",
+  messageBody4: "Esperamos verte pronto en <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceName}}': general.ecommerceName }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{lostPasswordLink}}': user.lostPasswordLink }) }}<br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageBody4 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody4, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -198,22 +198,22 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - Cambio de contraseña`,
       html: `
 {% set languageSheet = {
-  premessage: 'Cambio de contraseña',
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Te confirmamos que tu contraseña ha sido modificada.',
+  premessage: "Cambio de contraseña",
+  messageHeader: "Hola {{firstName}} {{lastName}},"
+  messageBody1: "Te confirmamos que tu contraseña ha sido modificada.",
   messageBody2: "Asegúrate de anotar tus credenciales en un lugar seguro para futuras referencias.",
-  messageBody3: "Esperamos verte pronto en " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  messageBody3: "Esperamos verte pronto en <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>."
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -230,24 +230,24 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - {{ wishlist.user.name }} te recomienda sus productos favoritos`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recomendación de favoritos',
-  messageHeader1: 'Hola ' ~ wishlist.toName ~ ',',
-  messageHeader2: "Tu amigo/a " ~ wishlist.user.firstName ~ " " ~ wishlist.user.lastName ~ " (" ~ wishlist.user.email ~ ") te envía estos productos que pueden resultarte de interés.",
-  messageBody: 'Si necesitas más información acerca de este producto puedes contactar con nosotros en <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName,
-  recommendedProducts: 'Productos recomendados',
-  product: 'Producto',
-  price: 'Precio',
-  comments: 'Mensaje de tu amigo/a:'
+  premessage: "Recomendación de favoritos",
+  messageHeader1: "Hola {{toName}},",
+  messageHeader2: "Tu amigo/a {{firstName}} {{lastName}} ({{email}}) te envía estos productos que pueden resultarte de interés.",
+  messageBody: "Si necesitas más información acerca de este producto puedes contactar con nosotros en <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}",
+  recommendedProducts: "Productos recomendados",
+  product: "Producto",
+  price: "Precio",
+  comments: "Mensaje de tu amigo/a:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageHeader2 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{toName}}': wishlist.toName }) }}<br><br>
+      {{ replace(languageSheet.messageHeader2, { '{{firstName}}': wishlist.user.firstName, '{{lastName}}': wishlist.user.lastName, '{{email}}': wishlist.user.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -281,9 +281,13 @@ export const LANGUAGE_ES = {
                         </tr>
                       </table>
                     </td>
-                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;"><span><span>
-                      {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
-                    </span></span></td>
+                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;">
+                      <span>
+                        <span>
+                          {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
+                        </span>
+                      </span>
+                    </td>
                   </tr>
                   {% endfor %}
                 </tbody>
@@ -316,22 +320,22 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - {{ recommend.name }} te recomienda un producto`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recomendación de producto',
-  messageHeader1: "Tu amigo/a " ~ recommend.name ~ " (" ~ recommend.email ~ ") te envía este producto que puede resultarte de interés.",
-  messageBody: 'Si necesitas más información acerca de este producto puedes contactar con nosotros en <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName,
-  recommendedProducts: 'Productos recomendados',
-  product: 'Producto',
-  price: 'Precio',
-  comments: 'Mensaje de tu amigo/a:'
+  premessage: "Recomendación de producto",
+  messageHeader1: "Tu amigo/a {{name}} ({{email}}) te envía este producto que puede resultarte de interés.",
+  messageBody: "Si necesitas más información acerca de este producto puedes contactar con nosotros en <a href='{{ecommerceUrl}}' style='color: #000;'>"{{ecommerceName}}"</a>",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}",
+  recommendedProducts: "Productos recomendados",
+  product: "Producto",
+  price: "Precio",
+  comments: "Mensaje de tu amigo/a:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{name}}': recommend.name, '{{email}}': recommend.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -397,12 +401,12 @@ export const LANGUAGE_ES = {
       html: `
 {% set languageSheet = {
   premessage: 'Formulario de contacto',
-  name: 'Nombre:',
-  email: 'Email:',
-  phone: 'Teléfono:',
-  motive: 'Motivo de consulta:',
-  comments: 'Mensaje:',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  name: "Nombre:",
+  email: "Email:",
+  phone: "Teléfono:",
+  motive: "Motivo de consulta:",
+  comments: "Mensaje:",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -424,7 +428,7 @@ export const LANGUAGE_ES = {
         {{ languageSheet.comments }} {{ contact.comments }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -436,13 +440,13 @@ export const LANGUAGE_ES = {
       html: `
 {% set languageSheet = {
   premessage: 'Consulta sobre producto',
-  name: 'Nombre:',
-  email: 'Email:',
-  phone: 'Teléfono:',
-  comments: 'Mensaje:',
-  productName: 'Nombre de producto:',
-  productSku: 'Referencia de producto:',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  name: "Nombre:",
+  email: "Email:",
+  phone: "Teléfono:",
+  comments: "Mensaje:",
+  productName: "Nombre de producto:",
+  productSku: "Referencia de producto:",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -467,7 +471,7 @@ export const LANGUAGE_ES = {
         {{ languageSheet.productSku }} {{ data.product.sku }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -478,29 +482,29 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - {{ (sales.reserve) ? (\'Pedido recibido\') : (\'Confirmación de pedido\') }} {{ sales.documentNumber }}`,
       html: `
 {% set languageSheet = {
-  premessage: 'Confirmación de pedido',
-  premessageReserve: 'Pedido recibido',
-  messageHeader: 'Muchas gracias por confiar en nosotros. Su compra ha sido procesada correctamente. Podrás encontrar este pedido en el archivo PDF adjunto.',
-  messageHeaderReserve: 'Muchas gracias por confiar en nosotros. Hemos recibido tu pedido, al tener algún producto por encargo lo tenemos pendiente de revisión.',
-  messageBody1: 'A continuación te mostramos los datos del pedido.',
-  messageBody2: 'Gracias por comprar en <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName,
-  orderNumber: 'Número:',
-  orderDate: 'Fecha:',
-  paymentSystem: 'Método de pago:',
-  shippingName: 'Método de envío:',
-  address: 'Dirección',
-  addressBilling: 'Dirección Facturación',
-  addressShipping: 'Dirección Envío',
-  orderResume: 'Resumen del pedido',
-  quantity: 'Cantidad',
-  product: 'Producto',
-  gift: 'Regalo',
-  total: 'Total:',
-  comment: 'Comentarios:',
-  pickup: 'Has elegido entrega en tienda',
-  pickupMessage: 'Te avisaremos por mail cuando tu pedido esté disponible para recoger.',
-  rewardPoints: 'El total de {{name}} que obtendrás para tu próxima compra es de {{value}}'
+  premessage: "Confirmación de pedido",
+  premessageReserve: "Pedido recibido",
+  messageHeader: "Muchas gracias por confiar en nosotros. Su compra ha sido procesada correctamente. Podrás encontrar este pedido en el archivo PDF adjunto.",
+  messageHeaderReserve: "Muchas gracias por confiar en nosotros. Hemos recibido tu pedido, al tener algún producto por encargo lo tenemos pendiente de revisión.",
+  messageBody1: "A continuación te mostramos los datos del pedido.",
+  messageBody2: "Gracias por comprar en <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}",
+  orderNumber: "Número:",
+  orderDate: "Fecha:",
+  paymentSystem: "Método de pago:",
+  shippingName: "Método de envío:",
+  address: "Dirección",
+  addressBilling: "Dirección Facturación",
+  addressShipping: "Dirección Envío",
+  orderResume: "Resumen del pedido",
+  quantity: "Cantidad",
+  product: "Producto",
+  gift: "Regalo",
+  total: "Total:",
+  comment: "Comentarios:",
+  pickup: "Has elegido entrega en tienda",
+  pickupMessage: "Te avisaremos por mail cuando tu pedido esté disponible para recoger.",
+  rewardPoints: "El total de {{ecommerceName}} que obtendrás para tu próxima compra es de {{value}}"
 } %}
 <tr>
   <td style="vertical-align: middle;font-family: sans-serif; padding: 20px" align="center">
@@ -695,6 +699,7 @@ export const LANGUAGE_ES = {
   </td>
 </tr>
 <tr><td>&nbsp;</td></tr>
+
 {% if sales.reserve %}
   {# do nothing #}
 {% else %}
@@ -729,13 +734,13 @@ export const LANGUAGE_ES = {
                 <div style="padding: 10px 12px;border: 1px solid #dee2e6;">
                   <p style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
                     <strong>{{ rewardPoint.language.name }}</strong><br>
-                    {{ replace(languageSheet.rewardPoints, { '{{name}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
+                    {{ replace(languageSheet.rewardPoints, { '{{ecommerceName}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
                   </p>
                 </div>
               {% endfor %}
             {% endif %}
             <div style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
-              {{ languageSheet.messageBody2 }}<br>{{ languageSheet.messageSignature }}
+              {{ replace(languageSheet.messageBody2, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>{{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
             </div>
           </td>
         </tr>
@@ -769,11 +774,11 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - Petición de devolución`,
       html: `
 {% set languageSheet = {
-  premessage: 'Información de la petición de devolución',
-  messageHeader: 'Hola ' ~ sales.user.billingAddress.firstName ~ ' ' ~ sales.user.billingAddress.lastName ~ ',',
-  messageBody1: 'Te informamos que hemos recibido tu petición de devolución.',
-  messageBody2: 'Si tienes alguna duda sobre tu devolución o alguna otra cuestión, puedes ponerte en contacto con nosotros.',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  premessage: "Información de la petición de devolución",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "Te informamos que hemos recibido tu petición de devolución del pedido {{documentNumber}}.",
+  messageBody2: "Si tienes alguna duda sobre tu devolución o alguna otra cuestión, puedes ponerte en contacto con nosotros.",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 
 <tr>
@@ -781,9 +786,9 @@ export const LANGUAGE_ES = {
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
       {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageBody1, { '{{documentNumber}}': first(sales.documentParents).documentNumber }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -795,19 +800,19 @@ export const LANGUAGE_ES = {
       html: `
 {% set languageSheet = {
   premessage: "Información del pedido incompleto",
-  messageHeader: 'Hola ' ~ abandonedCart.user.firstName ~ ' ' ~ abandonedCart.user.lastName ~ ',',
-  messageBody1: 'En tu última visita a nuestra tienda, añadiste los siguientes productos al carro de la compra, pero no completaste el pedido.',
-  messageBody2: 'Haz clic <a target="_blank" href="' ~ abandonedCart.link ~ '" style="color: #000;">aquí</a> si deseas recuperar tu pedido.',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "En tu última visita a nuestra tienda, añadiste los siguientes productos al carro de la compra, pero no completaste el pedido.",
+  messageBody2: "Haz clic <a target='_blank' href='{{link}}' style='color: #000;'>aquí</a> si deseas recuperar tu pedido.",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': abandonedCart.user.firstName, '{{lastName}}': abandonedCart.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody2, { '{{url}}': abandonedCart.link }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -825,19 +830,19 @@ export const LANGUAGE_ES = {
       html: `
 {% set languageSheet = {
   premessage: "Verificación de correo",
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Gracias por registrarte en ' ~ general.ecommerceUrl ~ '. Por favor activa tu cuenta clicando <a href="' ~ user.verifyAccountLink ~ '" style="color: #000;">aquí</a>.',
-  messageBody2: "Esperamos verte pronto en " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  messageHeader: "Hola {{firstName}} {{lastName}},"
+  messageBody1: "Gracias por registrarte en {{ecommerceUrl}}. Por favor activa tu cuenta clicando <a href='{{verifyAccountLink}}' style='color: #000;'>aquí</a>.",
+  messageBody2: "Esperamos verte pronto en <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br><br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{verifyAccountLink}}': user.verifyAccountLink }) }}<br><br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -848,22 +853,22 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - Activación de cuenta`,
       html: `
 {% set languageSheet = {
-  premessage: 'Activación de cuenta',
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Te notificamos que tu cuenta en ' ~ general.ecommerceUrl ~ ' ha sido activada correctamente.',
-  messageBody2: 'Para ver tus datos y toda la información referente a tu cuenta accede a través del panel de control: <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">Editar tu perfil</a>',
-  messageBody3: "Esperamos verte pronto en " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  premessage: "Activación de cuenta",
+  messageHeader: "Hola {{firstName}} {{lastName}},"
+  messageBody1: "Te notificamos que tu cuenta en {{ecommerceUrl}} ha sido activada correctamente.",
+  messageBody2: "Para ver tus datos y toda la información referente a tu cuenta accede a través del panel de control: <a href='{{ecommerceUrl}}' style='color: #000;'>Editar tu perfil</a>",
+  messageBody3: "Esperamos verte pronto en <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -880,22 +885,22 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - Stock disponible`,
       html: `
 {% set languageSheet = {
-  premessage: 'Stock disponible del producto <a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Hola ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
+  premessage: "Stock disponible del producto <a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
   messageBody1: "¡El artículo que tanto querías ya está disponible!",
   messageBody2: "Queremos recordarte que este email aporta información orientativa sobre la disponibilidad de este artículo y depende de muchos factores (personas interesadas, unidades disponibles).",
   messageBody3: "Hemos enviado este email a todos los clientes interesados en este artículo, por lo que es posible que se agote muy pronto.",
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -918,28 +923,27 @@ export const LANGUAGE_ES = {
       subject: `¡Bienvenido a  {{ blogSubscription.blogName }}!`,
       html: `
 {% set languageSheet = {
-  premessage: '¡Bienvenido/a a ' ~ '<a href="' ~ blogSubscription.blogLink ~ '" style="color: #000;">' ~ blogSubscription.blogName ~ '</a>!',
-
-  messageHeader: 'Hola ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Gracias por suscribirte a nuestro blog. Pronto recibirás los nuevos artículos por email, información sobre descuentos, promociones, regalos y datos de interés relativos a la actividad de la tienda online.',
-  messageBody2: "Esperamos verte pronto en " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  premessage: "¡Bienvenido/a a <a href='{{blogLink}}' style='color: #000;'>{{blogName}}</a>!",
+  messageHeader: "Hola {{firstName}} {{lastName}},"
+  messageBody1: "Gracias por suscribirte a nuestro blog. Pronto recibirás los nuevos artículos por email, información sobre descuentos, promociones, regalos y datos de interés relativos a la actividad de la tienda online.",
+  messageBody2: "Esperamos verte pronto en <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{blogLink}}': blogSubscription.blogLink, '{{blogName}}': blogSubscription.blogName }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
       footer: {
         html: `
 {% set languageSheet = {
-  moreInfo: 'Para obtener más información, lea nuestra <a href="' ~ general.privacyPolicyLink ~ '">política de privacidad</a> y <a href="' ~ general.termsOfUseLink ~ '">términos de uso</a>.',
+  moreInfo: 'Para obtener más información, lea nuestra <a href="{{privacyPolicyLink}}">política de privacidad</a> y <a href="{{termsOfUseLink}}">términos de uso</a>.',
   unsubscribe: 'Darse de baja de la suscripción del Blog'
 } %}
         <tr>
@@ -1005,7 +1009,7 @@ export const LANGUAGE_ES = {
               {% endif %}
               <tr>
                 <td align="center" heigth="50" style="font-family: Arial, Helvetica, sans-serif; font-size: 11px; color: #999; height: 20px;">
-                  {{ languageSheet.moreInfo }}
+                  {{ replace(languageSheet.moreInfo, { '{{privacyPolicyLink}}': general.privacyPolicyLink, '{{termsOfUseLink}}': general.termsOfUseLink }) }}
                 </td>
               </tr>
             </table>
@@ -1043,20 +1047,20 @@ export const LANGUAGE_ES = {
       subject: `{{ general.ecommerceName }} - Subscripción de stock`,
       html: `
 {% set languageSheet = {
-  premessage: 'Suscripción de stock del producto <br><a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Hola ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
-  messageBody1: "Te has suscrito a los avisos de stock de " ~ stockAlert.product.name,
+  premessage: "Suscripción de stock del producto <br><a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Hola {{firstName}} {{lastName}},",
+  messageBody1: "Te has suscrito a los avisos de stock de {{name}}",
   messageBody2: "En caso de que volvamos a recibir este artículo te avisaremos de inmediato para que no se te escape.",
-  product: 'Producto',
-  price: 'Precio',
-  messageSignature: 'Atentamente, el equipo de ' ~ general.ecommerceName
+  product: "Producto",
+  price: "Precio",
+  messageSignature: "Atentamente, el equipo de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1. { '{{name}}': stockAlert.product.name }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
     </span>
   </td>
@@ -1097,7 +1101,7 @@ export const LANGUAGE_ES = {
         <tr>
           <td style="text-align: center;">
             <br><br>
-            {{ languageSheet.messageSignature }}
+            {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
           </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
diff --git a/src/app/data/beyond/app-language-fr.ts b/src/app/data/beyond/app-language-fr.ts
index 956ff73..4800b6c 100644
--- a/src/app/data/beyond/app-language-fr.ts
+++ b/src/app/data/beyond/app-language-fr.ts
@@ -29,7 +29,7 @@ export const LANGUAGE_FR = {
   footer: {
     html: `
 {% set languageSheet = {
-  moreInfo: 'Pour plus d\\'informations, lisez notre <a href="' ~ general.privacyPolicyLink ~ '">politique de confidentialité</a> y <a href="' ~ general.termsOfUseLink ~ '">conditions d\\'utilisation</a>.'
+  moreInfo: "Pour plus d'informations, lisez notre <a href='{{privacyPolicyLink}}'>politique de confidentialité</a> y <a href='{{termsOfUseLink}}'>conditions d'utilisation</a>."
 } %}
         <tr>
           <td bgcolor="#fff" style="background-color: #fff; padding: 20px 20px 20px 20px;">
@@ -94,7 +94,7 @@ export const LANGUAGE_FR = {
               {% endif %}
               <tr>
                 <td align="center" heigth="50" style="font-family: Arial, Helvetica, sans-serif; font-size: 11px; color: #999; height: 20px;">
-                  {{ languageSheet.moreInfo }}
+                  {{ replace(languageSheet.moreInfo, { '{{privacyPolicyLink}}': general.privacyPolicyLink, '{{termsOfUseLink}}': general.termsOfUseLink }) }}
                 </td>
               </tr>
             </table>
@@ -122,22 +122,22 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - Merci de vous inscrire`,
       html: `
 {% set languageSheet = {
-  premessage: 'Bienvenue à ' ~ general.ecommerceName,
-  messageHeader: 'Bonjour ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Nous avons le plaisir de vous confirmer la création de votre compte client chez <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageBody2: 'Grâce à votre compte client, vous pourrez mettre à jour votre profil et votre mot de passe, consulter l\\'historique de vos commandes et d\\'autres informations qui vous intéressent.',
-  messageBody3: "Nous espérons vous voir bientôt à " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  premessage: "Bienvenue à {{ecommerceName}}",
+  messageHeader: "Bonjour {{firstName}} {{lastName}},",
+  messageBody1: "Nous avons le plaisir de vous confirmer la création de votre compte client chez <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageBody2: "Grâce à votre compte client, vous pourrez mettre à jour votre profil et votre mot de passe, consulter l'historique de vos commandes et d'autres informations qui vous intéressent.",
+  messageBody3: "Nous espérons vous voir bientôt à <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{ecommerceName}}': general.ecommerceName }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -148,18 +148,18 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - Désinscription de l\\'utilisateur`,
       html: `
 {% set languageSheet = {
-  premessage: 'Confirmation de la suppression du compte',
-  messageHeader: 'Bonjour ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody: 'Comme demandé lors de votre récente visite à ' ~ general.ecommerceName ~ ", nous confirmons que votre compte utilisateur " ~ user.email ~ " a été supprimé de notre base de données.",
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  premessage: "Confirmation de la suppression du compte",
+  messageHeader: "Bonjour {{firstName}} {{lastName}},",
+  messageBody: "Comme demandé lors de votre récente visite à {{ecommerceName}}, nous confirmons que votre compte utilisateur {{email}} a été supprimé de notre base de données.",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{userEmail}}': user.email }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -170,24 +170,24 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - Mémoriser le mot de passe`,
       html: `
 {% set languageSheet = {
-  premessage: 'Mémoriser le mot de passe',
-  messageHeader: 'Bonjour ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: "Comme demandé lors de votre récente visite à " ~ general.ecommerceName ~ ", voici votre adresse d\\'accès à la zone de récupération du mot de passe :",
-  messageBody2: '<a href="' ~ user.lostPasswordLink ~ '" style="color:#000">Cliquez ici pour récupérer le mot de passe</a>',
-  messageBody3: 'Ce lien ne sera valable que pendant 24 heures à compter de son envoi.',
-  messageBody4: "Nous espérons vous voir bientôt à " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  premessage: "Mémoriser le mot de passe",
+  messageHeader: "Bonjour {{firstName}} {{lastName}},",
+  messageBody1: "Comme demandé lors de votre récente visite à {{ecommerceName}}, voici votre adresse d'accès à la zone de récupération du mot de passe :",
+  messageBody2: "<a href='{{lostPasswordLink}}' style='color:#000'>Cliquez ici pour récupérer le mot de passe</a>",
+  messageBody3: "Ce lien ne sera valable que pendant 24 heures à compter de son envoi.",
+  messageBody4: "Nous espérons vous voir bientôt à <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceName}}': general.ecommerceName }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{lostPasswordLink}}': user.lostPasswordLink }) }}<br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageBody4 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody4, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -198,22 +198,22 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - Changement de mot de passe`,
       html: `
 {% set languageSheet = {
-  premessage: 'Changement de mot de passe',
-  messageHeader: 'Bonjour ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Nous confirmons que votre mot de passe a été modifié.',
-  messageBody2: "N\\'oubliez pas de noter vos références dans un endroit sûr pour pouvoir les consulter ultérieurement.",
-  messageBody3: "Nous espérons vous voir bientôt à " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  premessage: "Changement de mot de passe",
+  messageHeader: "Bonjour {{firstName}} {{lastName}},",
+  messageBody1: "Nous confirmons que votre mot de passe a été modifié.",
+  messageBody2: "N'oubliez pas de noter vos références dans un endroit sûr pour pouvoir les consulter ultérieurement.",
+  messageBody3: "Nous espérons vous voir bientôt à <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -230,24 +230,24 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - {{ wishlist.user.name }} il recommande ses produits préférés`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recommandation de favoris',
-  messageHeader1: 'Bonjour ' ~ wishlist.toName ~ ',',
-  messageHeader2: "Votre ami " ~ wishlist.user.firstName ~ " " ~ wishlist.user.lastName ~ " (" ~ wishlist.user.email ~ ") vous envoie ces produits qui peuvent vous intéresser.",
-  messageBody: 'Si vous avez besoin de plus d\\'informations sur ce produit, vous pouvez nous contacter à l\\'adresse suivante <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName,
-  recommendedProducts: 'Produits recommandés',
-  product: 'Produit',
-  price: 'Prix',
-  comments: 'Message de votre ami:'
+  premessage: "Recommandation de favoris",
+  messageHeader1: "Bonjour {{toName}},",
+  messageHeader2: "Votre ami {{firstName}} {{lastName}} ({{email}}) vous envoie ces produits qui peuvent vous intéresser.",
+  messageBody: "Si vous avez besoin de plus d'informations sur ce produit, vous pouvez nous contacter à l'adresse suivante <a href='{{ecommerceUrl}}' style='color: #000;'>'{{ecommerceName}}'</a>",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}",
+  recommendedProducts: "Produits recommandés",
+  product: "Produit",
+  price: "Prix",
+  comments: "Message de votre ami:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageHeader2 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{toName}}': wishlist.toName }) }}<br><br>
+      {{ replace(languageSheet.messageHeader2, { '{{firstName}}': wishlist.user.firstName, '{{lastName}}': wishlist.user.lastName, '{{email}}': wishlist.user.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -281,9 +281,13 @@ export const LANGUAGE_FR = {
                         </tr>
                       </table>
                     </td>
-                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;"><span><span>
-                      {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
-                    </span></span></td>
+                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;">
+                      <span>
+                        <span>
+                          {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
+                        </span>
+                      </span>
+                    </td>
                   </tr>
                   {% endfor %}
                 </tbody>
@@ -316,22 +320,22 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - {{ recommend.name }} recommande un produit`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recommandation de produit',
-  messageHeader1: "Votre ami " ~ recommend.name ~ " (" ~ recommend.email ~ ") vous envoie ce produit qui pourrait vous intéresser.",
-  messageBody: 'Si vous avez besoin de plus d\\'informations sur ce produit, vous pouvez nous contacter à l\\'adresse suivante <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName,
-  recommendedProducts: 'Produits recommandés',
-  product: 'Produit',
-  price: 'Prix',
-  comments: 'Message de votre ami:'
+  premessage: "Recommandation de produit",
+  messageHeader1: "Votre ami {{name}} ({{email}}) vous envoie ce produit qui pourrait vous intéresser.",
+  messageBody: "Si vous avez besoin de plus d'informations sur ce produit, vous pouvez nous contacter à l'adresse suivante <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}",
+  recommendedProducts: "Produits recommandés",
+  product: "Produit",
+  price: "Prix",
+  comments: "Message de votre ami:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{name}}': recommend.name, '{{email}}': recommend.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -396,13 +400,13 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - Formulaire de contact`,
       html: `
 {% set languageSheet = {
-  premessage: 'Formulaire de contact',
-  name: 'Nom:',
-  email: 'Email:',
-  phone: 'Téléphone:',
-  motive: 'Motif de la consultation :',
-  comments: 'Message :',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  premessage: "Formulaire de contact",
+  name: "Nom:",
+  email: "Email:",
+  phone: "Téléphone:",
+  motive: "Motif de la consultation :",
+  comments: "Message :",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -424,7 +428,7 @@ export const LANGUAGE_FR = {
         {{ languageSheet.comments }} {{ contact.comments }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -436,13 +440,13 @@ export const LANGUAGE_FR = {
       html: `
 {% set languageSheet = {
   premessage: 'Demande de renseignements sur le produit',
-  name: 'Nom:',
-  email: 'Email:',
-  phone: 'Téléphone:',
-  comments: 'Mensaje:',
-  productName: 'Nom du produit:',
-  productSku: 'Référence du produit:',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  name: "Nom:",
+  email: "Email:",
+  phone: "Téléphone:",
+  comments: "Message :",
+  productName: "Nom du produit:",
+  productSku: "Référence du produit:",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -467,7 +471,7 @@ export const LANGUAGE_FR = {
         {{ languageSheet.productSku }} {{ data.product.sku }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -478,29 +482,29 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - {{ (sales.reserve) ? ('Commande reçue') : ('Confirmation de la commande') }} {{ sales.documentNumber }}`,
       html: `
 {% set languageSheet = {
-  premessage: 'Confirmation de la commande',
-  premessageReserve: 'Commande reçue',
-  messageHeader: 'Merci beaucoup de nous faire confiance. Votre achat a été traité correctement. Vous trouverez cet arrêté dans le fichier PDF ci-joint.',
-  messageHeaderReserve: 'Merci beaucoup de nous faire confiance. Nous avons reçu votre commande, comme nous avons quelques produits en commande nous l\\'avons en attente de révision.',
-  messageBody1: 'Vous trouverez ci-dessous les détails de la commande.',
-  messageBody2: 'Merci de faire vos achats chez <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName,
-  orderNumber: 'Numéro de commande:',
-  orderDate: 'Date de la commande:',
-  paymentSystem: 'Mode de paiement:',
-  shippingName: 'Méthode d\\'expédition:',
-  address: 'Adresse',
-  addressBilling: 'Adresse de facturation',
-  addressShipping: 'Adresse de livraison',
-  orderResume: 'Résumé de la commande',
-  quantity: 'Quantité:',
-  product: 'Produit',
-  gift: 'Cadeau',
-  total: 'Total:',
-  comment: 'Commentaires:',
-  pickup: 'Vous avez choisi la livraison en magasin',
-  pickupMessage: 'Nous vous informerons par e-mail lorsque votre commande sera disponible pour la collecte.',
-  rewardPoints: 'Le total de {{name}} obtenus pour votre prochaine commande est de {{value}}'
+  premessage: "Confirmation de la commande",
+  premessageReserve: "Commande reçue",
+  messageHeader: "Merci beaucoup de nous faire confiance. Votre achat a été traité correctement. Vous trouverez cet arrêté dans le fichier PDF ci-joint.",
+  messageHeaderReserve: "Merci beaucoup de nous faire confiance. Nous avons reçu votre commande, comme nous avons quelques produits en commande nous l'avons en attente de révision.",
+  messageBody1: "Vous trouverez ci-dessous les détails de la commande.",
+  messageBody2: "Merci de faire vos achats chez <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}",
+  orderNumber: "Numéro de commande:",
+  orderDate: "Date de la commande:",
+  paymentSystem: "Mode de paiement:",
+  shippingName: "Méthode d'expédition:",
+  address: "Adresse",
+  addressBilling: "Adresse de facturation",
+  addressShipping: "Adresse de livraison",
+  orderResume: "Résumé de la commande",
+  quantity: "Quantité:",
+  product: "Produit",
+  gift: "Cadeau",
+  total: "Total:",
+  comment: "Commentaires:",
+  pickup: "Vous avez choisi la livraison en magasin",
+  pickupMessage: "Nous vous informerons par e-mail lorsque votre commande sera disponible pour la collecte.",
+  rewardPoints: "Le total de {{ecommerceName}} obtenus pour votre prochaine commande est de {{value}}"
 } %}
 <tr>
   <td style="vertical-align: middle;font-family: sans-serif; padding: 20px" align="center">
@@ -730,13 +734,13 @@ export const LANGUAGE_FR = {
                 <div style="padding: 10px 12px;border: 1px solid #dee2e6;">
                   <p style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
                     <strong>{{ rewardPoint.language.name }}</strong><br>
-                    {{ replace(languageSheet.rewardPoints, { '{{name}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
+                    {{ replace(languageSheet.rewardPoints, { '{{ecommerceName}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
                   </p>
                 </div>
               {% endfor %}
             {% endif %}
             <div style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
-              {{ languageSheet.messageBody2 }}<br>{{ languageSheet.messageSignature }}
+              {{ replace(languageSheet.messageBody2, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>{{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
             </div>
           </td>
         </tr>
@@ -770,11 +774,11 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - Demande de retour`,
       html: `
 {% set languageSheet = {
-  premessage: 'Informations sur la demande de retour',
-  messageHeader: 'Bonjour ' ~ sales.user.billingAddress.firstName ~ ' ' ~ sales.user.billingAddress.lastName ~ ',',
-  messageBody1: 'Veuillez noter que nous avons reçu votre demande de remboursement.',
-  messageBody2: 'Si vous avez des questions concernant votre retour ou tout autre problème, vous pouvez nous contacter.',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  premessage: "Informations sur la demande de retour",
+  messageHeader: "Bonjour {{firstName}} {{lastName}},",
+  messageBody1: "Veuillez noter que nous avons reçu votre demande de remboursement de la commande {{documentNumber}}.",
+  messageBody2: "Si vous avez des questions concernant votre retour ou tout autre problème, vous pouvez nous contacter.",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 
 <tr>
@@ -782,9 +786,9 @@ export const LANGUAGE_FR = {
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
       {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageBody1, { '{{documentNumber}}': first(sales.documentParents).documentNumber }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -796,19 +800,19 @@ export const LANGUAGE_FR = {
       html: `
 {% set languageSheet = {
   premessage: "Informations incomplètes sur la commande",
-  messageHeader: 'Bonjour ' ~ abandonedCart.user.firstName ~ ' ' ~ abandonedCart.user.lastName ~ ',',
-  messageBody1: 'Lors de votre dernière visite dans notre boutique, vous avez ajouté les produits suivants à votre panier, mais n\\'avez pas terminé votre commande.',
-  messageBody2: 'Cliquez <a target="_blank" href="' ~ abandonedCart.link ~ '" style="color: #000;">ici</a> si vous souhaitez récupérer votre commande.',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  messageHeader: "Bonjour {{firstName}} {{lastName}},",
+  messageBody1: "Lors de votre dernière visite dans notre boutique, vous avez ajouté les produits suivants à votre panier, mais n'avez pas terminé votre commande.",
+  messageBody2: "Cliquez <a target='_blank' href='{{link}}' style='color: #000;'>ici</a> si vous souhaitez récupérer votre commande.",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': abandonedCart.user.firstName, '{{lastName}}': abandonedCart.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody2, { '{{url}}': abandonedCart.link }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -826,19 +830,19 @@ export const LANGUAGE_FR = {
       html: `
 {% set languageSheet = {
   premessage: "Vérification du courrier",
-  messageHeader: 'Bonjour ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Merci de vous inscrire à ' ~ general.ecommerceUrl ~ '. Veuillez activer votre compte en cliquant sur <a href="' ~ user.verifyAccountLink ~ '" style="color: #000;">ici</a>.',
-  messageBody2: "Nous espérons vous voir bientôt à " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  messageHeader: "Bonjour {{firstName}} {{lastName}},",
+  messageBody1: "Merci de vous inscrire à {{ecommerceUrl}}. Veuillez activer votre compte en cliquant sur <a href='{{verifyAccountLink}}' style='color: #000;'>ici</a>.",
+  messageBody2: "Nous espérons vous voir bientôt à <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br><br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{verifyAccountLink}}': user.verifyAccountLink }) }}<br><br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -849,22 +853,22 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - Activation du compte`,
       html: `
 {% set languageSheet = {
-  premessage: 'Activation du compte',
-  messageHeader: 'Bonjour ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Nous vous informons que votre compte en ' ~ general.ecommerceUrl ~ ' a été activé correctement.',
-  messageBody2: 'Pour voir vos coordonnées et toutes les informations relatives à votre compte, connectez-vous via le panneau de contrôle: <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">Modifier votre profil</a>',
-  messageBody3: "Nous espérons vous voir bientôt à " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  premessage: "Activation du compte",
+  messageHeader: "Bonjour {{firstName}} {{lastName}},",
+  messageBody1: "Nous vous informons que votre compte en {{ecommerceUrl}} a été activé correctement.",
+  messageBody2: "Pour voir vos coordonnées et toutes les informations relatives à votre compte, connectez-vous via le panneau de contrôle: <a href='{{ecommerceUrl}}' style='color: #000;'>Modifier votre profil</a>",
+  messageBody3: "Nous espérons vous voir bientôt à <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -881,22 +885,22 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - Stock en main`,
       html: `
 {% set languageSheet = {
-  premessage: 'Produit en stock <a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Bonjour ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
-  messageBody1: "L\\'article que vous vouliez tant est maintenant disponible!",
+  premessage: "Produit en stock <a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Bonjour {{firstName}} {{lastName}} ,",
+  messageBody1: "L'article que vous vouliez tant est maintenant disponible!",
   messageBody2: "Nous vous rappelons que cet e-mail fournit des informations indicatives sur la disponibilité de cet article et dépend de nombreux facteurs (personnes intéressées, unités disponibles).",
   messageBody3: "Nous avons envoyé cet e-mail à tous les clients intéressés par cet article, qui pourrait donc être épuisé très prochainement.",
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -925,20 +929,20 @@ export const LANGUAGE_FR = {
       subject: `{{ general.ecommerceName }} - Souscription d\\'actions`,
       html: `
 {% set languageSheet = {
-  premessage: 'Abonnement au stock de produits <br><a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Bonjour ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
-  messageBody1: "Vous vous êtes abonné aux alertes boursières de " ~ stockAlert.product.name,
+  premessage: "Abonnement au stock de produits <br><a href='{{productLink}}' style='color: #000;'>{{name}}</a>,
+  messageHeader: "Bonjour {{firstName}} {{lastName}},",
+  messageBody1: "Vous vous êtes abonné aux alertes boursières de {{name}}",
   messageBody2: "Si nous recevons à nouveau cet article, nous vous en informerons immédiatement afin que vous ne le manquiez pas.",
-  product: 'Produit',
-  price: 'Prix',
-  messageSignature: 'Sincèrement, l\\'équipe de ' ~ general.ecommerceName
+  product: "Produit",
+  price: "Prix",
+  messageSignature: "Sincèrement, l'équipe de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1. { '{{name}}': stockAlert.product.name }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
     </span>
   </td>
@@ -979,7 +983,7 @@ export const LANGUAGE_FR = {
         <tr>
           <td style="text-align: center;">
             <br><br>
-            {{ languageSheet.messageSignature }}
+            {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
           </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
diff --git a/src/app/data/beyond/app-language-it.ts b/src/app/data/beyond/app-language-it.ts
index 7353a52..016723d 100644
--- a/src/app/data/beyond/app-language-it.ts
+++ b/src/app/data/beyond/app-language-it.ts
@@ -29,7 +29,7 @@ export const LANGUAGE_IT = {
   footer: {
     html: `
 {% set languageSheet = {
-  moreInfo: 'Per ulteriori informazioni, si prega di leggere la nostra <a href="' ~ general.privacyPolicyLink ~ '">informativa sulla privacy</a> y <a href="' ~ general.termsOfUseLink ~ '">condizioni d\\'uso</a>.'
+  moreInfo: "Per ulteriori informazioni, si prega di leggere la nostra <a href='{{privacyPolicyLink}}'>informativa sulla privacy</a> y <a href='{{termsOfUseLink}}'>condizioni d'uso</a>."
 } %}
         <tr>
           <td bgcolor="#fff" style="background-color: #fff; padding: 20px 20px 20px 20px;">
@@ -94,7 +94,7 @@ export const LANGUAGE_IT = {
               {% endif %}
               <tr>
                 <td align="center" heigth="50" style="font-family: Arial, Helvetica, sans-serif; font-size: 11px; color: #999; height: 20px;">
-                  {{ languageSheet.moreInfo }}
+                  {{ replace(languageSheet.moreInfo, { '{{privacyPolicyLink}}': general.privacyPolicyLink, '{{termsOfUseLink}}': general.termsOfUseLink }) }}
                 </td>
               </tr>
             </table>
@@ -122,22 +122,22 @@ export const LANGUAGE_IT = {
       subject: `{{ general.ecommerceName }} - Grazie per la registrazione`,
       html: `
 {% set languageSheet = {
-  premessage: 'Benvenuti a ' ~ general.ecommerceName ~ '!',
-  messageHeader: 'Ciao ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Siamo lieti di confermare che il tuo account cliente su <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
+  premessage: "Benvenuti a {{ecommerceName}}!",
+  messageHeader: "Ciao {{firstName}} {{lastName}},",
+  messageBody1: "Siamo lieti di confermare che il tuo account cliente su <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
   messageBody2: "Grazie al tuo account cliente potrai aggiornare il tuo profilo e la tua password, consultare il tuo storico ordini ed altre informazioni utili.",
-  messageBody3: "Ci auguriamo di vederti presto su  " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  messageBody3: "Ci auguriamo di vederti presto su <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{ecommerceName}}': general.ecommerceName }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -148,18 +148,18 @@ export const LANGUAGE_IT = {
       subject: `{{ general.ecommerceName }} - Cancellazione dell'utente`,
       html: `
 {% set languageSheet = {
-  premessage: 'Conferma account eliminato',
-  messageHeader: 'Ciao ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody: 'Come da te richiesto durante la tua ultima visita su ' ~ general.ecommerceName ~ ", ti confermiamo che l'account utente " ~ user.email ~ " è stato eliminato dal nostro database.",
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  premessage: "Conferma account eliminato",
+  messageHeader: "Ciao {{firstName}} {{lastName}},",
+  messageBody: "Come da te richiesto durante la tua ultima visita su {{ecommerceName}}, ti confermiamo che l'account utente {{email}} è stato eliminato dal nostro database.",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{userEmail}}': user.email }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -170,24 +170,24 @@ export const LANGUAGE_IT = {
       subject: `{{ general.ecommerceName }} - Ricorda la password`,
       html: `
 {% set languageSheet = {
-  premessage: 'Ricorda la password',
-  messageHeader: 'Ciao ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: "Come da te richiesto durante la tua ultima visita su " ~ general.ecommerceName ~ ", ti inviamo il link di accesso alla sezione dedicata al recupero della password:",
-  messageBody2: '<a href="' ~ user.lostPasswordLink ~ '" style="color:#000">Clicca qui per recuperare la password</a>',
-  messageBody3: 'Questo link sar&agrave; attivo solamente per le 24 ore successive al suo invio.',
-  messageBody4: "Ci auguriamo di vederti presto su  " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  premessage: "Ricorda la password",
+  messageHeader: "Ciao {{firstName}} {{lastName}},",
+  messageBody1: "Come da te richiesto durante la tua ultima visita su {{ecommerceName}}, ti inviamo il link di accesso alla sezione dedicata al recupero della password:",
+  messageBody2: "<a href='{{lostPasswordLink}}' style='color:#000'>Clicca qui per recuperare la password</a>",
+  messageBody3: "Questo link sarà attivo solamente per le 24 ore successive al suo invio.",
+  messageBody4: "Ci auguriamo di vederti presto su <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}/a>.",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceName}}': general.ecommerceName }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{lostPasswordLink}}': user.lostPasswordLink }) }}<br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageBody4 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody4, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -198,22 +198,22 @@ export const LANGUAGE_IT = {
       subject: `{{ general.ecommerceName }} - Cambio della password`,
       html: `
 {% set languageSheet = {
-  premessage: 'Cambio della password',
-  messageHeader: 'Ciao ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
+  premessage: "Cambio della password",
+  messageHeader: "Ciao {{firstName}} {{lastName}},",
   messageBody1: "Ti confermiamo che la tua password è stata modificata.",
   messageBody2: "Accertati di conservare le credenziali in un luogo sicuro per gli accessi futuri.",
-  messageBody3: "Ci auguriamo di vederti presto su  " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  messageBody3: "Ci auguriamo di vederti presto su <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -230,24 +230,24 @@ export const LANGUAGE_IT = {
       subject: `{{ general.ecommerceName }} - {{ wishlist.user.name }} raccomanda i suoi prodotti preferiti`,
       html: `
 {% set languageSheet = {
-  premessage: 'Raccomandazione sui preferiti',
-  messageHeader1: 'Ciao ' ~ wishlist.toName ~ ',',
-  messageHeader2: "Il tuo amico/a " ~ wishlist.user.firstName ~ " " ~ wishlist.user.lastName ~ " (" ~ wishlist.user.email ~ ") ti invia questo prodotto a cui potresti essere interessato.",
-  messageBody: 'Se desideri maggiori informazioni sul prodotto puoi contattarci su <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName,
-  recommendedProducts: 'Prodotti raccomandati',
-  product: 'Prodotto',
-  price: 'Prezzo',
-  comments: 'Messaggio del tuo amico:'
+  premessage: "Raccomandazione sui preferiti",
+  messageHeader1: "Ciao {{toName}},",
+  messageHeader2: "Il tuo amico/a {{firstName}} {{lastName}} ({{email}}) ti invia questo prodotto a cui potresti essere interessato.",
+  messageBody: "Se desideri maggiori informazioni sul prodotto puoi contattarci su <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}",
+  recommendedProducts: "Prodotti raccomandati",
+  product: "Prodotto",
+  price: "Prezzo",
+  comments: "Messaggio del tuo amico:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageHeader2 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{toName}}': wishlist.toName }) }}<br><br>
+      {{ replace(languageSheet.messageHeader2, { '{{firstName}}': wishlist.user.firstName, '{{lastName}}': wishlist.user.lastName, '{{email}}': wishlist.user.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -281,9 +281,13 @@ export const LANGUAGE_IT = {
                         </tr>
                       </table>
                     </td>
-                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;"><span><span>
-                      {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
-                    </span></span></td>
+                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;">
+                      <span>
+                        <span>
+                          {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
+                        </span>
+                      </span>
+                    </td>
                   </tr>
                   {% endfor %}
                 </tbody>
@@ -316,22 +320,22 @@ export const LANGUAGE_IT = {
       subject: `{{ general.ecommerceName }} - {{ recommend.name }} raccomanda un prodotto`,
       html: `
 {% set languageSheet = {
-  premessage: 'Raccomandazione di prodotto',
-  messageHeader1: "Il tuo amico/a " ~ recommend.name ~ " (" ~ recommend.email ~ ") ti invia questo prodotto a cui potresti essere interessato.",
-  messageBody: 'Se desideri maggiori informazioni sul prodotto puoi contattarci su <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName,
-  recommendedProducts: 'Prodotti raccomandati',
-  product: 'Prodotto',
-  price: 'Prezzo',
-  comments: 'Messaggio del tuo amico:'
+  premessage: "Raccomandazione di prodotto",
+  messageHeader1: "Il tuo amico/a {{name}} ({{email}}) ti invia questo prodotto a cui potresti essere interessato.",
+  messageBody: "Se desideri maggiori informazioni sul prodotto puoi contattarci su <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}",
+  recommendedProducts: "Prodotti raccomandati",
+  product: "Prodotto",
+  price: "Prezzo",
+  comments: "Messaggio del tuo amico:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{name}}': recommend.name, '{{email}}': recommend.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -396,13 +400,13 @@ export const LANGUAGE_IT = {
       subject: `{{ general.ecommerceName }} - Modulo di contatto`,
       html: `
 {% set languageSheet = {
-  premessage: 'Modulo di contatto',
-  name: 'Nome:',
-  email: 'Email:',
-  phone: 'Telefono:',
-  motive: 'Motivo della richiesta:',
-  comments: 'Messaggio:',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  premessage: "Modulo di contatto",
+  name: "Nome:",
+  email: "Email:",
+  phone: "Telefono:",
+  motive: "Motivo della richiesta:",
+  comments: "Messaggio:",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -424,7 +428,7 @@ export const LANGUAGE_IT = {
         {{ languageSheet.comments }} {{ contact.comments }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -436,13 +440,13 @@ export const LANGUAGE_IT = {
       html: `
 {% set languageSheet = {
   premessage: 'Consulta sobre producto',
-  name: 'Nome:',
-  email: 'Email:',
-  phone: 'Telefono:',
-  comments: 'Messaggio:',
-  productName: 'Nome Prodotto:',
-  productSku: 'Codice Prodotto:',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  name: "Nome:",
+  email: "Email:",
+  phone: "Telefono:",
+  comments: "Messaggio:",
+  productName: "Nome Prodotto:",
+  productSku: "Codice Prodotto:",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -467,7 +471,7 @@ export const LANGUAGE_IT = {
         {{ languageSheet.productSku }} {{ data.product.sku }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -478,29 +482,29 @@ export const LANGUAGE_IT = {
       subject: `{{ general.ecommerceName }} - {{ (sales.reserve) ? ('Ordine ricevuto') : ('Conferma d\\'ordine') }} {{ sales.documentNumber }}`,
       html: `
 {% set languageSheet = {
-  premessage: 'Conferma d\\'ordine',
-  premessageReserve: 'Ordine ricevuto',
-  messageHeader: 'Grazie mille per averci dato fiducia. Il suo acquisto è stato elaborato correttamente. Potete trovare questo ordine nel file PDF allegato.',
-  messageHeaderReserve: 'Grazie mille per averci dato fiducia. Abbiamo ricevuto il suo ordine, dato che abbiamo alcuni prodotti in ordine lo abbiamo in attesa di revisione.',
-  messageBody1: 'Di seguito troverete i dettagli dell\\'ordine.',
-  messageBody2: 'Grazie per aver fatto acquisti da <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName,
-  orderNumber: 'Numero d\\'ordine:',
-  orderDate: 'Data dell\\'ordine:',
-  paymentSystem: 'Metodo di pagamento:',
-  shippingName: 'Metodo di spedizione:',
-  address: 'Indirizzo',
-  addressBilling: 'Indirizzo di fatturazione',
-  addressShipping: 'Indirizzo di spedizione',
-  orderResume: 'Riassunto dell\\'ordine',
-  quantity: 'Quantità:',
-  product: 'Prodotto',
-  gift: 'Regalo',
-  total: 'Totale:',
-  comment: 'Commenti:',
-  pickup: 'Hai scelto la consegna in negozio',
-  pickupMessage: 'Ti avviseremo via e-mail quando il tuo ordine sarà disponibile per il ritiro.',
-  rewardPoints: 'Il numero di {{name}} che otterrai con il prossimo acquisto e {{value}}'
+  premessage: "Conferma d'ordine",
+  premessageReserve: "Ordine ricevuto",
+  messageHeader: "Grazie mille per averci dato fiducia. Il suo acquisto è stato elaborato correttamente. Potete trovare questo ordine nel file PDF allegato.",
+  messageHeaderReserve: "Grazie mille per averci dato fiducia. Abbiamo ricevuto il suo ordine, dato che abbiamo alcuni prodotti in ordine lo abbiamo in attesa di revisione.",
+  messageBody1: "Di seguito troverete i dettagli dell'ordine.",
+  messageBody2: "Grazie per aver fatto acquisti da <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}",
+  orderNumber: "Numero d'ordine:",
+  orderDate: "Data dell'ordine:",
+  paymentSystem: "Metodo di pagamento:",
+  shippingName: "Metodo di spedizione:",
+  address: "Indirizzo",
+  addressBilling: "Indirizzo di fatturazione",
+  addressShipping: "Indirizzo di spedizione",
+  orderResume: "Riassunto dell'ordine",
+  quantity: "Quantità:",
+  product: "Prodotto",
+  gift: "Regalo",
+  total: "Totale:",
+  comment: "Commenti:",
+  pickup: "Hai scelto la consegna in negozio",
+  pickupMessage: "Ti avviseremo via e-mail quando il tuo ordine sarà disponibile per il ritiro.",
+  rewardPoints: "Il numero di {{ecommerceName}} che otterrai con il prossimo acquisto e {{value}}"
 } %}
 <tr>
   <td style="vertical-align: middle;font-family: sans-serif; padding: 20px" align="center">
@@ -730,13 +734,13 @@ export const LANGUAGE_IT = {
                 <div style="padding: 10px 12px;border: 1px solid #dee2e6;">
                   <p style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
                     <strong>{{ rewardPoint.language.name }}</strong><br>
-                    {{ replace(languageSheet.rewardPoints, { '{{name}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
+                    {{ replace(languageSheet.rewardPoints, { '{{ecommerceName}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
                   </p>
                 </div>
               {% endfor %}
             {% endif %}
             <div style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
-              {{ languageSheet.messageBody2 }}<br>{{ languageSheet.messageSignature }}
+              {{ replace(languageSheet.messageBody2, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>{{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
             </div>
           </td>
         </tr>
@@ -777,19 +781,19 @@ export const LANGUAGE_IT = {
       html: `
 {% set languageSheet = {
   premessage: "Informazioni ordine incompleto",
-  messageHeader: 'Ciao ' ~ abandonedCart.user.firstName ~ ' ' ~ abandonedCart.user.lastName ~ ',',
-  messageBody1: 'Durante la tua ultima visita al nostro negozio, hai aggiunto al carrello i seguenti prodotti, ma non hai completato l\\'ordine.',
-  messageBody2: 'Clicca <a target="_blank" href="' ~ abandonedCart.link ~ '" style="color: #000;">qui</a> se desideri recuperare il tuo ordine.',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  messageHeader: "Ciao {{firstName}} {{lastName}},",
+  messageBody1: "Durante la tua ultima visita al nostro negozio, hai aggiunto al carrello i seguenti prodotti, ma non hai completato l'ordine.",
+  messageBody2: "Clicca <a target='_blank' href='{{link}}' style='color: #000;'>qui</a> se desideri recuperare il tuo ordine.",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': abandonedCart.user.firstName, '{{lastName}}': abandonedCart.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody2, { '{{url}}': abandonedCart.link }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -807,19 +811,19 @@ export const LANGUAGE_IT = {
       html: `
 {% set languageSheet = {
   premessage: "Verifica dell'indirizzo e-mail",
-  messageHeader: 'Ciao ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Grazie per esserti registrato su ' ~ general.ecommerceUrl ~ '. Per favore attiva il tuo account cliccando <a href="' ~ user.verifyAccountLink ~ '" style="color: #000;">qui</a>.',
-  messageBody2: "Ci auguriamo di vederti presto su  " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  messageHeader: "Ciao {{firstName}} {{lastName}},",
+  messageBody1: "Grazie per esserti registrato su {{ecommerceUrl}}. Per favore attiva il tuo account cliccando <a href='{{verifyAccountLink}}' style='color: #000;'>qui</a>.",
+  messageBody2: "Ci auguriamo di vederti presto su <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br><br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{verifyAccountLink}}': user.verifyAccountLink }) }}<br><br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -831,21 +835,21 @@ export const LANGUAGE_IT = {
       html: `
 {% set languageSheet = {
   premessage: "Attivazione dell'account",
-  messageHeader: 'Ciao ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Ti informiamo che il tuo account su ' ~ general.ecommerceUrl ~ ' è stato attivato correttamente.',
-  messageBody2: 'Per visualizzare i tuoi dati e tutte le informazioni relative al tuo account accedi tramite il pannello di controllo: <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">Modifica il tuo profilo</a>',
-  messageBody3: "Ci auguriamo di vederti presto su  " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  messageHeader: "Ciao {{firstName}} {{lastName}},",
+  messageBody1: "Ti informiamo che il tuo account su {{ecommerceUrl}} è stato attivato correttamente.",
+  messageBody2: "Per visualizzare i tuoi dati e tutte le informazioni relative al tuo account accedi tramite il pannello di controllo: <a href='{{ecommerceUrl}}' style='color: #000;'>Modifica il tuo profilo</a>",
+  messageBody3: "Ci auguriamo di vederti presto su <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -862,22 +866,22 @@ export const LANGUAGE_IT = {
       subject: `{{ general.ecommerceName }} - Stock disponibile`,
       html: `
 {% set languageSheet = {
-  premessage: 'Disponibilit&agrave; del prodotto <a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Ciao ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
+  premessage: "Disponibilità del prodotto <a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Ciao {{firstName}} {{lastName}},",
   messageBody1: "L'articolo che tanto desideravi è ora disponibile!",
-  messageBody2: "Ti ricordiamo che questo messaggio e-mail fornisce delle informazioni indicative riguardo alla disponibilit&agrave; dell'articolo e tale disponibilit&agrave; dipende da molti fattori (persone interessate, pezzi disponibili).",
-  messageBody3: "Questo messaggio è stato inviato a tutti i clienti interessati a questo articolo, di conseguenza è possibile che molto presto non sia pi&ugrave; disponibile.",
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  messageBody2: "Ti ricordiamo che questo messaggio e-mail fornisce delle informazioni indicative riguardo alla disponibilità dell'articolo e tale disponibilità dipende da molti fattori (persone interessate, pezzi disponibili).",
+  messageBody3: "Questo messaggio è stato inviato a tutti i clienti interessati a questo articolo, di conseguenza è possibile che molto presto non sia più disponibile.",
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -903,21 +907,21 @@ export const LANGUAGE_IT = {
 
     25: {
       name: `Confirmar suscripción de Stock`,
-      subject: `{{ general.ecommerceName }} - Iscrizione all'avviso di disponibilit&agrave;`,
+      subject: `{{ general.ecommerceName }} - Iscrizione all'avviso di disponibilità`,
       html: `
 {% set languageSheet = {
-  premessage: 'Iscrizione all\\'avviso di disponibilit&agrave; del prodotto <br><a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Ciao ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
-  messageBody1: "Ti sei iscritto agli avvisi di disponibilit&agrave; del " ~ stockAlert.product.name,
+  premessage: "Iscrizione all'avviso di disponibilità del prodotto <br><a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Ciao {{firstName}} {{lastName}},",
+  messageBody1: "Ti sei iscritto agli avvisi di disponibilità del {{name}}",
   messageBody2: "Nel caso in cui questo articolo fosse nuovamente disponibile ti avviseremo immediatamente per fare in modo che non ti sfugga.",
-  messageSignature: 'Cordiali saluti, il team di ' ~ general.ecommerceName
+  messageSignature: "Cordiali saluti, il team di {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1. { '{{name}}': stockAlert.product.name }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
     </span>
   </td>
@@ -958,7 +962,7 @@ export const LANGUAGE_IT = {
         <tr>
           <td style="text-align: center;">
             <br><br>
-            {{ languageSheet.messageSignature }}
+            {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
           </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
diff --git a/src/app/data/beyond/app-language-pt.ts b/src/app/data/beyond/app-language-pt.ts
index b2dfbc6..8ef05be 100644
--- a/src/app/data/beyond/app-language-pt.ts
+++ b/src/app/data/beyond/app-language-pt.ts
@@ -29,7 +29,7 @@ export const LANGUAGE_PT = {
   footer: {
     html: `
 {% set languageSheet = {
-  moreInfo: 'Para mais informações, leia nossa <a href="' ~ general.privacyPolicyLink ~ '">política de privacidade</a> e <a href="' ~ general.termsOfUseLink ~ '">termos de uso</a>.'
+  moreInfo: "Para mais informações, leia nossa <a href='{{privacyPolicyLink}}'>política de privacidade</a> e <a href='{{termsOfUseLink}}'>termos de uso</a>."
 } %}
         <tr>
           <td bgcolor="#fff" style="background-color: #fff; padding: 20px 20px 20px 20px;">
@@ -94,7 +94,7 @@ export const LANGUAGE_PT = {
               {% endif %}
               <tr>
                 <td align="center" heigth="50" style="font-family: Arial, Helvetica, sans-serif; font-size: 11px; color: #999; height: 20px;">
-                  {{ languageSheet.moreInfo }}
+                  {{ replace(languageSheet.moreInfo, { '{{privacyPolicyLink}}': general.privacyPolicyLink, '{{termsOfUseLink}}': general.termsOfUseLink }) }}
                 </td>
               </tr>
             </table>
@@ -122,22 +122,22 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - Obrigado por se registar`,
       html: `
 {% set languageSheet = {
-  premessage: 'Bem-vindo a ' ~ general.ecommerceName ~ '!',
-  messageHeader: 'Olá ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Temos o prazer de confirmar a criação da sua conta de cliente em <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageBody2: 'Recomendamos-lhe que guarde este e-mail com os seus dados de acesso à nossa loja online, de maneira a que a sua próxima compra seja mais fácil e rápida.',
-  messageBody3: "Esperamos vê-lo em breve em " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  premessage: "Bem-vindo a {{ecommerceName}}!",
+  messageHeader: "Olá {{firstName}} {{lastName}},",
+  messageBody1: "Temos o prazer de confirmar a criação da sua conta de cliente em <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageBody2: "Recomendamos-lhe que guarde este e-mail com os seus dados de acesso à nossa loja online, de maneira a que a sua próxima compra seja mais fácil e rápida.",
+  messageBody3: "Esperamos vê-lo em breve em <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{ecommerceName}}': general.ecommerceName }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -149,17 +149,17 @@ export const LANGUAGE_PT = {
       html: `
 {% set languageSheet = {
   premessage: 'Confirmação da conta eliminada',
-  messageHeader: 'Olá ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody: 'Como solicitado durante a sua recente visita a ' ~ general.ecommerceName ~ ", confirmamos que a sua conta " ~ user.email ~ " foi eliminada da nossa base de dados.",
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  messageHeader: "Olá {{firstName}} {{lastName}},",
+  messageBody: "Como solicitado durante a sua recente visita a {{ecommerceName}}, confirmamos que a sua conta {{email}} foi eliminada da nossa base de dados.",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{userEmail}}': user.email }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -170,24 +170,24 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - Recordar palavra-passe`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recordar palavra-passe',
-  messageHeader: 'Olá ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: "Como solicitado durante a sua recente visita a " ~ general.ecommerceName ~ ", aqui está o seu endereço de acesso à área de recuperação de senha:",
-  messageBody2: '<a href="' ~ user.lostPasswordLink ~ '" style="color:#000">Clique aqui para recuperar a senha</a>',
-  messageBody3: 'Este link só será válido por 24 horas após o momento de sua entrega.',
-  messageBody4: "Esperamos vê-lo em breve em " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  premessage: "Recordar palavra-passe",
+  messageHeader: "Olá {{firstName}} {{lastName}},",
+  messageBody1: "Como solicitado durante a sua recente visita a {{ecommerceName}}, aqui está o seu endereço de acesso à área de recuperação de senha:",
+  messageBody2: "<a href='{{lostPasswordLink}}'style='color:#000'>Clique aqui para recuperar a senha</a>",
+  messageBody3: "Este link só será válido por 24 horas após o momento de sua entrega.",
+  messageBody4: "Esperamos vê-lo em breve em <a href='{{ecommerceUrl}}' style='color:#000'>"{{ecommerceName}}"</a>.",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceName}}': general.ecommerceName }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{lostPasswordLink}}': user.lostPasswordLink }) }}<br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageBody4 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody4, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -198,22 +198,22 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - Modificação de password`,
       html: `
 {% set languageSheet = {
-  premessage: 'Modificação de password',
-  messageHeader: 'Olá ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Confirmamos que a sua password foi modificada.',
+  premessage: "Modificação de password",
+  messageHeader: "Olá {{firstName}} {{lastName}},",
+  messageBody1: "Confirmamos que a sua password foi modificada.",
   messageBody2: "Recomendamos-lhe que conserve este email com os seus dados para que a sua futura compra seja mais fácil e rápida.",
-  messageBody3: "Esperamos vê-lo em breve em " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  messageBody3: "Esperamos vê-lo em breve em <a href='{{ecommerceUrl}}' style='color:#000'>"{{ecommerceName}}"</a>.",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -230,24 +230,24 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - {{ wishlist.user.name }} ele recomenda os seus produtos preferidos`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recomendação da lista de desejos',
-  messageHeader1: 'Olá ' ~ wishlist.toName ~ ',',
-  messageHeader2: "O seu amigo " ~ wishlist.user.firstName ~ " " ~ wishlist.user.lastName ~ " (" ~ wishlist.user.email ~ ") envia-lhe os seus produtos preferidos.",
-  messageBody: 'Se necessitar de mais informações sobre este produto, pode contactar-nos em <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName,
-  recommendedProducts: 'Produtos recomendados',
-  product: 'Produto',
-  price: 'Preço',
-  comments: 'Mensagem do seu amigo/a:'
+  premessage: "Recomendação da lista de desejos",
+  messageHeader1: "Olá {{toName}},",
+  messageHeader2: "O seu amigo {{firstName}} {{lastName}} ({{email}}) envia-lhe os seus produtos preferidos.",
+  messageBody: "Se necessitar de mais informações sobre este produto, pode contactar-nos em <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "A equipa de {{ecommerceName}}",
+  recommendedProducts: "Produtos recomendados",
+  product: "Produto",
+  price: "Preço",
+  comments: "Mensagem do seu amigo/a:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageHeader2 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{toName}}': wishlist.toName }) }}<br><br>
+      {{ replace(languageSheet.messageHeader2, { '{{firstName}}': wishlist.user.firstName, '{{lastName}}': wishlist.user.lastName, '{{email}}': wishlist.user.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -281,9 +281,13 @@ export const LANGUAGE_PT = {
                         </tr>
                       </table>
                     </td>
-                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;"><span><span>
-                      {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
-                    </span></span></td>
+                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;">
+                      <span>
+                        <span>
+                          {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
+                        </span>
+                      </span>
+                    </td>
                   </tr>
                   {% endfor %}
                 </tbody>
@@ -316,22 +320,22 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - {{ recommend.name }} recomenda um produto`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recomendação de produto',
-  messageHeader1: "O seu amigo/a " ~ recommend.name ~ " (" ~ recommend.email ~ ") envia-lhe este produto que pode ser do seu interesse.",
-  messageBody: 'Se necessitar de mais informações sobre este produto, pode contactar-nos em <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName,
-  recommendedProducts: 'Produtos recomendados',
-  product: 'Produto',
-  price: 'Preço',
-  comments: 'Mensagem do seu amigo/a:'
+  premessage: "Recomendação de produto",
+  messageHeader1: "O seu amigo/a {{name}} ({{email}}) envia-lhe este produto que pode ser do seu interesse.",
+  messageBody: "Se necessitar de mais informações sobre este produto, pode contactar-nos em <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "A equipa de {{ecommerceName}}",
+  recommendedProducts: "Produtos recomendados",
+  product: "Produto",
+  price: "Preço",
+  comments: "Mensagem do seu amigo/a:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{name}}': recommend.name, '{{email}}': recommend.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -396,13 +400,13 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - Formulário de contacto`,
       html: `
 {% set languageSheet = {
-  premessage: 'Formulário de contacto',
-  name: 'Nome:',
-  email: 'Email:',
-  phone: 'Telefone:',
-  motive: 'Motivo da consulta:',
-  comments: 'Mensagem:',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  premessage: "Formulário de contacto",
+  name: "Nome:",
+  email: "Email:",
+  phone: "Telefone:",
+  motive: "Motivo da consulta:",
+  comments: "Mensagem:",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -424,7 +428,7 @@ export const LANGUAGE_PT = {
         {{ languageSheet.comments }} {{ contact.comments }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -435,14 +439,14 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - Dúvida sobre um produto`,
       html: `
 {% set languageSheet = {
-  premessage: 'Dúvida sobre um produto',
-  name: 'Nome:',
-  email: 'Email:',
-  phone: 'Telefone:',
-  comments: 'Mensagem:',
-  productName: 'Nome do produto:',
-  productSku: 'Referência do produto:',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  premessage: "Dúvida sobre um produto",
+  name: "Nome:",
+  email: "Email:",
+  phone: "Telefone:",
+  comments: "Mensagem:",
+  productName: "Nome do produto:",
+  productSku: "Referência do produto:",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -467,7 +471,7 @@ export const LANGUAGE_PT = {
         {{ languageSheet.productSku }} {{ data.product.sku }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -478,29 +482,29 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - {{ (sales.reserve) ? ('Ordem recebida') : ('Confirmação pedido') }} {{ sales.documentNumber }}`,
       html: `
 {% set languageSheet = {
-  premessage: 'Confirmação pedido',
-  premessageReserve: 'Ordem recebida',
-  messageHeader: 'Muito obrigado por confiar em nós. A sua compra foi processada correctamente. Pode encontrar esta encomenda no ficheiro PDF em anexo.',
-  messageHeaderReserve: 'Muito obrigado por confiar em nós. Recebemos a sua encomenda, uma vez que temos alguns produtos por encomenda, aguardamos a sua revisão.',
-  messageBody1: 'Abaixo encontrará os detalhes da encomenda.',
-  messageBody2: 'Obrigado por fazer compras em <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName,
-  orderNumber: 'Número de encomenda:',
-  orderDate: 'Data da encomenda:',
-  paymentSystem: 'Forma de pagamento:',
-  shippingName: 'Método de envio:',
-  address: 'Endereço',
-  addressBilling: 'Endereço para facturação',
-  addressShipping: 'Endereço de envio',
-  orderResume: 'Resumo da encomenda',
-  quantity: 'Quantidade:',
-  product: 'Produto',
-  gift: 'Presente',
-  total: 'Total:',
-  comment: 'Comentários:',
-  pickup: 'Escolheu a entrega na loja',
-  pickupMessage: 'Iremos notificá-lo por e-mail quando a sua encomenda estiver disponível para recolha.',
-  rewardPoints: 'O total de {{name}} que você começa para sua próxima compra é {{value}}'
+  premessage: "Confirmação pedido",
+  premessageReserve: "Ordem recebida",
+  messageHeader: "Muito obrigado por confiar em nós. A sua compra foi processada correctamente. Pode encontrar esta encomenda no ficheiro PDF em anexo.",
+  messageHeaderReserve: "Muito obrigado por confiar em nós. Recebemos a sua encomenda, uma vez que temos alguns produtos por encomenda, aguardamos a sua revisão.",
+  messageBody1: "Abaixo encontrará os detalhes da encomenda.",
+  messageBody2: "Obrigado por fazer compras em <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "A equipa de {{ecommerceName}}",
+  orderNumber: "Número de encomenda:",
+  orderDate: "Data da encomenda:",
+  paymentSystem: "Forma de pagamento:",
+  shippingName: "Método de envio:",
+  address: "Endereço",
+  addressBilling: "Endereço para facturação",
+  addressShipping: "Endereço de envio",
+  orderResume: "Resumo da encomenda",
+  quantity: "Quantidade:",
+  product: "Produto",
+  gift: "Presente",
+  total: "Total:",
+  comment: "Comentários:",
+  pickup: "Escolheu a entrega na loja",
+  pickupMessage: "Iremos notificá-lo por e-mail quando a sua encomenda estiver disponível para recolha.",
+  rewardPoints: "O total de {{ecommerceName}} que você começa para sua próxima compra é {{value}}"
 } %}
 <tr>
   <td style="vertical-align: middle;font-family: sans-serif; padding: 20px" align="center">
@@ -730,13 +734,13 @@ export const LANGUAGE_PT = {
                 <div style="padding: 10px 12px;border: 1px solid #dee2e6;">
                   <p style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
                     <strong>{{ rewardPoint.language.name }}</strong><br>
-                    {{ replace(languageSheet.rewardPoints, { '{{name}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
+                    {{ replace(languageSheet.rewardPoints, { '{{ecommerceName}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
                   </p>
                 </div>
               {% endfor %}
             {% endif %}
             <div style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
-              {{ languageSheet.messageBody2 }}<br>{{ languageSheet.messageSignature }}
+              {{ replace(languageSheet.messageBody2, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>{{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
             </div>
           </td>
         </tr>
@@ -770,11 +774,11 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - Pedido de devolução`,
       html: `
 {% set languageSheet = {
-  premessage: 'Informação sobre o pedido de devolução',
-  messageHeader: 'Olá ' ~ sales.user.billingAddress.firstName ~ ' ' ~ sales.user.billingAddress.lastName ~ ',',
-  messageBody1: 'Por favor, note que recebemos o seu pedido de reembolso.',
-  messageBody2: 'Se tiver alguma dúvida sobre o seu regresso ou qualquer outro assunto, pode contactar-nos.',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  premessage: "Informação sobre o pedido de devolução",
+  messageHeader: "Olá {{firstName}} {{lastName}},",
+  messageBody1: "Por favor, note que recebemos o seu pedido de reembolso da encomenda {{documentNumber}}.",
+  messageBody2: "Se tiver alguma dúvida sobre o seu regresso ou qualquer outro assunto, pode contactar-nos.",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 
 <tr>
@@ -782,9 +786,9 @@ export const LANGUAGE_PT = {
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
       {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageBody1, { '{{documentNumber}}': first(sales.documentParents).documentNumber }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -796,19 +800,19 @@ export const LANGUAGE_PT = {
       html: `
 {% set languageSheet = {
   premessage: "Informação de encomenda incompleta",
-  messageHeader: 'Olá ' ~ abandonedCart.user.firstName ~ ' ' ~ abandonedCart.user.lastName ~ ',',
-  messageBody1: 'Na sua última visita à nossa loja, adicionou os seguintes produtos ao seu carrinho de compras, mas não completou a sua encomenda.',
-  messageBody2: 'Clique <a target="_blank" href="' ~ abandonedCart.link ~ '" style="color: #000;">aqui</a> recuperar seu carrinho.',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  messageHeader: "Olá {{firstName}} {{lastName}},",
+  messageBody1: "Na sua última visita à nossa loja, adicionou os seguintes produtos ao seu carrinho de compras, mas não completou a sua encomenda.",
+  messageBody2: "Clique <a target='_blank' href='{{link}}' style='color: #000;'>aqui</a> recuperar seu carrinho.",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': abandonedCart.user.firstName, '{{lastName}}': abandonedCart.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody2, { '{{url}}': abandonedCart.link }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -826,19 +830,19 @@ export const LANGUAGE_PT = {
       html: `
 {% set languageSheet = {
   premessage: "Verificação por e-mail",
-  messageHeader: 'Olá ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Obrigado por se registar em ' ~ general.ecommerceUrl ~ '. Por favor, active a sua conta, clicando <a href="' ~ user.verifyAccountLink ~ '" style="color: #000;">aqui</a>.',
-  messageBody2: "Esperamos vê-lo em breve em " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  messageHeader: "Olá {{firstName}} {{lastName}},",
+  messageBody1: "Obrigado por se registar em {{ecommerceUrl}}. Por favor, active a sua conta, clicando <a href='{{verifyAccountLink}}' style='color: #000;'>aqui</a>.",
+  messageBody2: "Esperamos vê-lo em breve em <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br><br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{verifyAccountLink}}': user.verifyAccountLink }) }}<br><br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -850,21 +854,21 @@ export const LANGUAGE_PT = {
       html: `
 {% set languageSheet = {
   premessage: 'Activação da conta',
-  messageHeader: 'Olá ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Temos o prazer de informar que sua conta de cliente em ' ~ general.ecommerceUrl ~ ' foi ativada com sucesso.',
-  messageBody2: 'Você pode visualizar e modificar todos os seus detalhes a qualquer momento acessando este painel de controle: <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">Edite seu perfil</a>',
-  messageBody3: "Esperamos vê-lo em breve em " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  messageHeader: "Olá {{firstName}} {{lastName}},",
+  messageBody1: "Temos o prazer de informar que sua conta de cliente em {{ecommerceUrl}} foi ativada com sucesso.",
+  messageBody2: "Você pode visualizar e modificar todos os seus detalhes a qualquer momento acessando este painel de controle: <a href='{{ecommerceUrl}}' style='color: #000;'>Edite seu perfil</a>",
+  messageBody3: "Esperamos vê-lo em breve em <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -881,22 +885,22 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - Disponível em estoque`,
       html: `
 {% set languageSheet = {
-  premessage: 'Estoque disponível do produto <a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Olá ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
+  premessage: "Estoque disponível do produto <a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Olá {{firstName}} {{lastName}},",
   messageBody1: "O artigo que você quer tanto já está disponível!",
   messageBody2: "Gostaríamos de lembrar que este e-mail fornece orientações sobre a disponibilidade deste artigo e depende de muitos fatores (pessoas interessadas, unidades disponíveis).",
   messageBody3: "Enviámos este email a todos os clientes interessados no artigo, pelo que é possível esgotar-se muito em breve.",
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -925,20 +929,20 @@ export const LANGUAGE_PT = {
       subject: `{{ general.ecommerceName }} - Subscrição de Ações`,
       html: `
 {% set languageSheet = {
-  premessage: 'Assinatura de estoque de produtos <br><a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Olá ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
-  messageBody1: "Você se inscreveu nos anúncios de ações da " ~ stockAlert.product.name,
+  premessage: "Assinatura de estoque de produtos <br><a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: 'Olá {{firstName}} {{lastName}},',
+  messageBody1: "Você se inscreveu nos anúncios de ações da {{name}}",
   messageBody2: "Caso recebamos este artigo novamente iremos notificá-lo imediatamente para que ele não escape.",
-  product: 'Produto',
-  price: 'Preço',
-  messageSignature: 'A equipa de ' ~ general.ecommerceName
+  product: "Produto",
+  price: "Preço",
+  messageSignature: "A equipa de {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1. { '{{name}}': stockAlert.product.name }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
     </span>
   </td>
@@ -979,7 +983,7 @@ export const LANGUAGE_PT = {
         <tr>
           <td style="text-align: center;">
             <br><br>
-            {{ languageSheet.messageSignature }}
+            {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
           </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
diff --git a/src/app/data/beyond/app-language-ru.ts b/src/app/data/beyond/app-language-ru.ts
index ab97ee7..5e84a60 100644
--- a/src/app/data/beyond/app-language-ru.ts
+++ b/src/app/data/beyond/app-language-ru.ts
@@ -29,7 +29,7 @@ export const LANGUAGE_RU = {
   footer: {
     html: `
 {% set languageSheet = {
-  moreInfo: 'Для получения дополнительной информации ознакомьтесь с нашей <a href="' ~ general.privacyPolicyLink ~ '">политикой конфиденциальности</a> и <a href="' ~ general.termsOfUseLink ~ '">условиями пользования</a>'
+  moreInfo: "Для получения дополнительной информации ознакомьтесь с нашей <a href='{{privacyPolicyLink}}'>политикой конфиденциальности</a> и <a href='{{termsOfUseLink}}'>условиями пользования</a>"
 } %}
         <tr>
           <td bgcolor="#fff" style="background-color: #fff; padding: 20px 20px 20px 20px;">
@@ -94,7 +94,7 @@ export const LANGUAGE_RU = {
               {% endif %}
               <tr>
                 <td align="center" heigth="50" style="font-family: Arial, Helvetica, sans-serif; font-size: 11px; color: #999; height: 20px;">
-                  {{ languageSheet.moreInfo }}
+                  {{ replace(languageSheet.moreInfo, { '{{privacyPolicyLink}}': general.privacyPolicyLink, '{{termsOfUseLink}}': general.termsOfUseLink }) }}
                 </td>
               </tr>
             </table>
@@ -122,22 +122,22 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - Благодарим Вас за регистрацию`,
       html: `
 {% set languageSheet = {
-  premessage: 'Добро пожаловать на сайт ' ~ general.ecommerceName ~ '!',
-  messageHeader: 'Уважаемый (-ая) ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Мы рады подтвердить создание Вашей учетной записи клиента на сайте <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageBody2: 'В учетной записи клиента вы можете обновлять свой профиль и пароль, проверять историю заказов и другую интересующую вас информацию.',
-  messageBody3: "Надеемся скоро увидеть Вас на сайте " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  premessage: "Добро пожаловать на сайт {{ecommerceName}}!",
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},",
+  messageBody1: "Мы рады подтвердить создание Вашей учетной записи клиента на сайте <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageBody2: "В учетной записи клиента вы можете обновлять свой профиль и пароль, проверять историю заказов и другую интересующую вас информацию.",
+  messageBody3: "Надеемся скоро увидеть Вас на сайте <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{ecommerceName}}': general.ecommerceName }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -148,18 +148,18 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - Удаление пользовательской записи`,
       html: `
 {% set languageSheet = {
-  premessage: 'Подтверждение удаления записи',
-  messageHeader: 'Уважаемый (-ая) ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody: 'В соответствии с запросом, сделанным во время недавнего посещения сайта ' ~ general.ecommerceName ~ ', подтверждаем, что Ваша учетная запись пользователя ' ~ user.email ~ ' удалена из нашей базы данных.",
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  premessage: "Подтверждение удаления записи",
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},"
+  messageBody: "В соответствии с запросом, сделанным во время недавнего посещения сайта {{ecommerceName}}, подтверждаем, что Ваша учетная запись пользователя {{email}} удалена из нашей базы данных.",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{userEmail}}': user.email }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -171,23 +171,23 @@ export const LANGUAGE_RU = {
       html: `
 {% set languageSheet = {
   premessage: 'Напомнить пароль',
-  messageHeader: 'Уважаемый (-ая) ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: "В соответствии с запросом, сделанным во время недавнего посещения сайта " ~ general.ecommerceName ~ ", отправляем Вам ссылку для перехода на страницу восстановления пароля:",
-  messageBody2: '<a href="' ~ user.lostPasswordLink ~ '" style="color:#000">Нажмите здесь для восстановления пароля</a>',
-  messageBody3: 'Ссылка действительна в течение 24 часов с момента отправки.',
-  messageBody4: "Надеемся скоро увидеть Вас на сайте " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},"
+  messageBody1: "В соответствии с запросом, сделанным во время недавнего посещения сайта {{ecommerceName}}, отправляем Вам ссылку для перехода на страницу восстановления пароля:",
+  messageBody2: "<a href='{{lostPasswordLink}}' style='color:#000'>Нажмите здесь для восстановления пароля</a>",
+  messageBody3: "Ссылка действительна в течение 24 часов с момента отправки.",
+  messageBody4: "Надеемся скоро увидеть Вас на сайте <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceName}}': general.ecommerceName }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{lostPasswordLink}}': user.lostPasswordLink }) }}<br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageBody4 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody4, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -198,22 +198,22 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - Смена пароля`,
       html: `
 {% set languageSheet = {
-  premessage: 'Смена пароля',
-  messageHeader: 'Уважаемый (-ая) ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Подтверждаем, что Ваш пароль успешно изменен.',
+  premessage: "Смена пароля",
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},"
+  messageBody1: "Подтверждаем, что Ваш пароль успешно изменен.",
   messageBody2: "Сохраните свои учетные данные в надежном месте для их последующего просмотра.",
-  messageBody3: "Надеемся скоро увидеть Вас на сайте " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color:#000">' ~ general.ecommerceName ~ '</a>.',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  messageBody3: "Надеемся скоро увидеть Вас на сайте <a href='{{ecommerceUrl}}' style='color:#000'>{{ecommerceName}}</a>.",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -230,24 +230,24 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - {{ wishlist.user.name }} te recomienda sus productos favoritos`,
       html: `
 {% set languageSheet = {
-  premessage: 'Recomendación de favoritos',
-  messageHeader1: 'Уважаемый (-ая) ' ~ wishlist.toName ~ ',',
-  messageHeader2: "Ваш друг " ~ wishlist.user.firstName ~ " " ~ wishlist.user.lastName ~ " (" ~ wishlist.user.email ~ ") отправляет Вам эти товары, которые могут Вас заинтересовать.",
-  messageBody: 'Для получения дополнительной информации об этих товарах свяжитесь с нами на сайте <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName,
-  recommendedProducts: 'Рекомендованные товары',
-  product: Товар,
-  price: 'Цена',
-  comments: 'Сообщение от Вашего друга:'
+  premessage: "Рекомендации по выбору",
+  messageHeader1: "Уважаемый (-ая) {{toName}},',
+  messageHeader2: "Ваш друг {{firstName}} {{lastName}} ({{email}}) отправляет Вам эти товары, которые могут Вас заинтересовать.",
+  messageBody: "Для получения дополнительной информации об этих товарах свяжитесь с нами на сайте <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}",
+  recommendedProducts: "Рекомендованные товары",
+  product: "Товар",
+  price: "Цена",
+  comments: "Сообщение от Вашего друга:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageHeader2 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{toName}}': wishlist.toName }) }}<br><br>
+      {{ replace(languageSheet.messageHeader2, { '{{firstName}}': wishlist.user.firstName, '{{lastName}}': wishlist.user.lastName, '{{email}}': wishlist.user.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -281,9 +281,13 @@ export const LANGUAGE_RU = {
                         </tr>
                       </table>
                     </td>
-                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;"><span><span>
-                      {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
-                    </span></span></td>
+                    <td style="text-align: right; padding-right: 8px; border-bottom: 1px solid #dcdcdc;">
+                      <span>
+                        <span>
+                          {{ item.price|number_format(2) }}{{ general.defaultCurrencyCode }}
+                        </span>
+                      </span>
+                    </td>
                   </tr>
                   {% endfor %}
                 </tbody>
@@ -316,22 +320,22 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - {{ recommend.name }} рекомендует Вам товар`,
       html: `
 {% set languageSheet = {
-  premessage: 'Рекомендация товара',
-  messageHeader1: "Ваш друг " ~ recommend.name ~ " (" ~ recommend.email ~ ") отправляет Вам этот товар, который может Вас заинтересовать.",
-  messageBody: 'Для получения дополнительной информации об этих товарах свяжитесь с нами на сайте <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName,
-  recommendedProducts: 'Рекомендованные товары',
-  product: Товар,
-  price: 'Цена',
-  comments: 'Сообщение от Вашего друга:'
+  premessage: "Рекомендация товара",
+  messageHeader1: "Ваш друг {{name}} ({{email}}) отправляет Вам этот товар, который может Вас заинтересовать.",
+  messageBody: "Для получения дополнительной информации об этих товарах свяжитесь с нами на сайте <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}",
+  recommendedProducts: "Рекомендованные товары",
+  product: "Товар",
+  price: "Цена",
+  comments: "Сообщение от Вашего друга:"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader1 }}<br><br>
-      {{ languageSheet.messageBody }}<br><br>
-      {{ languageSheet.messageSignature }}<br><br>
+      {{ replace(languageSheet.messageHeader1, { '{{name}}': recommend.name, '{{email}}': recommend.email }) }}<br><br>
+      {{ replace(languageSheet.messageBody, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}<br><br>
     </span>
   </td>
 </tr>
@@ -396,13 +400,13 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - Форма обратной связи`,
       html: `
 {% set languageSheet = {
-  premessage: 'Форма обратной связи',
-  name: 'Имя:',
-  email: 'Электронная почта:',
-  phone: 'Телефон:',
-  motive: 'Повод обращения:',
-  comments: 'Текст сообщения:',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  premessage: "Форма обратной связи",
+  name: "Имя:",
+  email: "Электронная почта:",
+  phone: "Телефон:",
+  motive: "Повод обращения:",
+  comments: "Текст сообщения:",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -424,7 +428,7 @@ export const LANGUAGE_RU = {
         {{ languageSheet.comments }} {{ contact.comments }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -435,14 +439,14 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - Поиск информации о товаре`,
       html: `
 {% set languageSheet = {
-  premessage: 'Поиск информации о товаре',
-  name: 'Имя:',
-  email: 'Электронная почта:',
-  phone: 'Телефон:',
-  comments: 'Текст сообщения:',
-  productName: 'Название продукта:',
-  productSku: 'Ссылка на продукт:',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  premessage: "Поиск информации о товаре",
+  name: "Имя:",
+  email: "Электронная почта:",
+  phone: "Телефон:",
+  comments: "Текст сообщения:",
+  productName: "Название продукта:",
+  productSku: "Ссылка на продукт:",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
@@ -467,7 +471,7 @@ export const LANGUAGE_RU = {
         {{ languageSheet.productSku }} {{ data.product.sku }}<br>
       {% endif %}
       <br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -478,29 +482,29 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - {{ (sales.reserve) ? (\'Заказ получен\') : (\'Подтверждение заказа\') }} {{ sales.documentNumber }}`,
       html: `
 {% set languageSheet = {
-  premessage: 'Подтверждение заказа',
-  premessageReserve: 'Заказ получен',
-  messageHeader: 'Благодарим Вас за доверие. Ваша покупка успешно оформлена. Отправляем Вам подтверждение заказа в прикрепленном PDF-файле.',
-  messageHeaderReserve: 'Благодарим Вас за доверие. Ваш заказ получен и в настоящее время находится на этапе проверки, поскольку некоторые из выбранных товаров поставляются по индивидуальному заказу.',
-  messageBody1: 'Далее приведена информация о Вашем заказе.',
-  messageBody2: 'Спасибо за покупку на сайте <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName,
-  orderNumber: 'Номер:',
-  orderDate: 'Дата:',
-  paymentSystem: 'Способ оплаты:',
-  shippingName: 'Способ доставки:',
-  address: 'Адрес',
-  addressBilling: 'Платежный адрес',
-  addressShipping: 'Адрес доставки',
-  orderResume: 'Краткая информация о заказе',
-  quantity: 'Количество',
-  product: Товар,
-  gift: 'Подарок',
-  total: 'Итого:',
-  comment: 'Комментарии:',
-  pickup: 'Вы выбрали получение заказа в магазине',
-  pickupMessage: 'Мы оповестим Вас по электронной почте, когда заказ будет готов к получению.',
-  rewardPoints: 'Общая сумма {{name}}, которую вы получите за следующую покупку, составляет {{value}}.'
+  premessage: "Подтверждение заказа",
+  premessageReserve: "Заказ получен",
+  messageHeader: "Благодарим Вас за доверие. Ваша покупка успешно оформлена. Отправляем Вам подтверждение заказа в прикрепленном PDF-файле.",
+  messageHeaderReserve: "Благодарим Вас за доверие. Ваш заказ получен и в настоящее время находится на этапе проверки, поскольку некоторые из выбранных товаров поставляются по индивидуальному заказу.",
+  messageBody1: "Далее приведена информация о Вашем заказе.",
+  messageBody2: "Спасибо за покупку на сайте <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}",
+  orderNumber: "Номер:",
+  orderDate: "Дата:",
+  paymentSystem: "Способ оплаты:",
+  shippingName: "Способ доставки:",
+  address: "Адрес",
+  addressBilling: "Платежный адрес",
+  addressShipping: "Адрес доставки",
+  orderResume: "Краткая информация о заказе",
+  quantity: "Количество",
+  product: "Товар",
+  gift: "Подарок",
+  total: "Итого:",
+  comment: "Комментарии:",
+  pickup: "Вы выбрали получение заказа в магазине",
+  pickupMessage: "Мы оповестим Вас по электронной почте, когда заказ будет готов к получению.",
+  rewardPoints: "Общая сумма {{ecommerceName}}, которую вы получите за следующую покупку, составляет {{value}}."
 } %}
 <tr>
   <td style="vertical-align: middle;font-family: sans-serif; padding: 20px" align="center">
@@ -730,13 +734,13 @@ export const LANGUAGE_RU = {
                 <div style="padding: 10px 12px;border: 1px solid #dee2e6;">
                   <p style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
                     <strong>{{ rewardPoint.language.name }}</strong><br>
-                    {{ replace(languageSheet.rewardPoints, { '{{name}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
+                    {{ replace(languageSheet.rewardPoints, { '{{ecommerceName}}': rewardPoint.language.name, '{{value}}': rewardPoint.summary.totalEarned }) }}<br><br>
                   </p>
                 </div>
               {% endfor %}
             {% endif %}
             <div style="font-size: 14px; line-height: 22px; font-weight: normal; font-family: Arial, Helvetica, sans-serif; margin: 1em 0;">
-              {{ languageSheet.messageBody2 }}<br>{{ languageSheet.messageSignature }}
+              {{ replace(languageSheet.messageBody2, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{ecommerceName}}': general.ecommerceName }) }}<br>{{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
             </div>
           </td>
         </tr>
@@ -770,11 +774,11 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - Запрос о возврате товара`,
       html: `
 {% set languageSheet = {
-  premessage: 'Информация касательно запроса о возврате товара',
-  messageHeader: 'Уважаемый (-ая) ' ~ sales.user.billingAddress.firstName ~ ' ' ~ sales.user.billingAddress.lastName ~ ',',
-  messageBody1: 'Сообщаем о получении Вашего запроса о возврате товара.',
-  messageBody2: 'Свяжитесь с нами, если у Вас есть вопросы по поводу возврата товара или иные вопросы.',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  premessage: "Информация касательно запроса о возврате товара",
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},",
+  messageBody1: "Сообщаем вам, что мы получили ваш запрос на возврат заказа {{documentNumber}}.",
+  messageBody2: "Свяжитесь с нами, если у Вас есть вопросы по поводу возврата товара или иные вопросы.",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 
 <tr>
@@ -782,9 +786,9 @@ export const LANGUAGE_RU = {
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
       {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageBody1, { '{{documentNumber}}': first(sales.documentParents).documentNumber }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -796,19 +800,19 @@ export const LANGUAGE_RU = {
       html: `
 {% set languageSheet = {
   premessage: "Информация о незавершенном заказе",
-  messageHeader: 'Уважаемый (-ая) ' ~ abandonedCart.user.firstName ~ ' ' ~ abandonedCart.user.lastName ~ ',',
-  messageBody1: 'Во время последнего посещения нашего магазина Вы добавили в корзину следующие товары, но не завершили заказ.',
-  messageBody2: 'Нажмите <a target="_blank" href="' ~ abandonedCart.link ~ '" style="color: #000;">здесь</a> для восстановления незавершенного заказа.',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},",
+  messageBody1: "Во время последнего посещения нашего магазина Вы добавили в корзину следующие товары, но не завершили заказ.",
+  messageBody2: "Нажмите <a target='_blank' href='{{link}}' style='color: #000;'>здесь</a> для восстановления незавершенного заказа.",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': abandonedCart.user.firstName, '{{lastName}}': abandonedCart.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody2, { '{{url}}': abandonedCart.link }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -826,19 +830,19 @@ export const LANGUAGE_RU = {
       html: `
 {% set languageSheet = {
   premessage: "Проверка электронной почты",
-  messageHeader: 'Уважаемый (-ая) ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Спасибо, что Вы зарегистрировались на сайте ' ~ general.ecommerceUrl ~ '. Для активации Вашей учетной записи нажмите <a href="' ~ user.verifyAccountLink ~ '" style="color: #000;">здесь</a>.',
-  messageBody2: "Надеемся скоро увидеть Вас на сайте " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},"
+  messageBody1: "Спасибо, что Вы зарегистрировались на сайте {{ecommerceUrl}}. Для активации Вашей учетной записи нажмите <a href='{{verifyAccountLink}}' style='color: #000;'>здесь</a>.",
+  messageBody2: "Надеемся скоро увидеть Вас на сайте <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br><br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl, '{{verifyAccountLink}}': user.verifyAccountLink }) }}<br><br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -849,22 +853,22 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - Активация учетной записи`,
       html: `
 {% set languageSheet = {
-  premessage: 'Активация учетной записи',
-  messageHeader: 'Уважаемый (-ая) ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Сообщаем, что Ваша учетная запись на сайте ' ~ general.ecommerceUrl ~ ' успешно активирована.',
-  messageBody2: 'Для просмотра Ваших данных и всей информации, связанной с Вашей учетной записью, выполните вход из панели управления, раздел <a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">Редактировать профиль</a>',
-  messageBody3: "Надеемся скоро увидеть Вас на сайте " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  premessage: "Активация учетной записи",
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},"
+  messageBody1: "Сообщаем, что Ваша учетная запись на сайте {{ecommerceUrl}} успешно активирована.",
+  messageBody2: "Для просмотра Ваших данных и всей информации, связанной с Вашей учетной записью, выполните вход из панели управления, раздел <a href='{{ecommerceUrl}}' style='color: #000;'>Редактировать профиль</a>",
+  messageBody3: "Надеемся скоро увидеть Вас на сайте <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
     <strong>{{ languageSheet.premessage }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1, { '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br>
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageBody3, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -881,22 +885,22 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - Товар в наличии`,
       html: `
 {% set languageSheet = {
-  premessage: 'Товар в наличии <a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Уважаемый (-ая) ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
+  premessage: "Товар в наличии <a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},",
   messageBody1: "Товар, который вы так хотели, теперь доступен!",
   messageBody2: "Напоминаем вам, что данное письмо предоставляет ориентировочную информацию о наличии данного товара и зависит от многих факторов (заинтересованные лица, доступные единицы товара).",
   messageBody3: "Мы отправили это письмо всем покупателям, заинтересованным в этом товаре, поэтому он может быть распродан очень скоро.",
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
       {{ languageSheet.messageBody3 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
@@ -919,28 +923,28 @@ export const LANGUAGE_RU = {
       subject: `Добро пожаловать в  {{ blogSubscription.blogName }}!`,
       html: `
 {% set languageSheet = {
-  premessage: 'Добро пожаловать в ' ~ '<a href="' ~ blogSubscription.blogLink ~ '" style="color: #000;">' ~ blogSubscription.blogName ~ '</a>!',
+  premessage: "Добро пожаловать в <a href='{{blogLink}}' style='color: #000;'>{{blogName}}</a>!",
 
-  messageHeader: 'Уважаемый (-ая) ' ~ user.firstName ~ ' ' ~ user.lastName ~ ',',
-  messageBody1: 'Спасибо, что подписались на наш блог. Вскоре вы будете получать по электронной почте новые статьи, информацию о скидках, акциях, подарках и интересующую вас информацию, связанную с деятельностью интернет-магазина.',
-  messageBody2: "Надеемся скоро увидеть Вас на сайте " ~ '<a href="' ~ general.ecommerceUrl ~ '" style="color: #000;">' ~ general.ecommerceName ~ '</a>',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},"
+  messageBody1: "Спасибо, что подписались на наш блог. Вскоре вы будете получать по электронной почте новые статьи, информацию о скидках, акциях, подарках и интересующую вас информацию, связанную с деятельностью интернет-магазина.",
+  messageBody2: "Надеемся скоро увидеть Вас на сайте <a href='{{ecommerceUrl}}' style='color: #000;'>{{ecommerceName}}</a>",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{blogLink}}': blogSubscription.blogLink, '{{blogName}}': blogSubscription.blogName }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': user.firstName, '{{lastName}}': user.lastName }) }}<br><br>
       {{ languageSheet.messageBody1 }}<br>
-      {{ languageSheet.messageBody2 }}<br><br>
-      {{ languageSheet.messageSignature }}
+      {{ replace(languageSheet.messageBody2, { '{{ecommerceName}}': general.ecommerceName, '{{ecommerceUrl}}': general.ecommerceUrl }) }}<br><br>
+      {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
     </span>
   </td>
 </tr>`,
       footer: {
         html: `
 {% set languageSheet = {
-  moreInfo: 'Для получения дополнительной информации ознакомьтесь с нашей <a href="' ~ general.privacyPolicyLink ~ '">политикой конфиденциальности</a> и <a href="' ~ general.termsOfUseLink ~ '">условиями пользования</a>',
+  moreInfo: "Для получения дополнительной информации ознакомьтесь с нашей <a href='{{privacyPolicyLink}}'>политикой конфиденциальности</a> и <a href='{{termsOfUseLink}}'>условиями пользования</a>"
   unsubscribe: 'Отписаться от блога'
 } %}
         <tr>
@@ -1006,7 +1010,7 @@ export const LANGUAGE_RU = {
               {% endif %}
               <tr>
                 <td align="center" heigth="50" style="font-family: Arial, Helvetica, sans-serif; font-size: 11px; color: #999; height: 20px;">
-                  {{ languageSheet.moreInfo }}
+                  {{ replace(languageSheet.moreInfo, { '{{privacyPolicyLink}}': general.privacyPolicyLink, '{{termsOfUseLink}}': general.termsOfUseLink }) }}
                 </td>
               </tr>
             </table>
@@ -1044,20 +1048,20 @@ export const LANGUAGE_RU = {
       subject: `{{ general.ecommerceName }} - Подписка на акции`,
       html: `
 {% set languageSheet = {
-  premessage: 'Подписка на товарные запасы <br><a href="' ~ stockAlert.product.productLink ~ '" style="color: #000;">' ~ stockAlert.product.name ~ '</a>',
-  messageHeader: 'Уважаемый (-ая) ' ~ stockAlert.user.firstName ~ ' ' ~ stockAlert.user.lastName ~ ',',
-  messageBody1: "Вы подписались на уведомления об акциях от " ~ stockAlert.product.name,
+  premessage: "Подписка на товарные запасы <br><a href='{{productLink}}' style='color: #000;'>{{name}}</a>",
+  messageHeader: "Уважаемый (-ая) {{firstName}} {{lastName}},",
+  messageBody1: "Вы подписались на уведомления об акциях от {{name}}",
   messageBody2: "Если мы получим этот товар снова, мы немедленно сообщим вам об этом, чтобы вы не пропустили его.",
-  product: Товар,
-  price: 'Цена',
-  messageSignature: 'С уважением, персонал компании ' ~ general.ecommerceName
+  product: "Товар",
+  price: "Цена",
+  messageSignature: "С уважением, персонал компании {{ecommerceName}}"
 } %}
 <tr>
   <td style="padding: 20px 20px 20px 20px; color: #000; font-family: Arial, Helvetica, sans-serif; font-size: 18px; line-height: 20px; text-align: center;">
-    <strong>{{ languageSheet.premessage }}</strong><br><br>
+    <strong>{{ replace(languageSheet.premessage, { '{{productLink}}': stockAlert.product.productLink, '{{name}}': stockAlert.product.name }) }}</strong><br><br>
     <span style="font-size: 15px;">
-      {{ languageSheet.messageHeader }}<br><br>
-      {{ languageSheet.messageBody1 }}<br>
+      {{ replace(languageSheet.messageHeader, { '{{firstName}}': stockAlert.user.firstName, '{{lastName}}': stockAlert.user.lastName }) }}<br><br>
+      {{ replace(languageSheet.messageBody1. { '{{name}}': stockAlert.product.name }) }}<br>
       {{ languageSheet.messageBody2 }}<br><br>
     </span>
   </td>
@@ -1098,7 +1102,7 @@ export const LANGUAGE_RU = {
         <tr>
           <td style="text-align: center;">
             <br><br>
-            {{ languageSheet.messageSignature }}
+            {{ replace(languageSheet.messageSignature, { '{{ecommerceName}}': general.ecommerceName }) }}
           </td>
         </tr>
         <tr><td>&nbsp;</td></tr>