- Close IMAP connection after SMTP, per discussion in (#1485975)

1 files changed, 3 insertions, 3 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 1c9810681..319e53cc0 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1060,9 +1060,6 @@ class rcmail
    */
   public function shutdown()
   {
-    if (is_object($this->imap))
-      $this->imap->close();
-
     if (is_object($this->smtp))
       $this->smtp->disconnect();
 
@@ -1073,6 +1070,9 @@ class rcmail
         $book->close();
     }
 
+    if (is_object($this->imap))
+      $this->imap->close();
+
     // before closing the database connection, write session data
     if ($_SERVER['REMOTE_ADDR'])
       session_write_close();