1 files changed, 7 insertions, 8 deletions
diff --git a/src/pop b/src/pop
index 8151010..dbdd8c6 100755
--- a/src/pop
+++ b/src/pop
@@ -23,11 +23,9 @@ if (@ARGV != 2) {
 my ($mbox, $index, @existing_uids);
 if (-e $ARGV[1]) {
 	open $index, '<', $ARGV[1] or die "Could not open $ARGV[1]: $!";
-	{
-		local $/ = ''; # paragraph mode
-		while (<$index>) {
-			push @existing_uids, $1 if /^UID: (.*)$/m;
-		}
+	local $/ = ''; # paragraph mode
+	while (<$index>) {
+		push @existing_uids, $1 if /^M-UID: (.*)$/m;
 	}
 	close $index;
 }
@@ -112,9 +110,10 @@ $from_
 MBOX
 	print $index <<INDEX;
 $from_
-UID: $uids{$id}
-Offset: $offset
-Message-Length: $message_length
+M-Offset: $offset
+M-Length: $message_length
+M-Status: 00
+M-UID: $uids{$id}
 @msg[0..$j-1]
 
 INDEX