diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 02e0b3cc8c..2616a4530a 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1876,16 +1876,13 @@ function htmlentities2($myHTML) {
 
 
 function wp_mail($to, $subject, $message, $headers = '', $more = '') {
-	if ( function_exists('mb_send_mail') )
-        {
-            if( $headers == '' )
-            {
+        if( $headers == '' ) {
                 $headers = "MIME-Version: 1.0\r\n" .
                            "From: " . $to . " <" . $to . ">\r\n" .
                            "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n";
-            }
-            return mb_send_mail($to, $subject, $message, $headers, $more);
         }
+	if ( function_exists('mb_send_mail') )
+                return mb_send_mail($to, $subject, $message, $headers, $more);
 	else
 		return mail($to, $subject, $message, $headers, $more);
 }
@@ -1917,4 +1914,4 @@ function wp_login($username, $password, $already_md5 = false) {
 	}
 }
 
-?>
\ No newline at end of file
+?>