Merge branch 'develop'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rainbox.email",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "ISP mail provider manager with mysql and integrated LDAP server",
   "repository": "https://gitlab.com/ArisuOngaku/rainbox.email",
   "author": "Alice Gaudon <alice@gaudon.pro>",

views/mail-auto-config.xml.njk

@@ -8,13 +8,13 @@
         <displayName>{{ display_name }}</displayName>
         <displayShortName>{{ display_name_short }}</displayShortName>
 
-        <outgoingServer type="imap">
+        <incomingServer type="imap">
             <hostname>{{ imap.server }}</hostname>
             <port>{{ imap.port }}</port>
             <socketType>{{ imap.method }}</socketType>
             <username>{{ username }}</username>
             <authentication>{{ auth_method }}</authentication>
-        </outgoingServer>
+        </incomingServer>
 
         <incomingServer type="pop3">
             <hostname>{{ pop3.server }}</hostname>