diff --git a/appl/popper/pop_dele.c b/appl/popper/pop_dele.c
index 0c4b68da0..2aa4da827 100644
--- a/appl/popper/pop_dele.c
+++ b/appl/popper/pop_dele.c
@@ -27,12 +27,12 @@ pop_dele (POP *p)
     mp = &(p->mlp[msg_num-1]);
 
     /*  Is the message already flagged for deletion? */
-    if (mp->del_flag)
+    if (mp->flags & DEL_FLAG)
         return (pop_msg (p,POP_FAILURE,"Message %d has already been deleted.",
             msg_num));
 
     /*  Flag the message for deletion */
-    mp->del_flag = TRUE;
+    mp->flags |= DEL_FLAG;
 
 #ifdef DEBUG
     if(p->debug)
diff --git a/appl/popper/pop_dropinfo.c b/appl/popper/pop_dropinfo.c
index aba90591f..0c7b3e68c 100644
--- a/appl/popper/pop_dropinfo.c
+++ b/appl/popper/pop_dropinfo.c
@@ -111,8 +111,7 @@ pop_dropinfo(POP *p)
             mp->length = 0;
             mp->lines = 0;
             mp->offset = ftell(p->drop) - nchar;
-            mp->del_flag = FALSE;
-            mp->retr_flag = FALSE;
+            mp->flags = 0;
 #if defined(UIDL) || defined(XOVER)
 	    mp->msg_id = 0;
 #endif
diff --git a/appl/popper/pop_list.c b/appl/popper/pop_list.c
index ae11ae9b4..ad4329174 100644
--- a/appl/popper/pop_list.c
+++ b/appl/popper/pop_list.c
@@ -31,7 +31,7 @@ pop_list (POP *p)
         mp = &p->mlp[msg_num-1];
 
         /*  Is the message already flagged for deletion? */
-        if (mp->del_flag)
+        if (mp->flags & DEL_FLAG)
             return (pop_msg (p,POP_FAILURE,
                 "Message %d has been deleted.",msg_num));
 
@@ -47,7 +47,7 @@ pop_list (POP *p)
 
     /*  Loop through the message information list.  Skip deleted messages */
     for (i = p->msg_count, mp = p->mlp; i > 0; i--, mp++) {
-        if (!mp->del_flag) 
+        if (!(mp->flags & DEL_FLAG)) 
             fprintf(p->output,"%u %lu\r\n",mp->number,mp->length);
     }
 
diff --git a/appl/popper/pop_rset.c b/appl/popper/pop_rset.c
index e8b89ed30..0735f4deb 100644
--- a/appl/popper/pop_rset.c
+++ b/appl/popper/pop_rset.c
@@ -19,7 +19,7 @@ pop_rset (POP *p)
 
     /*  Unmark all the messages */
     for (i = p->msg_count, mp = p->mlp; i > 0; i--, mp++)
-        mp->del_flag = FALSE; 
+        mp->flags &= ~DEL_FLAG;
     
     /*  Reset the messages-deleted and bytes-deleted counters */
     p->msgs_deleted = 0;
diff --git a/appl/popper/pop_send.c b/appl/popper/pop_send.c
index 05ae38aa0..5eae1e0f9 100644
--- a/appl/popper/pop_send.c
+++ b/appl/popper/pop_send.c
@@ -10,7 +10,6 @@ RCSID("$Id$");
 /*
  *  sendline:   Send a line of a multi-line response to a client.
  */
-static
 void
 pop_sendline(POP *p, char *buffer)
 {
@@ -67,7 +66,7 @@ pop_send(POP *p)
     mp = &p->mlp[msg_num-1];
 
     /*  Is the message flagged for deletion? */
-    if (mp->del_flag)
+    if (mp->flags & DEL_FLAG)
         return (pop_msg (p,POP_FAILURE,
             "Message %d has been deleted.",msg_num));
 
@@ -80,7 +79,7 @@ pop_send(POP *p)
         /*  Assume that a RETR (retrieve) command was issued */
         msg_lines = -1;
         /*  Flag the message as retreived */
-        mp->retr_flag = TRUE;
+        mp->flags |= RETR_FLAG;
     }
     
     /*  Display the number of bytes in the message */
diff --git a/appl/popper/pop_uidl.c b/appl/popper/pop_uidl.c
index 1cc2803f6..a6e307f77 100644
--- a/appl/popper/pop_uidl.c
+++ b/appl/popper/pop_uidl.c
@@ -64,7 +64,7 @@ pop_uidl (POP *p)
         mp = &p->mlp[msg_num-1];
 
         /*  Is the message already flagged for deletion? */
-        if (mp->del_flag)
+        if (mp->flags & DEL_FLAG)
             return (pop_msg (p,POP_FAILURE,
                 "Message %d has been deleted.",msg_num));
 
@@ -80,7 +80,7 @@ pop_uidl (POP *p)
 
     /*  Loop through the message information list.  Skip deleted messages */
     for (i = p->msg_count, mp = p->mlp; i > 0; i--, mp++) {
-        if (!mp->del_flag) 
+        if (!(mp->flags & DEL_FLAG)) 
             fprintf(p->output,"%u %s\r\n",mp->number,mp->msg_id);
     }
 
diff --git a/appl/popper/pop_updt.c b/appl/popper/pop_updt.c
index b2decd887..b8e6733a8 100644
--- a/appl/popper/pop_updt.c
+++ b/appl/popper/pop_updt.c
@@ -108,7 +108,7 @@ pop_updt (POP *p)
         /*  Get a pointer to the message information list */
         mp = &p->mlp[msg_num];
 
-        if (mp->del_flag) {
+        if (mp->flags & DEL_FLAG) {
 #ifdef DEBUG
             if(p->debug)
                 pop_log(p,POP_DEBUG,
@@ -131,7 +131,7 @@ pop_updt (POP *p)
 
                 /*  Update the message status */
                 if (strncasecmp(buffer,"Status:",7) == 0) {
-                    if (mp->retr_flag)
+                    if (mp->flags & RETR_FLAG)
                         fputs("Status: RO\n",md);
                     else
                         fputs(buffer, md);
@@ -142,7 +142,7 @@ pop_updt (POP *p)
                 if (*buffer == '\n') {
                     doing_body = 1;
                     if (status_written == 0) {
-                        if (mp->retr_flag)
+                        if (mp->flags & RETR_FLAG)
                             fputs("Status: RO\n\n",md);
                         else
                             fputs("Status: U\n\n",md);
diff --git a/appl/popper/pop_xover.c b/appl/popper/pop_xover.c
index 8b8f5988f..bebb7f619 100644
--- a/appl/popper/pop_xover.c
+++ b/appl/popper/pop_xover.c
@@ -15,7 +15,7 @@ pop_xover (POP *p)
     
     /*  Loop through the message information list.  Skip deleted messages */
     for (i = p->msg_count, mp = p->mlp; i > 0; i--, mp++) {
-        if (!mp->del_flag) 
+        if (!(mp->flags & DEL_FLAG)) 
             fprintf(p->output,"%u\t%s\t%s\t%s\t%s\t%lu\t%u\r\n",
 		    mp->number,
 		    mp->subject,