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 -N -r1.13 -r1.14
--- openacs-4/packages/acs-mail-lite/tcl/email-inbound-procs.tcl	21 Jun 2018 15:45:03 -0000	1.13
+++ openacs-4/packages/acs-mail-lite/tcl/email-inbound-procs.tcl	22 Jun 2018 15:48:55 -0000	1.14
@@ -2526,6 +2526,42 @@
     }
 }
 
+
+ad_proc -public acs_mail_lite::bounce_address {
+    -user_id:required
+    -package_id:required
+    -message_id:required
+} {
+    Composes a bounce address. If parameter FixedSenderEmail empty,
+    message_id is used. If message_id is empty, the legacy approach
+    for creating bounce_address is used.
+
+    @option user_id user_id of the mail recipient
+    @option package_id package_id of the mail sending package
+    (needed to call package-specific code to deal with bounces)
+    @option message_id message-id of the mail
+    @return bounce address
+} {
+    set mail_package_id [apm_package_id_from_key "acs-mail-lite"]
+    set fixed_sender [parameter::get -parameter "FixedSenderEmail" \
+                          -package_id $mail_package_id \
+                          -default "" ]
+    if { $fixed_sender ne "" } {
+        set ba $fixed_sender
+    } else {
+        if { $message_id ne "" } {
+            set ba $message_id
+        } else {
+            set ba [bounce_prefix]
+            append ba "-" $user_id "-" [ns_sha1 $message_id] \
+                "-" $package_id "@" [address_domain]
+            ns_log Warning "acs_mail_lite::bounce_address is using \
+deprecated way. Supply message_id. Use acs_mail_lite::unique_id_create"
+        }
+    }
+    return $ba
+}
+
 #
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-mail-lite/tcl/legacy-inbound-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/legacy-inbound-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-mail-lite/tcl/legacy-inbound-procs.tcl	21 Jun 2018 15:21:23 -0000	1.1
+++ openacs-4/packages/acs-mail-lite/tcl/legacy-inbound-procs.tcl	22 Jun 2018 15:48:55 -0000	1.2
@@ -305,42 +305,6 @@
                     -user_id [party::get_by_email -email $email]]
     }
 
-    ad_proc -deprecated -public bounce_address {
-        -user_id:required
-        -package_id:required
-        -message_id:required
-    } {
-        Composes a bounce address. If parameter FixedSenderEmail empty,
-        message_id is used. If message_id is empty, the legacy approach
-        for creating bounce_address is used.
-
-        @option user_id user_id of the mail recipient
-        @option package_id package_id of the mail sending package
-        (needed to call package-specific code to deal with bounces)
-        @option message_id message-id of the mail
-        @return bounce address
-        @see acs_mail_lite::inbound_email_context
-    } {
-        set mail_package_id [apm_package_id_from_key "acs-mail-lite"]
-        set fixed_sender [parameter::get -parameter "FixedSenderEmail" \
-                              -package_id $mail_package_id \
-                              -default "" ]
-        if { $fixed_sender ne "" } {
-            set ba $fixed_sender
-        } else {
-            if { $message_id ne "" } {
-                set ba $message_id
-            } else {
-                set ba [bounce_prefix]
-                append ba "-" $user_id "-" [ns_sha1 $message_id] \
-                    "-" $package_id "@" [address_domain]
-                ns_log Warning "acs_mail_lite::bounce_address is using \
- deprecated way. Supply message_id. Use acs_mail_lite::unique_id_create"
-            }
-        }
-        return $ba
-    }
-
     ad_proc -deprecated -public scan_replies {} {
         Scheduled procedure that will scan for bounced mails
         @see acs_mail_lite::check_bounces