MANIFEST                   |  1 +
 lib/PublicInbox/MsgTime.pm |  3 +++
 t/time.t                   | 28 ++++++++++++++++++++++++++++

diff --git a/MANIFEST b/MANIFEST
index ad145f790f034ee831b4c56068cf9ef009e5f236..4a1096d6290dfcf93e1951c4e8daf98c726ae5b6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -185,6 +185,7 @@ t/spamcheck_spamc.t
 t/spawn.t
 t/thread-all.t
 t/thread-cycle.t
+t/time.t
 t/utf8.mbox
 t/v2mda.t
 t/v2reindex.t
diff --git a/lib/PublicInbox/MsgTime.pm b/lib/PublicInbox/MsgTime.pm
index 4295e87389f9ccdfbb7b399c774420ddf7c18812..c67a41fff2effa6b2bfbc163040936350f5a4d8c 100644
--- a/lib/PublicInbox/MsgTime.pm
+++ b/lib/PublicInbox/MsgTime.pm
@@ -47,6 +47,9 @@ 	my @date = $hdr->header_raw('Date');
 	my ($ts, $zone);
 	foreach my $d (@date) {
 		$zone = undef;
+		# Y2K problems: 3-digit years
+		$d =~ s!([A-Za-z]{3}) (\d{3}) (\d\d:\d\d:\d\d)!
+			my $yyyy = $2 + 1900; "$1 $yyyy $3"!e;
 		$ts = eval { str2time($d) };
 		if ($@) {
 			my $mid = $hdr->header_raw('Message-ID');
diff --git a/t/time.t b/t/time.t
new file mode 100644
index 0000000000000000000000000000000000000000..370a0bd35c9c26003de22cf3d64a247c626f1e72
--- /dev/null
+++ b/t/time.t
@@ -0,0 +1,28 @@
+# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
+use warnings;
+use Test::More;
+use_ok 'PublicInbox::MIME';
+use PublicInbox::MsgTime qw(msg_datestamp);
+my $mime = PublicInbox::MIME->create(
+	header => [
+		From => 'a@example.com',
+		To => 'test@example.com',
+		Subject => 'this is a subject',
+		'Message-ID' => '<a-mid@b>',
+		Date => 'Fri, 02 Oct 93 00:00:00 +0000',
+	],
+	body => "hello world\n",
+);
+
+my $ts = msg_datestamp($mime->header_obj);
+use POSIX qw(strftime);
+is(strftime('%Y-%m-%d %H:%M:%S', gmtime($ts)), '1993-10-02 00:00:00',
+	'got expected date with 2 digit year');
+$mime->header_set(Date => 'Fri, 02 Oct 101 01:02:03 +0000');
+$ts = msg_datestamp($mime->header_obj);
+is(strftime('%Y-%m-%d %H:%M:%S', gmtime($ts)), '2001-10-02 01:02:03',
+	'got expected date with 3 digit year');
+
+done_testing();