diff --git a/k9mail/src/main/res/xml/providers.xml b/k9mail/src/main/res/xml/providers.xml
index 2fc64e675..5f7d3ea6f 100644
--- a/k9mail/src/main/res/xml/providers.xml
+++ b/k9mail/src/main/res/xml/providers.xml
@@ -258,78 +258,90 @@
    </provider> 
 
    <!-- Switzerland -->
-    <!-- MyKolab.com variants -->
-    <provider id="mykolab.com" label="MyKolab.com" domain="mykolab.com">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <!-- KolabNow.com variants -->
+    <provider id="kolabnow.com" label="KolabNow.com" domain="kolabnow.com">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="attorneymail.ch" label="MyKolab.com" domain="attorneymail.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="attorneymail.ch" label="KolabNow.com" domain="attorneymail.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="barmail.ch" label="MyKolab.com" domain="barmail.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="barmail.ch" label="KolabNow.com" domain="barmail.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="collaborative.li" label="MyKolab.com" domain="collaborative.li">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="collaborative.li" label="KolabNow.com" domain="collaborative.li">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="diplomail.ch" label="MyKolab.com" domain="diplomail.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="diplomail.ch" label="KolabNow.com" domain="diplomail.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="groupoffice.ch" label="MyKolab.com" domain="groupoffice.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="groupoffice.ch" label="KolabNow.com" domain="groupoffice.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="journalistmail.ch" label="MyKolab.com" domain="journalistmail.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="journalistmail.ch" label="KolabNow.com" domain="journalistmail.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="legalprivilege.ch" label="MyKolab.com" domain="legalprivilege.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="legalprivilege.ch" label="KolabNow.com" domain="legalprivilege.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="mailatlaw.ch" label="MyKolab.com" domain="mailatlaw.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="libertymail.co" label="KolabNow.com" domain="libertymail.co">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="medmail.ch" label="MyKolab.com" domain="medmail.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="libertymail.net" label="KolabNow.com" domain="libertymail.net">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="mykolab.ch" label="MyKolab.com" domain="mykolab.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="mailatlaw.ch" label="KolabNow.com" domain="mailatlaw.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="myswissmail.ch" label="MyKolab.com" domain="myswissmail.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="medmail.ch" label="KolabNow.com" domain="medmail.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="opengroupware.ch" label="MyKolab.com" domain="opengroupware.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="mykolab.ch" label="KolabNow.com" domain="mykolab.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="pressmail.ch" label="MyKolab.com" domain="pressmail.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="mykolab.com" label="KolabNow.com" domain="mykolab.com">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="swisscollab.ch" label="MyKolab.com" domain="swisscollab.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="myswissmail.ch" label="KolabNow.com" domain="myswissmail.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="swissgroupware.ch" label="MyKolab.com" domain="swissgroupware.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="opengroupware.ch" label="KolabNow.com" domain="opengroupware.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="switzerlandmail.ch" label="MyKolab.com" domain="switzerlandmail.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="pressmail.ch" label="KolabNow.com" domain="pressmail.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
-    <provider id="trusted-legal-mail.ch" label="MyKolab.com" domain="trusted-legal-mail.ch">
-        <incoming uri="imap+tls+://imap.mykolab.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mykolab.com" username="$email" />
+    <provider id="swisscollab.ch" label="KolabNow.com" domain="swisscollab.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
+    </provider>
+    <provider id="swissgroupware.ch" label="KolabNow.com" domain="swissgroupware.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
+    </provider>
+    <provider id="switzerlandmail.ch" label="KolabNow.com" domain="switzerlandmail.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
+    </provider>
+    <provider id="trusted-legal-mail.ch" label="KolabNow.com" domain="trusted-legal-mail.ch">
+        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
+        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
     </provider>
 
     <!-- Poland -->