diff --git a/en/cgi/getmsg.cgi b/en/cgi/getmsg.cgi
index 513f6b8fc5..f4876e6729 100755
--- a/en/cgi/getmsg.cgi
+++ b/en/cgi/getmsg.cgi
@@ -1,228 +1,228 @@
 #!/usr/bin/perl -T
 #
 # Given a filename, start offset and end offset of a mail message,
 # read the message and format it nicely using HTML.
 #
 # by John Fieber
 # February 26, 1998
 #
-# $FreeBSD: www/en/cgi/getmsg.cgi,v 1.29 2000/11/29 22:10:24 wosch Exp $
+# $FreeBSD: www/en/cgi/getmsg.cgi,v 1.30 2001/05/07 22:14:17 wosch Exp $
 #
 
 require "./cgi-lib.pl";
 require "./cgi-style.pl";
 use POSIX qw(strftime);
 
 #
 # Files MUST be fully qualified and MUST start with this path.
 #
 $messagepath = "/usr/local/www/db/text/";
 $messagepathcurrent = "/usr/local/www/mid/archive/";
-$ftparchive = 'ftp://ftp2.de.freebsd.org/pub/FreeBSD/doc/mailing-lists/archive';
+$ftparchive = 'ftp://ftp6.de.freebsd.org/pub/FreeBSD/doc/mailing-lists/archive';
 
 &ReadParse(*formdata);
 &Fetch($formdata{'fetch'});
 exit 0;
 
 sub Fetch
 {
     my ($docid) = @_;
     my ($start, $end, $file, $type) = split(/ /, $docid);
     my ($message, @finfo);
 
     #
     # Check to ensure that (a) the specified file starts
     # with an approved pathname and (b) that it contains no
     # relative components (eg ..).  This is so that arbitrary
     # files cannot be accessed.
     #
 
     $file =~ s/\.\.//g;
     $file =~ s|/+|/|;
     $file =~ s|^archive/|$messagepath/|;
 
     # read the full archive 
     if ($type eq 'archive') {
 	# from the FreeBSD ftp server
 	if ($file =~ s%^$messagepath%%o) {
 	    print "Location: $ftparchive/$file.gz\n";
 	    print "Content-type: text/plain\n\n";     
 	    exit(0);
 	}
 	
 	# from the local mail archive for current mails
 	elsif ($file =~ m%^current/(cvs|freebsd)-[a-z0-9-]+$% &&
 	       open(DATA, "$messagepathcurrent$file")) {
 	    print "Content-type: text/plain\n\n"; 
 	    while(<DATA>) {
 		print;
 	    }
 	    close(DATA);
 	    exit(0);
 	}
     }
 
     if (($file =~ /^$messagepath/ && -f $file && open(DATA, $file)) ||
 	($file =~ m%^current/(cvs|freebsd)-[a-z0-9-]+$% &&
 	 open(DATA, "$messagepathcurrent$file")))
     {
 	@finfo = stat DATA;
     	seek DATA, $start, 0;
 	if ($end > $start && $start >= 0) {
 	    read DATA, $message, $end - $start;
 	} else {
 	    # Unknown length, guess the end of the E-Mail
 	    my($newline) = 0;
 	    while(<DATA>) {
 		last if ($newline && /^From .* \d{4}/);
 		if (/^$/) { $newline = 1 } else { $newline = 0; }
 		$message .= $_;
 	    }
 	}
     	close(DATA);
 	print "last-modified: " .
 	    POSIX::strftime("%a, %d %b %Y %T GMT", gmtime($finfo[9])) . "\n";
 
 	# print E-Mail as plain ascii text
 	if ($type eq 'raw') {
             print "Content-type: text/plain\n\n";
             print $message;
 	    return;
         }	
 	$message = &MessageToHTML($message, $file);
     }
     else
     {
     	$message = "<p>The specified message cannot be accessed.</p>\n";
     }
 
     print &short_html_header("FreeBSD Mail Archives");
     print $message;
     print &html_footer;
     print "</BODY></HTML>\n";
 }
 
 sub EscapeHTML
 {
     my ($text) = @_;
     $text =~ s/&/&amp;/g;
     $text =~ s/</&lt;/g;
     $text =~ s/>/&gt;/g;
     return $text;
 }
 
 sub MessageToHTML
 {
     my ($doc, $file) = @_;
     my ($header, $body) = split(/\n\n/, $doc, 2);
     my ($i, %hdr, $field, $data, $message);
     my ($mid) = 'mid.cgi';
     my ($tmid,$tirt,$tref);
     
     $body = &AddAnchors(&EscapeHTML($body));
 
     $header = &EscapeHTML($header);
     $header =~ s/\n[ \t]+/ /g;
 
     foreach $i (split(/\n/, $header)) {
     	($field, $data) = split(/ /, $i, 2);
 	$field =~ y/A-Z/a-z/;
     	$hdr{$field} = $data;
     }
 
     $message = "<pre>\n";
     if (length($hdr{'date:'}) > 0) {
     	$message .= "<strong>Date: </strong>     $hdr{'date:'}\n";
     }
     if (length($hdr{'from:'}) > 0) {
     	$message .= "<strong>From: </strong>     $hdr{'from:'}\n";
     }
     if (length($hdr{'to:'}) > 0) {
     	$message .= "<strong>To: </strong>       $hdr{'to:'}\n";
     }
     if (length($hdr{'cc:'}) > 0) {
     	$message .= "<strong>Cc: </strong>       $hdr{'cc:'}\n";
     }
 #    if (length($hdr{'sender:'}) > 0) {
 #    	$message .= "<strong>Sender: </strong>   $hdr{'sender:'}\n";
 #    }
     if (length($hdr{'subject:'}) > 0) {
     	$message .= "<strong>Subject: </strong>  $hdr{'subject:'}\n";
     }
 
     if ($hdr{'message-id:'}) {
 	$tmid = $hdr{'message-id:'}; 
 	$hdr{'message-id:'} =~ 
 	    s%;([^&]+)&%;<a href="$mid?db=irt&id=$1">$1</a>&%oi;
 	$message .= "<strong>Message-ID: </strong> $hdr{'message-id:'}\n";
     }
 
     if ($hdr{'resent-message-id:'}) {
 	$hdr{'resent-message-id:'} =~ 
 	    s%;([^&]+)&%;<a href="$mid?db=irt&id=$1">$1</a>&%oi;
 	$message .= "<strong>Resent-Message-ID: </strong>$hdr{'resent-message-id:'}\n";
     }
 
     if ($hdr{'in-reply-to:'}) {
 	$tirt = $hdr{'in-reply-to:'};
 	$hdr{'in-reply-to:'} =~
 	    s%;([^&]+)&%;<a href="$mid?db=mid&id=$1">$1</a>&%oi;
 	$message .= "<strong>In-Reply-To: </strong>$hdr{'in-reply-to:'}\n";
     }
 
     if ($hdr{'references:'}) {
 	$tref = $hdr{'references:'};
 	$hdr{'references:'} =~
 	    s%;([^&\s]+)&%;<a href="$mid?db=mid&id=$1">$1</a>&%goi;
 	$message .= "<strong>References: </strong> $hdr{'references:'}\n";
     }
 
 
     $message .= "</pre>\n";
     $message .= "<HR NOSHADE>\n";
 
     if ($tmid =~ m%;([^&]+)&%) {
 	$message .= qq{<a href="$mid?db=irt&id=$1">Next in thread</a>\n};
     }
 
     if ($tirt  =~ m%;([^&]+)&% ||
 	$tref  =~ m%;([^&]+)&%) {
 	$message .= qq{| <a href="$mid?db=mid&id=$1">Previous in thread</a>\n};
     }
     $message .= qq{| <a href="$ENV{'REQUEST_URI'}+raw">Raw E-Mail</a>\n};
     my $file2 = $file;
     if ($file2 =~ s%^$messagepath%archive/%oi ||
 	$file2 =~ /^current/) {
     	$message .= qq{| <a href="/mail/$file2.html">Index</a>\n};
     }
     $message .= qq{| <a href="$ENV{'REQUEST_URI'}+archive">Archive</a>\n};
     $message .= qq{| <a href="../search/searchhints.html">Help</a>\n};
 
     $message .= "<HR NOSHADE>\n";
 
     $message .= "<p><pre>\n$body\n</pre>\n";
     
     return $message;
 }
 
 sub AddAnchors
 {
     my ($text) = @_;
     my $cvsweb = 'http://www.freebsd.org/cgi/cvsweb.cgi';
 
     $text =~ s/(http|https|ftp|gopher|mailto|news|file)(:[^\s]*?\/?)(\W?\s)/<a href="$1$2">$1$2<\/a>$3/goi;
 
     if ($text =~ /Revision\s+Changes\s+Path/) {
 
 	
 	# match revsion and file name
 	#   1.10      +2 -2      ports/audio/xmradio/Makefile
 	# ->
 	#  cvsweb.cgi/ports/audio/xmradio/Makefile.diff?r1=1.9&r2=r.10
 	#
 	$text =~ s#([\d.]+\.)(\d+)(\s+[+-]\d+\s+[+-]\d+\s+)([a-zA-Z\d_:.+/-]+)#sprintf("%s%s%s<a href=\"$cvsweb/%s.diff?r1=%s%s&r2=%s%s\">%s</a>", $1, $2, $3, $4, $1, $2 - 1, $1, $2, $4)#ge;
     }
 
 
     return $text;
 }