diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index a1276c11643..31037cca63f 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -24,7 +24,7 @@
 {
     "name" : "Fetchmail Server",
     "version" : "1.0",
-    "depends" : ["base"],
+    "depends" : ["base", 'mail_gateway'],
     "author" : "Tiny",
     "description": """Fetchmail: 
     * Fetch email from Pop / IMAP server
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 6419cc8a18d..10a51f0f5b2 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -181,7 +181,7 @@ class email_server(osv.osv):
         context.update({
             'server_id':server.id
         })
-        history_pool = self.pool.get('mail.server.history')
+        history_pool = self.pool.get('mailgate.message')
         msg_txt = email.message_from_string(message)
         message_id = msg_txt.get('Message-ID', False)
 
@@ -329,7 +329,7 @@ class email_server(osv.osv):
                 'name': message_id, 
                 'res_id': res_id, 
                 'server_id': server.id, 
-                'note': msg.get('body', msg.get('from')),
+                'description': msg.get('body', msg.get('from')),
                 'ref_id':msg.get('references', msg.get('id')),
                 'type':server.type
             }
@@ -412,17 +412,11 @@ email_server()
 
 class mail_server_history(osv.osv):
 
-    _name = "mail.server.history"
-    _description = "Mail Server History"
+    _inherit = "mailgate.message"
     
     _columns = {
-        'name': fields.char('Message Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
         'ref_id': fields.char('Referance Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
-        'res_id': fields.integer("Resource ID", readonly=True, select=True),
         'server_id': fields.many2one('email.server',"Mail Server", readonly=True, select=True),
-        'model_id':fields.related('server_id', 'object_id', type='many2one', relation='ir.model', string='Model', readonly=True, select=True), 
-        'note': fields.text('Notes', readonly=True),
-        'create_date': fields.datetime('Created Date', readonly=True),
         'type':fields.selection([
             ('pop','POP Server'),
             ('imap','IMAP Server'),
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 510b31b6131..330f9fec349 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -103,82 +103,54 @@
             action="action_email_server_tree_imap"
         />
         
-        <record model="ir.ui.view" id="view_mail_server_history_tree">
-            <field name="name">mail.server.history.tree</field>
-            <field name="model">mail.server.history</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Received Mail History">
-                    <field name="server_id" select="1"/>
-                    <field name="create_date" select="1"/>
-                    <field name="model_id"/>
-                    <field name="name" select="1"/>
-                    <field name="ref_id"/>
-                </tree>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="view_email_server_history_form">
-            <field name="name">mail.server.history.form</field>
-            <field name="model">mail.server.history</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Email History">
-                    <group col="6" colspan="4">
+      <record model="ir.ui.view" id="mailgate_message_tree_view">
+                <field name="name">mailgate.message.tree</field>
+                <field name="model">mailgate.message</field>
+                <field name="type">tree</field>
+                <field name="inherit_id" ref="mail_gateway.view_mailgate_message_tree"/>
+                <field name="arch" type="xml">
+                    <field name="user_id" position="after">
                         <field name="server_id" select="1"/>
-                        <field name="create_date" select="1"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Resource Information" colspan="2"/>
-                        <field name="model_id" select="1"/>
-                        <field name="res_id"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Meta Information" colspan="2"/>
-                        <field name="name" select="1"/>
                         <field name="ref_id"/>
-                    </group>
-                    <newline/>
-                    <separator string="Description" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1"/>
-                </form>
-            </field>
-        </record>
-        
+                    </field>
+                </field>
+            </record>
+
         <act_window 
             context="{'server_id': active_id}"
             domain="[('server_id', '=', active_id)]"
             id="act_server_history" name="Email History"
-            res_model="mail.server.history" src_model="email.server"/>
+            res_model="mailgate.message" src_model="email.server"/>
             
-        <record model="ir.actions.act_window" id="action_email_server_history_tree">
+        <record model="ir.actions.act_window" id="action_mailgate_message_tree">
             <field name="name">Received Email History</field>
-            <field name="res_model">mail.server.history</field>
+            <field name="res_model">mailgate.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_mail_server_history_tree"/>
+            <field name="view_id" ref="mailgate_message_tree_view"/>
             <field name="context">{'type':'imap'}</field>
             <field name="domain">[('type','=','imap')]</field>
         </record>
         
         <menuitem 
             parent="menu_action_email_server_tree_imap" 
-            id="menu_action_email_server_history_tree" 
-            action="action_email_server_history_tree"/>
+            id="menu_action_mailgate_message_tree" 
+            action="action_mailgate_message_tree"/>
             
-        <record model="ir.actions.act_window" id="action_email_server_history_tree_pop">
+        <record model="ir.actions.act_window" id="action_mailgate_message_tree_pop">
             <field name="name">Received Email History</field>
-            <field name="res_model">mail.server.history</field>
+            <field name="res_model">mailgate.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_mail_server_history_tree"/>
+            <field name="view_id" ref="mailgate_message_tree_view"/>
             <field name="context">{'type':'pop'}</field>
             <field name="domain">[('type','=','pop')]</field>
         </record>
         
         <menuitem 
             parent="menu_action_email_server_tree" 
-            id="menu_action_email_server_history_tree_pop" 
-            action="action_email_server_history_tree_pop"/>
+            id="menu_action_mailgate_message_tree_pop" 
+            action="action_mailgate_message_tree_pop"/>
 
     </data>
 </openerp>
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
index 907aa187913..d31fd067485 100644
--- a/addons/fetchmail/security/ir.model.access.csv
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -1,4 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_email_server","email.server","model_email_server",,1,1,1,1
-"access_mail_server_history","mail.server.history","model_mail_server_history",,1,1,1,1
 "access_email_server_tools","email.server.tools","model_email_server_tools",,1,1,1,1