diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index f96987f3471..f51f3eddee8 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -135,12 +135,5 @@
         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 699503226cb..fedd8954785 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -51,6 +51,8 @@
                     <field name="name" string="Subject"/>
                     <field name="email_from" string="From"/>
                     <field name="user_id" string="Owner"/>
+                    <field name="message_id" string="Message" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -63,13 +65,14 @@
                 <search string="Email Search">
                     <field name="name" string="Subject"/>
                     <field name="date" />
-                    <field name="user_id" string="Owner"/>
+                    <field name="user_id" string="Owner" default="uid"/>
                     <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="Owner" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Message" icon="terp-personal" domain="[]" context="{'group_by':'message_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
@@ -132,6 +135,7 @@
             <field name="view_type">form</field>
             <field name="domain">[('history', '=', True)]</field>
             <field name="view_id" ref="view_mailgate_message_tree"/>
+            <field name="context">{"search_default_user_id":uid}</field>
         </record>
 
         <record model="ir.actions.act_window" id="action_view_mailgate_thread">
@@ -185,5 +189,14 @@
             view_id="view_mailgate_message_tree"
             />
 
+      <menuitem name="Mail" id="menu_base_config_mail"
+        parent="base.menu_base_partner" sequence="5" />
+
+    <menuitem name="Emails" id="menu_mailgate_message"
+        parent="menu_base_config_mail"
+        action="mail_gateway.action_view_mailgate_message"
+       />
+
+
     </data>
 </openerp>
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index afb9f82c3bc..231d599a801 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -108,8 +108,7 @@
       <field name="target">new</field>
     </record>
 
-    <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
-	<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config_mail" sequence="10" />
+	<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10" />
 	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird" parent="base.menu_base_config_plugins" sequence="10" />
 
   </data>