message/delivery-status attachments should be shown as text

diff --git a/postfix/detach_queue.cgi b/postfix/detach_queue.cgi
index f358611..63839fc 100755 (executable)
--- a/postfix/detach_queue.cgi
+++ b/postfix/detach_queue.cgi
@@ -13,7 +13,12 @@ $mail || &error($text{'mailq_egone'});
 $attach = $mail->{'attach'}->[$in{'attach'}];
 
 print "X-no-links: 1\n";
-print "Content-type: $attach->{'type'}\n\n";
+if ($attach->{'type'} eq 'message/delivery-status') {
+       print "Content-type: text/plain\n\n";
+       }
+else {
+       print "Content-type: $attach->{'type'}\n\n";
+       }
 if ($attach->{'type'} =~ /^text\/html/i) {
        print &filter_javascript($attach->{'data'});
        }

diff --git a/sendmail/qdetach.cgi b/sendmail/qdetach.cgi
index 3fb61b0..61578a4 100755 (executable)
--- a/sendmail/qdetach.cgi
+++ b/sendmail/qdetach.cgi
@@ -28,7 +28,12 @@ foreach $s (@sub) {
 $attach = $mail->{'attach'}->[$in{'attach'}];
 
 print "X-no-links: 1\n";
-print "Content-type: $attach->{'type'}\n\n";
+if ($attach->{'type'} eq 'message/delivery-status') {
+       print "Content-type: text/plain\n\n";
+       }
+else {
+       print "Content-type: $attach->{'type'}\n\n";
+       }
 if ($attach->{'type'} =~ /^text\/html/i) {
        print &filter_javascript($attach->{'data'});
        }