diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3ca0101fb88..d2c73e677c8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -208,7 +208,7 @@
                         icon="terp-document-new" type="action" />
                     <button string="Send New Email"
                         name="%(emails.action_email_compose_message_wizard)d"
-                        context="{'mail':'new', 'email_model':'crm.lead'}"
+                        context="{'email_model':'crm.lead'}"
                         icon="terp-mail-message-new" type="action"/>
                  </page>
                 </notebook>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 5e288143f5b..296d91563b3 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -193,7 +193,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'email_model': 'crm.lead'}"
+		                        context="{'email_model': 'crm.lead'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index bc1c1d87a1a..8a52f6568b6 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -199,7 +199,7 @@
                                     icon="terp-document-new" type="action" />
 			                    <button string="Send New Email"
 			                        name="%(emails.action_email_compose_message_wizard)d"
-			                        context="{'mail':'new', 'email_model':'crm.claim'}"
+			                        context="{'email_model':'crm.claim'}"
 			                        icon="terp-mail-message-new" type="action"/>
                             </page>
                         </notebook>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index bfae3c329c6..815cca6cb9c 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -188,7 +188,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'email_model':'crm.fundraising'}"
+		                        context="{'email_model':'crm.fundraising'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index d605b573e19..aac415aa9f3 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -140,7 +140,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'email_model':'crm.helpdesk'}"
+		                        context="{'email_model':'crm.helpdesk'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b1199f8d19c..d35d6efbe25 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -431,7 +431,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'email_model':'event.registration'}"
+		                        context="{'email_model':'event.registration'}"
 		                        icon="terp-mail-message-new" type="action"/>
                            </page>
                     </notebook>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a9057d92518..40cbfd44e73 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -185,7 +185,7 @@
                                 icon="terp-document-new" type="action" />
 	                    <button string="Send New Email"
 	                        name="%(emails.action_email_compose_message_wizard)d"
-	                        context="{'mail':'new', 'email_model': 'hr.applicant'}"
+	                        context="{'email_model': 'hr.applicant'}"
 	                        icon="terp-mail-message-new" type="action"/>
                  </page>
                  <page string="Notes">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0fb8c1f0ad3..2130d7fa8d5 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -142,7 +142,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'email_model':'project.issue'}"
+		                        context="{'email_model':'project.issue'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index c3a1228bb87..dcf614c5df4 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -109,7 +109,7 @@
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                                        <button name="%(emails.action_email_compose_message_wizard)d" context="{'mail':'new', 'email_model':'project.task'}" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
+                                                        <button name="%(emails.action_email_compose_message_wizard)d" context="{'email_model':'project.task'}" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
                                                     </group>
                                                  </page>
                                                 <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 28655d6ce0e..a49cad89b62 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -396,7 +396,7 @@
                         <field name="user_id"/>
                         <button name="%(emails.action_email_compose_message_wizard)d"
                                 string="Send Email" type="action" icon="terp-mail-message-new"
-                                context="{'mail':'new', 'email_model': 'project.scrum.meeting'}"/>
+                                context="{'email_model': 'project.scrum.meeting'}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">