Index: openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl	8 Aug 2005 13:10:06 -0000	1.9
+++ openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl	11 Aug 2005 01:25:03 -0000	1.10
@@ -87,6 +87,16 @@
                 {reason:text(textarea),optional {label "[_ dotlrn-ecommerce.Reason]"} {html {rows 10 cols 60}}}
             } \
             -on_request {
+		set reason [lindex [lindex [callback dotlrn::default_member_email -community_id $community_id -to_user $user_id -type "prereq approval"] 0] 2]
+		set var_list [lindex [callback dotlrn::member_email_var_list -community_id $community_id -to_user $user_id -type $type] 0]
+	    set email_vars [lang::message::get_embedded_vars $reason]
+	    foreach var [concat $email_vars] {
+		if {![info exists vars($var)]} {
+		    set vars($var) ""
+		}
+	    }
+		set var_list [array get vars]
+		set reason "[lang::message::format $reason $var_list]"
             } \
             -on_submit {
 		db_transaction {
@@ -116,9 +126,9 @@
 
                 set applicant_email [cc_email_from_party $user_id]
                 set actor_email [cc_email_from_party $actor_id]
-                set community_name [dotlrn_community::get_community_name $community_id]
-		dotlrn_community::send_member_email -community_id $community_id -to_user $user_id -type $email_type -var_list [list course_name $community_name reason $reason]
 
+		dotlrn_community::send_member_email -community_id $community_id -to_user $user_id -type $email_type -override_email $reason
+
             } \
             -after_submit {
                 ad_returnredirect $return_url
@@ -154,8 +164,12 @@
 set applicant_email [cc_email_from_party $user_id]
 set actor_email [cc_email_from_party $actor_id]
 set community_name [dotlrn_community::get_community_name $community_id]
-
-dotlrn_community::send_member_email -community_id $community_id -to_user $user_id -type $email_type
+if {[exists_and_not_null reason]} {
+    set override_email $reason
+} else {
+    set override_email ""
+}
+dotlrn_community::send_member_email -community_id $community_id -to_user $user_id -type $email_type -override_email $override_email
 ad_returnredirect $return_url
 }
 }
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl	3 Aug 2005 08:44:38 -0000	1.7
+++ openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl	11 Aug 2005 01:25:03 -0000	1.8
@@ -44,6 +44,16 @@
             {reason:text(textarea),optional {label "[_ dotlrn-ecommerce.Reason]"} {html {rows 10 cols 60}}}
         } \
         -on_request {
+	    set reason [lindex [lindex [callback dotlrn::default_member_email -community_id $community_id -to_user $user_id -type "prereq reject"] 0] 2]
+	    set var_list [lindex [callback dotlrn::member_email_var_list -community_id $community_id -to_user $user_id -type $type] 0]
+	    set email_vars [lang::message::get_embedded_vars $reason]
+	    foreach var [concat $email_vars] {
+		if {![info exists vars($var)]} {
+		    set vars($var) ""
+		}
+	    }
+	    set var_list [array get vars]
+	    set reason "[lang::message::format $reason $var_list]"
         } \
         -on_submit {
             dotlrn_community::membership_reject -community_id $community_id -user_id $user_id
@@ -53,19 +63,20 @@
             switch $type {
                 prereq {
                     set subject "[_ dotlrn-ecommerce.Application_prereq_rejected]"
-                    set body "[_ dotlrn-ecommerce.lt_Your_prereq_rejected]"
+		    if {[string equal "" $reason]} {
+			set body "[_ dotlrn-ecommerce.lt_Your_prereq_rejected]"
+		    } else {
+			set body $reason
+		    }
                 }
                 default {
                     set subject "[_ dotlrn-ecommerce.Application_rejected]"
                     set body "[_ dotlrn-ecommerce.lt_Your_application_to_j_1]"
                 }
             }
-            if {![empty_string_p [string trim $reason]]} {
-                append body "
-[_ dotlrn-ecommerce.Reason]:
-[string trim $reason]"
 
-            }
+
+	
             acs_mail_lite::send \
                 -to_addr $applicant_email \
                 -from_addr $actor_email \