--- popper/pop_updt.c.ORIG	Thu Jan  2 03:39:03 2003
+++ popper/pop_updt.c	Sun Oct 31 10:09:30 2004
@@ -531,11 +531,13 @@
             if ( fputs ( buffer, md ) == EOF )
                 break;
 
-            sprintf ( buffer, "X-UIDL: %s", mp->uidl_str );
-            if ( fputs ( buffer, md ) == EOF )
-                break;
-            length += strlen ( buffer ) + 1; /* for CRLF */
-            lines  ++;
+            if ( p->bUpdate_status_hdrs ) {
+                sprintf ( buffer, "X-UIDL: %s", mp->uidl_str );
+                if ( fputs ( buffer, md ) == EOF )
+                    break;
+                length += strlen ( buffer ) + 1; /* for CRLF */
+                lines  ++;
+            }
 
             for ( status_written = 0, inheader = 1;
                   fgets ( buffer, MAXMSGLINELEN, p->drop );