diff --git a/config/aerc.conf b/config/aerc.conf
index fbbf587..1ad7ce5 100644
--- a/config/aerc.conf
+++ b/config/aerc.conf
@@ -132,7 +132,9 @@ styleset-name=default
 #[ui:account=foo]
 #
 # Enable threading in the ui. Only works with notmuch:// and imap:// accounts
-# (when the server supports it).
+# (when the server supports it). If this is not supported by the server,
+# you can enable it on the fly by issuing the :toggle-threads command. The
+# threading will be done client side instead of on the server.
 #
 # Default: false
 #threading-enabled=false
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index 885c4f8..493fd71 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -249,6 +249,10 @@ These options are configured in the *[ui]* section of aerc.conf.
 	This option should only be set to true for specific accounts
 	accordingly. See *Contextual UI Configuration* below.
 
+	If this is not supported by the server, you can enable it on the fly by
+	issuing the _:toggle-threads_ command. The threading will be done client
+	side instead of on the server.
+
 	Default: false