diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 46f10f69ff5..8aaff197d47 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -29,13 +29,13 @@ from poplib import POP3_SSL
 import netsvc
 from osv import osv, fields
 import tools
+from tools.translate import _
 
 logger = logging.getLogger('fetchmail')
 
-
-class email_server(osv.osv):
-
-    _name = 'email.server'
+class fetchmail_server(osv.osv):
+    """Incoming POP/IMAP mail server account"""
+    _name = 'fetchmail.server'
     _description = "POP/IMAP Server"
     _order = 'priority'
 
@@ -69,7 +69,7 @@ class email_server(osv.osv):
                                                                                              "emails to the existing conversations (documents)."),
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Defines the order of processing, "
                                                                                                                   "lower values mean higher priority"),
-        'message_ids': fields.one2many('mail.message', 'server_id', 'Messages', readonly=True),
+        'message_ids': fields.one2many('mail.message', 'fetchmail_server_id', 'Messages', readonly=True),
     }
     _defaults = {
         'state': "draft",
@@ -84,7 +84,6 @@ class email_server(osv.osv):
             port = ssl and 995 or 110
         elif server_type == 'imap':
             port = ssl and 993 or 143
-
         return {'value':{'port':port}}
 
     def set_draft(self, cr, uid, ids, context=None):
@@ -147,7 +146,7 @@ class email_server(osv.osv):
         action_pool = self.pool.get('ir.actions.server')
         for server in self.browse(cr, uid, ids, context=context):
             logger.info('start checking for new emails on %s server %s', server.type, server.name)
-            context.update({'server_id': server.id, 'server_type': server.type})
+            context.update({'fetchmail_server_id': server.id, 'server_type': server.type})
             count = 0
             if server.type == 'imap':
                 try:
@@ -199,28 +198,29 @@ class email_server(osv.osv):
         return True
 
 class mail_message(osv.osv):
-
     _inherit = "mail.message"
-
     _columns = {
-        'server_id': fields.many2one('email.server', "Inbound Mail Server", readonly=True, select=True),
+        'fetchmail_server_id': fields.many2one('fetchmail.server', "Inbound Mail Server",
+                                               readonly=True,
+                                               select=True,
+                                               oldname='server_id'),
     }
 
     def create(self, cr, uid, values, context=None):
         if context is None:
             context={}
-        server_id = context.get('server_id',False)
-        if server_id:
-            values['server_id'] = server_id
+        fetchmail_server_id = context.get('fetchmail_server_id')
+        if fetchmail_server_id:
+            values['fetchmail_server_id'] = fetchmail_server_id
         res = super(mail_message,self).create(cr, uid, values, context=context)
         return res
 
     def write(self, cr, uid, ids, values, context=None):
         if context is None:
             context={}
-        server_id = context.get('server_id',False)
-        if server_id:
-            values['server_id'] = server_id
+        fetchmail_server_id = context.get('fetchmail_server_id')
+        if fetchmail_server_id:
+            values['fetchmail_server_id'] = server_id
         res = super(mail_message,self).write(cr, uid, ids, values, context=context)
         return res
 
diff --git a/addons/fetchmail/fetchmail_data.xml b/addons/fetchmail/fetchmail_data.xml
index ef40a76489f..d77aadc12de 100644
--- a/addons/fetchmail/fetchmail_data.xml
+++ b/addons/fetchmail/fetchmail_data.xml
@@ -6,10 +6,10 @@
             <field name="interval_number">5</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
-            <field eval="False" name="doall"/>
-            <field eval="'email.server'" name="model"/>
-            <field eval="'_fetch_mails'" name="function"/>
-            <field eval="'()'" name="args"/>
+            <field name="doall" eval="False"/>
+            <field name="model">fetchmail.server</field>
+            <field name="function">_fetch_mails</field>
+            <field name="args">()</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml
index 791ff2180cd..911ad8101da 100644
--- a/addons/fetchmail/fetchmail_installer_view.xml
+++ b/addons/fetchmail/fetchmail_installer_view.xml
@@ -1,9 +1,9 @@
 <openerp>
     <data>
 	 <record model="ir.actions.act_window" id="view_email_server_form_installer">
-	        <field name="name">Setup Inbound Mail Server (fetchmail)</field>
+	        <field name="name">Setup Incoming Mail Server (fetchmail)</field>
 	        <field name="type">ir.actions.act_window</field>
-	        <field name="res_model">email.server</field>
+	        <field name="res_model">fetchmail.server</field>
 	        <field name="view_type">form</field>
 	        <field name="view_mode">tree,form</field>
 	        <field name="view_id" ref="fetchmail.view_email_server_form"/>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 5f5c094a454..f9c6b9b591a 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -3,8 +3,8 @@
     <data>
 
         <record model="ir.ui.view" id="view_email_server_tree">
-            <field name="name">email.server.tree</field>
-            <field name="model">email.server</field>
+            <field name="name">fetchmail.server.list</field>
+            <field name="model">fetchmail.server</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');" string="POP/IMAP Servers">
@@ -20,11 +20,11 @@
         </record>
 
         <record model="ir.ui.view" id="view_email_server_form">
-            <field name="name">email.server.form</field>
-            <field name="model">email.server</field>
+            <field name="name">fetchmail.server.form</field>
+            <field name="model">fetchmail.server</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POP/IMAP Server">
+                <form string="Incoming Mail Server">
                     <group col="6" colspan="4">
                         <field name="name" select="1" colspan="4"/>
                         <field name="type" select="1" on_change="onchange_server_type(type, is_ssl)"/>
@@ -63,20 +63,20 @@
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state" select="1"/>
-                        <button string="Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
-                        <button string="Fetch Now" type="object" name="fetch_mail" states="done"/>
                         <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
+                        <button string="Test &amp; Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
+                        <button string="Fetch Now" type="object" name="fetch_mail" states="done" icon="gtk-network"/>
                     </group>
                 </form>
             </field>
         </record>
 
         <record model="ir.ui.view" id="view_email_server_search">
-            <field name="name">email.server.search</field>
-            <field name="model">email.server</field>
+            <field name="name">fetchmail.server.search</field>
+            <field name="model">fetchmail.server</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Email Servers">
+                <search string="Search Incoming Mail Servers">
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
                     <separator orientation="vertical"/>
@@ -96,7 +96,7 @@
 
         <record model="ir.actions.act_window" id="action_email_server_tree">
             <field name="name">Incoming Mail Servers</field>
-            <field name="res_model">email.server</field>
+            <field name="res_model">fetchmail.server</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_server_tree"/>
@@ -112,13 +112,13 @@
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-          <field name="name">mail.message.tree</field>
+          <field name="name">mail.message.list.fetchmail</field>
           <field name="model">mail.message</field>
           <field name="type">tree</field>
           <field name="inherit_id" ref="mail.view_email_message_tree"/>
           <field name="arch" type="xml">
               <field name="user_id" position="after">
-                  <field name="server_id" select="1"/>
+                  <field name="fetchmail_server_id" select="1"/>
               </field>
           </field>
       </record>
@@ -130,15 +130,15 @@
           <field name="inherit_id" ref="mail.view_email_message_search"/>
           <field name="arch" type="xml">
             <xpath expr="/search/group/filter[@string='Thread']" position="before">
-                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
+                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'fetchmail_server_id'}"/>
             </xpath>
           </field>
       </record>
 
       <act_window
             context="{'search_default_server_id': active_id, 'default_server_id': active_id}"
-            id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('server_id', '=', active_id)]"
-            res_model="mail.message" src_model="email.server"/>
+            id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('fetchmail_server_id', '=', active_id)]"
+            res_model="mail.message" src_model="fetchmail.server"/>
 
     </data>
 </openerp>
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
index 7aa6c84d22b..0ef984cd002 100644
--- a/addons/fetchmail/security/ir.model.access.csv
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -1,2 +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_fetchmail_server","fetchmail.server","model_email_server",,1,0,0,0
+"access_fetchmail_server","fetchmail.server","model_email_server","base.group_system",1,1,1,1