diff --git a/docs/offlineimap.known_issues.txt b/docs/offlineimap.known_issues.txt
index 6752c3e..d566a54 100644
--- a/docs/offlineimap.known_issues.txt
+++ b/docs/offlineimap.known_issues.txt
@@ -102,6 +102,11 @@ folder behind offlineimap's back, causing them to get assigned a new UID, or
 when offlineimap first syncs a pre-existing Maildir. In the latter case, it
 could appear as if a noticeable and random subset of old messages are synced.
 
+* Offlineimap hangs.
++
+When having unexpected hangs it's advised to set `singlethreadperfolder' to
+'yes', especially when in IMAP/IMAP mode (no maildir).
+
 * Passwords in netrc.
 +
 Offlineimap doesn't know how to retrieve passwords when more than one account is
diff --git a/offlineimap.conf b/offlineimap.conf
index d3d6fa7..e88c006 100644
--- a/offlineimap.conf
+++ b/offlineimap.conf
@@ -1080,7 +1080,8 @@ remoteuser = username
 # download in UIDs order.
 #
 # If this is unset (the default), then up to maxconnections threads are used
-# across all currently syncing folders.
+# across all currently syncing folders. This option is sightly recommended in
+# IMAP/IMAP mode (no maildir).
 #
 #singlethreadperfolder = no