diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index e3c3fd8f8c8..bc1dc0a7c4e 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -74,7 +74,6 @@ between mails and Open ERP.""",
 
         'wizard/crm_forward_to_partner_view.xml', 
         'wizard/crm_send_email_view.xml', 
-        'wizard/crm_email_add_cc_view.xml', 
         'crm_view.xml', 
 
         'crm_action_rule_view.xml', 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b6d8ae2ed51..c47b70afcba 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -155,14 +155,10 @@
                     <!-- TODO-->
                     <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="7" colspan="4">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
                                 <field name="email_to"/>
                                 <field name="email_from"/>
-                                <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/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3e7d6ac119b..d6cb7d4ddf4 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -172,15 +172,11 @@
                    </group>
                     <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="7" colspan="4">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
                                 <field name="email_to"/>
                                 <field name="email_from"/>
-                                <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
+							</group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 85347103f5d..4e8366ae29e 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -395,17 +395,12 @@
                            <group colspan="4">
                                <field colspan="4" name="email_cc" string="CC"/>
                            </group>
-                            <!-- TODO-->
-                           <!-- <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                           <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                                <form string="Communication history">
-                                   <group col="7" colspan="4">
+                                   <group col="6" colspan="4">
                                        <field name="date"/>
                                        <field name="email_to"/>
                                        <field name="email_from"/>
-                                       <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"/>
@@ -420,7 +415,7 @@
                                    <field name="email_to"/>
                                    <field name="date"/>
                                </tree>
-                           </field> -->
+                           </field>
                            <button colspan="4" string="Send New Email"
                                name="%(action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'crm.case'}"
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index a4650b1b866..f83a8177369 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -12,8 +12,6 @@
 "access_crm_case_categ_manager","crm.case.categ.manager","model_crm_case_categ","crm.group_crm_manager",1,1,1,1
 "access_crm_case_log_manager","crm.case.log manager","model_crm_case_log","crm.group_crm_manager",1,1,1,1
 "access_crm_case_history_manager","crm.case.history manager","model_crm_case_history","crm.group_crm_manager",1,1,1,1
-"access_crm_email_add_cc_manager","crm.email.add.cc","model_crm_email_add_cc","crm.group_crm_manager",1,1,1,1
-"access_crm_email_add_cc_user","crm.email.add.cc","model_crm_email_add_cc","crm.group_crm_user",1,0,0,0
 "access_crm_case_stage","crm.case.stage","model_crm_case_stage","crm.group_crm_user",1,0,0,0
 "access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
 "access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index a9067d9fa0b..e4eb233a9b8 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -21,7 +21,6 @@
 
 import crm_send_email
 import crm_forward_to_partner
-import crm_email_add_cc
 
 import crm_lead_to_partner
 import crm_lead_to_opportunity
diff --git a/addons/crm/wizard/crm_email_add_cc.py b/addons/crm/wizard/crm_email_add_cc.py
deleted file mode 100644
index f3a10b36ef2..00000000000
--- a/addons/crm/wizard/crm_email_add_cc.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-from tools.translate import _
-import tools
-
-class crm_email_add_cc_wizard(osv.osv_memory):
-    """ Email Add CC"""
-
-    _name = "crm.email.add.cc"
-    _description = "Email Add CC"
-
-    _columns = {
-        'name': fields.selection([('user', 'User'), ('partner', 'Partner'), \
-                         ('email', 'Email Address')], 'Send to', required=True), 
-        'user_id': fields.many2one('res.users', "User"), 
-        'partner_id': fields.many2one('res.partner', "Partner"), 
-        'email': fields.char('Email', size=32), 
-        'subject': fields.char('Subject', size=32), 
-    }
-
-    def on_change_email(self, cr, uid, ids, user, partner):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of Mail’s IDs
-        """
-
-        if (not partner and not user):
-            return {'value': {'email': False}}
-        email = False
-        if partner:
-            addr = self.pool.get('res.partner').address_get(cr, uid, [partner], ['contact'])
-            if addr and addr['contact']:
-                email = self.pool.get('res.partner.address').read(cr, uid, addr['contact'] , ['email'])['email']
-        elif user:
-            addr = self.pool.get('res.users').read(cr, uid, user, ['address_id'])['address_id']
-            if addr:
-                email = self.pool.get('res.partner.address').read(cr, uid, addr[0] , ['email'])['email']
-        return {'value': {'email': email}}
-
-
-    def add_cc(self, cr, uid, ids, context={}):
-        """
-        Adds CC value in case 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of create menu’s IDs
-        @param context: A standard dictionary for contextual values
-        """
-
-        data = self.read(cr, uid, ids[0])
-        email = data['email']
-        subject = data['subject']
-
-        if not context:
-            return {}
-        history_line = self.pool.get('crm.case.history').browse(cr, uid, context['active_id'])
-        model = history_line.log_id.model_id.model
-        model_pool = self.pool.get(model)
-        case = model_pool.browse(cr, uid, history_line.log_id.res_id)
-        body = history_line.description.replace('\n', '\n> ')
-        if not case.email_from:
-            raise osv.except_osv(_('Warning!'), ('No email Address defined for this case..'))
-        if not email:
-            raise osv.except_osv(_('Warning!'), ('Please Specify email address..'))
-        flag = tools.email_send(
-            case.user_id.address_id.email, 
-            [case.email_from], 
-            subject or '[' + str(case.id) + '] ' + case.name, 
-            model_pool.format_body(body), 
-            email_cc = [email], 
-            openobject_id = str(case.id), 
-            subtype = "html"
-        )
-
-        if flag:
-            model_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ',' + email or email})
-        else:
-            raise osv.except_osv(_('Email Fail!'), ("Lastest Email is not sent successfully"))
-        return {}
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {'type' : 'ir.actions.act_window_close'}
-
-crm_email_add_cc_wizard()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_email_add_cc_view.xml b/addons/crm/wizard/crm_email_add_cc_view.xml
deleted file mode 100644
index b017c9d9901..00000000000
--- a/addons/crm/wizard/crm_email_add_cc_view.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<openerp>
-    <data>
-
-        <!-- CRM Email Add CC Form View  -->
-
-        <record id="view_crm_email_add_cc_wizard" model="ir.ui.view">
-            <field name="name">Add CC</field>
-            <field name="model">crm.email.add.cc</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Send mail to CC">
-                	<separator colspan="4" string="Send mail to CC" />
-                    <field name="name" width="200" />
-                    <field name="subject" colspan="4" />
-                    <separator colspan="4" string="" />
-                    <group col="2" colspan="2" attrs="{ 'invisible' : [('name','!=','user')]}">
-                        <field name="user_id"
-                            attrs="{ 'required' : [('name','=','user')]}"
-                            on_change="on_change_email(user_id, partner_id)" />
-                    </group>
-                    <newline />
-                    <group col="2" colspan="2"
-                        attrs="{ 'invisible' : [('name','!=','partner')]}">
-                        <field name="partner_id"
-                            attrs="{'required' : [('name','=','partner')]}"
-                            on_change="on_change_email(user_id, partner_id)" />
-                    </group>
-                    <field colspan="4" name="email" attrs="{ 'required' : [('name','=','email')]}" />
-                    <separator colspan="4" string="" />
-                    <group col="2" colspan="4">
-                        <button name="action_cancel" special="cancel" string="Cancel" icon="gtk-cancel" type="object" />
-                        <button name="add_cc" string="_Forward" type="object" icon="gtk-ok" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <!-- CRM Email Add CC Action  -->
-
-        <record id="action_view_crm_email_add_cc_wizard" model="ir.actions.act_window">
-            <field name="name">Add CC</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">crm.email.add.cc</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 2b9148083b3..4228096e670 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -176,15 +176,11 @@
                    </group>
                     <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="7" colspan="4">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
                                 <field name="email_to"/>
                                 <field name="email_from"/>
-                               <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
+							</group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 963526e148f..4891636690a 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -189,15 +189,11 @@
                    </group>
                     <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                        <form string="Communication history">
-                            <group col="7" colspan="4">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
                                 <field name="email_to"/>
                                 <field name="email_from"/>
-                                <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
+							</group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 7bfb2d0a89c..e88a6dfec4c 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -120,15 +120,11 @@
                        </group>
                        <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                            <form string="Communication history">
-                               <group col="7" colspan="4">
+                               <group col="6" colspan="4">
                                    <field name="date"/>
                                    <field name="email_to"/>
                                    <field name="email_from"/>
-                                   <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
+								</group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index beb9467814c..396b1238572 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -148,15 +148,11 @@
                        </group>
                        <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="7" colspan="4">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
                                 <field name="email_to"/>
                                 <field name="email_from"/>
-                                <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
+							</group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 04168492d38..ea4bdce5b46 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -89,28 +89,29 @@
                                 <field name="active"/>
                             </group>
                             <field name="log_ids" nolabel="1" colspan="4">
-                                <form string="Actions">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name" colspan="4"/>
-                                    <field name="date" />
-                                    <field name="user_id" />
-                                </form>
-                            </field>
+		                        <tree string="Logs">
+		                            <field name="name" colspan="4"/>
+		                            <field name="date"/>
+		                            <field name="user_id"/>
+		                        </tree>
+		                        <form string="Logs">
+		                            <separator string="Action Information" colspan="4"/>
+		                            <field name="name" colspan="4"/>
+		                            <field name="date"/>
+		                            <field name="user_id"/>
+		                        </form>
+		                    </field>
                         </page>
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="CC"/>
                             </group>
-                            <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                                 <form string="Communication history">
-                                    <group col="7" colspan="4">
+                                    <group col="6" colspan="4">
                                         <field name="date"/>
                                         <field name="email_to"/>
                                         <field name="email_from"/>
-                                        <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"/>