diff --git a/PATCHES.txt b/PATCHES.txt
index 9bf6ddbd..d7606685 100644
--- a/PATCHES.txt
+++ b/PATCHES.txt
@@ -5,3 +5,7 @@ Wrong schema for smtp settings
 Source: https://www.drupal.org/files/issues/2865696-fix-schema-2.patch
 
 
+'site_mail' variable override 'From' header
+Source: https://www.drupal.org/files/issues/2714749-15.patch
+
+
diff --git a/src/Plugin/Mail/SMTPMailSystem.php b/src/Plugin/Mail/SMTPMailSystem.php
index 6d5302a2..db0042a5 100644
--- a/src/Plugin/Mail/SMTPMailSystem.php
+++ b/src/Plugin/Mail/SMTPMailSystem.php
@@ -125,6 +125,13 @@ public function mail(array $message) {
         $headers['Reply-To'] = $from;
     }
 
+    // Override the from value with the value provided in the header.
+    // The header switch will copy back the value.
+    if (!empty($headers['From'])) {
+      $from = '';
+      $headers['Sender'] = $headers['From'];
+    }
+
     // Defines the From value to what we expect.
     $mailer->From = $from;
     $mailer->FromName = $from_name;