diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 5b14b6d15ec..77748adf017 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -58,10 +58,11 @@ class email_server(osv.osv):
         'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'note': fields.text('Description'),
         'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]", 
-                                    help="A Email Server Action. It will be run whenever an e-mail is fetched from server."),
+                                    help="An Email Server Action. It will be run whenever an e-mail is fetched from server."),
         'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model."),
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
         'user_id':fields.many2one('res.users', 'User', required=False),
+        'message_ids': fields.one2many('mailgate.message', 'server_id', 'Messages', readonly=True),
     }
     _defaults = {
         'state': lambda *a: "draft",
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 0b74b20637b..ecdb4acfb3b 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -12,6 +12,8 @@
                     <field name="type"/>
                     <field name="user"/>
                     <field name="is_ssl"/>
+                    <field name="object_id"/>
+                    <field name="message_ids" string="# of emails"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -117,11 +119,39 @@
 	          </field>
 	      </field>
       </record>
+      
+      <record model="ir.ui.view" id="mailgate_message_search_view">
+	      <field name="name">mailgate.message.inherit.search</field>
+	      <field name="model">mailgate.message</field>
+	      <field name="type">search</field>
+	      <field name="inherit_id" ref="mail_gateway.view_mailgate_message_search"/>
+	      <field name="arch" type="xml">
+			<xpath expr="/search/field[@name='name']" position="before">
+			     <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
+			     <separator orientation="vertical"/>
+			</xpath>
+			<xpath expr="/search/group/filter[@string='Thread']" position="before">
+                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
+            </xpath>
+	      </field>
+      </record>
+      
+      <record id="action_view_mail_message_emails" model="ir.actions.act_window">
+            <field name="name">Messages</field>
+            <field name="res_model">mailgate.message</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_emails': 1}</field>
+            <field name="search_view_id" ref="mailgate_message_search_view"/>
+      </record>
+        
+      <menuitem id="base.menu_email_gateway_form"
+               parent="base.menu_mail_gateway" action="action_view_mail_message_emails" />
 
-        <act_window 
+      <act_window 
             context="{'server_id': active_id}"
             domain="[('server_id', '=', active_id)]"
-            id="act_server_history" name="Email History"
+            id="act_server_history" name="Emails"
             res_model="mailgate.message" src_model="email.server"/>
             
     </data>
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index f3be1eff422..b2aaab21a36 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_mail_gateway" name="Email"
+        <menuitem id="base.menu_mail_gateway" name="Emails"
             parent="base.menu_base_config" sequence="1" />
 
         <record model="ir.ui.view" id="view_mailgate_message_form">
@@ -93,7 +93,7 @@
 
 
         <record id="action_view_mail_message" model="ir.actions.act_window">
-            <field name="name">Message</field>
+            <field name="name">Messages</field>
             <field name="res_model">mailgate.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -213,7 +213,7 @@
        src_model="mailgate.message"
        domain="[('res_id', '=', res_id),('res_model','=',model)]"/>
 
-           <menuitem id="menu_email_gateway_form"
+           <menuitem id="base.menu_email_gateway_form"
                parent="base.menu_mail_gateway" action="action_view_mail_message" />
 
     </data>