diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c1d64f1b6e3..7a9c45f11e2 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -161,16 +161,21 @@
                                 <field name="email_to"/>
                                 <field name="email_from"/>
                             </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
+                            <notebook colspan="4">
+                                <page string="Details">
+                                    <field name="description" colspan="4" nolabel="1"/>
+                                </page>
+                                <page string="Attachments">
+                                    <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                </page>
+                            </notebook>
                             <button colspan="4"
-                                string="Reply to Last Email"
-                                name="%(action_crm_send_mail)d"
-                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                icon="gtk-undo" type="action" />
+                            string="Reply to Last Email"
+                            name="%(crm.action_crm_send_mail)d"
+                            context="{'mail':'reply', 'model': 'crm.lead'}"
+                            icon="gtk-undo" type="action" />
                         </form>
                         <tree string="Communication history">
-                            <field name="name" />
                             <field name="date"/>
                             <field name="email_from" />
                             <field name="email_to"/>
@@ -178,7 +183,7 @@
                         </tree>
                     </field>
                     <button colspan="2" string="Send New Email"
-                        name="%(action_crm_send_mail)d"
+                        name="%(crm.action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}"
                         icon="gtk-go-forward" type="action" />
                     <button colspan="2" string="Forward to Partner"
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 1f0c97e9b56..ecabf5f57f8 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+    <data>
 
-<!-- Opportunity Categories Form View -->
+        <!-- Opportunity Categories Form View -->
 
-    <record id="crm_opportunity_categ_action" model="ir.actions.act_window">
-        <field name="name">Opportunity Categories</field>
-        <field name="res_model">crm.case.categ</field>
-        <field name="view_type">form</field>
-        <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-        <field name="context">{'object_id':'crm.lead'}</field>
-    </record>
+        <record id="crm_opportunity_categ_action" model="ir.actions.act_window">
+            <field name="name">Opportunity Categories</field>
+            <field name="res_model">crm.case.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
+            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+            <field name="context">{'object_id':'crm.lead'}</field>
+        </record>
 
-    <menuitem action="crm_opportunity_categ_action"
-        id="menu_crm_case_opportunity-act"
-        parent="crm.menu_crm_case_categ" />
+        <menuitem action="crm_opportunity_categ_action"
+            id="menu_crm_case_opportunity-act"
+            parent="crm.menu_crm_case_categ" />
 
-<!-- Opportunity Stages Form View-->
+        <!-- Opportunity Stages Form View-->
 
         <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
             <field name="name">Opportunity Stages</field>
@@ -32,7 +32,7 @@
             id="menu_crm_opportunity_stage_act"
             parent="crm.menu_crm_case_stage" />
 
-<!-- Opportunity Resource Type Form View -->
+    <!-- Opportunity Resource Type Form View -->
 
         <record id="crm_opportunity_resource_act" model="ir.actions.act_window">
             <field name="name">Opportunity Resource Type</field>
@@ -47,333 +47,339 @@
             id="menu_crm_opportunity_resource_act"
             parent="crm.menu_crm_case_resource_type" />
 
-<!-- Opportunities Form View -->
+        <!-- Opportunities Form View -->
 
-    <record model="ir.ui.view" id="crm_case_form_view_oppor">
-        <field name="name">Opportunities</field>
-        <field name="model">crm.lead</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Opportunities">
-                <group colspan="4" col="7">
-                    <field name="name"  required="1" string="Opportunity"/>
-                    <label string="Stage:" align="1.0"/>
-                    <group colspan="1" col="4">
-                        <field name="stage_id" nolabel="1"
-                            on_change="onchange_stage_id(stage_id)"
-                            widget="selection"
-                            domain="[('object_id.model', '=', 'crm.lead')]" />
-                        <button name="stage_previous"
+            <record model="ir.ui.view" id="crm_case_form_view_oppor">
+                <field name="name">Opportunities</field>
+                <field name="model">crm.lead</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+                    <form string="Opportunities">
+                        <group colspan="4" col="7">
+                            <field name="name"  required="1" string="Opportunity"/>
+                            <label string="Stage:" align="1.0"/>
+                            <group colspan="1" col="4">
+                                <field name="stage_id" nolabel="1"
+                                on_change="onchange_stage_id(stage_id)"
+                                widget="selection"
+                                domain="[('object_id.model', '=', 'crm.lead')]" />
+                                <button name="stage_previous"
+                                states="open,pending" type="object"
+                                icon="gtk-go-back" string="" />
+                                <button name="stage_next" states="open,pending"
+                                type="object" icon="gtk-go-forward" string="" />
+                            </group>
+                            <field name="user_id"/>
+
+                            <button name="action_makeMeeting" type="object"
+                            string="Schedule Meeting" icon="gtk-redo" />
+
+                            <field name="planned_revenue"/>
+                            <field name="probability"/>
+                            <field name="date_deadline" string="Expected Closing"/>
+                            <button string="Schedule Call"
+                            name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action"  />
+                            <newline/>
+                            <field name="date_action"/>
+                            <field name="priority" string="Priority"/>
+                        </group>
+                        <notebook colspan="4">
+                        <page string="Opportunity">
+                            <group col="4" colspan="2">
+                                <separator colspan="4" string="Contacts"/>
+                                <field name="partner_id" select="1"
+                                on_change="onchange_partner_id(partner_id, email_from)"
+                                colspan="2" />
+                                <field name="partner_address_id"
+                                string="Contact"
+                                on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                colspan="1" />
+                                <field name="email_from" string="Email" />
+                                <field name="phone"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Categorization"/>
+                                <field name="section_id" colspan="1" widget="selection"/>
+                                <field name="categ_id" select="1" groups="base.group_extended"
+                                string="Category" widget="selection"
+                                domain="[('object_id.model', '=', 'crm.lead')]" />
+                            </group>
+
+                            <separator colspan="4" string="Details"/>
+                            <field name="description" nolabel="1" colspan="4"/>
+
+                            <separator colspan="4"/>
+                            <group col="8" colspan="4">
+                                <field name="state"/>
+                                <button name="case_open" string="Open"
+                                    states="draft,pending" type="object"
+                                    icon="gtk-go-forward" />
+                                <button name="case_pending" string="Pending"
+                                    states="draft,open" type="object"
+                                    icon="gtk-media-pause" />
+                                <button name="case_escalate" string="Escalate"
+                                    states="open,draft,pending" type="object"
+                                    groups="base.group_extended"
+                                    icon="gtk-go-up" />
+                                <button name="case_cancel" string="Mark Lost"
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-close" />
+                                <button name="case_close" string="Mark Won"
+                                    states="open,draft,pending" type="object"
+                                    icon="gtk-apply" />
+                                <button name="case_reset" string="Reset to New"
+                                    states="done,cancel" type="object"
+                                    icon="gtk-convert" />
+                            </group>
+                        </page>
+
+                        <page string="Emails" groups="base.group_extended">
+                            <group colspan="4">
+                                <field colspan="4" name="email_cc" string="CC"/>
+                            </group>
+                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree" height="280">
+                                <form string="Communication history">
+                                    <group col="6" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="description" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Attachments">
+                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                    <button colspan="4"
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'crm.lead'}"
+                                    icon="gtk-undo" type="action" />
+                                </form>
+                                <tree string="Communication history">
+		                            <field name="date"/>
+		                            <field name="email_from" />
+		                            <field name="email_to"/>
+		                            <field name="description"/>
+                                </tree>
+                            </field>
+                            <button colspan="2" string="Send New Email"
+                                name="%(crm.action_crm_send_mail)d"
+                                context="{'mail':'new', 'model': 'crm.lead'}"
+                                icon="gtk-go-forward" type="action" />
+                            <button colspan="2" string="Forward to Partner"
+                                name="%(crm_lead_forward_to_partner_act)d"
+                                icon="gtk-go-forward" type="action" />
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="create_date"/>
+                                <field name="write_date"/>
+                                <field name="date_closed"/>
+                                <field name="date_open"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Misc" colspan="2"/>
+                                <field name="active"/>
+                                <field name="day_open"/>
+                                <field name="day_close"/>
+                                <field name="referred"/>
+                            </group>
+                            <separator colspan="4" string="References"/>
+                            <field name="ref"/>
+                            <field name="ref2"/>
+                            <field name="log_ids" nolabel="1" colspan="4">
+                                <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>
+                        </notebook>
+                    </form>
+                </field>
+            </record>
+
+        <!-- Opportunities Tree View -->
+
+            <record model="ir.ui.view" id="crm_case_tree_view_oppor">
+                <field name="name">Opportunities Tree</field>
+                <field name="model">crm.lead</field>
+                <field name="type">tree</field>
+                <field name="arch" type="xml">
+                    <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline &lt; current_date">
+                        <field name="date_deadline" invisible="1"/>
+                        <field name="create_date"/>
+                        <field name="name" string="Opportunity"/>
+                        <field name="partner_id"/>
+                        <field name="stage_id"/>
+                        <field name="categ_id" invisible="1" groups="base.group_extended"/>
+                        <button name="stage_previous" string="Previous"
+                            states="open,pending" type="object" icon="gtk-go-back" />
+                        <button name="stage_next" string="Next"
                             states="open,pending" type="object"
-                            icon="gtk-go-back" string="" />
-                        <button name="stage_next" states="open,pending"
-                            type="object" icon="gtk-go-forward" string="" />
-                    </group>
-                    <field name="user_id"/>
-
-                       <button name="action_makeMeeting" type="object"
-                        string="Schedule Meeting" icon="gtk-redo" />
-
-                    <field name="planned_revenue"/>
-                    <field name="probability"/>
-                    <field name="date_deadline" string="Expected Closing"/>
-                    <button string="Schedule Call"
-                        name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action"  />
-
-                    <newline/>
-                    <field name="date_action"/>
-                    <field name="priority" string="Priority"/>
-                </group>
-                <notebook colspan="4">
-                <page string="Opportunity">
-                    <group col="4" colspan="2">
-                        <separator colspan="4" string="Contacts"/>
-                        <field name="partner_id" select="1"
-                            on_change="onchange_partner_id(partner_id, email_from)"
-                            colspan="2" />
-                        <field name="partner_address_id"
-                            string="Contact"
-                            on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                            colspan="1" />
-                        <field name="email_from" string="Email" />
-                        <field name="phone"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Categorization"/>
-                        <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="categ_id" select="1" groups="base.group_extended"
-                            string="Category" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.lead')]" />
-                    </group>
-
-                    <separator colspan="4" string="Details"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
+                            icon="gtk-go-forward" />
+                        <field name="planned_revenue" sum="Total of Planned Revenue"/>
+                        <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
+                        <field name="date_action"/>
+                        <field name="section_id" groups="base.group_extended"/>
+                        <field name="user_id"/>
+                        <field name="priority"/>
                         <field name="state"/>
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"
                             icon="gtk-go-forward" />
-                        <button name="case_pending" string="Pending"
-                            states="draft,open" type="object"
-                            icon="gtk-media-pause" />
-                        <button name="case_escalate" string="Escalate"
-                            states="open,draft,pending" type="object"
-                            groups="base.group_extended"
-                            icon="gtk-go-up" />
-                        <button name="case_cancel" string="Mark Lost"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-close" />
-                        <button name="case_close" string="Mark Won"
+                        <button name="case_close" string="Won"
                             states="open,draft,pending" type="object"
                             icon="gtk-apply" />
-                        <button name="case_reset" string="Reset to New"
-                            states="done,cancel" type="object"
-                            icon="gtk-convert" />
-                    </group>
-                </page>
-
-                 <page string="Emails" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
-                   </group>
-                    <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email_to"/>
-                                <field name="email_from"/>
-							</group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                       string="Reply to Last Email"
-                                       name="%(action_crm_send_mail)d"
-                                       context="{'mail':'reply', 'model': 'crm.lead'}"
-                                       icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
-                           <button colspan="2" string="Send New Email"
-                               name="%(action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'crm.lead'}"
-                               icon="gtk-go-forward" type="action" />
-                           <button colspan="2" string="Forward to Partner"
-                               name="%(crm_lead_forward_to_partner_act)d"
-                               icon="gtk-go-forward" type="action" />
-                 </page>
-                <page string="History" groups="base.group_extended">
-                    <group col="2" colspan="2">
-                        <separator string="Dates" colspan="2"/>
-                        <field name="create_date"/>
-                        <field name="write_date"/>
-                        <field name="date_closed"/>
-                        <field name="date_open"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Misc" colspan="2"/>
-                        <field name="active"/>
-                        <field name="day_open"/>
-                        <field name="day_close"/>
-                        <field name="referred"/>
-                    </group>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref"/>
-                    <field name="ref2"/>
-                    <field name="log_ids" nolabel="1" colspan="4">
-                    	 <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>
-                </notebook>
-            </form>
-        </field>
-    </record>
-
-<!-- Opportunities Tree View -->
-
-    <record model="ir.ui.view" id="crm_case_tree_view_oppor">
-        <field name="name">Opportunities Tree</field>
-        <field name="model">crm.lead</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline &lt; current_date">
-                <field name="date_deadline" invisible="1"/>
-                <field name="create_date"/>
-                <field name="name" string="Opportunity"/>
-                <field name="partner_id"/>
-                <field name="stage_id"/>
-                <field name="categ_id" invisible="1" groups="base.group_extended"/>
-                <button name="stage_previous" string="Previous"
-                    states="open,pending" type="object" icon="gtk-go-back" />
-                <button name="stage_next" string="Next"
-                    states="open,pending" type="object"
-                    icon="gtk-go-forward" />
-                <field name="planned_revenue" sum="Total of Planned Revenue"/>
-                <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                <field name="date_action"/>
-                <field name="section_id" groups="base.group_extended"/>
-                <field name="user_id"/>
-                <field name="priority"/>
-                <field name="state"/>
-                <button name="case_open" string="Open"
-                    states="draft,pending" type="object"
-                    icon="gtk-go-forward" />
-                <button name="case_close" string="Won"
-                    states="open,draft,pending" type="object"
-                    icon="gtk-apply" />
-                <button name="case_pending" string="Pending"
-                    states="open,draft" type="object"
-                    icon="gtk-media-pause" />
-                <button name="case_cancel" string="Lost"
-                    states="draft,open,pending" type="object"
-                    icon="gtk-cancel" />
-            </tree>
-        </field>
-    </record>
-
-<!-- Opportunities Graph View -->
-
-    <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
-        <field name="name">CRM - Opportunity Graph</field>
-        <field name="model">crm.lead</field>
-        <field name="type">graph</field>
-        <field name="arch" type="xml">
-            <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
-                <field name="categ_id"/>
-                <field name="planned_revenue" operator="+"/>
-                <field name="state" group="True"/>
-            </graph>
-        </field>
-    </record>
-
-<!-- Opportunities Search View -->
-
-    <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
-        <field name="name">CRM - Opportunities Search</field>
-        <field name="model">crm.lead</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Opportunities">
-                <filter icon="terp-project"
-                    string="Current"
-                    name="current"
-                    domain="[('state','in',('draft','open'))]"/>
-                <filter icon="terp-project"
-                    string="Open"
-                    domain="[('state','=','open')]"/>
-                <filter icon="terp-project"
-                    string="Pending"
-                    domain="[('state','=','pending')]"/>
-                <separator orientation="vertical"/>
-                <filter icon="gtk-home" string="Today"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
-                    help="Todays' Opportunities" />
-                <filter icon="gtk-media-rewind" string="7 Days"
-                    help="Opportunities during last 7 days"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
-                         ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                />
-                <separator orientation="vertical"/>
-                <field name="name" string="Opportunity"/>
-                <field name="user_id" widget="selection">
-                    <filter icon="terp-partner"
-                        domain="[('user_id','=', False)]"
-                        help="Unassigned Opportunities" />
+                        <button name="case_pending" string="Pending"
+                            states="open,draft" type="object"
+                            icon="gtk-media-pause" />
+                        <button name="case_cancel" string="Lost"
+                            states="draft,open,pending" type="object"
+                            icon="gtk-cancel" />
+                    </tree>
                 </field>
-                <field name="section_id"
-                    default="context.get('section_id', False)" select="1"
-                    widget="selection">
-                    <filter icon="terp-crm"
-                        domain="[('section_id','=',context.get('section_id',False))]"
-                        help="My Sale Team" />
-                </field>
-                <newline/>
-                <group expand="0" string="Group By..." colspan="16">
-                    <filter string="Stage" icon="terp-crm" domain="[]"
-                        context="{'group_by':'stage_id'}" />
-                    <filter string="Priority" icon="terp-crm" domain="[]"
-                        context="{'group_by':'priority'}" />
-                    <filter string="Category" icon="terp-crm"
-                        domain="[]" context="{'group_by':'categ_id'}" />
+            </record>
 
-                    <separator orientation="vertical" />
-                    <filter string="Salesman" icon="terp-crm"
-                        domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" />
-                    <separator orientation="vertical" />
-                    <filter string="Creation" icon="terp-project"
-                        domain="[]" context="{'group_by':'create_date'}" />
-                    <filter string="Exp.Closing" icon="terp-project"
-                        domain="[]" context="{'group_by':'date_deadline'}" />
-                </group>
-           </search>
-        </field>
-    </record>
+        <!-- Opportunities Graph View -->
+
+            <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
+                <field name="name">CRM - Opportunity Graph</field>
+                <field name="model">crm.lead</field>
+                <field name="type">graph</field>
+                <field name="arch" type="xml">
+                    <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
+                        <field name="categ_id"/>
+                        <field name="planned_revenue" operator="+"/>
+                        <field name="state" group="True"/>
+                    </graph>
+                </field>
+            </record>
+
+        <!-- Opportunities Search View -->
+
+            <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
+                <field name="name">CRM - Opportunities Search</field>
+                <field name="model">crm.lead</field>
+                <field name="type">search</field>
+                <field name="arch" type="xml">
+                    <search string="Search Opportunities">
+                        <filter icon="terp-project"
+                            string="Current"
+                            name="current"
+                            domain="[('state','in',('draft','open'))]"/>
+                        <filter icon="terp-project"
+                            string="Open"
+                            domain="[('state','=','open')]"/>
+                        <filter icon="terp-project"
+                            string="Pending"
+                            domain="[('state','=','pending')]"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="gtk-home" string="Today"
+                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
+                            help="Todays' Opportunities" />
+                        <filter icon="gtk-media-rewind" string="7 Days"
+                            help="Opportunities during last 7 days"
+                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
+                                ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                        />
+                        <separator orientation="vertical"/>
+                        <field name="name" string="Opportunity"/>
+                        <field name="user_id" widget="selection">
+                            <filter icon="terp-partner"
+                                domain="[('user_id','=', False)]"
+                                help="Unassigned Opportunities" />
+                        </field>
+                        <field name="section_id"
+                            default="context.get('section_id', False)" select="1"
+                            widget="selection">
+                            <filter icon="terp-crm"
+                                domain="[('section_id','=',context.get('section_id',False))]"
+                                help="My Sale Team" />
+                        </field>
+                        <newline/>
+                        <group expand="0" string="Group By..." colspan="16">
+                            <filter string="Stage" icon="terp-crm" domain="[]"
+                                context="{'group_by':'stage_id'}" />
+                            <filter string="Priority" icon="terp-crm" domain="[]"
+                                context="{'group_by':'priority'}" />
+                            <filter string="Category" icon="terp-crm"
+                                domain="[]" context="{'group_by':'categ_id'}" />
+
+                            <separator orientation="vertical" />
+                            <filter string="Salesman" icon="terp-crm"
+                                domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Creation" icon="terp-project"
+                                domain="[]" context="{'group_by':'create_date'}" />
+                            <filter string="Exp.Closing" icon="terp-project"
+                                domain="[]" context="{'group_by':'date_deadline'}" />
+                        </group>
+                    </search>
+                </field>
+            </record>
     
     <!--  Partners inherited form -->
 
-		<record id="view_opp_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.opportunity.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-               		<field name="phonecall_ids" position="after">
-               			<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
-               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
-				                <field name="create_date"/>
-				                <field name="partner_name"/>
-				                <field name="name"/>
-				                <field name="email_from"/>
-				                <field name="phone"/>
-				
-				                <field name="categ_id" invisible="1"/>
-				                <field name="type_id" invisible="1"/>
-				                <field name="referred" invisible="1"/>
-				
-				                <field name="stage_id"/>
-				                <button name="stage_previous" string="Previous"
-				                    states="open,pending" type="object" icon="gtk-go-back" />
-				                <button name="stage_next" string="Next"
-				                    states="open,pending" type="object"
-				                    icon="gtk-go-forward" />
-				                <field name="section_id"
-				                    invisible="context.get('invisible_section', True)" />
-				                <field name="user_id" />
-				                <field name="state" />
-				                <button name="case_open" string="Open"
-				                    states="draft,pending" type="object"
-				                    icon="gtk-go-forward" />
-				                <button name="case_close" string="Close"
-				                    states="open,draft,pending" type="object"
-				                    icon="gtk-close" />
-				                <button string="Convert to Opportunity"
-				                    name="convert_opportunity"
-				                    states="draft,open,pending" icon="gtk-index"
-				                    type="object" />
-				                <button name="case_escalate" string="Escalate"
-				                    states="open,draft,pending" type="object"
-				                    icon="gtk-go-up" />
-				                <button name="case_cancel" string="Cancel"
-				                    states="draft,open,pending" type="object"
-				                    icon="gtk-cancel" />
-				            </tree>
-               			</field>
-               		</field>
+            <record id="view_opp_partner_info_form" model="ir.ui.view">
+                <field name="name">res.partner.opportunity.info.inherit</field>
+                <field name="model">res.partner</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="base.view_partner_form"/>
+                <field name="arch" type="xml">
+                    <field name="phonecall_ids" position="after">
+                       <field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
+                           <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+                            <field name="create_date"/>
+                            <field name="partner_name"/>
+                            <field name="name"/>
+                            <field name="email_from"/>
+                            <field name="phone"/>
+            
+                            <field name="categ_id" invisible="1"/>
+                            <field name="type_id" invisible="1"/>
+                            <field name="referred" invisible="1"/>
+            
+                            <field name="stage_id"/>
+                            <button name="stage_previous" string="Previous"
+                                states="open,pending" type="object" icon="gtk-go-back" />
+                            <button name="stage_next" string="Next"
+                                states="open,pending" type="object"
+                                icon="gtk-go-forward" />
+                            <field name="section_id"
+                                invisible="context.get('invisible_section', True)" />
+                            <field name="user_id" />
+                            <field name="state" />
+                            <button name="case_open" string="Open"
+                                states="draft,pending" type="object"
+                                icon="gtk-go-forward" />
+                            <button name="case_close" string="Close"
+                                states="open,draft,pending" type="object"
+                                icon="gtk-close" />
+                            <button string="Convert to Opportunity"
+                                name="convert_opportunity"
+                                states="draft,open,pending" icon="gtk-index"
+                                type="object" />
+                            <button name="case_escalate" string="Escalate"
+                                states="open,draft,pending" type="object"
+                                icon="gtk-go-up" />
+                            <button name="case_cancel" string="Cancel"
+                                states="draft,open,pending" type="object"
+                                icon="gtk-cancel" />
+                        </tree>
+                    </field>
+                </field>
             </field>
         </record>
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7a3dd4cc829..6925347c887 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -174,31 +174,38 @@
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
-                    <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email_to"/>
-                                <field name="email_from"/>
-							</group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                       string="Reply to Last Email"
-                                       name="%(crm.action_crm_send_mail)d"
-                                       context="{'mail':'reply', 'model': 'crm.claim'}"
-                                       icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
-                           <button colspan="4" string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'crm.claim'}"
-                               icon="gtk-go-forward" type="action" />
+                   <field name="message_ids" colspan="4" nolabel="1" mode="form,tree" height="280">
+                                <form string="Communication history">
+                                    <group col="6" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="description" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Attachments">
+                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                    <button colspan="4"
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'crm.lead'}"
+                                    icon="gtk-undo" type="action" />
+                                </form>
+                                <tree string="Communication history">
+                                    <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
+                                </tree>
+                         </field>
+                   <button colspan="4" string="Send New Email"
+                       name="%(crm.action_crm_send_mail)d"
+                       context="{'mail':'new', 'model': 'crm.claim'}"
+                       icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 68fcd768d74..542588d9190 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -195,18 +195,25 @@
                                         <field name="email_to"/>
                                         <field name="email_from"/>
                                     </group>
-                                    <newline/>
-                                    <field name="description" colspan="4" nolabel="1"/>
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="description" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Attachments">
+                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        </page>
+                                    </notebook>
                                     <button colspan="4"
-                                        string="Reply to Last Email"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'crm.fundraising'}"
-                                        icon="gtk-undo" type="action" />
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'crm.lead'}"
+                                    icon="gtk-undo" type="action" />
                                 </form>
                                 <tree string="Communication history">
-                                    <field name="description"/>
-                                    <field name="email_to"/>
                                     <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
                                 </tree>
                             </field>
                             <button colspan="4" string="Send New Email"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 27ccee6ef0d..681b396afb9 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -135,18 +135,25 @@
                                         <field name="email_to"/>
                                         <field name="email_from"/>
                                     </group>
-                                    <newline/>
-                                    <field name="description" colspan="4" nolabel="1"/>
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="description" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Attachments">
+                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        </page>
+                                    </notebook>
                                     <button colspan="4"
-                                        string="Reply to Last Email"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'crm.helpdesk'}"
-                                        icon="gtk-undo" type="action" />
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'crm.lead'}"
+                                    icon="gtk-undo" type="action" />
                                 </form>
                                 <tree string="Communication history">
-                                    <field name="description"/>
-                                    <field name="email_to"/>
                                     <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
                                 </tree>
                             </field>
                             <button colspan="4" string="Send New Email"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 37ac26ac7b4..5f93dbb4a72 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -223,25 +223,32 @@
                     <page string="History">
                         <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
 	                        <form string="Communication history">
-							    <group col="6" colspan="4">
-							        <field name="date"/>
-							        <field name="email_to"/>
-							        <field name="email_from"/>
-								</group>
-							   <newline/>
-							   <field name="description" colspan="4" nolabel="1"/>
-							   <button colspan="4"
-							       string="Reply to Last Email"
-							       name="%(crm.action_crm_send_mail)d"
-							       context="{'mail':'reply', 'model': 'crm.lead'}"
-							       icon="gtk-undo" type="action" />
-							</form>
-							<tree string="Communication history">
-							   <field name="description"/>
-							   <field name="email_to"/>
-							   <field name="date"/>
-							</tree>
-                        </field>
+                                    <group col="6" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="description" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Attachments">
+                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                    <button colspan="4"
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'crm.lead'}"
+                                    icon="gtk-undo" type="action" />
+                                </form>
+                                <tree string="Communication history">
+                                    <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
+                                </tree>
+                            </field>
                         <field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
                             <tree string="Actions">
                                 <separator string="Action Information" colspan="4"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a3bf7a08ab9..768726fd05c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -152,26 +152,33 @@
                            <field colspan="4" name="email_cc" string="CC"/>
                        </group>
                        <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email_to"/>
-                                <field name="email_from"/>
-							</group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(crm.action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'hr.applicant'}"
-                                   	icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
+                           <form string="Communication history">
+                                    <group col="6" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="description" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Attachments">
+                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                    <button colspan="4"
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'crm.lead'}"
+                                    icon="gtk-undo" type="action" />
+                                </form>
+                                <tree string="Communication history">
+                                    <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
+                                </tree>
+                            </field>
                            <button colspan="4" string="Send New Email"
                            	name="%(crm.action_crm_send_mail)d"
                            	context="{'mail':'new', 'model': 'hr.applicant'}"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 210ad4ee737..68f58c78edb 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -112,20 +112,27 @@
                                         <field name="date"/>
                                         <field name="email_to"/>
                                         <field name="email_from"/>
-                                   </group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(crm.action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'project.issue'}"
-                                   	icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="description" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Attachments">
+                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                    <button colspan="4"
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'crm.lead'}"
+                                    icon="gtk-undo" type="action" />
+                                </form>
+                                <tree string="Communication history">
+                                    <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
+                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
                            	name="%(crm.action_crm_send_mail)d"