diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 3623dce3977..1607e69799a 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -221,14 +221,15 @@
             <field name="relation_field">section_id</field>
         </record>
 
-        <!--Definition of an email template with an empty body that will be used in opportunity mailing. Used to give a
-            basis for email recipients, name and to ease the definition of a further elaborated template. -->
+        <!--Definition of an email template with an empty body that will be used in opportunity mailing.
+            Used to give a basis for email recipients, name and to ease the definition of a further
+            elaborated template.  -->
         <record id="lead_template" model="email.template">
             <field name="name">Lead/Opportunity Mass Mail</field>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field name="auto_delete" eval="True"/>
             <field name="partner_to">${object.partner_id and object.partner_id.id}</field>
-            <field name="email_to">${! object.partner_id and object.email}</field>
+            <field name="email_to">${not object.partner_id and object.email_from}</field>
             <field name="body_html"></field>
         </record>
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 1d659bd9cd7..8f40ca2b1a5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -597,8 +597,8 @@
                             'default_template_id': ref('crm.lead_template'),
                         }"/>
 
-        <!--Definition of an email template with an empty body that will be used in opportunity mailing. Used to give a
-            basis for email recipients, name and to ease the definition of a further elaborated template. -->
+        <!--Update of email_template defined in crm_lead_data, to add ref_ir_act_window
+            allowing to have a well formed email template (context action considered as set). -->
         <record id="lead_template" model="email.template">
             <field name="ref_ir_act_window" ref="crm.action_lead_mass_mail"/>
         </record>