diff --git a/library/lafite/LAFITECOMMANDS b/library/lafite/LAFITECOMMANDS
index 2719daeb..62ed44c9 100644
--- a/library/lafite/LAFITECOMMANDS
+++ b/library/lafite/LAFITECOMMANDS
@@ -1,9 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "30-Sep-2021 22:58:57" 
-{DSK}<USERS>KAPLAN>LOCAL>MEDLEY3.5>GIT-MEDLEY>LIBRARY>LAFITE>LAFITECOMMANDS.;1 163531 
 
-      previous date%: "28-Jun-99 10:23:32" 
-{DSK}<USERS>KAPLAN>LOCAL>MEDLEY3.5>GIT-MEDLEY>LIBRARY>LAFITE>LAFITECOMMANDS.;1)
+(FILECREATED " 7-Feb-2022 12:04:09" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>lafite>LAFITECOMMANDS.;2 164626 
+
+      :CHANGES-TO (FILES LAFITEDECLS)
+                  (FNS \LAFITE.HARDCOPY.PROC \LAFITE.HARDCOPY.HEADERS)
+
+      :PREVIOUS-DATE "30-Sep-2021 22:58:57" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>lafite>LAFITECOMMANDS.;1)
 
 
 (* ; "
@@ -688,28 +692,26 @@ Copyright (c) 1988-1989, 1992-1993, 1999, 2021 by Xerox Corporation.
 
 (ADDTOVAR LAFITE.EXTRA.DISPLAY.COMMANDS ("Looks" '\LAFITE.SET.LOOKS.FROM.MENU 
                    "Change the appearance of the selected text, or whole message if nothing selected"
-                                                   )
-                                            ("Hardcopy" '\LAFITE.HARDCOPY.FROM.DISPLAY 
-                                                   "Hardcopy this message in its current appearance")
-                                            ("Unhide" '\LAFITE.UNHIDE.HEADERS 
+                                               )
+                                        ("Hardcopy" '\LAFITE.HARDCOPY.FROM.DISPLAY 
+                                               "Hardcopy this message in its current appearance")
+                                        ("Unhide" '\LAFITE.UNHIDE.HEADERS 
                                                "Display the header fields that are hidden from view."
-                                                   (SUBITEMS ("Hide" '\LAFITE.REHIDE.HEADERS 
+                                               (SUBITEMS ("Hide" '\LAFITE.REHIDE.HEADERS 
                                                           "Hide uninteresting fields from view again"
-                                                                    ))))
+                                                                ))))
 
 (ADDTOVAR LAFITE.LOOKS.SUBCOMMANDS ("VP Line Breaks" 'LAFITE.SUBSTITUTE.VP.EOL 
-                                             "Replace the Viewpoint end of line character with ours."
-                                              )
-                                       ("Lowercase" 'LAFITE.SET.LOWER.CASE 
-                                              "Lowercase the region or whole message.")
-                                       ("Spread Paragraphs" 'LAFITE.SET.PARA.SEPARATION 
+                                          "Replace the Viewpoint end of line character with ours.")
+                                   ("Lowercase" 'LAFITE.SET.LOWER.CASE 
+                                          "Lowercase the region or whole message.")
+                                   ("Spread Paragraphs" 'LAFITE.SET.PARA.SEPARATION 
                                       "Separate paragraphs by 10 points (useful for Tioga messages)."
-                                              )
-                                       ("Default" '\LAFITE.SET.DEFAULT.LOOKS 
-                                              "Change selection (or whole text) back to default font"
-                                              )
-                                       ("Fixed Width" '\LAFITE.SET.FIXED.LOOKS 
-                                              "Change selection (or whole text) to fixed-width font"))
+                                          )
+                                   ("Default" '\LAFITE.SET.DEFAULT.LOOKS 
+                                          "Change selection (or whole text) back to default font")
+                                   ("Fixed Width" '\LAFITE.SET.FIXED.LOOKS 
+                                          "Change selection (or whole text) to fixed-width font"))
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS \LAFITE.DISPLAY.COMMANDS)
@@ -1207,16 +1209,14 @@ Copyright (c) 1988-1989, 1992-1993, 1999, 2021 by Xerox Corporation.
 
 (ADDTOVAR LAFITEEXTRAMENUITEMS ("Enable MoveTo Menu" '\LAFITE.ENABLE.MOVE.MENU 
                            "Attach a menu of folders for accelerated MoveTo (or modify existing one)"
-                                          (SUBITEMS ("Restore MoveTo Menu" 
-                                                           '\LAFITE.RESTORE.MOVE.MENU 
+                                      (SUBITEMS ("Restore MoveTo Menu" '\LAFITE.RESTORE.MOVE.MENU 
                                                 "Just reopen the attached MoveTo menu if it existed."
-                                                           )))
-                                   ("Copy To" '\LAFITE.COPYTO 
-                                          "Like MoveTo, but don't delete the message(s)."))
+                                                       )))
+                               ("Copy To" '\LAFITE.COPYTO 
+                                      "Like MoveTo, but don't delete the message(s)."))
 
 (ADDTOVAR LAFITE.EXTRA.MOVE.ITEMS ("---Display---" '\LAFITE.DISPLAY "Display the next message")
-                                      ("---Delete---" '\LAFITE.DELETE 
-                                             "Delete the selected message(s)"))
+                                  ("---Delete---" '\LAFITE.DELETE "Delete the selected message(s)"))
 
 (RPAQ? LAFITE.AUTO.MOVE.MENU )
 
@@ -2225,7 +2225,8 @@ Copyright (c) 1988-1989, 1992-1993, 1999, 2021 by Xerox Corporation.
            'MESSAGEHARDCOPIER])
 
 (\LAFITE.HARDCOPY.PROC
-  [LAMBDA (MAILFOLDER ITEM MENU MSGLST BATCHFLG)         (* ; "Edited 23-Aug-88 15:37 by bvm")
+  [LAMBDA (MAILFOLDER ITEM MENU MSGLST BATCHFLG)             (* ; "Edited  7-Feb-2022 12:00 by rmk")
+                                                             (* ; "Edited 23-Aug-88 15:37 by bvm")
     (PROG (LCASEFILENAME TEXTSTREAM)
           (RESETLST
               (LA.RESETSHADE ITEM MENU (AND BATCHFLG LAFITEHARDCOPYBATCHSHADE))
@@ -2238,8 +2239,8 @@ Copyright (c) 1988-1989, 1992-1993, 1999, 2021 by Xerox Corporation.
                            (SETQ LCASEFILENAME (L-CASE (fetch (MAILFOLDER FULLFOLDERNAME)
                                                           of MAILFOLDER)))
                            [SETQ TEXTSTREAM (COND
-                                               [(AND BATCHFLG (SETQ CONTINUEFLG (fetch
-                                                                                 (MAILFOLDER 
+                                               [(AND BATCHFLG (SETQ CONTINUEFLG (fetch (MAILFOLDER
+                                                                                        
                                                                                        HARDCOPYSTREAM
                                                                                         )
                                                                                    of MAILFOLDER]
@@ -2247,22 +2248,23 @@ Copyright (c) 1988-1989, 1992-1993, 1999, 2021 by Xerox Corporation.
                                                      LAFITEHARDCOPY.MIN.TOC
                                                      (>= (LENGTH MSGLST)
                                                          LAFITEHARDCOPY.MIN.TOC))
-                                                (\LAFITE.HARDCOPY.HEADERS MAILFOLDER 
-                                                       LCASEFILENAME MSGLST))
+                                                (\LAFITE.HARDCOPY.HEADERS MAILFOLDER LCASEFILENAME 
+                                                       MSGLST))
                                                (T            (* ; "Start fresh")
-                                                  (OPENTEXTSTREAM "" NIL NIL NIL (LIST 'FONT 
+                                                  (OPENTEXTSTREAM NIL NIL NIL NIL (LIST 'FONT 
                                                                                    LAFITEHARDCOPYFONT
-                                                                                       ]
+                                                                                        ]
                            (\LAFITE.HARDCOPY.BODIES MAILFOLDER TEXTSTREAM MSGLST CONTINUEFLG)
                            (COND
-                              (BATCHFLG (\LAFITE.MARK.HARDCOPIED MAILFOLDER MSGLST 
-                                               HARDCOPYBATCHMARK)
-                                     (replace (MAILFOLDER HARDCOPYSTREAM) of MAILFOLDER
-                                        with TEXTSTREAM)
+                              (BATCHFLG (\LAFITE.MARK.HARDCOPIED MAILFOLDER MSGLST HARDCOPYBATCHMARK)
+                                     (replace (MAILFOLDER HARDCOPYSTREAM) of MAILFOLDER with 
+                                                                                           TEXTSTREAM
+                                            )
                                      (replace (MAILFOLDER HARDCOPYMESSAGES) of MAILFOLDER
-                                        with (NCONC (fetch (MAILFOLDER HARDCOPYMESSAGES)
-                                                           of MAILFOLDER)
-                                                        MSGLST))
+                                        with (NCONC (fetch (MAILFOLDER HARDCOPYMESSAGES) of 
+                                                                                           MAILFOLDER
+                                                           )
+                                                    MSGLST))
                                      (SETQ TEXTSTREAM]))
           (COND
              (TEXTSTREAM                                     (* ; "Send to printer now...")
@@ -2270,48 +2272,51 @@ Copyright (c) 1988-1989, 1992-1993, 1999, 2021 by Xerox Corporation.
 
 (\LAFITE.HARDCOPY.HEADERS
   [LAMBDA (MAILFOLDER LCASEFILENAME MESSAGES INCLUDE# TEXTSTREAM)
+                                                             (* ; "Edited  7-Feb-2022 12:01 by rmk")
                                                              (* ; "Edited  3-Jun-88 17:50 by bvm")
     (PROG ((OUTPUTFILE (OPENSTREAM '{NODIRCORE} 'BOTH 'NEW))
            TITLELEN TITLE TOCSTART TOCLEN FROMSTR SUBJLEFT DATELEFT TABSTOPS)
           (LINELENGTH MAX.SMALLP OUTPUTFILE)
-          (for MSG in MESSAGES as N from 1
-             do 
+          (for MSG in MESSAGES as N from 1 do 
+                                              (* ;; 
+                                  "Each line consists of [<tab>#.<tab>]date<tab>from<tab>subject<cr>")
 
-                   (* ;; "Each line consists of [<tab>#.<tab>]date<tab>from<tab>subject<cr>")
-
-                   (OR (fetch (LAFITEMSG PARSED?) of MSG)
-                       (LAFITE.PARSE.MSG.FOR.TOC MSG MAILFOLDER))
-                   (POSITION OUTPUTFILE 0)
-                   [COND
-                      (INCLUDE# (\OUTCHAR OUTPUTFILE (CHARCODE TAB))
-                             (CL:FORMAT OUTPUTFILE "~D." N)
-                             (\OUTCHAR OUTPUTFILE (CHARCODE TAB]
-                   (PRIN3 (OR (fetch (LAFITEMSG DATE) of MSG)
-                              UNSUPPLIEDFIELDSTR)
-                          OUTPUTFILE)
-                   (\OUTCHAR OUTPUTFILE (CHARCODE TAB))
-                   (PRIN3 (OR (COND
-                                 ((fetch (LAFITEMSG MSGFROMMEP) of MSG)
-                                  (PRIN3 "To: " OUTPUTFILE)
-                                  (OR (fetch (LAFITEMSG TO) of MSG)
-                                      (LAFITE.FETCH.TO.FIELD MSG MAILFOLDER)))
-                                 (T (fetch (LAFITEMSG FROM) of MSG)))
-                              UNSUPPLIEDFIELDSTR)
-                          OUTPUTFILE)
-                   (\OUTCHAR OUTPUTFILE (CHARCODE TAB))
-                   (PRIN3 (OR (fetch (LAFITEMSG SUBJECT) of MSG)
-                              UNSUPPLIEDFIELDSTR)
-                          OUTPUTFILE)
-                   (TERPRI OUTPUTFILE))
+                                              (OR (fetch (LAFITEMSG PARSED?) of MSG)
+                                                  (LAFITE.PARSE.MSG.FOR.TOC MSG MAILFOLDER))
+                                              (POSITION OUTPUTFILE 0)
+                                              [COND
+                                                 (INCLUDE# (\OUTCHAR OUTPUTFILE (CHARCODE TAB))
+                                                        (CL:FORMAT OUTPUTFILE "~D." N)
+                                                        (\OUTCHAR OUTPUTFILE (CHARCODE TAB]
+                                              (PRIN3 (OR (fetch (LAFITEMSG DATE) of MSG)
+                                                         UNSUPPLIEDFIELDSTR)
+                                                     OUTPUTFILE)
+                                              (\OUTCHAR OUTPUTFILE (CHARCODE TAB))
+                                              (PRIN3 (OR (COND
+                                                            ((fetch (LAFITEMSG MSGFROMMEP)
+                                                                of MSG)
+                                                             (PRIN3 "To: " OUTPUTFILE)
+                                                             (OR (fetch (LAFITEMSG TO) of MSG)
+                                                                 (LAFITE.FETCH.TO.FIELD MSG 
+                                                                        MAILFOLDER)))
+                                                            (T (fetch (LAFITEMSG FROM) of MSG)))
+                                                         UNSUPPLIEDFIELDSTR)
+                                                     OUTPUTFILE)
+                                              (\OUTCHAR OUTPUTFILE (CHARCODE TAB))
+                                              (PRIN3 (OR (fetch (LAFITEMSG SUBJECT) of MSG)
+                                                         UNSUPPLIEDFIELDSTR)
+                                                     OUTPUTFILE)
+                                              (TERPRI OUTPUTFILE))
           (SETQ OUTPUTFILE (OPENSTREAM (CLOSEF OUTPUTFILE)
                                   'INPUT))
           (SETQ TITLE (CL:FORMAT NIL "Messages from ~A~%%Listed on ~A~%%~%%" LCASEFILENAME (DATE)))
           (SETQ TITLELEN (NCHARS TITLE))
           [COND
              (TEXTSTREAM                                     (* ; 
-                                         "Need to insert all this stuff at beginning of textstream")
+                                           "Need to insert all this stuff at beginning of textstream")
                     (TEDIT.INSERT TEXTSTREAM TITLE 1))
-             (T (SETQ TEXTSTREAM (OPENTEXTSTREAM TITLE (AND NIL (CREATEW NIL "Lafite headers"))
+             (T (SETQ TEXTSTREAM (OPENTEXTSTREAM (OPENSTRINGSTREAM TITLE)
+                                        (AND NIL (CREATEW NIL "Lafite headers"))
                                         NIL NIL (LIST 'FONT LAFITEHARDCOPYFONT]
           (PROGN                                             (* ; "Make title centered")
                  (TEDIT.PARALOOKS TEXTSTREAM '(QUAD CENTERED)
@@ -2325,7 +2330,7 @@ Copyright (c) 1988-1989, 1992-1993, 1999, 2021 by Xerox Corporation.
                  (TEDIT.INSERT TEXTSTREAM [CONSTANT (CONCATCODES (CHARCODE (FF]
                         (+ TOCSTART TOCLEN)))                (* ; "Formfeed after the insertion")
           (PROGN                                             (* ; 
-                                             "Now give the toc lines the appropriate tab settings.")
+                                               "Now give the toc lines the appropriate tab settings.")
                  (SETQ DATELEFT (COND
                                    (INCLUDE# 30)
                                    (T 0)))
@@ -2335,7 +2340,7 @@ Copyright (c) 1988-1989, 1992-1993, 1999, 2021 by Xerox Corporation.
                                             'LEFT]
                  [COND
                     (INCLUDE# (push TABSTOPS '(20 . RIGHT)
-                                     (CONS DATELEFT 'LEFT]
+                                    (CONS DATELEFT 'LEFT]
                  (TEDIT.PARALOOKS TEXTSTREAM `(TABS (NIL ,@TABSTOPS)
                                                     LEFTMARGIN
                                                     ,(+ SUBJLEFT 20))
@@ -2492,7 +2497,7 @@ Copyright (c) 1988-1989, 1992-1993, 1999, 2021 by Xerox Corporation.
 
 (ADDTOVAR LAFITEEXTRAMENUITEMS ("Cancel Pending Hardcopy" '\LAFITE.CANCEL.HARDCOPY 
                                   "Forget about hardcopying the messages so far marked for hardcopy."
-                                          ))
+                                      ))
 
 (RPAQ? LAFITEHARDCOPYBATCHFLG NIL)
 
@@ -2546,37 +2551,37 @@ Copyright (c) 1988-1989, 1992-1993, 1999, 2021 by Xerox Corporation.
 )
 (PUTPROPS LAFITECOMMANDS COPYRIGHT ("Xerox Corporation" 1988 1989 1992 1993 1999 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (7824 27492 (\LAFITE.DISPLAY 7834 . 9539) (\LAFITE.DO.DISPLAY 9541 . 13706) (
-SELECTMESSAGETODISPLAY 13708 . 16076) (MESSAGEDISPLAYER 16078 . 23494) (LA.COPY.MESSAGE.TEXT 23496 . 
-24250) (\LAFITE.CLOSE.DISPLAYWINDOWS 24252 . 25846) (\LAFITE.CLOSE.DISPLAYER 25848 . 27490)) (27493 
-36085 (\LAFITE.UNHIDE.HEADERS 27503 . 28593) (\LAFITE.HIDE.HEADERS 28595 . 29248) (
-\LAFITE.REHIDE.HEADERS 29250 . 30286) (LAFITE.EAT.UNDESIRABLE.FIELD 30288 . 31047) (LAFITE.EAT.GVGV 
-31049 . 32210) (\LAFITE.HARDCOPY.FROM.DISPLAY 32212 . 35731) (LAFITE.HARDCOPY.TAB.WIDTH 35733 . 36083)
-) (36086 44389 (\LAFITE.SET.LOOKS.FROM.MENU 36096 . 36273) (\LAFITE.SET.DEFAULT.LOOKS 36275 . 36466) (
-\LAFITE.SET.FIXED.LOOKS 36468 . 36660) (LAFITE.SET.LOOKS 36662 . 41119) (LAFITE.SET.TAB.LOOKS 41121 . 
-41832) (LAFITE.SET.PARA.SEPARATION 41834 . 42042) (LAFITE.SET.LOWER.CASE 42044 . 42895) (
-LAFITE.SUBSTITUTE.VP.EOL 42897 . 44387)) (46459 54787 (LAFITE.DELETE.MESSAGES 46469 . 47519) (
-\LAFITE.DELETE 47521 . 48708) (DISPLAYAFTERDELETE 48710 . 53436) (\LAFITE.SELECT.NEXT 53438 . 54076) (
-\LAFITE.UNDELETE 54078 . 54785)) (54809 69304 (LAFITE.MOVE.MESSAGES 54819 . 55466) (\COERCE.TO.MSGLST 
-55468 . 56226) (\LAFITE.MOVETO 56228 . 60172) (\LAFITE.COPYTO 60174 . 60590) (\LAFITE.MOVETO.PROC 
-60592 . 61862) (\LAFITE.MOVE.MESSAGES.INTERNAL 61864 . 69302)) (69330 77882 (\LAFITE.ENABLE.MOVE.MENU 
-69340 . 70382) (\LAFITE.ADD.TO.MOVE.MENU 70384 . 71400) (\LAFITE.UPDATE.MOVE.MENU 71402 . 76042) (
-\LAFITE.RESTORE.MOVE.MENU 76044 . 76720) (\LAFITE.HANDLE.AUTO.MOVE 76722 . 77880)) (78864 96348 (
-\LAFITE.UPDATE 78874 . 84507) (\LAFITE.EXPUNGE.PROC 84509 . 85314) (\LAFITE.UPDATE.PROC 85316 . 86399)
- (\LAFITE.HARDCOPYONLY.PROC 86401 . 86843) (LAB.CHOOSE.UPDATE.MENU 86845 . 87626) (
-LAB.CREATE.UPDATE.MENU 87628 . 89527) (LAB.UPDATE.NEEDED? 89529 . 91099) (\LAFITE.START.UPDATE 91101
- . 92133) (LAB.START.COMMAND 92135 . 92985) (\LAFITE.FINISH.UPDATE 92987 . 95240) (
-\LAFITE.CLOSE.OTHER.FOLDERS 95242 . 96346)) (96349 131143 (LAB.FLUSHWINDOW 96359 . 98038) (
-LAB.APPENDMESSAGES 98040 . 101202) (\LAFITE.COMPACT.FOLDER 101204 . 105368) (\LAFITE.COMPACT.FOLDER1 
-105370 . 121409) (\LAFITE.COMPACT.FOLDER2 121411 . 126125) (\LAFITE.COMPACT.EXTRA 126127 . 128442) (
-\LAFITE.INVALIDATE.TOC 128444 . 129137) (\LAFITE.RENAMEFILE 129139 . 129609) (SMART-RENAMEFILEP 129611
- . 130171) (LA.OPENTEMPFILE 130173 . 131141)) (131144 144486 (\LAFITE.UPDATE.FOLDER 131154 . 133131) (
-\LAFITE.UPDATE.CONTENTS 133133 . 133850) (\LAFITE.UPDATE.CONTENTS1 133852 . 138706) (WRITETOCENTRY 
-138708 . 141826) (WRITETOCMARKBYTES 141828 . 142070) (WRITEFOLDERMARKBYTES 142072 . 144484)) (144512 
-162219 (LAFITE.HARDCOPY.MESSAGES 144522 . 144982) (\LAFITE.HARDCOPY 144984 . 145319) (
-\LAFITE.HARDCOPY.PROC 145321 . 148539) (\LAFITE.HARDCOPY.HEADERS 148541 . 152862) (
-\LAFITE.MARK.HARDCOPIED 152864 . 154574) (\LAFITE.TRANSMIT.HARDCOPY 154576 . 156166) (
-\LAFITE.HARDCOPY.BODIES 156168 . 157410) (\LAFITE.APPEND.MESSAGE.BODY 157412 . 159520) (
-\LAFITE.DO.PENDING.HARDCOPY 159522 . 160597) (\LAFITE.CANCEL.HARDCOPY 160599 . 161315) (
-\LAFITE.CLEAR.HARDCOPY.STATE 161317 . 162217)))))
+  (FILEMAP (NIL (7934 27602 (\LAFITE.DISPLAY 7944 . 9649) (\LAFITE.DO.DISPLAY 9651 . 13816) (
+SELECTMESSAGETODISPLAY 13818 . 16186) (MESSAGEDISPLAYER 16188 . 23604) (LA.COPY.MESSAGE.TEXT 23606 . 
+24360) (\LAFITE.CLOSE.DISPLAYWINDOWS 24362 . 25956) (\LAFITE.CLOSE.DISPLAYER 25958 . 27600)) (27603 
+36195 (\LAFITE.UNHIDE.HEADERS 27613 . 28703) (\LAFITE.HIDE.HEADERS 28705 . 29358) (
+\LAFITE.REHIDE.HEADERS 29360 . 30396) (LAFITE.EAT.UNDESIRABLE.FIELD 30398 . 31157) (LAFITE.EAT.GVGV 
+31159 . 32320) (\LAFITE.HARDCOPY.FROM.DISPLAY 32322 . 35841) (LAFITE.HARDCOPY.TAB.WIDTH 35843 . 36193)
+) (36196 44499 (\LAFITE.SET.LOOKS.FROM.MENU 36206 . 36383) (\LAFITE.SET.DEFAULT.LOOKS 36385 . 36576) (
+\LAFITE.SET.FIXED.LOOKS 36578 . 36770) (LAFITE.SET.LOOKS 36772 . 41229) (LAFITE.SET.TAB.LOOKS 41231 . 
+41942) (LAFITE.SET.PARA.SEPARATION 41944 . 42152) (LAFITE.SET.LOWER.CASE 42154 . 43005) (
+LAFITE.SUBSTITUTE.VP.EOL 43007 . 44497)) (46416 54744 (LAFITE.DELETE.MESSAGES 46426 . 47476) (
+\LAFITE.DELETE 47478 . 48665) (DISPLAYAFTERDELETE 48667 . 53393) (\LAFITE.SELECT.NEXT 53395 . 54033) (
+\LAFITE.UNDELETE 54035 . 54742)) (54766 69261 (LAFITE.MOVE.MESSAGES 54776 . 55423) (\COERCE.TO.MSGLST 
+55425 . 56183) (\LAFITE.MOVETO 56185 . 60129) (\LAFITE.COPYTO 60131 . 60547) (\LAFITE.MOVETO.PROC 
+60549 . 61819) (\LAFITE.MOVE.MESSAGES.INTERNAL 61821 . 69259)) (69287 77839 (\LAFITE.ENABLE.MOVE.MENU 
+69297 . 70339) (\LAFITE.ADD.TO.MOVE.MENU 70341 . 71357) (\LAFITE.UPDATE.MOVE.MENU 71359 . 75999) (
+\LAFITE.RESTORE.MOVE.MENU 76001 . 76677) (\LAFITE.HANDLE.AUTO.MOVE 76679 . 77837)) (78695 96179 (
+\LAFITE.UPDATE 78705 . 84338) (\LAFITE.EXPUNGE.PROC 84340 . 85145) (\LAFITE.UPDATE.PROC 85147 . 86230)
+ (\LAFITE.HARDCOPYONLY.PROC 86232 . 86674) (LAB.CHOOSE.UPDATE.MENU 86676 . 87457) (
+LAB.CREATE.UPDATE.MENU 87459 . 89358) (LAB.UPDATE.NEEDED? 89360 . 90930) (\LAFITE.START.UPDATE 90932
+ . 91964) (LAB.START.COMMAND 91966 . 92816) (\LAFITE.FINISH.UPDATE 92818 . 95071) (
+\LAFITE.CLOSE.OTHER.FOLDERS 95073 . 96177)) (96180 130974 (LAB.FLUSHWINDOW 96190 . 97869) (
+LAB.APPENDMESSAGES 97871 . 101033) (\LAFITE.COMPACT.FOLDER 101035 . 105199) (\LAFITE.COMPACT.FOLDER1 
+105201 . 121240) (\LAFITE.COMPACT.FOLDER2 121242 . 125956) (\LAFITE.COMPACT.EXTRA 125958 . 128273) (
+\LAFITE.INVALIDATE.TOC 128275 . 128968) (\LAFITE.RENAMEFILE 128970 . 129440) (SMART-RENAMEFILEP 129442
+ . 130002) (LA.OPENTEMPFILE 130004 . 130972)) (130975 144317 (\LAFITE.UPDATE.FOLDER 130985 . 132962) (
+\LAFITE.UPDATE.CONTENTS 132964 . 133681) (\LAFITE.UPDATE.CONTENTS1 133683 . 138537) (WRITETOCENTRY 
+138539 . 141657) (WRITETOCMARKBYTES 141659 . 141901) (WRITEFOLDERMARKBYTES 141903 . 144315)) (144343 
+163318 (LAFITE.HARDCOPY.MESSAGES 144353 . 144813) (\LAFITE.HARDCOPY 144815 . 145150) (
+\LAFITE.HARDCOPY.PROC 145152 . 148630) (\LAFITE.HARDCOPY.HEADERS 148632 . 153961) (
+\LAFITE.MARK.HARDCOPIED 153963 . 155673) (\LAFITE.TRANSMIT.HARDCOPY 155675 . 157265) (
+\LAFITE.HARDCOPY.BODIES 157267 . 158509) (\LAFITE.APPEND.MESSAGE.BODY 158511 . 160619) (
+\LAFITE.DO.PENDING.HARDCOPY 160621 . 161696) (\LAFITE.CANCEL.HARDCOPY 161698 . 162414) (
+\LAFITE.CLEAR.HARDCOPY.STATE 162416 . 163316)))))
 STOP
diff --git a/library/lafite/LAFITECOMMANDS.LCOM b/library/lafite/LAFITECOMMANDS.LCOM
index 97a061df..a5b32a9f 100644
Binary files a/library/lafite/LAFITECOMMANDS.LCOM and b/library/lafite/LAFITECOMMANDS.LCOM differ
diff --git a/library/lafite/LAFITEFOLDERS b/library/lafite/LAFITEFOLDERS
index 99f60a2f..a4c215fe 100644
--- a/library/lafite/LAFITEFOLDERS
+++ b/library/lafite/LAFITEFOLDERS
@@ -1,18 +1,62 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-(FILECREATED " 2-Nov-89 18:16:37" "{pooh/n}<pooh>lafite>sources>lafitefolders;9" 42102  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (FNS PROMPTFORFILENAME \LAFITE.RENAME.FOLDER)
+(FILECREATED " 7-Feb-2022 12:04:09" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>lafite>LAFITEFOLDERS.;2 44421  
 
-      previous date%: "29-Aug-89 11:11:20" "{pooh/n}<pooh>lafite>sources>lafitefolders;8")
+      :CHANGES-TO (FNS \LAFITE.MAKE.RANDOM.DISPLAY)
+
+      :PREVIOUS-DATE " 2-Nov-89 18:16:37" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>lafite>LAFITEFOLDERS.;1)
 
 
-(* "
-Copyright (c) 1989 by Xerox Corporation.  All rights reserved.
+(* ; "
+Copyright (c) 1989 by Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT LAFITEFOLDERSCOMS)
 
-(RPAQQ LAFITEFOLDERSCOMS ((* ;; "Maintenance of Lafite's folder structures, menus etc.") (COMS (* ; "The profile") (FNS \LAFITE.READ.PROFILE \LAFITE.PROCESS.PROFILE \LAFITE.WRITE.PROFILE \LAFITE.MERGE.NAMELISTS \LAFITE.READ.OLD.PROFILE \LAFITE.MERGE.FOLDERS \LAFITE.MERGE.STRUCTURES \LAFITE.REPACK.FOLDERS) (INITVARS (\LAFITEPROFILECHANGED) (LAFITEMAILFOLDERS) (\LAFITEPROFILEDATE)) (ADDVARS (LAFITE.PROFILE.VARS (*LA.ABBREVS.IN.PROFILE*) (LAFITEMAILFOLDERS \LAFITE.MERGE.FOLDERS) (LAFITEFORMFILES \LAFITE.MERGE.NAMELISTS) (LAFITE.FOLDER.STRUCTURE \LAFITE.MERGE.STRUCTURES)))) (COMS (* ; "Prompting for folders") (FNS \LAFITE.PROMPTFORFOLDER PROMPTFORFILENAME MAKELAFITEMAILFOLDERSMENU MAKELAFITEFOLDERSMENUITEMS LAFITE.GROUP.ITEM \LAFITE.ARRANGE.MENU \LAFITE.MAKE.FOLDER.MENU LAFITE.SELECT.FOLDERS LAFITE.SELECT.MULTIPLE \LAFITE.HANDLE.MULTIPLE.SELECTION COLLECT.SHADED.ITEMS) (INITVARS (LAFITE.2COLUMN.MENU.MIN.ITEMS 10) (LAFITEFOLDERSMENU) (LAFITEMULTIPLEFOLDERSMENU)) (ADDVARS (LAFITEMENUVARS LAFITEFOLDERSMENU LAFITEMULTIPLEFOLDERSMENU))) (COMS (* ; "Name hacking") (FNS LA.LONGFILENAME LA.SHORTFILENAME FORGETMAILFILE \LAFITE.FOLDER.NAME.CHANGED \LAFITE.CHANGE.NAME.IN.LIST \LAFITE.RECOMPUTE.FOLDER.NAMES \LAFITE.NEW.SHORT.NAME \LAFITE.NOTICE.FILE \LAFITE.UNCACHE.FOLDER) (INITVARS LAFITE.HOST.ABBREVS \LAFITE.PSEUDO.DEVICES)) (COMS (* ; "Hacking the hierarchy") (FNS \LAFITE.NOTICE.FOLDERS \LAFITE.GC.FOLDERS \LAFITE.GC.FOLDERS.CONFIRM \LAFITE.MAKE.RANDOM.DISPLAY \LAFITE.CHANGE.FOLDER.LIST \LAFITE.RENAME.FOLDER \LAFITE.ADD.NEW.GROUP \LAFITE.CHECK.GROUP.NAME \LAFITE.CHANGE.GROUP.MEMBERS \LAFITE.SELECT.GROUP.FOLDERS \LAFITE.CHANGE.SUBGROUPS \LAFITE.CHANGE.TOP.GROUPS \LAFITE.DELETE.GROUP LAFITE.RENAME.GROUP \LAFITE.EDIT.HIERARCHY LAFITE.FIND.GROUP UALPHORDERCAR) (VARS LAFITE.SPACER.MENU.ITEM LAFITE.GROUP.COMMANDS (LAFITE.GROUP.COMMANDS.MENU))) (DECLARE%: EVAL@COMPILE DONTCOPY (FILES (SOURCE) LAFITEDECLS) (LOCALVARS . T) (GLOBALVARS MENUFONT LAFITE.GROUP.COMMANDS.MENU LAFITE.GROUP.COMMANDS) (P (CL:PROCLAIM (QUOTE (CL:SPECIAL *LA.ABBREVS.IN.PROFILE*)))))))
+(RPAQQ LAFITEFOLDERSCOMS
+       [
+        (* ;; "Maintenance of Lafite's folder structures, menus etc.")
+
+        [COMS                                                (* ; "The profile")
+              (FNS \LAFITE.READ.PROFILE \LAFITE.PROCESS.PROFILE \LAFITE.WRITE.PROFILE 
+                   \LAFITE.MERGE.NAMELISTS \LAFITE.READ.OLD.PROFILE \LAFITE.MERGE.FOLDERS 
+                   \LAFITE.MERGE.STRUCTURES \LAFITE.REPACK.FOLDERS)
+              (INITVARS (\LAFITEPROFILECHANGED)
+                     (LAFITEMAILFOLDERS)
+                     (\LAFITEPROFILEDATE))
+              (ADDVARS (LAFITE.PROFILE.VARS (*LA.ABBREVS.IN.PROFILE*)
+                              (LAFITEMAILFOLDERS \LAFITE.MERGE.FOLDERS)
+                              (LAFITEFORMFILES \LAFITE.MERGE.NAMELISTS)
+                              (LAFITE.FOLDER.STRUCTURE \LAFITE.MERGE.STRUCTURES]
+        (COMS                                                (* ; "Prompting for folders")
+              (FNS \LAFITE.PROMPTFORFOLDER PROMPTFORFILENAME MAKELAFITEMAILFOLDERSMENU 
+                   MAKELAFITEFOLDERSMENUITEMS LAFITE.GROUP.ITEM \LAFITE.ARRANGE.MENU 
+                   \LAFITE.MAKE.FOLDER.MENU LAFITE.SELECT.FOLDERS LAFITE.SELECT.MULTIPLE 
+                   \LAFITE.HANDLE.MULTIPLE.SELECTION COLLECT.SHADED.ITEMS)
+              (INITVARS (LAFITE.2COLUMN.MENU.MIN.ITEMS 10)
+                     (LAFITEFOLDERSMENU)
+                     (LAFITEMULTIPLEFOLDERSMENU))
+              (ADDVARS (LAFITEMENUVARS LAFITEFOLDERSMENU LAFITEMULTIPLEFOLDERSMENU)))
+        (COMS                                                (* ; "Name hacking")
+              (FNS LA.LONGFILENAME LA.SHORTFILENAME FORGETMAILFILE \LAFITE.FOLDER.NAME.CHANGED 
+                   \LAFITE.CHANGE.NAME.IN.LIST \LAFITE.RECOMPUTE.FOLDER.NAMES \LAFITE.NEW.SHORT.NAME
+                   \LAFITE.NOTICE.FILE \LAFITE.UNCACHE.FOLDER)
+              (INITVARS LAFITE.HOST.ABBREVS \LAFITE.PSEUDO.DEVICES))
+        (COMS                                                (* ; "Hacking the hierarchy")
+              (FNS \LAFITE.NOTICE.FOLDERS \LAFITE.GC.FOLDERS \LAFITE.GC.FOLDERS.CONFIRM 
+                   \LAFITE.MAKE.RANDOM.DISPLAY \LAFITE.CHANGE.FOLDER.LIST \LAFITE.RENAME.FOLDER 
+                   \LAFITE.ADD.NEW.GROUP \LAFITE.CHECK.GROUP.NAME \LAFITE.CHANGE.GROUP.MEMBERS 
+                   \LAFITE.SELECT.GROUP.FOLDERS \LAFITE.CHANGE.SUBGROUPS \LAFITE.CHANGE.TOP.GROUPS 
+                   \LAFITE.DELETE.GROUP LAFITE.RENAME.GROUP \LAFITE.EDIT.HIERARCHY LAFITE.FIND.GROUP
+                   UALPHORDERCAR)
+              (VARS LAFITE.SPACER.MENU.ITEM LAFITE.GROUP.COMMANDS (LAFITE.GROUP.COMMANDS.MENU)))
+        (DECLARE%: EVAL@COMPILE DONTCOPY (FILES (SOURCE)
+                                                LAFITEDECLS)
+               (LOCALVARS . T)
+               (GLOBALVARS MENUFONT LAFITE.GROUP.COMMANDS.MENU LAFITE.GROUP.COMMANDS)
+               (P (CL:PROCLAIM '(CL:SPECIAL *LA.ABBREVS.IN.PROFILE*])
 
 
 
@@ -58,13 +102,16 @@ Copyright (c) 1989 by Xerox Corporation.  All rights reserved.
 )
 )
 
-(RPAQ? \LAFITEPROFILECHANGED)
+(RPAQ? \LAFITEPROFILECHANGED )
 
-(RPAQ? LAFITEMAILFOLDERS)
+(RPAQ? LAFITEMAILFOLDERS )
 
-(RPAQ? \LAFITEPROFILEDATE)
+(RPAQ? \LAFITEPROFILEDATE )
 
-(ADDTOVAR LAFITE.PROFILE.VARS (*LA.ABBREVS.IN.PROFILE*) (LAFITEMAILFOLDERS \LAFITE.MERGE.FOLDERS) (LAFITEFORMFILES \LAFITE.MERGE.NAMELISTS) (LAFITE.FOLDER.STRUCTURE \LAFITE.MERGE.STRUCTURES))
+(ADDTOVAR LAFITE.PROFILE.VARS (*LA.ABBREVS.IN.PROFILE*)
+                              (LAFITEMAILFOLDERS \LAFITE.MERGE.FOLDERS)
+                              (LAFITEFORMFILES \LAFITE.MERGE.NAMELISTS)
+                              (LAFITE.FOLDER.STRUCTURE \LAFITE.MERGE.STRUCTURES))
 
 
 
@@ -117,13 +164,13 @@ Copyright (c) 1989 by Xerox Corporation.  All rights reserved.
 )
 )
 
-(RPAQ? LAFITE.2COLUMN.MENU.MIN.ITEMS 10)
+(RPAQ? LAFITE.2COLUMN.MENU.MIN.ITEMS 10)
 
-(RPAQ? LAFITEFOLDERSMENU)
+(RPAQ? LAFITEFOLDERSMENU )
 
-(RPAQ? LAFITEMULTIPLEFOLDERSMENU)
+(RPAQ? LAFITEMULTIPLEFOLDERSMENU )
 
-(ADDTOVAR LAFITEMENUVARS LAFITEFOLDERSMENU LAFITEMULTIPLEFOLDERSMENU)
+(ADDTOVAR LAFITEMENUVARS LAFITEFOLDERSMENU LAFITEMULTIPLEFOLDERSMENU)
 
 
 
@@ -168,9 +215,9 @@ Copyright (c) 1989 by Xerox Corporation.  All rights reserved.
 )
 )
 
-(RPAQ? LAFITE.HOST.ABBREVS NIL)
+(RPAQ? LAFITE.HOST.ABBREVS NIL)
 
-(RPAQ? \LAFITE.PSEUDO.DEVICES NIL)
+(RPAQ? \LAFITE.PSEUDO.DEVICES NIL)
 
 
 
@@ -192,8 +239,34 @@ Copyright (c) 1989 by Xerox Corporation.  All rights reserved.
 )
 
 (\LAFITE.MAKE.RANDOM.DISPLAY
-(LAMBDA (TITLE SAMPLESTRING INITIALCONTENT) (* ; "Edited 23-Aug-88 14:54 by bvm") (LET ((REG (WINDOWREGION LAFITESTATUSWINDOW)) (HEIGHT (HEIGHTIFWINDOW (TIMES 6 (FONTPROP NIL (QUOTE HEIGHT))) T)) BOTTOM WINDOW) (SETQ WINDOW (OPENTEXTSTREAM INITIALCONTENT (CREATEW (MAKEWITHINREGION (create REGION LEFT _ (fetch (REGION LEFT) of REG) BOTTOM _ (COND ((< (SETQ BOTTOM (- (fetch (REGION BOTTOM) of REG) HEIGHT)) 0) (* ; "tried placing it below status window, but that's off screen") (fetch (REGION TOP) of REG)) (T BOTTOM)) WIDTH _ (IMAX (FIXR (TIMES 1.5 (STRINGWIDTH SAMPLESTRING))) (TIMES 64 (CHARWIDTH (CHARCODE M)))) HEIGHT _ HEIGHT)) TITLE) NIL NIL (QUOTE (PROMPTWINDOW DON'T)))) (SETFILEPTR WINDOW -1) (LINELENGTH MAX.SMALLP WINDOW) WINDOW))
-)
+  [LAMBDA (TITLE SAMPLESTRING INITIALCONTENT)                (* ; "Edited  7-Feb-2022 11:59 by rmk")
+                                                             (* ; "Edited 23-Aug-88 14:54 by bvm")
+    (LET ((REG (WINDOWREGION LAFITESTATUSWINDOW))
+          (HEIGHT (HEIGHTIFWINDOW (TIMES 6 (FONTPROP NIL 'HEIGHT))
+                         T))
+          BOTTOM WINDOW)
+         [SETQ WINDOW (OPENTEXTSTREAM (OPENSTRINGSTREAM INITIALCONTENT)
+                             (CREATEW (MAKEWITHINREGION
+                                       (create REGION
+                                              LEFT _ (fetch (REGION LEFT) of REG)
+                                              BOTTOM _ (COND
+                                                          ((< (SETQ BOTTOM (- (fetch (REGION BOTTOM)
+                                                                                 of REG)
+                                                                              HEIGHT))
+                                                              0)
+                                                             (* ; 
+                                        "tried placing it below status window, but that's off screen")
+                                                           (fetch (REGION TOP) of REG))
+                                                          (T BOTTOM))
+                                              WIDTH _ [IMAX (FIXR (TIMES 1.5 (STRINGWIDTH 
+                                                                                    SAMPLESTRING)))
+                                                            (TIMES 64 (CHARWIDTH (CHARCODE M]
+                                              HEIGHT _ HEIGHT))
+                                    TITLE)
+                             NIL NIL '(PROMPTWINDOW DON'T]
+         (SETFILEPTR WINDOW -1)
+         (LINELENGTH MAX.SMALLP WINDOW)
+         WINDOW])
 
 (\LAFITE.CHANGE.FOLDER.LIST
 (LAMBDA (NEWFILES NEWCASEFILES NOTFOUND TEXTSTREAM) (* ; "Edited 12-Apr-89 16:34 by bvm") (* ;; "Change Lafite's set of folders by adding NEWFILES, removing NOTFOUND and renaming each (oldname . newname) in NEWCASEFILES.  Outputs %"Done%" to optional TEXTSTREAM") (for FILE in NEWFILES do (* ; "add these") (\LAFITE.FOLDER.NAME.CHANGED NIL FILE)) (for FILE in NOTFOUND do (* ; "forget these") (\LAFITE.FOLDER.NAME.CHANGED FILE NIL)) (for FILE in NEWCASEFILES do (* ; "Fix case on these") (\LAFITE.FOLDER.NAME.CHANGED (CAR FILE) (CDR FILE))) (if TEXTSTREAM then (* ; "Use TEDIT.INSERT here instead of printout to insure that scrolling occurs if needed.") (TEDIT.INSERT TEXTSTREAM "
@@ -247,14 +320,21 @@ Done." (ADD1 (GETEOFPTR TEXTSTREAM))))))
 (LAMBDA (X Y) (* ; "Edited 13-Apr-89 14:38 by bvm") (ALPHORDER (CAR X) (CAR Y) UPPERCASEARRAY)))
 )
 
-(RPAQQ LAFITE.SPACER.MENU.ITEM (#*(32 1)OOOOOOOO NIL "(this is not a choice)"))
+(RPAQQ LAFITE.SPACER.MENU.ITEM (#*(32 1)OOOOOOOO NIL "(this is not a choice)"))
 
-(RPAQQ LAFITE.GROUP.COMMANDS (("Delete Group" (QUOTE \LAFITE.DELETE.GROUP) "Remove this group from the hierarchy") ("Rename Group" (QUOTE LAFITE.RENAME.GROUP) "Change the name of this group") ("Change Members" (QUOTE \LAFITE.CHANGE.GROUP.MEMBERS) "Change the membership of this group") ("Change Subgroups" (QUOTE \LAFITE.CHANGE.SUBGROUPS) "Change the subgroups of this group") ("Create Subgroup" (QUOTE \LAFITE.ADD.NEW.GROUP) "Create a new group and make it a subgroup of this group")))
+(RPAQQ LAFITE.GROUP.COMMANDS
+       (("Delete Group" '\LAFITE.DELETE.GROUP "Remove this group from the hierarchy")
+        ("Rename Group" 'LAFITE.RENAME.GROUP "Change the name of this group")
+        ("Change Members" '\LAFITE.CHANGE.GROUP.MEMBERS "Change the membership of this group")
+        ("Change Subgroups" '\LAFITE.CHANGE.SUBGROUPS "Change the subgroups of this group")
+        ("Create Subgroup" '\LAFITE.ADD.NEW.GROUP 
+               "Create a new group and make it a subgroup of this group")))
 
-(RPAQQ LAFITE.GROUP.COMMANDS.MENU NIL)
+(RPAQQ LAFITE.GROUP.COMMANDS.MENU NIL)
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 
-(FILESLOAD (SOURCE) LAFITEDECLS)
+(FILESLOAD (SOURCE)
+       LAFITEDECLS)
 
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
@@ -267,27 +347,27 @@ Done." (ADD1 (GETEOFPTR TEXTSTREAM))))))
 )
 
 
-(CL:PROCLAIM (QUOTE (CL:SPECIAL *LA.ABBREVS.IN.PROFILE*)))
+(CL:PROCLAIM '(CL:SPECIAL *LA.ABBREVS.IN.PROFILE*))
 )
 (PUTPROPS LAFITEFOLDERS COPYRIGHT ("Xerox Corporation" 1989))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2597 10462 (\LAFITE.READ.PROFILE 2607 . 4811) (\LAFITE.PROCESS.PROFILE 4813 . 6003) (
-\LAFITE.WRITE.PROFILE 6005 . 7839) (\LAFITE.MERGE.NAMELISTS 7841 . 8575) (\LAFITE.READ.OLD.PROFILE 
-8577 . 9176) (\LAFITE.MERGE.FOLDERS 9178 . 9490) (\LAFITE.MERGE.STRUCTURES 9492 . 9692) (
-\LAFITE.REPACK.FOLDERS 9694 . 10460)) (10780 19324 (\LAFITE.PROMPTFORFOLDER 10790 . 11340) (
-PROMPTFORFILENAME 11342 . 12183) (MAKELAFITEMAILFOLDERSMENU 12185 . 12349) (MAKELAFITEFOLDERSMENUITEMS
- 12351 . 13466) (LAFITE.GROUP.ITEM 13468 . 14005) (\LAFITE.ARRANGE.MENU 14007 . 15289) (
-\LAFITE.MAKE.FOLDER.MENU 15291 . 15816) (LAFITE.SELECT.FOLDERS 15818 . 16203) (LAFITE.SELECT.MULTIPLE 
-16205 . 18549) (\LAFITE.HANDLE.MULTIPLE.SELECTION 18551 . 19023) (COLLECT.SHADED.ITEMS 19025 . 19322))
- (19529 28038 (LA.LONGFILENAME 19539 . 21414) (LA.SHORTFILENAME 21416 . 23239) (FORGETMAILFILE 23241
- . 23701) (\LAFITE.FOLDER.NAME.CHANGED 23703 . 24926) (\LAFITE.CHANGE.NAME.IN.LIST 24928 . 25307) (
-\LAFITE.RECOMPUTE.FOLDER.NAMES 25309 . 26730) (\LAFITE.NEW.SHORT.NAME 26732 . 27413) (
-\LAFITE.NOTICE.FILE 27415 . 27596) (\LAFITE.UNCACHE.FOLDER 27598 . 28036)) (28146 41112 (
-\LAFITE.NOTICE.FOLDERS 28156 . 29796) (\LAFITE.GC.FOLDERS 29798 . 30885) (\LAFITE.GC.FOLDERS.CONFIRM 
-30887 . 31697) (\LAFITE.MAKE.RANDOM.DISPLAY 31699 . 32477) (\LAFITE.CHANGE.FOLDER.LIST 32479 . 33232) 
-(\LAFITE.RENAME.FOLDER 33234 . 34964) (\LAFITE.ADD.NEW.GROUP 34966 . 35691) (\LAFITE.CHECK.GROUP.NAME 
-35693 . 36044) (\LAFITE.CHANGE.GROUP.MEMBERS 36046 . 36421) (\LAFITE.SELECT.GROUP.FOLDERS 36423 . 
-37429) (\LAFITE.CHANGE.SUBGROUPS 37431 . 38082) (\LAFITE.CHANGE.TOP.GROUPS 38084 . 38792) (
-\LAFITE.DELETE.GROUP 38794 . 39376) (LAFITE.RENAME.GROUP 39378 . 40234) (\LAFITE.EDIT.HIERARCHY 40236
- . 40795) (LAFITE.FIND.GROUP 40797 . 40993) (UALPHORDERCAR 40995 . 41110)))))
+  (FILEMAP (NIL (3536 11401 (\LAFITE.READ.PROFILE 3546 . 5750) (\LAFITE.PROCESS.PROFILE 5752 . 6942) (
+\LAFITE.WRITE.PROFILE 6944 . 8778) (\LAFITE.MERGE.NAMELISTS 8780 . 9514) (\LAFITE.READ.OLD.PROFILE 
+9516 . 10115) (\LAFITE.MERGE.FOLDERS 10117 . 10429) (\LAFITE.MERGE.STRUCTURES 10431 . 10631) (
+\LAFITE.REPACK.FOLDERS 10633 . 11399)) (11828 20372 (\LAFITE.PROMPTFORFOLDER 11838 . 12388) (
+PROMPTFORFILENAME 12390 . 13231) (MAKELAFITEMAILFOLDERSMENU 13233 . 13397) (MAKELAFITEFOLDERSMENUITEMS
+ 13399 . 14514) (LAFITE.GROUP.ITEM 14516 . 15053) (\LAFITE.ARRANGE.MENU 15055 . 16337) (
+\LAFITE.MAKE.FOLDER.MENU 16339 . 16864) (LAFITE.SELECT.FOLDERS 16866 . 17251) (LAFITE.SELECT.MULTIPLE 
+17253 . 19597) (\LAFITE.HANDLE.MULTIPLE.SELECTION 19599 . 20071) (COLLECT.SHADED.ITEMS 20073 . 20370))
+ (20595 29104 (LA.LONGFILENAME 20605 . 22480) (LA.SHORTFILENAME 22482 . 24305) (FORGETMAILFILE 24307
+ . 24767) (\LAFITE.FOLDER.NAME.CHANGED 24769 . 25992) (\LAFITE.CHANGE.NAME.IN.LIST 25994 . 26373) (
+\LAFITE.RECOMPUTE.FOLDER.NAMES 26375 . 27796) (\LAFITE.NEW.SHORT.NAME 27798 . 28479) (
+\LAFITE.NOTICE.FILE 28481 . 28662) (\LAFITE.UNCACHE.FOLDER 28664 . 29102)) (29220 43399 (
+\LAFITE.NOTICE.FOLDERS 29230 . 30870) (\LAFITE.GC.FOLDERS 30872 . 31959) (\LAFITE.GC.FOLDERS.CONFIRM 
+31961 . 32771) (\LAFITE.MAKE.RANDOM.DISPLAY 32773 . 34764) (\LAFITE.CHANGE.FOLDER.LIST 34766 . 35519) 
+(\LAFITE.RENAME.FOLDER 35521 . 37251) (\LAFITE.ADD.NEW.GROUP 37253 . 37978) (\LAFITE.CHECK.GROUP.NAME 
+37980 . 38331) (\LAFITE.CHANGE.GROUP.MEMBERS 38333 . 38708) (\LAFITE.SELECT.GROUP.FOLDERS 38710 . 
+39716) (\LAFITE.CHANGE.SUBGROUPS 39718 . 40369) (\LAFITE.CHANGE.TOP.GROUPS 40371 . 41079) (
+\LAFITE.DELETE.GROUP 41081 . 41663) (LAFITE.RENAME.GROUP 41665 . 42521) (\LAFITE.EDIT.HIERARCHY 42523
+ . 43082) (LAFITE.FIND.GROUP 43084 . 43280) (UALPHORDERCAR 43282 . 43397)))))
 STOP
diff --git a/library/lafite/LAFITEFOLDERS.LCOM b/library/lafite/LAFITEFOLDERS.LCOM
index 824e0744..42c20c7f 100644
Binary files a/library/lafite/LAFITEFOLDERS.LCOM and b/library/lafite/LAFITEFOLDERS.LCOM differ
diff --git a/library/lafite/LAFITESEND b/library/lafite/LAFITESEND
index a6b7fdda..ef7c6b00 100644
--- a/library/lafite/LAFITESEND
+++ b/library/lafite/LAFITESEND
@@ -1,9 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "30-Sep-2021 22:58:58" 
-{DSK}<USERS>KAPLAN>LOCAL>MEDLEY3.5>GIT-MEDLEY>LIBRARY>LAFITE>LAFITESEND.;1 99805  
 
-      previous date%: " 3-Dec-2000 14:53:30" 
-{DSK}<USERS>KAPLAN>LOCAL>MEDLEY3.5>GIT-MEDLEY>LIBRARY>LAFITE>LAFITESEND.;1)
+(FILECREATED " 7-Feb-2022 12:04:09" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>lafite>LAFITESEND.;2 100778 
+
+      :CHANGES-TO (FILES LAFITEDECLS)
+                  (FNS \SENDMESSAGE.RESTARTABLE \SENDMESSAGE LAFITE.SENDMESSAGE MAKEXXXSUPPORTFORM 
+                       MAKENEWMESSAGEFORM MAKEANSWERFORM LAFITE.FILL.IN.ANSWER.FORM MAKEFORWARDFORM)
+
+      :PREVIOUS-DATE "30-Sep-2021 22:58:58" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>lafite>LAFITESEND.;1)
 
 
 (* ; "
@@ -501,16 +506,18 @@ Copyright (c) 1984-1990, 1993, 1999-2000, 2021 by Xerox Corporation.
 (DEFINEQ
 
 (\SENDMESSAGE
-  [LAMBDA (FORM TEDITPROPS FORMNAME)                     (* ; "Edited 10-Feb-89 12:22 by bvm")
+  [LAMBDA (FORM TEDITPROPS FORMNAME)                         (* ; "Edited  7-Feb-2022 11:54 by rmk")
+                                                             (* ; "Edited 10-Feb-89 12:22 by bvm")
 
 (* ;;; "FORM can be a string, file, or stream --- The value of \SENDMESSAGE is T only if the message was actually sent")
 
     (OR (TEXTSTREAMP FORM)
-        (SETQ FORM (OPENTEXTSTREAM FORM NIL NIL NIL TEDITPROPS)))
+        (SETQ FORM (OPENTEXTSTREAM (OPENSTRINGSTREAM FORM)
+                          NIL NIL NIL TEDITPROPS)))
     (TEDIT.STREAMCHANGEDP FORM T)                            (* ; "Clear the changed bit")
     (if (NOT (LISTGET TEDITPROPS 'LEAVETTY))
-        then                                             (* ; "Take control of the keyboard")
-              (TTY.PROCESS (THIS.PROCESS)))
+        then                                                 (* ; "Take control of the keyboard")
+             (TTY.PROCESS (THIS.PROCESS)))
     (PROG [(MODE (LISTGET TEDITPROPS 'LAFITEMODE]            (* ; "Old way of specifying mode")
           (if MODE
               then (TEXTPROP FORM 'LAFITEMODE MODE)
@@ -518,87 +525,84 @@ Copyright (c) 1984-1990, 1993, 1999-2000, 2021 by Xerox Corporation.
             elseif (SETQ MODE (fetch LAFITEMODE of \LAFITEMODE))
               then (TEXTPROP FORM 'LAFITEMODE MODE)
             else (PRINTOUT PROMPTWINDOW T "Can't send mail without a Lafite mode.")
-                  (RETURN NIL))
+                 (RETURN NIL))
           (RETURN (\SENDMESSAGE.RESTARTABLE FORM TEDITPROPS NIL FORMNAME])
 
 (\SENDMESSAGE.RESTARTABLE
-  [LAMBDA (FORM TEDITPROPS EDITORWINDOW FORMNAME)        (* ; "Edited  3-Nov-89 15:06 by bvm")
+  [LAMBDA (FORM TEDITPROPS EDITORWINDOW FORMNAME)            (* ; "Edited  7-Feb-2022 11:50 by rmk")
+                                                             (* ; "Edited  3-Nov-89 15:06 by bvm")
     (bind (CURRENTMESSAGE _ FORM)
-           (FIRSTTIME _ T)
-           EDITORRESULT DONE SENTOK PARSE
+          (FIRSTTIME _ T)
+          EDITORRESULT DONE SENTOK PARSE
        do (PROCESSPROP (THIS.PROCESS)
-                     'BEFOREEXIT NIL)                        (* ; 
-                 "Allow LOGOUT until delivery is attempted.  Need to do this if we loop or restart")
-             (COND
-                ([NULL (PROG1 EDITORWINDOW
-                           [SETQ EDITORWINDOW (\SENDMESSAGE.MAKEWINDOW CURRENTMESSAGE NIL 
-                                                     EDITORWINDOW (TEXTPROP FORM 'LAFITEMODE])]
+                 'BEFOREEXIT NIL)                            (* ; 
+                   "Allow LOGOUT until delivery is attempted.  Need to do this if we loop or restart")
+          (COND
+             ([NULL (PROG1 EDITORWINDOW
+                        [SETQ EDITORWINDOW (\SENDMESSAGE.MAKEWINDOW CURRENTMESSAGE NIL EDITORWINDOW
+                                                  (TEXTPROP FORM 'LAFITEMODE])]
                                                              (* ; 
-                                       "First time thru.  Fix it so that we can restart if aborted")
-                 (PROCESSPROP (THIS.PROCESS)
-                        'RESTARTFORM
-                        (LIST (FUNCTION \SENDMESSAGE.RESTARTABLE)
-                              (KWOTE FORM)
-                              (KWOTE TEDITPROPS)
-                              (KWOTE EDITORWINDOW)))         (* ; 
-                                         "If process is reset or aborted, this is how to resurrect")
-                 (PROCESSPROP (THIS.PROCESS)
-                        'RESTARTABLE T)
-                 (WINDOWPROP EDITORWINDOW 'LAFITEFORM FORMNAME)))
-             (COND
-                (FIRSTTIME (RESETSAVE NIL (LIST (FUNCTION \SENDMESSAGE.CLEANUP)
-                                                EDITORWINDOW))
-                       (push LAFITECURRENTEDITORWINDOWS EDITORWINDOW)
-                       (SETQ FIRSTTIME)))
-             [SETQ EDITORRESULT (TEDIT FORM EDITORWINDOW T (APPEND TEDITPROPS (LIST 'FONT 
-                                                                                    LAFITEEDITORFONT]
-             (COND
-                ((TTY.PROCESSP)                              (* ; "give back the keyboard")
-                 (TTY.PROCESS T)))
-             (WINDOWDELPROP EDITORWINDOW 'CLOSEFN 'DON'T)    (* ; "let the window close")
-             (COND
-                ((NOT (type? SENDINGCOMMAND EDITORRESULT))
+                                         "First time thru.  Fix it so that we can restart if aborted")
+              (PROCESSPROP (THIS.PROCESS)
+                     'RESTARTFORM
+                     (LIST (FUNCTION \SENDMESSAGE.RESTARTABLE)
+                           (KWOTE FORM)
+                           (KWOTE TEDITPROPS)
+                           (KWOTE EDITORWINDOW)))            (* ; 
+                                           "If process is reset or aborted, this is how to resurrect")
+              (PROCESSPROP (THIS.PROCESS)
+                     'RESTARTABLE T)
+              (WINDOWPROP EDITORWINDOW 'LAFITEFORM FORMNAME)))
+          (COND
+             (FIRSTTIME (RESETSAVE NIL (LIST (FUNCTION \SENDMESSAGE.CLEANUP)
+                                             EDITORWINDOW))
+                    (push LAFITECURRENTEDITORWINDOWS EDITORWINDOW)
+                    (SETQ FIRSTTIME)))
+          [SETQ EDITORRESULT (TEDIT (OPENSTRINGSTREAM FORM)
+                                    EDITORWINDOW T (APPEND TEDITPROPS (LIST 'FONT LAFITEEDITORFONT]
+          (COND
+             ((TTY.PROCESSP)                                 (* ; "give back the keyboard")
+              (TTY.PROCESS T)))
+          (WINDOWDELPROP EDITORWINDOW 'CLOSEFN 'DON'T)       (* ; "let the window close")
+          (COND
+             ((NOT (type? SENDINGCOMMAND EDITORRESULT))      (* ; 
+ "get out anyway since the user used the TEDIT `quit' command instead of one of the sending commands")
+              (SETQ DONE T))
+             (T                                              (* ; 
+     "the user used the lafite menu to get out rather than the TEDIT menu so we have to do something")
                                                              (* ; 
-"get out anyway since the user used the TEDIT `quit' command instead of one of the sending commands")
-                 (SETQ DONE T))
-                (T                                           (* ; 
-   "the user used the lafite menu to get out rather than the TEDIT menu so we have to do something")
-                                                             (* ; 
-                                                      "make sure CURRENTMESSAGE is always a string")
-                   (SETQ CURRENTMESSAGE (fetch (SENDINGCOMMAND MESSAGE) of EDITORRESULT))
-                   (SETQ DONE (SELECTQ (AND EDITORRESULT (fetch (SENDINGCOMMAND COMMAND)
-                                                            of EDITORRESULT))
-                                  (%##SEND## [SETQ SENTOK (\SENDMESSAGE0 CURRENTMESSAGE 
-                                                                 EDITORWINDOW (SETQ PARSE
-                                                                               (fetch
-                                                                                (SENDINGCOMMAND
-                                                                                 MESSAGEPARSE)
-                                                                                  of EDITORRESULT
-                                                                                ])
-                                  (SHOULDNT)))
-                   (SHADEITEM (fetch (SENDINGCOMMAND ITEM) of EDITORRESULT)
-                          (fetch (SENDINGCOMMAND MENU) of EDITORRESULT)
-                          WHITESHADE)                        (* ; 
-                                 "Unshade command.  DOLAFITESENDINGCOMMAND shaded it to begin with")
-                   ))
-             (COND
-                (DONE                                        (* ; "Message successfully dispatched")
-                      (PROCESSPROP (THIS.PROCESS)
-                             'RESTARTABLE NIL)               (* ; 
-                                            "Don't try to restart if there's any sort of error now")
-                      (COND
-                         (CURRENTMESSAGE                     (* ; 
-                                              "Mark text unchanged now, so no trouble closing icon")
-                                (TEDIT.STREAMCHANGEDP CURRENTMESSAGE T)))
-                      (COND
-                         ((NULL SENTOK)
-                          (CLOSEW EDITORWINDOW))
-                         (T                                  (* ; "shrink the window")
-                            (\LAFITE.AFTER.DELIVER EDITORWINDOW CURRENTMESSAGE PARSE)))
-                      (RETURN SENTOK))
-                (T                                           (* ; 
-                                         "Loop if deliver failed or \LAFITE.SAVE.FORM was aborted.")
-                   ])
+                                                        "make sure CURRENTMESSAGE is always a string")
+                (SETQ CURRENTMESSAGE (fetch (SENDINGCOMMAND MESSAGE) of EDITORRESULT))
+                (SETQ DONE (SELECTQ (AND EDITORRESULT (fetch (SENDINGCOMMAND COMMAND) of EDITORRESULT
+                                                             ))
+                               (%##SEND## [SETQ SENTOK (\SENDMESSAGE0 CURRENTMESSAGE EDITORWINDOW
+                                                              (SETQ PARSE (fetch (SENDINGCOMMAND
+                                                                                  MESSAGEPARSE)
+                                                                             of EDITORRESULT])
+                               (SHOULDNT)))
+                (SHADEITEM (fetch (SENDINGCOMMAND ITEM) of EDITORRESULT)
+                       (fetch (SENDINGCOMMAND MENU) of EDITORRESULT)
+                       WHITESHADE)                           (* ; 
+                                   "Unshade command.  DOLAFITESENDINGCOMMAND shaded it to begin with")
+                ))
+          (COND
+             (DONE                                           (* ; "Message successfully dispatched")
+                   (PROCESSPROP (THIS.PROCESS)
+                          'RESTARTABLE NIL)                  (* ; 
+                                              "Don't try to restart if there's any sort of error now")
+                   (COND
+                      (CURRENTMESSAGE                        (* ; 
+                                                "Mark text unchanged now, so no trouble closing icon")
+                             (TEDIT.STREAMCHANGEDP CURRENTMESSAGE T)))
+                   (COND
+                      ((NULL SENTOK)
+                       (CLOSEW EDITORWINDOW))
+                      (T                                     (* ; "shrink the window")
+                         (\LAFITE.AFTER.DELIVER EDITORWINDOW CURRENTMESSAGE PARSE)))
+                   (RETURN SENTOK))
+             (T                                              (* ; 
+                                           "Loop if deliver failed or \LAFITE.SAVE.FORM was aborted.")
+                ])
 
 (\SENDMESSAGE.CLEANUP
   [LAMBDA (EDITORWINDOW)                                 (* ; "Edited  6-Oct-87 15:58 by bvm:")
@@ -795,11 +799,12 @@ Copyright (c) 1984-1990, 1993, 1999-2000, 2021 by Xerox Corporation.
                                (T STR))))])
 
 (LAFITE.SENDMESSAGE
-  [LAMBDA (MESSAGEFORM)                                  (* ; "Edited 12-Sep-88 14:07 by bvm")
+  [LAMBDA (MESSAGEFORM)                                      (* ; "Edited  7-Feb-2022 11:55 by rmk")
+                                                             (* ; "Edited 12-Sep-88 14:07 by bvm")
 
 (* ;;; "this is the external interface to sending a message")
 
-    (SETQ MESSAGEFORM (OPENTEXTSTREAM MESSAGEFORM))
+    (SETQ MESSAGEFORM (OPENTEXTSTREAM (OPENSTRINGSTREAM MESSAGEFORM)))
     (LET* ((MODE (TEXTPROP MESSAGEFORM 'LAFITEMODE))
            (*LAFITE-MODE-DATA* (\LAFITE.GET.USER.DATA MODE))
            PARSE)
@@ -1197,16 +1202,16 @@ Copyright (c) 1984-1990, 1993, 1999-2000, 2021 by Xerox Corporation.
     (MAKEXXXSUPPORTFORM "Lisp" LISPSUPPORT])
 
 (MAKEXXXSUPPORTFORM
-  [LAMBDA (SYSTEMNAME ADDRESS SYSTEMDATE)                (* ; "Edited  3-May-89 18:37 by bvm")
+  [LAMBDA (SYSTEMNAME ADDRESS SYSTEMDATE)                    (* ; "Edited  7-Feb-2022 11:56 by rmk")
+                                                             (* ; "Edited  3-May-89 18:37 by bvm")
     (PROG ((SUBJFIELD ">>Terse summary of problem<<")
            (UCODEVERSION (MICROCODEVERSION))
            (SCRATCH (OPENSTREAM "{nodircore}" 'BOTH))
            TEXTSTREAM SELECTPOSITION MODE)
           [COND
              [(LISTP ADDRESS)                                (* ; 
-             "Mode-dependent address.  Pick the first address that's in a mode we know how to send")
-              (SETQ ADDRESS (for PAIR in ADDRESS when (\LAFITE.GET.USER.DATA
-                                                                   (SETQ MODE (CAR PAIR)))
+               "Mode-dependent address.  Pick the first address that's in a mode we know how to send")
+              (SETQ ADDRESS (for PAIR in ADDRESS when (\LAFITE.GET.USER.DATA (SETQ MODE (CAR PAIR)))
                                do (RETURN (CADR PAIR]
              (T                                              (* ; "Just send in current mode")
                 (SETQ MODE (fetch LAFITEMODE of \LAFITEMODE]
@@ -1214,11 +1219,11 @@ Copyright (c) 1984-1990, 1993, 1999-2000, 2021 by Xerox Corporation.
              ((NOT ADDRESS)
               (printout PROMPTWINDOW T "Can't -- no address known for " SYSTEMNAME " report.")
               (RETURN)))
-          (SETQ TEXTSTREAM (OPENTEXTSTREAM (CONCAT "Subject: " SYSTEMNAME ": ")
+          (SETQ TEXTSTREAM (OPENTEXTSTREAM (OPENSTRINGSTREAM (CONCAT "Subject: " SYSTEMNAME ": "))
                                   NIL NIL NIL (LIST 'FONT LAFITEEDITORFONT)))
           (SETQ SELECTPOSITION (ADD1 (GETEOFPTR TEXTSTREAM)))
           (PROGN                                             (* ; 
-      "Now write the main stuff to a scratch stream. faster than bouting a byte at a time to tedit")
+        "Now write the main stuff to a scratch stream. faster than bouting a byte at a time to tedit")
                  (printout SCRATCH SUBJFIELD T)
                  (printout SCRATCH "To: " ADDRESS T)
                  (printout SCRATCH "cc: " (FULLUSERNAME NIL MODE)
@@ -1258,8 +1263,9 @@ Impact: >> Fatal, Serious, Moderate, Annoying, Minor <<" T T)
           (RETURN TEXTSTREAM])
 
 (MAKENEWMESSAGEFORM
-  [LAMBDA NIL                                            (* ; "Edited  6-Jun-88 12:22 by bvm")
-    (LET ((OUTSTREAM (OPENTEXTSTREAM "" NIL NIL NIL (LIST 'FONT LAFITEEDITORFONT)))
+  [LAMBDA NIL                                                (* ; "Edited  7-Feb-2022 11:56 by rmk")
+                                                             (* ; "Edited  6-Jun-88 12:22 by bvm")
+    (LET ((OUTSTREAM (OPENTEXTSTREAM NIL NIL NIL NIL (LIST 'FONT LAFITEEDITORFONT)))
           SELECTPOSITION)
          (printout OUTSTREAM "Subject: ")
          (SETQ SELECTPOSITION (ADD1 (GETFILEPTR OUTSTREAM)))
@@ -1269,8 +1275,8 @@ Impact: >> Fatal, Serious, Moderate, Annoying, Minor <<" T T)
                 T T)
          (printout OUTSTREAM MESSAGESTR T)
          (if LAFITE.SIGNATURE
-             then                                        (* ; "Pre-sign it")
-                   (PRIN3 LAFITE.SIGNATURE OUTSTREAM))
+             then                                            (* ; "Pre-sign it")
+                  (PRIN3 LAFITE.SIGNATURE OUTSTREAM))
          (TEDIT.SETSEL OUTSTREAM SELECTPOSITION (NCHARS SUBJECTSTR)
                 'RIGHT T)
          OUTSTREAM])
@@ -1442,7 +1448,8 @@ Impact: >> Fatal, Serious, Moderate, Annoying, Minor <<" T T)
                             (MARKMESSAGE MSGDESCRIPTOR MAILFOLDER ANSWERMARK])])
 
 (MAKEANSWERFORM
-  [LAMBDA (MSGDESCRIPTORS MAILFOLDER)                    (* ; "Edited 10-Aug-89 17:28 by bvm")
+  [LAMBDA (MSGDESCRIPTORS MAILFOLDER)                        (* ; "Edited  7-Feb-2022 11:58 by rmk")
+                                                             (* ; "Edited 10-Aug-89 17:28 by bvm")
     (LET* ((FIRSTMSG (if (LISTP MSGDESCRIPTORS)
                          then (CAR MSGDESCRIPTORS)
                        else MSGDESCRIPTORS))
@@ -1450,20 +1457,17 @@ Impact: >> Fatal, Serious, Moderate, Annoying, Minor <<" T T)
            (MODE (CL:NTH MODEBITS *LAFITE-WELL-KNOWN-MODES*)))
           (if (NULL MODE)
               then (if [OR (NEQ MODEBITS 0)
-                                   (NULL (SETQ MODE (\LAFITE.GUESS.MODE FIRSTMSG]
-                           then (LAB.PROMPTPRINT MAILFOLDER (if (EQ MODEBITS 0)
-                                                                    then 
-                                                                       "Message of unknown protocol."
-                                                                  else 
+                           (NULL (SETQ MODE (\LAFITE.GUESS.MODE FIRSTMSG]
+                       then (LAB.PROMPTPRINT MAILFOLDER (if (EQ MODEBITS 0)
+                                                            then "Message of unknown protocol."
+                                                          else 
                         "Warning: This message was retrieved under a protocol not currently enabled."
-                                                                       ))
-                                 (LAB.PROMPTPRINT MAILFOLDER "Will answer in " (SETQ MODE
-                                                                                (fetch
-                                                                                 (LAFITEOPS 
-                                                                                        LAFITEMODE)
-                                                                                   of \LAFITEMODE
-                                                                                 ))
-                                        " mode; this may not work.  ")))
+                                                            ))
+                            (LAB.PROMPTPRINT MAILFOLDER "Will answer in " (SETQ MODE
+                                                                           (fetch (LAFITEOPS 
+                                                                                         LAFITEMODE)
+                                                                              of \LAFITEMODE))
+                                   " mode; this may not work.  ")))
 
           (* ;; "Currently we only pay attention to the first message.  If we ever do otherwise, we'll want to notice whether the other messages are in the same mode")
 
@@ -1474,14 +1478,13 @@ Impact: >> Fatal, Serious, Moderate, Annoying, Minor <<" T T)
 
                (if (NULL *LAFITE-MODE-DATA*)
                    then (LAB.FORMAT MAILFOLDER "Failed: can't authenticate user in ~A mode" MODE)
-                 elseif (SETQ MSG (CL:FUNCALL (fetch (LAFITEMODEDATA ANSWERER) of 
-                                                                                   *LAFITE-MODE-DATA*
-                                                         )
-                                             MSGDESCRIPTORS MAILFOLDER))
+                 elseif (SETQ MSG (CL:FUNCALL (fetch (LAFITEMODEDATA ANSWERER) of *LAFITE-MODE-DATA*)
+                                         MSGDESCRIPTORS MAILFOLDER))
                    then (if (TEXTSTREAMP MSG)
-                                then (TEXTPROP MSG 'LAFITEMODE MODE)
-                                      MSG
-                              else (OPENTEXTSTREAM MSG NIL NIL NIL `(LAFITEMODE ,MODE])
+                            then (TEXTPROP MSG 'LAFITEMODE MODE)
+                                 MSG
+                          else (OPENTEXTSTREAM (OPENSTRINGSTREAM MSG)
+                                      NIL NIL NIL `(LAFITEMODE ,MODE])
 
 (LA.PRINT.COMMA.LIST
   [LAMBDA (STRINGS STREAM)                               (* ; "Edited  6-Jun-88 12:50 by bvm")
@@ -1491,21 +1494,22 @@ Impact: >> Fatal, Serious, Moderate, Annoying, Minor <<" T T)
                                                                     (PRIN3 STR STREAM])
 
 (LAFITE.FILL.IN.ANSWER.FORM
-  [LAMBDA (SUBJECT FROM DATE TO CC ADDRESSPRINTFN)       (* ; "Edited 10-Jun-88 17:19 by bvm")
+  [LAMBDA (SUBJECT FROM DATE TO CC ADDRESSPRINTFN)           (* ; "Edited  7-Feb-2022 11:58 by rmk")
+                                                             (* ; "Edited 10-Jun-88 17:19 by bvm")
 
     (* ;; "Construct an answer form replying to a message from FROM on DATE with specified SUBJECT.  Reply should go to the lists of names TO and CC.  ADDRESSPRINTFN is a function that prints a list of names suitably for the protocol in question.")
 
-    (LET ((OUTSTREAM (OPENTEXTSTREAM "" NIL NIL NIL (LIST 'FONT LAFITEEDITORFONT)))
+    (LET ((OUTSTREAM (OPENTEXTSTREAM NIL NIL NIL NIL (LIST 'FONT LAFITEEDITORFONT)))
           SELECTPOSITION)
          (LINELENGTH MAX.SMALLP OUTSTREAM)                   (* ; 
-                                                    "Sigh, apparently text streams have linelength")
+                                                      "Sigh, apparently text streams have linelength")
          (PROGN (printout OUTSTREAM "Subject: ")
                 (if SUBJECT
                     then (COND
-                                ((NOT (STRING-EQUAL (SUBSTRING SUBJECT 1 3)
-                                             "Re:"))
-                                 (printout OUTSTREAM "Re: ")))
-                          (printout OUTSTREAM SUBJECT)
+                            ((NOT (STRING-EQUAL (SUBSTRING SUBJECT 1 3)
+                                         "Re:"))
+                             (printout OUTSTREAM "Re: ")))
+                         (printout OUTSTREAM SUBJECT)
                   else (printout OUTSTREAM "(reply to message)")))
          (PROGN (printout OUTSTREAM T "In-reply-to: ")
                 (if (NULL FROM)
@@ -1515,8 +1519,8 @@ Impact: >> Fatal, Serious, Moderate, Annoying, Minor <<" T T)
          (PROGN (printout OUTSTREAM "To: ")
                 (if TO
                     then (CL:FUNCALL ADDRESSPRINTFN TO OUTSTREAM)
-                  else                                   (* ; "No to, so ask to fill in")
-                        (printout OUTSTREAM RECIPIENTSSTR T))
+                  else                                       (* ; "No to, so ask to fill in")
+                       (printout OUTSTREAM RECIPIENTSSTR T))
                 (TERPRI OUTSTREAM))
          (COND
             (CC (printout OUTSTREAM "cc: ")
@@ -1526,8 +1530,8 @@ Impact: >> Fatal, Serious, Moderate, Annoying, Minor <<" T T)
          (SETQ SELECTPOSITION (ADD1 (GETFILEPTR OUTSTREAM)))
          (printout OUTSTREAM MESSAGESTR T)
          (if LAFITE.SIGNATURE
-             then                                        (* ; "Pre-sign it")
-                   (PRIN3 LAFITE.SIGNATURE OUTSTREAM))
+             then                                            (* ; "Pre-sign it")
+                  (PRIN3 LAFITE.SIGNATURE OUTSTREAM))
          (TEDIT.SETSEL OUTSTREAM SELECTPOSITION (NCHARS MESSAGESTR)
                 'RIGHT T)
          OUTSTREAM])
@@ -1583,12 +1587,13 @@ Impact: >> Fatal, Serious, Moderate, Annoying, Minor <<" T T)
                                            (MARKMESSAGE MSG MAILFOLDER FORWARDMARK])])
 
 (MAKEFORWARDFORM
-  [LAMBDA (WINDOW FOLDER MESSAGELIST)                    (* ; "Edited  5-Jan-90 17:46 by bvm")
+  [LAMBDA (WINDOW FOLDER MESSAGELIST)                        (* ; "Edited  7-Feb-2022 11:59 by rmk")
+                                                             (* ; "Edited  5-Jan-90 17:46 by bvm")
 
     (* ;; "Make a message form that forwards each of the messages in MESSAGELIST")
 
     (PROG ((FOLDERSTREAM (\LAFITE.OPEN.FOLDER FOLDER 'INPUT :ABORT))
-           (TEXTSTREAM (OPENTEXTSTREAM "" NIL NIL NIL (LIST 'FONT LAFITEEDITORFONT)))
+           (TEXTSTREAM (OPENTEXTSTREAM NIL NIL NIL NIL (LIST 'FONT LAFITEEDITORFONT)))
            (CURMSG (CAR MESSAGELIST))
            SUBJECT SELECTPOSITION SELECTLEN)
           (OR (fetch (LAFITEMSG PARSED?) of CURMSG)
@@ -1596,8 +1601,7 @@ Impact: >> Fatal, Serious, Moderate, Annoying, Minor <<" T T)
           (LINELENGTH MAX.SMALLP TEXTSTREAM)
           (PRIN3 "Subject: " TEXTSTREAM)
           (COND
-             ([OR LAFITEFORWARDSUBJECTSTR (NULL (SETQ SUBJECT (fetch (LAFITEMSG SUBJECT)
-                                                                 of CURMSG]
+             ([OR LAFITEFORWARDSUBJECTSTR (NULL (SETQ SUBJECT (fetch (LAFITEMSG SUBJECT) of CURMSG]
               (SETQ SELECTPOSITION (ADD1 (GETFILEPTR TEXTSTREAM)))
               [SETQ SELECTLEN (NCHARS (SETQ SUBJECT (OR LAFITEFORWARDSUBJECTSTR SUBJECTSTR]
               (PRIN3 SUBJECT TEXTSTREAM))
@@ -1616,23 +1620,29 @@ cc: ~A
 " RECIPIENTSSTR (FULLUSERNAME)
                  (CAR LAFITEFORWARDSTRINGS))
           (if LAFITE.SIGNATURE
-              then                                       (* ; 
-                                      "Sign it up here, after the user's inserted comments, if any")
-                    (PRIN3 LAFITE.SIGNATURE TEXTSTREAM)
-                    (TERPRI TEXTSTREAM))
-          (for MSGDESCRIPTOR in MESSAGELIST bind NTHTIME
-             do (PRIN3 (COND
-                              (NTHTIME                       (* ; "%"Next message%"")
-                                     (CADDR LAFITEFORWARDSTRINGS))
-                              (T                             (* ; "%"Begin forwarded messages%"")
-                                 (SETQ NTHTIME T)
-                                 (CADR LAFITEFORWARDSTRINGS)))
-                           TEXTSTREAM)
-                   (TERPRI TEXTSTREAM)
-                   (\LAFITE.APPEND.MESSAGE.BODY TEXTSTREAM FOLDERSTREAM MSGDESCRIPTOR 
-                          \LAPARSE.DONT.FORWARD.HEADERS)
-                   (TERPRI TEXTSTREAM)
-                   (TEDIT.CARETLOOKS TEXTSTREAM LAFITEEDITORFONT))
+              then                                           (* ; 
+                                        "Sign it up here, after the user's inserted comments, if any")
+                   (PRIN3 LAFITE.SIGNATURE TEXTSTREAM)
+                   (TERPRI TEXTSTREAM))
+          (for MSGDESCRIPTOR in MESSAGELIST bind NTHTIME do (PRIN3 (COND
+                                                                      (NTHTIME 
+                                                             (* ; "%"Next message%"")
+                                                                             (CADDR 
+                                                                                 LAFITEFORWARDSTRINGS
+                                                                                    ))
+                                                                      (T 
+                                                             (* ; "%"Begin forwarded messages%"")
+                                                                         (SETQ NTHTIME T)
+                                                                         (CADR LAFITEFORWARDSTRINGS))
+                                                                      )
+                                                                   TEXTSTREAM)
+                                                            (TERPRI TEXTSTREAM)
+                                                            (\LAFITE.APPEND.MESSAGE.BODY TEXTSTREAM 
+                                                                   FOLDERSTREAM MSGDESCRIPTOR 
+                                                                   \LAPARSE.DONT.FORWARD.HEADERS)
+                                                            (TERPRI TEXTSTREAM)
+                                                            (TEDIT.CARETLOOKS TEXTSTREAM 
+                                                                   LAFITEEDITORFONT))
           (PRIN3 (CADDDR LAFITEFORWARDSTRINGS)
                  TEXTSTREAM)
           (TERPRI TEXTSTREAM)
@@ -1640,25 +1650,23 @@ cc: ~A
           (RETURN TEXTSTREAM])
 )
 
-(RPAQQ LAFITESENDINGMENUITEMS (("Deliver" '\SENDMSG.DELIVER "Send the message in the edit window"
-                                          )
-                                   ("Reply To" '\SENDMSG.REPLYTO 
-                                          "Insert a Reply-to field in this message")
-                                   ("Change Mode" '\SENDMSG.CHANGE.MODE 
-                                         "Change the mode (mail protocol) used to send this message."
-                                          )
-                                   ("Save" '\SENDMSG.SAVE.FORM 
+(RPAQQ LAFITESENDINGMENUITEMS (("Deliver" '\SENDMSG.DELIVER "Send the message in the edit window")
+                               ("Reply To" '\SENDMSG.REPLYTO 
+                                      "Insert a Reply-to field in this message")
+                               ("Change Mode" '\UNIXMAIL.CHANGE.MODE 
+                                      "Change the mode (mail protocol) used to send this message.")
+                               ("Save" '\SENDMSG.SAVE.FORM 
                     "Save the message in a file for later use (retrieve with middle-button SendMail)"
-                                          )))
+                                      )))
 
 (RPAQQ LAFITEFORMSMENUITEMS (("Saved Form" '%##ANOTHERFORM## 
-                                        "You will be asked to specify a filename for the form")
-                                 ("Standard Form" (FUNCTION MAKENEWMESSAGEFORM)
-                                        "A clean message form")))
+                                    "You will be asked to specify a filename for the form")
+                             ("Standard Form" (FUNCTION MAKENEWMESSAGEFORM)
+                                    "A clean message form")))
 
 (RPAQQ LAFITEFORMATMENUITEMS (("Send Formatted Message" 'TEDIT)
-                                  ("Send Plain Text" 'TEXT)
-                                  ("Abort" 'ABORT)))
+                              ("Send Plain Text" 'TEXT)
+                              ("Abort" 'ABORT)))
 
 (RPAQQ LAFITEFORWARDSTRINGS (">>CoveringMessage<<" "
      ----- Begin Forwarded Messages -----
@@ -1670,9 +1678,9 @@ cc: ~A
 (ADDTOVAR \SYSTEMCACHEVARS \LAFITE.REPORT.MACHINE)
 
 (ADDTOVAR LAFITESPECIALFORMS ("Lisp Report" (FUNCTION MAKELISPSUPPORTFORM)
-                                        "A form to report a Lisp bug or suggestion")
-                                 ("Lafite Report" (FUNCTION MAKELAFITESUPPORTFORM)
-                                        "A form to report a Lafite bug or suggestion"))
+                                    "A form to report a Lisp bug or suggestion")
+                             ("Lafite Report" (FUNCTION MAKELAFITESUPPORTFORM)
+                                    "A form to report a Lafite bug or suggestion"))
 
 (ADDTOVAR LAFITEMENUVARS LAFITEFORMSMENU LAFITEFORMATMENU)
 
@@ -1709,9 +1717,9 @@ cc: ~A
 (RPAQ? SUBJECTSTR ">>Subject<<")
 
 (RPAQ? LAFITE.SEND.FORMATTED '((NSCHARS :ASK)
-                                   (CHARLOOKS :ASK)
-                                   (PARALOOKS :ASK)
-                                   (IMAGEOBJ :ASK)))
+                               (CHARLOOKS :ASK)
+                               (PARALOOKS :ASK)
+                               (IMAGEOBJ :ASK)))
 
 
 
@@ -1726,15 +1734,15 @@ cc: ~A
 
 
 (RPAQQ LAFITE.MSG.ICON (#*(82 72)@@@@@@@@@GO@@@@@@@@@@@@@@@@@@@@@AOOL@@@@@@@@@@@@@@@@@@@@GH@O@@@@@@@@@@@@@@@@@@@CN@@CL@@@@@@@@@@@@@@@@@@OH@@@OH@@@@@@@@@@@@@@@@CL@@@@CN@@@@@@@@@@@@@@@@O@@@@@@GH@@@@@@@@@@@@@@CL@@@@@@AN@@@@@@@@@@@@@AO@@@@@@@@GL@@@@@@@@@@@@GL@@@@@@@@AO@@@@@@@@@@@AN@@@@@@@@@@CL@@@@@@@@@@GH@@@@@@@@@@@O@@@@@@@@@CN@@@@@@@@@@@@CL@@@@@@@@OH@@@@@@@@@@@@@OH@@@@@@CL@@@@@@@@@@@@@@CN@@@@@@O@@@@@@@@@@@@@@@@GH@@@@CL@@@@@@@@@@@@@@@@AN@@@@O@@@@@@@@@@@@@@@@@@GH@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@O@@@@@@@@@@@@@@@@@@GL@@@ML@@@@@@@@@@@@@@@@ALL@@@LN@@@@@@@@@@@@@@@@CHL@@@LCH@@@@@@@@@@@@@@@N@L@@@LAL@@@@@@@@@@@@@@CL@L@@@L@G@@@@@@@@@@@@@@G@@L@@@L@CL@@@@@@@@@@@@AL@@L@@@L@@N@@@@@@@@@@@@CH@@L@@@L@@CH@@@@@@@@@@@N@@@L@@@L@@AL@@@@@@@@@@AL@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@@@@@@@@@@@@@@@@@@L@@@L@@N@@@@@@@@@@@@CH@@L@@@L@CL@@@@@@@@@@@@AL@@L@@@L@G@@@@@@@@@@@@@@G@@L@@@LAL@@@@@@@@@@@@@@CL@L@@@LCH@@@@@@@@@@@@@@@N@L@@@LN@@@@@@@@@@@@@@@@CHL@@@ML@@@@@@@@@@@@@@@@ALL@@@O@@@@@@@@@@@@@@@@@@GL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@
-                            #*(82 72)@@@@@@@@@GO@@@@@@@@@@@@@@@@@@@@@AOOL@@@@@@@@@@@@@@@@@@@@GOOO@@@@@@@@@@@@@@@@@@@COOOOL@@@@@@@@@@@@@@@@@@OOOOOOH@@@@@@@@@@@@@@@@COOOOOON@@@@@@@@@@@@@@@@OOOOOOOOH@@@@@@@@@@@@@@COOOOOOOON@@@@@@@@@@@@@AOOOOOOOOOOL@@@@@@@@@@@@GOOOOOOOOOOO@@@@@@@@@@@AOOOOOOOOOOOOL@@@@@@@@@@GOOOOOOOOOOOOO@@@@@@@@@COOOOOOOOOOOOOOL@@@@@@@@OOOOOOOOOOOOOOOOH@@@@@@COOOOOOOOOOOOOOOON@@@@@@OOOOOOOOOOOOOOOOOOH@@@@COOOOOOOOOOOOOOOOOON@@@@OOOOOOOOOOOOOOOOOOOOH@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@
-                            (8 8 64 36)))
+                        #*(82 72)@@@@@@@@@GO@@@@@@@@@@@@@@@@@@@@@AOOL@@@@@@@@@@@@@@@@@@@@GOOO@@@@@@@@@@@@@@@@@@@COOOOL@@@@@@@@@@@@@@@@@@OOOOOOH@@@@@@@@@@@@@@@@COOOOOON@@@@@@@@@@@@@@@@OOOOOOOOH@@@@@@@@@@@@@@COOOOOOOON@@@@@@@@@@@@@AOOOOOOOOOOL@@@@@@@@@@@@GOOOOOOOOOOO@@@@@@@@@@@AOOOOOOOOOOOOL@@@@@@@@@@GOOOOOOOOOOOOO@@@@@@@@@COOOOOOOOOOOOOOL@@@@@@@@OOOOOOOOOOOOOOOOH@@@@@@COOOOOOOOOOOOOOOON@@@@@@OOOOOOOOOOOOOOOOOOH@@@@COOOOOOOOOOOOOOOOOON@@@@OOOOOOOOOOOOOOOOOOOOH@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@OOOOOOOOOOOOOOOOOOOOL@@@
+                        (8 8 64 36)))
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 (DECLARE%: EVAL@COMPILE
 
 (RECORD SENDINGCOMMAND (COMMAND ITEM MENU MESSAGE MESSAGEPARSE)
-                           [TYPE? (AND (LISTP DATUM)
-                                           (FMEMB (fetch COMMAND of DATUM)
-                                                  '(%##SEND## %##SAVE## %##FORGETIT##])
+                       [TYPE? (AND (LISTP DATUM)
+                                   (FMEMB (fetch COMMAND of DATUM)
+                                          '(%##SEND## %##SAVE## %##FORGETIT##])
 )
 
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
@@ -1758,29 +1766,29 @@ cc: ~A
 (PUTPROPS LAFITESEND COPYRIGHT ("Xerox Corporation" 1984 1985 1986 1987 1988 1989 1990 1993 1999 2000 
 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (5301 28278 (DOLAFITESENDINGCOMMAND 5311 . 5801) (\SENDMESSAGE.INITIATE 5803 . 7742) (
-\SENDMSG.DELIVER 7744 . 8352) (\SENDMSG.EXIT.TEDIT 8354 . 8725) (\SENDMSG.SAVE.FORM 8727 . 10714) (
-\LAFITE.HEADER.EOF 10716 . 11009) (\LAFITE.INSERT.REPLYTO 11011 . 11619) (\SENDMSG.REPLYTO 11621 . 
-12180) (\SENDMSG.CHANGE.MODE 12182 . 17758) (\SENDMSG.FIND.FIELD 17760 . 18270) (\SENDMESSAGE.PARSE 
-18272 . 19068) (\LAFITE.PREPARE.SEND 19070 . 21903) (\LAFITE.PREPARE.ERROR 21905 . 23087) (
-\LAFITE.CHOOSE.MSG.FORMAT 23089 . 25730) (LAFITE.MAKE.PLAIN.TEXTSTREAM 25732 . 26657) (
-\SENDMESSAGE.MENUPROMPT 26659 . 27522) (\SENDMESSAGE.PROMPT 27524 . 28060) (\SENDMESSAGEFAIL 28062 . 
-28276)) (28279 52755 (\SENDMESSAGE 28289 . 29481) (\SENDMESSAGE.RESTARTABLE 29483 . 34790) (
-\SENDMESSAGE.CLEANUP 34792 . 35008) (\SENDMESSAGE.MAKEWINDOW 35010 . 41183) (MAKELAFITEDELIVERMENU 
-41185 . 41492) (\LAFITE.CLOSEMSG? 41494 . 42444) (\LAFITE.AFTER.DELIVER 42446 . 45765) (
-\LAFITE.UNSENT.ICON 45767 . 46077) (\LAFITE.FETCH.SUBJECT 46079 . 46879) (LAFITE.SENDMESSAGE 46881 . 
-47642) (\SENDMESSAGE0 47644 . 50508) (LA.ASSURE.PROMPT.WINDOW 50510 . 51407) (\LAFITE.SEND.FAIL 51409
- . 51880) (\LAFITE.INVALID.RECIPIENTS 51882 . 52340) (\SENDMESSAGE.ABORT 52342 . 52753)) (52787 62700 
-(\OUTBOX.CREATE 52797 . 54260) (\OUTBOX.RESET 54262 . 54755) (\OUTBOX.CLOSEFN 54757 . 54897) (
-\OUTBOX.REPAINTFN 54899 . 55562) (\OUTBOX.RESHAPEFN 55564 . 56847) (\OUTBOX.SHADEITEM 56849 . 57522) (
-\OUTBOX.BUTTONFN 57524 . 60372) (\OUTBOX.DISPLAYLINE 60374 . 60868) (\OUTBOX.ADD.ITEM 60870 . 62698)) 
-(62996 79218 (\LAFITE.MESSAGEFORM 63006 . 67349) (MAKELAFITESUPPORTFORM 67351 . 67540) (
-MAKELISPSUPPORTFORM 67542 . 67708) (MAKEXXXSUPPORTFORM 67710 . 71690) (MAKENEWMESSAGEFORM 71692 . 
-72531) (MAKELAFITEPRIVATEFORMSITEMS 72533 . 72961) (\LAFITE.UNCACHE.MESSAGEFORM 72963 . 73416) (
-\LAFITE.DELETE.MESSAGEFORM 73418 . 74019) (\LAFITE.SELECT.FORM 74021 . 74376) (
-\LAFITE.DELETE.FORM.INTERNAL 74378 . 75522) (\LAFITE.READ.FORM 75524 . 78261) (\LAFITE.FIND.TEMPLATE 
-78263 . 79216)) (79242 87146 (\LAFITE.ANSWER 79252 . 79657) (\LAFITE.ANSWER.PROC 79659 . 81553) (
-MAKEANSWERFORM 81555 . 84367) (LA.PRINT.COMMA.LIST 84369 . 84855) (LAFITE.FILL.IN.ANSWER.FORM 84857 . 
-87144)) (87171 92434 (\LAFITE.FORWARD 87181 . 87589) (\LAFITE.FORWARD.PROC 87591 . 89580) (
-MAKEFORWARDFORM 89582 . 92432)))))
+  (FILEMAP (NIL (5539 28516 (DOLAFITESENDINGCOMMAND 5549 . 6039) (\SENDMESSAGE.INITIATE 6041 . 7980) (
+\SENDMSG.DELIVER 7982 . 8590) (\SENDMSG.EXIT.TEDIT 8592 . 8963) (\SENDMSG.SAVE.FORM 8965 . 10952) (
+\LAFITE.HEADER.EOF 10954 . 11247) (\LAFITE.INSERT.REPLYTO 11249 . 11857) (\SENDMSG.REPLYTO 11859 . 
+12418) (\SENDMSG.CHANGE.MODE 12420 . 17996) (\SENDMSG.FIND.FIELD 17998 . 18508) (\SENDMESSAGE.PARSE 
+18510 . 19306) (\LAFITE.PREPARE.SEND 19308 . 22141) (\LAFITE.PREPARE.ERROR 22143 . 23325) (
+\LAFITE.CHOOSE.MSG.FORMAT 23327 . 25968) (LAFITE.MAKE.PLAIN.TEXTSTREAM 25970 . 26895) (
+\SENDMESSAGE.MENUPROMPT 26897 . 27760) (\SENDMESSAGE.PROMPT 27762 . 28298) (\SENDMESSAGEFAIL 28300 . 
+28514)) (28517 52962 (\SENDMESSAGE 28527 . 29879) (\SENDMESSAGE.RESTARTABLE 29881 . 34865) (
+\SENDMESSAGE.CLEANUP 34867 . 35083) (\SENDMESSAGE.MAKEWINDOW 35085 . 41258) (MAKELAFITEDELIVERMENU 
+41260 . 41567) (\LAFITE.CLOSEMSG? 41569 . 42519) (\LAFITE.AFTER.DELIVER 42521 . 45840) (
+\LAFITE.UNSENT.ICON 45842 . 46152) (\LAFITE.FETCH.SUBJECT 46154 . 46954) (LAFITE.SENDMESSAGE 46956 . 
+47849) (\SENDMESSAGE0 47851 . 50715) (LA.ASSURE.PROMPT.WINDOW 50717 . 51614) (\LAFITE.SEND.FAIL 51616
+ . 52087) (\LAFITE.INVALID.RECIPIENTS 52089 . 52547) (\SENDMESSAGE.ABORT 52549 . 52960)) (52994 62907 
+(\OUTBOX.CREATE 53004 . 54467) (\OUTBOX.RESET 54469 . 54962) (\OUTBOX.CLOSEFN 54964 . 55104) (
+\OUTBOX.REPAINTFN 55106 . 55769) (\OUTBOX.RESHAPEFN 55771 . 57054) (\OUTBOX.SHADEITEM 57056 . 57729) (
+\OUTBOX.BUTTONFN 57731 . 60579) (\OUTBOX.DISPLAYLINE 60581 . 61075) (\OUTBOX.ADD.ITEM 61077 . 62905)) 
+(63203 79611 (\LAFITE.MESSAGEFORM 63213 . 67556) (MAKELAFITESUPPORTFORM 67558 . 67747) (
+MAKELISPSUPPORTFORM 67749 . 67915) (MAKEXXXSUPPORTFORM 67917 . 71966) (MAKENEWMESSAGEFORM 71968 . 
+72924) (MAKELAFITEPRIVATEFORMSITEMS 72926 . 73354) (\LAFITE.UNCACHE.MESSAGEFORM 73356 . 73809) (
+\LAFITE.DELETE.MESSAGEFORM 73811 . 74412) (\LAFITE.SELECT.FORM 74414 . 74769) (
+\LAFITE.DELETE.FORM.INTERNAL 74771 . 75915) (\LAFITE.READ.FORM 75917 . 78654) (\LAFITE.FIND.TEMPLATE 
+78656 . 79609)) (79635 87366 (\LAFITE.ANSWER 79645 . 80050) (\LAFITE.ANSWER.PROC 80052 . 81946) (
+MAKEANSWERFORM 81948 . 84478) (LA.PRINT.COMMA.LIST 84480 . 84966) (LAFITE.FILL.IN.ANSWER.FORM 84968 . 
+87364)) (87391 93587 (\LAFITE.FORWARD 87401 . 87809) (\LAFITE.FORWARD.PROC 87811 . 89800) (
+MAKEFORWARDFORM 89802 . 93585)))))
 STOP
diff --git a/library/lafite/LAFITESEND.LCOM b/library/lafite/LAFITESEND.LCOM
index 7e180958..0d99d7db 100644
Binary files a/library/lafite/LAFITESEND.LCOM and b/library/lafite/LAFITESEND.LCOM differ
diff --git a/library/lafite/MAILSCAVENGE b/library/lafite/MAILSCAVENGE
index 0e07e6d5..a88057e6 100644
--- a/library/lafite/MAILSCAVENGE
+++ b/library/lafite/MAILSCAVENGE
@@ -1,9 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "30-Sep-2021 22:57:39" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>lafite>MAILSCAVENGE.;2 40187  
 
-      previous date%: "15-Jun-90 18:25:37" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>lafite>MAILSCAVENGE.;1)
+(FILECREATED " 7-Feb-2022 12:04:09" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>lafite>MAILSCAVENGE.;4 40080  
+
+      :CHANGES-TO (FNS \MAILSCAVENGE.MAKEWINDOW)
+
+      :PREVIOUS-DATE "30-Sep-2021 22:57:39" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>lafite>MAILSCAVENGE.;3)
 
 
 (* ; "
@@ -509,36 +512,34 @@ Copyright (c) 1985, 1989-1990, 2021 by Venue & Xerox Corporation.
                            *ERRORMSGSTREAM* ARGS))))
 
 (\MAILSCAVENGE.MAKEWINDOW
-  [LAMBDA (FOLDER)                                       (* ; "Edited 21-Apr-89 15:34 by bvm")
+  [LAMBDA (FOLDER)                                           (* ; "Edited  7-Feb-2022 11:51 by rmk")
+                                                             (* ; "Edited 21-Apr-89 15:34 by bvm")
 
     (* ;; 
-  "Return a tedit window to use for Scavenger report, or NIL if FOLDER doesn't have a browser")
+    "Return a tedit window to use for Scavenger report, or NIL if FOLDER doesn't have a browser")
 
     (LET ((BROWSERWINDOW (fetch (MAILFOLDER BROWSERWINDOW) of FOLDER)))
          (if BROWSERWINDOW
-             then (LET* ((FONT (DSPFONT NIL (fetch (MAILFOLDER BROWSERWINDOW) of FOLDER))
-                                   )
-                             (ERRHEIGHT (HEIGHTIFWINDOW (TIMES 10 (FONTPROP FONT 'HEIGHT))
-                                               T))
-                             (ERRW (CREATEW (CREATEREGION 0 0 10 ERRHEIGHT)
-                                          (CONCAT "Mail Scavenger Report for " (fetch
-                                                                                (MAILFOLDER 
+             then (LET* ((FONT (DSPFONT NIL (fetch (MAILFOLDER BROWSERWINDOW) of FOLDER)))
+                         (ERRHEIGHT (HEIGHTIFWINDOW (TIMES 10 (FONTPROP FONT 'HEIGHT))
+                                           T))
+                         (ERRW (CREATEW (CREATEREGION 0 0 10 ERRHEIGHT)
+                                      (CONCAT "Mail Scavenger Report for " (fetch (MAILFOLDER 
                                                                                       SHORTFOLDERNAME
-                                                                                       ) of
-                                                                                         FOLDER))
-                                          T)))
-                            (ATTACHWINDOW ERRW BROWSERWINDOW
-                                   (if (< (fetch (REGION BOTTOM) of (WINDOWPROP
-                                                                                 BROWSERWINDOW
-                                                                                 'REGION))
-                                              ERRHEIGHT)
-                                       then              (* ; "Won't fit below")
-                                             'TOP
-                                     else 'BOTTOM)
-                                   'JUSTIFY
-                                   'LOCALCLOSE)
-                            (OPENTEXTSTREAM "" ERRW NIL NIL `(FONT ,FONT PROMPTWINDOW DON'T))
-                            ERRW])
+                                                                                         )
+                                                                              of FOLDER))
+                                      T)))
+                        (ATTACHWINDOW ERRW BROWSERWINDOW
+                               (if (< (fetch (REGION BOTTOM) of (WINDOWPROP BROWSERWINDOW
+                                                                       'REGION))
+                                      ERRHEIGHT)
+                                   then                      (* ; "Won't fit below")
+                                        'TOP
+                                 else 'BOTTOM)
+                               'JUSTIFY
+                               'LOCALCLOSE)
+                        (OPENTEXTSTREAM NIL ERRW NIL NIL `(FONT ,FONT PROMPTWINDOW DON'T))
+                        ERRW])
 
 (\MAILSCAVENGE.ASKUSER
   [LAMBDA (PROMPT)
@@ -655,10 +656,10 @@ Copyright (c) 1985, 1989-1990, 2021 by Venue & Xerox Corporation.
 )
 (PUTPROPS MAILSCAVENGE COPYRIGHT ("Venue & Xerox Corporation" 1985 1989 1990 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1409 39666 (LAFITE.SCAVENGE 1419 . 1941) (\MAILSCAVENGE.INTERNAL 1943 . 28454) (
-\MAILSCAVENGE.OPEN.SCRATCH 28456 . 29059) (\MAILSCAVENGE.LENGTHWIDTH 29061 . 29474) (
-\MAILSCAVENGE.LFCOPYBYTES 29476 . 30045) (\MAILSCAVENGE.READSTAMP 30047 . 30794) (
-\MAILSCAVENGE.DUPLICATE? 30796 . 31497) (\MAILSCAVENGE.FORMAT 31499 . 32326) (\MAILSCAVENGE.MAKEWINDOW
- 32328 . 34382) (\MAILSCAVENGE.ASKUSER 34384 . 37514) (\MAILSCAVENGE.FIX.LENGTHS 37516 . 38674) (
-\MAILSCAVENGE.CONFIRM 38676 . 39664)))))
+  (FILEMAP (NIL (1459 39559 (LAFITE.SCAVENGE 1469 . 1991) (\MAILSCAVENGE.INTERNAL 1993 . 28504) (
+\MAILSCAVENGE.OPEN.SCRATCH 28506 . 29109) (\MAILSCAVENGE.LENGTHWIDTH 29111 . 29524) (
+\MAILSCAVENGE.LFCOPYBYTES 29526 . 30095) (\MAILSCAVENGE.READSTAMP 30097 . 30844) (
+\MAILSCAVENGE.DUPLICATE? 30846 . 31547) (\MAILSCAVENGE.FORMAT 31549 . 32376) (\MAILSCAVENGE.MAKEWINDOW
+ 32378 . 34275) (\MAILSCAVENGE.ASKUSER 34277 . 37407) (\MAILSCAVENGE.FIX.LENGTHS 37409 . 38567) (
+\MAILSCAVENGE.CONFIRM 38569 . 39557)))))
 STOP
diff --git a/library/lafite/MAILSCAVENGE.LCOM b/library/lafite/MAILSCAVENGE.LCOM
index 1abf12e9..29cbfe3a 100644
Binary files a/library/lafite/MAILSCAVENGE.LCOM and b/library/lafite/MAILSCAVENGE.LCOM differ
