diff --git a/lib/imap.c b/lib/imap.c
index e6d83f2cf8..8d805e83d2 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -653,8 +653,8 @@ static CURLcode imap_perform_list(struct connectdata *conn)
     result = imap_sendf(conn, "%s%s", imap->custom,
                         imap->custom_params ? imap->custom_params : "");
   else {
-    /* Make sure the mailbox is in the correct atom format */
-    mailbox = imap_atom(imap->mailbox ? imap->mailbox : "");
+    /* Make sure the mailbox is in the correct atom format if necessary */
+    mailbox = imap->mailbox ? imap_atom(imap->mailbox) : "";
     if(!mailbox)
       return CURLE_OUT_OF_MEMORY;