From f39c0050382c99a3cfacaf151561413bb5106799 Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@delocalizedham.com>
Date: Wed, 21 Dec 2011 20:09:55 -0800
Subject: [PATCH] #1379362 sender_name should be used when preparing mail

---
 messaging.mail.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/messaging.mail.inc b/messaging.mail.inc
index 02e462b..1560853 100644
--- a/messaging.mail.inc
+++ b/messaging.mail.inc
@@ -29,7 +29,7 @@ function messaging_mail_prepare($destination, $message, $params, $alter = TRUE)
       $from_format = variable_get('messaging_sender_name', '[user]') . ' <' . variable_get('messaging_sender_mail', '[mail]') . '>';
       $from = token_replace($from_format, 'user', $message->sender_account);
     } elseif(!empty($message->sender_name) && $default_from) {
-      $from = token_replace('[user]', 'user', $message->sender_account) . ' <'.$default_from.'>';
+      $from = $message->sender_name . ' <' . $default_from . '>';
     } else {
       $from = $default_from;
     }
-- 
1.7.5