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 -N -r1.107 -r1.108
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	21 Jun 2018 13:12:17 -0000	1.107
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	21 Jun 2018 15:45:03 -0000	1.108
@@ -767,6 +767,38 @@
             -extraheaders $extraheaders_list
     }
 
+    ad_proc -public address_domain {} {
+        @return domain address to which bounces are directed to.
+        If empty, uses domain from FixedSenderEmail parameter,
+        otherwise the hostname in config.tcl is used.
+    } {
+        set domain [parameter::get_from_package_key \
+                        -package_key "acs-mail-lite" \
+                        -parameter "BounceDomain"]
+        if { $domain eq "" } {
+            # Assume a FixedSenderEmail domain, if it exists.
+            set email [parameter::get_from_package_key \
+                           -package_key "acs-mail-lite" \
+                           -parameter "FixedSenderEmail"]
+            if { $email ne "" } {
+                set domain [string range $email [string last "@" $email]+1 end]
+            } else {
+                #
+                # If there is no domain configured, use the configured
+                # hostname as domain name
+                #
+                foreach driver {nsssl nssock_v4 nssock_v6 nssock} {
+                    set section [ns_driversection -driver $driver]
+                    set configured_hostname [ns_config $section hostname]
+                    if {$configured_hostname ne ""} {
+                        set domain $configured_hostname
+                        break
+                    }
+                }
+            }
+        }
+        return $domain
+    }
 }
 
 # Local variables: