--- pine4.44/pine/reply.c.dg3	Tue Nov 27 10:31:36 2001
+++ pine4.44/pine/reply.c	Sat Jan 19 19:27:46 2002
@@ -4437,6 +4437,17 @@
 	*(*d)++ = 'X';				/* write mask */
 	*(*d)++ = '-';
     }
+    /* these are qmail headers (or rather standards which originated with qmail) */
+    if((*s == 'D' || *s == 'd')
+       && (!struncmp(s+1, "elivered-to:", 12))){
+	*(*d)++ = 'X';				/* write mask */
+	*(*d)++ = '-';
+    }
+    if((*s == 'M' || *s == 'm')
+       && (!struncmp(s+1, "ailing-list:", 12))){
+	*(*d)++ = 'X';				/* write mask */
+	*(*d)++ = '-';
+    }
 }
 
 
--- pine4.44/pine/send.c.dg3	Tue Jan  8 12:59:37 2002
+++ pine4.44/pine/send.c	Sat Jan 19 19:37:30 2002
@@ -3989,6 +3989,7 @@
 
 	outgoing->return_path = rfc822_cpy_adr(outgoing->from);
 
+#if 0	/* i think sender is pretty silly.  -dg */
 	/*
 	 * Don't ever believe the sender that is there.
 	 * If From doesn't look quite right, generate our own sender.
@@ -4014,6 +4015,7 @@
 	    outgoing->sender->mailbox = cpystr(ps_global->VAR_USER_ID);
 	    outgoing->sender->host    = cpystr(ps_global->hostname);
 	}
+#endif
 
         /*----- Message is edited, now decide what to do with it ----*/
 	if(editor_result & (COMP_SUSPEND | COMP_GOTHUP | COMP_CANCEL)){