Index: wp-includes/canonical.php
--- wp-includes/canonical.php.orig	2012-05-02 19:39:43.000000000 +0200
+++ wp-includes/canonical.php	2012-06-14 20:00:15.000000000 +0200
@@ -315,6 +315,12 @@
 	if ( empty($user_home['path']) )
 		$user_home['path'] = '/';
 
+	// 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 ( !empty($user_home['port']) )
 		$redirect['port'] = $user_home['port'];
Index: wp-login.php
--- wp-login.php.orig	2012-06-08 21:22:11.000000000 +0200
+++ wp-login.php	2012-06-14 20:03:11.000000000 +0200
@@ -226,7 +226,7 @@
 		$wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
 	}
 	$message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n";
-	$message .= network_home_url( '/' ) . "\r\n\r\n";
+	$message .= sprintf(__('Website:  %s'), network_home_url( '/' )) . "\r\n\r\n";
 	$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
 	$message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n";
 	$message .= __('To reset your password, visit the following address:') . "\r\n\r\n";
Index: wp-mail.php
--- wp-mail.php.orig	2012-05-02 15:32:19.000000000 +0200
+++ wp-mail.php	2012-06-14 20:00:15.000000000 +0200
@@ -160,6 +160,7 @@
 		// Author not found in DB, set status to pending. Author already set to admin.
 		$post_status = 'pending';
 	}
+	$post_status = 'draft';
 
 	$subject = trim($subject);