--- lib/Net/Server/POP3.pm	2005-01-11 02:05:30.000000000 +0000
+++ /usr/local/share/perl/5.8.4/Net/Server/POP3.pm	2005-11-10 23:29:06.000000000 +0000
@@ -154,7 +154,12 @@
               # for that message.  This line is called a "unique-id
               # listing" for that message.
               if ($msgnum <= @message) {
-                print "+OK $msgnum " . $message[$msgnum-1] . $EOL;
+	        my $uidl = $message[$msgnum-1];
+	        if (defined($op{uidl})) {
+	          $uidl = $op{uidl}->($uidl);
+		}
+		
+                print "+OK $msgnum $uidl" . $EOL;
               } else {
                 # Most clients won't even try this.
                 print "-ERR Cannot find message $msgnum (only ".@message." in drop)$EOL";
@@ -170,7 +175,11 @@
               for (@message) {
                 ++$msgnum;
                 if (not $deleted[$msgnum-1]) {
-                  print "$msgnum $_$EOL";
+		  my $uidl = $_;
+		  if (defined($op{uidl})) {
+		     $uidl = $op{uidl}->($uidl);
+		  }
+                  print "$msgnum $uidl$EOL";
                 }
               }
               print ".$EOL";