diff --git a/mail.php b/mail.php
index 3f35620..e2dd61c 100644
--- a/mail.php
+++ b/mail.php
@@ -1308,19 +1308,19 @@ class mail
       $attachmentInlineDetails[$i] = $this->getAttachmentDetails($i, true);
     unset ($i);
     $size = strlen ($this->getMail());
-    $from = $this->getHeader ("From");
+    $from = trim ($this->getHeader ("From"));
     if ($from !== false)
     {
       $fromArray = $this->convertPeopleToArray (
                          $this->decodeHeaders ("From", $from));
     }
-    $to = $this->getHeader ("To");
+    $to = trim ($this->getHeader ("To"));
     if ($to !== false)
     {
       $toArray = $this->convertPeopleToArray (
                        $this->decodeHeaders ("To", $to));
     }
-    $date = $this->getDate ();
+    $date = trim ($this->getDate ());
     $dateTimestamp = $this->getDateTimestamp ();
     $subject = $this->getHeaderValue ("Subject");
     return get_defined_vars();