diff --git a/p01-contact/src/P01contact_Form.php b/p01-contact/src/P01contact_Form.php
index 25997dc..e91ea5c 100644
--- a/p01-contact/src/P01contact_Form.php
+++ b/p01-contact/src/P01contact_Form.php
@@ -427,9 +427,8 @@ public function sendMail()
     private function mailHeaders($name, $email, $mime_boundary)
     {
         $encoded_name = $this->encodeHeader($name);
-        $headers  = "From: $encoded_name";
+        $headers  = "From: $encoded_name <no-reply@" . SERVERNAME . ">\n";
         if ($email) {
-            $headers .= " <$email>\n";
             $headers .= "Reply-To: $encoded_name <$email>\n";
             $headers .= "Return-Path: $encoded_name <$email>";
         }