diff --git a/src/Transport/Sendmail.php b/src/Transport/Sendmail.php index 821c94e3..a5227149 100644 --- a/src/Transport/Sendmail.php +++ b/src/Transport/Sendmail.php @@ -258,12 +258,16 @@ protected function prepareParameters(Mail\Message $message) return; } - $parameters = (string) $this->parameters; + $parameters = null; + $priorityParameters = null; + + if ($this->parameters) + $priorityParameters = (string) $this->parameters; $sender = $message->getSender(); if ($sender instanceof AddressInterface) { $parameters .= ' -f' . \escapeshellarg($sender->getEmail()); - return $parameters; + return trim($parameters . $priorityParameters); } $from = $message->getFrom(); @@ -271,10 +275,10 @@ protected function prepareParameters(Mail\Message $message) $from->rewind(); $sender = $from->current(); $parameters .= ' -f' . \escapeshellarg($sender->getEmail()); - return $parameters; + return trim($parameters . $priorityParameters); } - return $parameters; + return trim($parameters . $priorityParameters); } /**