Index: openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.en_US.ISO-8859-1.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.en_US.ISO-8859-1.xml	5 Dec 2006 04:23:38 -0000	1.6
+++ openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.en_US.ISO-8859-1.xml	8 Apr 2007 08:25:14 -0000	1.7
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-mail-lite" package_version="1.3b8" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-mail-lite" package_version="5.4.0d1" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Associated_files">Associated Files:</msg>
   <msg key="BCC">BCC</msg>
+  <msg key="Bounce_disabled">Bouncing recorded as disabled. You will receive E-Mails again.</msg>
   <msg key="CC">CC</msg>
   <msg key="cc_help">Send copy to multiple addresses separated by &quot;;&quot;</msg>
   <msg key="check_uncheck">Check/Uncheck</msg>
Index: openacs-4/packages/acs-mail-lite/tcl/bounce-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/bounce-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-mail-lite/tcl/bounce-procs.tcl	8 Apr 2007 08:12:51 -0000	1.1
+++ openacs-4/packages/acs-mail-lite/tcl/bounce-procs.tcl	8 Apr 2007 08:25:14 -0000	1.2
@@ -137,7 +137,7 @@
 	    array set user $notification_list
 	    set user_id $user(user_id)
 
-	    set body "Dear $user(name),\n\nDue to returning mails from your email account, we currently do not send you any email from our system. To reenable your email account, please visit\n[ad_url]/register/restore-bounce?[export_url_vars user_id]"
+	    set body "Dear $user(name),\n\nDue to returning mails from your email account, we currently do not send you any email from our system. To reenable your email account, please visit\n[ad_url]/acs-mail-lite/restore-bounce?[export_url_vars user_id]"
 
 	    send -to_addr $notification_list -from_addr $notification_sender -subject $subject -body $body -valid_email
 	    ns_log Notice "Bounce notification send to user $user_id"
Index: openacs-4/packages/acs-mail-lite/www/restore-bounce.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/www/restore-bounce.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail-lite/www/restore-bounce.adp	8 Apr 2007 08:25:14 -0000	1.1
@@ -0,0 +1,13 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<p>#acs-mail-lite.Bounce_disabled#</p>
+
+<p>
+  <b>&raquo;</b> <a href="@return_url@">#acs-subsite.Continue#</a>
+</p>
+
+
+
+
Index: openacs-4/packages/acs-mail-lite/www/restore-bounce.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/www/restore-bounce.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail-lite/www/restore-bounce.tcl	8 Apr 2007 08:25:14 -0000	1.1
@@ -0,0 +1,16 @@
+ad_page_contract {
+    The page restores a user from the deleted state.
+    @cvs-id $Id: restore-bounce.tcl,v 1.1 2007/04/08 08:25:14 maltes Exp $
+} {
+    {return_url {[ad_pvt_home]}}
+}
+
+set page_title [_ acs-mail-lite.Restore_bounce]
+set context [list [list [ad_pvt_home] [ad_pvt_home_name]] $page_title]
+
+# We do require authentication, though their account will be closed
+set user_id [auth::require_login]
+
+db_dml unbounce_user "update users set email_bouncing_p = 'f' where user_id = :user_id"
+# Used in a message key
+set system_name [ad_system_name]