Index: wordpress/wp-includes/canonical.php
--- wordpress/wp-includes/canonical.php.orig	2008-02-24 03:09:24 +0100
+++ wordpress/wp-includes/canonical.php	2008-04-05 17:21:55 +0200
@@ -139,6 +139,12 @@
 	$user_home = @parse_url(get_option('home'));
 	$redirect['host'] = $user_home['host'];
 
+	// SHAMELESS HACK TO MAKE WORDPRESS THINK IT IS RUNNING UNDER PORT 80
+	// TO FIX THE URL TROUBLE WITH THE USUAL FRONTEND APACHE WEBSERVER! --rse
+	$user_home['port'] = 80;
+	$redirect['port'] = 80;
+	$original['port'] = 80;
+
 	// Handle ports
 	if ( isset($user_home['port']) )
 		$redirect['port'] = $user_home['port'];
Index: wordpress/wp-login.php
--- wordpress/wp-login.php.orig	2008-03-26 08:43:52 +0100
+++ wordpress/wp-login.php	2008-04-05 17:21:55 +0200
@@ -99,7 +99,7 @@
 		$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";
@@ -129,7 +129,7 @@
 	wp_set_password($new_pass, $user->ID);
 	$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 (  !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-12-29 20:38:33 +0100
+++ wordpress/wp-mail.php	2008-04-05 17:21:55 +0200
@@ -133,6 +133,7 @@
 		// Author not found in DB, set status to pending.  Author already set to admin.
 		$post_status = 'pending';
 	}
+	$post_status = 'draft';
 
 	$subject = trim($subject);
 
Index: wp-hashcash/wp-hashcash.php
--- wp-hashcash/wp-hashcash.php.orig	2008-03-29 20:07:10 +0100
+++ wp-hashcash/wp-hashcash.php	2008-04-05 17:23:06 +0200
@@ -448,8 +448,7 @@
 	}
 	
 	echo '<input type="hidden" id="wphc_value" name="wphc_value" value=""/>';
-	echo '<p>' . __('Powered by', 'wp-hashcash') . ' <a href="http://wordpress-plugins.feifei.us/hashcash/">WP Hashcash</a></p>';
-	echo '<noscript><small>Wordpress Hashcash needs javascript to work, but your browser has javascript disabled. Your comment will be '.$verb.'!</small></noscript>';
+	echo '<noscript><small>Wordpress Hashcash needs JavaScript to work, but your browser has JavaScript disabled. Your comment will be '.$verb.'!</small></noscript>';
 }
 
 add_action('comment_form', 'wphc_addform');