diff -crN pine4.60/pine/reply.c pine4.60-norole-sleep/pine/reply.c
*** pine4.60/pine/reply.c	Thu May  6 10:47:26 2004
--- pine4.60-norole-sleep/pine/reply.c	Sat Jul 10 21:32:28 2004
***************
*** 361,367 ****
      env = pine_mail_fetchstructure(pine_state->mail_stream, seq[times], NULL);
  
      if(role){
! 	q_status_message1(SM_ORDER, 3, 4,
  			  "Replying using role \"%.200s\"", role->nick);
  
  	/* override fcc gotten in reply_seed */
--- 361,367 ----
      env = pine_mail_fetchstructure(pine_state->mail_stream, seq[times], NULL);
  
      if(role){
! 	q_status_message1(SM_ORDER, 0, 1,
  			  "Replying using role \"%.200s\"", role->nick);
  
  	/* override fcc gotten in reply_seed */
***************
*** 3699,3705 ****
      }
  
      if(role)
!       q_status_message1(SM_ORDER, 3, 4,
  			"Forwarding using role \"%.200s\"", role->nick);
  
      if(role && role->template){
--- 3699,3705 ----
      }
  
      if(role)
!       q_status_message1(SM_ORDER, 0, 1,
  			"Forwarding using role \"%.200s\"", role->nick);
  
      if(role && role->template){
***************
*** 4383,4389 ****
  	}
  
  	if(role)
! 	  q_status_message1(SM_ORDER, 3, 4, "Composing using role \"%.200s\"",
  			    role->nick);
  
  	sig = detoken(role, NULL, 2, 0, 1, NULL, NULL);
--- 4383,4389 ----
  	}
  
  	if(role)
! 	  q_status_message1(SM_ORDER, 0, 1, "Composing using role \"%.200s\"",
  			    role->nick);
  
  	sig = detoken(role, NULL, 2, 0, 1, NULL, NULL);
***************
*** 5395,5404 ****
      if(!hostpart)
        hostpart = cpystr("huh");
  
!     sprintf(id,"<Pine.%.4s.%.20s.%02d%02d%02d%02d%02d%02d%X.%d@%.50s>",
! 	    SYSTYPE, pine_version, (now_x->tm_year) % 100, now_x->tm_mon + 1,
  	    now_x->tm_mday, now_x->tm_hour, now_x->tm_min, now_x->tm_sec, 
! 	    cnt, getpid(), hostpart);
  
      if(hostpart)
        fs_give((void **) &hostpart);
--- 5395,5404 ----
      if(!hostpart)
        hostpart = cpystr("huh");
  
!     sprintf(id,"<%02d%02d%02d%02d%02d%02d%X.%d@somehost.domainz.com>",
!             (now_x->tm_year) % 100, now_x->tm_mon + 1,
  	    now_x->tm_mday, now_x->tm_hour, now_x->tm_min, now_x->tm_sec, 
! 	    cnt);
  
      if(hostpart)
        fs_give((void **) &hostpart);
diff -crN pine4.60/pine/send.c pine4.60-norole-sleep/pine/send.c
*** pine4.60/pine/send.c	Thu May  6 10:47:28 2004
--- pine4.60-norole-sleep/pine/send.c	Sat Jul 10 21:33:16 2004
***************
*** 4293,4300 ****
  	 * Don't ever believe the sender that is there.
  	 * If From doesn't look quite right, generate our own sender.
  	 */
! 	if(outgoing->sender)
  	  mail_free_address(&outgoing->sender);
  
  	/*
  	 * If the LHS of the address doesn't match, or the RHS
--- 4293,4301 ----
  	 * Don't ever believe the sender that is there.
  	 * If From doesn't look quite right, generate our own sender.
  	 */
! /*	if(outgoing->sender)
  	  mail_free_address(&outgoing->sender);
+ */
  
  	/*
  	 * If the LHS of the address doesn't match, or the RHS
***************
*** 10077,10085 ****
  {
      char **p;
      static char *forbidden_headers[] = {
- 	"sender",
- 	"x-sender",
- 	"x-x-sender",
  	"date",
  	"received",
  	"message-id",
--- 10078,10083 ----