--- qmail-scanner-1.11/qmail-scanner-queue.template.orig	2002-04-22 08:47:05.000000000 +0900
+++ qmail-scanner-1.11/qmail-scanner-queue.template	2002-05-10 13:23:13.000000000 +0900
@@ -69,6 +69,7 @@
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV QMAILMFTFILE QMAILINJECT)};
 
 use strict 'vars', 'subs';
+use Jcode;
 
 use Sys::Syslog qw(:DEFAULT setlogsock);
 setlogsock('unix');
@@ -1184,13 +1185,13 @@
     print SM "Cc: $QUARANTINE_CC\n";
     $tmpsndrs .= "$QUARANTINE_CC,";
   }
-  $tmpsubj="$destring LOCALE_sender_subject \"$headers{'subject'}\"";
+  $tmpsubj = jcode("$destring LOCALE_sender_subject \"$headers{'subject'}\"")->mime_encode;
   $tmpsubj =~ s/(\r|\0|\n)/ /g;
   print SM "Subject: $tmpsubj\n";
   print SM "Message-ID: <".&uniq_id."\@$hostname>\n";
   print SM "X-Tnz-Problem-Type: 40\n";
   print SM "MIME-Version: 1.0\n";
-  print SM "Content-type: text/plain\n";
+  print SM "Content-type: text/plain; charset=iso-2022-jp\n";
   if ( $descriptive_hdrs ) {
     print SM "${V_HEADER}-Mail-From: $returnpath via $hostname\n";
     print SM "${V_HEADER}-Rcpt-To: $recips\n" if ($descriptive_hdrs eq "2");
@@ -1198,26 +1199,26 @@
   }
   
   if (!&is_unreplyable_email('sender')) {
-    print SM "LOCALE_attention: $headers{'from'}.\n";
+    print SM jcode("LOCALE_attention: $headers{'from'}.\n")->iso_2022_jp;
   } else {
-    print SM "LOCALE_attention: $V_FROMNAME.\n";
-    print SM "LOCALE_sender_automated_mail_note\n";
+    print SM jcode("LOCALE_attention: $V_FROMNAME.\n")->iso_2022_jp;
+    print SM jcode("LOCALE_sender_automated_mail_note\n")->iso_2022_jp;
   }
-  print SM "\nLOCALE_sender_explanation\n";
+  print SM jcode("\nLOCALE_sender_explanation\n")->iso_2022_jp;
   if ($destring eq "Virus") {
-    print SM "\nLOCALE_sender_virus_content\n";
+    print SM jcode("\nLOCALE_sender_virus_content\n")->iso_2022_jp;
   } else {
-    print SM "\nLOCALE_sender_other_content\n";
+    print SM jcode("\nLOCALE_sender_other_content\n")->iso_2022_jp;
   }
-  print SM "\nLOCALE_sender_msg_description\n\n";
+  print SM jcode("\nLOCALE_sender_msg_description\n\n")->iso_2022_jp;
   
   print SM "From:    $headers{'from'}\n";
   print SM "To:      $headers{'to'}\n" if ($headers{'to'});
   print SM "Cc:	 $headers{'cc'}\n" if ($headers{'cc'});
-  print SM "Subject: $headers{'subject'}\n" if ($headers{'subject'});
+  print SM jcode("Subject: $headers{'subject'}\n")->mime_decode->iso_2022_jp if ($headers{'subject'});
   print SM "Message-ID: $headers{'message-id'}\n" if ($headers{'message-id'});
   print SM "Date:    $headers{'date'}\n" if ($headers{'date'});
-  print SM "\nLOCALE_sender_quarantine\n";
+  print SM jcode("\nLOCALE_sender_quarantine\n")->iso_2022_jp;
   close(SM);
   if ($log_details) {
     &log_msg("qmail-scanner","Clear:$tag_score",$elapsed_time,1100,$V_FROM,$tmpsndrs,$tmpsubj,$tmpmsgid,"quarantine-event.txt");
@@ -1237,39 +1238,38 @@
       $tmpsndrs = "$recips,";
     }
   }
-  $tmpsubj= "$destring LOCALE_recips_subject \"$headers{'subject'}\"";
+  $tmpsubj = jcode("$destring LOCALE_recips_subject \"$headers{'subject'}\"")->mime_encode;
   $tmpsubj =~ s/(\r|\0|\n)/ /g;
   print SM "Subject: $tmpsubj\n";
   print SM "Message-ID: <".&uniq_id."\@$hostname>\n";
   print SM "X-Tnz-Problem-Type: 40\n";
   print SM "MIME-Version: 1.0\n";
-  print SM "Content-type: text/plain\n";
+  print SM "Content-type: text/plain; charset=iso-2022-jp\n";
   if ( $descriptive_hdrs ) {
     print SM "${V_HEADER}-Mail-From: $returnpath via $hostname\n";
     print SM "${V_HEADER}-Rcpt-To: $recips\n" if ($descriptive_hdrs eq "2");
     print SM "$V_HEADER: $VERSION ($SCANINFO $destring Found. Processed in ",tv_interval($start_time,[gettimeofday])," secs)\n\n";
   }
   
-  print SM "
-LOCALE_attention: $recips\n";
+  print SM jcode("\nLOCALE_attention: $recips\n")->iso_2022_jp;
   
   if (!&is_unreplyable_email('recips')) {
     if (&notify_addr('sender')) {
-      print SM "LOCALE_recips_not_automated_mail_note\n";
+      print SM jcode("LOCALE_recips_not_automated_mail_note\n")->iso_2022_jp;
     }
   } else {
-    print SM "LOCALE_recips_automated_mail_note\n";
+    print SM jcode("LOCALE_recips_automated_mail_note\n")->iso_2022_jp;
   }
-  print SM "\nLOCALE_recips_explanation\n";
-  print SM "\nLOCALE_recips_msg_description\n\n";
+  print SM jcode("\nLOCALE_recips_explanation\n")->iso_2022_jp;
+  print SM jcode("\nLOCALE_recips_msg_description\n\n")->iso_2022_jp;
   
   print SM "From:    $headers{'from'}\n";
   print SM "To:      $headers{'to'}\n" if ($headers{'to'});
   print SM "Cc:	 $headers{'cc'}\n" if ($headers{'cc'});
-  print SM "Subject: $headers{'subject'}\n" if ($headers{'subject'});
+  print SM jcode("Subject: $headers{'subject'}\n")->mime_decode->iso_2022_jp if ($headers{'subject'});
   print SM "Message-ID: $headers{'message-id'}\n" if ($headers{'message-id'});
   print SM "Date:    $headers{'date'}\n" if ($headers{'date'});
-  print SM "\nLOCALE_recips_quarantine\n";
+  print SM jcode("\nLOCALE_recips_quarantine\n")->iso_2022_jp;
   close(SM);
   if ($log_details) {
     &log_msg("qmail-scanner","Clear:$tag_score",$elapsed_time,1100,$V_FROM,$tmpsndrs,$tmpsubj,$tmpmsgid,"quarantine-event.txt");