diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index e69bbdf87a2..296d592396a 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -117,7 +117,7 @@ class email_server(osv.osv):
             context = {}
         for server in self.browse(cr, uid, ids, context=context):
             logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
-            context.update({'server_id': server.id, 'server_type': server.type})
+            context.update({'server_id': server.id})
             try:
                 if server.type == 'imap':
                     imap_server = None
@@ -215,22 +215,14 @@ class email_message(osv.osv):
 
     _columns = {
         'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True),
-        'server_type':fields.selection([
-            ('pop', 'POP Server'),
-            ('imap', 'IMAP Server'),
-        ], 'Server Type', select=True, readonly=True),
     }
-    _order = 'id desc'
 
     def create(self, cr, uid, values, context=None):
         if context is None:
             context={}
         server_id = context.get('server_id',False)
-        server_type = context.get('server_type',False)
         if server_id:
             values['server_id'] = server_id
-        if server_type:
-            values['server_type'] = server_type
         res = super(email_message,self).create(cr, uid, values, context=context)
         return res
 
@@ -238,11 +230,8 @@ class email_message(osv.osv):
         if context is None:
             context={}
         server_id = context.get('server_id',False)
-        server_type = context.get('server_type',False)
         if server_id:
             values['server_id'] = server_id
-        if server_type:
-            values['server_type'] = server_type
         res = super(email_message,self).write(cr, uid, ids, values, context=context)
         return res