diff --git a/filter/edit.cgi b/filter/edit.cgi
index d64a559d6..f8c720eb7 100755
--- a/filter/edit.cgi
+++ b/filter/edit.cgi
@@ -2,7 +2,7 @@
 # Show details of one filter
 
 require './filter-lib.pl';
-&foreign_require("mailbox", "mailbox-lib.pl");
+&foreign_require("mailbox");
 &ReadParse();
 
 # Show page header and get the filter
diff --git a/filter/filter-lib.pl b/filter/filter-lib.pl
index d78e7a400..042cc0415 100755
--- a/filter/filter-lib.pl
+++ b/filter/filter-lib.pl
@@ -576,7 +576,7 @@ else {
 	local $folder = &file_to_folder($f->{'action'}, $folders, $home);
 	if ($folder) {
 		if (&get_product_name() eq 'usermin') {
-			&foreign_require("mailbox", "mailbox-lib.pl");
+			&foreign_require("mailbox");
 			local $id = &mailbox::folder_name($folder);
 			$action = &text('index_afolder',
 			   "<a href='../mailbox/index.cgi?id=$id'>".
diff --git a/filter/index.cgi b/filter/index.cgi
index 314cc6b6a..0b10ad8d1 100755
--- a/filter/index.cgi
+++ b/filter/index.cgi
@@ -2,7 +2,7 @@
 # Show a table of simple actions
 
 require './filter-lib.pl';
-&foreign_require("mailbox", "mailbox-lib.pl");
+&foreign_require("mailbox");
 &ui_print_header(undef, $text{'index_title'}, "", undef, 0, 1);
 
 if (&get_product_name() eq 'webmin') {
diff --git a/filter/move.cgi b/filter/move.cgi
index 26e8c6b59..9536c1e65 100755
--- a/filter/move.cgi
+++ b/filter/move.cgi
@@ -2,7 +2,7 @@
 # Apply a filter to email in some folder
 
 require './filter-lib.pl';
-&foreign_require("mailbox", "mailbox-lib.pl");
+&foreign_require("mailbox");
 &ReadParse();
 &error_setup($text{'move_err'});
 
diff --git a/filter/save.cgi b/filter/save.cgi
index 49240ce2a..6f0d06108 100755
--- a/filter/save.cgi
+++ b/filter/save.cgi
@@ -2,7 +2,7 @@
 # Create, update or delete a filter
 
 require './filter-lib.pl';
-&foreign_require("mailbox", "mailbox-lib.pl");
+&foreign_require("mailbox");
 use Time::Local;
 &ReadParse();
 
diff --git a/filter/save_auto.cgi b/filter/save_auto.cgi
index 311b6f505..6364d3084 100755
--- a/filter/save_auto.cgi
+++ b/filter/save_auto.cgi
@@ -2,7 +2,7 @@
 # Create, update or delete an autoreply filter
 
 require './filter-lib.pl';
-&foreign_require("mailbox", "mailbox-lib.pl");
+&foreign_require("mailbox");
 &ReadParse();
 &error_setup($text{'auto_err'});
 use Time::Local;