diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java
index eaf511a71..3132904b3 100644
--- a/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java
@@ -49,152 +49,12 @@ import static com.fsck.k9.mail.helper.UrlEncodingHelper.encodeUtf8;
  */
 public class WebDavStore extends RemoteStore {
 
-    /**
-     * Decodes a WebDavStore URI.
-     * <p/>
-     * <p>Possible forms:</p>
-     * <pre>
-     * webdav://user:password@server:port ConnectionSecurity.NONE
-     * webdav+ssl+://user:password@server:port ConnectionSecurity.SSL_TLS_REQUIRED
-     * </pre>
-     */
     public static WebDavStoreSettings decodeUri(String uri) {
-        String host;
-        int port;
-        ConnectionSecurity connectionSecurity;
-        String username = null;
-        String password = null;
-        String alias = null;
-        String path = null;
-        String authPath = null;
-        String mailboxPath = null;
-
-
-        URI webDavUri;
-        try {
-            webDavUri = new URI(uri);
-        } catch (URISyntaxException use) {
-            throw new IllegalArgumentException("Invalid WebDavStore URI", use);
-        }
-
-        String scheme = webDavUri.getScheme();
-        /*
-         * Currently available schemes are:
-         * webdav
-         * webdav+ssl+
-         *
-         * The following are obsolete schemes that may be found in pre-existing
-         * settings from earlier versions or that may be found when imported. We
-         * continue to recognize them and re-map them appropriately:
-         * webdav+tls
-         * webdav+tls+
-         * webdav+ssl
-         */
-        if (scheme.equals("webdav")) {
-            connectionSecurity = ConnectionSecurity.NONE;
-        } else if (scheme.startsWith("webdav+")) {
-            connectionSecurity = ConnectionSecurity.SSL_TLS_REQUIRED;
-        } else {
-            throw new IllegalArgumentException("Unsupported protocol (" + scheme + ")");
-        }
-
-        host = webDavUri.getHost();
-        if (host.startsWith("http")) {
-            String[] hostParts = host.split("://", 2);
-            if (hostParts.length > 1) {
-                host = hostParts[1];
-            }
-        }
-
-        port = webDavUri.getPort();
-
-        String userInfo = webDavUri.getUserInfo();
-        if (userInfo != null) {
-            String[] userInfoParts = userInfo.split(":");
-            username = decodeUtf8(userInfoParts[0]);
-            String userParts[] = username.split("\\\\", 2);
-
-            if (userParts.length > 1) {
-                alias = userParts[1];
-            } else {
-                alias = username;
-            }
-            if (userInfoParts.length > 1) {
-                password = decodeUtf8(userInfoParts[1]);
-            }
-        }
-
-        String[] pathParts = webDavUri.getPath().split("\\|");
-        for (int i = 0, count = pathParts.length; i < count; i++) {
-            if (i == 0) {
-                if (pathParts[0] != null &&
-                        pathParts[0].length() > 1) {
-                    path = pathParts[0];
-                }
-            } else if (i == 1) {
-                if (pathParts[1] != null &&
-                        pathParts[1].length() > 1) {
-                    authPath = pathParts[1];
-                }
-            } else if (i == 2) {
-                if (pathParts[2] != null &&
-                        pathParts[2].length() > 1) {
-                    mailboxPath = pathParts[2];
-                }
-            }
-        }
-
-        return new WebDavStoreSettings(host, port, connectionSecurity, null, username, password,
-                null, alias, path, authPath, mailboxPath);
+        return WebDavStoreUriDecoder.decode(uri);
     }
 
-
-    /**
-     * Creates a WebDavStore URI with the supplied settings.
-     *
-     * @param server The {@link ServerSettings} object that holds the server settings.
-     * @return A WebDavStore URI that holds the same information as the {@code server} parameter.
-     * @see StoreConfig#getStoreUri()
-     * @see WebDavStore#decodeUri(String)
-     */
     public static String createUri(ServerSettings server) {
-        String userEnc = encodeUtf8(server.username);
-        String passwordEnc = (server.password != null) ?
-                encodeUtf8(server.password) : "";
-
-        String scheme;
-        switch (server.connectionSecurity) {
-            case SSL_TLS_REQUIRED:
-                scheme = "webdav+ssl+";
-                break;
-            default:
-            case NONE:
-                scheme = "webdav";
-                break;
-        }
-
-        String userInfo = userEnc + ":" + passwordEnc;
-
-        String uriPath;
-        Map<String, String> extra = server.getExtra();
-        if (extra != null) {
-            String path = extra.get(WebDavStoreSettings.PATH_KEY);
-            path = (path != null) ? path : "";
-            String authPath = extra.get(WebDavStoreSettings.AUTH_PATH_KEY);
-            authPath = (authPath != null) ? authPath : "";
-            String mailboxPath = extra.get(WebDavStoreSettings.MAILBOX_PATH_KEY);
-            mailboxPath = (mailboxPath != null) ? mailboxPath : "";
-            uriPath = "/" + path + "|" + authPath + "|" + mailboxPath;
-        } else {
-            uriPath = "/||";
-        }
-
-        try {
-            return new URI(scheme, userInfo, server.host, server.port, uriPath,
-                    null, null).toString();
-        } catch (URISyntaxException e) {
-            throw new IllegalArgumentException("Can't create WebDavStore URI", e);
-        }
+        return WebDavStoreUriCreator.create(server);
     }
 
     private ConnectionSecurity mConnectionSecurity;
diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStoreUriCreator.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStoreUriCreator.java
new file mode 100644
index 000000000..ef62f808e
--- /dev/null
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStoreUriCreator.java
@@ -0,0 +1,61 @@
+package com.fsck.k9.mail.store.webdav;
+
+import com.fsck.k9.mail.ServerSettings;
+import com.fsck.k9.mail.store.StoreConfig;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import static com.fsck.k9.mail.helper.UrlEncodingHelper.encodeUtf8;
+
+public class WebDavStoreUriCreator {
+
+    /**
+     * Creates a WebDavStore URI with the supplied settings.
+     *
+     * @param server The {@link ServerSettings} object that holds the server settings.
+     * @return A WebDavStore URI that holds the same information as the {@code server} parameter.
+     * @see StoreConfig#getStoreUri()
+     * @see WebDavStore#decodeUri(String)
+     */
+    public static String create(ServerSettings server) {
+        String userEnc = encodeUtf8(server.username);
+        String passwordEnc = (server.password != null) ?
+                encodeUtf8(server.password) : "";
+
+        String scheme;
+        switch (server.connectionSecurity) {
+            case SSL_TLS_REQUIRED:
+                scheme = "webdav+ssl+";
+                break;
+            default:
+            case NONE:
+                scheme = "webdav";
+                break;
+        }
+
+        String userInfo = userEnc + ":" + passwordEnc;
+
+        String uriPath;
+        Map<String, String> extra = server.getExtra();
+        if (extra != null) {
+            String path = extra.get(WebDavStoreSettings.PATH_KEY);
+            path = (path != null) ? path : "";
+            String authPath = extra.get(WebDavStoreSettings.AUTH_PATH_KEY);
+            authPath = (authPath != null) ? authPath : "";
+            String mailboxPath = extra.get(WebDavStoreSettings.MAILBOX_PATH_KEY);
+            mailboxPath = (mailboxPath != null) ? mailboxPath : "";
+            uriPath = "/" + path + "|" + authPath + "|" + mailboxPath;
+        } else {
+            uriPath = "/||";
+        }
+
+        try {
+            return new URI(scheme, userInfo, server.host, server.port, uriPath,
+                    null, null).toString();
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Can't create WebDavStore URI", e);
+        }
+    }
+}
diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStoreUriDecoder.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStoreUriDecoder.java
new file mode 100644
index 000000000..698ffbef9
--- /dev/null
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStoreUriDecoder.java
@@ -0,0 +1,111 @@
+package com.fsck.k9.mail.store.webdav;
+
+
+import com.fsck.k9.mail.ConnectionSecurity;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import static com.fsck.k9.mail.helper.UrlEncodingHelper.decodeUtf8;
+
+public class WebDavStoreUriDecoder {
+
+    /**
+     * Decodes a WebDavStore URI.
+     * <p/>
+     * <p>Possible forms:</p>
+     * <pre>
+     * webdav://user:password@server:port ConnectionSecurity.NONE
+     * webdav+ssl+://user:password@server:port ConnectionSecurity.SSL_TLS_REQUIRED
+     * </pre>
+     */
+    public static WebDavStoreSettings decode(String uri) {
+        String host;
+        int port;
+        ConnectionSecurity connectionSecurity;
+        String username = null;
+        String password = null;
+        String alias = null;
+        String path = null;
+        String authPath = null;
+        String mailboxPath = null;
+
+
+        URI webDavUri;
+        try {
+            webDavUri = new URI(uri);
+        } catch (URISyntaxException use) {
+            throw new IllegalArgumentException("Invalid WebDavStore URI", use);
+        }
+
+        String scheme = webDavUri.getScheme();
+        /*
+         * Currently available schemes are:
+         * webdav
+         * webdav+ssl+
+         *
+         * The following are obsolete schemes that may be found in pre-existing
+         * settings from earlier versions or that may be found when imported. We
+         * continue to recognize them and re-map them appropriately:
+         * webdav+tls
+         * webdav+tls+
+         * webdav+ssl
+         */
+        if (scheme.equals("webdav")) {
+            connectionSecurity = ConnectionSecurity.NONE;
+        } else if (scheme.startsWith("webdav+")) {
+            connectionSecurity = ConnectionSecurity.SSL_TLS_REQUIRED;
+        } else {
+            throw new IllegalArgumentException("Unsupported protocol (" + scheme + ")");
+        }
+
+        host = webDavUri.getHost();
+        if (host.startsWith("http")) {
+            String[] hostParts = host.split("://", 2);
+            if (hostParts.length > 1) {
+                host = hostParts[1];
+            }
+        }
+
+        port = webDavUri.getPort();
+
+        String userInfo = webDavUri.getUserInfo();
+        if (userInfo != null) {
+            String[] userInfoParts = userInfo.split(":");
+            username = decodeUtf8(userInfoParts[0]);
+            String userParts[] = username.split("\\\\", 2);
+
+            if (userParts.length > 1) {
+                alias = userParts[1];
+            } else {
+                alias = username;
+            }
+            if (userInfoParts.length > 1) {
+                password = decodeUtf8(userInfoParts[1]);
+            }
+        }
+
+        String[] pathParts = webDavUri.getPath().split("\\|");
+        for (int i = 0, count = pathParts.length; i < count; i++) {
+            if (i == 0) {
+                if (pathParts[0] != null &&
+                        pathParts[0].length() > 1) {
+                    path = pathParts[0];
+                }
+            } else if (i == 1) {
+                if (pathParts[1] != null &&
+                        pathParts[1].length() > 1) {
+                    authPath = pathParts[1];
+                }
+            } else if (i == 2) {
+                if (pathParts[2] != null &&
+                        pathParts[2].length() > 1) {
+                    mailboxPath = pathParts[2];
+                }
+            }
+        }
+
+        return new WebDavStoreSettings(host, port, connectionSecurity, null, username, password,
+                null, alias, path, authPath, mailboxPath);
+    }
+}