diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 244496ee377..aed75041b60 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -32,13 +32,13 @@ class crm_configuration(osv.osv_memory):
         'fetchmail_lead': fields.boolean("Create leads from an email account",
             fetchmail_model='crm.lead', fetchmail_name='Incoming leads',
             help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
-        'lead_server': fields.char('Server Name', size=256),
+        'lead_server': fields.char('Server', size=256),
         'lead_port': fields.integer('Port'),
         'lead_type': fields.selection([
                 ('pop', 'POP Server'),
                 ('imap', 'IMAP Server'),
                 ('local', 'Local Server'),
-            ], 'Server Type'),
+            ], 'Type'),
         'lead_is_ssl': fields.boolean('SSL/TLS',
             help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"),
         'lead_user': fields.char('Username', size=256),
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 445c81f924c..d94958f7f75 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -13,7 +13,7 @@
                     <field name="fetchmail_lead"/>
                     <group colspan="2" attrs="{'invisible': [('fetchmail_lead','=',False)]}">
                         <field name="lead_server" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
-                        <field name="lead_type" nolabel="1" on_change="onchange_fetchmail('lead', lead_type, lead_is_ssl)" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
+                        <field name="lead_type" on_change="onchange_fetchmail('lead', lead_type, lead_is_ssl)" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
                         <field name="lead_port" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
                         <field name="lead_is_ssl" on_change="onchange_fetchmail('lead', lead_type, lead_is_ssl)"/>
                         <field name="lead_user" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py
index 37a0f49da99..17395d0ad39 100644
--- a/addons/crm_claim/res_config.py
+++ b/addons/crm_claim/res_config.py
@@ -29,13 +29,13 @@ class crm_claim_settings(osv.osv_memory):
         'fetchmail_claim': fields.boolean("Create claims from an email account",
             fetchmail_model='crm.claim', fetchmail_name='Incoming claims',
             help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
-        'claim_server' : fields.char('Server Name', size=256),
+        'claim_server' : fields.char('Server', size=256),
         'claim_port' : fields.integer('Port'),
         'claim_type': fields.selection([
                 ('pop', 'POP Server'),
                 ('imap', 'IMAP Server'),
                 ('local', 'Local Server'),
-            ], 'Server Type'),
+            ], 'Type'),
         'claim_is_ssl': fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"),
         'claim_user' : fields.char('Username', size=256),
         'claim_password' : fields.char('Password', size=1024),
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 727032474fc..95959f2312d 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -12,7 +12,7 @@
                     <field name="fetchmail_claim"/>
                     <group colspan="2" attrs="{'invisible': [('fetchmail_claim','=',False)]}">
                         <field name="claim_server" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
-                        <field name="claim_type" nolabel="1" on_change="onchange_fetchmail('claim', claim_type, claim_is_ssl)" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
+                        <field name="claim_type" on_change="onchange_fetchmail('claim', claim_type, claim_is_ssl)" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
                         <field name="claim_port" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
                         <field name="claim_is_ssl" on_change="onchange_fetchmail('claim', claim_type, claim_is_ssl)"/>
                         <field name="claim_user" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py
index 3b921ca3a9c..8e4a343292e 100644
--- a/addons/project_issue/res_config.py
+++ b/addons/project_issue/res_config.py
@@ -29,13 +29,13 @@ class project_issue_settings(osv.osv_memory):
         'fetchmail_issue': fields.boolean("Create issues from an email account",
             fetchmail_model='project.issue', fetchmail_name='Incoming issues',
             help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""),
-        'issue_server' : fields.char('Server Name', size=256),
+        'issue_server' : fields.char('Server', size=256),
         'issue_port' : fields.integer('Port'),
         'issue_type': fields.selection([
                 ('pop', 'POP Server'),
                 ('imap', 'IMAP Server'),
                 ('local', 'Local Server'),
-            ], 'Server Type'),
+            ], 'Type'),
         'issue_is_ssl': fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"),
         'issue_user' : fields.char('Username', size=256),
         'issue_password' : fields.char('Password', size=1024),
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index 5a0f0279f7a..a07f42a9a1f 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -12,7 +12,7 @@
                     <field name="fetchmail_issue"/>
                     <group colspan="2" attrs="{'invisible': [('fetchmail_issue','=',False)]}">
                         <field name="issue_server" attrs="{'required': [('fetchmail_issue','=',True)]}"/>
-                        <field name="issue_type" nolabel="1" on_change="onchange_fetchmail('issue', issue_type, issue_is_ssl)" attrs="{'required': [('fetchmail_issue','=',True)]}"/>
+                        <field name="issue_type" on_change="onchange_fetchmail('issue', issue_type, issue_is_ssl)" attrs="{'required': [('fetchmail_issue','=',True)]}"/>
                         <field name="issue_port" attrs="{'required': [('fetchmail_issue','=',True)]}"/>
                         <field name="issue_is_ssl" on_change="onchange_fetchmail('issue', issue_type, issue_is_ssl)"/>
                         <field name="issue_user" attrs="{'required': [('fetchmail_issue','=',True)]}"/>