Index: openacs-4/packages/acs-mail-lite/tcl/email-inbound-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/email-inbound-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-mail-lite/tcl/email-inbound-procs.tcl	17 Feb 2018 17:33:11 -0000	1.2
+++ openacs-4/packages/acs-mail-lite/tcl/email-inbound-procs.tcl	18 Feb 2018 10:41:58 -0000	1.3
@@ -579,7 +579,7 @@
         array set h_arr [list ]
     }
 
-    if { $headers ne "" && [llength [array names h_arr]] < 1 } {
+    if { $headers ne "" && [array size h_arr] < 1 } {
         #  To remove subject from headers to search, 
         #  incase topic uses a reserved word,
         #  we rebuild the semblence of array returned by ns_imap headers.
@@ -674,7 +674,7 @@
         set from_email ""
         if { $fr_idx > -1 } {
             set fr_h [lindex $hn_list $fr_idx]
-            set from [ad_quotehtml $h_arr(${fr_h})]
+            set from [ns_quotehtml $h_arr(${fr_h})]
             set h_arr(aml_from) $from
             set from_email [string tolower \
                                 [acs_mail_lite::parse_email_address \
@@ -933,7 +933,7 @@
                 set fr_idx [lsearch -glob -nocase $hn_list {subject}]
                 if { $fr_idx > -1 } {
                     set subject $h_arr(${subject})
-                    set h_arr(aml_subject) [ad_quotehtml $subject]
+                    set h_arr(aml_subject) [ns_quotehtml $subject]
                 }
             }
             
@@ -1074,7 +1074,7 @@
                     aml_to_addrs -
                     to {
                         if { ![info exists h_arr(aml_to_addrs)] } {
-                            set h_quoted [ad_quotehtml $h_value]
+                            set h_quoted [ns_quotehtml $h_value]
                             set h_arr(aml_to) $h_quoted
                             set to_addrs [acs_mail_lite::parse_email_address \
                                                     -email $h_quoted ]
@@ -1316,7 +1316,7 @@
                                     -other $h_arr(aml_other) \
                                     -datetime_cs $h_arr(aml_datetime_cs)]
                     
-                    if { [lsearch -exact $status "0"] > -1 } {
+                    if {"0" in $status} {
                         set error_p 1
                     }
                 }
Index: openacs-4/packages/acs-mail-lite/tcl/imap-inbound-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/imap-inbound-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-mail-lite/tcl/imap-inbound-procs.tcl	17 Feb 2018 17:08:31 -0000	1.1
+++ openacs-4/packages/acs-mail-lite/tcl/imap-inbound-procs.tcl	18 Feb 2018 10:41:58 -0000	1.2
@@ -419,7 +419,7 @@
     set i 0
     set conn_exists_p 0
     while { $i < $s_len && $id ne $conn_id }  {
-        set id [lindex [lindex $sessions_list 0] 0]
+        set id [lindex $sessions_list 0 0]
         if { $id eq $conn_id || $conn_id eq "all" } {
             set conn_exists_p 1
             ns_log Dev "acs_mail_lite::imap_conn_close.731 session_id '${id}'"
@@ -622,7 +622,7 @@
                                             $headers_list subject]
                             if { $su_idx > -1 } {
                                 set sun [lindex $headers_list $su_idx]
-                                set hdrs_arr(aml_subject) [ad_quotehtml $hdrs_arr(${sun})]
+                                set hdrs_arr(aml_subject) [ns_quotehtml $hdrs_arr(${sun})]
                             } else {
                                 set hdrs_arr(aml_subject) ""
                             }
@@ -631,7 +631,7 @@
                                             $headers_list to]
                             if { ${to_idx} > -1 } {
                                 set ton [lindex $headers_list $to_idx]
-                                set hdrs_arr(aml_to) [ad_quotehtml $hdrs_arr(${ton}) ]
+                                set hdrs_arr(aml_to) [ns_quotehtml $hdrs_arr(${ton}) ]
                             } else {
                                 set hdrs_arr(aml_to) ""
                             }
Index: openacs-4/packages/acs-mail-lite/tcl/maildir-inbound-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/maildir-inbound-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-mail-lite/tcl/maildir-inbound-procs.tcl	17 Feb 2018 17:25:19 -0000	1.2
+++ openacs-4/packages/acs-mail-lite/tcl/maildir-inbound-procs.tcl	18 Feb 2018 10:41:58 -0000	1.3
@@ -110,7 +110,7 @@
                                         $headers_list subject]
                         if { $su_idx > -1 } {
                             set sun [lindex $headers_list $su_idx]
-                            set hdrs_arr(aml_subject) [ad_quotehtml $hdrs_arr(${sun})]
+                            set hdrs_arr(aml_subject) [ns_quotehtml $hdrs_arr(${sun})]
                         } else {
                             set hdrs_arr(aml_subject) ""
                         }
@@ -119,7 +119,7 @@
                                         $headers_list to]
                         if { ${to_idx} > -1 } {
                             set ton [lindex $headers_list $to_idx]
-                            set hdrs_arr(aml_to) [ad_quotehtml $hdrs_arr(${ton}) ]
+                            set hdrs_arr(aml_to) [ns_quotehtml $hdrs_arr(${ton}) ]
                         } else {
                             set hdrs_arr(aml_to) ""
                         }