Index: openacs-4/packages/acs-mail-lite/tcl/incoming-mail-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/incoming-mail-procs.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/acs-mail-lite/tcl/incoming-mail-procs.tcl	10 Sep 2015 08:21:31 -0000	1.7.2.1
+++ openacs-4/packages/acs-mail-lite/tcl/incoming-mail-procs.tcl	20 Sep 2016 10:52:23 -0000	1.7.2.2
@@ -19,7 +19,18 @@
     } {
         set domain [parameter::get_from_package_key -package_key "acs-mail-lite" -parameter "BounceDomain"]
         if { $domain eq "" } {
-	    regsub {http://} [ns_config [ns_driversection -driver nssock] hostname] _ domain
+            #
+            # If there is no domain configured, use the configured
+            # hostname as domain name
+            #
+            foreach driver {nsssl nssock} {
+                set driver_section [ns_driversection -driver $driver]
+                set configured_hostname [ns_config $driver_section hostname]
+                if {$configured_hostname ne ""} {
+                    set domain $configured_hostname
+                    break
+                }
+            }
 	}
 	return $domain
     }