diff --git a/mailboxes/list_mail.cgi b/mailboxes/list_mail.cgi
index 914494c06..34956edf6 100755
--- a/mailboxes/list_mail.cgi
+++ b/mailboxes/list_mail.cgi
@@ -26,7 +26,6 @@ if ($err) {
 	}
 
 &ui_print_header(undef, $text{'mail_title'}, "");
-print &check_clicks_function();
 @folders = &list_user_folders_sorted($in{'user'});
 ($folder) = grep { $_->{'index'} == $in{'folder'} } @folders;
 
diff --git a/mailboxes/mailboxes-lib.pl b/mailboxes/mailboxes-lib.pl
index 3b2009c50..eca988cf4 100755
--- a/mailboxes/mailboxes-lib.pl
+++ b/mailboxes/mailboxes-lib.pl
@@ -346,10 +346,8 @@ return 0;	# can't happen!
 sub movecopy_user_select
 {
 local $rv;
-$rv .= "<input type=submit name=move$_[0] value=\"$text{'mail_move'}\" ".
-       "onClick='return check_clicks(form)'>";
-$rv .= "<input type=submit name=copy$_[0] value=\"$text{'mail_copy'}\" ".
-       "onClick='return check_clicks(form)'>";
+$rv .= "<input type=submit name=move$_[0] value=\"$text{'mail_move'}\">";
+$rv .= "<input type=submit name=copy$_[0] value=\"$text{'mail_copy'}\">";
 $rv .= &ui_user_textbox("mfolder$_[0]", undef, $_[3]);
 return $rv;
 }
@@ -964,8 +962,7 @@ local $uuser = &urlize($user);
 local $spacer = "&nbsp;\n";
 if (@$mail) {
 	# Delete
-	print "<input type=submit name=delete value=\"$text{'mail_delete'}\" ",
-	      "onClick='return check_clicks(form)'>";
+	print "<input type=submit name=delete value=\"$text{'mail_delete'}\">";
 	if ($config{'show_delall'} && !$search) {
 		print "<input type=submit name=deleteall value=\"$text{'mail_deleteall'}\">";
 		}
diff --git a/mailboxes/view_mail.cgi b/mailboxes/view_mail.cgi
index 6fcabd263..3a664176e 100755
--- a/mailboxes/view_mail.cgi
+++ b/mailboxes/view_mail.cgi
@@ -73,7 +73,6 @@ else {
 
 &mail_page_header($text{'view_title'}, $headstuff, undef,
 		  &folder_link($in{'user'}, $folder));
-print &check_clicks_function();
 &show_arrows();
 
 # Start of the form
@@ -251,8 +250,7 @@ sub show_mail_buttons
 {
 local $spacer = "&nbsp;\n";
 if (!$_[1]) {
-	print "<input type=submit value=\"$text{'view_delete'}\" name=delete ",
-	      "onClick='return check_clicks(form)'>";
+	print "<input type=submit value=\"$text{'view_delete'}\" name=delete>";
 	print $spacer;
 
 	if (!$folder->{'sent'} && !$folder->{'drafts'}) {