Markasjunk: Fix marking more than one message as spam/ham with email_learn driver (#7121)

1 files changed, 4 insertions, 3 deletions

diff --git a/program/include/rcmail_sendmail.php b/program/include/rcmail_sendmail.php
index b90c23912..9ed65f756 100644
--- a/program/include/rcmail_sendmail.php
+++ b/program/include/rcmail_sendmail.php
@@ -362,11 +362,12 @@ class rcmail_sendmail
     /**
      * Message delivery, and setting Replied/Forwarded flag on success
      *
-     * @param Mail_mime $message Message object
+     * @param Mail_mime $message    Message object
+     * @param bool      $disconnect Close SMTP connection after delivery
      *
      * @return bool True on success, False on failure
      */
-    public function deliver_message($message)
+    public function deliver_message($message, $disconnect = true)
     {
         // Handle Delivery Status Notification request
         $smtp_opts = array('dsn' => $this->options['dsn_enabled']);
@@ -374,7 +375,7 @@ class rcmail_sendmail
         $sent = $this->rcmail->deliver_message($message,
             $this->options['from'],
             $this->options['mailto'],
-            $smtp_error, $mailbody_file, $smtp_opts, true
+            $smtp_error, $mailbody_file, $smtp_opts, $disconnect
         );
 
         // return to compose page if sending failed