diff --git a/lib/imap.c b/lib/imap.c
index dce9f3016e..d69922e454 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -1474,6 +1474,9 @@ static CURLcode imap_done(struct connectdata *conn, CURLcode status,
 
   /* Cleanup our per-request based variables */
   Curl_safefree(imap->mailbox);
+  Curl_safefree(imap->uidvalidity);
+  Curl_safefree(imap->uid);
+  Curl_safefree(imap->section);
 
   /* Clear the transfer mode for the next request */
   imap->transfer = FTPTRANSFER_BODY;
diff --git a/lib/imap.h b/lib/imap.h
index 6fa1ba4f24..09c296f4c5 100644
--- a/lib/imap.h
+++ b/lib/imap.h
@@ -59,6 +59,9 @@ struct IMAP {
   curl_off_t *bytecountp;
   curl_pp_transfer transfer;
   char *mailbox;          /* Mailbox to select */
+  char *uidvalidity;      /* UIDVALIDITY to check in select */
+  char *uid;              /* Message UID to fetch */
+  char *section;          /* Message SECTION to fetch */
 };
 
 /* imap_conn is used for struct connection-oriented data in the connectdata