diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 869db68cbd2..90f11c63257 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Discuss',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Productivity/Discuss',
     'sequence': 145,
     'summary': 'Chat, mail gateway and private channels',
diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml
index f414646572d..da5cc279ede 100644
--- a/addons/mail/views/res_partner_views.xml
+++ b/addons/mail/views/res_partner_views.xml
@@ -90,16 +90,6 @@
             </field>
         </record>
 
-        <!--Definition of an email template with an empty body that will be used in partner mailing. Used to give a
-            basis for email recipients, name and to ease the definition of a further elaborated template. -->
-        <record id="email_template_partner" model="mail.template">
-            <field name="name">Partner Mass Mail</field>
-            <field name="model_id" ref="base.model_res_partner"/>
-            <field name="partner_to">${object.id}</field>
-            <field name="auto_delete" eval="True"/>
-            <field name="lang">${object.lang}</field>
-        </record>
-
         <!-- Add mail-defined activity view to standard action on partners to manage activities related to partner model -->
         <record id="base.action_partner_form" model="ir.actions.act_window">
             <field name="view_mode">kanban,tree,form,activity</field>
@@ -120,16 +110,12 @@
             <field name="context" eval="{
                 'default_composition_mode': 'mass_mail',
                 'default_partner_to': '${object.id or \'\'}',
-                'default_use_template': True,
-                'default_template_id': ref('email_template_partner'),
+                'default_use_template': False,
+                'default_no_auto_thread': True,
             }"/>
             <field name="binding_model_id" ref="base.model_res_partner"/>
             <field name="binding_view_types">list</field>
         </record>
 
-        <record id="email_template_partner" model="mail.template">
-            <field name="ref_ir_act_window" ref="action_partner_mass_mail"/>
-        </record>
-
     </data>
 </odoo>