Index: wordpress/wp-login.php
--- wordpress/wp-login.php.orig	2007-09-19 00:23:16 +0200
+++ wordpress/wp-login.php	2007-09-25 07:35:56 +0200
@@ -113,7 +113,7 @@
 				// Now insert the new pass md5'd into the db
 				$wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'");
 				$message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
-				$message .= get_option('siteurl') . "\r\n\r\n";
+				$message .= sprintf(__('Website:  %s'), get_option('siteurl')) . "\r\n";
 				$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
 				$message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
 				$message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
@@ -187,7 +187,7 @@
 	wp_cache_delete($user->user_login, 'userlogins');
 	$message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
 	$message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
-	$message .= get_option('siteurl') . "/wp-login.php\r\n";
+	$message .= sprintf(__('Login:    %s'), get_option('siteurl') . "/wp-login.php") . "\r\n";
 
 	if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message)) {
 		die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
Index: wordpress/wp-mail.php
--- wordpress/wp-mail.php.orig	2007-09-18 18:32:22 +0200
+++ wordpress/wp-mail.php	2007-09-25 07:35:56 +0200
@@ -142,7 +142,7 @@
 	$post_category = $post_categories;
 
 	// or maybe we should leave the choice to email drafts? propose a way
-	$post_status = 'publish';
+	$post_status = 'draft';
 
 	$post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status');
 	$post_data = add_magic_quotes($post_data);