diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index c7d22c5d5..d3f3b0106 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2922,7 +2922,7 @@ my $iframe_body = <<EOF;
 			imgPresrc.forEach(function(img) {
 				(async function() {
 				  try {
-				      const response = await fetch("$webprefix/XHR.cgi?action=fetch&type=download&subtype=blob&url=" + encodeURIComponent(img.dataset.presrc) + "");
+				      const response = await fetch("$webprefix/$module_name/xhr.cgi?action=fetch&type=download&subtype=blob&url=" + encodeURIComponent(img.dataset.presrc) + "");
 				      response.blob().then(function(blob) {
 				        try {
 				          const urlBlob = URL.createObjectURL(blob);
diff --git a/XHR-lib.pl b/mailboxes/xhr-lib.pl
similarity index 98%
rename from XHR-lib.pl
rename to mailboxes/xhr-lib.pl
index b8004cd9f..67d71b35a 100644
--- a/XHR-lib.pl
+++ b/mailboxes/xhr-lib.pl
@@ -1,5 +1,5 @@
 #!/usr/local/bin/perl
-# A pile of XHR related routines
+# XHR related routines
 
 use strict;
 
diff --git a/XHR.cgi b/mailboxes/xhr.cgi
similarity index 86%
rename from XHR.cgi
rename to mailboxes/xhr.cgi
index e21716ec2..0006711b6 100755
--- a/XHR.cgi
+++ b/mailboxes/xhr.cgi
@@ -10,6 +10,6 @@ use WebminCore;
 &init_config();
 &ReadParse();
 &switch_to_remote_user();
-do "$root_directory/XHR-lib.pl";
 
+do "./xhr-lib.pl";
 xhr();