diff --git a/src/mailbox.lua b/src/mailbox.lua
index a201944..a4d574d 100644
--- a/src/mailbox.lua
+++ b/src/mailbox.lua
@@ -367,6 +367,8 @@ function Mailbox._fetch_message(self, messages)
         end
     end
 
+    if options.close == true then self._cached_close(self) end
+
     return results
 end
 
@@ -1060,6 +1062,8 @@ function Mailbox.enter_idle(self)
     local r = ifcore.idle(self._account._session)
     if r == nil then error("idle request failed", 0) end
 
+    if options.close == true then self._cached_close(self) end
+
     return r
 end