X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fndmail.pl;h=f90f4c68b770dd903e1d6458167c785e6ff9f260;hb=f1cf15b270e1f1b7d0a43ec35a17418d9cdb96f3;hp=5f6a00e0cab82edc2a0cf320e8ae212f32d1cd31;hpb=79f96e8569b30cf0a0ee0cc698acc98ff2d67725;p=ndwebbie.git

diff --git a/scripts/ndmail.pl b/scripts/ndmail.pl
index 5f6a00e..f90f4c6 100755
--- a/scripts/ndmail.pl
+++ b/scripts/ndmail.pl
@@ -22,13 +22,15 @@ q{
 
 use strict;
 use warnings;
+use local::lib;
 use DBI;
 use DBD::Pg qw(:pg_types);
 use CGI qw/:standard/;
 
 use Email::Simple;
 use Email::StripMIME;
-use Encode::Encoder qw(encoder);
+use Encode;
+use Encoding::FixLatin qw(fix_latin);
 use MIME::QuotedPrint;
 
 use FindBin;
@@ -42,8 +44,8 @@ my $text = join '',@text;
 
 my $email = Email::Simple->new(Email::StripMIME::strip_mime($text));;
 
-my $subject = encoder(decode_qp($email->header('Subject')))->utf8;
-my $body = 'FROM:'.encoder(decode_qp($email->header('From')))->utf8 . "\n\n" . encoder($email->body)->utf8;
+my $subject = decode('MIME-Header', $email->header('Subject'));
+my $body = 'FROM:' . decode('MIME-Header', $email->header('From')) . "\n\n" . fix_latin($email->body);
 
 
 $dbh->begin_work;