diff --git a/JSON b/JSON
deleted file mode 120000
index bc90c230..00000000
--- a/JSON
+++ /dev/null
@@ -1 +0,0 @@
-../webadmin/JSON
\ No newline at end of file
diff --git a/mailbox/add_address.cgi b/mailbox/add_address.cgi
index 05e28abb..3ca3277f 100755
--- a/mailbox/add_address.cgi
+++ b/mailbox/add_address.cgi
@@ -3,6 +3,8 @@
 # Add an address from an email to the user's address book
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %in;
 
 require './mailbox-lib.pl';
diff --git a/mailbox/address_chooser.cgi b/mailbox/address_chooser.cgi
index 3396fdec..e1c35761 100755
--- a/mailbox/address_chooser.cgi
+++ b/mailbox/address_chooser.cgi
@@ -3,6 +3,8 @@
 # Display a list of entries from the address book
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %uconfig);
 
 our $trust_unknown_referers = 1;
diff --git a/mailbox/auto.pl b/mailbox/auto.pl
index d6ae2806..1a807758 100755
--- a/mailbox/auto.pl
+++ b/mailbox/auto.pl
@@ -2,6 +2,8 @@
 # Scan through all folders, and apply the scheduled deletion policy for each
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 our $no_acl_check++;
 $ENV{'REMOTE_USER'} = getpwuid($<);
diff --git a/mailbox/copy.cgi b/mailbox/copy.cgi
index 50fe8d9b..d6367f37 100755
--- a/mailbox/copy.cgi
+++ b/mailbox/copy.cgi
@@ -2,6 +2,8 @@
 # Copy (or move) all messages from one folder to another
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/copy_form.cgi b/mailbox/copy_form.cgi
index 3ed7f407..ebdde927 100755
--- a/mailbox/copy_form.cgi
+++ b/mailbox/copy_form.cgi
@@ -2,6 +2,8 @@
 # Show a form for copying or moving all email to another folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/delete_folders.cgi b/mailbox/delete_folders.cgi
index f2198d61..1c75b47f 100755
--- a/mailbox/delete_folders.cgi
+++ b/mailbox/delete_folders.cgi
@@ -2,6 +2,8 @@
 # Delete a bunch of folders
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/delete_mail.cgi b/mailbox/delete_mail.cgi
index b460fe2f..c2cf2420 100755
--- a/mailbox/delete_mail.cgi
+++ b/mailbox/delete_mail.cgi
@@ -3,6 +3,8 @@
 # Delete, mark, move or copy multiple messages
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig, %gconfig);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/detach.cgi b/mailbox/detach.cgi
index 952c3444..37f9dbdc 100755
--- a/mailbox/detach.cgi
+++ b/mailbox/detach.cgi
@@ -3,6 +3,8 @@
 # View one attachment from a message
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 use Socket;
diff --git a/mailbox/detachall.cgi b/mailbox/detachall.cgi
index 7c1dea6e..176d136b 100755
--- a/mailbox/detachall.cgi
+++ b/mailbox/detachall.cgi
@@ -2,6 +2,8 @@
 # Download all attachments in a ZIP file
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/edit_auto.cgi b/mailbox/edit_auto.cgi
index 165cd18d..223ef4c2 100755
--- a/mailbox/edit_auto.cgi
+++ b/mailbox/edit_auto.cgi
@@ -2,6 +2,8 @@
 # Show a form for setting up scheduled folder clearing
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/edit_comp.cgi b/mailbox/edit_comp.cgi
index 23510c81..3418ebc0 100755
--- a/mailbox/edit_comp.cgi
+++ b/mailbox/edit_comp.cgi
@@ -3,6 +3,8 @@
 # Display a form for creating or editing a composite folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/edit_folder.cgi b/mailbox/edit_folder.cgi
index 5c03832e..a8909a62 100755
--- a/mailbox/edit_folder.cgi
+++ b/mailbox/edit_folder.cgi
@@ -3,6 +3,8 @@
 # Display a form for creating or editing a folder of some kind
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig);
 our $folders_dir;
 our @remote_user_info;
diff --git a/mailbox/edit_ifolder.cgi b/mailbox/edit_ifolder.cgi
index e587e94d..7244861d 100755
--- a/mailbox/edit_ifolder.cgi
+++ b/mailbox/edit_ifolder.cgi
@@ -2,6 +2,8 @@
 # Display a form for creating or editing an IMAP folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/edit_imap.cgi b/mailbox/edit_imap.cgi
index 0ff5f2af..0a46a3e0 100755
--- a/mailbox/edit_imap.cgi
+++ b/mailbox/edit_imap.cgi
@@ -3,6 +3,8 @@
 # Display a form for creating or editing an IMAP folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our $imap_port;
 
diff --git a/mailbox/edit_pop3.cgi b/mailbox/edit_pop3.cgi
index 97d2e097..bb6f529a 100755
--- a/mailbox/edit_pop3.cgi
+++ b/mailbox/edit_pop3.cgi
@@ -3,6 +3,8 @@
 # Display a form for creating or editing a POP3 folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our $pop3_port;
 
diff --git a/mailbox/edit_sig.cgi b/mailbox/edit_sig.cgi
index 6b41a851..dd597da1 100755
--- a/mailbox/edit_sig.cgi
+++ b/mailbox/edit_sig.cgi
@@ -3,6 +3,8 @@
 # Display the user's .signature file for editing
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/edit_virt.cgi b/mailbox/edit_virt.cgi
index 8acfb448..b7ebd08e 100755
--- a/mailbox/edit_virt.cgi
+++ b/mailbox/edit_virt.cgi
@@ -2,6 +2,8 @@
 # Display a form for creating or editing a virtual folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/export.cgi b/mailbox/export.cgi
index d93512ae..01ecb09b 100755
--- a/mailbox/export.cgi
+++ b/mailbox/export.cgi
@@ -2,6 +2,8 @@
 # Output the address book in some format
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, $remote_user);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/import.cgi b/mailbox/import.cgi
index e819cfa0..d60406c8 100755
--- a/mailbox/import.cgi
+++ b/mailbox/import.cgi
@@ -2,6 +2,8 @@
 # Import addresses from a file
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/inbox_login.cgi b/mailbox/inbox_login.cgi
index 862db1a2..8f8e2393 100755
--- a/mailbox/inbox_login.cgi
+++ b/mailbox/inbox_login.cgi
@@ -3,6 +3,8 @@
 # Save inbox POP3 login and password
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %pop3);
 our $user_module_config_directory;
 
diff --git a/mailbox/inbox_login_error.cgi b/mailbox/inbox_login_error.cgi
index 895f4144..cec13e9c 100755
--- a/mailbox/inbox_login_error.cgi
+++ b/mailbox/inbox_login_error.cgi
@@ -3,6 +3,8 @@
 # Let user update IMAP/POP3 login credentials
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our ($remote_user, $remote_pass);
 
diff --git a/mailbox/inbox_logout.cgi b/mailbox/inbox_logout.cgi
index df4c4e9a..c0151bcf 100755
--- a/mailbox/inbox_logout.cgi
+++ b/mailbox/inbox_logout.cgi
@@ -3,6 +3,8 @@
 # Clear inbox POP3 login and password
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %in;
 our $user_module_config_directory;
 
diff --git a/mailbox/index.cgi b/mailbox/index.cgi
index 8744b447..fe3c6da4 100755
--- a/mailbox/index.cgi
+++ b/mailbox/index.cgi
@@ -3,6 +3,8 @@
 # List the mail messages for the user
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig, %config);
 our ($remote_user, $remote_pass);
 our $special_folder_id;
diff --git a/mailbox/list_addresses.cgi b/mailbox/list_addresses.cgi
index 0f18985a..e45d87f4 100755
--- a/mailbox/list_addresses.cgi
+++ b/mailbox/list_addresses.cgi
@@ -2,6 +2,8 @@
 # Display contents of the user's address book, and allowed and denied addresses
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config, %userconfig);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/list_folders.cgi b/mailbox/list_folders.cgi
index 224c4f6c..116f3dc5 100755
--- a/mailbox/list_folders.cgi
+++ b/mailbox/list_folders.cgi
@@ -3,6 +3,8 @@
 # Display a list of all folders and allows additional and deletion
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our %folder_types;
 our $remote_user;
diff --git a/mailbox/list_ifolders.cgi b/mailbox/list_ifolders.cgi
index d5ceaa07..a4a5e6de 100755
--- a/mailbox/list_ifolders.cgi
+++ b/mailbox/list_ifolders.cgi
@@ -2,6 +2,8 @@
 # Display a list of IMAP folders, and allow addition and deletion
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/mail_search.cgi b/mailbox/mail_search.cgi
index eeee2a86..18573cbf 100755
--- a/mailbox/mail_search.cgi
+++ b/mailbox/mail_search.cgi
@@ -3,6 +3,8 @@
 # Find mail messages matching some pattern
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig);
 our $search_folder_id;
 
diff --git a/mailbox/mailbox-lib.pl b/mailbox/mailbox-lib.pl
index c0d6ab62..d6c3ba85 100755
--- a/mailbox/mailbox-lib.pl
+++ b/mailbox/mailbox-lib.pl
@@ -1,6 +1,8 @@
 # mailbox-lib.pl
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %config, %gconfig, %userconfig);
 our $remote_user;
 our @remote_user_info;
diff --git a/mailbox/newfolder.cgi b/mailbox/newfolder.cgi
index 10cbf3df..69c6ae01 100755
--- a/mailbox/newfolder.cgi
+++ b/mailbox/newfolder.cgi
@@ -2,6 +2,8 @@
 # Just re-directs to the appropriate folder creator
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %in;
 
 require './mailbox-lib.pl';
diff --git a/mailbox/print_mail.cgi b/mailbox/print_mail.cgi
index 6e11c9c6..aa77b452 100755
--- a/mailbox/print_mail.cgi
+++ b/mailbox/print_mail.cgi
@@ -2,6 +2,8 @@
 # Display a message for printing
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig);
 
 our $trust_unknown_referers = 1;
diff --git a/mailbox/quotacheck.pl b/mailbox/quotacheck.pl
index d702ee5a..abc2058c 100755
--- a/mailbox/quotacheck.pl
+++ b/mailbox/quotacheck.pl
@@ -4,6 +4,8 @@
 # error occurred
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 use Net::LDAP;
 
diff --git a/mailbox/reply_mail.cgi b/mailbox/reply_mail.cgi
index 1c191aac..d65bf2cd 100755
--- a/mailbox/reply_mail.cgi
+++ b/mailbox/reply_mail.cgi
@@ -2,6 +2,8 @@
 # Display a form for replying to or composing an email
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config, %gconfig, %userconfig);
 our $module_name;
 our @remote_user_info;
@@ -536,6 +538,7 @@ print &ui_hidden("charset", $main::force_charset);
 # Start tabs for from / to / cc / bcc / signing / options
 # Subject is separate
 print &ui_table_start($text{'reply_headers'}, "width=100%", 2);
+print "<tbody><tr><td>";
 my $has_gpg;
 my @keys;
 if (&has_command("gpg") && &foreign_check("gnupg") &&
@@ -544,7 +547,6 @@ if (&has_command("gpg") && &foreign_check("gnupg") &&
 	@keys = &gnupg::list_keys_sorted();
 	$has_gpg = @keys ? 1 : 0;
 	}
-my @tds = ( "width=10%", "width=90% nowrap" );
 my @tabs = ( [ "from", $text{'reply_tabfrom'} ],
 	  $userconfig{'reply_to'} ne 'x' ?
 		( [ "rto", $text{'reply_tabreplyto'} ] ) : ( ),
@@ -554,7 +556,7 @@ my @tabs = ( [ "from", $text{'reply_tabfrom'} ],
 		  [ "bcc", $text{'reply_tabbcc'} ] ),
 	  $has_gpg ? ( [ "signing", $text{'reply_tabsigning'} ] ) : ( ),
 	  [ "options", $text{'reply_taboptions'} ] );
-print &ui_table_row(undef, &ui_tabs_start(\@tabs, "tab", "to", 0), 2);
+print &ui_tabs_start(\@tabs, "tab", "to", 0);
 
 # From address tab
 my @froms;
@@ -643,56 +645,56 @@ else {
 			     &ui_hidden("from", $froms[0]);
 		}
 	}
-print &ui_tabs_start_tabletab("tab", "from");
-print &ui_table_row($text{'mail_from'}, $frominput, 1, \@tds);
-print &ui_tabs_end_tabletab();
+print &ui_tabs_start_tab("tab", "from");
+print &ui_div_row($text{'mail_from'}, $frominput);
+print &ui_tabs_end_tab();
 
 # Show the Reply-To field
 if ($userconfig{'reply_to'} ne 'x') {
 	$rto = $userconfig{'reply_to'} if ($userconfig{'reply_to'} ne '*');
-	print &ui_tabs_start_tabletab("tab", "rto");
-	print &ui_table_row($text{'mail_replyto'},
-			    &ui_address_field("replyto", $rto, 1, 0), 1, \@tds);
-	print &ui_tabs_end_tabletab();
+	print &ui_tabs_start_tab("tab", "rto");
+	print &ui_div_row($text{'mail_replyto'},
+			    &ui_address_field("replyto", $rto, 1, 0));
+	print &ui_tabs_end_tab();
 	}
 
 $bcc ||= $userconfig{'bcc_to'};
 if ($userconfig{'cc_tabs'}) {
 	# Show all address fields in a tab
-	print &ui_tabs_start_tabletab("tab", "to");
+	print &ui_tabs_start_tab("tab", "to");
 
-	print &ui_table_row($text{'mail_to'}, &ui_address_field("to", $to,
-			    0, 1), 1, \@tds);
-	print &ui_table_row($text{'mail_cc'}, &ui_address_field("cc", $cc,
-			    0, 1), 1, \@tds);
-	print &ui_table_row($text{'mail_bcc'}, &ui_address_field("bcc", $bcc,
-			    0, 1), 1, \@tds);
+	print &ui_div_row($text{'mail_to'}, &ui_address_field("to", $to,
+			    0, 1));
+	print &ui_div_row($text{'mail_cc'}, &ui_address_field("cc", $cc,
+			    0, 1));
+	print &ui_div_row($text{'mail_bcc'}, &ui_address_field("bcc", $bcc,
+			    0, 1));
 
-	print &ui_tabs_end_tabletab();
+	print &ui_tabs_end_tab();
 	}
 else {
 	# Show To: field in a tab
-	print &ui_tabs_start_tabletab("tab", "to");
-	print &ui_table_row($text{'mail_to'}, &ui_address_field("to", $to,
-			    0, 1), 1, \@tds);
-	print &ui_tabs_end_tabletab();
+	print &ui_tabs_start_tab("tab", "to");
+	print &ui_div_row($text{'mail_to'}, &ui_address_field("to", $to,
+			    0, 1));
+	print &ui_tabs_end_tab();
 
 	# Show Cc: field in a tab
-	print &ui_tabs_start_tabletab("tab", "cc");
-	print &ui_table_row($text{'mail_cc'}, &ui_address_field("cc", $cc,
-			    0, 1), 1, \@tds);
-	print &ui_tabs_end_tabletab();
+	print &ui_tabs_start_tab("tab", "cc");
+	print &ui_div_row($text{'mail_cc'}, &ui_address_field("cc", $cc,
+			    0, 1));
+	print &ui_tabs_end_tab();
 
 	# Show Bcc: field in a tab
-	print &ui_tabs_start_tabletab("tab", "bcc");
-	print &ui_table_row($text{'mail_bcc'}, &ui_address_field("bcc", $bcc,
-			    0, 1), 1, \@tds);
-	print &ui_tabs_end_tabletab();
+	print &ui_tabs_start_tab("tab", "bcc");
+	print &ui_div_row($text{'mail_bcc'}, &ui_address_field("bcc", $bcc,
+			    0, 1));
+	print &ui_tabs_end_tab();
 	}
 
 # Ask for signing and encryption
 if ($has_gpg) {
-	print &ui_tabs_start_tabletab("tab", "signing");
+	print &ui_tabs_start_tab("tab", "signing");
 	my @signs;
 	my $def_sign = "";
 	my @crypts;
@@ -719,47 +721,46 @@ if ($has_gpg) {
 			}
 		push(@crypts, [ $k->{'index'}, $n ]);
 		}
-	print &ui_table_row($text{'mail_sign'},
+	print &ui_div_row($text{'mail_sign'},
 		&ui_select("sign", $def_sign,
-		   [ [ "", $text{'mail_nosign'} ], @signs ]), 1, \@tds);
-	print &ui_table_row($text{'mail_crypt'},
+		   [ [ "", $text{'mail_nosign'} ], @signs ]));
+	print &ui_div_row($text{'mail_crypt'},
 		&ui_select("crypt", $userconfig{'def_crypt'} ? -1 : "",
 		   [ [ "", $text{'mail_nocrypt'} ],
-		     [ -1, $text{'mail_samecrypt'} ], @crypts ]), 1, \@tds);
-	print &ui_tabs_end_tabletab();
+		     [ -1, $text{'mail_samecrypt'} ], @crypts ]));
+	print &ui_tabs_end_tab();
 	}
 
 # Show tab for options
-print &ui_tabs_start_tabletab("tab", "options");
-print &ui_table_row($text{'mail_pri'},
+print &ui_tabs_start_tab("tab", "options");
+print &ui_div_row($text{'mail_pri'},
 		&ui_select("pri", "",
 			[ [ 1, $text{'mail_highest'} ],
 			  [ 2, $text{'mail_high'} ],
 			  [ "", $text{'mail_normal'} ],
 			  [ 4, $text{'mail_low'} ],
-			  [ 5, $text{'mail_lowest'} ] ]), 1, \@tds);
+			  [ 5, $text{'mail_lowest'} ] ]));
 
 if ($userconfig{'req_dsn'} == 2) {
 	# Ask for a disposition (read) status
-	print &ui_table_row($text{'reply_dsn'},
+	print &ui_div_row($text{'reply_dsn'},
 		&ui_radio("dsn", 0, [ [ 1, $text{'yes'} ],
-				      [ 0, $text{'no'} ] ]), 1, \@tds);
+				      [ 0, $text{'no'} ] ]));
 	}
 
 if ($userconfig{'req_del'} == 2) {
 	# Ask for a delivery status
-	print &ui_table_row($text{'reply_del'},
+	print &ui_div_row($text{'reply_del'},
 		&ui_radio("del", 0, [ [ 1, $text{'yes'} ],
-				      [ 0, $text{'no'} ] ]), 1, \@tds);
+				      [ 0, $text{'no'} ] ]));
 	}
 
 # Ask if should add to address book
-print &ui_table_row(" ",
-    &ui_checkbox("abook", 1, $text{'reply_aboot'}, $userconfig{'add_abook'}),
-    1, \@tds);
-print &ui_tabs_end_tabletab();
+print &ui_div_row(" ",
+    &ui_checkbox("abook", 1, $text{'reply_aboot'}, $userconfig{'add_abook'}));
+print &ui_tabs_end_tab();
 
-print &ui_table_row(undef, &ui_tabs_end());
+print &ui_tabs_end();
 
 # JS to disable enter in subject field
 print <<EOF;
@@ -772,22 +773,22 @@ EOF
 
 # Field for subject is always at the bottom
 if ($userconfig{'send_buttons'}) {
-	print &ui_table_row($text{'mail_subject'},
+	print &ui_div_row($text{'mail_subject'},
 		&ui_textbox("subject", $subject, 40, 0, undef,
-			    "style='width:60%' onKeyPress='return noenter()'").
-		&ui_submit($text{'reply_send'}).
+			    "style='width:50%' onKeyPress='return noenter()'").
+		"&nbsp;&nbsp;".&ui_submit($text{'reply_send'}).
 		&ui_submit($text{'reply_draft'}, "draft", undef,
 			   "onClick='form.draft_clicked = 1'").
 		&ui_submit($text{'reply_save'}, "save", undef,
-			   "onClick='form.draft_clicked = 1'"),
-		1, \@tds);
+			   "onClick='form.draft_clicked = 1'"));
 	}
 else {
 	# Subject only
-	print &ui_table_row($text{'mail_subject'},
+	print &ui_div_row($text{'mail_subject'},
 		&ui_textbox("subject", $subject, 40, 0, undef,
-			    "style='width:95%' onKeyPress='return noenter()'"), 1, \@tds);
+			    "style='width:90%' onKeyPress='return noenter()'"));
 	}
+print "</td></tr></tbody>";
 print &ui_table_end();
 
 # Create link for switching to HTML/text mode for new mail
diff --git a/mailbox/save_address.cgi b/mailbox/save_address.cgi
index c4c5ff24..0092b043 100755
--- a/mailbox/save_address.cgi
+++ b/mailbox/save_address.cgi
@@ -3,6 +3,8 @@
 # Save, add or delete an address book entry
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/save_allow.cgi b/mailbox/save_allow.cgi
index 6a0d2847..b3a22955 100755
--- a/mailbox/save_allow.cgi
+++ b/mailbox/save_allow.cgi
@@ -2,6 +2,8 @@
 # Update allowed or denied email addresses
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/save_auto.cgi b/mailbox/save_auto.cgi
index 5335677e..b121b44a 100755
--- a/mailbox/save_auto.cgi
+++ b/mailbox/save_auto.cgi
@@ -2,6 +2,8 @@
 # Show a form for setting up scheduled folder clearing
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/save_comp.cgi b/mailbox/save_comp.cgi
index 5d9e7b2d..ea38c963 100755
--- a/mailbox/save_comp.cgi
+++ b/mailbox/save_comp.cgi
@@ -3,6 +3,8 @@
 # Create, modify or delete a composite folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/save_folder.cgi b/mailbox/save_folder.cgi
index 29857a9b..48d5e769 100755
--- a/mailbox/save_folder.cgi
+++ b/mailbox/save_folder.cgi
@@ -8,6 +8,8 @@
 ##  (Usermin also adds .usermin-maildircache by itself)
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our %folder_types;
 our @remote_user_info;
diff --git a/mailbox/save_group.cgi b/mailbox/save_group.cgi
index a05e8602..babd7a1a 100755
--- a/mailbox/save_group.cgi
+++ b/mailbox/save_group.cgi
@@ -3,6 +3,8 @@
 # Save, add or delete an address group entry
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/save_ifolder.cgi b/mailbox/save_ifolder.cgi
index 3565528e..72a9d558 100755
--- a/mailbox/save_ifolder.cgi
+++ b/mailbox/save_ifolder.cgi
@@ -2,6 +2,8 @@
 # Create, update or delete an IMAP folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/save_imap.cgi b/mailbox/save_imap.cgi
index db463d4e..98b7306d 100755
--- a/mailbox/save_imap.cgi
+++ b/mailbox/save_imap.cgi
@@ -3,6 +3,8 @@
 # Create, modify or delete an IMAP folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our %folder_types;
 
diff --git a/mailbox/save_pop3.cgi b/mailbox/save_pop3.cgi
index 45353fd3..f6b02cf3 100755
--- a/mailbox/save_pop3.cgi
+++ b/mailbox/save_pop3.cgi
@@ -3,6 +3,8 @@
 # Create, modify or delete a POP3 folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 our %folder_types;
 
diff --git a/mailbox/save_sig.cgi b/mailbox/save_sig.cgi
index 49752c3b..8f25008e 100755
--- a/mailbox/save_sig.cgi
+++ b/mailbox/save_sig.cgi
@@ -3,6 +3,8 @@
 # Update the user's signature file
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/save_virt.cgi b/mailbox/save_virt.cgi
index 7b8af295..e51e10b4 100755
--- a/mailbox/save_virt.cgi
+++ b/mailbox/save_virt.cgi
@@ -2,6 +2,8 @@
 # Create, modify or delete a virtual folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/search_form.cgi b/mailbox/search_form.cgi
index a788d57d..1f728e9e 100755
--- a/mailbox/search_form.cgi
+++ b/mailbox/search_form.cgi
@@ -3,6 +3,8 @@
 # Display a form for searching a mailbox
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %userconfig);
 our $search_folder_id;
 
diff --git a/mailbox/send_mail.cgi b/mailbox/send_mail.cgi
index b976072b..c753a08a 100755
--- a/mailbox/send_mail.cgi
+++ b/mailbox/send_mail.cgi
@@ -3,6 +3,8 @@
 # Send off an email message
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config, %userconfig);
 our @remote_user_info;
 
diff --git a/mailbox/slideshow.cgi b/mailbox/slideshow.cgi
index f2d1f6ab..d9dde6b5 100755
--- a/mailbox/slideshow.cgi
+++ b/mailbox/slideshow.cgi
@@ -2,6 +2,8 @@
 # Show a page containing all image attachments
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/sort.cgi b/mailbox/sort.cgi
index 49dab17c..20bd4afe 100755
--- a/mailbox/sort.cgi
+++ b/mailbox/sort.cgi
@@ -2,6 +2,8 @@
 # Adjust the sort order and field, and return to the index
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %in;
 
 require './mailbox-lib.pl';
diff --git a/mailbox/specialsync.cgi b/mailbox/specialsync.cgi
index 71e12a3a..548c6347 100755
--- a/mailbox/specialsync.cgi
+++ b/mailbox/specialsync.cgi
@@ -3,6 +3,8 @@
 # the Special folder
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 require './mailbox-lib.pl';
 my $special = &get_special_folder();
diff --git a/mailbox/system_info.pl b/mailbox/system_info.pl
index fab21b0c..d29128ca 100644
--- a/mailbox/system_info.pl
+++ b/mailbox/system_info.pl
@@ -1,6 +1,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require 'mailbox-lib.pl';
 our (%text, %gconfig);
 
diff --git a/mailbox/uconfig_info.pl b/mailbox/uconfig_info.pl
index 8c7c14a5..03465190 100755
--- a/mailbox/uconfig_info.pl
+++ b/mailbox/uconfig_info.pl
@@ -1,5 +1,7 @@
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our %userconfig; # Export this
 
 do 'mailbox-lib.pl';
diff --git a/mailbox/view_mail.cgi b/mailbox/view_mail.cgi
index f437589d..69f5c109 100755
--- a/mailbox/view_mail.cgi
+++ b/mailbox/view_mail.cgi
@@ -3,6 +3,8 @@
 # View a single email message
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in, %config, %gconfig, %userconfig);
 our $module_name;
 our $user_module_config_directory;
@@ -296,7 +298,7 @@ if ($bodycontents) {
 	}
 else {
 	print &ui_table_start($text{'view_body'}, "width=100%", 1);
-	print &ui_table_row(undef, "<b>$text{'view_nobody'}</b>");
+	print &ui_table_row(undef, "<strong>$text{'view_nobody'}</strong>");
 	print &ui_table_end();
 	}
 
diff --git a/mailbox/virtualize.cgi b/mailbox/virtualize.cgi
index 8697a454..519f9a6d 100755
--- a/mailbox/virtualize.cgi
+++ b/mailbox/virtualize.cgi
@@ -2,6 +2,8 @@
 # Create a new virtual folder from some search results
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %in);
 
 require './mailbox-lib.pl';
diff --git a/mailbox/webmin_menu.pl b/mailbox/webmin_menu.pl
index ee615bb8..3e21620a 100644
--- a/mailbox/webmin_menu.pl
+++ b/mailbox/webmin_menu.pl
@@ -1,6 +1,8 @@
 # Function to get the desired menu of folders, for use by themes
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 our (%text, %config, %userconfig);
 our $module_name;
 our $special_folder_id;
diff --git a/makedist.pl b/makedist.pl
index 30953a73..82dd0d51 100755
--- a/makedist.pl
+++ b/makedist.pl
@@ -50,7 +50,7 @@
 	push(@mlist, "virtual-server-theme");
 	push(@mlist, "virtual-server-mobile");
 	}
-@dirlist = ( "JSON" );
+@dirlist = ( "vendor_perl" );
 
 chdir("/usr/local/useradmin");
 if ($webmail) {
diff --git a/quota/system_info.pl b/quota/system_info.pl
index cff9ccea..cda71add 100644
--- a/quota/system_info.pl
+++ b/quota/system_info.pl
@@ -1,6 +1,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require 'quota-lib.pl';
 our (%text, %config, $remote_user, %filesys);
 
diff --git a/twofactor/enable.cgi b/twofactor/enable.cgi
index 1e68eacb..ab6d3649 100755
--- a/twofactor/enable.cgi
+++ b/twofactor/enable.cgi
@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './twofactor-lib.pl';
 our (%in, %text, $remote_user);
 &error_setup($text{'enable_err'});
diff --git a/twofactor/index.cgi b/twofactor/index.cgi
index fa9fb6bf..e7f3049e 100755
--- a/twofactor/index.cgi
+++ b/twofactor/index.cgi
@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 require './twofactor-lib.pl';
 our (%in, %text, $remote_user);
 &ui_print_header(undef, $text{'index_title'}, "");
diff --git a/update-usermin-modules-links.pl b/update-usermin-modules-links.pl
index ffb6613c..d8aae8da 100755
--- a/update-usermin-modules-links.pl
+++ b/update-usermin-modules-links.pl
@@ -3,6 +3,8 @@
 
 use strict;
 use warnings;
+no warnings 'redefine';
+no warnings 'uninitialized';
 
 # Load libs
 BEGIN { push( @INC, "." ); }
diff --git a/vendor_perl b/vendor_perl
new file mode 120000
index 00000000..7db2af02
--- /dev/null
+++ b/vendor_perl
@@ -0,0 +1 @@
+../webadmin/vendor_perl
\ No newline at end of file