[api-web] Refresh Evolution's autoconfig files.



commit cbedf00f5b970bc84abb22e18f8ab91a077a9386
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Mar 23 08:38:42 2012 -0400

    Refresh Evolution's autoconfig files.
    
    These files use version 1.1 of Mozilla's autoconfig file format, so
    they're placed in a separate "1.1" subdirectory so as not to break
    compatibility with Evolution 3.4, which uses the original format.

 evolution/autoconfig/1.1/1und1.de             |   65 +++++++
 evolution/autoconfig/1.1/README               |   52 +++++
 evolution/autoconfig/1.1/abc.plala.or.jp      |   24 +++
 evolution/autoconfig/1.1/agate.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/alice.it             |   30 +++
 evolution/autoconfig/1.1/amail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/amber.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/aol.com              |   45 +++++
 evolution/autoconfig/1.1/apost.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/aqua.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/arcor.de             |   57 ++++++
 evolution/autoconfig/1.1/arubapec.it          |   34 ++++
 evolution/autoconfig/1.1/att.net              |   35 ++++
 evolution/autoconfig/1.1/ballade.plala.or.jp  |   24 +++
 evolution/autoconfig/1.1/bay.wind.ne.jp       |   28 +++
 evolution/autoconfig/1.1/bb-niigata.jp        |   22 +++
 evolution/autoconfig/1.1/beige.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/biglobe.ne.jp        |   23 +++
 evolution/autoconfig/1.1/bigpond.com          |   28 +++
 evolution/autoconfig/1.1/blue.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/bluemail.ch          |   31 +++
 evolution/autoconfig/1.1/bluewin.ch           |   30 +++
 evolution/autoconfig/1.1/bmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/bolero.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/bpost.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/broba.cc             |   25 +++
 evolution/autoconfig/1.1/brown.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/camel.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/cameo.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/cc9.ne.jp            |   21 ++
 evolution/autoconfig/1.1/cek.ne.jp            |   21 ++
 evolution/autoconfig/1.1/cgl.ucsf.edu         |   22 +++
 evolution/autoconfig/1.1/clio.ne.jp           |   22 +++
 evolution/autoconfig/1.1/cmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/co1.wind.ne.jp       |   25 +++
 evolution/autoconfig/1.1/co2.wind.ne.jp       |   25 +++
 evolution/autoconfig/1.1/co3.wind.ne.jp       |   25 +++
 evolution/autoconfig/1.1/cocoa.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/coda.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/comcast.net          |   22 +++
 evolution/autoconfig/1.1/concerto.plala.or.jp |   24 +++
 evolution/autoconfig/1.1/coral.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/courante.plala.or.jp |   24 +++
 evolution/autoconfig/1.1/cpost.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/cream.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/dan.wind.ne.jp       |   28 +++
 evolution/autoconfig/1.1/dance.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/dd.iij4u.or.jp       |   33 ++++
 evolution/autoconfig/1.1/df.eu                |   33 ++++
 evolution/autoconfig/1.1/dmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/earthlink.net        |   35 ++++
 evolution/autoconfig/1.1/ebony.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/email.it             |   33 ++++
 evolution/autoconfig/1.1/email.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/ewetel.de            |   23 +++
 evolution/autoconfig/1.1/fantasy.plala.or.jp  |   24 +++
 evolution/autoconfig/1.1/flamenco.plala.or.jp |   24 +++
 evolution/autoconfig/1.1/fmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/francetelecom.fr     |   31 +++
 evolution/autoconfig/1.1/free.fr              |   62 ++++++
 evolution/autoconfig/1.1/freenet.de           |   56 ++++++
 evolution/autoconfig/1.1/fuga.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/gandi.net            |   58 ++++++
 evolution/autoconfig/1.1/gmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/gmx.com              |   72 +++++++
 evolution/autoconfig/1.1/gmx.net              |   66 +++++++
 evolution/autoconfig/1.1/go.tvm.ne.jp         |   22 +++
 evolution/autoconfig/1.1/goo.jp               |   22 +++
 evolution/autoconfig/1.1/googlemail.com       |   52 +++++
 evolution/autoconfig/1.1/grape.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/gray.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/hal.ne.jp            |   22 +++
 evolution/autoconfig/1.1/hana.or.jp           |   22 +++
 evolution/autoconfig/1.1/hotmail.com          |   37 ++++
 evolution/autoconfig/1.1/i.softbank.jp        |   22 +++
 evolution/autoconfig/1.1/ic-net.or.jp         |   22 +++
 evolution/autoconfig/1.1/iijmio-mail.jp       |   26 +++
 evolution/autoconfig/1.1/iiyama-catv.ne.jp    |   21 ++
 evolution/autoconfig/1.1/imail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/inbox.lt             |   26 +++
 evolution/autoconfig/1.1/inbox.lv             |   26 +++
 evolution/autoconfig/1.1/indigo.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/inet-shibata.or.jp   |   22 +++
 evolution/autoconfig/1.1/internode.on.net     |   32 ++++
 evolution/autoconfig/1.1/ipax.at              |   28 +++
 evolution/autoconfig/1.1/ivory.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/iwafune.ne.jp        |   22 +++
 evolution/autoconfig/1.1/jade.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/janis.or.jp          |   23 +++
 evolution/autoconfig/1.1/jet.ne.jp            |   29 +++
 evolution/autoconfig/1.1/ji.jet.ne.jp         |   22 +++
 evolution/autoconfig/1.1/jmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/kabelmail.de         |   31 +++
 evolution/autoconfig/1.1/kelcom.net           |   21 ++
 evolution/autoconfig/1.1/khaki.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/kl.wind.ne.jp        |   32 ++++
 evolution/autoconfig/1.1/kmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/kokuyou.ne.jp        |   21 ++
 evolution/autoconfig/1.1/lapis.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/laposte.net          |   37 ++++
 evolution/autoconfig/1.1/lemon.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/libero.it            |   34 ++++
 evolution/autoconfig/1.1/lilac.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/lime.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/mahoroba.ne.jp       |   22 +++
 evolution/autoconfig/1.1/mail.com             |  248 +++++++++++++++++++++++++
 evolution/autoconfig/1.1/mail.dk              |   22 +++
 evolution/autoconfig/1.1/mail.iwafune.ne.jp   |   22 +++
 evolution/autoconfig/1.1/mail.ru              |   42 ++++
 evolution/autoconfig/1.1/mail.telenor.dk      |  121 ++++++++++++
 evolution/autoconfig/1.1/mail.wind.ne.jp      |   29 +++
 evolution/autoconfig/1.1/maroon.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/me.com               |   31 +++
 evolution/autoconfig/1.1/minuet.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/ml.murakami.ne.jp    |   22 +++
 evolution/autoconfig/1.1/mnet.ne.jp           |   22 +++
 evolution/autoconfig/1.1/mopera.net           |   50 +++++
 evolution/autoconfig/1.1/mozilla.com          |   23 +++
 evolution/autoconfig/1.1/mx1.tiki.ne.jp       |   54 ++++++
 evolution/autoconfig/1.1/navy.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/nifty.com            |   22 +++
 evolution/autoconfig/1.1/nsat.jp              |   22 +++
 evolution/autoconfig/1.1/o2.pl                |   35 ++++
 evolution/autoconfig/1.1/olive.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/onet.pl              |   38 ++++
 evolution/autoconfig/1.1/opal.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/orange.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/orchid.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/ovh.net              |   32 ++++
 evolution/autoconfig/1.1/pal.kijimadaira.jp   |   21 ++
 evolution/autoconfig/1.1/palette.plala.or.jp  |   24 +++
 evolution/autoconfig/1.1/parabox.or.jp        |   22 +++
 evolution/autoconfig/1.1/peach.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/peoplepc.com         |   29 +++
 evolution/autoconfig/1.1/plum.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/po.dcn.ne.jp         |   21 ++
 evolution/autoconfig/1.1/po.wind.ne.jp        |   28 +++
 evolution/autoconfig/1.1/polka.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/pop.shibata.ne.jp    |   23 +++
 evolution/autoconfig/1.1/posteo.de            |   25 +++
 evolution/autoconfig/1.1/purple.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/rainbow.plala.or.jp  |   24 +++
 evolution/autoconfig/1.1/rambler.ru           |   35 ++++
 evolution/autoconfig/1.1/red.plala.or.jp      |   24 +++
 evolution/autoconfig/1.1/rmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/rondo.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/rose.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/rouge.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/rr.com               |   25 +++
 evolution/autoconfig/1.1/ruby.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/sakunet.ne.jp        |   21 ++
 evolution/autoconfig/1.1/sea.plala.or.jp      |   24 +++
 evolution/autoconfig/1.1/sepia.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/serenade.plala.or.jp |   24 +++
 evolution/autoconfig/1.1/seznam.cz            |   26 +++
 evolution/autoconfig/1.1/sfr.fr               |   36 ++++
 evolution/autoconfig/1.1/silk.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/silver.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/sky.plala.or.jp      |   24 +++
 evolution/autoconfig/1.1/skynet.be            |   35 ++++
 evolution/autoconfig/1.1/smail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/snow.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/so.wind.ne.jp        |   25 +++
 evolution/autoconfig/1.1/sonata.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/strato.de            |   43 +++++
 evolution/autoconfig/1.1/studenti.univr.it    |   22 +++
 evolution/autoconfig/1.1/suite.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/sympatico.ca         |   30 +++
 evolution/autoconfig/1.1/symphony.plala.or.jp |   24 +++
 evolution/autoconfig/1.1/t-online.de          |   37 ++++
 evolution/autoconfig/1.1/taupe.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/terra.es             |   29 +++
 evolution/autoconfig/1.1/tiki.ne.jp           |   24 +++
 evolution/autoconfig/1.1/tiscali.cz           |   25 +++
 evolution/autoconfig/1.1/tiscali.it           |   31 +++
 evolution/autoconfig/1.1/tmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/toccata.plala.or.jp  |   24 +++
 evolution/autoconfig/1.1/topaz.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/trio.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/umail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/umich.edu            |   22 +++
 evolution/autoconfig/1.1/upcmail.nl           |   23 +++
 evolution/autoconfig/1.1/verizon.net          |   22 +++
 evolution/autoconfig/1.1/versatel.de          |   43 +++++
 evolution/autoconfig/1.1/violet.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/vm.aikis.or.jp       |   22 +++
 evolution/autoconfig/1.1/vmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/vp.tiki.ne.jp        |   24 +++
 evolution/autoconfig/1.1/waltz.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/wave.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/web.de               |   55 ++++++
 evolution/autoconfig/1.1/white.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/wildwestdomains.com  |   37 ++++
 evolution/autoconfig/1.1/wine.plala.or.jp     |   24 +++
 evolution/autoconfig/1.1/wmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/wp.pl                |   22 +++
 evolution/autoconfig/1.1/xmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/xp.wind.jp           |   24 +++
 evolution/autoconfig/1.1/xpost.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/xs4all.nl            |   22 +++
 evolution/autoconfig/1.1/xtra.co.nz           |   22 +++
 evolution/autoconfig/1.1/yahoo.co.jp          |   22 +++
 evolution/autoconfig/1.1/yahoo.com            |   41 ++++
 evolution/autoconfig/1.1/yandex.ru            |   39 ++++
 evolution/autoconfig/1.1/ybb.ne.jp            |   22 +++
 evolution/autoconfig/1.1/yellow.plala.or.jp   |   24 +++
 evolution/autoconfig/1.1/ymail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/ypost.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/ziggo.nl             |   25 +++
 evolution/autoconfig/1.1/zmail.plala.or.jp    |   24 +++
 evolution/autoconfig/1.1/zpost.plala.or.jp    |   24 +++
 211 files changed, 6129 insertions(+), 0 deletions(-)
---
diff --git a/evolution/autoconfig/1.1/1und1.de b/evolution/autoconfig/1.1/1und1.de
new file mode 100644
index 0000000..b669e33
--- /dev/null
+++ b/evolution/autoconfig/1.1/1und1.de
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="1und1.de">
+    <!-- employees -->
+    <domain>1and1.de</domain>
+    <!-- DSL customers -->
+    <domain>online.de</domain>
+    <domain>onlinehome.de</domain>
+    <domain>sofortstart.de</domain>
+    <domain>sofort-start.de</domain>
+    <domain>sofortsurf.de</domain>
+    <domain>sofort-surf.de</domain>
+    <domain>go4more.de</domain>
+    <!-- Hosting customers, MX servers -->
+    <domain>kundenserver.de</domain>
+    <domain>schlund.de</domain>
+    <domain>1and1.com</domain>
+    <domain>1and1.fr</domain>
+    <domain>1and1.co.uk</domain>
+    <domain>1and1.es</domain>
+
+    <displayName>1&amp;1</displayName>
+    <displayShortName>1&amp;1</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.1und1.de</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>imap.1und1.de</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.1und1.de</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.1und1.de</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.1und1.de</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <documentation url="http://hilfe-center.1und1.de/access/search/go.php?t=e698123"/>
+    <!--
+        Kundenservice: +49-721-96-00
+        Presse: +49-2602-96-1276 <presse 1und1 de>
+      -->
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/README b/evolution/autoconfig/1.1/README
new file mode 100644
index 0000000..75f8b4a
--- /dev/null
+++ b/evolution/autoconfig/1.1/README
@@ -0,0 +1,52 @@
+The files in this directory are used by Evolution 3.6 and later to
+automatically configure email accounts.  This so that you can tell it,
+"My mail is example gmail com" and it will automatically figure out that
+it must use imap.googlemail.com and smtp.googlemail.com.
+
+The files in this directory use the <clientConfig version="1.1"> format,
+whereas files in the parent directory use the initial <clientConfig> format.
+As far as I can tell, there's merely some naming differences between the two.
+
+The files themselves need to be named after an authoritative name server
+for the domains listed in the file, based on the domain's MX record in DNS.
+
+For example:
+
+  $ dig mx rocketmail.com
+
+  ; <<>> DiG 9.8.1-P1 <<>> mx rocketmail.com
+  ;; global options: +cmd
+  ;; Got answer:
+  ;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 4974
+  ;; flags: qr rd ra; QUERY: 1, ANSWER: 5, AUTHORITY: 5, ADDITIONAL: 16
+
+  ... <snipped> ...
+
+  ;; AUTHORITY SECTION:
+  rocketmail.com.		29284	IN	NS	ns1.yahoo.com.
+  rocketmail.com.		29284	IN	NS	ns5.yahoo.com.
+  rocketmail.com.		29284	IN	NS	ns3.yahoo.com.
+  rocketmail.com.		29284	IN	NS	ns4.yahoo.com.
+  rocketmail.com.		29284	IN	NS	ns2.yahoo.com.
+
+  ... <snipped> ...
+
+  ;; Query time: 101 msec
+  ;; SERVER: 10.5.26.21#53(10.5.26.21)
+  ;; WHEN: Fri Mar 23 08:25:42 2012
+  ;; MSG SIZE  rcvd: 505
+
+Evolution will perform its own MX record lookup, extract one of the name
+server (NS) records from the authority section as shown above, and then
+pare down the name server's host name until it gets a match like so:
+
+  http://api.gnome.org/evolution/autoconfig/1.1/ns1.yahoo.com : NOT FOUND
+  http://api.gnome.org/evolution/autoconfig/1.1/yahoo.com     : FOUND!
+
+FIXME: Write a test script to ensure all files meet this requirement.
+
+These files are copied from
+http://live.mozillamessaging.com/sites/autoconfig.mozillamessaging.com/trunk
+
+  Matthew Barnes
+  March 2012
diff --git a/evolution/autoconfig/1.1/abc.plala.or.jp b/evolution/autoconfig/1.1/abc.plala.or.jp
new file mode 100644
index 0000000..549bed6
--- /dev/null
+++ b/evolution/autoconfig/1.1/abc.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="abc.plala.or.jp">
+    <domain>abc.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>abc.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>abc.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/agate.plala.or.jp b/evolution/autoconfig/1.1/agate.plala.or.jp
new file mode 100644
index 0000000..6195f58
--- /dev/null
+++ b/evolution/autoconfig/1.1/agate.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="agate.plala.or.jp">
+    <domain>agate.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>agate.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>agate.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/alice.it b/evolution/autoconfig/1.1/alice.it
new file mode 100644
index 0000000..6bf811d
--- /dev/null
+++ b/evolution/autoconfig/1.1/alice.it
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="alice.it">
+    <domain>alice.it</domain>
+    <displayName>Alice Italy</displayName>
+    <displayShortName>Alice</displayShortName>
+    <incomingServer type="imap">
+      <hostname>in.alice.it</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>in.alice.it</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>out.alice.it</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://aiuto.alice.it/informazioni/clientemail/thunderbird.html"/>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/amail.plala.or.jp b/evolution/autoconfig/1.1/amail.plala.or.jp
new file mode 100644
index 0000000..b4bd8af
--- /dev/null
+++ b/evolution/autoconfig/1.1/amail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="amail.plala.or.jp">
+    <domain>amail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>amail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>amail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/amber.plala.or.jp b/evolution/autoconfig/1.1/amber.plala.or.jp
new file mode 100644
index 0000000..ae68293
--- /dev/null
+++ b/evolution/autoconfig/1.1/amber.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="amber.plala.or.jp">
+    <domain>amber.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>amber.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>amber.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/aol.com b/evolution/autoconfig/1.1/aol.com
new file mode 100644
index 0000000..a967363
--- /dev/null
+++ b/evolution/autoconfig/1.1/aol.com
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="aol.com">
+    <domain>aol.com</domain>
+    <domain>aim.com</domain>
+    <domain>netscape.net</domain>
+    <displayName>AOL Mail</displayName>
+    <displayShortName>AOL</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.aol.com</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>imap.aol.com</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.aol.com</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.aol.com</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.aol.com</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/apost.plala.or.jp b/evolution/autoconfig/1.1/apost.plala.or.jp
new file mode 100644
index 0000000..c4f936a
--- /dev/null
+++ b/evolution/autoconfig/1.1/apost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="apost.plala.or.jp">
+    <domain>apost.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>apost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>apost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/aqua.plala.or.jp b/evolution/autoconfig/1.1/aqua.plala.or.jp
new file mode 100644
index 0000000..0c78abc
--- /dev/null
+++ b/evolution/autoconfig/1.1/aqua.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="aqua.plala.or.jp">
+    <domain>aqua.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>aqua.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>aqua.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/arcor.de b/evolution/autoconfig/1.1/arcor.de
new file mode 100644
index 0000000..81ebcdc
--- /dev/null
+++ b/evolution/autoconfig/1.1/arcor.de
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="arcor.de">
+    <domain>arcor.de</domain>
+    <displayName>Arcor</displayName>
+    <displayShortName>Arcor</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.arcor.de</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <!-- also works: <port>143</port> <socketType>STARTTLS</socketType> -->
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>imap.arcor.de</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop3.arcor.de</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <!-- STARTTLS does *not* work, unlike IMAP -->
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.arcor.de</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.arcor.de</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </outgoingServer>
+    <documentation url="http://www.arcor.de/hilfe/neu/index.php?aktion=anzeigen&amp;rubrik=040006001&amp;id=181";>
+      <descr lang="en">Generic settings</descr>
+    </documentation>
+    <documentation url="http://www.arcor.de/hilfe/neu/index.php?aktion=anzeigen&amp;rubrik=006001003&amp;id=1241";>
+      <descr lang="en">TB 2.0 settings</descr>
+    </documentation>
+    <!--
+         Sent Folder: SentMail
+         Draft Folder: Drafts
+
+         IMAP-Server is a Courier.
+      -->
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/arubapec.it b/evolution/autoconfig/1.1/arubapec.it
new file mode 100644
index 0000000..8196ee8
--- /dev/null
+++ b/evolution/autoconfig/1.1/arubapec.it
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="arubapec.it">
+    <domain>pec.it</domain>
+    <domain>arubapec.it</domain>
+    <domain>mypec.eu</domain>
+    <domain>gigapec.it</domain>
+    <domain>ingpec.eu</domain>
+    <displayName>Aruba PEC</displayName>
+    <displayShortName>Aruba</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imaps.pec.aruba.it</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop3s.pec.aruba.it</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtps.pec.aruba.it</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://pec.aruba.it/guide_filmate.asp"/>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/att.net b/evolution/autoconfig/1.1/att.net
new file mode 100644
index 0000000..0e839a1
--- /dev/null
+++ b/evolution/autoconfig/1.1/att.net
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="att.net">
+    <domain>att.net</domain>
+    <domain>bellsouth.net</domain>
+    <domain>sbcglobal.net</domain>
+    <domain>prodigy.net</domain>
+    <domain>pacbell.net</domain>
+    <domain>swbell.net</domain>
+    <domain>nvbell.net</domain>
+    <domain>ameritech.net</domain>
+    <domain>snet.net</domain>
+    <domain>flash.net</domain>
+    <domain>wans.net</domain>
+    <displayName>AT&amp;T</displayName>
+    <displayShortName>AT&amp;T</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.att.yahoo.com</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.att.yahoo.com</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://www.att.com/esupport/article.jsp?sid=KB401570&amp;ct=9000152";>
+      <descr lang="en">Configure POP3 for att, sbcglobal, swbell, prodigy etc.</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ballade.plala.or.jp b/evolution/autoconfig/1.1/ballade.plala.or.jp
new file mode 100644
index 0000000..913390f
--- /dev/null
+++ b/evolution/autoconfig/1.1/ballade.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ballade.plala.or.jp">
+    <domain>ballade.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ballade.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ballade.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/bay.wind.ne.jp b/evolution/autoconfig/1.1/bay.wind.ne.jp
new file mode 100644
index 0000000..930cf3a
--- /dev/null
+++ b/evolution/autoconfig/1.1/bay.wind.ne.jp
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="bay.wind.ne.jp">
+    <domain>bay.wind.ne.jp</domain>
+    <domain>bay.wind.jp</domain>
+    <domain>bay.wind.co.jp</domain>
+    <domain>bay.gunmanet.or.jp</domain>
+    <domain>bay.gunmanet.ne.jp</domain>
+    <displayName>çéããããããã</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>bay.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>bay.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/bb-niigata.jp b/evolution/autoconfig/1.1/bb-niigata.jp
new file mode 100644
index 0000000..96f4fb7
--- /dev/null
+++ b/evolution/autoconfig/1.1/bb-niigata.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="bb-niigata.jp">
+    <domain>bb-niigata.jp</domain>
+    <displayName>ïïãããã</displayName>
+    <displayShortName>BB-NIIGATA</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.bb-niigata.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>pop.bb-niigata.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/beige.plala.or.jp b/evolution/autoconfig/1.1/beige.plala.or.jp
new file mode 100644
index 0000000..1da18eb
--- /dev/null
+++ b/evolution/autoconfig/1.1/beige.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="beige.plala.or.jp">
+    <domain>beige.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>beige.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>beige.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/biglobe.ne.jp b/evolution/autoconfig/1.1/biglobe.ne.jp
new file mode 100644
index 0000000..a55728a
--- /dev/null
+++ b/evolution/autoconfig/1.1/biglobe.ne.jp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="biglobe.ne.jp">
+    <!-- about 1400 domains, all with bgmgate1.biglobe.ne.jp as MX -->
+    <domain>biglobe.ne.jp</domain>
+    <displayName>Biglobe</displayName>
+    <displayShortName>Biglobe</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.biglobe.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.biglobe.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/bigpond.com b/evolution/autoconfig/1.1/bigpond.com
new file mode 100644
index 0000000..b3bb498
--- /dev/null
+++ b/evolution/autoconfig/1.1/bigpond.com
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="bigpond.com">
+    <domain>bigpond.com</domain>
+    <domain>bigpond.net.au</domain>
+    <domain>telstra.com</domain>
+    <domain>bigpond.net</domain>
+    <displayName>Telstra Bigpond</displayName>
+    <displayShortName>Bigpond</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.bigpond.com</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.bigpond.com</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+    </outgoingServer>
+  </emailProvider>
+  <documentation url="http://bigpond.custhelp.com/cgi-bin/bigpond.cfg/php/enduser/std_adp.php?p_faqid=672";>
+    <descr lang="en">Generic email settings</descr>
+  </documentation>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/blue.plala.or.jp b/evolution/autoconfig/1.1/blue.plala.or.jp
new file mode 100644
index 0000000..510042e
--- /dev/null
+++ b/evolution/autoconfig/1.1/blue.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="blue.plala.or.jp">
+    <domain>blue.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>blue.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>blue.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/bluemail.ch b/evolution/autoconfig/1.1/bluemail.ch
new file mode 100644
index 0000000..8a4062a
--- /dev/null
+++ b/evolution/autoconfig/1.1/bluemail.ch
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="bluemail.ch">
+    <domain>bluemail.ch</domain>
+    <!-- Same ISP as bluewin.ch, but different username form -->
+    <displayName>bluewin.ch</displayName>
+    <displayShortName>bluewin.ch</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imaps.bluewin.ch</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop3s.bluewin.ch</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtpauths.bluewin.ch</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+    <documentation url="http://smtphelp.bluewin.ch/swisscomdtg/setup/?"/>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/bluewin.ch b/evolution/autoconfig/1.1/bluewin.ch
new file mode 100644
index 0000000..64488a0
--- /dev/null
+++ b/evolution/autoconfig/1.1/bluewin.ch
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="bluewin.ch">
+    <domain>bluewin.ch</domain>
+    <displayName>bluewin.ch</displayName>
+    <displayShortName>bluewin.ch</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imaps.bluewin.ch</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop3s.bluewin.ch</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtpauths.bluewin.ch</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+    <documentation url="http://smtphelp.bluewin.ch/swisscomdtg/setup/"/>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/bmail.plala.or.jp b/evolution/autoconfig/1.1/bmail.plala.or.jp
new file mode 100644
index 0000000..f849e6e
--- /dev/null
+++ b/evolution/autoconfig/1.1/bmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="bmail.plala.or.jp">
+    <domain>bmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>bmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>bmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/bolero.plala.or.jp b/evolution/autoconfig/1.1/bolero.plala.or.jp
new file mode 100644
index 0000000..171776a
--- /dev/null
+++ b/evolution/autoconfig/1.1/bolero.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="bolero.plala.or.jp">
+    <domain>bolero.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>bolero.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>bolero.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/bpost.plala.or.jp b/evolution/autoconfig/1.1/bpost.plala.or.jp
new file mode 100644
index 0000000..24c8ebd
--- /dev/null
+++ b/evolution/autoconfig/1.1/bpost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="bpost.plala.or.jp">
+    <domain>bpost.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>bpost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>bpost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/broba.cc b/evolution/autoconfig/1.1/broba.cc
new file mode 100644
index 0000000..75e6ebc
--- /dev/null
+++ b/evolution/autoconfig/1.1/broba.cc
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="broba.cc">
+    <domain>garnet.broba.cc</domain>
+    <domain>amethyst.broba.cc</domain>
+    <domain>coral.broba.ccv</domain>
+    <domain>diamond.broba.cc</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.broba.cc</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.broba.cc</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/brown.plala.or.jp b/evolution/autoconfig/1.1/brown.plala.or.jp
new file mode 100644
index 0000000..3bd4be2
--- /dev/null
+++ b/evolution/autoconfig/1.1/brown.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="brown.plala.or.jp">
+    <domain>brown.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>brown.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>brown.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/camel.plala.or.jp b/evolution/autoconfig/1.1/camel.plala.or.jp
new file mode 100644
index 0000000..c55faa8
--- /dev/null
+++ b/evolution/autoconfig/1.1/camel.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="camel.plala.or.jp">
+    <domain>camel.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>camel.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>camel.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/cameo.plala.or.jp b/evolution/autoconfig/1.1/cameo.plala.or.jp
new file mode 100644
index 0000000..7376c1f
--- /dev/null
+++ b/evolution/autoconfig/1.1/cameo.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cameo.plala.or.jp">
+    <domain>cameo.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>cameo.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>cameo.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/cc9.ne.jp b/evolution/autoconfig/1.1/cc9.ne.jp
new file mode 100644
index 0000000..9f6c11e
--- /dev/null
+++ b/evolution/autoconfig/1.1/cc9.ne.jp
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="cc9.ne.jp">
+    <domain>cc9.ne.jp</domain>
+    <displayName>CC9ããããããããããã</displayName>
+    <displayShortName>CC9</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.cc9.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.cc9.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/cek.ne.jp b/evolution/autoconfig/1.1/cek.ne.jp
new file mode 100644
index 0000000..a1bce9e
--- /dev/null
+++ b/evolution/autoconfig/1.1/cek.ne.jp
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="cek.ne.jp">
+    <domain>cek.ne.jp</domain>
+    <displayName>ããããããããéãå</displayName>
+    <displayShortName>CEK-Net</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.cek.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.cek.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/cgl.ucsf.edu b/evolution/autoconfig/1.1/cgl.ucsf.edu
new file mode 100644
index 0000000..ca545eb
--- /dev/null
+++ b/evolution/autoconfig/1.1/cgl.ucsf.edu
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="cgl.ucsf.edu">
+    <domain>cgl.ucsf.edu</domain>
+    <displayName>UCSF CGL email</displayName>
+    <displayShortName>CGL email</displayShortName>
+    <incomingServer type="imap">
+      <hostname>plato.cgl.ucsf.edu</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>plato.cgl.ucsf.edu</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/clio.ne.jp b/evolution/autoconfig/1.1/clio.ne.jp
new file mode 100644
index 0000000..e1cb755
--- /dev/null
+++ b/evolution/autoconfig/1.1/clio.ne.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="clio.ne.jp">
+    <domain>clio.ne.jp</domain>
+    <displayName>CLIO-Netççãããã</displayName>
+    <displayShortName>CLIO-Net</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.clio.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.clio.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/cmail.plala.or.jp b/evolution/autoconfig/1.1/cmail.plala.or.jp
new file mode 100644
index 0000000..eb25582
--- /dev/null
+++ b/evolution/autoconfig/1.1/cmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cmail.plala.or.jp">
+    <domain>cmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>cmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>cmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/co1.wind.ne.jp b/evolution/autoconfig/1.1/co1.wind.ne.jp
new file mode 100644
index 0000000..e086cd7
--- /dev/null
+++ b/evolution/autoconfig/1.1/co1.wind.ne.jp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="co1.wind.ne.jp">
+    <domain>co1.wind.ne.jp</domain>
+    <domain>co1.wind.jp</domain>
+    <displayName>çéããããããã</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>co1.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>co1.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/co2.wind.ne.jp b/evolution/autoconfig/1.1/co2.wind.ne.jp
new file mode 100644
index 0000000..0104772
--- /dev/null
+++ b/evolution/autoconfig/1.1/co2.wind.ne.jp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="co2.wind.ne.jp">
+    <domain>co2.wind.ne.jp</domain>
+    <domain>co2.wind.jp</domain>
+    <displayName>çéããããããã</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>co2.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>co2.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/co3.wind.ne.jp b/evolution/autoconfig/1.1/co3.wind.ne.jp
new file mode 100644
index 0000000..498384c
--- /dev/null
+++ b/evolution/autoconfig/1.1/co3.wind.ne.jp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="co3.wind.ne.jp">
+    <domain>co3.wind.ne.jp</domain>
+    <domain>co3.wind.jp</domain>
+    <displayName>çéããããããã</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>co3.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>co3.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/cocoa.plala.or.jp b/evolution/autoconfig/1.1/cocoa.plala.or.jp
new file mode 100644
index 0000000..5387cd3
--- /dev/null
+++ b/evolution/autoconfig/1.1/cocoa.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cocoa.plala.or.jp">
+    <domain>cocoa.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>cocoa.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>cocoa.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/coda.plala.or.jp b/evolution/autoconfig/1.1/coda.plala.or.jp
new file mode 100644
index 0000000..f668775
--- /dev/null
+++ b/evolution/autoconfig/1.1/coda.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="coda.plala.or.jp">
+    <domain>coda.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>coda.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>coda.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/comcast.net b/evolution/autoconfig/1.1/comcast.net
new file mode 100644
index 0000000..a78656b
--- /dev/null
+++ b/evolution/autoconfig/1.1/comcast.net
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="comcast.net">
+    <domain>comcast.net</domain>
+    <displayName>Comcast</displayName>
+    <displayShortName>Comcast</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.comcast.net</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.comcast.net</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/concerto.plala.or.jp b/evolution/autoconfig/1.1/concerto.plala.or.jp
new file mode 100644
index 0000000..1c190b5
--- /dev/null
+++ b/evolution/autoconfig/1.1/concerto.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="concerto.plala.or.jp">
+    <domain>concerto.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>concerto.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>concerto.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/coral.plala.or.jp b/evolution/autoconfig/1.1/coral.plala.or.jp
new file mode 100644
index 0000000..1c52fce
--- /dev/null
+++ b/evolution/autoconfig/1.1/coral.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="coral.plala.or.jp">
+    <domain>coral.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>coral.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>coral.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/courante.plala.or.jp b/evolution/autoconfig/1.1/courante.plala.or.jp
new file mode 100644
index 0000000..05976ef
--- /dev/null
+++ b/evolution/autoconfig/1.1/courante.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="courante.plala.or.jp">
+    <domain>courante.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>courante.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>courante.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/cpost.plala.or.jp b/evolution/autoconfig/1.1/cpost.plala.or.jp
new file mode 100644
index 0000000..613d377
--- /dev/null
+++ b/evolution/autoconfig/1.1/cpost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cpost.plala.or.jp">
+    <domain>cpost.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>cpost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>cpost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/cream.plala.or.jp b/evolution/autoconfig/1.1/cream.plala.or.jp
new file mode 100644
index 0000000..16e2325
--- /dev/null
+++ b/evolution/autoconfig/1.1/cream.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="cream.plala.or.jp">
+    <domain>cream.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>cream.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>cream.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/dan.wind.ne.jp b/evolution/autoconfig/1.1/dan.wind.ne.jp
new file mode 100644
index 0000000..b027d98
--- /dev/null
+++ b/evolution/autoconfig/1.1/dan.wind.ne.jp
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="dan.wind.ne.jp">
+    <domain>dan.wind.ne.jp</domain>
+    <domain>dan.wind.jp</domain>
+    <domain>dan.wind.co.jp</domain>
+    <domain>dan.gunmanet.or.jp</domain>
+    <domain>dan.gunmanet.ne.jp</domain>
+    <displayName>çéããããããã</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>dan.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>dan.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/dance.plala.or.jp b/evolution/autoconfig/1.1/dance.plala.or.jp
new file mode 100644
index 0000000..74f90c8
--- /dev/null
+++ b/evolution/autoconfig/1.1/dance.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="dance.plala.or.jp">
+    <domain>dance.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>dance.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>dance.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/dd.iij4u.or.jp b/evolution/autoconfig/1.1/dd.iij4u.or.jp
new file mode 100644
index 0000000..5d42218
--- /dev/null
+++ b/evolution/autoconfig/1.1/dd.iij4u.or.jp
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="dd.iij4u.or.jp">
+    <domain>dd.iij4u.or.jp</domain>
+    <domain>ff.iij4u.or.jp</domain>
+    <domain>hh.iij4u.or.jp</domain>
+    <domain>kk.iij4u.or.jp</domain>
+    <domain>nn.iij4u.or.jp</domain>
+    <domain>pp.iij4u.or.jp</domain>
+    <domain>rr.iij4u.or.jp</domain>
+    <domain>ss.iij4u.or.jp</domain>
+    <domain>bc.iij4u.or.jp</domain>
+    <domain>bk.iij4u.or.jp</domain>
+    <domain>bp.iij4u.or.jp</domain>
+    <domain>bu.iij4u.or.jp</domain>
+    <displayName>IIJ4U</displayName>
+    <displayShortName>IIJ4U</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mbox.iij4u.or.jp</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%.%EMAILDOMAIN%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mbox.iij4u.or.jp</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%.%EMAILDOMAIN%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/df.eu b/evolution/autoconfig/1.1/df.eu
new file mode 100644
index 0000000..9d54fd2
--- /dev/null
+++ b/evolution/autoconfig/1.1/df.eu
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="df.eu">
+    <!-- domain hoster, per MX -->
+    <domain>ispgateway.de</domain>
+    <displayName>domainFACTORY</displayName>
+    <displayShortName>domainFACTORY</displayShortName>
+    <incomingServer type="imap">
+      <hostname>sslmailpool.ispgateway.de</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>sslmailpool.ispgateway.de</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtprelaypool.ispgateway.de</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://www.df.eu/de/service/df-faq/e-mail/mail-programme/";>
+      <descr lang="en">Configuration of Thunderbird (2, 3, 3.1) and others</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/dmail.plala.or.jp b/evolution/autoconfig/1.1/dmail.plala.or.jp
new file mode 100644
index 0000000..f742605
--- /dev/null
+++ b/evolution/autoconfig/1.1/dmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="dmail.plala.or.jp">
+    <domain>dmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>dmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>dmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/earthlink.net b/evolution/autoconfig/1.1/earthlink.net
new file mode 100644
index 0000000..6807e32
--- /dev/null
+++ b/evolution/autoconfig/1.1/earthlink.net
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="earthlink.net">
+    <domain>earthlink.net</domain>
+    <domain>mindspring.com</domain>
+    <domain>ix.netcom.com</domain>
+    <!-- many other domains, via MX earthlink.net -->
+    <displayName>EarthLink</displayName>
+    <displayShortName>EarthLink</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.earthlink.net</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.earthlink.net</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtpauth.earthlink.net</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+    <documentation url="http://support.earthlink.net/email/email-server-settings.php";>
+      <descr>POP settings, domains</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ebony.plala.or.jp b/evolution/autoconfig/1.1/ebony.plala.or.jp
new file mode 100644
index 0000000..11a275e
--- /dev/null
+++ b/evolution/autoconfig/1.1/ebony.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ebony.plala.or.jp">
+    <domain>ebony.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ebony.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ebony.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/email.it b/evolution/autoconfig/1.1/email.it
new file mode 100644
index 0000000..22ec456
--- /dev/null
+++ b/evolution/autoconfig/1.1/email.it
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="email.it">
+    <domain>email.it</domain>
+    <displayName>email.it</displayName>
+    <displayShortName>email.it</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imapmail.email.it</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>popmail.email.it</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.email.it</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://www.email.it/ita/config/thunder.php"/>
+    <!--
+        You should set "IMAP server directory" to "INBOX"
+      -->
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/email.plala.or.jp b/evolution/autoconfig/1.1/email.plala.or.jp
new file mode 100644
index 0000000..45a8e0d
--- /dev/null
+++ b/evolution/autoconfig/1.1/email.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="email.plala.or.jp">
+    <domain>email.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>email.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>email.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ewetel.de b/evolution/autoconfig/1.1/ewetel.de
new file mode 100644
index 0000000..b61ac4c
--- /dev/null
+++ b/evolution/autoconfig/1.1/ewetel.de
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="ewetel.de">
+    <domain>ewetel.de</domain>
+    <domain>ewetel.net</domain>
+    <displayName>EWE Tel</displayName>
+    <displayShortName>EWE Tel</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3s-1.ewetel.net</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtps-1.ewetel.net</hostname>
+      <port>25</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/fantasy.plala.or.jp b/evolution/autoconfig/1.1/fantasy.plala.or.jp
new file mode 100644
index 0000000..5774cc2
--- /dev/null
+++ b/evolution/autoconfig/1.1/fantasy.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="fantasy.plala.or.jp">
+    <domain>fantasy.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>fantasy.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>fantasy.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/flamenco.plala.or.jp b/evolution/autoconfig/1.1/flamenco.plala.or.jp
new file mode 100644
index 0000000..3a8ade7
--- /dev/null
+++ b/evolution/autoconfig/1.1/flamenco.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="flamenco.plala.or.jp">
+    <domain>flamenco.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>flamenco.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>flamenco.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/fmail.plala.or.jp b/evolution/autoconfig/1.1/fmail.plala.or.jp
new file mode 100644
index 0000000..c4a4dbc
--- /dev/null
+++ b/evolution/autoconfig/1.1/fmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="fmail.plala.or.jp">
+    <domain>fmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>fmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>fmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/francetelecom.fr b/evolution/autoconfig/1.1/francetelecom.fr
new file mode 100644
index 0000000..32d67bf
--- /dev/null
+++ b/evolution/autoconfig/1.1/francetelecom.fr
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="francetelecom.fr">
+    <domain>wanadoo.fr</domain>
+    <domain>orange.fr</domain>
+    <displayName>France Telecom / Orange</displayName>
+    <displayShortName>Orange</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.orange.fr</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>imap.orange.fr</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.orange.fr</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+      <!-- works outside the ISP network -->
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/free.fr b/evolution/autoconfig/1.1/free.fr
new file mode 100644
index 0000000..a3fac4d
--- /dev/null
+++ b/evolution/autoconfig/1.1/free.fr
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="free.fr">
+    <domain>free.fr</domain>
+    <displayName>Free Telecom</displayName>
+    <displayShortName>free.fr</displayShortName>
+
+    <incomingServer type="imap">
+      <hostname>imap.free.fr</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+
+    <incomingServer type="pop3">
+      <hostname>pop.free.fr</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+
+    <outgoingServer type="smtp">
+      <hostname>smtp.free.fr</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+      <restriction>client-IP-address</restriction>
+    </outgoingServer>
+    <!-- The following config also exists, but
+         - the user needs to manually enable
+           "SMTP auth" in their admin webpages, as noted below.
+         - Free says this is not supposed to be used
+           inside the Free network, because checking the password is
+           unnecessary in that case and uses "unnecessary CPU resources".
+         This means that users can't move outside home
+         with the default config. :-( See bug 556750.
+    <outgoingServer type="smtp">
+      <hostname>smtp.free.fr</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+    -->
+
+    <documentation url="http://www.free.fr/assistance/599-thunderbird.html";>
+      <descr lang="en">How to set up Thunderbird with Free.fr</descr>
+      <descr lang="fr">Configurer Thunderbird avec Free</descr>
+    </documentation>
+    <documentation url="http://www.free.fr/assistance/2514-interet-et-fonctionnement.html";>
+      <descr lang="en">How to setup a secure IMAP account</descr>
+      <descr lang="fr">Serveur de rÃception IMAP sÃcurisà SSL</descr>
+    </documentation>
+    <documentation url="http://www.free.fr/assistance/2407-interet-et-fonctionnement.html";>
+      <descr lang="en">How to enable authenticated SMTP</descr>
+      <descr lang="fr">Comment activer le serveur d'envoi SMTP authentifiÃ</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/freenet.de b/evolution/autoconfig/1.1/freenet.de
new file mode 100644
index 0000000..e2cb788
--- /dev/null
+++ b/evolution/autoconfig/1.1/freenet.de
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="freenet.de">
+    <domain>freenet.de</domain>
+    <displayName>Freenet Mail</displayName>
+    <displayShortName>Freenet</displayShortName>
+    <incomingServer type="imap">
+      <hostname>mx.freenet.de</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-encrypted</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>mx.freenet.de</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-encrypted</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>mx.freenet.de</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>mx.freenet.de</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mx.freenet.de</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <authentication>password-encrypted</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>mx.freenet.de</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-encrypted</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <documentation url="http://kundenservice.freenet.de/hilfe/email/programme/config/index.html";>
+      <descr lang="en">Generic settings page</descr>
+    </documentation>
+    <documentation url="http://kundenservice.freenet.de/hilfe/email/programme/config/thunderbird/imap-thunderbird/imap/index.html";>
+      <descr lang="en">TB 2.0 IMAP settings</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/fuga.plala.or.jp b/evolution/autoconfig/1.1/fuga.plala.or.jp
new file mode 100644
index 0000000..f41116a
--- /dev/null
+++ b/evolution/autoconfig/1.1/fuga.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="fuga.plala.or.jp">
+    <domain>fuga.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>fuga.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>fuga.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/gandi.net b/evolution/autoconfig/1.1/gandi.net
new file mode 100644
index 0000000..b71cdbb
--- /dev/null
+++ b/evolution/autoconfig/1.1/gandi.net
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="gandi.net">
+    <!-- Gandi is a domain registrar with free mail service -->
+    <!-- MX domain -->
+    <domain>gandi.net</domain>
+    <displayName>Gandi Mail</displayName>
+    <displayShortName>Gandi</displayShortName>
+    <incomingServer type="imap">
+      <hostname>mail.gandi.net</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>mail.gandi.net</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>mail.gandi.net</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>mail.gandi.net</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.gandi.net</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.gandi.net</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <documentation url="http://wiki.gandi.net/en/mail/standard-settings";>
+      <descr lang="en">Generic settings page</descr>
+    </documentation>
+    <documentation url="http://wiki.gandi.net/en/mail/create-email-account";>
+      <descr lang="en">Create new mailbox, including MX servers to use in DNS</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/gmail.plala.or.jp b/evolution/autoconfig/1.1/gmail.plala.or.jp
new file mode 100644
index 0000000..d369859
--- /dev/null
+++ b/evolution/autoconfig/1.1/gmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="gmail.plala.or.jp">
+    <domain>gmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>gmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>gmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/gmx.com b/evolution/autoconfig/1.1/gmx.com
new file mode 100644
index 0000000..6c2809f
--- /dev/null
+++ b/evolution/autoconfig/1.1/gmx.com
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="gmx.com">
+    <domain>gmx.com</domain>
+    <domain>gmx.tm</domain>
+    <domain>gmx.us</domain>
+    <domain>gmx.co.uk</domain>
+    <domain>gmx.es</domain>
+    <domain>gmx.fr</domain>
+    <domain>gmx.ca</domain>
+    <domain>gmx.cn</domain>
+    <domain>gmx.co.in</domain>
+    <domain>gmx.com.br</domain>
+    <domain>gmx.com.my</domain>
+    <domain>gmx.hk</domain>
+    <domain>gmx.ie</domain>
+    <domain>gmx.ph</domain>
+    <domain>gmx.pt</domain>
+    <domain>gmx.ru</domain>
+    <domain>gmx.se</domain>
+    <domain>gmx.sg</domain>
+    <domain>gmx.tw</domain>
+    <domain>gmx.com.tr</domain>
+    <domain>gmx.it</domain>
+    <domain>gmx.li</domain>
+    <!-- gmx.net is same company, but different access servers -->
+    <displayName>GMX Freemail</displayName>
+    <displayShortName>GMX</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.gmx.com</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>imap.gmx.com</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.gmx.com</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.gmx.com</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.gmx.com</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.gmx.com</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/gmx.net b/evolution/autoconfig/1.1/gmx.net
new file mode 100644
index 0000000..5a33fb0
--- /dev/null
+++ b/evolution/autoconfig/1.1/gmx.net
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="gmx.net">
+    <domain>gmx.net</domain>
+    <domain>gmx.de</domain>
+    <domain>gmx.at</domain>
+    <domain>gmx.ch</domain>
+    <domain>gmx.eu</domain>
+    <domain>gmx.biz</domain>
+    <domain>gmx.org</domain>
+    <domain>gmx.info</domain>
+    <!-- see also other domains below -->
+    <!-- gmx.com is same company, but different access servers -->
+    <displayName>GMX Freemail</displayName>
+    <displayShortName>GMX</displayShortName>
+    <!-- imap officially costs money, but actually works with freemail accounts, too -->
+    <incomingServer type="imap">
+      <hostname>imap.gmx.net</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <!-- Kundennummer (customer no) and email address should both work -->
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>imap.gmx.net</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.gmx.net</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <!-- see above -->
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.gmx.net</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.gmx.net</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <!-- see above -->
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.gmx.net</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
+<!-- A whole lot of vanity domains, which we will not add here (yay MX lookup):
+     bist-eine-haelfte-von-mir.de,  bleib-bei-mir.de,  es-ist-liebe.de,  fahr-zur-hoelle.org,  ich-bin-verrueckt-nach-dir.de,  ist-allein.info,  ist-es-liebe.de,  ist-ganz-allein.de,  ist-willig.de,  lass-es-geschehen.de,  liebt-dich.info,  loveyouforever.de,  moechte-mit-dir-aufwachen.de,  schmusemail.de,  schreib-doch-mal-wieder.de,  teilt-mit-dir-alle-geheimnisse.de,  verlass-mich-nicht.de,  vorsicht-scharf.de,  weinenvorglueck.de,  alphafrau.de,  feinripptraeger.de,  fettabernett.de,  ist-einmalig.de,  kaffeeschluerfer.com,  liebt-den-mann-ihrer-chefin.de,  liebt-die-frau-seines-chefs.de,  maennerversteherin.com,  partybombe.de,  partyheld.de,  polizisten-duzer.de,  raubtierbaendiger.de,  saeuferleber.de,  tortenboxer.de,  turboprinz.de,  turboprinzessin.de,  vorsicht-bissig.de,  alpenjodel.de,  das-spiel-hat-90-minuten.de,  der-ball-ist-rund.net,  die-genossen.de,  die-optimisten.net,  email-ausdrucker.de,  fantasymail.de,  freudenkinder.de,  gentlemansclub.de,  gmx-ist
 -cool.de,  herr-der-mails.de,  ich-habe-fertig.com,  meine-wahrheit-deine-wahrheit.de,  muskelshirt.de,  quantentunnel.de,  sags-per-mail.de,  sonnenkinder.org,  turnbeutel-vergesser.com,  vollbio.de,  volloeko.de,  vorabend-einchecker.de,  weibsvolk.org,  wenns-um-email-geht.de,  wir-sind-cool.org,  wolke7.net,  abwesend.de,  baldmama.de,  baldpapa.de,  betriebsdirektor.de,  buerotiger.de,  habmalnefrage.de,  hab-verschlafen.de,  ich-will-net.de,  kommespaeter.de,  mailueberfall.de,  netterchef.de,  nurfuerspam.de,  streber24.de,  terminverpennt.de,  unterderbruecke.de,  will-hier-weg.de,  wir-haben-nachwuchs.de,  women-at-work.org,  bin-wieder-da.de,  coole-files.de,  die-besten-bilder.de,  digi-dia-freakshow.de,  digital-filestore.de,  digitalfoto-model-award.de,  download-privat.de,  gmx-topmail.de,  meine-dateien.info,  meine-diashow.de,  meine-fotos.info,  meine-urlaubsfotos.de,  neue-dateien.de,  office-dateien.de,  peinliche-fotos.de,  public-files.de,  shared-files.
 de,  topmail-files.de,  war-im-urlaub.de
+-->
diff --git a/evolution/autoconfig/1.1/go.tvm.ne.jp b/evolution/autoconfig/1.1/go.tvm.ne.jp
new file mode 100644
index 0000000..e8e5570
--- /dev/null
+++ b/evolution/autoconfig/1.1/go.tvm.ne.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="go.tvm.ne.jp">
+    <domain>go.tvm.ne.jp</domain>
+    <displayName>ãããææããããããããããããããã</displayName>
+    <displayShortName>TVM-Net</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>go.tvm.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>go.tvm.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/goo.jp b/evolution/autoconfig/1.1/goo.jp
new file mode 100644
index 0000000..ef4d5f7
--- /dev/null
+++ b/evolution/autoconfig/1.1/goo.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="goo.jp">
+    <domain>goo.jp</domain>
+    <displayName>goo ãããããããã</displayName>
+    <displayShortName>goo</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.mail.goo.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.mail.goo.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/googlemail.com b/evolution/autoconfig/1.1/googlemail.com
new file mode 100644
index 0000000..ea2a63e
--- /dev/null
+++ b/evolution/autoconfig/1.1/googlemail.com
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="googlemail.com">
+    <domain>gmail.com</domain>
+    <domain>googlemail.com</domain>
+    <!-- MX, for Google Apps -->
+    <domain>google.com</domain>
+    <!-- HACK. Only add ISPs with 100000+ users here -->
+    <domain>jazztel.es</domain>
+    <displayName>Google Mail</displayName>
+    <displayShortName>GMail</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.googlemail.com</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.googlemail.com</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+      <pop3>
+        <leaveMessagesOnServer>true</leaveMessagesOnServer>
+      </pop3>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.googlemail.com</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <enable visiturl="https://mail.google.com/mail/?ui=2&amp;shva=1#settings/fwdandpop";>
+      <instruction>You need to enable IMAP access</instruction>
+    </enable>
+    <documentation url="http://mail.google.com/support/bin/answer.py?answer=13273";>
+      <descr>How to enable IMAP/POP3 in GMail</descr>
+    </documentation>
+    <documentation url="http://mail.google.com/support/bin/topic.py?topic=12806";>
+      <descr>How to configure email clients for IMAP</descr>
+    </documentation>
+    <documentation url="http://mail.google.com/support/bin/topic.py?topic=12805";>
+      <descr>How to configure email clients for POP3</descr>
+    </documentation>
+    <documentation url="http://mail.google.com/support/bin/answer.py?answer=86399";>
+      <descr>How to configure TB 2.0 for POP3</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/grape.plala.or.jp b/evolution/autoconfig/1.1/grape.plala.or.jp
new file mode 100644
index 0000000..09fb378
--- /dev/null
+++ b/evolution/autoconfig/1.1/grape.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="grape.plala.or.jp">
+    <domain>grape.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>grape.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>grape.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/gray.plala.or.jp b/evolution/autoconfig/1.1/gray.plala.or.jp
new file mode 100644
index 0000000..efeb354
--- /dev/null
+++ b/evolution/autoconfig/1.1/gray.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="gray.plala.or.jp">
+    <domain>gray.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>gray.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>gray.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/hal.ne.jp b/evolution/autoconfig/1.1/hal.ne.jp
new file mode 100644
index 0000000..0653877
--- /dev/null
+++ b/evolution/autoconfig/1.1/hal.ne.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="hal.ne.jp">
+    <domain>hal.ne.jp</domain>
+    <displayName>ããããããããã</displayName>
+    <displayShortName>HAL</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.hal.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.hal.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/hana.or.jp b/evolution/autoconfig/1.1/hana.or.jp
new file mode 100644
index 0000000..e2e7d7f
--- /dev/null
+++ b/evolution/autoconfig/1.1/hana.or.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="hana.or.jp">
+    <domain>hana.or.jp</domain>
+    <displayName>ããããèããã</displayName>
+    <displayShortName>èããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.hana.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.hana.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/hotmail.com b/evolution/autoconfig/1.1/hotmail.com
new file mode 100644
index 0000000..1474ece
--- /dev/null
+++ b/evolution/autoconfig/1.1/hotmail.com
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="hotmail.com">
+    <domain>hotmail.com</domain>
+    <domain>hotmail.co.uk</domain>
+    <domain>hotmail.co.jp</domain>
+    <domain>hotmail.com.br</domain>
+    <domain>hotmail.de</domain>
+    <domain>hotmail.fr</domain>
+    <domain>hotmail.it</domain>
+    <domain>hotmail.es</domain>
+    <domain>live.com</domain>
+    <domain>live.co.uk</domain>
+    <domain>live.co.jp</domain>
+    <domain>live.de</domain>
+    <domain>live.fr</domain>
+    <domain>live.it</domain>
+    <domain>live.jp</domain>
+    <domain>msn.com</domain>
+    <displayName>Microsoft Live Hotmail</displayName>
+    <displayShortName>Hotmail</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.live.com</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.live.com</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/i.softbank.jp b/evolution/autoconfig/1.1/i.softbank.jp
new file mode 100644
index 0000000..965d5e8
--- /dev/null
+++ b/evolution/autoconfig/1.1/i.softbank.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="i.softbank.jp">
+    <domain>i.softbank.jp</domain>
+    <displayName>SoftBank</displayName>
+    <displayShortName>SoftBank</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.softbank.jp</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.softbank.jp</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ic-net.or.jp b/evolution/autoconfig/1.1/ic-net.or.jp
new file mode 100644
index 0000000..8a8e995
--- /dev/null
+++ b/evolution/autoconfig/1.1/ic-net.or.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="ic-net.or.jp">
+    <domain>ic-net.or.jp</domain>
+    <displayName>IC-NET</displayName>
+    <displayShortName>IC-NET</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.ic-net.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.ic-net.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/iijmio-mail.jp b/evolution/autoconfig/1.1/iijmio-mail.jp
new file mode 100644
index 0000000..00a385e
--- /dev/null
+++ b/evolution/autoconfig/1.1/iijmio-mail.jp
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="iijmio-mail.jp">
+    <domain>iijmio-mail.jp</domain>
+    <domain>miomio.jp</domain>
+    <domain>miobox.jp</domain>
+    <domain>e23.jp</domain>
+    <domain>x-il.jp</domain>
+    <displayName>IIJmio ãããããããã</displayName>
+    <displayShortName>IIJmio</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mbox.iijmio-mail.jp</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%.%EMAILDOMAIN%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mbox.iijmio-mail.jp</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%.%EMAILDOMAIN%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/iiyama-catv.ne.jp b/evolution/autoconfig/1.1/iiyama-catv.ne.jp
new file mode 100644
index 0000000..96477d0
--- /dev/null
+++ b/evolution/autoconfig/1.1/iiyama-catv.ne.jp
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="iiyama-catv.ne.jp">
+    <domain>iiyama-catv.ne.jp</domain>
+    <displayName>ãããããããiãããéå</displayName>
+    <displayShortName>iãããéå</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.iiyama-catv.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.iiyama-catv.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/imail.plala.or.jp b/evolution/autoconfig/1.1/imail.plala.or.jp
new file mode 100644
index 0000000..d4c8897
--- /dev/null
+++ b/evolution/autoconfig/1.1/imail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="imail.plala.or.jp">
+    <domain>imail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>imail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>imail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/inbox.lt b/evolution/autoconfig/1.1/inbox.lt
new file mode 100644
index 0000000..336c817
--- /dev/null
+++ b/evolution/autoconfig/1.1/inbox.lt
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="inbox.lt">
+    <domain>inbox.lt</domain>
+    <!-- Same as inbox.lv -->
+    <displayName>Inbox.lt</displayName>
+    <displayShortName>Inbox.lt</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.inbox.lt</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+      <pop3>
+        <leaveMessagesOnServer>true</leaveMessagesOnServer>
+      </pop3>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.inbox.lt</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/inbox.lv b/evolution/autoconfig/1.1/inbox.lv
new file mode 100644
index 0000000..1378626
--- /dev/null
+++ b/evolution/autoconfig/1.1/inbox.lv
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="inbox.lv">
+    <domain>inbox.lv</domain>
+    <!-- Same as inbox.lt TODO merge? -->
+    <displayName>Inbox.lv</displayName>
+    <displayShortName>Inbox.lv</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.inbox.lv</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+      <pop3>
+        <leaveMessagesOnServer>true</leaveMessagesOnServer>
+      </pop3>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.inbox.lv</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/indigo.plala.or.jp b/evolution/autoconfig/1.1/indigo.plala.or.jp
new file mode 100644
index 0000000..2d21e2d
--- /dev/null
+++ b/evolution/autoconfig/1.1/indigo.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="indigo.plala.or.jp">
+    <domain>indigo.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>indigo.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>indigo.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/inet-shibata.or.jp b/evolution/autoconfig/1.1/inet-shibata.or.jp
new file mode 100644
index 0000000..f12c85b
--- /dev/null
+++ b/evolution/autoconfig/1.1/inet-shibata.or.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="inet-shibata.or.jp">
+    <domain>inet-shibata.or.jp</domain>
+    <displayName>ãããããããæçç</displayName>
+    <displayShortName>INET-SHIBATA</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>po.inet-shibata.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>po.inet-shibata.or.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/internode.on.net b/evolution/autoconfig/1.1/internode.on.net
new file mode 100644
index 0000000..ee7dab1
--- /dev/null
+++ b/evolution/autoconfig/1.1/internode.on.net
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="internode.on.net">
+    <domain>internode.on.net</domain>
+    <displayName>Internode</displayName>
+    <displayShortName>Internode</displayShortName>
+    <incomingServer type="imap">
+      <hostname>mail.internode.on.net</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>mail.internode.on.net</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.internode.on.net</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <documentation url="http://www.internode.on.net/support/guides/email/secure_email/";>
+      <descr lang="en">Secure settings, generic</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ipax.at b/evolution/autoconfig/1.1/ipax.at
new file mode 100644
index 0000000..3d6d3b4
--- /dev/null
+++ b/evolution/autoconfig/1.1/ipax.at
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<clientConfig version="1.1">
+    <emailProvider id="ipax.at">
+      <domain>ipax.at</domain>
+      <displayName>IPAX Internet Services</displayName>
+      <displayShortName>IPAX</displayShortName>
+      <incomingServer type="imap">
+         <hostname>mail.ipax.at</hostname>
+         <port>993</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>password-cleartext</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>mail.ipax.at</hostname>
+         <port>465</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>password-cleartext</authentication>
+      </outgoingServer>
+
+      <instruction url="http://help.ipax.at/Thunderbird3/";>
+         <descr lang="en">Configure Thunderbird 3 for IMAP</descr>
+         <descr lang="de">Thunderbird 3 mit IMAP konfigurieren</descr>
+      </instruction>
+    </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ivory.plala.or.jp b/evolution/autoconfig/1.1/ivory.plala.or.jp
new file mode 100644
index 0000000..a3a0b40
--- /dev/null
+++ b/evolution/autoconfig/1.1/ivory.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ivory.plala.or.jp">
+    <domain>ivory.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ivory.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ivory.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/iwafune.ne.jp b/evolution/autoconfig/1.1/iwafune.ne.jp
new file mode 100644
index 0000000..f7cf4cd
--- /dev/null
+++ b/evolution/autoconfig/1.1/iwafune.ne.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="iwafune.ne.jp">
+    <domain>iwafune.ne.jp</domain>
+    <displayName>ããããããããããã</displayName>
+    <displayShortName>IWAFUNE</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>po.iwafune.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>po.iwafune.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/jade.plala.or.jp b/evolution/autoconfig/1.1/jade.plala.or.jp
new file mode 100644
index 0000000..998ff0c
--- /dev/null
+++ b/evolution/autoconfig/1.1/jade.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="jade.plala.or.jp">
+    <domain>jade.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>jade.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>jade.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/janis.or.jp b/evolution/autoconfig/1.1/janis.or.jp
new file mode 100644
index 0000000..d23012b
--- /dev/null
+++ b/evolution/autoconfig/1.1/janis.or.jp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="janis.or.jp">
+    <!-- ytg.janis.or.jp etc. use MX mx1.janis.or.jp -->
+    <domain>janis.or.jp</domain>
+    <displayName>Janis</displayName>
+    <displayShortName>Janis</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.%EMAILDOMAIN%</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.%EMAILDOMAIN%</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+      <restriction>client-IP-address</restriction>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/jet.ne.jp b/evolution/autoconfig/1.1/jet.ne.jp
new file mode 100644
index 0000000..13e49f0
--- /dev/null
+++ b/evolution/autoconfig/1.1/jet.ne.jp
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="jet.ne.jp">
+    <domain>jet.ne.jp</domain>
+    <displayName>JETINTERNET</displayName>
+    <displayShortName>JET</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.jet.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>imap.jet.ne.jp</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.jet.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ji.jet.ne.jp b/evolution/autoconfig/1.1/ji.jet.ne.jp
new file mode 100644
index 0000000..ecc22eb
--- /dev/null
+++ b/evolution/autoconfig/1.1/ji.jet.ne.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="ji.jet.ne.jp">
+    <domain>ji.jet.ne.jp</domain>
+    <displayName>JETINTERNET</displayName>
+    <displayShortName>JET</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop02.jet.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp02.jet.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/jmail.plala.or.jp b/evolution/autoconfig/1.1/jmail.plala.or.jp
new file mode 100644
index 0000000..a8c80b2
--- /dev/null
+++ b/evolution/autoconfig/1.1/jmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="jmail.plala.or.jp">
+    <domain>jmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>jmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>jmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/kabelmail.de b/evolution/autoconfig/1.1/kabelmail.de
new file mode 100644
index 0000000..6f58d3e
--- /dev/null
+++ b/evolution/autoconfig/1.1/kabelmail.de
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="kabelmail.de">
+    <domain>kabelmail.de</domain>
+    <displayName>Kabel Deutschland</displayName>
+    <displayShortName>Kabel D</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.kabelmail.de</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.kabelmail.de</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.kabelmail.de</hostname>
+      <port>25</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://www.kabeldeutschland.de/portal/faq/article/id/191"/>
+    <!-- presse tel:+49-361-5502300 -->
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/kelcom.net b/evolution/autoconfig/1.1/kelcom.net
new file mode 100644
index 0000000..a3e211a
--- /dev/null
+++ b/evolution/autoconfig/1.1/kelcom.net
@@ -0,0 +1,21 @@
+<clientConfig  version="1.1">
+    <emailProvider id="kelcom.net">
+        <domain>kelcom.net</domain>
+        <displayName>KELCOM Internet</displayName>
+        <displayShortName>KELCOM</displayShortName>
+        <incomingServer type="pop3">
+            <hostname>pop1.kelcom.net</hostname>
+            <port>110</port>
+            <socketType>plain</socketType>
+            <username>%EMAILADDRESS%</username>
+            <authentication>password-cleartext</authentication>
+        </incomingServer>
+        <outgoingServer type="smtp">
+            <hostname>smtp.kelcom.net</hostname>
+            <port>25</port>
+            <socketType>plain</socketType>
+            <username>%EMAILADDRESS%</username>
+            <authentication>password-cleartext</authentication>
+        </outgoingServer>
+    </emailProvider>
+</clientConfig>
\ No newline at end of file
diff --git a/evolution/autoconfig/1.1/khaki.plala.or.jp b/evolution/autoconfig/1.1/khaki.plala.or.jp
new file mode 100644
index 0000000..09b562c
--- /dev/null
+++ b/evolution/autoconfig/1.1/khaki.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="khaki.plala.or.jp">
+    <domain>khaki.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>khaki.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>khaki.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/kl.wind.ne.jp b/evolution/autoconfig/1.1/kl.wind.ne.jp
new file mode 100644
index 0000000..80bd91e
--- /dev/null
+++ b/evolution/autoconfig/1.1/kl.wind.ne.jp
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="kl.wind.ne.jp">
+    <domain>kl.wind.ne.jp</domain>
+    <domain>kl.wind.jp</domain>
+    <domain>kl.wind.co.jp</domain>
+    <domain>kl.gunmanet.or.jp</domain>
+    <domain>kl.gunmanet.ne.jp</domain>
+    <domain>k1.wind.ne.jp</domain>
+    <domain>k1.wind.jp</domain>
+    <domain>k1.gunmanet.or.jp</domain>
+    <domain>k1.gunmanet.ne.jp</domain>
+    <displayName>çéããããããã</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>kl.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>kl.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/kmail.plala.or.jp b/evolution/autoconfig/1.1/kmail.plala.or.jp
new file mode 100644
index 0000000..7e88d5f
--- /dev/null
+++ b/evolution/autoconfig/1.1/kmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="kmail.plala.or.jp">
+    <domain>kmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>kmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>kmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/kokuyou.ne.jp b/evolution/autoconfig/1.1/kokuyou.ne.jp
new file mode 100644
index 0000000..5e6d657
--- /dev/null
+++ b/evolution/autoconfig/1.1/kokuyou.ne.jp
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="kokuyou.ne.jp">
+    <domain>kokuyou.ne.jp</domain>
+    <displayName>éåçéèãéããããã</displayName>
+    <displayShortName>ããããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.kokuyou.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.kokuyou.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/lapis.plala.or.jp b/evolution/autoconfig/1.1/lapis.plala.or.jp
new file mode 100644
index 0000000..eb54651
--- /dev/null
+++ b/evolution/autoconfig/1.1/lapis.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="lapis.plala.or.jp">
+    <domain>lapis.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>lapis.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>lapis.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/laposte.net b/evolution/autoconfig/1.1/laposte.net
new file mode 100644
index 0000000..18a7257
--- /dev/null
+++ b/evolution/autoconfig/1.1/laposte.net
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="laposte.net">
+    <domain>laposte.net</domain>
+    <displayName>LaPoste</displayName>
+    <displayShortName>LaPoste</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.laposte.net</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.laposte.net</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.laposte.net</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://www.geckozone.org/forum/viewtopic.php?f=4&amp;t=93118";>
+      <descr lang="fr">Annonce sur le site de Geckozone (non-officiel)</descr>
+      <descr lang="en">News on the Geckozone website (unofficial)</descr>
+    </documentation>
+    <documentation url="http://aide.laposte.net/mon-courrier-electronique/recevoir-et-lire-mon-courrier/96.html";>
+      <descr lang="fr">Aide officielle (non-SSL)</descr>
+      <descr lang="en">Official support (no SSL)</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/lemon.plala.or.jp b/evolution/autoconfig/1.1/lemon.plala.or.jp
new file mode 100644
index 0000000..26846d8
--- /dev/null
+++ b/evolution/autoconfig/1.1/lemon.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="lemon.plala.or.jp">
+    <domain>lemon.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>lemon.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>lemon.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/libero.it b/evolution/autoconfig/1.1/libero.it
new file mode 100644
index 0000000..172e2a0
--- /dev/null
+++ b/evolution/autoconfig/1.1/libero.it
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="libero.it">
+    <domain>libero.it</domain>
+    <domain>iol.it</domain>
+    <domain>blu.it</domain>
+    <domain>inwind.it</domain>
+    <displayName>Libero Mail</displayName>
+    <displayShortName>Libero</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imapmail.libero.it</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>popmail.libero.it</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.libero.it</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+    <documentation url="http://aiuto.libero.it/mail/istruzioni/configura-mozilla-thunderbird-per-windows-a11.phtml"/>
+    <documentation url="http://aiuto.libero.it/mail/utilizzo-di-un-client/faq/5388.phtml"/>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/lilac.plala.or.jp b/evolution/autoconfig/1.1/lilac.plala.or.jp
new file mode 100644
index 0000000..1283c02
--- /dev/null
+++ b/evolution/autoconfig/1.1/lilac.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="lilac.plala.or.jp">
+    <domain>lilac.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>lilac.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>lilac.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/lime.plala.or.jp b/evolution/autoconfig/1.1/lime.plala.or.jp
new file mode 100644
index 0000000..94e0925
--- /dev/null
+++ b/evolution/autoconfig/1.1/lime.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="lime.plala.or.jp">
+    <domain>lime.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>lime.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>lime.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mahoroba.ne.jp b/evolution/autoconfig/1.1/mahoroba.ne.jp
new file mode 100644
index 0000000..7365039
--- /dev/null
+++ b/evolution/autoconfig/1.1/mahoroba.ne.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="mahoroba.ne.jp">
+    <domain>mahoroba.ne.jp</domain>
+    <displayName>ããããããããããã</displayName>
+    <displayShortName>ãããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.mahoroba.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.mahoroba.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mail.com b/evolution/autoconfig/1.1/mail.com
new file mode 100644
index 0000000..de1c346
--- /dev/null
+++ b/evolution/autoconfig/1.1/mail.com
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="mail.com">
+    <!-- mail.com has MX of mx0.gmx.com,
+         but not all users can use imap.gmx.com (config for gmx.com),
+         so without this config, things go wrong.
+         They are planning to resolve this somehow on their side, too,
+         but it can take a while. -->
+    <!-- big domains -->
+    <domain>mail.com</domain>
+    <domain>mail.org</domain>
+    <domain>email.com</domain>
+    <domain>post.com</domain>
+    <domain>usa.com</domain>
+    <domain>accountant.com</domain>
+    <domain>consultant.com</domain>
+    <domain>dr.com</domain>
+    <domain>engineer.com</domain>
+    <domain>cheerful.com</domain>
+    <domain>techie.com</domain>
+    <domain>linuxmail.org</domain>
+    <domain>europe.com</domain>
+    <domain>london.com</domain>
+    <domain>uymail.com</domain>
+    <domain>myself.com</domain>
+    <domain>iname.com</domain>
+    <domain>writeme.com</domain>
+    <!-- smaller domains -->
+    <domain>2die4.com</domain>
+    <domain>activist.com</domain>
+    <domain>adexec.com</domain>
+    <domain>africamail.com</domain>
+    <domain>aircraftmail.com</domain>
+    <domain>alabama.usa.com</domain>
+    <domain>alaska.usa.com</domain>
+    <domain>allergist.com</domain>
+    <domain>alumni.com</domain>
+    <domain>alumnidirector.com</domain>
+    <domain>americamail.com</domain>
+    <domain>amorous.com</domain>
+    <domain>angelic.com</domain>
+    <domain>archaeologist.com</domain>
+    <domain>arizona.usa.com</domain>
+    <domain>artlover.com</domain>
+    <domain>asia-mail.com</domain>
+    <domain>atheist.com</domain>
+    <domain>australiamail.com</domain>
+    <domain>bartender.net</domain>
+    <domain>berlin.com</domain>
+    <domain>bigger.com</domain>
+    <domain>bikerider.com</domain>
+    <domain>birdlover.com</domain>
+    <domain>blader.com</domain>
+    <domain>boardermail.com</domain>
+    <domain>brazilmail.com</domain>
+    <domain>brew-master.com</domain>
+    <domain>california.usa.com</domain>
+    <domain>californiamail.com</domain>
+    <domain>caress.com</domain>
+    <domain>catlover.com</domain>
+    <domain>chef.net</domain>
+    <domain>chemist.com</domain>
+    <domain>chinamail.com</domain>
+    <domain>clerk.com</domain>
+    <domain>cliffhanger.com</domain>
+    <domain>collector.org</domain>
+    <domain>columnist.com</domain>
+    <domain>comic.com</domain>
+    <domain>computer4u.com</domain>
+    <domain>contractor.net</domain>
+    <domain>coolsite.net</domain>
+    <domain>counsellor.com</domain>
+    <domain>count.com</domain>
+    <domain>couple.com</domain>
+    <domain>cutey.com</domain>
+    <domain>cyberdude.com</domain>
+    <domain>cybergal.com</domain>
+    <domain>cyber-wizard.com</domain>
+    <domain>dallasmail.com</domain>
+    <domain>dbzmail.com</domain>
+    <domain>deliveryman.com</domain>
+    <domain>diplomats.com</domain>
+    <domain>disciples.com</domain>
+    <domain>doctor.com</domain>
+    <domain>doglover.com</domain>
+    <domain>doramail.com</domain>
+    <domain>dublin.com</domain>
+    <domain>earthling.net</domain>
+    <domain>elvisfan.com</domain>
+    <domain>englandmail.com</domain>
+    <domain>europemail.com</domain>
+    <domain>execs.com</domain>
+    <domain>fan.com</domain>
+    <domain>feelings.com</domain>
+    <domain>financier.com</domain>
+    <domain>fireman.net</domain>
+    <domain>florida.usa.com</domain>
+    <domain>footballer.com</domain>
+    <domain>gardener.com</domain>
+    <domain>geologist.com</domain>
+    <domain>germanymail.com</domain>
+    <domain>graduate.org</domain>
+    <domain>graphic-designer.com</domain>
+    <domain>hackermail.com</domain>
+    <domain>hairdresser.net</domain>
+    <domain>hilarious.com</domain>
+    <domain>hockeymail.com</domain>
+    <domain>homemail.com</domain>
+    <domain>hot-shot.com</domain>
+    <domain>hour.com</domain>
+    <domain>humanoid.net</domain>
+    <domain>illinois.usa.com</domain>
+    <domain>innocent.com</domain>
+    <domain>inorbit.com</domain>
+    <domain>instruction.com</domain>
+    <domain>instructor.net</domain>
+    <domain>insurer.com</domain>
+    <domain>irelandmail.com</domain>
+    <domain>italymail.com</domain>
+    <domain>japan.com</domain>
+    <domain>journalist.com</domain>
+    <domain>keromail.com</domain>
+    <domain>kittymail.com</domain>
+    <domain>koreamail.com</domain>
+    <domain>lawyer.com</domain>
+    <domain>legislator.com</domain>
+    <domain>loveable.com</domain>
+    <domain>lovecat.com</domain>
+    <domain>mad.scientist.com</domain>
+    <domain>madonnafan.com</domain>
+    <domain>madrid.com</domain>
+    <domain>marchmail.com</domain>
+    <domain>mexicomail.com</domain>
+    <domain>mindless.com</domain>
+    <domain>minister.com</domain>
+    <domain>mobsters.com</domain>
+    <domain>monarchy.com</domain>
+    <domain>moscowmail.com</domain>
+    <domain>munich.com</domain>
+    <domain>musician.org</domain>
+    <domain>muslim.com</domain>
+    <domain>newyork.usa.com</domain>
+    <domain>null.net</domain>
+    <domain>nycmail.com</domain>
+    <domain>oath.com</domain>
+    <domain>optician.com</domain>
+    <domain>pacificwest.com</domain>
+    <domain>petlover.com</domain>
+    <domain>photographer.net</domain>
+    <domain>playful.com</domain>
+    <domain>poetic.com</domain>
+    <domain>politician.com</domain>
+    <domain>popstar.com</domain>
+    <domain>presidency.com</domain>
+    <domain>priest.com</domain>
+    <domain>programmer.net</domain>
+    <domain>publicist.com</domain>
+    <domain>realtyagent.com</domain>
+    <domain>reborn.com</domain>
+    <domain>reggaefan.com</domain>
+    <domain>religious.com</domain>
+    <domain>repairman.com</domain>
+    <domain>representative.com</domain>
+    <domain>rescueteam.com</domain>
+    <domain>revenue.com</domain>
+    <domain>rocketship.com</domain>
+    <domain>rockfan.com</domain>
+    <domain>rome.com</domain>
+    <domain>royal.net</domain>
+    <domain>saintly.com</domain>
+    <domain>salesperson.net</domain>
+    <domain>sanfranmail.com</domain>
+    <domain>scientist.com</domain>
+    <domain>scotlandmail.com</domain>
+    <domain>secretary.net</domain>
+    <domain>seductive.com</domain>
+    <domain>singapore.com</domain>
+    <domain>snakebite.com</domain>
+    <domain>songwriter.net</domain>
+    <domain>soon.com</domain>
+    <domain>spainmail.com</domain>
+    <domain>teachers.org</domain>
+    <domain>technologist.com</domain>
+    <domain>texas.usa.com</domain>
+    <domain>thegame.com</domain>
+    <domain>therapist.net</domain>
+    <domain>toke.com</domain>
+    <domain>tokyo.com</domain>
+    <domain>toothfairy.com</domain>
+    <domain>tvstar.com</domain>
+    <domain>umpire.com</domain>
+    <domain>wallet.com</domain>
+    <domain>webname.com</domain>
+    <domain>weirdness.com</domain>
+    <domain>who.net</domain>
+    <domain>whoever.com</domain>
+    <domain>winning.com</domain>
+    <domain>witty.com</domain>
+    <domain>worker.com</domain>
+    <domain>workmail.com</domain>
+    <domain>yours.com</domain>
+    <!-- even smaller domains (about 500 more) are left out, we can't add them all here -->
+    <displayName>mail.com</displayName>
+    <displayShortName>mail.com</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.mail.com</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>imap.mail.com</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.mail.com</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.mail.com</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.mail.com</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.mail.com</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mail.dk b/evolution/autoconfig/1.1/mail.dk
new file mode 100644
index 0000000..2a16f89
--- /dev/null
+++ b/evolution/autoconfig/1.1/mail.dk
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="mail.dk">
+    <domain>mail.dk</domain>
+    <displayName>TDC (DK)</displayName>
+    <displayShortName>TDC</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.mail.dk</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>asmtp.mail.dk</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mail.iwafune.ne.jp b/evolution/autoconfig/1.1/mail.iwafune.ne.jp
new file mode 100644
index 0000000..38123dc
--- /dev/null
+++ b/evolution/autoconfig/1.1/mail.iwafune.ne.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="mail.iwafune.ne.jp">
+    <domain>mail.iwafune.ne.jp</domain>
+    <displayName>ããããããããããã</displayName>
+    <displayShortName>IWAFUNE</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.iwafune.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.iwafune.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mail.ru b/evolution/autoconfig/1.1/mail.ru
new file mode 100644
index 0000000..bc86f1f
--- /dev/null
+++ b/evolution/autoconfig/1.1/mail.ru
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="mail.ru">
+    <domain>mail.ru</domain>
+    <domain>inbox.ru</domain>
+    <domain>list.ru</domain>
+    <domain>bk.ru</domain>
+    <displayName>mail.ru</displayName>
+    <displayShortName>mail.ru</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.mail.ru</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.mail.ru</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.mail.ru</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.mail.ru</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+  <documentation url="http://help.mail.ru/mail-help/mailer/mt";>
+    <descr lang="en">POP, Thunderbird, with screenshots</descr>
+  </documentation>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mail.telenor.dk b/evolution/autoconfig/1.1/mail.telenor.dk
new file mode 100644
index 0000000..74dc63d
--- /dev/null
+++ b/evolution/autoconfig/1.1/mail.telenor.dk
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="mail.telenor.dk">
+    <!-- Main domains -->
+    <domain>mail.telenor.dk</domain>
+    <domain>vip.cybercity.dk</domain>
+    <domain>post.cybercity.dk</domain>
+    <!-- Alias domains -->
+    <domain>email.dk</domain>
+    <domain>mobil.dk</domain>
+    <domain>privatmail.dk</domain>
+    <domain>info.dk</domain>
+    <domain>io.dk</domain>
+    <domain>it.dk</domain>
+    <domain>film.dk</domain>
+    <domain>worldonline.dk</domain>
+    <domain>wol.dk</domain>
+    <!-- Nonsense domains -->
+    <domain>1031.inord.dk</domain>
+    <domain>123mail.dk</domain>
+    <domain>12fuel.dk</domain>
+    <domain>12mail.dk</domain>
+    <domain>12move.dk</domain>
+    <domain>2senior.dk</domain>
+    <domain>anarki.dk</domain>
+    <domain>anderledes.dk</domain>
+    <domain>begavet.dk</domain>
+    <domain>bitnisse.dk</domain>
+    <domain>city.dk</domain>
+    <domain>cool.dk</domain>
+    <domain>cyberdude.dk</domain>
+    <domain>cyberjunkie.dk</domain>
+    <domain>dk2net.dk</domain>
+    <domain>dk-online.dk</domain>
+    <domain>elinstallatoer.dk</domain>
+    <domain>elsker.dk</domain>
+    <domain>elvis.dk</domain>
+    <domain>fald.dk</domain>
+    <domain>fedt.dk</domain>
+    <domain>feminin.dk</domain>
+    <domain>forening.dk</domain>
+    <domain>gadefejer.dk</domain>
+    <domain>gason.dk</domain>
+    <domain>grin.dk</domain>
+    <domain>grov.dk</domain>
+    <domain>hardworking.dk</domain>
+    <domain>heaven.dk</domain>
+    <domain>hemmelig.dk</domain>
+    <domain>huleboer.dk</domain>
+    <domain>image.dk</domain>
+    <domain>inbound.dk</domain>
+    <domain>indbakke.dk</domain>
+    <domain>infile.dk</domain>
+    <domain>jyde.dk</domain>
+    <domain>klog.dk</domain>
+    <domain>knus.dk</domain>
+    <domain>krudt.dk</domain>
+    <domain>kulturel.dk</domain>
+    <domain>larsen.dk</domain>
+    <domain>lazy.dk</domain>
+    <domain>lystig.dk</domain>
+    <domain>mail.dia.dk</domain>
+    <domain>maskulin.dk</domain>
+    <domain>min-postkasse.dk</domain>
+    <domain>musling.dk</domain>
+    <domain>natteliv.dk</domain>
+    <domain>netbruger.dk</domain>
+    <domain>pedal.dk</domain>
+    <domain>pengemand.dk</domain>
+    <domain>pokerface.dk</domain>
+    <domain>post.dia.dk</domain>
+    <domain>postman.dk</domain>
+    <domain>privat.dia.dk</domain>
+    <domain>quake.dk</domain>
+    <domain>ready.dk</domain>
+    <domain>secret.dk</domain>
+    <domain>sleepy.dk</domain>
+    <domain>sporty.dk</domain>
+    <domain>superbruger.dk</domain>
+    <domain>talent.dk</domain>
+    <domain>tanke.dk</domain>
+    <domain>taxidriver.dk</domain>
+    <domain>teens.dk</domain>
+    <domain>teknik.dk</domain>
+    <domain>tjekket.dk</domain>
+    <domain>traceroute.dk</domain>
+    <domain>tv.dk</domain>
+    <domain>ugenstilbud.dk</domain>
+    <domain>ungdom.dk</domain>
+    <domain>video.dk</domain>
+    <domain>vittig.dk</domain>
+    <displayName>Telenor Danmark</displayName>
+    <displayShortName>Telenor</displayShortName>
+    <incomingServer type="imap">
+      <hostname>mail.telenor.dk</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>mail.telenor.dk</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.telenor.dk</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+  <documentation url="http://www.telenor.dk/privat/kundeservice/kundeservice/bredbaand/opsaetning/email-og-hjemmeside/tabs/opsaetning/outlook-express-6.0.aspx"/>
+  <documentation url="http://www.telenor.dk/privat/kundeservice/kundeservice/bredbaand/opsaetning/email-og-hjemmeside/tabs/opsaetning/windows-live-mail.aspx"/>
+  <documentation url="http://mailselvbetjening.telenor.dk/";>
+    <descr lang="en">Domain list source (requires login)</descr>
+  </documentation>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mail.wind.ne.jp b/evolution/autoconfig/1.1/mail.wind.ne.jp
new file mode 100644
index 0000000..90bdf8e
--- /dev/null
+++ b/evolution/autoconfig/1.1/mail.wind.ne.jp
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="mail.wind.ne.jp">
+    <domain>mail.wind.ne.jp</domain>
+    <domain>mail.wind.jp</domain>
+    <domain>mail.wind.co.jp</domain>
+    <domain>mail.gunmanet.or.jp</domain>
+    <domain>mail.gunmanet.ne.jp</domain>
+    <domain>mail.gunmanet.jp</domain>
+    <displayName>çéããããããã</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/maroon.plala.or.jp b/evolution/autoconfig/1.1/maroon.plala.or.jp
new file mode 100644
index 0000000..d2e00e2
--- /dev/null
+++ b/evolution/autoconfig/1.1/maroon.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="maroon.plala.or.jp">
+    <domain>maroon.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>maroon.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>maroon.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/me.com b/evolution/autoconfig/1.1/me.com
new file mode 100644
index 0000000..9c7d731
--- /dev/null
+++ b/evolution/autoconfig/1.1/me.com
@@ -0,0 +1,31 @@
+<clientConfig version="1.0">
+  <emailProvider id="me.com">
+    <domain>mac.com</domain>
+    <domain>me.com</domain>
+    <displayName>Apple iCloud</displayName>
+    <displayShortName>Apple</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.mail.me.com</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <!-- Not working for me. BenB 2010-08-19 from Europe
+    <outgoingServer type="smtp">
+      <hostname>smtp.me.com</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    -->
+    <outgoingServer type="smtp">
+      <hostname>smtp.mail.me.com</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
\ No newline at end of file
diff --git a/evolution/autoconfig/1.1/minuet.plala.or.jp b/evolution/autoconfig/1.1/minuet.plala.or.jp
new file mode 100644
index 0000000..af72bf2
--- /dev/null
+++ b/evolution/autoconfig/1.1/minuet.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="minuet.plala.or.jp">
+    <domain>minuet.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>minuet.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>minuet.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ml.murakami.ne.jp b/evolution/autoconfig/1.1/ml.murakami.ne.jp
new file mode 100644
index 0000000..c563dba
--- /dev/null
+++ b/evolution/autoconfig/1.1/ml.murakami.ne.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="ml.murakami.ne.jp">
+    <domain>ml.murakami.ne.jp</domain>
+    <displayName>ããããããããããã</displayName>
+    <displayShortName>IWAFUNE</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ml.murakami.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ml.murakami.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mnet.ne.jp b/evolution/autoconfig/1.1/mnet.ne.jp
new file mode 100644
index 0000000..0965552
--- /dev/null
+++ b/evolution/autoconfig/1.1/mnet.ne.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="mnet.ne.jp">
+    <domain>mnet.ne.jp</domain>
+    <displayName>Mnet ããã ãããã</displayName>
+    <displayShortName>Mnetããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.mnet.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.mnet.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mopera.net b/evolution/autoconfig/1.1/mopera.net
new file mode 100644
index 0000000..26f6037
--- /dev/null
+++ b/evolution/autoconfig/1.1/mopera.net
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="mopera.net">
+    <domain>mopera.net</domain>
+    <displayName>mopera U</displayName>
+    <displayShortName>mopera U</displayShortName>
+    <incomingServer type="imap">
+      <hostname>mail.mopera.net</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>mail.mopera.net</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>mail.mopera.net</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>mail.mopera.net</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.mopera.net</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.mopera.net</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mozilla.com b/evolution/autoconfig/1.1/mozilla.com
new file mode 100644
index 0000000..3275fcf
--- /dev/null
+++ b/evolution/autoconfig/1.1/mozilla.com
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="mozilla.com">
+    <domain>mozilla.com</domain>
+    <domain>mozillafoundation.org</domain>
+    <displayName>Mozilla Corporation and Mozilla Foundation internal email addresses</displayName>
+    <displayShortName>mozilla.com</displayShortName>
+    <incomingServer type="imap">
+      <hostname>mail.mozilla.com</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.mozilla.org</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/mx1.tiki.ne.jp b/evolution/autoconfig/1.1/mx1.tiki.ne.jp
new file mode 100644
index 0000000..d87f89e
--- /dev/null
+++ b/evolution/autoconfig/1.1/mx1.tiki.ne.jp
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="mx1.tiki.ne.jp">
+    <domain>mx1.tiki.ne.jp</domain>
+    <domain>mx2.et.tiki.ne.jp</domain>
+    <domain>mx2.tiki.ne.jp</domain>
+    <domain>mx2.wt.tiki.ne.jp</domain>
+    <domain>mx3.et.tiki.ne.jp</domain>
+    <domain>mx3.tiki.ne.jp</domain>
+    <domain>mx4.et.tiki.ne.jp</domain>
+    <domain>mx4.tiki.ne.jp</domain>
+    <domain>mx5.et.tiki.ne.jp</domain>
+    <domain>mx5.tiki.ne.jp</domain>
+    <domain>mx6.et.tiki.ne.jp</domain>
+    <domain>mx6.tiki.ne.jp</domain>
+    <domain>mx7.tiki.ne.jp</domain>
+    <domain>mx8.tiki.ne.jp</domain>
+    <domain>mx9.tiki.ne.jp</domain>
+    <domain>mx21.tiki.ne.jp</domain>
+    <domain>mx22.tiki.ne.jp</domain>
+    <domain>mx31.tiki.ne.jp</domain>
+    <domain>mx32.tiki.ne.jp</domain>
+    <domain>mx35.tiki.ne.jp</domain>
+    <domain>mx36.tiki.ne.jp</domain>
+    <domain>mx41.tiki.ne.jp</domain>
+    <domain>mx51.et.tiki.ne.jp</domain>
+    <domain>mx51.tiki.ne.jp</domain>
+    <domain>mx52.tiki.ne.jp</domain>
+    <domain>mx61.tiki.ne.jp</domain>
+    <domain>mx71.tiki.ne.jp</domain>
+    <domain>mx81.tiki.ne.jp</domain>
+    <domain>mx82.tiki.ne.jp</domain>
+    <domain>mx91.tiki.ne.jp</domain>
+    <domain>ma100.tiki.ne.jp</domain>
+    <displayName>TikiTikiããããããã</displayName>
+    <displayShortName>TikiTiki</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>%EMAILDOMAIN%</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp-auth.tiki.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/navy.plala.or.jp b/evolution/autoconfig/1.1/navy.plala.or.jp
new file mode 100644
index 0000000..3935216
--- /dev/null
+++ b/evolution/autoconfig/1.1/navy.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="navy.plala.or.jp">
+    <domain>navy.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>navy.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>navy.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/nifty.com b/evolution/autoconfig/1.1/nifty.com
new file mode 100644
index 0000000..12217d4
--- /dev/null
+++ b/evolution/autoconfig/1.1/nifty.com
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="nifty.com">
+    <domain>nifty.com</domain>
+    <displayName>@nifty</displayName>
+    <displayShortName>@nifty</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.nifty.com</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.nifty.com</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/nsat.jp b/evolution/autoconfig/1.1/nsat.jp
new file mode 100644
index 0000000..a8a3206
--- /dev/null
+++ b/evolution/autoconfig/1.1/nsat.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="nsat.jp">
+    <domain>nsat.jp</domain>
+    <displayName>ïïãããã</displayName>
+    <displayShortName>NSAT</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.nsat.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.nsat.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/o2.pl b/evolution/autoconfig/1.1/o2.pl
new file mode 100644
index 0000000..7a9671f
--- /dev/null
+++ b/evolution/autoconfig/1.1/o2.pl
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="o2.pl">
+    <domain>o2.pl</domain>
+    <domain>go2.pl</domain>
+    <domain>tlen.pl</domain>
+    <domain>prokonto.pl</domain>
+    <displayName>o2 Poczta</displayName>
+    <displayShortName>o2</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>poczta.o2.pl</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>poczta.o2.pl</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+      <restriction>client-IP-address</restriction>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>poczta.o2.pl</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILLOCALPART%</username>
+      <restriction>client-IP-address</restriction>
+    </outgoingServer>
+    <documentation url="http://pomoc.o2.pl/poczta/programy/thunderbird.html"/>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/olive.plala.or.jp b/evolution/autoconfig/1.1/olive.plala.or.jp
new file mode 100644
index 0000000..f85b023
--- /dev/null
+++ b/evolution/autoconfig/1.1/olive.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="olive.plala.or.jp">
+    <domain>olive.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>olive.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>olive.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/onet.pl b/evolution/autoconfig/1.1/onet.pl
new file mode 100644
index 0000000..8a25934
--- /dev/null
+++ b/evolution/autoconfig/1.1/onet.pl
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="onet.pl">
+    <domain>onet.pl</domain>
+    <domain>onet.eu</domain>
+    <domain>poczta.onet.pl</domain>
+    <domain>poczta.onet.eu</domain>
+    <domain>op.pl</domain>
+    <domain>vp.pl</domain>
+    <domain>autograf.pl</domain>
+    <domain>buziaczek.pl</domain>
+    <domain>amorki.pl</domain>
+    <domain>republika.pl</domain>
+    <displayName>Poczta Onet</displayName>
+    <displayShortName>Onet</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.poczta.onet.pl</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.poczta.onet.pl</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.poczta.onet.pl</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/opal.plala.or.jp b/evolution/autoconfig/1.1/opal.plala.or.jp
new file mode 100644
index 0000000..168f59f
--- /dev/null
+++ b/evolution/autoconfig/1.1/opal.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="opal.plala.or.jp">
+    <domain>opal.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>opal.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>opal.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/orange.plala.or.jp b/evolution/autoconfig/1.1/orange.plala.or.jp
new file mode 100644
index 0000000..7baa803
--- /dev/null
+++ b/evolution/autoconfig/1.1/orange.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="orange.plala.or.jp">
+    <domain>orange.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>orange.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>orange.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/orchid.plala.or.jp b/evolution/autoconfig/1.1/orchid.plala.or.jp
new file mode 100644
index 0000000..b5c8bc2
--- /dev/null
+++ b/evolution/autoconfig/1.1/orchid.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="orchid.plala.or.jp">
+    <domain>orchid.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>orchid.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>orchid.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ovh.net b/evolution/autoconfig/1.1/ovh.net
new file mode 100644
index 0000000..f469126
--- /dev/null
+++ b/evolution/autoconfig/1.1/ovh.net
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="ovh.net">
+    <!-- Hosting customers, MX servers -->
+    <domain>ovh.net</domain>
+
+    <displayName>OVH</displayName>
+    <displayShortName>OVH</displayShortName>
+    <incomingServer type="imap">
+      <hostname>ssl0.ovh.net</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>ssl0.ovh.net</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ssl0.ovh.net</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <documentation url="http://guides.ovh.com/ConfigurationEmail"/>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/pal.kijimadaira.jp b/evolution/autoconfig/1.1/pal.kijimadaira.jp
new file mode 100644
index 0000000..5652a2c
--- /dev/null
+++ b/evolution/autoconfig/1.1/pal.kijimadaira.jp
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="pal.kijimadaira.jp">
+    <domain>pal.kijimadaira.jp</domain>
+    <displayName>æååæFTTH</displayName>
+    <displayShortName>æååæFTTH</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.pal.kijimadaira.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.pal.kijimadaira.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/palette.plala.or.jp b/evolution/autoconfig/1.1/palette.plala.or.jp
new file mode 100644
index 0000000..1a64ad6
--- /dev/null
+++ b/evolution/autoconfig/1.1/palette.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="palette.plala.or.jp">
+    <domain>palette.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>palette.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>palette.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/parabox.or.jp b/evolution/autoconfig/1.1/parabox.or.jp
new file mode 100644
index 0000000..bda1e22
--- /dev/null
+++ b/evolution/autoconfig/1.1/parabox.or.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="parabox.or.jp">
+    <domain>parabox.or.jp</domain>
+    <displayName>ãããããã</displayName>
+    <displayShortName>PARABOX</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.parabox.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.parabox.or.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/peach.plala.or.jp b/evolution/autoconfig/1.1/peach.plala.or.jp
new file mode 100644
index 0000000..34c7a3d
--- /dev/null
+++ b/evolution/autoconfig/1.1/peach.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="peach.plala.or.jp">
+    <domain>peach.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>peach.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>peach.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/peoplepc.com b/evolution/autoconfig/1.1/peoplepc.com
new file mode 100644
index 0000000..01429db
--- /dev/null
+++ b/evolution/autoconfig/1.1/peoplepc.com
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="peoplepc.com">
+    <domain>peoplepc.com</domain>
+    <displayName>PeoplePC</displayName>
+    <displayShortName>PeoplePC</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.peoplepc.com</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.peoplepc.com</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtpauth.peoplepc.com</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/plum.plala.or.jp b/evolution/autoconfig/1.1/plum.plala.or.jp
new file mode 100644
index 0000000..5696afd
--- /dev/null
+++ b/evolution/autoconfig/1.1/plum.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="plum.plala.or.jp">
+    <domain>plum.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>plum.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>plum.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/po.dcn.ne.jp b/evolution/autoconfig/1.1/po.dcn.ne.jp
new file mode 100644
index 0000000..efa044e
--- /dev/null
+++ b/evolution/autoconfig/1.1/po.dcn.ne.jp
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="po.dcn.ne.jp">
+    <domain>po.dcn.ne.jp</domain>
+    <displayName>DCNããããããããããã</displayName>
+    <displayShortName>DCN</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>po.dcn.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>po.dcn.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/po.wind.ne.jp b/evolution/autoconfig/1.1/po.wind.ne.jp
new file mode 100644
index 0000000..96b2d0f
--- /dev/null
+++ b/evolution/autoconfig/1.1/po.wind.ne.jp
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="po.wind.ne.jp">
+    <domain>po.wind.ne.jp</domain>
+    <domain>po.wind.jp</domain>
+    <domain>po.wind.co.jp</domain>
+    <domain>po.gunmanet.or.jp</domain>
+    <domain>po.gunmanet.ne.jp</domain>
+    <displayName>çéããããããã</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>po.wind.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>po.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/polka.plala.or.jp b/evolution/autoconfig/1.1/polka.plala.or.jp
new file mode 100644
index 0000000..087065e
--- /dev/null
+++ b/evolution/autoconfig/1.1/polka.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="polka.plala.or.jp">
+    <domain>polka.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>polka.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>polka.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/pop.shibata.ne.jp b/evolution/autoconfig/1.1/pop.shibata.ne.jp
new file mode 100644
index 0000000..6f2e8df
--- /dev/null
+++ b/evolution/autoconfig/1.1/pop.shibata.ne.jp
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="pop.shibata.ne.jp">
+    <domain>pop.shibata.ne.jp</domain>
+    <domain>ml.shibata.ne.jp</domain>
+    <displayName>ãããããããæçç</displayName>
+    <displayShortName>INET-SHIBATA</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>%EMAILDOMAIN%</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>%EMAILDOMAIN%</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/posteo.de b/evolution/autoconfig/1.1/posteo.de
new file mode 100644
index 0000000..3720753
--- /dev/null
+++ b/evolution/autoconfig/1.1/posteo.de
@@ -0,0 +1,25 @@
+<clientConfig version="1.1">
+  <emailProvider id="posteo.de">
+    <domain>posteo.de</domain>
+    <domain>posteo.at</domain>
+    <domain>posteo.ch</domain>
+    <domain>posteo.org</domain>
+    <domain>posteo.eu</domain>
+    <displayName>Posteo</displayName>
+    <displayShortName>Posteo</displayShortName>
+    <incomingServer type="imap">
+      <hostname>posteo.de</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>posteo.de</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
\ No newline at end of file
diff --git a/evolution/autoconfig/1.1/purple.plala.or.jp b/evolution/autoconfig/1.1/purple.plala.or.jp
new file mode 100644
index 0000000..393d2ac
--- /dev/null
+++ b/evolution/autoconfig/1.1/purple.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="purple.plala.or.jp">
+    <domain>purple.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>purple.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>purple.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/rainbow.plala.or.jp b/evolution/autoconfig/1.1/rainbow.plala.or.jp
new file mode 100644
index 0000000..3718ed4
--- /dev/null
+++ b/evolution/autoconfig/1.1/rainbow.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="rainbow.plala.or.jp">
+    <domain>rainbow.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>rainbow.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>rainbow.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/rambler.ru b/evolution/autoconfig/1.1/rambler.ru
new file mode 100644
index 0000000..8d62546
--- /dev/null
+++ b/evolution/autoconfig/1.1/rambler.ru
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="rambler.ru">
+    <domain>rambler.ru</domain>
+    <displayName>Rambler Mail</displayName>
+    <displayShortName>Rambler</displayShortName>
+    <incomingServer type="imap">
+      <hostname>mail.rambler.ru</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>mail.rambler.ru</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.rambler.ru</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </outgoingServer>
+  </emailProvider>
+  <documentation url="http://help.rambler.ru/article.html?s=141&amp;id=41";>
+    <descr lang="en">POP, Thunderbird, with screenshots</descr>
+  </documentation>
+  <documentation url="http://help.rambler.ru/article.html?s=141&amp;id=33";>
+    <descr lang="en">IMAP, all clients</descr>
+  </documentation>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/red.plala.or.jp b/evolution/autoconfig/1.1/red.plala.or.jp
new file mode 100644
index 0000000..a42e889
--- /dev/null
+++ b/evolution/autoconfig/1.1/red.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="red.plala.or.jp">
+    <domain>red.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>red.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>red.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/rmail.plala.or.jp b/evolution/autoconfig/1.1/rmail.plala.or.jp
new file mode 100644
index 0000000..7ecc703
--- /dev/null
+++ b/evolution/autoconfig/1.1/rmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="rmail.plala.or.jp">
+    <domain>rmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>rmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>rmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/rondo.plala.or.jp b/evolution/autoconfig/1.1/rondo.plala.or.jp
new file mode 100644
index 0000000..13616d3
--- /dev/null
+++ b/evolution/autoconfig/1.1/rondo.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="rondo.plala.or.jp">
+    <domain>rondo.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>rondo.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>rondo.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/rose.plala.or.jp b/evolution/autoconfig/1.1/rose.plala.or.jp
new file mode 100644
index 0000000..034f32c
--- /dev/null
+++ b/evolution/autoconfig/1.1/rose.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="rose.plala.or.jp">
+    <domain>rose.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>rose.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>rose.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/rouge.plala.or.jp b/evolution/autoconfig/1.1/rouge.plala.or.jp
new file mode 100644
index 0000000..cbbb43c
--- /dev/null
+++ b/evolution/autoconfig/1.1/rouge.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="rouge.plala.or.jp">
+    <domain>rouge.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>rouge.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>rouge.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/rr.com b/evolution/autoconfig/1.1/rr.com
new file mode 100644
index 0000000..93346f9
--- /dev/null
+++ b/evolution/autoconfig/1.1/rr.com
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="rr.com">
+    <!-- per MX, as actual addresses are user tampabay rr com -->
+    <domain>rr.com</domain>
+    <displayName>RoadRunner</displayName>
+    <displayShortName>RR</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop-server.%EMAILDOMAIN%</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp-server.%EMAILDOMAIN%</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://help.rr.com/HMSFaqs/e_emailserveraddys.aspx"; />
+    <documentation url="http://help.rr.com/HMSFaqs/e_SmtpAuth.aspx"; />
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ruby.plala.or.jp b/evolution/autoconfig/1.1/ruby.plala.or.jp
new file mode 100644
index 0000000..427be4b
--- /dev/null
+++ b/evolution/autoconfig/1.1/ruby.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ruby.plala.or.jp">
+    <domain>ruby.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ruby.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ruby.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/sakunet.ne.jp b/evolution/autoconfig/1.1/sakunet.ne.jp
new file mode 100644
index 0000000..80d5f24
--- /dev/null
+++ b/evolution/autoconfig/1.1/sakunet.ne.jp
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="sakunet.ne.jp">
+    <domain>sakunet.ne.jp</domain>
+    <displayName>ääããããããã</displayName>
+    <displayShortName>Saku-Net</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.sakunet.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.sakunet.ne.jp</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>none</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/sea.plala.or.jp b/evolution/autoconfig/1.1/sea.plala.or.jp
new file mode 100644
index 0000000..ddde2c1
--- /dev/null
+++ b/evolution/autoconfig/1.1/sea.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="sea.plala.or.jp">
+    <domain>sea.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>sea.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>sea.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/sepia.plala.or.jp b/evolution/autoconfig/1.1/sepia.plala.or.jp
new file mode 100644
index 0000000..1dce9e1
--- /dev/null
+++ b/evolution/autoconfig/1.1/sepia.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="sepia.plala.or.jp">
+    <domain>sepia.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>sepia.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>sepia.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/serenade.plala.or.jp b/evolution/autoconfig/1.1/serenade.plala.or.jp
new file mode 100644
index 0000000..83bf35b
--- /dev/null
+++ b/evolution/autoconfig/1.1/serenade.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="serenade.plala.or.jp">
+    <domain>serenade.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>serenade.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>serenade.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/seznam.cz b/evolution/autoconfig/1.1/seznam.cz
new file mode 100644
index 0000000..7dacb0c
--- /dev/null
+++ b/evolution/autoconfig/1.1/seznam.cz
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="seznam.cz">
+    <domain>seznam.cz</domain>
+    <domain>email.cz</domain>
+    <domain>post.cz</domain>
+    <domain>spoluzaci.cz</domain>
+    <displayName>Seznam</displayName>
+    <displayShortName>Seznam</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.seznam.cz</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.seznam.cz</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://napoveda.seznam.cz/cz/jake-jsou-adresy-pop3-a-smtp-serveru.html"/>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/sfr.fr b/evolution/autoconfig/1.1/sfr.fr
new file mode 100644
index 0000000..845c27c
--- /dev/null
+++ b/evolution/autoconfig/1.1/sfr.fr
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="sfr.fr">
+    <domain>sfr.fr</domain>
+    <domain>neuf.fr</domain>
+    <displayName>SFR / Neuf</displayName>
+    <displayShortName>SFR</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.sfr.fr</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.sfr.fr</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.sfr.fr</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://assistance.sfr.fr/internet_neufbox-de-SFR/utiliser-email/parametrer-id-sfr/fc-505-50680";>
+      <descr lang="en">TB2, unclear</descr>
+    </documentation>
+    <documentation url="http://assistance.sfr.fr/internet_neufbox-de-SFR/utiliser-email/configurer-adresse-email-sfr-mac-osX/fc-509-50682";>
+      <descr lang="en">Apple Mail</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/silk.plala.or.jp b/evolution/autoconfig/1.1/silk.plala.or.jp
new file mode 100644
index 0000000..1aa4b81
--- /dev/null
+++ b/evolution/autoconfig/1.1/silk.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="silk.plala.or.jp">
+    <domain>silk.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>silk.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>silk.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/silver.plala.or.jp b/evolution/autoconfig/1.1/silver.plala.or.jp
new file mode 100644
index 0000000..8ff9fd9
--- /dev/null
+++ b/evolution/autoconfig/1.1/silver.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="silver.plala.or.jp">
+    <domain>silver.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>silver.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>silver.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/sky.plala.or.jp b/evolution/autoconfig/1.1/sky.plala.or.jp
new file mode 100644
index 0000000..9da6383
--- /dev/null
+++ b/evolution/autoconfig/1.1/sky.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="sky.plala.or.jp">
+    <domain>sky.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>sky.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>sky.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/skynet.be b/evolution/autoconfig/1.1/skynet.be
new file mode 100644
index 0000000..66442b0
--- /dev/null
+++ b/evolution/autoconfig/1.1/skynet.be
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="skynet.be">
+    <domain>skynet.be</domain>
+    <displayName>skynet</displayName>
+    <displayShortName>skynet</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.skynet.be</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.skynet.be</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <authentication>password-encrypted</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>relay.skynet.be</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <documentation url="http://support.en.belgacom.be/app/answers/detail/a_id/14337/kw/thunderbird";>
+      <descr lang="en">Thunderbird settings</descr>
+    </documentation>
+    <documentation url="http://support.en.belgacom.be/app/answers/detail/a_id/14332/kw/thunderbird";>
+      <descr lang="en">SMTP works outside their network</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/smail.plala.or.jp b/evolution/autoconfig/1.1/smail.plala.or.jp
new file mode 100644
index 0000000..1768bfd
--- /dev/null
+++ b/evolution/autoconfig/1.1/smail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="smail.plala.or.jp">
+    <domain>smail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>smail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/snow.plala.or.jp b/evolution/autoconfig/1.1/snow.plala.or.jp
new file mode 100644
index 0000000..44267b9
--- /dev/null
+++ b/evolution/autoconfig/1.1/snow.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="snow.plala.or.jp">
+    <domain>snow.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>snow.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>snow.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/so.wind.ne.jp b/evolution/autoconfig/1.1/so.wind.ne.jp
new file mode 100644
index 0000000..50fd47e
--- /dev/null
+++ b/evolution/autoconfig/1.1/so.wind.ne.jp
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="so.wind.ne.jp">
+    <domain>so.wind.ne.jp</domain>
+    <domain>so.wind.jp</domain>
+    <displayName>çéããããããã</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="imap">
+      <hostname>so.wind.ne.jp</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>so.wind.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/sonata.plala.or.jp b/evolution/autoconfig/1.1/sonata.plala.or.jp
new file mode 100644
index 0000000..3834428
--- /dev/null
+++ b/evolution/autoconfig/1.1/sonata.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="sonata.plala.or.jp">
+    <domain>sonata.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>sonata.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>sonata.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/strato.de b/evolution/autoconfig/1.1/strato.de
new file mode 100644
index 0000000..a143e6f
--- /dev/null
+++ b/evolution/autoconfig/1.1/strato.de
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="strato.de">
+    <domain>strato.de</domain>
+    <!-- Hosting customers, MX servers -->
+    <domain>rzone.de</domain>
+
+    <displayName>Strato</displayName>
+    <displayShortName>Strato</displayShortName>
+
+    <incomingServer type="imap">
+      <hostname>imap.strato.de</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-encrypted</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop3.strato.de</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <authentication>password-encrypted</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.strato.de</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <authentication>password-encrypted</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.strato.de</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-encrypted</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <!--
+        Kundenservice: +49-1805-055055
+      -->
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/studenti.univr.it b/evolution/autoconfig/1.1/studenti.univr.it
new file mode 100644
index 0000000..6eb5bf9
--- /dev/null
+++ b/evolution/autoconfig/1.1/studenti.univr.it
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="studenti.univr.it">
+    <domain>studenti.univr.it</domain>
+    <displayName>Università degli Studi di Verona</displayName>
+    <displayShortName>UniVR</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.studenti.univr.it</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.studenti.univr.it</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/suite.plala.or.jp b/evolution/autoconfig/1.1/suite.plala.or.jp
new file mode 100644
index 0000000..c8beac6
--- /dev/null
+++ b/evolution/autoconfig/1.1/suite.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="suite.plala.or.jp">
+    <domain>suite.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>suite.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>suite.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/sympatico.ca b/evolution/autoconfig/1.1/sympatico.ca
new file mode 100644
index 0000000..2830faf
--- /dev/null
+++ b/evolution/autoconfig/1.1/sympatico.ca
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+    <emailProvider id="sympatico.ca">
+      <domain>sympatico.ca</domain>
+
+      <displayName>Sympatico Email</displayName>
+      <displayShortName>Sympatico</displayShortName>
+
+      <incomingServer type="pop3">
+         <hostname>pophm.sympatico.ca</hostname>
+         <port>995</port>
+         <socketType>SSL</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+      </incomingServer>
+
+      <outgoingServer type="smtp">
+         <hostname>smtphm.sympatico.ca</hostname>
+         <port>587</port>
+         <socketType>STARTTLS</socketType>
+         <username>%EMAILADDRESS%</username>
+         <authentication>plain</authentication>
+         <addThisServer>true</addThisServer>
+         <useGlobalPreferredServer>false</useGlobalPreferredServer>
+      </outgoingServer>
+      <documentation url="http://internet.bell.ca/index.cfm?method=content.view&amp;category_id=585&amp;content_id=12767";>
+	  <descr>POP settings, domains</descr>
+      </documentation>
+    </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/symphony.plala.or.jp b/evolution/autoconfig/1.1/symphony.plala.or.jp
new file mode 100644
index 0000000..311aa18
--- /dev/null
+++ b/evolution/autoconfig/1.1/symphony.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="symphony.plala.or.jp">
+    <domain>symphony.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>symphony.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>symphony.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/t-online.de b/evolution/autoconfig/1.1/t-online.de
new file mode 100644
index 0000000..0d3014b
--- /dev/null
+++ b/evolution/autoconfig/1.1/t-online.de
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="t-online.de">
+    <domain>t-online.de</domain>
+    <displayName>T-Online</displayName>
+    <displayShortName>T-Online</displayShortName>
+    <incomingServer type="imap">
+      <hostname>secureimap.t-online.de</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>securepop.t-online.de</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>securesmtp.t-online.de</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <enable visiturl="https://kundencenter.telekom.de/kundencenter/registriert/dienste-abos/ngcs/email-einstellungen/index.html";>
+      <instruction>You need to set up an E-Mail-Password. Attention: The normal password for the T-Online-Website and Webmail does *not* work for email aplications.</instruction>
+      <instruction lang="de">Sie mÃssen ein E-Mail-Passwort einrichten. Achtung: Das Passwort fÃr die T-Online-Website und Webmail funktioniert *nicht* fÃr E-Mail-Programme!</instruction>
+    </enable>
+    <documentation url="http://hilfe.telekom.de/hsp/cms/content/HSP/de/3378/theme-45858870/theme-45858718/theme-45858716/theme-45858715/faq-45855229";>
+      <descr lang="en">Set up your email address</descr>
+      <descr>Richten Sie Ihre Email-Adresse ein</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/taupe.plala.or.jp b/evolution/autoconfig/1.1/taupe.plala.or.jp
new file mode 100644
index 0000000..cec35b2
--- /dev/null
+++ b/evolution/autoconfig/1.1/taupe.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="taupe.plala.or.jp">
+    <domain>taupe.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>taupe.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>taupe.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/terra.es b/evolution/autoconfig/1.1/terra.es
new file mode 100644
index 0000000..f6e8a33
--- /dev/null
+++ b/evolution/autoconfig/1.1/terra.es
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="terra.es">
+    <domain>terra.es</domain>
+    <displayName>Correo Terra</displayName>
+    <displayShortName>Terra</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap4.terra.es</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop3.terra.es</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mailhost.terra.es</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/tiki.ne.jp b/evolution/autoconfig/1.1/tiki.ne.jp
new file mode 100644
index 0000000..9e54488
--- /dev/null
+++ b/evolution/autoconfig/1.1/tiki.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="tiki.ne.jp">
+    <domain>tiki.ne.jp</domain>
+    <displayName>TikiTikiããããããã</displayName>
+    <displayShortName>TikiTiki</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mx.tiki.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp-auth.tiki.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/tiscali.cz b/evolution/autoconfig/1.1/tiscali.cz
new file mode 100644
index 0000000..552eb8a
--- /dev/null
+++ b/evolution/autoconfig/1.1/tiscali.cz
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="tiscali.cz">
+    <domain>tiscali.cz</domain>
+    <domain>wo.cz</domain>
+    <domain>worldonline.cz</domain>
+    <domain>worldmail.cz</domain>
+    <displayName>Tiscali</displayName>
+    <displayShortName>Tiscali</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.mail.tiscali.cz</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.mail.tiscali.cz</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/tiscali.it b/evolution/autoconfig/1.1/tiscali.it
new file mode 100644
index 0000000..98f22a7
--- /dev/null
+++ b/evolution/autoconfig/1.1/tiscali.it
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="tiscali.it">
+    <domain>tiscali.it</domain>
+    <displayName>Tiscali Italy</displayName>
+    <displayShortName>Tiscali</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.tiscali.it</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.tiscali.it</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.tiscali.it</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-encrypted</authentication>
+      <restriction>client-IP-address</restriction>
+    </outgoingServer>
+    <documentation url="http://assistenza.tiscali.it/tecnica/posta/configurazioni/"/>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/tmail.plala.or.jp b/evolution/autoconfig/1.1/tmail.plala.or.jp
new file mode 100644
index 0000000..d138304
--- /dev/null
+++ b/evolution/autoconfig/1.1/tmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="tmail.plala.or.jp">
+    <domain>tmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>tmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>tmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/toccata.plala.or.jp b/evolution/autoconfig/1.1/toccata.plala.or.jp
new file mode 100644
index 0000000..41281a7
--- /dev/null
+++ b/evolution/autoconfig/1.1/toccata.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="toccata.plala.or.jp">
+    <domain>toccata.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>toccata.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>toccata.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/topaz.plala.or.jp b/evolution/autoconfig/1.1/topaz.plala.or.jp
new file mode 100644
index 0000000..185f179
--- /dev/null
+++ b/evolution/autoconfig/1.1/topaz.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="topaz.plala.or.jp">
+    <domain>topaz.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>topaz.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>topaz.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/trio.plala.or.jp b/evolution/autoconfig/1.1/trio.plala.or.jp
new file mode 100644
index 0000000..6d15fc1
--- /dev/null
+++ b/evolution/autoconfig/1.1/trio.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="trio.plala.or.jp">
+    <domain>trio.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>trio.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>trio.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/umail.plala.or.jp b/evolution/autoconfig/1.1/umail.plala.or.jp
new file mode 100644
index 0000000..2b4a069
--- /dev/null
+++ b/evolution/autoconfig/1.1/umail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="umail.plala.or.jp">
+    <domain>umail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>umail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>umail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/umich.edu b/evolution/autoconfig/1.1/umich.edu
new file mode 100644
index 0000000..c19dd74
--- /dev/null
+++ b/evolution/autoconfig/1.1/umich.edu
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+    <emailProvider id="umich.edu">
+        <domain>umich.edu</domain>
+        <displayName>UM ITCS Email</displayName>
+        <displayShortName>UM ITCS</displayShortName>
+        <incomingServer type="imap">
+            <hostname>mail.umich.edu</hostname>
+            <port>993</port>
+            <socketType>SSL</socketType>
+            <username>%EMAILLOCALPART%</username>
+            <authentication>password-cleartext</authentication>
+        </incomingServer>
+        <outgoingServer type="smtp">
+            <hostname>smtp.mail.umich.edu</hostname>
+            <port>587</port>
+            <socketType>STARTTLS</socketType>
+            <username>%EMAILLOCALPART%</username>
+            <authentication>password-cleartext</authentication>
+        </outgoingServer>
+    </emailProvider>
+</clientConfig>
\ No newline at end of file
diff --git a/evolution/autoconfig/1.1/upcmail.nl b/evolution/autoconfig/1.1/upcmail.nl
new file mode 100644
index 0000000..48db41a
--- /dev/null
+++ b/evolution/autoconfig/1.1/upcmail.nl
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="upcmail.nl">
+    <domain>upcmail.nl</domain>
+    <domain>chello.nl</domain>
+    <displayName>UPC Nederland</displayName>
+    <displayShortName>UPC</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.upcmail.nl</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.upcmail.nl</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>client-IP-address</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/verizon.net b/evolution/autoconfig/1.1/verizon.net
new file mode 100644
index 0000000..a72d5d5
--- /dev/null
+++ b/evolution/autoconfig/1.1/verizon.net
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="verizon.net">
+    <domain>verizon.net</domain>
+    <displayName>Verizon Online</displayName>
+    <displayShortName>Verizon</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>incoming.verizon.net</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-encrypted</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>outgoing.verizon.net</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/versatel.de b/evolution/autoconfig/1.1/versatel.de
new file mode 100644
index 0000000..1945a19
--- /dev/null
+++ b/evolution/autoconfig/1.1/versatel.de
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="versatel.de">
+    <domain>versatel.de</domain>
+    <domain>versanet.de</domain>
+    <domain>foni.net</domain>
+    <domain>gelsennet.de</domain>
+    <!-- the following are rarely used, but are used -->
+    <domain>telebel.de</domain>
+    <domain>telelev.de</domain>
+    <domain>cneweb.de</domain>
+    <domain>ruhrnet-online.de</domain>
+    <displayName>Versatel</displayName>
+    <displayShortName>Versatel</displayShortName>
+    <incomingServer type="imap">
+      <hostname>mx.versatel.de</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>mx.versatel.de</hostname>
+      <port>143</port>
+      <socketType>plain</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.versatel.de</hostname>
+      <port>25</port>
+      <socketType>plain</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <documentation url="http://www.versatel.de/hilfe/index_popup.php?einrichtung_email_programm";>
+      <descr lang="en">Email settings</descr>
+    </documentation>
+    <documentation url="http://versatel.custhelp.com/cgi-bin/versatel.cfg/php/enduser/std_adp.php?p_faqid=230";>
+      <descr lang="en">IMAP server</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/violet.plala.or.jp b/evolution/autoconfig/1.1/violet.plala.or.jp
new file mode 100644
index 0000000..a1ce58b
--- /dev/null
+++ b/evolution/autoconfig/1.1/violet.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="violet.plala.or.jp">
+    <domain>violet.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>violet.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>violet.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/vm.aikis.or.jp b/evolution/autoconfig/1.1/vm.aikis.or.jp
new file mode 100644
index 0000000..f650476
--- /dev/null
+++ b/evolution/autoconfig/1.1/vm.aikis.or.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="vm.aikis.or.jp">
+    <domain>vm.aikis.or.jp</domain>
+    <displayName>aikis</displayName>
+    <displayShortName>aikis</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>mail.aikis.or.jp</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>mail.aikis.or.jp</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/vmail.plala.or.jp b/evolution/autoconfig/1.1/vmail.plala.or.jp
new file mode 100644
index 0000000..66358ef
--- /dev/null
+++ b/evolution/autoconfig/1.1/vmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="vmail.plala.or.jp">
+    <domain>vmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>vmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>vmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/vp.tiki.ne.jp b/evolution/autoconfig/1.1/vp.tiki.ne.jp
new file mode 100644
index 0000000..378a9d3
--- /dev/null
+++ b/evolution/autoconfig/1.1/vp.tiki.ne.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="vp.tiki.ne.jp">
+    <domain>vp.tiki.ne.jp</domain>
+    <displayName>TikiTikiããããããã</displayName>
+    <displayShortName>TikiTiki</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>vp.tiki.ne.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>vs.tiki.ne.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/waltz.plala.or.jp b/evolution/autoconfig/1.1/waltz.plala.or.jp
new file mode 100644
index 0000000..e7814cd
--- /dev/null
+++ b/evolution/autoconfig/1.1/waltz.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="waltz.plala.or.jp">
+    <domain>waltz.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>waltz.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>waltz.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/wave.plala.or.jp b/evolution/autoconfig/1.1/wave.plala.or.jp
new file mode 100644
index 0000000..611ab2a
--- /dev/null
+++ b/evolution/autoconfig/1.1/wave.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="wave.plala.or.jp">
+    <domain>wave.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>wave.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>wave.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/web.de b/evolution/autoconfig/1.1/web.de
new file mode 100644
index 0000000..606848a
--- /dev/null
+++ b/evolution/autoconfig/1.1/web.de
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="web.de">
+    <domain>web.de</domain>
+    <displayName>WEB.DE Freemail</displayName>
+    <displayShortName>Web.de</displayShortName>
+    <!-- imap officially pay only ("Web.de Club"), but works for me -->
+    <incomingServer type="imap">
+      <hostname>imap.web.de</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>imap.web.de</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop3.web.de</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+      <pop3>
+        <!-- server allows checks only every 15 minutes, otherwise fails at auth -->
+        <checkInterval minutes="15"/>
+      </pop3>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop3.web.de</hostname>
+      <port>110</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+      <pop3>
+        <!-- see above -->
+        <checkInterval minutes="15"/>
+      </pop3>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.web.de</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <documentation url="http://hilfe.freemail.web.de/freemail/e-mail/pop3/thunderbird/";>
+      <descr lang="en">Configure POP3 in Thunderbird (currently describing TB 3.0)</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/white.plala.or.jp b/evolution/autoconfig/1.1/white.plala.or.jp
new file mode 100644
index 0000000..34f9a8a
--- /dev/null
+++ b/evolution/autoconfig/1.1/white.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="white.plala.or.jp">
+    <domain>white.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>white.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>white.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/wildwestdomains.com b/evolution/autoconfig/1.1/wildwestdomains.com
new file mode 100644
index 0000000..2f47caa
--- /dev/null
+++ b/evolution/autoconfig/1.1/wildwestdomains.com
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="wildwestdomains.com">
+    <!-- Hosting customers, MX servers -->
+    <domain>secureserver.net</domain>
+
+    <displayName>Your WildWest domain</displayName>
+    <displayShortName>WildWest</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.secureserver.net</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <!--
+        Warning: Only a minority of users has IMAP access.
+      -->
+    <incomingServer type="imap">
+      <hostname>imap.secureserver.net</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtpout.secureserver.net</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+    <!--
+        customer service: +1-480-624-2500
+      -->
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/wine.plala.or.jp b/evolution/autoconfig/1.1/wine.plala.or.jp
new file mode 100644
index 0000000..62f66db
--- /dev/null
+++ b/evolution/autoconfig/1.1/wine.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="wine.plala.or.jp">
+    <domain>wine.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>wine.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>wine.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/wmail.plala.or.jp b/evolution/autoconfig/1.1/wmail.plala.or.jp
new file mode 100644
index 0000000..375c301
--- /dev/null
+++ b/evolution/autoconfig/1.1/wmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="wmail.plala.or.jp">
+    <domain>wmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>wmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>wmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/wp.pl b/evolution/autoconfig/1.1/wp.pl
new file mode 100644
index 0000000..0d801c0
--- /dev/null
+++ b/evolution/autoconfig/1.1/wp.pl
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="wp.pl">
+    <domain>wp.pl</domain>
+    <displayName>Poczta Wirtualna Polska</displayName>
+    <displayShortName>Poczta WP</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.wp.pl</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.wp.pl</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/xmail.plala.or.jp b/evolution/autoconfig/1.1/xmail.plala.or.jp
new file mode 100644
index 0000000..b8d7187
--- /dev/null
+++ b/evolution/autoconfig/1.1/xmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="xmail.plala.or.jp">
+    <domain>xmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>xmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>xmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/xp.wind.jp b/evolution/autoconfig/1.1/xp.wind.jp
new file mode 100644
index 0000000..bed7569
--- /dev/null
+++ b/evolution/autoconfig/1.1/xp.wind.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="xp.wind.jp">
+    <domain>xp.wind.jp</domain>
+    <displayName>çéããããããã</displayName>
+    <displayShortName>wind</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>xp.wind.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>xp.wind.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/xpost.plala.or.jp b/evolution/autoconfig/1.1/xpost.plala.or.jp
new file mode 100644
index 0000000..7d175fd
--- /dev/null
+++ b/evolution/autoconfig/1.1/xpost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="xpost.plala.or.jp">
+    <domain>xpost.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>xpost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>xpost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/xs4all.nl b/evolution/autoconfig/1.1/xs4all.nl
new file mode 100644
index 0000000..60c1913
--- /dev/null
+++ b/evolution/autoconfig/1.1/xs4all.nl
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="xs4all.nl">
+    <domain>xs4all.nl</domain>
+    <displayName>XS4All</displayName>
+    <displayShortName>XS4All</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pops.xs4all.nl</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtps.xs4all.nl</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/xtra.co.nz b/evolution/autoconfig/1.1/xtra.co.nz
new file mode 100644
index 0000000..3fe9e7b
--- /dev/null
+++ b/evolution/autoconfig/1.1/xtra.co.nz
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="xtra.co.nz">
+    <domain>xtra.co.nz</domain>
+    <displayName>Yahoo! Mail</displayName>
+    <displayShortName>Yahoo</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop3.xtra.co.nz</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>send.xtra.co.nz</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/yahoo.co.jp b/evolution/autoconfig/1.1/yahoo.co.jp
new file mode 100644
index 0000000..f8fadde
--- /dev/null
+++ b/evolution/autoconfig/1.1/yahoo.co.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="yahoo.co.jp">
+    <domain>yahoo.co.jp</domain>
+    <displayName>Yahoo! ããã</displayName>
+    <displayShortName>Yahoo! ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.mail.yahoo.co.jp</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.mail.yahoo.co.jp</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/yahoo.com b/evolution/autoconfig/1.1/yahoo.com
new file mode 100644
index 0000000..2846f90
--- /dev/null
+++ b/evolution/autoconfig/1.1/yahoo.com
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="yahoo.com">
+    <domain>yahoo.com</domain>
+    <domain>yahoo.de</domain>
+    <domain>yahoo.it</domain>
+    <domain>yahoo.fr</domain>
+    <domain>yahoo.es</domain>
+    <domain>yahoo.co.uk</domain>
+    <domain>yahoo.co.nz</domain>
+    <domain>yahoo.com.au</domain>
+    <domain>yahoo.com.ar</domain>
+    <domain>yahoo.com.br</domain>
+    <domain>yahoo.com.mx</domain>
+    <domain>ymail.com</domain>
+    <domain>rocketmail.com</domain>
+    <displayName>Yahoo! Mail</displayName>
+    <displayShortName>Yahoo</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.mail.yahoo.com</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="imap">
+      <hostname>imap.mail.yahoo.com</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.mail.yahoo.com</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/yandex.ru b/evolution/autoconfig/1.1/yandex.ru
new file mode 100644
index 0000000..b9b4538
--- /dev/null
+++ b/evolution/autoconfig/1.1/yandex.ru
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="yandex.ru">
+    <domain>yandex.ru</domain>
+    <domain>yandex.com</domain>
+    <domain>yandex.net</domain>
+    <domain>yandex.by</domain>
+    <domain>yandex.kz</domain>
+    <domain>yandex.ua</domain>
+    <domain>ya.ru</domain>
+    <domain>narod.ru</domain>
+    <displayName>Yandex Mail</displayName>
+    <displayShortName>Yandex</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.yandex.ru</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <incomingServer type="pop3">
+      <hostname>pop.yandex.ru</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.yandex.ru</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+    <enable visiturl="http://mail.yandex.ru/neo/setup_client";>
+      <instruction>Check 'Enable IMAP' on Yandex.Mail setup page</instruction>
+    </enable>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ybb.ne.jp b/evolution/autoconfig/1.1/ybb.ne.jp
new file mode 100644
index 0000000..ab91e94
--- /dev/null
+++ b/evolution/autoconfig/1.1/ybb.ne.jp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="ybb.ne.jp">
+    <domain>ybb.ne.jp</domain>
+    <displayName>Yahoo! BB</displayName>
+    <displayShortName>Yahoo! BB</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ybbpop.mail.yahoo.co.jp</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ybbsmtp.mail.yahoo.co.jp</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/yellow.plala.or.jp b/evolution/autoconfig/1.1/yellow.plala.or.jp
new file mode 100644
index 0000000..4b71b37
--- /dev/null
+++ b/evolution/autoconfig/1.1/yellow.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="yellow.plala.or.jp">
+    <domain>yellow.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>yellow.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>yellow.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ymail.plala.or.jp b/evolution/autoconfig/1.1/ymail.plala.or.jp
new file mode 100644
index 0000000..0f367d6
--- /dev/null
+++ b/evolution/autoconfig/1.1/ymail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ymail.plala.or.jp">
+    <domain>ymail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ymail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ymail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ypost.plala.or.jp b/evolution/autoconfig/1.1/ypost.plala.or.jp
new file mode 100644
index 0000000..9149c8d
--- /dev/null
+++ b/evolution/autoconfig/1.1/ypost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="ypost.plala.or.jp">
+    <domain>ypost.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>ypost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>ypost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/ziggo.nl b/evolution/autoconfig/1.1/ziggo.nl
new file mode 100644
index 0000000..5827ab5
--- /dev/null
+++ b/evolution/autoconfig/1.1/ziggo.nl
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="ziggo.nl">
+    <domain>ziggo.nl</domain>
+    <domain>casema.nl</domain>
+    <domain>quicknet.nl</domain>
+    <domain>home.nl</domain>
+    <displayName>Ziggo</displayName>
+    <displayShortName>Ziggo</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>pop.ziggo.nl</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>smtp.ziggo.nl</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/zmail.plala.or.jp b/evolution/autoconfig/1.1/zmail.plala.or.jp
new file mode 100644
index 0000000..02e73a9
--- /dev/null
+++ b/evolution/autoconfig/1.1/zmail.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="zmail.plala.or.jp">
+    <domain>zmail.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>zmail.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>zmail.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>
diff --git a/evolution/autoconfig/1.1/zpost.plala.or.jp b/evolution/autoconfig/1.1/zpost.plala.or.jp
new file mode 100644
index 0000000..9844a44
--- /dev/null
+++ b/evolution/autoconfig/1.1/zpost.plala.or.jp
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig>
+  <emailProvider id="zpost.plala.or.jp">
+    <domain>zpost.plala.or.jp</domain>
+    <displayName>ããã</displayName>
+    <displayShortName>ããã</displayShortName>
+    <incomingServer type="pop3">
+      <hostname>zpost.mail.plala.or.jp</hostname>
+      <port>110</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>zpost.mail.plala.or.jp</hostname>
+      <port>587</port>
+      <socketType>plain</socketType>
+      <username>%EMAILLOCALPART%</username>
+      <authentication>plain</authentication>
+      <addThisServer>true</addThisServer>
+      <useGlobalPreferredServer>false</useGlobalPreferredServer>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]