diff --git a/mailcap/cgi_args.pl b/mailcap/cgi_args.pl
new file mode 100644
index 000000000..51c8e0618
--- /dev/null
+++ b/mailcap/cgi_args.pl
@@ -0,0 +1,12 @@
+
+do 'mailcap-lib.pl';
+
+sub cgi_args
+{
+my ($cgi) = @_;
+if ($cgi eq 'edit.cgi') {
+	my @mailcap = &list_mailcap();
+	return @mailcap ? 'index='.$mailcap[0]->{'index'} : 'new=1';
+	}
+return undef;
+}
diff --git a/mailcap/index.cgi b/mailcap/index.cgi
index 9ef1df5ec..b088cd340 100755
--- a/mailcap/index.cgi
+++ b/mailcap/index.cgi
@@ -7,9 +7,10 @@ require './mailcap-lib.pl';
 @mailcap = &list_mailcap();
 if (@mailcap) {
 	print &ui_form_start("delete.cgi", "post");
-	print &select_all_link("d"),"\n";
-	print &select_invert_link("d"),"\n";
-	print "<a href='edit.cgi?new=1'>$text{'index_add'}</a><br>\n";
+	@links = ( &select_all_link("d"),
+		   &select_invert_link("d"),
+		   "<a href='edit.cgi?new=1'>$text{'index_add'}</a>" );
+	print &ui_links_row(\@links);
 
 	@tds = ( "width=5" );
 	print &ui_columns_start([
@@ -18,7 +19,7 @@ if (@mailcap) {
 		$text{'index_program'},
 		$text{'index_cmt'},
 		$text{'index_enabled'},
-		], "width=100%", 0, \@tds);
+		], 100, 0, \@tds);
 	foreach $m (@mailcap) {
 		print &ui_checked_columns_row([
 			"<a href='edit.cgi?index=$m->{'index'}'>$m->{'type'}</a>",
@@ -30,9 +31,7 @@ if (@mailcap) {
 		}
 	print &ui_columns_end();
 
-	print &select_all_link("d"),"\n";
-	print &select_invert_link("d"),"\n";
-	print "<a href='edit.cgi?new=1'>$text{'index_add'}</a><br>\n";
+	print &ui_links_row(\@links);
 	print &ui_form_end([ [ "delete", $text{'index_delete'} ],
 			     undef,
 			     [ "disable", $text{'index_disable'} ],