diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 481e92ec134..f96987f3471 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -96,9 +96,9 @@
 
     <menuitem name="Inbound" id="menu_crm_case_phone_inbound"
         parent="crm.menu_crm_case_phone"
-        action="crm_case_categ_phone_incoming0" />
+        action="crm_case_categ_phone_incoming0"/>
 
-    <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
+        <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
         <field name="name">Outbound</field>
         <field name="res_model">crm.phonecall</field>
         <field name="view_type">form</field>
@@ -135,5 +135,12 @@
         parent="crm.menu_crm_case_phone"
         action="crm_case_categ_phone_outgoing0" />
 
+   <menuitem name="Emails" id="menu_mailgate_message"
+        parent="crm.menu_crm_case_phone"
+        action="mail_gateway.action_view_mailgate_message"
+        sequence="3"/>
+
+
+
 </data>
 </openerp>
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 203d9a942bf..699503226cb 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -10,13 +10,13 @@
                     <group colspan="4" col="6">
                         <field name="name" string="Subject" required="1" select="1"  widget="char" size="512"/>
                         <field name="date" required="1" select="1"/>
-                        <field name="user_id" string="Responsible" select="1"/>
+                        <field name="user_id" string="Owner" select="1"/>
                         <field name="partner_id" readonly="1" />
                     </group>
                     <notebook colspan="4">
                         <page string="Details">
                             <group col="2" colspan="2">
-                                <separator string="Email Details" colspan="4"/>
+                                <separator string="Email Followers" colspan="4"/>
                                 <field name="email_from" />
                                 <field name="email_to" widget="char" size="512"/>
                                 <field name="email_cc" widget="char" size="512"/>
@@ -50,7 +50,7 @@
                     <field name="date" />
                     <field name="name" string="Subject"/>
                     <field name="email_from" string="From"/>
-                    <field name="user_id" string="Responsible"/>
+                    <field name="user_id" string="Owner"/>
                 </tree>
             </field>
         </record>
@@ -63,13 +63,18 @@
                 <search string="Email Search">
                     <field name="name" string="Subject"/>
                     <field name="date" />
-                    <field name="user_id" />
-                    <field name="message_id" />
+                    <field name="user_id" string="Owner"/>
+                    <field name="description" />
+                    <newline/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Message" icon="terp-personal" domain="[]" context="{'group_by':'message_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
 
-
         <record model="ir.ui.view" id="view_mailgate_thread_form">
             <field name="name">mailgate.thread.form</field>
             <field name="model">mailgate.thread</field>
@@ -108,7 +113,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_mailgate_thread_tree">
+                <record model="ir.ui.view" id="view_mailgate_thread_tree">
             <field name="name">mailgate.thread.tree</field>
             <field name="model">mailgate.thread</field>
             <field name="type">tree</field>
@@ -128,7 +133,7 @@
             <field name="domain">[('history', '=', True)]</field>
             <field name="view_id" ref="view_mailgate_message_tree"/>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_view_mailgate_thread">
             <field name="name">Mailgateway Threads</field>
             <field name="res_model">mailgate.thread</field>
@@ -149,7 +154,7 @@
             <field name="view_id" ref="view_mailgate_thread_form"/>
             <field name="act_window_id" ref="action_view_mailgate_thread"/>
         </record>
-        
+
         <!--        Emailsaction-->
         <record model="ir.actions.act_window" id="action_view_mailgate_message">
             <field name="name">Emails</field>
@@ -159,7 +164,7 @@
             <field name="domain">[('history', '=', True)]</field>
             <field name="view_id" ref="view_mailgate_message_tree"/>
         </record>
-        
+
         <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
@@ -173,10 +178,6 @@
             <field name="act_window_id" ref="action_view_mailgate_thread"/>
         </record>
 
-        <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="4"/>
-        <menuitem id="menu_mailgate_message" name="Emails" action="action_view_mailgate_message"
-           parent="base.menu_base_config_mail" sequence="5" groups="base.group_system"/>
-
         <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
             id="act_res_partner_emails" name="Emails"
             res_model="mailgate.message"