Fix so additional headers are added to all messages sent (#1489284)

Conflicts:

	plugins/additional_message_headers/additional_message_headers.php
	program/lib/Roundcube/rcube.php

3 files changed, 6 insertions, 0 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 675a2c057..4cfaca13c 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -958,6 +958,10 @@ class rcmail extends rcube
             'options' => $options,
         ));
 
+        if ($plugin['abort']) {
+            return isset($plugin['result']) ? $plugin['result'] : false;
+        }
+
         $from    = $plugin['from'];
         $mailto  = $plugin['mailto'];
         $options = $plugin['options'];
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index af24b0e85..d5f1d59e9 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1295,6 +1295,7 @@ class rcube
             return $_SESSION['language'];
         }
     }
+
 }
 
 
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index cb3a40524..b1f5aebb0 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -462,6 +462,7 @@ if (!empty($CONFIG['useragent'])) {
 }
 
 // exec hook for header checking and manipulation
+// Depracated: use message_before_send hook instead
 $data = $RCMAIL->plugins->exec_hook('message_outgoing_headers', array('headers' => $headers));
 
 // sending aborted by plugin