= 1.9.8 - 2019-02-18

* New: a new from field to the fallback - Can't trust the username as "from" value (email address).

1 files changed, 7 insertions, 0 deletions

diff --git a/Postman/Postman-Mail/PostmanMessage.php b/Postman/Postman-Mail/PostmanMessage.php
index a85687e..2af67ef 100644
--- a/Postman/Postman-Mail/PostmanMessage.php
+++ b/Postman/Postman-Mail/PostmanMessage.php
@@ -228,6 +228,13 @@ if ( ! class_exists( 'PostmanMessage' ) ) {
 				$this->logger->debug( sprintf( 'Forced From email address: before=%s after=%s', $this->getFromAddress()->getEmail(), $forcedEmailAddress ) );
 				$this->getFromAddress()->setEmail( $forcedEmailAddress );
 			}
+
+			if ( $options->is_fallback ) {
+				$fallback_email = $options->getFallbackFromEmail();
+				$this->logger->debug( sprintf( 'Fallback: Forced From email address: before=%s after=%s', $this->getFromAddress()->getEmail(), $fallback_email ) );
+				$this->getFromAddress()->setEmail( $fallback_email );
+			}
+
 			$forcedEmailName = $options->getMessageSenderName();
 			if ( $options->isSenderNameOverridePrevented() && $this->getFromAddress()->getName() !== $forcedEmailName ) {
 				$this->logger->debug( sprintf( 'Forced From email name: before=%s after=%s', $this->getFromAddress()->getName(), $forcedEmailName ) );