--- pine/send.c.orig	Sat Jan 17 19:54:07 1998
+++ pine/send.c	Sat Jan 17 21:22:38 1998
@@ -50,6 +50,7 @@
 #include "../c-client/smtp.h"
 #include "../c-client/nntp.h"
 
+#define bitstrip(x) (x)
 
 #ifndef TCPSTREAM
 #define TCPSTREAM void
@@ -1076,31 +1077,31 @@
 */
 static struct headerentry he_template[]={
   {"From    : ",  "From",        h_composer_from,       10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_TOADDRBOOK},
   {"Reply-To: ",  "Reply To",    h_composer_reply_to,   10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_TOADDRBOOK},
   {"To      : ",  "To",          h_composer_to,         10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 0, 0, 1, 0, 0, 0, KS_TOADDRBOOK},
   {"Cc      : ",  "Cc",          h_composer_cc,         10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 0, 0, 1, 0, 0, 0, KS_TOADDRBOOK},
   {"Bcc     : ",  "Bcc",         h_composer_bcc,        10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_TOADDRBOOK},
   {"Newsgrps: ",  "Newsgroups",  h_composer_news,        10, 0, NULL,
-   news_build,    NULL, NULL, news_group_selector,  "To NwsGrps",
+   news_build,    NULL, NULL, news_group_selector,  "sDոsC",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_NONE},
   {"Fcc     : ",  "Fcc",         h_composer_fcc,        10, 0, NULL,
-   NULL,          NULL, NULL, folders_for_fcc,      "To Fldrs",
+   NULL,          NULL, NULL, folders_for_fcc,      "HC",
    0, 0, 0, 1, 1, 1, 0, 0, 0, KS_NONE},
   {"Lcc     : ",  "Lcc",         h_composer_lcc,        10, 0, NULL,
-   build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"To AddrBk",
+   build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"a}C",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_NONE},
   {"Attchmnt: ",  "Attchmnt",    h_composer_attachment, 10, 0, NULL,
-   NULL,          NULL, NULL, NULL,                 "To Files",
+   NULL,          NULL, NULL, NULL,                 "ɮצC",
    0, 1, 1, 0, 0, 1, 0, 0, 0, KS_NONE},
   {"Subject : ",  "Subject",     h_composer_subject,    10, 0, NULL,
    valid_subject, NULL, NULL, NULL,                 NULL,
@@ -1132,7 +1133,7 @@
 
 static struct headerentry he_custom_addr_templ={
    NULL,          NULL,          h_composer_custom_addr,10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_TOADDRBOOK};
 static struct headerentry he_custom_free_templ={
    NULL,          NULL,          h_composer_custom_free,10, 0, NULL,
@@ -1407,7 +1408,7 @@
     ekey[0].ch    = ctrl('T');
     ekey[0].rval  = 2;
     ekey[0].name  = "^T";
-    ekey[0].label = "To AddrBk";
+    ekey[0].label = "a}C";
     ekey[1].ch    = -1;
 
     /*----------------------------------------------------------------------
@@ -3419,12 +3420,12 @@
     opts[i].ch      = 'y';
     opts[i].rval    = 'y';
     opts[i].name    = "Y";
-    opts[i++].label = "Yes";
+    opts[i++].label = "O";
 
     opts[i].ch      = 'n';
     opts[i].rval    = 'n';
     opts[i].name    = "N";
-    opts[i++].label = "No";
+    opts[i++].label = "_";
 
     if(filters){
 	/* set global_filter_pointer to desired filter or NULL if none */
