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

1 files changed, 4 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'];