1 files changed, 3 insertions, 2 deletions
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 2b580d16..91b10f20 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -8,7 +8,7 @@ use fields qw(nntpd article rbuf ng long_res);
  use PublicInbox::Msgmap;
  use PublicInbox::GitCatFile;
  use PublicInbox::MID qw(mid2path);
-use Email::Simple;
+use Email::MIME;
  use Data::Dumper qw(Dumper);
  use POSIX qw(strftime);
  use Time::HiRes qw(clock_gettime ualarm CLOCK_MONOTONIC);
@@ -29,6 +29,7 @@ my %DISABLED; # = map { $_ => 1 } qw(xover list_overview_fmt newnews xhdr);
  sub new ($$$) {
          my ($class, $sock, $nntpd) = @_;
          my $self = fields::new($class);
+        binmode $sock, ':utf8'; # RFC 3977
          $self->SUPER::new($sock);
          $self->{nntpd} = $nntpd;
          res($self, '201 server ready - post via email');
@@ -367,7 +368,7 @@ find_mid:
  found:
          my $o = 'HEAD:' . mid2path($mid);
          my $bytes;
-        my $s = eval { Email::Simple->new($ng->gcf->cat_file($o, \$bytes)) };
+        my $s = eval { Email::MIME->new($ng->gcf->cat_file($o, \$bytes)) };
          return $err unless $s;
          if ($set_headers) {
                  $s->header_set('Newsgroups', $ng->{name});