diff --git a/postfix/view_mailq.cgi b/postfix/view_mailq.cgi
index ddb2eef66..113b975c3 100755
--- a/postfix/view_mailq.cgi
+++ b/postfix/view_mailq.cgi
@@ -106,7 +106,7 @@ if (@attach) {
 			}
 		else {
 			print &ui_columns_row([
-				"<a href='detach_queue.cgi?id=$in{'id'}&attach=$a->{'idx'}$subs'>$a->{'filename'}</a>",
+				"<a href='detach_queue.cgi/$a->{'filename'}?id=$in{'id'}&attach=$a->{'idx'}$subs'>$a->{'filename'}</a>",
 				$a->{'type'},
 				&nice_size(length($a->{'data'})),
 				]);
diff --git a/sendmail/view_mailq.cgi b/sendmail/view_mailq.cgi
index 8f4f14630..f5c6d6fdd 100755
--- a/sendmail/view_mailq.cgi
+++ b/sendmail/view_mailq.cgi
@@ -114,7 +114,7 @@ if (@attach) {
 			}
 		else {
 			print &ui_columns_row([
-				"<a href='qdetach.cgi?file=$qfile&attach=$a->{'idx'}$subs'>$a->{'filename'}</a>",
+				"<a href='qdetach.cgi/$a->{'filename'}?file=$qfile&attach=$a->{'idx'}$subs'>$a->{'filename'}</a>",
 				$a->{'type'},
 				&nice_size(length($a->{'data'})),
 				]);