(imap_string): Return 1 if the input is not a quoted string.

(imap_list): Ignore NIL delimiters, correctly handle
strings, not enclosed in doublequotes.

@@ -1103,6 +1103,7 @@ imap_string (f_imap_t f_imap, char **ptr)
       break;
       break;
     default:
     default:
       /* Problem.  */
       /* Problem.  */
+      status = 1;
       break;
       break;
     }
     }
   return status;
   return status;
@@ -1168,7 +1169,7 @@ imap_list (f_imap_t f_imap)
     }
     }
   /* Hiearchy delimeter.  */
   /* Hiearchy delimeter.  */
   tok = strtok_r (NULL, " ", &sp);
   tok = strtok_r (NULL, " ", &sp);
-  if (tok && strlen (tok) > 2)
+  if (tok && strlen (tok) > 2 && strcasecmp (tok, "NIL"))
     lr->separator = tok[1];
     lr->separator = tok[1];
   /* The path.  */
   /* The path.  */
   tok = strtok_r (NULL, " ", &sp);
   tok = strtok_r (NULL, " ", &sp);
@@ -1201,7 +1202,12 @@ imap_list (f_imap_t f_imap)
 	  stream_truncate (f_imap->string.stream, 0);
 	  stream_truncate (f_imap->string.stream, 0);
 	  f_imap->string.offset = 0;
 	  f_imap->string.offset = 0;
 	  f_imap->string.nleft = 0;
 	  f_imap->string.nleft = 0;
-
+	}
+      else
+	{
+	  lr->name = strdup (tok);
+	  if (!lr->name)
+	    status = ENOMEM;
 	}
 	}
     }
     }
   return status;
   return status;