From c962e4b3bd148b0a197e171ac3d3f45ab81f799b Mon Sep 17 00:00:00 2001
From: Mat <mberchtold@gmail.com>
Date: Wed, 29 Jul 2015 19:56:39 +0200
Subject: [PATCH 1/2] Fix issue #22

Remove the subject header otherwise it will be duplicated.
---
 src/Transport/Sendmail.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Transport/Sendmail.php b/src/Transport/Sendmail.php
index 412763ab..b889e9e1 100644
--- a/src/Transport/Sendmail.php
+++ b/src/Transport/Sendmail.php
@@ -217,15 +217,14 @@ protected function prepareBody(Mail\Message $message)
      */
     protected function prepareHeaders(Mail\Message $message)
     {
-        // On Windows, simply return verbatim
-        if ($this->isWindowsOs()) {
-            return $message->getHeaders()->toString();
-        }
-
-        // On *nix platforms, strip the "to" header
+        // strip the "subject" header
         $headers = clone $message->getHeaders();
-        $headers->removeHeader('To');
         $headers->removeHeader('Subject');
+
+        // On *nix platforms, strip the "to" header as wll
+        if (!$this->isWindowsOs()) {
+            $headers->removeHeader('To');
+        }
         return $headers->toString();
     }
 

From 504657227ec16ae3ee89434897dd06245362221d Mon Sep 17 00:00:00 2001
From: Mat <mberchtold@gmail.com>
Date: Wed, 29 Jul 2015 20:03:13 +0200
Subject: [PATCH 2/2] fix typo

---
 src/Transport/Sendmail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Transport/Sendmail.php b/src/Transport/Sendmail.php
index b889e9e1..9be0137f 100644
--- a/src/Transport/Sendmail.php
+++ b/src/Transport/Sendmail.php
@@ -221,7 +221,7 @@ protected function prepareHeaders(Mail\Message $message)
         $headers = clone $message->getHeaders();
         $headers->removeHeader('Subject');
 
-        // On *nix platforms, strip the "to" header as wll
+        // On *nix platforms, strip the "to" header as well
         if (!$this->isWindowsOs()) {
             $headers->removeHeader('To');
         }