Ticket #5007: 5007.patch

wp-includes/pluggable.php

@@ -235 +235 @@
                         $sitename = substr( $sitename, 4 );
                 }
 
-                $from_email = 'wordpress@' . $sitename;
+                $from_email = get_option('admin_email');
         }
 
         // Set the from name and email

wp-admin/includes/upgrade.php

@@ -114 +114 @@
         $user = new WP_User($user_id);
         $email = $user->user_email;
         $name = $user->user_login;
-        $message_headers = 'From: "' . $blog_title . '" <wordpress@' . $_SERVER['SERVER_NAME'] . '>';
+        $message_headers = 'From: "' . $blog_title . '" <'. get_option('admin_email') . '>';
         $message = sprintf(__("Your new WordPress blog has been successfully set up at:
 
 %1\$s