diff --git a/k9mail-library/src/main/java/foundation/e/mail/mail/store/RemoteStore.java b/k9mail-library/src/main/java/foundation/e/mail/mail/store/RemoteStore.java
index 6e768230c5186daf72060fdeaeae6605357db7bb..fd1c2ecac5301005cd2e49e9e41b8f12262a215b 100644
--- a/k9mail-library/src/main/java/foundation/e/mail/mail/store/RemoteStore.java
+++ b/k9mail-library/src/main/java/foundation/e/mail/mail/store/RemoteStore.java
@@ -48,24 +48,25 @@ public abstract class RemoteStore extends Store {
     {
         String uri = storeConfig.getStoreUri();
 
-        if (uri.startsWith("local")) {
+        if (uri != null && uri.startsWith("local")) {
             throw new RuntimeException("Asked to get non-local Store object but given LocalStore URI");
         }
 
         Store store = sStores.get(uri);
         if (store == null) {
-            if (uri.startsWith("imap")) {
-                store = new ImapStore(
-                        storeConfig,
-                        new DefaultTrustedSocketFactory(context),
-                        (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE),
-                        oAuth2TokenProvider);
-            } else if (uri.startsWith("pop3")) {
-                store = new Pop3Store(storeConfig, new DefaultTrustedSocketFactory(context));
-            } else if (uri.startsWith("webdav")) {
-                store = new WebDavStore(storeConfig, new WebDavHttpClient.WebDavHttpClientFactory());
+            if (uri != null) {
+                if (uri.startsWith("imap")) {
+                    store = new ImapStore(
+                            storeConfig,
+                            new DefaultTrustedSocketFactory(context),
+                            (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE),
+                            oAuth2TokenProvider);
+                } else if (uri.startsWith("pop3")) {
+                    store = new Pop3Store(storeConfig, new DefaultTrustedSocketFactory(context));
+                } else if (uri.startsWith("webdav")) {
+                    store = new WebDavStore(storeConfig, new WebDavHttpClient.WebDavHttpClientFactory());
+                }
             }
-
             if (store != null) {
                 sStores.put(uri, store);
             }
diff --git a/k9mail/src/main/java/foundation/e/mail/activity/Accounts.java b/k9mail/src/main/java/foundation/e/mail/activity/Accounts.java
index db99fbc1f9dcf2fbf84bbcdf986fbaa071ad52ea..2981ff02f6971491d5d0bce04724b1aa63b80263 100644
--- a/k9mail/src/main/java/foundation/e/mail/activity/Accounts.java
+++ b/k9mail/src/main/java/foundation/e/mail/activity/Accounts.java
@@ -498,6 +498,21 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
         return true;
     }
 
+
+    private boolean isDomainAvailable(String deviceAccountEmailId) {
+        try {
+            String[] emailParts = EmailHelper.splitEmail(deviceAccountEmailId);
+            AccountSetupPresenter.Provider provider = findProviderForDomain(this, emailParts[1]);
+            if (provider != null) {
+                return true;
+            }
+        } catch (Exception e) {
+            Timber.e(e, "Error while trying to initialise account configuration.");
+        }
+        return false;
+    }
+
+
     private static AccountSetupPresenter.Provider findProviderForDomain(Context context,
                                                                         String domain) {
         try {
@@ -529,6 +544,19 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
                     return provider;
                 }
             }
+
+            if (provider == null) {
+                provider = new AccountSetupPresenter.Provider();
+                provider.id = domain;
+                provider.label = domain + " mail service";
+                provider.domain = domain;
+                provider.note = "";
+                provider.incomingUriTemplate = new URI("imap+ssl+://mail." + domain);
+                provider.incomingUsernameTemplate = "$email";
+                provider.outgoingUriTemplate = new URI("smtp+tls+://mail." + domain);
+                provider.outgoingUsernameTemplate = "$email";
+            }
+
         } catch (Exception e) {
             Timber.e(e, "Error while trying to load provider settings.");
         }
@@ -663,8 +691,11 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
                 }
                 if (!accountIsSignedIn) {
                     String password = accountManager.getPassword(eeloAccount);
-                    EeloAccountCreator.createAccount(this, emailId, password);
-                    accountWasAdded = true;
+                    if (isDomainAvailable(emailId)) {
+                        EeloAccountCreator.createAccount(this, emailId, password);
+                        accountWasAdded = true;
+                    }
+
                 }
             }
 
@@ -674,9 +705,9 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
                 boolean accountIsSignedIn = false;
                 for (Account account : accounts) {
                     if (emailId.equals(account.getEmail())) {
-                        if(account.getName() == null){ // we need to fix an old bug
-                           account.setName(emailId);
-                           account.save(Preferences.getPreferences(this));
+                        if (account.getName() == null) { // we need to fix an old bug
+                            account.setName(emailId);
+                            account.save(Preferences.getPreferences(this));
                         }
 
                         accountIsSignedIn = true;
@@ -689,17 +720,15 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
                 }
             }
 
-	    return accountWasAdded;
-        }
-        catch (SecurityException e)
-        {
+            return accountWasAdded;
+        } catch (SecurityException e) {
             e.printStackTrace();
             return false;
         }
 
     }
 
-    private void removeOldAccountsAutomatically(List<Account> accounts){
+    private void removeOldAccountsAutomatically(List<Account> accounts) {
         try {
             android.accounts.Account[] eeloAccounts = getEeloAccountsOnDevice();
             android.accounts.Account[] googleAccounts = getGoogleAccountsOnDevice();
@@ -708,7 +737,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
                 if (account.isDeviceAccount()) {
                     boolean accountIsSignedInOnDevice = false;
                     // because of a now fixed bug, accounts with empty mails coming from custom nextcloud server could have been added: we need to remove them
-                    if(account.getEmail() != null) {
+                    if (account.getEmail() != null) {
                         for (android.accounts.Account eeloAccount : eeloAccounts) {
                             String emailId = accountManager.getUserData(eeloAccount,
                                     ACCOUNT_EMAIL_ADDRESS_KEY);
diff --git a/k9mail/src/main/java/foundation/e/mail/activity/setup/AccountSetupPresenter.java b/k9mail/src/main/java/foundation/e/mail/activity/setup/AccountSetupPresenter.java
index 7598fc8541c2bb360633df512556157c09aa017b..8808f94b7f8530d71c99465b0ca1d2d099a81710 100644
--- a/k9mail/src/main/java/foundation/e/mail/activity/setup/AccountSetupPresenter.java
+++ b/k9mail/src/main/java/foundation/e/mail/activity/setup/AccountSetupPresenter.java
@@ -724,6 +724,19 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter,
                     return provider;
                 }
             }
+
+            if (provider == null) {
+                provider = new AccountSetupPresenter.Provider();
+                provider.id = domain;
+                provider.label = domain + " mail service";
+                provider.domain = domain;
+                provider.note = "";
+                provider.incomingUriTemplate = new URI("imap+ssl+://mail." + domain);
+                provider.incomingUsernameTemplate = "$email";
+                provider.outgoingUriTemplate = new URI("smtp+tls+://mail." + domain);
+                provider.outgoingUsernameTemplate = "$email";
+            }
+
         } catch (Exception e) {
             Timber.e(e, "Error while trying to load provider settings.");
         }
@@ -1878,7 +1891,7 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter,
     public void onWebViewDismiss() {
         if (!oAuth2CodeGotten) {
             view.goToBasics();
-            view.showErrorDialog("Couldn't sign in"); 
+            view.showErrorDialog("Couldn't sign in");
         }
     }
 
diff --git a/k9mail/src/main/java/foundation/e/mail/activity/setup/EeloAccountCreator.java b/k9mail/src/main/java/foundation/e/mail/activity/setup/EeloAccountCreator.java
index ea17b0ceff0680ea5fdbbdf9eb09c42ca26975ef..1b535934dc1823136b8db6259b51b401c392143d 100644
--- a/k9mail/src/main/java/foundation/e/mail/activity/setup/EeloAccountCreator.java
+++ b/k9mail/src/main/java/foundation/e/mail/activity/setup/EeloAccountCreator.java
@@ -154,6 +154,18 @@ public class EeloAccountCreator {
                     return provider;
                 }
             }
+            if (provider == null) {
+                provider = new AccountSetupPresenter.Provider();
+                provider.id = domain;
+                provider.label = domain + " mail service";
+                provider.domain = domain;
+                provider.note = "";
+                provider.incomingUriTemplate = new URI("imap+ssl+://mail." + domain);
+                provider.incomingUsernameTemplate = "$email";
+                provider.outgoingUriTemplate = new URI("smtp+tls+://mail." + domain);
+                provider.outgoingUsernameTemplate = "$email";
+            }
+
         } catch (Exception e) {
             Timber.e(e, "Error while trying to load provider settings.");
         }
diff --git a/k9mail/src/main/java/foundation/e/mail/controller/MessagingController.java b/k9mail/src/main/java/foundation/e/mail/controller/MessagingController.java
index 5c3ce8bd39b4be6ee7155f7704701ece339c308c..9c1210f4a70bd8fba466015f016754f4a773183d 100644
--- a/k9mail/src/main/java/foundation/e/mail/controller/MessagingController.java
+++ b/k9mail/src/main/java/foundation/e/mail/controller/MessagingController.java
@@ -3521,6 +3521,19 @@ public class MessagingController {
                     return provider;
                 }
             }
+
+            if (provider == null) {
+                provider = new AccountSetupPresenter.Provider();
+                provider.id = domain;
+                provider.label = domain + " mail service";
+                provider.domain = domain;
+                provider.note = "";
+                provider.incomingUriTemplate = new URI("imap+ssl+://mail." + domain);
+                provider.incomingUsernameTemplate = "$email";
+                provider.outgoingUriTemplate = new URI("smtp+tls+://mail." + domain);
+                provider.outgoingUsernameTemplate = "$email";
+            }
+
         } catch (Exception e) {
             Timber.e(e, "Error while trying to load provider settings.");
         }
diff --git a/k9mail/src/main/res/layout/account_setup_check_settings.xml b/k9mail/src/main/res/layout/account_setup_check_settings.xml
index f2b94f45da9031581ae1e4d8351484f9a6bebb46..9cc366e0c5809a22665595f73af743673ced3fcb 100644
--- a/k9mail/src/main/res/layout/account_setup_check_settings.xml
+++ b/k9mail/src/main/res/layout/account_setup_check_settings.xml
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
+
     <TextView
-	android:id="@+id/title"
+        android:id="@+id/title"
         android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="Please wait"
-        android:textColor="@android:color/black"
-        android:layout_marginLeft="32dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
+        android:layout_marginLeft="32dp"
+        android:layout_marginTop="32dp"
+        android:text="Please wait"
+        android:textColor="@android:color/black"
         android:textSize="32sp"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="32dp" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
-	android:id="@+id/progress"
-	android:layout_width="0dp"    
-	android:layout_height="wrap_content"
-	android:indeterminate="true"
-        app:mpb_progressStyle="horizontal"
+        android:id="@+id/progress"
         style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
-        app:layout_constraintLeft_toLeftOf="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
-        app:layout_constraintRight_toRightOf="parent"
+        android:indeterminate="true"
         app:layout_constraintHorizontal_bias="0.0"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="20dp"
-        app:layout_constraintTop_toBottomOf="@+id/message" />
+        app:layout_constraintLeft_toLeftOf="@+id/title"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/message"
+        app:mpb_progressStyle="horizontal" />
 
     <TextView
         android:id="@+id/message"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-        tools:layout_constraintTop_creator="1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="56dp"
+        app:layout_constraintLeft_toLeftOf="@+id/title"
         app:layout_constraintTop_toBottomOf="@+id/title"
         tools:layout_constraintLeft_creator="1"
-        app:layout_constraintLeft_toLeftOf="@+id/title"/>
+        tools:layout_constraintTop_creator="1" />
 </android.support.constraint.ConstraintLayout>
 
diff --git a/k9mail/src/main/res/xml/providers.xml b/k9mail/src/main/res/xml/providers.xml
index 93e2cc9eb96c2a3e6260243e483d8c3c9316e8df..ced636be4be455bee79c7a0217ad3083bc8a7cc8 100644
--- a/k9mail/src/main/res/xml/providers.xml
+++ b/k9mail/src/main/res/xml/providers.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,71 +13,71 @@
      limitations under the License.
 -->
 
-    <!--
-        This file is used to specify providers that we know default settings for
-        so that the user can set up their account by simply entering their email
-        address and password.
-
-        When a user starts this process, the email address is parsed, the domain
-        broken out and used to search this file for a provider. If one is found the
-        provider's settings are used to attempt to connect to the account.
-        
-        At this time, the id and label attributes are not used.  However, please include them
-        if you make edits to this file.  id must also be completely unique.  label will be shown
-        to the user when there are multiple options provided for a single domain (not currently
-        supported).
-
-        A provider contains the settings for setting up an email account
-        that ends with the given domain. Domains should be unique within
-        this file. Each provider should have at least one incoming section and
-        one outgoing section. If more than one is specified only the first
-        will be used.
-
-        Valid incoming uri schemes are:
-            imap+tls+   IMAP with required TLS transport security.
-                            If TLS is not available the connection fails.
-            imap+ssl+   IMAP with required SSL transport security.
-                            If SSL is not available the connection fails.
-
-            pop3+tls+   POP3 with required TLS transport security.
-                            If TLS is not available the connection fails.
-            pop3+ssl+   POP3 with required SSL transport security.
-                            If SSL is not available the connection fails.
-
-        Valid outgoing uri schemes are:
-            smtp+tls+   SMTP with required TLS transport security.
-                            If TLS is not available the connection fails.
-            smtp+ssl+   SMTP with required SSL transport security.
-                            If SSL is not available the connection fails.
-
-        The URIs should be full templates for connection, including a port if
-        the service uses a non-default port.  The default ports are as follows:
-            imap+tls+   143     pop3+tls+   110     smtp+tls+   587
-            imap+ssl+   993     pop3+ssl+   995     smtp+ssl+   465
-
-        The username attribute is used to supply a template for the username
-        that will be presented to the server. This username is built from a
-        set of variables that are substituted with parts of the user
-        specified email address.
-
-        Valid substitution values for the username attribute are:
-            $email - the email address the user entered
-            $user - the value before the @ sign in the email address the user entered
-            $domain - the value after the @ sign in the email address the user entered
-            
-        The username attribute MUST be specified for the incoming element, so the POP3 or IMAP
-        server can identify the mailbox to be opened.
-        
-        The username attribute MAY be the empty string for the outgoing element, but only if the 
-        SMTP server supports anonymous transmission (most don't).
-
-        While it would technically work please DO NOT add providers that don't support encrypted
-        connections.
-    -->
+<!--
+    This file is used to specify providers that we know default settings for
+    so that the user can set up their account by simply entering their email
+    address and password.
+
+    When a user starts this process, the email address is parsed, the domain
+    broken out and used to search this file for a provider. If one is found the
+    provider's settings are used to attempt to connect to the account.
+
+    At this time, the id and label attributes are not used.  However, please include them
+    if you make edits to this file.  id must also be completely unique.  label will be shown
+    to the user when there are multiple options provided for a single domain (not currently
+    supported).
+
+    A provider contains the settings for setting up an email account
+    that ends with the given domain. Domains should be unique within
+    this file. Each provider should have at least one incoming section and
+    one outgoing section. If more than one is specified only the first
+    will be used.
+
+    Valid incoming uri schemes are:
+        imap+tls+   IMAP with required TLS transport security.
+                        If TLS is not available the connection fails.
+        imap+ssl+   IMAP with required SSL transport security.
+                        If SSL is not available the connection fails.
+
+        pop3+tls+   POP3 with required TLS transport security.
+                        If TLS is not available the connection fails.
+        pop3+ssl+   POP3 with required SSL transport security.
+                        If SSL is not available the connection fails.
+
+    Valid outgoing uri schemes are:
+        smtp+tls+   SMTP with required TLS transport security.
+                        If TLS is not available the connection fails.
+        smtp+ssl+   SMTP with required SSL transport security.
+                        If SSL is not available the connection fails.
+
+    The URIs should be full templates for connection, including a port if
+    the service uses a non-default port.  The default ports are as follows:
+        imap+tls+   143     pop3+tls+   110     smtp+tls+   587
+        imap+ssl+   993     pop3+ssl+   995     smtp+ssl+   465
+
+    The username attribute is used to supply a template for the username
+    that will be presented to the server. This username is built from a
+    set of variables that are substituted with parts of the user
+    specified email address.
+
+    Valid substitution values for the username attribute are:
+        $email - the email address the user entered
+        $user - the value before the @ sign in the email address the user entered
+        $domain - the value after the @ sign in the email address the user entered
+
+    The username attribute MUST be specified for the incoming element, so the POP3 or IMAP
+    server can identify the mailbox to be opened.
+
+    The username attribute MAY be the empty string for the outgoing element, but only if the
+    SMTP server supports anonymous transmission (most don't).
+
+    While it would technically work please DO NOT add providers that don't support encrypted
+    connections.
+-->
 
 <providers>
 
-     <!-- eelo.io / eelo.me / e.email / ecloud.global -->
+    <!-- eelo.io / eelo.me / e.email / ecloud.global -->
     <provider
         domain="ecloud.global"
         id="ecloud.global"
@@ -101,7 +100,6 @@
             uri="smtp+tls+://mail.ecloud.global"
             username="$email" />
     </provider>
-    
     <provider
         domain="eelo.io"
         id="eelo.io"
@@ -126,665 +124,1733 @@
     </provider>
 
     <!-- Gmail variants -->
-    <provider id="gmail" label="Gmail" domain="gmail.com">
-        <incoming uri="imap+ssl+://imap.gmail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.gmail.com" username="$email" />
+    <provider
+        domain="gmail.com"
+        id="gmail"
+        label="Gmail">
+        <incoming
+            uri="imap+ssl+://imap.gmail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.gmail.com"
+            username="$email" />
     </provider>
-    <provider id="googlemail" label="Google Mail" domain="googlemail.com">
-        <incoming uri="imap+ssl+://imap.googlemail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.googlemail.com" username="$email" />
+    <provider
+        domain="googlemail.com"
+        id="googlemail"
+        label="Google Mail">
+        <incoming
+            uri="imap+ssl+://imap.googlemail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.googlemail.com"
+            username="$email" />
     </provider>
-    <provider id="google" label="Google" domain="google.com">
-        <incoming uri="imap+ssl+://imap.gmail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.gmail.com" username="$email" />
+    <provider
+        domain="google.com"
+        id="google"
+        label="Google">
+        <incoming
+            uri="imap+ssl+://imap.gmail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.gmail.com"
+            username="$email" />
     </provider>
-    <provider id="android" label="Android" domain="android.com">
-        <incoming uri="imap+ssl+://imap.gmail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.gmail.com" username="$email" />
+    <provider
+        domain="android.com"
+        id="android"
+        label="Android">
+        <incoming
+            uri="imap+ssl+://imap.gmail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.gmail.com"
+            username="$email" />
     </provider>
 
     <!-- USA -->
-    <provider id="comcast" label="Comcast" domain="comcast.net">
-        <incoming uri="imap+ssl+://imap.comcast.net" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.comcast.net" username="$email" />
-    </provider>
-    <provider id="cox" label="Cox" domain="cox.net">
-        <incoming uri="pop3+ssl+://pop.east.cox.net" username="$user" />
-        <outgoing uri="smtp+ssl+://smtp.east.cox.net" username="$user" />
-    </provider> 
-    <provider id="live" label="Windows Live Hotmail" domain="live.com">
-        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
-    </provider>
-    <provider id="hotmail" label="Hotmail" domain="hotmail.com">
-        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
-    </provider>
-    <provider id="outlook" label="Outlook.com" domain="outlook.com">
-        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
-    </provider>
-    <provider id="msn" label="MSN" domain="msn.com">
-        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
-    </provider>
-    <provider id="montclair.edu" label="MSU" domain="montclair.edu">
-        <incoming uri="imap+ssl+://mail.montclair.edu" username="$user" />
-        <outgoing uri="smtp+tls+://smtp.montclair.edu" username="$user" />
-    </provider>
-    <provider id="gmx.com" label="GMX" domain="gmx.com">
-        <incoming uri="imap+ssl+://imap.gmx.com" username="$email" />
-        <outgoing uri="smtp+ssl+://mail.gmx.com" username="$email" />
-    </provider>
-    <provider id="zoho.com" label="Zoho Mail" domain="zoho.com">
-    	<incoming uri="imap+ssl+://imap.zoho.com" username="$email" />
-    	<outgoing uri="smtp+tls+://smtp.zoho.com" username="$email" />
-    </provider>
-    <provider id="gnu" label="GNU" domain="gnu.org">
-    	<incoming uri="pop3+ssl+://fencepost.gnu.org" username="$user" />
-    	<outgoing uri="smtp+tls+://fencepost.gnu.org" username="$user" />
-    </provider>
-    <provider id="riseup" label="Riseup Networks" domain="riseup.net">
-    	<incoming uri="imap+ssl+://mail.riseup.net" username="$user" />
-    	<outgoing uri="smtp+tls+://mail.riseup.net" username="$user" />
-    </provider>	
-
-    <!-- Mail.com Variants -->
-    <provider id="mail.com" label="Mail.com" domain="mail.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
-    </provider>
-    <provider id="email.com" label="Mail.com" domain="email.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
-    </provider>
-    <provider id="techie.com" label="Mail.com" domain="techie.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
-    </provider>
-    <provider id="email.com" label="Mail.com" domain="email.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
-    </provider>
-    <provider id="usa.com" label="Mail.com" domain="usa.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
-    </provider>
-    <provider id="myself.com" label="Mail.com" domain="myself.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
-    </provider>
-    <provider id="consultant.com" label="Mail.com" domain="consultant.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
-    </provider>
-    <provider id="post.com" label="Mail.com" domain="post.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
-    </provider>
-    <provider id="europe.com" label="Mail.com" domain="europe.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
-    </provider>
-    <provider id="asia.com" label="Mail.com" domain="asia.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="comcast.net"
+        id="comcast"
+        label="Comcast">
+        <incoming
+            uri="imap+ssl+://imap.comcast.net"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.comcast.net"
+            username="$email" />
     </provider>
-    <provider id="iname.com" label="Mail.com" domain="iname.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="cox.net"
+        id="cox"
+        label="Cox">
+        <incoming
+            uri="pop3+ssl+://pop.east.cox.net"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://smtp.east.cox.net"
+            username="$user" />
     </provider>
-    <provider id="writeme.com" label="Mail.com" domain="writeme.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="live.com"
+        id="live"
+        label="Windows Live Hotmail">
+        <incoming
+            uri="imap+ssl+://imap-mail.outlook.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp-mail.outlook.com"
+            username="$email" />
     </provider>
-    <provider id="dr.com" label="Mail.com" domain="dr.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="hotmail.com"
+        id="hotmail"
+        label="Hotmail">
+        <incoming
+            uri="imap+ssl+://imap-mail.outlook.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp-mail.outlook.com"
+            username="$email" />
     </provider>
-    <provider id="engineer.com" label="Mail.com" domain="engineer.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="outlook.com"
+        id="outlook"
+        label="Outlook.com">
+        <incoming
+            uri="imap+ssl+://imap-mail.outlook.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp-mail.outlook.com"
+            username="$email" />
     </provider>
-    <provider id="cheerful.com" label="Mail.com" domain="cheerful.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="msn.com"
+        id="msn"
+        label="MSN">
+        <incoming
+            uri="imap+ssl+://imap-mail.outlook.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp-mail.outlook.com"
+            username="$email" />
     </provider>
-    <provider id="accountant.com" label="Mail.com" domain="accountant.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="montclair.edu"
+        id="montclair.edu"
+        label="MSU">
+        <incoming
+            uri="imap+ssl+://mail.montclair.edu"
+            username="$user" />
+        <outgoing
+            uri="smtp+tls+://smtp.montclair.edu"
+            username="$user" />
     </provider>
-    <provider id="techie.com" label="Mail.com" domain="techie.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="gmx.com"
+        id="gmx.com"
+        label="GMX">
+        <incoming
+            uri="imap+ssl+://imap.gmx.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://mail.gmx.com"
+            username="$email" />
     </provider>
-    <provider id="linuxmail.org" label="Mail.com" domain="linuxmail.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="zoho.com"
+        id="zoho.com"
+        label="Zoho Mail">
+        <incoming
+            uri="imap+ssl+://imap.zoho.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.zoho.com"
+            username="$email" />
     </provider>
-    <provider id="uymail.com" label="Mail.com" domain="uymail.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="gnu.org"
+        id="gnu"
+        label="GNU">
+        <incoming
+            uri="pop3+ssl+://fencepost.gnu.org"
+            username="$user" />
+        <outgoing
+            uri="smtp+tls+://fencepost.gnu.org"
+            username="$user" />
     </provider>
-    <provider id="contractor.net" label="Mail.com" domain="contractor.com">
-        <incoming uri="imap+ssl+://imap.mail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.com" username="$email" />
+    <provider
+        domain="riseup.net"
+        id="riseup"
+        label="Riseup Networks">
+        <incoming
+            uri="imap+ssl+://mail.riseup.net"
+            username="$user" />
+        <outgoing
+            uri="smtp+tls+://mail.riseup.net"
+            username="$user" />
     </provider>
 
-    <!-- Yahoo! Mail Variants -->
-    <provider id="yahoo" label="Yahoo" domain="yahoo.com">
-        <incoming uri="imap+ssl+://imap.mail.yahoo.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.yahoo.com" username="$email" />
-    </provider>
-    <provider id="yahoo.de" label="Yahoo" domain="yahoo.de">
-        <incoming uri="imap+ssl+://imap.mail.yahoo.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.yahoo.com" username="$email" />
-    </provider>
-    <provider id="ymail" label="YMail" domain="ymail.com">
-        <incoming uri="imap+ssl+://imap.mail.yahoo.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.yahoo.com" username="$email" />
-    </provider>
-    <provider id="rocketmail" label="Rocketmail" domain="rocketmail.com">
-        <incoming uri="imap+ssl+://imap.mail.yahoo.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.yahoo.com" username="$email" />
+    <!-- Mail.com Variants -->
+    <provider
+        domain="mail.com"
+        id="mail.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    
-    <!-- Apple -->
-    <provider id="apple" label="Apple" domain="apple.com">
-        <incoming uri="imap+ssl+://imap.mail.apple.com" username="$user" />
-        <outgoing uri="smtp+tls+://smtp.mail.apple.com" username="$user" />
+    <provider
+        domain="email.com"
+        id="email.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="dotmac" label=".Mac" domain="mac.com">
-        <incoming uri="imap+ssl+://imap.mail.mac.com" username="$user" />
-        <outgoing uri="smtp+tls+://smtp.mail.mac.com" username="$user" />
+    <provider
+        domain="techie.com"
+        id="techie.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="mobileme" label="MobileMe" domain="me.com">
-        <incoming uri="imap+ssl+://imap.mail.me.com" username="$user" />
-        <outgoing uri="smtp+tls+://smtp.mail.me.com" username="$user" />
+    <provider
+        domain="email.com"
+        id="email.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="icloud" label="iCloud" domain="icloud.com">
-        <incoming uri="imap+ssl+://imap.mail.icloud.com" username="$user" />
-        <outgoing uri="smtp+tls+://smtp.mail.icloud.com" username="$user" />
+    <provider
+        domain="usa.com"
+        id="usa.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-
-    <!-- Australia -->
-    <provider id="fastmail-fm" label="Fastmail" domain="fastmail.fm">
-        <incoming uri="imap+ssl+://mail.messagingengine.com" username="$email" />
-        <outgoing uri="smtp+ssl+://mail.messagingengine.com" username="$email" />
+    <provider
+        domain="myself.com"
+        id="myself.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-
-   <!-- UK -->
-    <provider id="aol-uk" label="AOL" domain="aol.co.uk">
-        <incoming uri="imap+ssl+://imap.uk.aol.com" label="IMAP" username="$user" />
-        <outgoing uri="smtp+ssl+://smtp.uk.aol.com" username="$user" />
+    <provider
+        domain="consultant.com"
+        id="consultant.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="yahoo-uk" label="Yahoo" domain="yahoo.co.uk">
-        <incoming uri="pop3+ssl+://pop.mail.yahoo.co.uk" username="$user" />
-        <outgoing uri="smtp+ssl+://smtp.mail.yahoo.co.uk" username="$user" />
+    <provider
+        domain="post.com"
+        id="post.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="live-uk" label="Windows Live Hotmail" domain="live.co.uk">
-        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
+    <provider
+        domain="europe.com"
+        id="europe.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="hotmail-uk" label="Hotmail" domain="hotmail.co.uk">
-        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
+    <provider
+        domain="asia.com"
+        id="asia.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <!-- Virgin Media variants -->
-    <provider id="virginmedia.com" label="Virgin Media" domain="virginmedia.com">
-        <incoming uri="imap+ssl+://imap.virginmedia.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.virginmedia.com" username="$email" />
+    <provider
+        domain="iname.com"
+        id="iname.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="virgin.net" label="Virgin Media" domain="virgin.net">
-        <incoming uri="imap+ssl+://imap.virginmedia.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.virginmedia.com" username="$email" />
+    <provider
+        domain="writeme.com"
+        id="writeme.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="blueyonder.co.uk" label="Virgin Media" domain="blueyonder.co.uk">
-        <incoming uri="imap+ssl+://imap.virginmedia.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.virginmedia.com" username="$email" />
+    <provider
+        domain="dr.com"
+        id="dr.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="ntlworld.com" label="Virgin Media" domain="ntlworld.com">
-        <incoming uri="imap+ssl+://imap.virginmedia.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.virginmedia.com" username="$email" />
+    <provider
+        domain="engineer.com"
+        id="engineer.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    
-    <!-- Germany -->
-    <provider id="mailbox.org" label="mailbox.org" domain="mailbox.org">
-        <incoming uri="imap+tls+://imap.mailbox.org" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.mailbox.org" username="$email" />
+    <provider
+        domain="cheerful.com"
+        id="cheerful.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="freenet" label="Freenet" domain="freenet.de">
-        <incoming uri="imap+tls+://mx.freenet.de" username="$email" />
-        <outgoing uri="smtp+tls+://mx.freenet.de" username="$email" />
+    <provider
+        domain="accountant.com"
+        id="accountant.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="T-Online" label="T-Online" domain="t-online.de">
-        <incoming uri="imap+ssl+://secureimap.t-online.de" username="$email" />
-        <outgoing uri="smtp+tls+://securesmtp.t-online.de" username="$email" />
+    <provider
+        domain="techie.com"
+        id="techie.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="web.de" label="Web.de" domain="web.de">
-        <incoming uri="imap+ssl+://imap.web.de" username="$user" />
-        <outgoing uri="smtp+tls+://smtp.web.de" username="$user" />
+    <provider
+        domain="linuxmail.com"
+        id="linuxmail.org"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="posteo" label="Posteo" domain="posteo.net">
-        <incoming uri="imap+tls+://posteo.de" username="$email" />
-        <outgoing uri="smtp+tls+://posteo.de" username="$email" />
-    </provider>    
-    <provider id="posteo" label="Posteo" domain="posteo.de">
-        <incoming uri="imap+tls+://posteo.de" username="$email" />
-        <outgoing uri="smtp+tls+://posteo.de" username="$email" />
+    <provider
+        domain="uymail.com"
+        id="uymail.com"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
-    <provider id="systemliorg" label="systemli.org" domain="systemli.org">
-        <incoming uri="imap+ssl+://mail.systemli.org" username="$email" />
-        <outgoing uri="smtp+tls+://mail.systemli.org" username="$email" />
+    <provider
+        domain="contractor.com"
+        id="contractor.net"
+        label="Mail.com">
+        <incoming
+            uri="imap+ssl+://imap.mail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.com"
+            username="$email" />
     </provider>
 
-    <!-- GMX variants -->
-    <provider id="gmx.net" label="GMX.net" domain="gmx.net">
-        <incoming uri="imap+ssl+://imap.gmx.net" username="$email" />
-        <outgoing uri="smtp+tls+://mail.gmx.net" username="$email" />
-    </provider>
-    <provider id="gmx.de" label="GMX.de" domain="gmx.de">
-        <incoming uri="imap+ssl+://imap.gmx.net" username="$email" />
-        <outgoing uri="smtp+tls+://mail.gmx.net" username="$email" />
+    <!-- Yahoo! Mail Variants -->
+    <provider
+        domain="yahoo.com"
+        id="yahoo"
+        label="Yahoo">
+        <incoming
+            uri="imap+ssl+://imap.mail.yahoo.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.yahoo.com"
+            username="$email" />
     </provider>
-    <provider id="gmx.at" label="GMX.at" domain="gmx.at">
-        <incoming uri="imap+ssl+://imap.gmx.net" username="$email" />
-        <outgoing uri="smtp+tls+://mail.gmx.net" username="$email" />
+    <provider
+        domain="yahoo.de"
+        id="yahoo.de"
+        label="Yahoo">
+        <incoming
+            uri="imap+ssl+://imap.mail.yahoo.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.yahoo.com"
+            username="$email" />
     </provider>
-    <provider id="gmx.ch" label="GMX.ch" domain="gmx.ch">
-        <incoming uri="imap+ssl+://imap.gmx.net" username="$email" />
-        <outgoing uri="smtp+tls+://mail.gmx.net" username="$email" />
+    <provider
+        domain="ymail.com"
+        id="ymail"
+        label="YMail">
+        <incoming
+            uri="imap+ssl+://imap.mail.yahoo.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.yahoo.com"
+            username="$email" />
     </provider>
-    <provider id="gmx.eu" label="GMX.eu" domain="gmx.eu">
-        <incoming uri="imap+ssl+://imap.gmx.net" username="$email" />
-        <outgoing uri="smtp+tls+://mail.gmx.net" username="$email" />
+    <provider
+        domain="rocketmail.com"
+        id="rocketmail"
+        label="Rocketmail">
+        <incoming
+            uri="imap+ssl+://imap.mail.yahoo.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.yahoo.com"
+            username="$email" />
     </provider>
 
-     <!-- Greece -->
-    <provider id="otenet.gr" label="otenet.gr" domain="otenet.gr">
-        <incoming uri="imap+ssl+://imap.otenet.gr" username="$email" />
-        <outgoing uri="smtp+tls+://mailgate.otenet.gr" username="$email" />
-    </provider>
-    <provider id="cosmotemail.gr" label="cosmotemail" domain="cosmotemail.gr">
-        <incoming uri="imap+ssl+://imap.cosmotemail.gr" username="$email" />
-        <outgoing uri="smtp+tls+://mailgate.cosmotemail.gr" username="$email" />
+    <!-- Apple -->
+    <provider
+        domain="apple.com"
+        id="apple"
+        label="Apple">
+        <incoming
+            uri="imap+ssl+://imap.mail.apple.com"
+            username="$user" />
+        <outgoing
+            uri="smtp+tls+://smtp.mail.apple.com"
+            username="$user" />
     </provider>
-    <provider id="mycosmos.gr" label="mycosmos" domain="mycosmos.gr">
-        <incoming uri="imap+ssl+://mail.mycosmos.gr" username="$email" />
-        <outgoing uri="smtp+tls+://mail.mycosmos.gr" username="$email" />
+    <provider
+        domain="mac.com"
+        id="dotmac"
+        label=".Mac">
+        <incoming
+            uri="imap+ssl+://imap.mail.mac.com"
+            username="$user" />
+        <outgoing
+            uri="smtp+tls+://smtp.mail.mac.com"
+            username="$user" />
     </provider>
-    <provider id="espiv" label="Espiv.net" domain="espiv.net">
-        <incoming uri="imap+ssl+://mail.espiv.net" username="$email" />
-        <outgoing uri="smtp+tls+://mail.espiv.net" username="$email" />
+    <provider
+        domain="me.com"
+        id="mobileme"
+        label="MobileMe">
+        <incoming
+            uri="imap+ssl+://imap.mail.me.com"
+            username="$user" />
+        <outgoing
+            uri="smtp+tls+://smtp.mail.me.com"
+            username="$user" />
     </provider>
-    <provider id="squat" label="Squat.gr" domain="squat.gr">
-        <incoming uri="imap+ssl+://mail.espiv.net" username="$email" />
-        <outgoing uri="smtp+tls+://mail.espiv.net" username="$email" />
+    <provider
+        domain="icloud.com"
+        id="icloud"
+        label="iCloud">
+        <incoming
+            uri="imap+ssl+://imap.mail.icloud.com"
+            username="$user" />
+        <outgoing
+            uri="smtp+tls+://smtp.mail.icloud.com"
+            username="$user" />
     </provider>
 
-   <!-- Italy -->
-   <provider id="poste" label="poste" domain="poste.it">
-        <incoming uri="imap+ssl+://relay.poste.it" username="$email" />
-        <outgoing uri="smtp+ssl+://relay.poste.it" username="$email" />
-   </provider> 
-   <provider id="vodafone" label="vodafone" domain="vodafone.it">
-        <incoming uri="imap+ssl+://imap.vodafone.it" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.vodafone.it" username="$email" />
-   </provider> 
-
-   <!-- Switzerland -->
-    <!-- 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="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="KolabNow.com" domain="barmail.ch">
-        <incoming uri="imap+ssl+://imap.kolabnow.com" username="$email" />
-        <outgoing uri="smtp+tls+://smtp.kolabnow.com" username="$email" />
+    <!-- Australia -->
+    <provider
+        domain="fastmail.fm"
+        id="fastmail-fm"
+        label="Fastmail">
+        <incoming
+            uri="imap+ssl+://mail.messagingengine.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://mail.messagingengine.com"
+            username="$email" />
     </provider>
-    <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" />
+
+    <!-- UK -->
+    <provider
+        domain="aol.co.uk"
+        id="aol-uk"
+        label="AOL">
+        <incoming
+            label="IMAP"
+            uri="imap+ssl+://imap.uk.aol.com"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://smtp.uk.aol.com"
+            username="$user" />
     </provider>
-    <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
+        domain="yahoo.co.uk"
+        id="yahoo-uk"
+        label="Yahoo">
+        <incoming
+            uri="pop3+ssl+://pop.mail.yahoo.co.uk"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.yahoo.co.uk"
+            username="$user" />
     </provider>
-    <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
+        domain="live.co.uk"
+        id="live-uk"
+        label="Windows Live Hotmail">
+        <incoming
+            uri="imap+ssl+://imap-mail.outlook.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp-mail.outlook.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="hotmail.co.uk"
+        id="hotmail-uk"
+        label="Hotmail">
+        <incoming
+            uri="imap+ssl+://imap-mail.outlook.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp-mail.outlook.com"
+            username="$email" />
+    </provider>
+    <!-- Virgin Media variants -->
+    <provider
+        domain="virginmedia.com"
+        id="virginmedia.com"
+        label="Virgin Media">
+        <incoming
+            uri="imap+ssl+://imap.virginmedia.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.virginmedia.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="virgin.net"
+        id="virgin.net"
+        label="Virgin Media">
+        <incoming
+            uri="imap+ssl+://imap.virginmedia.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.virginmedia.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="blueyonder.co.uk"
+        id="blueyonder.co.uk"
+        label="Virgin Media">
+        <incoming
+            uri="imap+ssl+://imap.virginmedia.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.virginmedia.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="ntlworld.com"
+        id="ntlworld.com"
+        label="Virgin Media">
+        <incoming
+            uri="imap+ssl+://imap.virginmedia.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.virginmedia.com"
+            username="$email" />
+    </provider>
+
+    <!-- Germany -->
+    <provider
+        domain="mailbox.org"
+        id="mailbox.org"
+        label="mailbox.org">
+        <incoming
+            uri="imap+tls+://imap.mailbox.org"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.mailbox.org"
+            username="$email" />
     </provider>
-    <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
+        domain="freenet.de"
+        id="freenet"
+        label="Freenet">
+        <incoming
+            uri="imap+tls+://mx.freenet.de"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mx.freenet.de"
+            username="$email" />
     </provider>
-    <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
+        domain="t-online.de"
+        id="T-Online"
+        label="T-Online">
+        <incoming
+            uri="imap+ssl+://secureimap.t-online.de"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://securesmtp.t-online.de"
+            username="$email" />
     </provider>
-    <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
+        domain="web.de"
+        id="web.de"
+        label="Web.de">
+        <incoming
+            uri="imap+ssl+://imap.web.de"
+            username="$user" />
+        <outgoing
+            uri="smtp+tls+://smtp.web.de"
+            username="$user" />
+    </provider>
+    <provider
+        domain="posteo.net"
+        id="posteo"
+        label="Posteo">
+        <incoming
+            uri="imap+tls+://posteo.de"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://posteo.de"
+            username="$email" />
+    </provider>
+    <provider
+        domain="posteo.de"
+        id="posteo"
+        label="Posteo">
+        <incoming
+            uri="imap+tls+://posteo.de"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://posteo.de"
+            username="$email" />
+    </provider>
+    <provider
+        domain="systemli.org"
+        id="systemliorg"
+        label="systemli.org">
+        <incoming
+            uri="imap+ssl+://mail.systemli.org"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mail.systemli.org"
+            username="$email" />
     </provider>
-    <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" />
+
+    <!-- GMX variants -->
+    <provider
+        domain="gmx.net"
+        id="gmx.net"
+        label="GMX.net">
+        <incoming
+            uri="imap+ssl+://imap.gmx.net"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mail.gmx.net"
+            username="$email" />
     </provider>
-    <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
+        domain="gmx.de"
+        id="gmx.de"
+        label="GMX.de">
+        <incoming
+            uri="imap+ssl+://imap.gmx.net"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mail.gmx.net"
+            username="$email" />
     </provider>
-    <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
+        domain="gmx.at"
+        id="gmx.at"
+        label="GMX.at">
+        <incoming
+            uri="imap+ssl+://imap.gmx.net"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mail.gmx.net"
+            username="$email" />
     </provider>
-    <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
+        domain="gmx.ch"
+        id="gmx.ch"
+        label="GMX.ch">
+        <incoming
+            uri="imap+ssl+://imap.gmx.net"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mail.gmx.net"
+            username="$email" />
     </provider>
-    <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
+        domain="gmx.eu"
+        id="gmx.eu"
+        label="GMX.eu">
+        <incoming
+            uri="imap+ssl+://imap.gmx.net"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mail.gmx.net"
+            username="$email" />
     </provider>
-    <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" />
+
+    <!-- Greece -->
+    <provider
+        domain="otenet.gr"
+        id="otenet.gr"
+        label="otenet.gr">
+        <incoming
+            uri="imap+ssl+://imap.otenet.gr"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mailgate.otenet.gr"
+            username="$email" />
     </provider>
-    <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
+        domain="cosmotemail.gr"
+        id="cosmotemail.gr"
+        label="cosmotemail">
+        <incoming
+            uri="imap+ssl+://imap.cosmotemail.gr"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mailgate.cosmotemail.gr"
+            username="$email" />
     </provider>
-    <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
+        domain="mycosmos.gr"
+        id="mycosmos.gr"
+        label="mycosmos">
+        <incoming
+            uri="imap+ssl+://mail.mycosmos.gr"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mail.mycosmos.gr"
+            username="$email" />
     </provider>
-    <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
+        domain="espiv.net"
+        id="espiv"
+        label="Espiv.net">
+        <incoming
+            uri="imap+ssl+://mail.espiv.net"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mail.espiv.net"
+            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
+        domain="squat.gr"
+        id="squat"
+        label="Squat.gr">
+        <incoming
+            uri="imap+ssl+://mail.espiv.net"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mail.espiv.net"
+            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" />
+
+    <!-- Italy -->
+    <provider
+        domain="poste.it"
+        id="poste"
+        label="poste">
+        <incoming
+            uri="imap+ssl+://relay.poste.it"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://relay.poste.it"
+            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
+        domain="vodafone.it"
+        id="vodafone"
+        label="vodafone">
+        <incoming
+            uri="imap+ssl+://imap.vodafone.it"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.vodafone.it"
+            username="$email" />
+    </provider>
+
+    <!-- Switzerland -->
+    <!-- KolabNow.com variants -->
+    <provider
+        domain="kolabnow.com"
+        id="kolabnow.com"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="attorneymail.ch"
+        id="attorneymail.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="barmail.ch"
+        id="barmail.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="collaborative.li"
+        id="collaborative.li"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="diplomail.ch"
+        id="diplomail.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="groupoffice.ch"
+        id="groupoffice.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="journalistmail.ch"
+        id="journalistmail.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="legalprivilege.ch"
+        id="legalprivilege.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="libertymail.co"
+        id="libertymail.co"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="libertymail.net"
+        id="libertymail.net"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="mailatlaw.ch"
+        id="mailatlaw.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="medmail.ch"
+        id="medmail.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="mykolab.ch"
+        id="mykolab.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="mykolab.com"
+        id="mykolab.com"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="myswissmail.ch"
+        id="myswissmail.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="opengroupware.ch"
+        id="opengroupware.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="pressmail.ch"
+        id="pressmail.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="swisscollab.ch"
+        id="swisscollab.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="swissgroupware.ch"
+        id="swissgroupware.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="switzerlandmail.ch"
+        id="switzerlandmail.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
+    </provider>
+    <provider
+        domain="trusted-legal-mail.ch"
+        id="trusted-legal-mail.ch"
+        label="KolabNow.com">
+        <incoming
+            uri="imap+ssl+://imap.kolabnow.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.kolabnow.com"
+            username="$email" />
     </provider>
 
     <!-- Poland -->
-    <provider id="interia" label="Interia" domain="interia.pl">
-        <incoming uri="pop3+ssl+://poczta.interia.pl" username="$user" />
-        <outgoing uri="smtp+ssl+://poczta.interia.pl" username="$user" />
+    <provider
+        domain="interia.pl"
+        id="interia"
+        label="Interia">
+        <incoming
+            uri="pop3+ssl+://poczta.interia.pl"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://poczta.interia.pl"
+            username="$user" />
     </provider>
-    <provider id="o2" label="O2" domain="o2.pl">
-        <incoming uri="pop3+ssl+://poczta.o2.pl" username="$user" />
-        <outgoing uri="smtp+ssl+://poczta.o2.pl" username="$user" />
+    <provider
+        domain="o2.pl"
+        id="o2"
+        label="O2">
+        <incoming
+            uri="pop3+ssl+://poczta.o2.pl"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://poczta.o2.pl"
+            username="$user" />
     </provider>
 
-   <!-- Japanese -->
-    <provider id="auone" label="au one" domain="auone.jp"
-              note="@string/provider_note_auonejp">
-        <incoming uri="imap+ssl+://imap.gmail.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.gmail.com" username="$email" />
+    <!-- Japanese -->
+    <provider
+        domain="auone.jp"
+        id="auone"
+        label="au one"
+        note="@string/provider_note_auonejp">
+        <incoming
+            uri="imap+ssl+://imap.gmail.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.gmail.com"
+            username="$email" />
     </provider>
 
-   <!-- Korean -->
-    <provider id="naver" label="Naver" domain="naver.com"
-			  note="@string/provider_note_naver">
-        <incoming uri="imap+ssl+://imap.naver.com"  username="$user" />
-        <outgoing uri="smtp+tls+://smtp.naver.com:587" username="$user" />
+    <!-- Korean -->
+    <provider
+        domain="naver.com"
+        id="naver"
+        label="Naver"
+        note="@string/provider_note_naver">
+        <incoming
+            uri="imap+ssl+://imap.naver.com"
+            username="$user" />
+        <outgoing
+            uri="smtp+tls+://smtp.naver.com:587"
+            username="$user" />
     </provider>
-    <provider id="hanmail" label="Hanmail" domain="hanmail.net"
-			  note="@string/provider_note_hanmail">
-        <incoming uri="imap+ssl+://imap.hanmail.net"  username="$user" />
-        <outgoing uri="smtp+ssl+://smtp.hanmail.net" username="$user" />
+    <provider
+        domain="hanmail.net"
+        id="hanmail"
+        label="Hanmail"
+        note="@string/provider_note_hanmail">
+        <incoming
+            uri="imap+ssl+://imap.hanmail.net"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://smtp.hanmail.net"
+            username="$user" />
     </provider>
-    <provider id="daum" label="Hanmail" domain="daum.net"
-			  note="@string/provider_note_hanmail">
-        <incoming uri="imap+ssl+://imap.hanmail.net"  username="$user" />
-        <outgoing uri="smtp+ssl+://smtp.hanmail.net" username="$user" />
+    <provider
+        domain="daum.net"
+        id="daum"
+        label="Hanmail"
+        note="@string/provider_note_hanmail">
+        <incoming
+            uri="imap+ssl+://imap.hanmail.net"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://smtp.hanmail.net"
+            username="$user" />
     </provider>
-    
-   <!-- Russia -->
+
+    <!-- Russia -->
     <!-- Mail.Ru variants -->
-    <provider id="rumailmailimap" label="mail.ru" domain="mail.ru">
-        <incoming uri="imap+ssl+://imap.mail.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.ru" username="$email" />
+    <provider
+        domain="mail.ru"
+        id="rumailmailimap"
+        label="mail.ru">
+        <incoming
+            uri="imap+ssl+://imap.mail.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.ru"
+            username="$email" />
     </provider>
-    <provider id="rumailinboximap" label="inbox.ru" domain="inbox.ru">
-        <incoming uri="imap+ssl+://imap.mail.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.ru" username="$email" />
+    <provider
+        domain="inbox.ru"
+        id="rumailinboximap"
+        label="inbox.ru">
+        <incoming
+            uri="imap+ssl+://imap.mail.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.ru"
+            username="$email" />
     </provider>
-    <provider id="rumaillistimap" label="list.ru" domain="list.ru">
-        <incoming uri="imap+ssl+://imap.mail.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.ru" username="$email" />
+    <provider
+        domain="list.ru"
+        id="rumaillistimap"
+        label="list.ru">
+        <incoming
+            uri="imap+ssl+://imap.mail.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.ru"
+            username="$email" />
     </provider>
-    <provider id="rumailbkimap" label="bk.ru" domain="bk.ru">
-        <incoming uri="imap+ssl+://imap.mail.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail.ru" username="$email" />
+    <provider
+        domain="bk.ru"
+        id="rumailbkimap"
+        label="bk.ru">
+        <incoming
+            uri="imap+ssl+://imap.mail.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail.ru"
+            username="$email" />
     </provider>
     <!-- Yandex.ru variants -->
-    <provider id="comyanyandeximap" label="yandex.com" domain="yandex.com">
-        <incoming uri="imap+ssl+://imap.yandex.com" username="$user" />
-        <outgoing uri="smtp+ssl+://smtp.yandex.com" username="$user" />
+    <provider
+        domain="yandex.com"
+        id="comyanyandeximap"
+        label="yandex.com">
+        <incoming
+            uri="imap+ssl+://imap.yandex.com"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://smtp.yandex.com"
+            username="$user" />
     </provider>
-    <provider id="ruyanyandeximap" label="yandex.ru" domain="yandex.ru">
-        <incoming uri="imap+ssl+://imap.yandex.ru" username="$user" />
-        <outgoing uri="smtp+ssl+://smtp.yandex.ru" username="$user" />
+    <provider
+        domain="yandex.ru"
+        id="ruyanyandeximap"
+        label="yandex.ru">
+        <incoming
+            uri="imap+ssl+://imap.yandex.ru"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://smtp.yandex.ru"
+            username="$user" />
     </provider>
-    <provider id="ruyanyaimap" label="ya.ru" domain="ya.ru">
-        <incoming uri="imap+ssl+://imap.ya.ru" username="$user" />
-        <outgoing uri="smtp+ssl+://smtp.ya.ru" username="$user" />
+    <provider
+        domain="ya.ru"
+        id="ruyanyaimap"
+        label="ya.ru">
+        <incoming
+            uri="imap+ssl+://imap.ya.ru"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://smtp.ya.ru"
+            username="$user" />
     </provider>
-    <provider id="ruyannarodimap" label="narod.ru" domain="narod.ru">
-        <incoming uri="imap+ssl+://imap.narod.ru" username="$user" />
-        <outgoing uri="smtp+ssl+://smtp.narod.ru" username="$user" />
+    <provider
+        domain="narod.ru"
+        id="ruyannarodimap"
+        label="narod.ru">
+        <incoming
+            uri="imap+ssl+://imap.narod.ru"
+            username="$user" />
+        <outgoing
+            uri="smtp+ssl+://smtp.narod.ru"
+            username="$user" />
     </provider>
     <!-- Rambler.ru variants -->
-    <provider id="ruramramblerimap" label="rambler.ru" domain="rambler.ru">
-        <incoming uri="imap+ssl+://mail.rambler.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://mail.rambler.ru" username="$email" />
+    <provider
+        domain="rambler.ru"
+        id="ruramramblerimap"
+        label="rambler.ru">
+        <incoming
+            uri="imap+ssl+://mail.rambler.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://mail.rambler.ru"
+            username="$email" />
     </provider>
-    <provider id="ruramlentaimap" label="lenta.ru" domain="lenta.ru">
-        <incoming uri="imap+ssl+://mail.rambler.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://mail.rambler.ru" username="$email" />
+    <provider
+        domain="lenta.ru"
+        id="ruramlentaimap"
+        label="lenta.ru">
+        <incoming
+            uri="imap+ssl+://mail.rambler.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://mail.rambler.ru"
+            username="$email" />
     </provider>
-    <provider id="ruramroimap" label="ro.ru" domain="ro.ru">
-        <incoming uri="imap+ssl+://mail.rambler.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://mail.rambler.ru" username="$email" />
+    <provider
+        domain="ro.ru"
+        id="ruramroimap"
+        label="ro.ru">
+        <incoming
+            uri="imap+ssl+://mail.rambler.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://mail.rambler.ru"
+            username="$email" />
     </provider>
     <!-- QIP.RU variants -->
-    <provider id="ruqipqipimap" label="qip.ru" domain="qip.ru">
-        <incoming uri="imap+ssl+://imap.qip.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.qip.ru" username="$email" />
+    <provider
+        domain="qip.ru"
+        id="ruqipqipimap"
+        label="qip.ru">
+        <incoming
+            uri="imap+ssl+://imap.qip.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.qip.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqippochtaimap" label="pochta.ru" domain="pochta.ru">
-        <incoming uri="imap+ssl+://imap.pochta.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.pochta.ru" username="$email" />
+    <provider
+        domain="pochta.ru"
+        id="ruqippochtaimap"
+        label="pochta.ru">
+        <incoming
+            uri="imap+ssl+://imap.pochta.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.pochta.ru"
+            username="$email" />
     </provider>
-    <provider id="comqipfromruimap" label="fromru.com" domain="fromru.com">
-        <incoming uri="imap+ssl+://imap.fromru.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.fromru.com" username="$email" />
+    <provider
+        domain="fromru.com"
+        id="comqipfromruimap"
+        label="fromru.com">
+        <incoming
+            uri="imap+ssl+://imap.fromru.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.fromru.com"
+            username="$email" />
     </provider>
-    <provider id="ruqipfrontimap" label="front.ru" domain="front.ru">
-        <incoming uri="imap+ssl+://imap.front.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.front.ru" username="$email" />
+    <provider
+        domain="front.ru"
+        id="ruqipfrontimap"
+        label="front.ru">
+        <incoming
+            uri="imap+ssl+://imap.front.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.front.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqiphotboximap" label="hotbox.ru" domain="hotbox.ru">
-        <incoming uri="imap+ssl+://imap.hotbox.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.hotbox.ru" username="$email" />
+    <provider
+        domain="hotbox.ru"
+        id="ruqiphotboximap"
+        label="hotbox.ru">
+        <incoming
+            uri="imap+ssl+://imap.hotbox.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.hotbox.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqiphotmailimap" label="hotmail.ru" domain="hotmail.ru">
-        <incoming uri="imap+ssl+://imap.hotmail.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.hotmail.ru" username="$email" />
+    <provider
+        domain="hotmail.ru"
+        id="ruqiphotmailimap"
+        label="hotmail.ru">
+        <incoming
+            uri="imap+ssl+://imap.hotmail.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.hotmail.ru"
+            username="$email" />
     </provider>
-    <provider id="suqipkrovatkaimap" label="krovatka.su" domain="krovatka.su">
-        <incoming uri="imap+ssl+://imap.krovatka.su" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.krovatka.su" username="$email" />
+    <provider
+        domain="krovatka.su"
+        id="suqipkrovatkaimap"
+        label="krovatka.su">
+        <incoming
+            uri="imap+ssl+://imap.krovatka.su"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.krovatka.su"
+            username="$email" />
     </provider>
-    <provider id="ruqiplandimap" label="land.ru" domain="land.ru">
-        <incoming uri="imap+ssl+://imap.land.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.land.ru" username="$email" />
+    <provider
+        domain="land.ru"
+        id="ruqiplandimap"
+        label="land.ru">
+        <incoming
+            uri="imap+ssl+://imap.land.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.land.ru"
+            username="$email" />
     </provider>
-    <provider id="comqipmail15imap" label="mail15.com" domain="mail15.com">
-        <incoming uri="imap+ssl+://imap.mail15.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail15.com" username="$email" />
+    <provider
+        domain="mail15.com"
+        id="comqipmail15imap"
+        label="mail15.com">
+        <incoming
+            uri="imap+ssl+://imap.mail15.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail15.com"
+            username="$email" />
     </provider>
-    <provider id="comqipmail333imap" label="mail333.com" domain="mail333.com">
-        <incoming uri="imap+ssl+://imap.mail333.com" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.mail333.com" username="$email" />
+    <provider
+        domain="mail333.com"
+        id="comqipmail333imap"
+        label="mail333.com">
+        <incoming
+            uri="imap+ssl+://imap.mail333.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.mail333.com"
+            username="$email" />
     </provider>
-    <provider id="ruqipnewmailimap" label="newmail.ru" domain="newmail.ru">
-        <incoming uri="imap+ssl+://imap.newmail.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.newmail.ru" username="$email" />
+    <provider
+        domain="newmail.ru"
+        id="ruqipnewmailimap"
+        label="newmail.ru">
+        <incoming
+            uri="imap+ssl+://imap.newmail.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.newmail.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqipnightmailimap" label="nightmail.ru" domain="nightmail.ru">
-        <incoming uri="imap+ssl+://imap.nightmail.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.nightmail.ru" username="$email" />
+    <provider
+        domain="nightmail.ru"
+        id="ruqipnightmailimap"
+        label="nightmail.ru">
+        <incoming
+            uri="imap+ssl+://imap.nightmail.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.nightmail.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqipnmimap" label="nm.ru" domain="nm.ru">
-        <incoming uri="imap+ssl+://imap.nm.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.nm.ru" username="$email" />
+    <provider
+        domain="nm.ru"
+        id="ruqipnmimap"
+        label="nm.ru">
+        <incoming
+            uri="imap+ssl+://imap.nm.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.nm.ru"
+            username="$email" />
     </provider>
-    <provider id="netqippisemimap" label="pisem.net" domain="pisem.net">
-        <incoming uri="imap+ssl+://imap.pisem.net" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.pisem.net" username="$email" />
+    <provider
+        domain="pisem.net"
+        id="netqippisemimap"
+        label="pisem.net">
+        <incoming
+            uri="imap+ssl+://imap.pisem.net"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.pisem.net"
+            username="$email" />
     </provider>
-    <provider id="ruqippochtamtimap" label="pochtamt.ru" domain="pochtamt.ru">
-        <incoming uri="imap+ssl+://imap.pochtamt.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.pochtamt.ru" username="$email" />
+    <provider
+        domain="pochtamt.ru"
+        id="ruqippochtamtimap"
+        label="pochtamt.ru">
+        <incoming
+            uri="imap+ssl+://imap.pochtamt.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.pochtamt.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqippop3imap" label="pop3.ru" domain="pop3.ru">
-        <incoming uri="imap+ssl+://imap.pop3.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.pop3.ru" username="$email" />
+    <provider
+        domain="pop3.ru"
+        id="ruqippop3imap"
+        label="pop3.ru">
+        <incoming
+            uri="imap+ssl+://imap.pop3.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.pop3.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqiprbcmailimap" label="rbcmail.ru" domain="rbcmail.ru">
-        <incoming uri="imap+ssl+://imap.rbcmail.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.rbcmail.ru" username="$email" />
+    <provider
+        domain="rbcmail.ru"
+        id="ruqiprbcmailimap"
+        label="rbcmail.ru">
+        <incoming
+            uri="imap+ssl+://imap.rbcmail.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.rbcmail.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqipsmtpimap" label="smtp.ru" domain="smtp.ru">
-        <incoming uri="imap+ssl+://imap.smtp.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.smtp.ru" username="$email" />
+    <provider
+        domain="smtp.ru"
+        id="ruqipsmtpimap"
+        label="smtp.ru">
+        <incoming
+            uri="imap+ssl+://imap.smtp.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.smtp.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqip5ballovimap" label="5ballov.ru" domain="5ballov.ru">
-        <incoming uri="imap+ssl+://imap.5ballov.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.5ballov.ru" username="$email" />
+    <provider
+        domain="5ballov.ru"
+        id="ruqip5ballovimap"
+        label="5ballov.ru">
+        <incoming
+            uri="imap+ssl+://imap.5ballov.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.5ballov.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqipaeternaimap" label="aeterna.ru" domain="aeterna.ru">
-        <incoming uri="imap+ssl+://imap.aeterna.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.aeterna.ru" username="$email" />
+    <provider
+        domain="aeterna.ru"
+        id="ruqipaeternaimap"
+        label="aeterna.ru">
+        <incoming
+            uri="imap+ssl+://imap.aeterna.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.aeterna.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqipzizaimap" label="ziza.ru" domain="ziza.ru">
-        <incoming uri="imap+ssl+://imap.ziza.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.ziza.ru" username="$email" />
+    <provider
+        domain="ziza.ru"
+        id="ruqipzizaimap"
+        label="ziza.ru">
+        <incoming
+            uri="imap+ssl+://imap.ziza.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.ziza.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqipmemoriimap" label="memori.ru" domain="memori.ru">
-        <incoming uri="imap+ssl+://imap.memori.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.memori.ru" username="$email" />
+    <provider
+        domain="memori.ru"
+        id="ruqipmemoriimap"
+        label="memori.ru">
+        <incoming
+            uri="imap+ssl+://imap.memori.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.memori.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqipphotofileimap" label="photofile.ru" domain="photofile.ru">
-        <incoming uri="imap+ssl+://imap.photofile.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.photofile.ru" username="$email" />
+    <provider
+        domain="photofile.ru"
+        id="ruqipphotofileimap"
+        label="photofile.ru">
+        <incoming
+            uri="imap+ssl+://imap.photofile.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.photofile.ru"
+            username="$email" />
     </provider>
-    <provider id="ruqipfotoplenkaimap" label="fotoplenka.ru" domain="fotoplenka.ru">
-        <incoming uri="imap+ssl+://imap.fotoplenka.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.fotoplenka.ru" username="$email" />
+    <provider
+        domain="fotoplenka.ru"
+        id="ruqipfotoplenkaimap"
+        label="fotoplenka.ru">
+        <incoming
+            uri="imap+ssl+://imap.fotoplenka.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.fotoplenka.ru"
+            username="$email" />
     </provider>
-    <provider id="comqippochtaimap" label="pochta.com" domain="pochta.com">
-        <incoming uri="imap+ssl+://imap.pochta.ru" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.pochta.ru" username="$email" />
+    <provider
+        domain="pochta.com"
+        id="comqippochtaimap"
+        label="pochta.com">
+        <incoming
+            uri="imap+ssl+://imap.pochta.ru"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.pochta.ru"
+            username="$email" />
     </provider>
 
     <!-- Slovakia -->
-    <provider id="azet.sk" label="Azet.sk" domain="azet.sk">
-        <incoming uri="imap+ssl+://imap.azet.sk" username="$email" />
-        <outgoing uri="smtp+ssl+://smtp.azet.sk" username="$email" />
+    <provider
+        domain="azet.sk"
+        id="azet.sk"
+        label="Azet.sk">
+        <incoming
+            uri="imap+ssl+://imap.azet.sk"
+            username="$email" />
+        <outgoing
+            uri="smtp+ssl+://smtp.azet.sk"
+            username="$email" />
     </provider>
-    <provider id="outlook.sk" label="Outlook.sk" domain="outlook.sk">
-        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
+    <provider
+        domain="outlook.sk"
+        id="outlook.sk"
+        label="Outlook.sk">
+        <incoming
+            uri="imap+ssl+://imap-mail.outlook.com"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp-mail.outlook.com"
+            username="$email" />
     </provider>
-    
+
     <!-- The Netherlands -->
     <!-- Ziggo variants -->
-    <provider id="casema.nl" label="Ziggo" domain="casema.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="casema.nl"
+        id="casema.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="chello.nl" label="Ziggo" domain="chello.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="chello.nl"
+        id="chello.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="hahah.nl" label="Ziggo" domain="hahah.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="hahah.nl"
+        id="hahah.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="home.nl" label="Ziggo" domain="home.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="home.nl"
+        id="home.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="multiweb.nl" label="Ziggo" domain="multiweb.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="multiweb.nl"
+        id="multiweb.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="quicknet.nl" label="Ziggo" domain="quicknet.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="quicknet.nl"
+        id="quicknet.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="razcall.com" label="Ziggo" domain="razcall.com">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="razcall.com"
+        id="razcall.com"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="razcall.nl" label="Ziggo" domain="razcall.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="razcall.nl"
+        id="razcall.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="upcmail.nl" label="Ziggo" domain="upcmail.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="upcmail.nl"
+        id="upcmail.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="zeggis.com" label="Ziggo" domain="zeggis.com">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="zeggis.com"
+        id="zeggis.com"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="zeggis.nl" label="Ziggo" domain="zeggis.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="zeggis.nl"
+        id="zeggis.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="ziggomail.com" label="Ziggo" domain="ziggomail.com">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="ziggomail.com"
+        id="ziggomail.com"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="ziggo.nl" label="Ziggo" domain="ziggo.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="ziggo.nl"
+        id="ziggo.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
-    <provider id="zinders.nl" label="Ziggo" domain="zinders.nl">
-        <incoming uri="imap+ssl+://imap.ziggo.nl"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.ziggo.nl" username="$email" />
+    <provider
+        domain="zinders.nl"
+        id="zinders.nl"
+        label="Ziggo">
+        <incoming
+            uri="imap+ssl+://imap.ziggo.nl"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://smtp.ziggo.nl"
+            username="$email" />
     </provider>
 
     <!-- EU wide -->
-    <provider id="fairnatics.net" label="Fairnatics" domain="fairnatics.net">
-        <incoming uri="imap+ssl+://mail.fairnatics.net" username="$email" />
-        <outgoing uri="smtp+tls+://mail.fairnatics.net:25" username="$email" />
+    <provider
+        domain="fairnatics.net"
+        id="fairnatics.net"
+        label="Fairnatics">
+        <incoming
+            uri="imap+ssl+://mail.fairnatics.net"
+            username="$email" />
+        <outgoing
+            uri="smtp+tls+://mail.fairnatics.net:25"
+            username="$email" />
     </provider>
-    
+
     <!-- Developers' vanity providers -->
-    <provider id="fsck.com" label="Jesse's personal mail" domain="fsck.com" >
-        <incoming uri="imap+ssl+://fsck.com"  username="$user" />
+    <provider
+        domain="fsck.com"
+        id="fsck.com"
+        label="Jesse's personal mail">
+        <incoming
+            uri="imap+ssl+://fsck.com"
+            username="$user" />
         <outgoing uri="smtp+tls+://mail.bestpractical.com:2525" />
     </provider>
-    <provider id="bestpractical.com" label="Best Practical Solutions" domain="bestpractical.com" >
-        <incoming uri="imap+ssl+://imap.bestpractical.com"  username="$user" />
+    <provider
+        domain="bestpractical.com"
+        id="bestpractical.com"
+        label="Best Practical Solutions">
+        <incoming
+            uri="imap+ssl+://imap.bestpractical.com"
+            username="$user" />
         <outgoing uri="smtp+tls+://smtp.bestpractical.com:2525" />
     </provider>
 </providers>