diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/Commands.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/Commands.cpp
index 31cf6e459d..ebe0431946 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/Commands.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/Commands.cpp
@@ -687,6 +687,14 @@ ListCommand::HandleUntagged(Response& response)
 		&& response.IsStringAt(3)) {
 		fSeparator = response.StringAt(2);
 
+		if (response.IsListAt(1)) {
+			// We're not supposed to select \Noselect mailboxes,
+			// so we'll just hide them
+			ArgumentList& attributes = response.ListAt(1);
+			if (attributes.Contains("\\Noselect"))
+				return true;
+		}
+
 		BString folder = response.StringAt(3);
 		if (folder == "")
 			return true;