Index: openacs-4/packages/acs-mail-lite/acs-mail-lite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/acs-mail-lite.info,v
diff -u -r1.62.2.1 -r1.62.2.2
--- openacs-4/packages/acs-mail-lite/acs-mail-lite.info	6 Apr 2020 17:49:47 -0000	1.62.2.1
+++ openacs-4/packages/acs-mail-lite/acs-mail-lite.info	8 Apr 2020 10:15:04 -0000	1.62.2.2
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.10.0d8" url="http://openacs.org/repository/download/apm/acs-mail-lite-5.10.0d8.apm">
+    <version name="5.10.0d9" url="http://openacs.org/repository/download/apm/acs-mail-lite-5.10.0d9.apm">
         <owner url="mailto:timo@studio-k4.de">Timo Hentschel</owner>
         <owner url="mailto:malte.sussdorff@cognovis.de">Malte Sussdorff</owner>
         <summary>Simplified reliable email transmission with bounce management.</summary>
@@ -18,7 +18,7 @@
         <description format="text/html">This package provides a service for sending and receiving messages, messages are queued in the database to ensure reliable sending and make sending a message &#39;transactional&#39;. Replacement for acs-mail.</description>
         <maturity>3</maturity>
 
-        <provides url="acs-mail-lite" version="5.10.0d8"/>
+        <provides url="acs-mail-lite" version="5.10.0d9"/>
         <requires url="acs-kernel" version="5.9.0"/>
         <requires url="acs-service-contract" version="5.9.0"/>
         <requires url="acs-tcl" version="5.10.0d8"/>
@@ -31,7 +31,7 @@
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="BounceMailDir"  description="Location of the maildir location that accepts incoming bounces" section_name="email"/>
             <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="BounceScanQueue"  default="120" description="How often (in seconds) to scan for new bounces" section_name="email"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailAllow"  description="Tcl list of email addresses that are allowed to receive messages when delivery mode is set to filter" section_name="rollout_support"/>
-            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailDeliveryMode"  default="default" description="Set how message will be delivered. default: Email messages are sent via the tcllib smtpd implementation. nssmptd: try to send mail via SMTP based on the NaviServer nssmptd module. log: Email messages are written to the server&#39;s error log. redirect: Email messages are redirected to the addresses specified by the EmailRedirectTo parameter. If this list is absent or empty, email messages are written to the server&#39;s error log. filter: Email messages are sent via SMTP if the recipient appears in the EmailAllow parameter, otherwise they are logged. The setting 'filter' and 'redirect' can be combined with 'nssmptd' as in 'filter nssmtpd' to specify the delivery implementation"  section_name="rollout_support"/>
+            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailDeliveryMode"  default="default" description="Set how message will be delivered. default: Email messages are sent via the tcllib smtpd implementation. nssmptd: try to send mail via SMTP based on the NaviServer nssmptd module. log: Email messages are written to the server&#39;s error log. ignore: just write a single line per ignored mail delivery attempt. redirect: Email messages are redirected to the addresses specified by the EmailRedirectTo parameter. If this list is absent or empty, email messages are written to the server&#39;s error log. filter: Email messages are sent via SMTP if the recipient appears in the EmailAllow parameter, otherwise they are logged. The setting 'filter' and 'redirect' can be combined with 'nssmptd' as in 'filter nssmtpd' to specify the delivery implementation"  section_name="rollout_support"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailRedirectTo"  description="Tcl list of email addresses to redirect to" section_name="rollout_support"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EnvelopePrefix"  default="bounce" description="The prefix for sending mail that will be handled by this instance. Use alphanumeric characters only." section_name="email"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="FilesystemAttachmentsRoot"  description="Path of a folder in the filesystem into which files are allowed to be read and sent as attachments. Trying to send attachments residing outside this folder will throw an error.
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl,v
diff -u -r1.108.2.6 -r1.108.2.7
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	7 Apr 2020 16:50:50 -0000	1.108.2.6
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	8 Apr 2020 10:15:04 -0000	1.108.2.7
@@ -645,7 +645,9 @@
                     return
                 }
                 if {[string first $filesystem_attachments_root $f] != 0} {
-                    ns_log Error "acs-mail-lite::send: Could not send mail: file '$f' is outside the allowed root folder for attachments '$filesystem_attachments_root'"
+                    ns_log Error "acs-mail-lite::send: Could not send mail: file '$f'\
+                           is outside the allowed root folder for attachments\
+                           '$filesystem_attachments_root'"
                     return
                 }
                 set name [file tail $f]
@@ -744,14 +746,13 @@
             redirect {
                 set send_mode $default_send_mode
 
-
                 set redirect_to [parameter::get \
                                  -package_id $mail_package_id \
                                  -parameter EmailRedirectTo]
                 if {$redirect_to eq ""} {
                     ns_log warning "acs-mail-lite: redirect mode activated but no value for\
-                       EmailRedirectTo provided. Fall back to send_mode 'log'"
-                    set send_mode log
+                       EmailRedirectTo provided"
+                    set send_mode ignore
                 } else {
                     set to_addr $redirect_to
 
@@ -820,13 +821,11 @@
             # Retrieve the email message as a string
             set packaged [mime::buildmessage $tokens]
 
-            # Close all mime tokens
-            mime::finalize $tokens -subordinates all
-
             # Send the email message to the log
-            ns_log Notice "acs-mail-lite::send: $notice\n\n**********\nEnvelope sender: $originator\n\n$packaged\n**********"
+            ns_log Notice "acs-mail-lite::send: $notice\n\n**********\n\
+                Envelope sender: $originator\n\n$packaged\n**********"
 
-        } else {
+        } elseif {$send_mode eq "smtp"} {
 
             ad_try {
                 acs_mail_lite::smtp -multi_token $tokens \
@@ -837,11 +836,19 @@
                 set status error
             }
 
-            # Close all mime tokens
-            mime::finalize $tokens -subordinates all
-
+        } else {
+            #
+            # Ignoring sending message
+            #
+            ns_log Notice "acs-mail-lite::send: ignore sending message to $to_addr"
         }
 
+        #
+        # Close all mime tokens
+        #
+        mime::finalize $tokens -subordinates all
+
+
         if { !$no_callback_p } {
             callback acs_mail_lite::send \
                 -package_id $package_id \