diff --git a/data/cgi/mid.cgi b/data/cgi/mid.cgi
index 77d7500ae6..541779056f 100755
--- a/data/cgi/mid.cgi
+++ b/data/cgi/mid.cgi
@@ -1,105 +1,125 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 #
 # Copyright (c) March 1998 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# Search and present a mail by Message-ID or In-Reply-To field
+# Search a mail by Message-ID, References or In-Reply-To field
 #
-# $Id: mid.cgi,v 1.2 1998-03-18 19:20:38 wosch Exp $
+# $Id: mid.cgi,v 1.3 1998-04-13 19:04:27 wosch Exp $
 
 $hsty_base = '';
 
 require "./cgi-lib.pl";
 require "./cgi-style.pl";
 
 $home = '/g/www/mid';
+$prefix= "/usr/local/www/db";
 $lookupdir = "$home/index"; # database(s) directory
 $database = 'mid';           # default database
 $bindir = "$home/bin"; # where search scripts located
 $script = $ENV{'SCRIPT_NAME'};
 $shortid = 1;
-
-sub foot { return &html_footer . "</BODY></HTML>\n"; }
+$lookCommand = "$home/bin/look";
 
 sub get_id {
     local($query, $db) = @_;
 
-    open(DB,  "-|") || 
-	exec("$bindir/mid", $query, "$lookupdir/mid-current.$db", "$lookupdir/mid.$db") || do {
-	print &foot; exit;	
-    	};	
+    open(DB,  "-|") ||
+	exec("$lookCommand", $query,
+	     "$lookupdir/mid-current.$db", "$lookupdir/mid.$db") ||
+	do {
+	    print &midheader .
+		"Cannot connect to Message-ID database.<p>\n" . &foot;
+	    exit;
+    	};
 
-    print "\n<pre>\n";
+    local(@idlist);
     while(<DB>) {
-	print &clickable($_);
+	push(@idlist, $_);
     }
     close DB;
 
-    if (($? >> 8) != 0) {
+    if ($#idlist < 0) {           # nothing found
+	print &midheader;
 	if ($db eq 'mid') {
 	    print qq{Message-ID: "$query" not fond\n};
 	} else {
 	    print qq{No answers found for: "$query"\n};
 	}
+	print &foot;
+
+    } elsif ($#idlist == -1) {     # one hit
+    # } elsif ($#idlist ==  0) {     # currently not work
+	local($location) = $ENV{'SCRIPT_NAME'};
+	local($id, $file, $start) = split($", $idlist[0]);
+	$location =~ s%/[^/]+$%%;
+
+	print "Location: $location/getmsg.cgi?fetch=$start+0+" .
+		($file =~ /^current/ ?  '' :  "$prefix/") . "$file\n";
+	warn "Location: $location/getmsg.cgi?fetch=$start+0+$prefix/$file\n";
+	print "Content-type: text/plain\n\n";
+
+    } else {                      # more than one hit
+	local($id, $file, $start, $name);
+	print &midheader;
+	print "<UL>\n";
+	foreach (@idlist) {
+	    ($id, $file, $start) = split;
+	    $name = $file;
+	    $name =~ s%.*/%%;
+	    $name =~ s%(....)(..)(..)\.%$1-$2-$3 %;
+	    print qq{<LI><A HREF="getmsg.cgi?fetch=$start+0+} .
+                ($file =~ /^current/ ? '' : "$prefix/") .
+		qq{$file">$name $start</A>\n};
+	}
+	print "</UL>\n<p>\n";
+	print &foot;
     }
-    print "</pre>\n";
-    print &foot;
 }
 
-sub clickable {
-    local($string) = @_;
-
-    if (/^(message-id|resent-message-id):\s+(.*)/oi) {
-	local($key,$val) = ($1,$2);
-	$val =~ s%<([^>]+)>%<a href="$script?db=irt&id=$1">&lt;$1&gt;</a>%goi;
-        return $key . ': ' . $val . "\n";
-    } elsif (/^(references|in-reply-to):\s+(.*)/oi) {
-	local($key,$val) = ($1,$2);
-	$val =~ s%<([^>]+)>%<a href="$script?db=mid&id=$1">&lt;$1&gt;</a>%goi;
-        return $key . ': ' . $val . "\n";
-    } else {
-	$string =~ s/</&lt;/g;
-	return $string;
-    }
-    # </&lt;/g"
+sub midheader {
+    return &short_html_header("FreeBSD Message-ID Mail Archives") .
+	qq{<p><a href="../search.html">Back to the search interface</a><p>\n};
 }
 
-print &short_html_header("FreeBSD Message-ID Mail Archives");
-print qq{<p><a href="../search.html">Back to the search interface</a><p>\n};
+sub foot { return &html_footer . "</BODY></HTML>\n"; }
 
 &ReadParse(*input);
+$messageid = $input{'id'};
+$database = $input{'db'};
+
 
-if (!$input{'id'}) {
+if (!$messageid) {
     print "No input given\n";
     print &foot; exit;
 }
-$input{'id'} =~ s/^<//;
-$input{'id'} =~ s/>$//;
-$input{'id'} =~ s/@.*// if $shortid;
+$messageid =~ s/^<//;
+$messageid =~ s/>$//;
+$messageid =~ s/@.*// if $shortid;
 
-if ($input{'db'} eq 'mid' || $input{'db'} eq 'irt') {
-    $database = $input{'db'};
+if ($database eq 'mid' || $database eq 'irt') {
+    $database = $database;
 }
 
-&get_id($input{'id'}, $input{'db'});
+&get_id($messageid, $database);
diff --git a/en/cgi/mid.cgi b/en/cgi/mid.cgi
index 77d7500ae6..541779056f 100755
--- a/en/cgi/mid.cgi
+++ b/en/cgi/mid.cgi
@@ -1,105 +1,125 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 #
 # Copyright (c) March 1998 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# Search and present a mail by Message-ID or In-Reply-To field
+# Search a mail by Message-ID, References or In-Reply-To field
 #
-# $Id: mid.cgi,v 1.2 1998-03-18 19:20:38 wosch Exp $
+# $Id: mid.cgi,v 1.3 1998-04-13 19:04:27 wosch Exp $
 
 $hsty_base = '';
 
 require "./cgi-lib.pl";
 require "./cgi-style.pl";
 
 $home = '/g/www/mid';
+$prefix= "/usr/local/www/db";
 $lookupdir = "$home/index"; # database(s) directory
 $database = 'mid';           # default database
 $bindir = "$home/bin"; # where search scripts located
 $script = $ENV{'SCRIPT_NAME'};
 $shortid = 1;
-
-sub foot { return &html_footer . "</BODY></HTML>\n"; }
+$lookCommand = "$home/bin/look";
 
 sub get_id {
     local($query, $db) = @_;
 
-    open(DB,  "-|") || 
-	exec("$bindir/mid", $query, "$lookupdir/mid-current.$db", "$lookupdir/mid.$db") || do {
-	print &foot; exit;	
-    	};	
+    open(DB,  "-|") ||
+	exec("$lookCommand", $query,
+	     "$lookupdir/mid-current.$db", "$lookupdir/mid.$db") ||
+	do {
+	    print &midheader .
+		"Cannot connect to Message-ID database.<p>\n" . &foot;
+	    exit;
+    	};
 
-    print "\n<pre>\n";
+    local(@idlist);
     while(<DB>) {
-	print &clickable($_);
+	push(@idlist, $_);
     }
     close DB;
 
-    if (($? >> 8) != 0) {
+    if ($#idlist < 0) {           # nothing found
+	print &midheader;
 	if ($db eq 'mid') {
 	    print qq{Message-ID: "$query" not fond\n};
 	} else {
 	    print qq{No answers found for: "$query"\n};
 	}
+	print &foot;
+
+    } elsif ($#idlist == -1) {     # one hit
+    # } elsif ($#idlist ==  0) {     # currently not work
+	local($location) = $ENV{'SCRIPT_NAME'};
+	local($id, $file, $start) = split($", $idlist[0]);
+	$location =~ s%/[^/]+$%%;
+
+	print "Location: $location/getmsg.cgi?fetch=$start+0+" .
+		($file =~ /^current/ ?  '' :  "$prefix/") . "$file\n";
+	warn "Location: $location/getmsg.cgi?fetch=$start+0+$prefix/$file\n";
+	print "Content-type: text/plain\n\n";
+
+    } else {                      # more than one hit
+	local($id, $file, $start, $name);
+	print &midheader;
+	print "<UL>\n";
+	foreach (@idlist) {
+	    ($id, $file, $start) = split;
+	    $name = $file;
+	    $name =~ s%.*/%%;
+	    $name =~ s%(....)(..)(..)\.%$1-$2-$3 %;
+	    print qq{<LI><A HREF="getmsg.cgi?fetch=$start+0+} .
+                ($file =~ /^current/ ? '' : "$prefix/") .
+		qq{$file">$name $start</A>\n};
+	}
+	print "</UL>\n<p>\n";
+	print &foot;
     }
-    print "</pre>\n";
-    print &foot;
 }
 
-sub clickable {
-    local($string) = @_;
-
-    if (/^(message-id|resent-message-id):\s+(.*)/oi) {
-	local($key,$val) = ($1,$2);
-	$val =~ s%<([^>]+)>%<a href="$script?db=irt&id=$1">&lt;$1&gt;</a>%goi;
-        return $key . ': ' . $val . "\n";
-    } elsif (/^(references|in-reply-to):\s+(.*)/oi) {
-	local($key,$val) = ($1,$2);
-	$val =~ s%<([^>]+)>%<a href="$script?db=mid&id=$1">&lt;$1&gt;</a>%goi;
-        return $key . ': ' . $val . "\n";
-    } else {
-	$string =~ s/</&lt;/g;
-	return $string;
-    }
-    # </&lt;/g"
+sub midheader {
+    return &short_html_header("FreeBSD Message-ID Mail Archives") .
+	qq{<p><a href="../search.html">Back to the search interface</a><p>\n};
 }
 
-print &short_html_header("FreeBSD Message-ID Mail Archives");
-print qq{<p><a href="../search.html">Back to the search interface</a><p>\n};
+sub foot { return &html_footer . "</BODY></HTML>\n"; }
 
 &ReadParse(*input);
+$messageid = $input{'id'};
+$database = $input{'db'};
+
 
-if (!$input{'id'}) {
+if (!$messageid) {
     print "No input given\n";
     print &foot; exit;
 }
-$input{'id'} =~ s/^<//;
-$input{'id'} =~ s/>$//;
-$input{'id'} =~ s/@.*// if $shortid;
+$messageid =~ s/^<//;
+$messageid =~ s/>$//;
+$messageid =~ s/@.*// if $shortid;
 
-if ($input{'db'} eq 'mid' || $input{'db'} eq 'irt') {
-    $database = $input{'db'};
+if ($database eq 'mid' || $database eq 'irt') {
+    $database = $database;
 }
 
-&get_id($input{'id'}, $input{'db'});
+&get_id($messageid, $database);