diff --git a/lib/imap.c b/lib/imap.c
index 05a50b0ad..b1c92ac7e 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -821,6 +821,25 @@ static CURLcode imap_custom(struct connectdata *conn)
   return result;
 }
 
+/***********************************************************************
+ *
+ * imap_logout()
+ *
+ * Performs the logout action prior to sclose() being called.
+ */
+static CURLcode imap_logout(struct connectdata *conn)
+{
+  CURLcode result = CURLE_OK;
+
+  /* Send the LOGOUT command */
+  result = imap_sendf(conn, "LOGOUT");
+
+  if(!result)
+    state(conn, IMAP_LOGOUT);
+
+  return result;
+}
+
 /* For the initial server greeting */
 static CURLcode imap_state_servergreet_resp(struct connectdata *conn,
                                             int imapcode,
@@ -1936,25 +1955,6 @@ static CURLcode imap_do(struct connectdata *conn, bool *done)
   return result;
 }
 
-/***********************************************************************
- *
- * imap_logout()
- *
- * Performs the logout action prior to sclose() being called.
- */
-static CURLcode imap_logout(struct connectdata *conn)
-{
-  CURLcode result = CURLE_OK;
-
-  /* Send the LOGOUT command */
-  result = imap_sendf(conn, "LOGOUT");
-
-  if(!result)
-    state(conn, IMAP_LOGOUT);
-
-  return result;
-}
-
 /***********************************************************************
  *
  * imap_disconnect()