diff --git a/mail_environment/__manifest__.py b/mail_environment/__manifest__.py
index 46a4b82..188ad16 100644
--- a/mail_environment/__manifest__.py
+++ b/mail_environment/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Mail configuration with server_environment',
-    'version': '11.0.1.1.0',
+    'version': '12.0.1.0.0',
     'category': 'Tools',
     'summary': 'Configure mail servers with server_environment_files',
     'author': "Camptocamp, Odoo Community Association (OCA)",
@@ -13,5 +13,4 @@
         'fetchmail',
         'server_environment',
     ],
-    'data': [],
 }
diff --git a/mail_environment/i18n/de.po b/mail_environment/i18n/de.po
index 0be52af..2f63945 100644
--- a/mail_environment/i18n/de.po
+++ b/mail_environment/i18n/de.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * mail_environment
-# 
+#
 # Translators:
 # Rudolf Schnapka <rs@techno-flex.de>, 2016
 msgid ""
@@ -11,19 +11,43 @@ msgstr ""
 "POT-Creation-Date: 2016-04-17 12:15+0000\n"
 "PO-Revision-Date: 2016-04-21 09:16+0000\n"
 "Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
-"Language-Team: German (http://www.transifex.com/oca/OCA-server-tools-9-0/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/oca/OCA-server-tools-9-0/"
+"language/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_environment
-#: model:ir.model,name:mail_environment.model_fetchmail_server
-msgid "POP/IMAP Server"
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "IMAP Server"
 msgstr "POP/IMAP-Server"
 
+#. module: mail_environment
+#: model:ir.model,name:mail_environment.model_fetchmail_server
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
+
 #. module: mail_environment
 #: model:ir.model,name:mail_environment.model_ir_mail_server
-msgid "ir.mail_server"
+#, fuzzy
+msgid "Mail Server"
 msgstr "ir.mail_server"
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "POP Server"
+msgstr "POP/IMAP-Server"
+
+#. module: mail_environment
+#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type
+msgid "Server Type"
+msgstr ""
diff --git a/mail_environment/i18n/en.po b/mail_environment/i18n/en.po
index f087971..d2bd1b9 100644
--- a/mail_environment/i18n/en.po
+++ b/mail_environment/i18n/en.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * mail_environment
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,19 +10,43 @@ msgstr ""
 "POT-Creation-Date: 2016-02-27 01:37+0000\n"
 "PO-Revision-Date: 2016-02-26 16:14+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: English (http://www.transifex.com/oca/OCA-server-tools-9-0/language/en/)\n"
+"Language-Team: English (http://www.transifex.com/oca/OCA-server-tools-9-0/"
+"language/en/)\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_environment
-#: model:ir.model,name:mail_environment.model_fetchmail_server
-msgid "POP/IMAP Server"
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "IMAP Server"
 msgstr "POP/IMAP Server"
 
+#. module: mail_environment
+#: model:ir.model,name:mail_environment.model_fetchmail_server
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
+
 #. module: mail_environment
 #: model:ir.model,name:mail_environment.model_ir_mail_server
-msgid "ir.mail_server"
+#, fuzzy
+msgid "Mail Server"
 msgstr "ir.mail_server"
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "POP Server"
+msgstr "POP/IMAP Server"
+
+#. module: mail_environment
+#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type
+msgid "Server Type"
+msgstr ""
diff --git a/mail_environment/i18n/es.po b/mail_environment/i18n/es.po
index d856500..8e8fdeb 100644
--- a/mail_environment/i18n/es.po
+++ b/mail_environment/i18n/es.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * mail_environment
-# 
+#
 # Translators:
 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
 msgid ""
@@ -12,18 +12,39 @@ msgstr ""
 "PO-Revision-Date: 2017-05-01 10:38+0000\n"
 "Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
+msgstr ""
+
 #. module: mail_environment
 #: model:ir.model,name:mail_environment.model_fetchmail_server
-msgid "POP/IMAP Server"
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
 msgstr ""
 
 #. module: mail_environment
 #: model:ir.model,name:mail_environment.model_ir_mail_server
-msgid "ir.mail_server"
+#, fuzzy
+msgid "Mail Server"
 msgstr "ir.mail_server"
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr ""
+
+#. module: mail_environment
+#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type
+msgid "Server Type"
+msgstr ""
diff --git a/mail_environment/i18n/hr.po b/mail_environment/i18n/hr.po
index bfa25bc..464b0dd 100644
--- a/mail_environment/i18n/hr.po
+++ b/mail_environment/i18n/hr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * mail_environment
-# 
+#
 # Translators:
 # Bole <bole@dajmi5.com>, 2016
 msgid ""
@@ -11,19 +11,44 @@ msgstr ""
 "POT-Creation-Date: 2016-06-29 00:48+0000\n"
 "PO-Revision-Date: 2016-06-14 10:58+0000\n"
 "Last-Translator: Bole <bole@dajmi5.com>\n"
-"Language-Team: Croatian (http://www.transifex.com/oca/OCA-server-tools-9-0/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/oca/OCA-server-tools-9-0/"
+"language/hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: mail_environment
-#: model:ir.model,name:mail_environment.model_fetchmail_server
-msgid "POP/IMAP Server"
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "IMAP Server"
 msgstr "POP/IMAP Server"
 
+#. module: mail_environment
+#: model:ir.model,name:mail_environment.model_fetchmail_server
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
+
 #. module: mail_environment
 #: model:ir.model,name:mail_environment.model_ir_mail_server
-msgid "ir.mail_server"
+#, fuzzy
+msgid "Mail Server"
 msgstr "ir.mail_server"
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "POP Server"
+msgstr "POP/IMAP Server"
+
+#. module: mail_environment
+#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type
+msgid "Server Type"
+msgstr ""
diff --git a/mail_environment/i18n/mail_environment.pot b/mail_environment/i18n/mail_environment.pot
new file mode 100644
index 0000000..44c1244
--- /dev/null
+++ b/mail_environment/i18n/mail_environment.pot
@@ -0,0 +1,45 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* mail_environment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
+msgstr ""
+
+#. module: mail_environment
+#: model:ir.model,name:mail_environment.model_fetchmail_server
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
+
+#. module: mail_environment
+#: model:ir.model,name:mail_environment.model_ir_mail_server
+msgid "Mail Server"
+msgstr ""
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr ""
+
+#. module: mail_environment
+#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type
+msgid "Server Type"
+msgstr ""
+
diff --git a/mail_environment/i18n/pt_BR.po b/mail_environment/i18n/pt_BR.po
index f929bd3..5c0c705 100644
--- a/mail_environment/i18n/pt_BR.po
+++ b/mail_environment/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * mail_environment
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,14 +10,43 @@ msgstr ""
 "POT-Creation-Date: 2015-09-29 11:14+0000\n"
 "PO-Revision-Date: 2015-09-18 13:55+0000\n"
 "Last-Translator: <>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-server-tools-8-0/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-server-"
+"tools-8-0/language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail_environment
-#: model:ir.model,name:mail_environment.model_fetchmail_server
-msgid "POP/IMAP Server"
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "IMAP Server"
 msgstr "Servidor POP/IMAP"
+
+#. module: mail_environment
+#: model:ir.model,name:mail_environment.model_fetchmail_server
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
+
+#. module: mail_environment
+#: model:ir.model,name:mail_environment.model_ir_mail_server
+#, fuzzy
+msgid "Mail Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "POP Server"
+msgstr "Servidor POP/IMAP"
+
+#. module: mail_environment
+#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type
+msgid "Server Type"
+msgstr ""
diff --git a/mail_environment/i18n/sl.po b/mail_environment/i18n/sl.po
index 03f146f..7b0594e 100644
--- a/mail_environment/i18n/sl.po
+++ b/mail_environment/i18n/sl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * mail_environment
-# 
+#
 # Translators:
 # Matjaž Mozetič <m.mozetic@matmoz.si>, 2016
 msgid ""
@@ -11,19 +11,44 @@ msgstr ""
 "POT-Creation-Date: 2016-02-27 01:37+0000\n"
 "PO-Revision-Date: 2016-02-27 16:56+0000\n"
 "Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
-"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-server-tools-9-0/language/sl/)\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-server-tools-9-0/"
+"language/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
 #. module: mail_environment
-#: model:ir.model,name:mail_environment.model_fetchmail_server
-msgid "POP/IMAP Server"
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "IMAP Server"
 msgstr "POP/IMAP strežnik"
 
+#. module: mail_environment
+#: model:ir.model,name:mail_environment.model_fetchmail_server
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
+
 #. module: mail_environment
 #: model:ir.model,name:mail_environment.model_ir_mail_server
-msgid "ir.mail_server"
+#, fuzzy
+msgid "Mail Server"
 msgstr "ir.mail_server"
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "POP Server"
+msgstr "POP/IMAP strežnik"
+
+#. module: mail_environment
+#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type
+msgid "Server Type"
+msgstr ""
diff --git a/mail_environment/i18n/zh_CN.po b/mail_environment/i18n/zh_CN.po
index 6836584..ee795ce 100644
--- a/mail_environment/i18n/zh_CN.po
+++ b/mail_environment/i18n/zh_CN.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * mail_environment
-# 
+#
 # Translators:
 # Jeffery Chenn <jeffery9@gmail.com>, 2016
 msgid ""
@@ -11,19 +11,43 @@ msgstr ""
 "POT-Creation-Date: 2016-08-31 11:58+0000\n"
 "PO-Revision-Date: 2016-09-04 06:08+0000\n"
 "Last-Translator: Jeffery Chenn <jeffery9@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-server-tools-9-0/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-server-"
+"tools-9-0/language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail_environment
-#: model:ir.model,name:mail_environment.model_fetchmail_server
-msgid "POP/IMAP Server"
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "IMAP Server"
 msgstr "POP/IMAP 服务器"
 
 #. module: mail_environment
-#: model:ir.model,name:mail_environment.model_ir_mail_server
-msgid "ir.mail_server"
+#: model:ir.model,name:mail_environment.model_fetchmail_server
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
+
+#. module: mail_environment
+#: model:ir.model,name:mail_environment.model_ir_mail_server
+#, fuzzy
+msgid "Mail Server"
+msgstr "POP/IMAP 服务器"
+
+#. module: mail_environment
+#: selection:fetchmail.server,type:0
+#, fuzzy
+msgid "POP Server"
+msgstr "POP/IMAP 服务器"
+
+#. module: mail_environment
+#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type
+msgid "Server Type"
 msgstr ""
diff --git a/mail_environment/static/description/icon.png b/mail_environment/static/description/icon.png
new file mode 100644
index 0000000..3a0328b
Binary files /dev/null and b/mail_environment/static/description/icon.png differ
diff --git a/mail_environment/static/description/index.html b/mail_environment/static/description/index.html
index 67f8d8f..5ef4e10 100644
--- a/mail_environment/static/description/index.html
+++ b/mail_environment/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Mail configuration with server_environment</title>
 <style type="text/css">