diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index bc429fdfd50..723f5c06c22 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -21,7 +21,7 @@
     <data noupdate="1">
         <!--Email template -->
         <record id="email_template_edi_invoice" model="email.template">
-            <field name="name">Invoice - Send by mail</field>
+            <field name="name">Invoice - Send by Email</field>
             <field name="email_from">${object.user_id.email or object.company_id.email or 'noreply@localhost'}</field>
             <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
             <field name="email_recipients">${object.partner_id.id}</field>
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index f324cede835..92611cea180 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -20,9 +20,9 @@
 
         <!--Email template -->
         <record id="email_template_edi_sale" model="email.template">
-            <field name="name">Sale Order - Send by mail</field>
+            <field name="name">Sale Order - Send by Email</field>
             <field name="email_from">${object.user_id.email or ''}</field>
-            <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
+            <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
             <field name="email_recipients">${object.partner_invoice_id.id}</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="auto_delete" eval="True"/>