Index: openacs.org-dev/packages/notifications/tcl/notification-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/notifications/tcl/notification-email-procs.tcl,v
diff -u -r1.1.1.2 -r1.1.1.3
--- openacs.org-dev/packages/notifications/tcl/notification-email-procs.tcl	25 Jul 2002 18:47:18 -0000	1.1.1.2
+++ openacs.org-dev/packages/notifications/tcl/notification-email-procs.tcl	8 Oct 2002 15:47:15 -0000	1.1.1.3
@@ -25,6 +25,10 @@
         return [get_parameter -name "EmailDomain"]
     }
 
+    ad_proc -public manage_notifications_url {} {
+        return "[ad_url]/[apm_package_url_from_key [notification::package_key]]manage"
+    }
+
     ad_proc -public reply_address_prefix {} {
         return [get_parameter -name "EmailReplyAddressPrefix"]
     }
@@ -46,9 +50,9 @@
         {-type_id:required}
     } {
         if {[empty_string_p $object_id] || [empty_string_p $type_id]} {
-            return [reply_address_prefix]
+            return "[address_domain] mailer <[reply_address_prefix]@[address_domain]>"
         } else {
-            return "[reply_address_prefix]-$object_id-$type_id@[address_domain]"
+            return "[address_domain] mailer <[reply_address_prefix]-$object_id-$type_id@[address_domain]>"
         }
     }
 
@@ -80,6 +84,8 @@
         # Get email
         set email [cc_email_from_party $to_user_id]
 
+       append content "\nGetting too much email? Manage your notifications at: [manage_notifications_url]"
+
         acs_mail_lite::send \
             -to_addr $email \
             -from_addr [reply_address -object_id $reply_object_id -type_id $notification_type_id] \
@@ -93,7 +99,8 @@
         Scans qmail incoming email queue and queues up messages
         using acs-mail.
 
-        @Author dan.wickstrom@openforce.net, ben@openforce
+        @author ben@openforce.net
+        @author dan.wickstrom@openforce.net
         @creation-date 22 Sept, 2001
 
         @param queue_dir The location of the qmail mail queue in