diff --git a/postfix/aliases.cgi b/postfix/aliases.cgi
index 69938a64b..0c44fff75 100755
--- a/postfix/aliases.cgi
+++ b/postfix/aliases.cgi
@@ -30,11 +30,10 @@ print &ui_form_start("save_opts_aliases.cgi");
 print &ui_table_start($text{'aliasopts_title'}, "width=100%", 2);
 
 # Aliases file
-$none = $text{'opts_none'};
-&option_mapfield("alias_maps", 60, $none);
+&option_mapfield("alias_maps", 60);
 
 # Aliases DB?
-&option_mapfield("alias_database", 60, $none);
+&option_mapfield("alias_database", 60);
 
 print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
diff --git a/postfix/bcc.cgi b/postfix/bcc.cgi
index 7b572376d..d452b61c0 100755
--- a/postfix/bcc.cgi
+++ b/postfix/bcc.cgi
@@ -13,13 +13,11 @@ print "<table border width=100%>\n";
 print "<tr $tb> <td><b>$text{'bcc_title'}</b></td></tr>\n";
 print "<tr $cb> <td><table width=100%>\n";
 
-$none = $text{'opts_none'};
-
 print "<tr>\n";
-&option_mapfield("sender_bcc_maps", 60, $none);
+&option_mapfield("sender_bcc_maps", 60);
 print "</tr>\n";
 print "<tr>\n";
-&option_mapfield("recipient_bcc_maps", 60, $none);
+&option_mapfield("recipient_bcc_maps", 60);
 print "</tr>\n";
 
 print "</table></td></tr></table><p>\n";
diff --git a/postfix/body.cgi b/postfix/body.cgi
index 92069d22f..bacd0aca2 100755
--- a/postfix/body.cgi
+++ b/postfix/body.cgi
@@ -22,34 +22,25 @@ require './postfix-lib.pl';
 $access{'body'} || &error($text{'body_ecannot'});
 &ui_print_header(undef, $text{'body_title'}, "", "body");
 
+# Start of body form
+print &ui_form_start("save_opts_body.cgi");
+print &ui_table_start($text{'body_title'}, "width=100%", 2);
 
-# alias general options
+&option_mapfield("body_checks", 60);
 
-print "<form action=save_opts_body.cgi>\n";
-print "<table border width=100%>\n";
-print "<tr $tb> <td><b>$text{'body_title'}</b></td></tr>\n";
-print "<tr $cb> <td><table width=100%>\n";
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
 
-$none = $text{'opts_none'};
-
-print "<tr>\n";
-&option_radios_freefield("body_checks", 60, $none);
-print "</tr>\n";
-
-print "</table></td></tr></table><p>\n";
-print "<input type=submit value=\"$text{'opts_save'}\"></form>\n";
+# Map contents
 print &ui_hr();
-print "<br>\n";
-
-
 if (&get_current_value("body_checks") eq "")
 {
-    print ($text{'no_map'}."<br><br>");
+    print $text{'no_map'},"<p>\n";
 }
 else
 {
     &generate_map_edit("body_checks", $text{'map_click'}." ".
-		       "<font size=\"-1\">".&hlink("$text{'help_map_format'}", "body")."</font>\n<br>\n", 1,
+		       &hlink($text{'help_map_format'}, "body"), 1,
 		       $text{'header_name'}, $text{'header_value'});
 }
 
diff --git a/postfix/canonical.cgi b/postfix/canonical.cgi
index fcaf734c2..9fb443a9d 100755
--- a/postfix/canonical.cgi
+++ b/postfix/canonical.cgi
@@ -26,12 +26,11 @@ $access{'canonical'} || &error($text{'canonical_ecannot'});
 print &ui_form_start("save_opts_canonical.cgi");
 print &ui_table_start($text{'canonical_title'}, "width=100%", 2);
 
-$none = $text{'opts_none'};
-&option_mapfield("canonical_maps", 60, $none);
+&option_mapfield("canonical_maps", 60);
 
-&option_mapfield("recipient_canonical_maps", 60, $none);
+&option_mapfield("recipient_canonical_maps", 60);
 
-&option_mapfield("sender_canonical_maps", 60, $none);
+&option_mapfield("sender_canonical_maps", 60);
 
 print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
diff --git a/postfix/header.cgi b/postfix/header.cgi
index 54603546b..8fc8a0d5f 100755
--- a/postfix/header.cgi
+++ b/postfix/header.cgi
@@ -26,8 +26,7 @@ $access{'header'} || &error($text{'header_ecannot'});
 print &ui_form_start("save_opts_header.cgi");
 print &ui_table_start($text{'header_title'}, "width=100%", 2);
 
-$none = $text{'opts_none'};
-&option_mapfield("header_checks", 60, $none);
+&option_mapfield("header_checks", 60);
 
 print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
diff --git a/postfix/lang/en b/postfix/lang/en
index 0dd4ae85e..64a77f0b3 100644
--- a/postfix/lang/en
+++ b/postfix/lang/en
@@ -133,6 +133,8 @@ what_is_it=What is it?
 
 opts_default=Default
 opts_none=None
+opts_nomap=No map set
+opts_setmap=Map specifications
 opts_relayhost=Send outgoing mail via host
 opts_direct=Deliver directly
 opts_myorigin=What domain to use in outbound mail
diff --git a/postfix/postfix-lib.pl b/postfix/postfix-lib.pl
index 8a98b7e1e..a6cd407e0 100644
--- a/postfix/postfix-lib.pl
+++ b/postfix/postfix-lib.pl
@@ -329,7 +329,7 @@ sub option_radios_freefield
     print &ui_table_row($help, $rv, $length > 20 ? 3 : 1);
 }
 
-# option_mapfield(name_of_option, length_of_free_field, defaulttext)
+# option_mapfield(name_of_option, length_of_free_field)
 # Prints a field for selecting a map, or none
 sub option_mapfield
 {
@@ -344,14 +344,15 @@ sub option_mapfield
 		&hlink($text{$key}, "opt_".$name) : $text{$key};
     my $rv;
     $rv .= &ui_oneradio($name."_def", "__DEFAULT_VALUE_IE_NOT_IN_CONFIG_FILE__",
-		       $_[2], &if_default_value($name));
+		        $text{'opts_nomap'}, &if_default_value($name));
+    $rv .= "<br>\n";
 
     $check_free_field = 0 if &if_default_value($name);
     shift;
     
     # the free field
-    $rv .= &ui_oneradio($name."_def", "__USE_FREE_FIELD__", undef,
-		       $check_free_field == 1);
+    $rv .= &ui_oneradio($name."_def", "__USE_FREE_FIELD__",
+		        $text{'opts_setmap'}, $check_free_field == 1);
     $rv .= &ui_textbox($name, $check_free_field == 1 ? $v : undef, $length);
     $rv .= &map_chooser_button($name, $name);
     print &ui_table_row($help, $rv, $length > 20 ? 3 : 1);
diff --git a/postfix/relocated.cgi b/postfix/relocated.cgi
index 13dd3a6b0..e9e99c1d9 100755
--- a/postfix/relocated.cgi
+++ b/postfix/relocated.cgi
@@ -26,8 +26,7 @@ $access{'relocated'} || &error($text{'relocated_ecannot'});
 print &ui_form_start("save_opts_relocated.cgi");
 print &ui_table_start($text{'relocated_title'}, "width=100%", 2);
 
-$none = $text{'opts_none'};
-&option_mapfield("relocated_maps", 60, $none);
+&option_mapfield("relocated_maps", 60);
 
 print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
diff --git a/postfix/transport.cgi b/postfix/transport.cgi
index 343a44416..bef052cea 100755
--- a/postfix/transport.cgi
+++ b/postfix/transport.cgi
@@ -26,8 +26,7 @@ $access{'transport'} || &error($text{'transport_ecannot'});
 print &ui_form_start("save_opts_transport.cgi");
 print &ui_table_start($text{'transport_title'}, "width=100%", 2);
 
-$none = $text{'opts_none'};
-&option_mapfield("transport_maps", 60, $none);
+&option_mapfield("transport_maps", 60);
 
 print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
diff --git a/postfix/virtual.cgi b/postfix/virtual.cgi
index 428dcab1d..28091e3b0 100755
--- a/postfix/virtual.cgi
+++ b/postfix/virtual.cgi
@@ -27,8 +27,7 @@ $access{'virtual'} || &error($text{'virtual_ecannot'});
 print &ui_form_start("save_opts_virtual.cgi");
 print &ui_table_start($text{'virtual_title'}, "width=100%", 2);
 
-$none = $text{'opts_none'};
-&option_mapfield($virtual_maps, 40, $none);
+&option_mapfield($virtual_maps, 60);
 
 if ($postfix_version >= 2) {
 	&option_radios_freefield("virtual_alias_domains", 40,