diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 4be9153..14d66dd 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -52,7 +52,7 @@ it will default to `imap'.")
 
 (defvoo nnimap-stream 'ssl
   "How nnimap will talk to the IMAP server.
-Values are `ssl', `network', `starttls' or `shell'.")
+Values are `ssl', `network', `network-no-tls', `starttls' or `shell'.")
 
 (defvoo nnimap-shell-program (if (boundp 'imap-shell-program)
 				 (if (listp imap-shell-program)
@@ -285,8 +285,8 @@ textual parts.")
 	     (port nil)
 	     (ports
 	      (cond
-	       ((eq nnimap-stream 'network)
-		(open-network-stream
+	       ((memq nnimap-stream '(network network-no-tls))
+                (open-network-stream
 		 "*nnimap*" (current-buffer) nnimap-address
 		 (setq port
 		       (or nnimap-server-port