--- sites/all/modules/messaging/messaging.mail.inc_ori.inc	2009-08-05 16:55:48.000000000 +0300
+++ sites/all/modules/messaging/messaging.mail.inc	2009-08-05 16:56:16.000000000 +0300
@@ -25,11 +25,23 @@ function messaging_mail_prepare($destina
   // The message 'from' will depend on message sender if present, otherwise default to site mail
   $default_from = variable_get('site_mail', ini_get('sendmail_from'));
   
+  $realname = FALSE;
+  if (module_exists("realname")) {
+    $realname = realname_make_name($message->sender_account);
+  }
   if (empty($params['from'])) {
     if (!empty($message->sender_account) && !empty($message->sender_account->mail)) {
-      $from = check_plain($message->sender_account->name) . ' <'.$message->sender_account->mail.'>';
+        if ($realname) {
+        $from = check_plain($realname) . ' <'.$message->sender_account->mail.'>';
+        } else {
+        $from = check_plain($message->sender_account->name) . ' <'.$message->sender_account->mail.'>';
+        }
     } elseif(!empty($message->sender_name) && $default_from) {
-      $from = check_plain($message->sender_name) . ' <'.$default_from.'>';
+      if ($realname) {
+        $from = check_plain($realname) . ' <'.$default_from.'>';
+      } else {
+        $from = check_plain($message->sender_name) . ' <'.$default_from.'>';
+      }
     } else {
       $from = $default_from;
     }
@@ -37,7 +49,7 @@ function messaging_mail_prepare($destina
   } else {
     $from = $params['from'];
   }
-
+  
   // Build the mail object, mimic drupal_mail() format
   $mail = array(
     'id'       => 'messaging_'. (!empty($message->type) ? 'message-'.$message->type : 'message'),
