diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 156ac40aa3a..7c054364583 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -422,7 +422,7 @@
                                        <field name="canal_id"/>
                                        <button
                                      string="Add a CC"
-		                                   	name="%(action_view_crm_email_add_cc_wizard)d"
+		                                   	name="%(crm.action_view_crm_email_add_cc_wizard)d"
 		                                   	icon="gtk-add" type="action"/>
                                    </group>
                                    <newline/>
@@ -477,7 +477,6 @@
             <field name="res_model">crm.case</field>
             <field name="view_type">form</field>
             <field name="domain">[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
         <menuitem action="crm_case_categ0-act_open" id="menu_crm_case_categ0-act_open" parent="crm.menu_crm_case_categ0-act" groups="base.group_extended_menu"/>
@@ -488,7 +487,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('user_id','=',uid)]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
         <menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52" groups="base.group_extended_menu"/>
@@ -498,7 +496,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('user_id','=',uid),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
-            <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
         <menuitem action="crm_case_categ0-act_my_open" id="menu_crm_case_categ0-act_my_open" parent="crm.menu_crm_case_categ0-act_my" groups="base.group_extended_menu"/>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index 612037d1c20..f20b4761ab0 100755
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -97,10 +97,14 @@
                    </group>
                     <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index 706e38602de..9bb8647d60d 100755
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -111,10 +111,14 @@
                    </group>
                     <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 1e96637eee9..7d1c0fac677 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -100,10 +100,14 @@
                    </group>
                     <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                        <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 1a0885440c5..7ab35e6b8cf 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -22,7 +22,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm.crm_case_calendar-view"/>
+        <field name="view_id" ref="crm_case_helpdesk_calendar_view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
@@ -32,36 +32,6 @@
         <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
     </record>
     <menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="menu_aftersale" action="crm_case_helpdesk_act111"/>    
-
-    <record model="ir.actions.act_window" id="crm_case_categ_help_act">
-        <field name="name">My Helpdesk</field>
-        <field name="res_model">crm.case</field>
-        <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid)]'"/>
-        <field name="context" eval="{'default_state':'open'}"/>
-        <field name="filter" eval="True"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_categ_help_act"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_calendar_view3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_helpdesk_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_categ_help_act"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view2">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_categ_help_act"/>
-    </record>
-    
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_helpdesk_view.xml b/addons/crm_configuration/crm_helpdesk_view.xml
index 63b7141eebe..99a6e1d4cd1 100644
--- a/addons/crm_configuration/crm_helpdesk_view.xml
+++ b/addons/crm_configuration/crm_helpdesk_view.xml
@@ -3,15 +3,15 @@
 <data>
 
     # ------------------------------------------------------ 
-    # Helpdisk Support
+    # Helpdesk Support
     # ------------------------------------------------------ 
 
     <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
-        <field name="name">CRM - Helpdisk Support Form</field>
+        <field name="name">CRM - Helpdesk Support Form</field>
         <field name="model">crm.case</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Helpdisk Support">
+            <form string="Helpdesk Support">
                 <group colspan="4" col="7">
                     <field colspan="2" name="name" select="1"/>
                     <field colspan="1" name="section_id" widget="selection"/>
@@ -95,10 +95,14 @@
                        </group>
                        <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                            <form string="Communication history">
-                               <group col="6" colspan="4">
+                               <group col="7" colspan="4">
                                    <field name="date"/>
                                    <field name="email"/>
                                    <field name="canal_id"/>
+                                   <button
+									   string="Add a CC"
+									    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+									    icon="gtk-add" type="action"/>
                                </group>
                                <newline/>
                                <field name="description" colspan="4" nolabel="1"/>
@@ -116,27 +120,12 @@
             </form>
         </field>
     </record>
-    
-    <record model="ir.ui.view" id="crm_case_helpdesk_calendar_view">
-        <field name="name">CRM - Helpdisk Support Calendar</field>
-        <field name="model">crm.case</field>
-        <field name="type">calendar</field>
-        <field name="priority" eval="2"/>
-        <field name="arch" type="xml">
-            <calendar string="Helpdisk Supports" date_start="date" color="user_id" date_delay="duration">
-                <field name="name"/>
-                <field name="partner_id"/>
-                <field name="categ_id"/>
-            </calendar>
-        </field>
-    </record>
-    
     <record model="ir.ui.view" id="crm_case_tree_view_helpdesk">
-        <field name="name">CRM - Helpdisk Support Tree</field>
+        <field name="name">CRM - Helpdesk Support Tree</field>
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Helpdisk Support Tree"  colors="red:state=='open'">
+            <tree string="Helpdesk Support Tree"  colors="red:state=='open'">
                 <field name="id"/>
                 <field name="name" string="Support Query"/>                
                 <field name="partner_id" string="Partner"/>
@@ -153,6 +142,20 @@
                 <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
             </tree>
         </field>
-    </record>    
+    </record>   
+    
+    <record model="ir.ui.view" id="crm_case_helpdesk_calendar_view">
+        <field name="name">CRM - Helpdesk Support Calendar</field>
+        <field name="model">crm.case</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Helpdesk Supports" date_start="date" color="user_id" date_delay="duration">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="categ_id"/>
+            </calendar>
+        </field>
+    </record> 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index c7a2f08c72a..b2b57e06c93 100755
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -119,10 +119,14 @@
                        </group>
                        <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								   name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								   icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 5efe38fa177..d5da665a399 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -111,10 +111,14 @@
                    </group>
                     <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 22fe5552413..5a920ad1df2 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -111,10 +111,14 @@
                    </group>
                     <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="7" colspan="4">
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
+                                <button
+								   string="Add a CC"
+								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>