Index: user_relationship_mailer.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/plugins/user_relationship_mailer/user_relationship_mailer.module,v
retrieving revision 1.5
diff -u -r1.5 user_relationship_mailer.module
--- user_relationship_mailer.module	8 Oct 2007 19:49:37 -0000	1.5
+++ user_relationship_mailer.module	9 Oct 2007 01:09:13 -0000
@@ -25,7 +25,6 @@
   $send_to_requester = isset($requester->user_relationship_mailer_send_mail) ? $requester->user_relationship_mailer_send_mail : TRUE;
 
   $send_to = array();
-
   switch ($op) {
   case 'request':
     if ($relationship->approved) {
@@ -33,20 +32,20 @@
     }
   case 'cancel':
     $send_email = $send_to_requestee;
-    $send_to[] = $requestee->mail;
+    $send_to[]['address'] = $requestee->mail;
     break;
 
   case 'approve':
   case 'disapprove':
     $send_email = $send_to_requester;
-    $send_to[] = $requester->mail;
+    $send_to[]['address'] = $requester->mail;
     break;
 
   case 'remove':
     $send_email = $send_to_requestee && $send_to_requester;
-    $send_to[] = $requester->mail;
+    $send_to[] = array ('address' => $requester->mail, 'uid' => $requester->uid,);
     if (!$relationship->type->is_oneway) {
-      $send_to[] = $requestee->mail;
+      $send_to[] = array ('address' => $requestee->mail, 'uid' => $requestee->uid,);
     }
     break;
 
@@ -62,25 +61,28 @@
   if (!$send_email) {
     return;
   }
+  foreach ($send_to as $target) {
+    $replacements = user_relationship_mailer_replacements($relationship);
+    $subject = t(constant(strtoupper("USER_RELATIONSHIP_MAILER_{$op}_SUBJECT")), $replacements);
+    if ($op == 'remove') {
+      $replacements['@profile_uid'] = $target['uid'];
+    }
 
-  $replacements = user_relationship_mailer_replacements($relationship);
-  $subject = t(constant(strtoupper("USER_RELATIONSHIP_MAILER_{$op}_SUBJECT")), $replacements);
-
-  $message_function = "user_relationship_mailer_{$op}_default";
-  $message = t(variable_get("user_relationship_mailer_{$op}_message", $message_function()), $replacements);
-
-  $site_mail = variable_get('site_mail', '');
-  if (!strlen($site_mail)) {
-    if (user_access('administer nodes')){
-      drupal_set_message(t('You should create an administrator mail address for your site! <a href="%url">Do it here</a>.', array('%url' => url('admin/settings/site-information'))), 'error');
+    $message_function = "user_relationship_mailer_{$op}_default";
+    $message = t(variable_get("user_relationship_mailer_{$op}_message", $message_function()), $replacements);
+
+    $site_mail = variable_get('site_mail', '');
+    if (!strlen($site_mail)) {
+      if (user_access('administer nodes')){
+        drupal_set_message(t('You should create an administrator mail address for your site! <a href="%url">Do it here</a>.', array('%url' => url('admin/settings/site-information'))), 'error');
+      }
+      $site_mail = 'nobody@localhost';
     }
-    $site_mail = 'nobody@localhost';
-  }
 
-  $errors = array();
-  foreach ($send_to as $address) {
+    $errors = array();
+
     $replacements = array('%type' => $op, '%username' => $related->name);
-    if (drupal_mail("user_relationship_mailer_user_$op", $address, $subject, $message, $site_mail)) {
+    if (drupal_mail("user_relationship_mailer_user_$op", $target['address'], $subject, $message, $site_mail)) {
       watchdog('userreltnships', t('%type message was sent to %username', $replacements));
     }
     else {
Index: user_relationship_mailer_defaults.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/plugins/user_relationship_mailer/user_relationship_mailer_defaults.inc,v
retrieving revision 1.4
diff -u -r1.4 user_relationship_mailer_defaults.inc
--- user_relationship_mailer_defaults.inc	7 Oct 2007 19:39:22 -0000	1.4
+++ user_relationship_mailer_defaults.inc	9 Oct 2007 01:09:13 -0000
@@ -16,7 +16,6 @@
 function user_relationship_mailer_replacements(&$relationship) {
   $requester = $relationship->requester;
   $requestee = $relationship->requestee;
-
   $replacements = array(
     '@site'                     => variable_get('site_name', 'Drupal'),
     '@site_url'                 => $GLOBALS['base_url'],
@@ -37,7 +36,7 @@
     '@relationship_plural_name' => $relationship->plural_name,
   );
 
-  if ($relationship->deleted_by) {
+  if ($deleted_by = $relationship->deleted_by) {
     $replacements['@deleted_by_name'] = $deleted_by->name;
     $replacements['@deleted_by_link'] = url("user/$deleted_by->uid", NULL, NULL, TRUE);
     $replacements['@deleted_by_uid']  = $deleted_by->uid;
@@ -62,6 +61,8 @@
 
 Regards,
 The @site team
+This message was sent to you because you have user relationships email notifications turned on.
+If you no longer wish to receive these emails, you can turn them off at @site_url/user/@requestee_uid/edit.
 MESSAGE;
 }
 
@@ -76,6 +77,9 @@
 
 Regards,
 The @site team
+
+This message was sent to you because you have user relationships email notifications turned on.
+If you no longer wish to receive these emails, you can turn them off at @site_url/user/@requestee_uid/edit.
 MESSAGE;
 }
 
@@ -93,6 +97,9 @@
 
 Regards,
 The @site team
+
+This message was sent to you because you have user relationships email notifications turned on.
+If you no longer wish to receive these emails, you can turn them off at @site_url/user/@requester_uid/edit.
 MESSAGE;
 }
 
@@ -107,6 +114,9 @@
 
 Regards,
 The @site team
+
+This message was sent to you because you have user relationships email notifications turned on.
+If you no longer wish to receive these emails, you can turn them off at @site_url/user/@requester_uid/edit.
 MESSAGE;
 }
 
@@ -119,5 +129,8 @@
 
 Regards,
 The @site team
+
+This message was sent to you because you have user relationships email notifications turned on. 
+If you no longer wish to receive these emails, you can turn them off at @site_url/user/@profile_uid/edit.
 MESSAGE;
 }