diff --git a/addons/fetchmail/models/fetchmail.py b/addons/fetchmail/models/fetchmail.py
index b477f2328e1..f4de274195e 100644
--- a/addons/fetchmail/models/fetchmail.py
+++ b/addons/fetchmail/models/fetchmail.py
@@ -43,8 +43,8 @@ class FetchmailServer(models.Model):
     server = fields.Char(string='Server Name', readonly=True, help="Hostname or IP of the mail server", states={'draft': [('readonly', False)]})
     port = fields.Integer(readonly=True, states={'draft': [('readonly', False)]})
     server_type = fields.Selection([
-        ('pop', 'POP Server'),
         ('imap', 'IMAP Server'),
+        ('pop', 'POP Server'),
         ('local', 'Local Server'),
     ], string='Server Type', index=True, required=True, default='pop')
     is_ssl = fields.Boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP3S=995)")
diff --git a/addons/fetchmail/views/fetchmail_views.xml b/addons/fetchmail/views/fetchmail_views.xml
index 59e65aad444..880c79ff652 100644
--- a/addons/fetchmail/views/fetchmail_views.xml
+++ b/addons/fetchmail/views/fetchmail_views.xml
@@ -5,14 +5,14 @@
             <field name="name">fetchmail.server.list</field>
             <field name="model">fetchmail.server</field>
             <field name="arch" type="xml">
-                <tree decoration-info="state == 'draft'" string="POP/IMAP Servers">
+                <tree string="POP/IMAP Servers">
                     <field name="name"/>
                     <field name="server_type"/>
-                    <field name="is_ssl"/>
-                    <field name="object_id"/>
+                    <field name="user"/>
                     <field name="date"/>
-                    <field name="message_ids" string="Email Count"/>
-                    <field name="state"/>
+                    <field name="state" widget="badge"
+                        decoration-info="state == 'draft'"
+                        decoration-success="state == 'done'"/>
                 </tree>
             </field>
         </record>
@@ -78,6 +78,7 @@
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
                     <field name="name" string="Incoming Mail Server"/>
+                    <field name="user"/>
                     <filter string="IMAP" name="imap" domain="[('server_type', '=', 'imap')]" help="Server type IMAP."/>
                     <filter string="POP" name="pop" domain="[('server_type', '=', 'pop')]" help="Server type POP."/>
                     <separator/>
diff --git a/odoo/addons/base/views/ir_mail_server_views.xml b/odoo/addons/base/views/ir_mail_server_views.xml
index a8eaf982b09..8fe837d721a 100644
--- a/odoo/addons/base/views/ir_mail_server_views.xml
+++ b/odoo/addons/base/views/ir_mail_server_views.xml
@@ -10,14 +10,18 @@
                             name="test_smtp_connection" class="btn-primary"/>
                     </header>
                     <sheet>
-                        <group col="4">
-                            <field name="name" placeholder="e.g. My Outgoing Server"/>
-                            <field name="from_filter"/>
-                            <field name="sequence"/>
-                            <field name="active" widget="boolean_toggle"/>
+                        <group>
+                            <group>
+                                <field name="name" placeholder="e.g. My Outgoing Server"/>
+                                <field name="from_filter"/>
+                            </group>
+                            <group>
+                                <field name="sequence"/>
+                                <field name="active" widget="boolean_toggle"/>
+                            </group>
                         </group>
                         <group>
-                            <group string="Authentication">
+                            <group>
                                 <field name="smtp_authentication" widget="radio"/>
                                 <field name="smtp_user" attrs="{'invisible': [('smtp_authentication', '!=', 'login')]}" force_save="1"/>
                                 <field name="smtp_pass" attrs="{'invisible': [('smtp_authentication', '!=', 'login')]}" password="True" force_save="1"/>