2 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 2b00b395..6f60c008 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@
 * Fix for NO response during SIZE fetches for M$ Exchange IMAP server.
 * Thomas Zajic <zlatko@gmx.at> sent a change that copes with GMX X-UIDLs.
 * Fix fetchmailconf's handling of ssl attributes when SSL is not configured.
+* Handle IMAP folder names with embedded spaces.
 
 fetchmail-5.2.7 (Sun Feb  6 20:45:41 EST 2000), 18517 lines:
 * Updated FAQ.
diff --git a/imap.c b/imap.c
index 34c4bf96..9aee018d 100644
--- a/imap.c
+++ b/imap.c
@@ -1065,10 +1065,9 @@ static int imap_getrange(int sock,
     }
     else
     {
-	if (!check_only)
-	    ok = gen_transact(sock, "SELECT %s", folder ? folder : "INBOX");
-	else
-	    ok = gen_transact(sock, "EXAMINE %s", folder ? folder : "INBOX");
+	ok = gen_transact(sock, 
+			  check_only ? "EXAMINE \"%s\"" : "SELECT \"%s\"",
+			  folder ? folder : "INBOX");
 	if (ok != 0)
 	{
 	    report(stderr, _("mailbox selection failed\n"));