Index: openacs-4/packages/acs-subsite/www/user/email-privacy-level.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/email-privacy-level.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/email-privacy-level.adp	14 Jan 2005 14:52:03 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/user/email-privacy-level.adp	31 Mar 2009 14:43:06 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">#acs-subsite.Change_my_email_P#</property>
+  <property name="&doc">doc</property>
   <property name="context">@context;noquote@</property>
 
 <formtemplate id=private-email></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl	10 Jan 2007 21:22:11 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl	31 Mar 2009 14:43:06 -0000	1.3
@@ -4,16 +4,21 @@
     @author Miguel Marin (miguelmarin@viaro.net) Viaro Networks (www.viaro.net)
 } {
     {user_id ""}
+    {return_url ""}
 }
 
-set page_title  "\"#acs-subsite.Change_my_email_P\#\""
-set context [list [list [ad_pvt_home] [ad_pvt_home_name]] $page_title]
+if { $return_url eq "" } {
+    set return_url [ad_pvt_home]
+}
 
+set doc(title) [_ acs-subsite.Change_my_email_P]
+set context [list [list [ad_pvt_home] [ad_pvt_home_name]] $doc(title)]
+
 if {$user_id eq ""} {
     set user_id [auth::require_login -account_status closed]
 }
 
-ad_form -name private-email -form {
+ad_form -name private-email -export return_url -form {
     {level:integer(select)
 	{label "\#acs-subsite.Change_my_email_P\#:"}
 	{options {{"[_ acs-subsite.email_as_text]" 4} {"[_ acs-subsite.email_as_image]" 3} \
@@ -24,5 +29,5 @@
 } -on_submit {
     email_image::update_private_p -user_id $user_id -level $level
 } -after_submit {
-    ad_returnredirect [ad_pvt_home]
+    ad_returnredirect $return_url
 }
\ No newline at end of file