diff --git a/app/src/androidTest/java/com/orgzly/android/repos/DocumentRepoTest.kt b/app/src/androidTest/java/com/orgzly/android/repos/DocumentRepoTest.kt
index 6ee38a981..c451503fb 100644
--- a/app/src/androidTest/java/com/orgzly/android/repos/DocumentRepoTest.kt
+++ b/app/src/androidTest/java/com/orgzly/android/repos/DocumentRepoTest.kt
@@ -51,8 +51,13 @@ class DocumentRepoTest : SyncRepoTest, OrgzlyTest() {
     }
 
     @Test
-    override fun testGetBooks_singleFileInSubfolder() {
-        SyncRepoTest.testGetBooks_singleFileInSubfolder(repoDirectory, syncRepo)
+    override fun testGetBooks_singleFileInSubfolderWhenEnabled() {
+        SyncRepoTest.testGetBooks_singleFileInSubfolderWhenEnabled(repoDirectory, syncRepo)
+    }
+
+    @Test
+    override fun testGetBooks_singleFileInSubfolderWhenDisabled() {
+        SyncRepoTest.testGetBooks_singleFileInSubfolderWhenDisabled(repoDirectory, syncRepo)
     }
 
     @Test
@@ -81,8 +86,13 @@ class DocumentRepoTest : SyncRepoTest, OrgzlyTest() {
     }
 
     @Test
-    override fun testStoreBook_producesSameUriAsRetrieveBook() {
-        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBook(syncRepo)
+    override fun testStoreBook_producesSameUriAsRetrieveBookWithSubfolder() {
+        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBookWithSubfolder(syncRepo)
+    }
+
+    @Test
+    override fun testStoreBook_producesSameUriAsRetrieveBookWithoutSubfolder() {
+        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBookWithoutSubfolder(syncRepo)
     }
 
     @Test
@@ -95,6 +105,11 @@ class DocumentRepoTest : SyncRepoTest, OrgzlyTest() {
         SyncRepoTest.testStoreBook_inSubfolder(repoDirectory, syncRepo)
     }
 
+    @Test(expected = IOException::class)
+    override fun testStoreBook_inSubfolderWhenDisabled() {
+        SyncRepoTest.testStoreBook_inSubfolderWhenDisabled(syncRepo)
+    }
+
     @Test
     override fun testRenameBook_expectedUri() {
         SyncRepoTest.testRenameBook_expectedUri(syncRepo)
@@ -106,8 +121,13 @@ class DocumentRepoTest : SyncRepoTest, OrgzlyTest() {
     }
 
     @Test
-    override fun testRenameBook_fromRootToSubfolder() {
-        SyncRepoTest.testRenameBook_fromRootToSubfolder(syncRepo)
+    override fun testRenameBook_fromRootToSubfolderWhenEnabled() {
+        SyncRepoTest.testRenameBook_fromRootToSubfolderWhenEnabled(syncRepo)
+    }
+
+    @Test(expected = IOException::class)
+    override fun testRenameBook_fromRootToSubfolderWhenDisabled() {
+        SyncRepoTest.testRenameBook_fromRootToSubfolderWhenDisabled(syncRepo)
     }
 
     @Test
diff --git a/app/src/main/java/com/orgzly/android/prefs/AppPreferences.java b/app/src/main/java/com/orgzly/android/prefs/AppPreferences.java
index 99015bc6b..4ffcb792c 100644
--- a/app/src/main/java/com/orgzly/android/prefs/AppPreferences.java
+++ b/app/src/main/java/com/orgzly/android/prefs/AppPreferences.java
@@ -1106,6 +1106,20 @@ public static void refileLastLocation(Context context, String value) {
         getStateSharedPreferences(context).edit().putString(key, value).apply();
     }
 
+    /*
+     * Subfolder support
+     */
+    public static boolean subfolderSupport(Context context) {
+        return getDefaultSharedPreferences(context).getBoolean(
+                context.getResources().getString(R.string.pref_key_enable_repo_subfolders),
+                context.getResources().getBoolean(R.bool.pref_default_enable_repo_subfolders));
+    }
+
+    public static void subfolderSupport(Context context, boolean value) {
+        String key = context.getResources().getString(R.string.pref_key_enable_repo_subfolders);
+        getDefaultSharedPreferences(context).edit().putBoolean(key, value).apply();
+    }
+
     /*
      * Repository properties map
      */
diff --git a/app/src/main/java/com/orgzly/android/repos/DocumentRepo.java b/app/src/main/java/com/orgzly/android/repos/DocumentRepo.java
index 03dc61eca..d2b0068bc 100644
--- a/app/src/main/java/com/orgzly/android/repos/DocumentRepo.java
+++ b/app/src/main/java/com/orgzly/android/repos/DocumentRepo.java
@@ -12,6 +12,7 @@
 import com.orgzly.R;
 import com.orgzly.android.BookName;
 import com.orgzly.android.db.entity.Repo;
+import com.orgzly.android.prefs.AppPreferences;
 import com.orgzly.android.util.LogUtils;
 import com.orgzly.android.util.MiscUtils;
 
@@ -117,6 +118,8 @@ private List<DocumentFile> walkFileTree() {
             for (DocumentFile node : currentDir.listFiles()) {
                 String repoRelativePath = BookName.getRepoRelativePath(repoUri, node.getUri());
                 if (node.isDirectory()) {
+                    if (!AppPreferences.subfolderSupport(context))
+                        continue;
                     if (Build.VERSION.SDK_INT >= 26) {
                         if (ignores.isPathIgnored(repoRelativePath, true)) {
                             continue;
@@ -176,10 +179,14 @@ public VersionedRook storeBook(File file, String repoRelativePath) throws IOExce
         }
         DocumentFile destinationFile = getDocumentFileFromPath(repoRelativePath);
         if (repoRelativePath.contains("/")) {
-            DocumentFile destinationDir = ensureDirectoryHierarchy(repoRelativePath);
-            String fileName = Uri.parse(repoRelativePath).getLastPathSegment();
-            if (destinationDir.findFile(fileName) == null) {
-                destinationFile = destinationDir.createFile("text/*", fileName);
+            if (AppPreferences.subfolderSupport(context)) {
+                DocumentFile destinationDir = ensureDirectoryHierarchy(repoRelativePath);
+                String fileName = Uri.parse(repoRelativePath).getLastPathSegment();
+                if (destinationDir.findFile(fileName) == null) {
+                    destinationFile = destinationDir.createFile("text/*", fileName);
+                }
+            } else {
+                throw new IOException(context.getString(R.string.subfolder_support_disabled));
             }
         } else {
             if (!destinationFile.exists()) {
@@ -246,7 +253,11 @@ public VersionedRook renameBook(Uri oldFullUri, String newName) throws IOExcepti
         Uri newUri = oldFullUri;
 
         if (newName.contains("/")) {
-            newDir = ensureDirectoryHierarchy(newName);
+            if (AppPreferences.subfolderSupport(context)) {
+                newDir = ensureDirectoryHierarchy(newName);
+            } else {
+                throw new IOException(context.getString(R.string.subfolder_support_disabled));
+            }
         } else {
             newDir = repoDocumentFile;
         }
diff --git a/app/src/main/java/com/orgzly/android/repos/DropboxClient.java b/app/src/main/java/com/orgzly/android/repos/DropboxClient.java
index fceec62ee..5d76ba55f 100644
--- a/app/src/main/java/com/orgzly/android/repos/DropboxClient.java
+++ b/app/src/main/java/com/orgzly/android/repos/DropboxClient.java
@@ -180,7 +180,7 @@ public List<VersionedRook> getBooks(Uri repoUri, RepoIgnoreNode ignores) throws
                                     list.add(book);
                                 }
                             }
-                            if (metadata instanceof FolderMetadata) {
+                            if (metadata instanceof FolderMetadata && AppPreferences.subfolderSupport(mContext)) {
                                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                                     if (ignores.isPathIgnored(pathRelativeToRepoRoot, true)) {
                                         continue;
@@ -385,6 +385,8 @@ public void deleteFolder(String path) throws IOException {
             } else {
                 throw new IOException("Not a directory: " + path);
             }
+        } catch (GetMetadataErrorException e) {
+            // Do nothing; the folder does not exist.
         } catch (DbxException e) {
             e.printStackTrace();
             if (e.getMessage() != null) {
diff --git a/app/src/main/java/com/orgzly/android/repos/DropboxRepo.java b/app/src/main/java/com/orgzly/android/repos/DropboxRepo.java
index 21cfdf65c..85b26acc4 100644
--- a/app/src/main/java/com/orgzly/android/repos/DropboxRepo.java
+++ b/app/src/main/java/com/orgzly/android/repos/DropboxRepo.java
@@ -5,7 +5,10 @@
 
 import androidx.annotation.NonNull;
 
+import com.orgzly.R;
+import com.orgzly.android.App;
 import com.orgzly.android.BookName;
+import com.orgzly.android.prefs.AppPreferences;
 
 import java.io.File;
 import java.io.IOException;
@@ -56,11 +59,17 @@ public InputStream openRepoFileInputStream(String repoRelativePath) throws IOExc
 
     @Override
     public VersionedRook storeBook(File file, String repoRelativePath) throws IOException {
+        Context context = App.getAppContext();
+        if (repoRelativePath.contains("/") && !AppPreferences.subfolderSupport(context))
+            throw new IOException(context.getString(R.string.subfolder_support_disabled));
         return client.upload(file, repoUri, repoRelativePath);
     }
 
     @Override
     public VersionedRook renameBook(Uri oldFullUri, String newName) throws IOException {
+        Context context = App.getAppContext();
+        if (newName.contains("/") && !AppPreferences.subfolderSupport(context))
+            throw new IOException(context.getString(R.string.subfolder_support_disabled));
         BookName oldBookName = BookName.fromRepoRelativePath(BookName.getRepoRelativePath(repoUri, oldFullUri));
         String newRelativePath = BookName.repoRelativePath(newName, oldBookName.getFormat());
         String newEncodedRelativePath = Uri.encode(newRelativePath, "/");
diff --git a/app/src/main/java/com/orgzly/android/repos/GitRepo.java b/app/src/main/java/com/orgzly/android/repos/GitRepo.java
index 2cf1941e1..056633a12 100644
--- a/app/src/main/java/com/orgzly/android/repos/GitRepo.java
+++ b/app/src/main/java/com/orgzly/android/repos/GitRepo.java
@@ -7,6 +7,8 @@
 import android.util.Log;
 
 import com.orgzly.BuildConfig;
+import com.orgzly.R;
+import com.orgzly.android.App;
 import com.orgzly.android.BookFormat;
 import com.orgzly.android.BookName;
 import com.orgzly.android.db.entity.Repo;
@@ -14,6 +16,7 @@
 import com.orgzly.android.git.GitPreferences;
 import com.orgzly.android.git.GitPreferencesFromRepoPrefs;
 import com.orgzly.android.git.GitTransportSetter;
+import com.orgzly.android.prefs.AppPreferences;
 import com.orgzly.android.prefs.RepoPreferences;
 import com.orgzly.android.util.LogUtils;
 
@@ -260,6 +263,7 @@ public List<VersionedRook> getBooks() throws IOException {
         walk.setRecursive(true);
         walk.addTree(synchronizer.currentHead().getTree());
         final RepoIgnoreNode ignores = new RepoIgnoreNode(this);
+        boolean supportsSubFolders = AppPreferences.subfolderSupport(App.getAppContext());
         walk.setFilter(new TreeFilter() {
             @Override
             public boolean include(TreeWalk walker) {
@@ -269,7 +273,7 @@ public boolean include(TreeWalk walker) {
                 if (ignores.isIgnored(repoRelativePath, isDirectory) == IgnoreNode.MatchResult.IGNORED)
                     return false;
                 if (isDirectory)
-                    return true;
+                    return supportsSubFolders;
                 return BookName.isSupportedFormatFileName(repoRelativePath);
             }
 
@@ -298,6 +302,10 @@ public void delete(Uri uri) throws IOException {
     }
 
     public VersionedRook renameBook(Uri oldFullUri, String newName) throws IOException {
+        Context context = App.getAppContext();
+        if (newName.contains("/") && !AppPreferences.subfolderSupport(context)) {
+            throw new IOException(context.getString(R.string.subfolder_support_disabled));
+        }
         String oldPath = oldFullUri.toString().replaceFirst("^/", "");
         String newPath = BookName.repoRelativePath(newName, BookFormat.ORG);
         if (synchronizer.renameFileInRepo(oldPath, newPath)) {
diff --git a/app/src/main/java/com/orgzly/android/repos/WebdavRepo.kt b/app/src/main/java/com/orgzly/android/repos/WebdavRepo.kt
index 81599b893..034ebfb93 100644
--- a/app/src/main/java/com/orgzly/android/repos/WebdavRepo.kt
+++ b/app/src/main/java/com/orgzly/android/repos/WebdavRepo.kt
@@ -9,7 +9,10 @@ import com.burgstaller.okhttp.basic.BasicAuthenticator
 import com.burgstaller.okhttp.digest.CachingAuthenticator
 import com.burgstaller.okhttp.digest.Credentials
 import com.burgstaller.okhttp.digest.DigestAuthenticator
+import com.orgzly.R
+import com.orgzly.android.App
 import com.orgzly.android.BookName
+import com.orgzly.android.prefs.AppPreferences
 import com.thegrizzlylabs.sardineandroid.DavResource
 import com.thegrizzlylabs.sardineandroid.impl.OkHttpSardine
 import okhttp3.OkHttpClient
@@ -166,8 +169,14 @@ class WebdavRepo(
 
         val ignores = RepoIgnoreNode(this)
 
+        val listDepth = if (AppPreferences.subfolderSupport(App.getAppContext())) {
+            -1
+        } else {
+            1
+        }
+
         return sardine
-                .list(url, -1)
+                .list(url, listDepth)
                 .mapNotNull {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                         if (!BookName.isSupportedFormatFileName(it.name) || ignores.isPathIgnored(it.getRelativePath(), it.isDirectory)) {
@@ -222,6 +231,9 @@ class WebdavRepo(
         val encodedRepoPath = Uri.encode(repoRelativePath, "/")
         if (encodedRepoPath != null) {
             if (encodedRepoPath.contains("/")) {
+                val context = App.getAppContext()
+                if (!AppPreferences.subfolderSupport(context))
+                    throw IOException(context.getString(R.string.subfolder_support_disabled))
                 ensureDirectoryHierarchy(encodedRepoPath)
             }
         }
@@ -244,6 +256,9 @@ class WebdavRepo(
         }
 
         if (newName.contains("/")) {
+            val context = App.getAppContext()
+            if (!AppPreferences.subfolderSupport(context))
+                throw IOException(context.getString(R.string.subfolder_support_disabled))
             ensureDirectoryHierarchy(newEncodedRelativePath)
         }
 
diff --git a/app/src/main/res/values/prefs_keys.xml b/app/src/main/res/values/prefs_keys.xml
index 4d2c14855..686ef9ad0 100644
--- a/app/src/main/res/values/prefs_keys.xml
+++ b/app/src/main/res/values/prefs_keys.xml
@@ -561,6 +561,10 @@
     <string name="pref_key_highlight_edited_rich_text" translatable="false">pref_key_highlight_edited_rich_text</string>
     <bool name="pref_default_highlight_edited_rich_text" translatable="false">false</bool>
 
+    <!-- Subfolder support -->
+    <string name="pref_key_enable_repo_subfolders" translatable="false">pref_key_enable_repo_subfolders</string>
+    <bool name="pref_default_enable_repo_subfolders" translatable="false">false</bool>
+
     <!-- Git preferences -->
     <string name="pref_key_git_ssh_key_type" translatable="false">pref_key_git_ssh_key_type</string>
     <string name="pref_key_git_author" traslatable="false">pref_key_git_author</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c26eeac1d..32016cc3d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,6 +87,8 @@
     <!-- Preferences (Settings). -->
     <string name="repos_preference_title">Repositories</string>
     <string name="repos_preference_summary">Location to synchronize your notebooks with</string>
+    <string name="enable_repo_subfolders_preferences_title">Support repository subfolders</string>
+    <string name="enable_repo_subfolders_preferences_summary">Load from and write to subfolders</string>
     <string name="ssh_keygen_preference_title">SSH key generation</string>
     <string name="ssh_keygen_preference_summary">Generate key pair for Git repo sync</string>
     <string name="ssh_show_public_key_preference_title">View generated SSH public key</string>
@@ -784,4 +786,6 @@
     <string name="sync_status_saved">Saved to %s</string>
 
     <string name="moving_between_subdirectories_requires_api_24">Renaming notebook to a different subdirectory requires Android 7 or higher</string>
+
+    <string name="subfolder_support_disabled">Support for subfolders is disabled</string>
 </resources>
diff --git a/app/src/main/res/xml/prefs_screen_sync.xml b/app/src/main/res/xml/prefs_screen_sync.xml
index 78c2d01cf..b5b8ca710 100644
--- a/app/src/main/res/xml/prefs_screen_sync.xml
+++ b/app/src/main/res/xml/prefs_screen_sync.xml
@@ -15,6 +15,12 @@
             android:targetClass="com.orgzly.android.ui.repos.ReposActivity"/>
     </Preference>
 
+    <SwitchPreference
+        android:key="@string/pref_key_enable_repo_subfolders"
+        android:title="@string/enable_repo_subfolders_preferences_title"
+        android:summary="@string/enable_repo_subfolders_preferences_summary"
+        android:defaultValue="@bool/pref_default_enable_repo_subfolders"/>
+
     <androidx.preference.PreferenceScreen
         android:key="prefs_screen_auto_sync"
         android:title="@string/auto_sync"
diff --git a/app/src/test/java/com/orgzly/android/repos/DropboxRepoTest.kt b/app/src/test/java/com/orgzly/android/repos/DropboxRepoTest.kt
index 1b49db0b4..f88f89495 100644
--- a/app/src/test/java/com/orgzly/android/repos/DropboxRepoTest.kt
+++ b/app/src/test/java/com/orgzly/android/repos/DropboxRepoTest.kt
@@ -54,8 +54,13 @@ class DropboxRepoTest : SyncRepoTest {
     }
 
     @Test
-    override fun testGetBooks_singleFileInSubfolder() {
-        SyncRepoTest.testGetBooks_singleFileInSubfolder(client, syncRepo)
+    override fun testGetBooks_singleFileInSubfolderWhenEnabled() {
+        SyncRepoTest.testGetBooks_singleFileInSubfolderWhenEnabled(client, syncRepo)
+    }
+
+    @Test
+    override fun testGetBooks_singleFileInSubfolderWhenDisabled() {
+        SyncRepoTest.testGetBooks_singleFileInSubfolderWhenDisabled(client, syncRepo)
     }
 
     @Test
@@ -84,8 +89,13 @@ class DropboxRepoTest : SyncRepoTest {
     }
 
     @Test
-    override fun testStoreBook_producesSameUriAsRetrieveBook() {
-        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBook(syncRepo)
+    override fun testStoreBook_producesSameUriAsRetrieveBookWithSubfolder() {
+        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBookWithSubfolder(syncRepo)
+    }
+
+    @Test
+    override fun testStoreBook_producesSameUriAsRetrieveBookWithoutSubfolder() {
+        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBookWithoutSubfolder(syncRepo)
     }
 
     @Test
@@ -98,6 +108,11 @@ class DropboxRepoTest : SyncRepoTest {
         SyncRepoTest.testStoreBook_inSubfolder(client, syncRepo)
     }
 
+    @Test(expected = IOException::class)
+    override fun testStoreBook_inSubfolderWhenDisabled() {
+        SyncRepoTest.testStoreBook_inSubfolderWhenDisabled(syncRepo)
+    }
+
     @Test
     override fun testRenameBook_expectedUri() {
         SyncRepoTest.testRenameBook_expectedUri(syncRepo)
@@ -109,8 +124,13 @@ class DropboxRepoTest : SyncRepoTest {
     }
 
     @Test
-    override fun testRenameBook_fromRootToSubfolder() {
-        SyncRepoTest.testRenameBook_fromRootToSubfolder(syncRepo)
+    override fun testRenameBook_fromRootToSubfolderWhenEnabled() {
+        SyncRepoTest.testRenameBook_fromRootToSubfolderWhenEnabled(syncRepo)
+    }
+
+    @Test(expected = IOException::class)
+    override fun testRenameBook_fromRootToSubfolderWhenDisabled() {
+        SyncRepoTest.testRenameBook_fromRootToSubfolderWhenDisabled(syncRepo)
     }
 
     @Test
diff --git a/app/src/test/java/com/orgzly/android/repos/GitRepoTest.kt b/app/src/test/java/com/orgzly/android/repos/GitRepoTest.kt
index 883be5b03..ac286a299 100644
--- a/app/src/test/java/com/orgzly/android/repos/GitRepoTest.kt
+++ b/app/src/test/java/com/orgzly/android/repos/GitRepoTest.kt
@@ -56,8 +56,13 @@ class GitRepoTest : SyncRepoTest {
     }
 
     @Test
-    override fun testGetBooks_singleFileInSubfolder() {
-        SyncRepoTest.testGetBooks_singleFileInSubfolder(gitWorkingTree, syncRepo)
+    override fun testGetBooks_singleFileInSubfolderWhenEnabled() {
+        SyncRepoTest.testGetBooks_singleFileInSubfolderWhenEnabled(gitWorkingTree, syncRepo)
+    }
+
+    @Test
+    override fun testGetBooks_singleFileInSubfolderWhenDisabled() {
+        SyncRepoTest.testGetBooks_singleFileInSubfolderWhenDisabled(gitWorkingTree, syncRepo)
     }
 
     @Test
@@ -86,8 +91,13 @@ class GitRepoTest : SyncRepoTest {
     }
 
     @Test
-    override fun testStoreBook_producesSameUriAsRetrieveBook() {
-        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBook(syncRepo)
+    override fun testStoreBook_producesSameUriAsRetrieveBookWithSubfolder() {
+        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBookWithSubfolder(syncRepo)
+    }
+
+    @Test
+    override fun testStoreBook_producesSameUriAsRetrieveBookWithoutSubfolder() {
+        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBookWithoutSubfolder(syncRepo)
     }
 
     @Test
@@ -100,6 +110,11 @@ class GitRepoTest : SyncRepoTest {
         SyncRepoTest.testStoreBook_inSubfolder(gitWorkingTree, syncRepo)
     }
 
+    @Test
+    override fun testStoreBook_inSubfolderWhenDisabled() {
+        SyncRepoTest.testStoreBook_inSubfolderWhenDisabled(syncRepo)
+    }
+
     @Test
     override fun testRenameBook_expectedUri() {
         SyncRepoTest.testRenameBook_expectedUri(syncRepo)
@@ -111,8 +126,13 @@ class GitRepoTest : SyncRepoTest {
     }
 
     @Test
-    override fun testRenameBook_fromRootToSubfolder() {
-        SyncRepoTest.testRenameBook_fromRootToSubfolder(syncRepo)
+    override fun testRenameBook_fromRootToSubfolderWhenEnabled() {
+        SyncRepoTest.testRenameBook_fromRootToSubfolderWhenEnabled(syncRepo)
+    }
+
+    @Test(expected = IOException::class)
+    override fun testRenameBook_fromRootToSubfolderWhenDisabled() {
+        SyncRepoTest.testRenameBook_fromRootToSubfolderWhenDisabled(syncRepo)
     }
 
     @Test
diff --git a/app/src/test/java/com/orgzly/android/repos/WebdavRepoTest.kt b/app/src/test/java/com/orgzly/android/repos/WebdavRepoTest.kt
index 273e1b752..d62fe20d6 100644
--- a/app/src/test/java/com/orgzly/android/repos/WebdavRepoTest.kt
+++ b/app/src/test/java/com/orgzly/android/repos/WebdavRepoTest.kt
@@ -57,8 +57,13 @@ class WebdavRepoTest : SyncRepoTest {
     }
 
     @Test
-    override fun testGetBooks_singleFileInSubfolder() {
-        SyncRepoTest.testGetBooks_singleFileInSubfolder(serverRootDir, syncRepo)
+    override fun testGetBooks_singleFileInSubfolderWhenEnabled() {
+        SyncRepoTest.testGetBooks_singleFileInSubfolderWhenEnabled(serverRootDir, syncRepo)
+    }
+
+    @Test
+    override fun testGetBooks_singleFileInSubfolderWhenDisabled() {
+        SyncRepoTest.testGetBooks_singleFileInSubfolderWhenDisabled(serverRootDir, syncRepo)
     }
 
     @Test
@@ -87,8 +92,13 @@ class WebdavRepoTest : SyncRepoTest {
     }
 
     @Test
-    override fun testStoreBook_producesSameUriAsRetrieveBook() {
-        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBook(syncRepo)
+    override fun testStoreBook_producesSameUriAsRetrieveBookWithSubfolder() {
+        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBookWithSubfolder(syncRepo)
+    }
+
+    @Test
+    override fun testStoreBook_producesSameUriAsRetrieveBookWithoutSubfolder() {
+        SyncRepoTest.testStoreBook_producesSameUriAsRetrieveBookWithoutSubfolder(syncRepo)
     }
 
     @Test
@@ -101,6 +111,11 @@ class WebdavRepoTest : SyncRepoTest {
         SyncRepoTest.testStoreBook_inSubfolder(serverRootDir, syncRepo)
     }
 
+    @Test(expected = IOException::class)
+    override fun testStoreBook_inSubfolderWhenDisabled() {
+        SyncRepoTest.testStoreBook_inSubfolderWhenDisabled(syncRepo)
+    }
+
     @Test
     override fun testRenameBook_expectedUri() {
         SyncRepoTest.testRenameBook_expectedUri(syncRepo)
@@ -112,8 +127,13 @@ class WebdavRepoTest : SyncRepoTest {
     }
 
     @Test
-    override fun testRenameBook_fromRootToSubfolder() {
-        SyncRepoTest.testRenameBook_fromRootToSubfolder(syncRepo)
+    override fun testRenameBook_fromRootToSubfolderWhenEnabled() {
+        SyncRepoTest.testRenameBook_fromRootToSubfolderWhenEnabled(syncRepo)
+    }
+
+    @Test(expected = IOException::class)
+    override fun testRenameBook_fromRootToSubfolderWhenDisabled() {
+        SyncRepoTest.testRenameBook_fromRootToSubfolderWhenDisabled(syncRepo)
     }
 
     @Test
diff --git a/shared-test/src/main/java/com/orgzly/android/repos/SyncRepoTest.kt b/shared-test/src/main/java/com/orgzly/android/repos/SyncRepoTest.kt
index 385910575..baf903482 100644
--- a/shared-test/src/main/java/com/orgzly/android/repos/SyncRepoTest.kt
+++ b/shared-test/src/main/java/com/orgzly/android/repos/SyncRepoTest.kt
@@ -4,7 +4,9 @@ import android.annotation.SuppressLint
 import android.net.Uri
 import android.os.Build
 import androidx.documentfile.provider.DocumentFile
+import com.orgzly.android.App
 import com.orgzly.android.BookName
+import com.orgzly.android.prefs.AppPreferences
 import com.orgzly.android.util.MiscUtils
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder
@@ -17,18 +19,22 @@ import java.io.IOException
 interface SyncRepoTest {
 
     fun testGetBooks_singleOrgFile()
-    fun testGetBooks_singleFileInSubfolder()
+    fun testGetBooks_singleFileInSubfolderWhenEnabled()
+    fun testGetBooks_singleFileInSubfolderWhenDisabled()
     fun testGetBooks_allFilesAreIgnored()
     fun testGetBooks_specificFileInSubfolderIsIgnored()
     fun testGetBooks_specificFileIsUnignored()
     fun testGetBooks_ignoredExtensions()
     fun testStoreBook_expectedUri()
-    fun testStoreBook_producesSameUriAsRetrieveBook()
+    fun testStoreBook_producesSameUriAsRetrieveBookWithSubfolder()
+    fun testStoreBook_producesSameUriAsRetrieveBookWithoutSubfolder()
     fun testStoreBook_producesSameUriAsGetBooks()
     fun testStoreBook_inSubfolder()
+    fun testStoreBook_inSubfolderWhenDisabled()
     fun testRenameBook_expectedUri()
     fun testRenameBook_repoFileAlreadyExists()
-    fun testRenameBook_fromRootToSubfolder()
+    fun testRenameBook_fromRootToSubfolderWhenEnabled()
+    fun testRenameBook_fromRootToSubfolderWhenDisabled()
     fun testRenameBook_fromSubfolderToRoot()
     fun testRenameBook_newSubfolderSameLeafName()
     fun testRenameBook_newSubfolderAndLeafName()
@@ -61,8 +67,9 @@ interface SyncRepoTest {
             assertEquals(fileName, BookName.getRepoRelativePath(syncRepo.uri, books[0].uri))
         }
 
-        fun testGetBooks_singleFileInSubfolder(repoManipulationPoint: Any, syncRepo: SyncRepo) {
+        fun testGetBooks_singleFileInSubfolderWhenEnabled(repoManipulationPoint: Any, syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val repoFilePath = "Folder/Book one.org"
             val fileContent = "\n\n...\n\n"
             val expectedRookUri = writeFileToRepo(fileContent, syncRepo, repoManipulationPoint, "Book one.org", "Folder")
@@ -79,6 +86,19 @@ interface SyncRepoTest {
             assertEquals(fileContent, retrieveBookDestinationFile.readText())
         }
 
+        fun testGetBooks_singleFileInSubfolderWhenDisabled(repoManipulationPoint: Any, syncRepo: SyncRepo) {
+            // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), false)
+            val fileContent = "\n\n...\n\n"
+            writeFileToRepo(fileContent, syncRepo, repoManipulationPoint, "Book one.org", "Folder")
+
+            // When
+            val books = syncRepo.books
+
+            // Then
+            assertEquals(0, books.size)
+        }
+
         fun testGetBooks_allFilesAreIgnored(repoManipulationPoint: Any, syncRepo: SyncRepo) {
             // Given
             val ignoreFileContent = "*\n"
@@ -92,6 +112,7 @@ interface SyncRepoTest {
 
         fun testGetBooks_specificFileInSubfolderIsIgnored(repoManipulationPoint: Any, syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val ignoreFileContent = "folder/book one.org\n"
             writeFileToRepo("...", syncRepo, repoManipulationPoint, "book one.org", "folder")
             writeFileToRepo(ignoreFileContent, syncRepo, repoManipulationPoint, RepoIgnoreNode.IGNORE_FILE)
@@ -100,11 +121,13 @@ interface SyncRepoTest {
             // Then
             assertEquals(0, books.size)
         }
+
         fun testGetBooks_specificFileIsUnignored(repoManipulationPoint: Any, syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val folderName = "My Folder"
             val fileName = "My file.org"
-            val ignoreFileContent = "folder/**\n!$folderName/$fileName\n"
+            val ignoreFileContent = "$folderName/**\n!$folderName/$fileName\n"
             writeFileToRepo("...", syncRepo, repoManipulationPoint, fileName, folderName)
             writeFileToRepo(ignoreFileContent, syncRepo, repoManipulationPoint, RepoIgnoreNode.IGNORE_FILE)
             // When
@@ -142,8 +165,9 @@ interface SyncRepoTest {
             assertEquals(expectedRookUri, vrook.uri.toString())
         }
 
-        fun testStoreBook_producesSameUriAsRetrieveBook(syncRepo: SyncRepo) {
+        fun testStoreBook_producesSameUriAsRetrieveBookWithSubfolder(syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val tmpFile = kotlin.io.path.createTempFile().toFile()
             val repositoryPath = "a folder/a book.org"
             MiscUtils.writeStringToFile("...", tmpFile)
@@ -155,8 +179,23 @@ interface SyncRepoTest {
             assertEquals(retrievedBook.uri, storedRook.uri)
         }
 
+        fun testStoreBook_producesSameUriAsRetrieveBookWithoutSubfolder(syncRepo: SyncRepo) {
+            // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), false)
+            val tmpFile = kotlin.io.path.createTempFile().toFile()
+            val repositoryPath = "A book.org"
+            MiscUtils.writeStringToFile("...", tmpFile)
+            // When
+            val storedRook = syncRepo.storeBook(tmpFile, repositoryPath)
+            val retrievedBook = syncRepo.retrieveBook(repositoryPath, tmpFile)
+            tmpFile.delete()
+            // Then
+            assertEquals(retrievedBook.uri, storedRook.uri)
+        }
+
         fun testStoreBook_producesSameUriAsGetBooks(repoManipulationPoint: Any, syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val tmpFile = kotlin.io.path.createTempFile().toFile()
             val folderName = "A folder"
             val fileName = "A book.org"
@@ -172,6 +211,7 @@ interface SyncRepoTest {
 
         fun testStoreBook_inSubfolder(repoManipulationPoint: Any, syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val tmpFile = kotlin.io.path.createTempFile().toFile()
             val repositoryPath = "A folder/A book.org"
             val testBookContent = "\n\n...\n\n"
@@ -224,6 +264,22 @@ interface SyncRepoTest {
             }
         }
 
+        fun testStoreBook_inSubfolderWhenDisabled(syncRepo: SyncRepo) {
+            // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), false)
+            val tmpFile = kotlin.io.path.createTempFile().toFile()
+            val repositoryPath = "A folder/A book.org"
+            val testBookContent = "\n\n...\n\n"
+            MiscUtils.writeStringToFile(testBookContent, tmpFile)
+            // Then
+            try {
+                syncRepo.storeBook(tmpFile, repositoryPath)
+            } catch (e: IOException) {
+                assertTrue(e.message!!.contains("Support for subfolders is disabled"))
+                throw e
+            }
+        }
+
         fun testRenameBook_expectedUri(syncRepo: SyncRepo) {
             // Given
             val tmpFile = kotlin.io.path.createTempFile().toFile()
@@ -264,8 +320,9 @@ interface SyncRepoTest {
             }
         }
 
-        fun testRenameBook_fromRootToSubfolder(syncRepo: SyncRepo) {
+        fun testRenameBook_fromRootToSubfolderWhenEnabled(syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val tmpFile = kotlin.io.path.createTempFile().toFile()
             MiscUtils.writeStringToFile("...", tmpFile)
             // When
@@ -281,8 +338,26 @@ interface SyncRepoTest {
             assertEquals(expectedRookUri, renamedRook.uri.toString())
         }
 
+        fun testRenameBook_fromRootToSubfolderWhenDisabled(syncRepo: SyncRepo) {
+            // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), false)
+            val tmpFile = kotlin.io.path.createTempFile().toFile()
+            MiscUtils.writeStringToFile("...", tmpFile)
+            // When
+            val originalRook = syncRepo.storeBook(tmpFile, "Original book.org")
+            tmpFile.delete()
+            // Then
+            try {
+                syncRepo.renameBook(originalRook.uri, "A folder/Renamed book")
+            } catch (e: IOException) {
+                assertTrue(e.message!!.contains("Support for subfolders is disabled"))
+                throw e
+            }
+        }
+
         fun testRenameBook_fromSubfolderToRoot(syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val tmpFile = kotlin.io.path.createTempFile().toFile()
             MiscUtils.writeStringToFile("...", tmpFile)
             // When
@@ -300,6 +375,7 @@ interface SyncRepoTest {
 
         fun testRenameBook_newSubfolderSameLeafName(syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val tmpFile = kotlin.io.path.createTempFile().toFile()
             MiscUtils.writeStringToFile("...", tmpFile)
             // When
@@ -317,6 +393,7 @@ interface SyncRepoTest {
 
         fun testRenameBook_newSubfolderAndLeafName(syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val tmpFile = kotlin.io.path.createTempFile().toFile()
             MiscUtils.writeStringToFile("...", tmpFile)
             // When
@@ -334,6 +411,7 @@ interface SyncRepoTest {
 
         fun testRenameBook_sameSubfolderNewLeafName(syncRepo: SyncRepo) {
             // Given
+            AppPreferences.subfolderSupport(App.getAppContext(), true)
             val tmpFile = kotlin.io.path.createTempFile().toFile()
             MiscUtils.writeStringToFile("...", tmpFile)
             // When