1 files changed, 4 insertions, 5 deletions
diff --git a/lib/PublicInbox/Smsg.pm b/lib/PublicInbox/Smsg.pm
index 260ce6bb..b132381b 100644
--- a/lib/PublicInbox/Smsg.pm
+++ b/lib/PublicInbox/Smsg.pm
@@ -99,9 +99,6 @@ sub populate {
                  # to protect git and NNTP clients
                  $val =~ tr/\0\t\n/   /;
  
-                # rare: in case headers have wide chars (not RFC2047-encoded)
-                utf8::decode($val);
-
                  # lower-case fields for read-only stuff
                  $self->{lc($f)} = $val;
  
@@ -115,8 +112,10 @@ sub populate {
                  $self->{$f} = $val if $val ne '';
          }
          $sync //= {};
-        $self->{-ds} = [ my @ds = msg_datestamp($hdr, $sync->{autime}) ];
-        $self->{-ts} = [ my @ts = msg_timestamp($hdr, $sync->{cotime}) ];
+        my @ds = msg_datestamp($hdr, $sync->{autime} // $self->{ds});
+        my @ts = msg_timestamp($hdr, $sync->{cotime} // $self->{ts});
+        $self->{-ds} = \@ds;
+        $self->{-ts} = \@ts;
          $self->{ds} //= $ds[0]; # no zone
          $self->{ts} //= $ts[0];
          $self->{mid} //= mids($hdr)->[0];