Index: includes/UserMailer.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/UserMailer.php,v
retrieving revision 1.37
diff -u -b -r1.37 UserMailer.php
--- includes/UserMailer.php	12 Dec 2005 06:04:45 -0000	1.37
+++ includes/UserMailer.php	22 Dec 2005 20:02:44 -0000
@@ -87,7 +87,7 @@
 		$headers['From'] = $from->toString();
 		$headers['To'] = $dest;
 		if ( $replyto ) {
-			$headers['Reply-To'] = $replyto;
+			$headers['Reply-To'] = $replyto->toString();
 		}
 		$headers['Subject'] = wfQuotedPrintable( $subject );
 		$headers['Date'] = date( 'r' );
@@ -122,7 +122,7 @@
 			"X-Mailer: MediaWiki mailer\n".
 			'From: ' . $from->toString() . "\n";
 		if ($replyto) {
-			$headers .= "Reply-To: $replyto\n";
+			$headers .= "Reply-To: " . $replyto->toString . "\n";
 		}

 		$dest = $to->toString();
@@ -350,7 +350,7 @@
 			}
 		} else {
 			$from    = $adminAddress;
-			$replyto = $wgNoReplyAddress;
+			$replyto = new MailAddress( $wgNoReplyAddress );
 		}

 		if( $wgUser->isIP( $name ) ) {