Index: user_relationships/plugins/user_relationship_privatemsg/user_relationship_privatemsg.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/plugins/user_relationship_privatemsg/Attic/user_relationship_privatemsg.module,v
retrieving revision 1.2.2.7
diff -u -r1.2.2.7 user_relationship_privatemsg.module
--- user_relationships/plugins/user_relationship_privatemsg/user_relationship_privatemsg.module	22 Apr 2008 21:38:20 -0000	1.2.2.7
+++ user_relationships/plugins/user_relationship_privatemsg/user_relationship_privatemsg.module	12 Dec 2008 22:00:04 -0000
@@ -32,17 +32,21 @@
   case 'request':
   case 'cancel':
     $message_to[] = $requestee;
+    $message_from[] = $requester;
     break;
 
   case 'approve':
   case 'disapprove':
     $message_to[] = $requester;
+    $message_from[] = $requester;
     break;
 
   case 'remove':
     $message_to[] = $requester;
+    $message_from[] = $requestee;
     if (!$relationship->is_oneway) {
       $message_to[] = $requestee;
+      $message_from[] = $requester;
     }
     break;
 
@@ -51,10 +55,12 @@
   }
 
   $sender = user_load(array('uid' => variable_get('user_relationship_privatemsg_sender', 1)));
-  foreach ($message_to as $target) {
+  foreach ($message_to as $key => $target) {
     // This prevents possible "You cannot contact" messages from the Privatemsg module
     if ($sender->uid == $target->uid) { continue; }
-
+    if (variable_get('user_relationship_private_msg_from_user', true)) {
+      $sender = user_load(array('uid' => $message_from[$key]));
+    }
     $replacements = user_relationship_privatemsg_replacements($relationship);
     if ($op == 'remove') {
       $replacements['@profile_uid'] = $target->uid;
@@ -146,6 +152,12 @@
         '#default_value'      => $sender->name,
         '#autocomplete_path'  => 'privatemsg/autocomplete',
       );
+      $form['privatemsg']['user_relationship_private_msg_from_user'] = array(
+        '#type'               => 'checkbox',
+        '#title'              => t('Override Sender'),
+        '#description'        => t('Override sender above with the other user in the relationship.'),
+        '#default_value'      => variable_get('user_relationship_private_msg_from_user', true),
+      );
       $user_relationship_privatemsg_ops = variable_get('user_relationship_privatemsg_ops', array());
       foreach ($user_relationship_privatemsg_ops as $op) {
         $message_function = "user_relationship_privatemsg_{$op}_default";