diff --git a/wp-admin/install.php b/wp-admin/install.php
index 1327802842..69af43b548 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -163,8 +163,7 @@ $wpdb->query("INSERT INTO $wpdb->users (ID, user_login, user_pass, user_nickname
 
 $from = 'From: '.$_POST['weblog_title'].' <wordpress@'.$_SERVER['SERVER_NAME'].'>';
 $message_headers = "$from";
-
-mail($admin_email, 'New WordPress Blog', "Your new WordPress blog has been successfully set up at:
+$message = "Your new WordPress blog has been successfully set up at:
 
 $guessurl
 
@@ -177,7 +176,9 @@ We hope you enjoy your new weblog. Thanks!
 
 --The WordPress Team
 http://wordpress.org/
-", $message_headers);
+";
+
+@mail($admin_email, 'New WordPress Blog', $message, $message_headers);
 
 upgrade_all();
 ?>
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index acc34abb42..a464eefc97 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1574,9 +1574,9 @@ function wp_mail($to, $subject, $message, $headers = '', $more = '') {
 	}
 
 	if ( function_exists('mb_send_mail') )
-		return mb_send_mail($to, $subject, $message, $headers, $more);
+		return @mb_send_mail($to, $subject, $message, $headers, $more);
 	else
-		return mail($to, $subject, $message, $headers, $more);
+		return @mail($to, $subject, $message, $headers, $more);
 }
 
 if ( !function_exists('wp_login') ) :