diff -burN ../messaging_ori//messaging.mail.inc messaging//messaging.mail.inc
--- ../messaging_ori//messaging.mail.inc	2010-06-21 18:20:37.000000000 +0200
+++ messaging//messaging.mail.inc	2010-10-26 23:01:45.000000000 +0200
@@ -30,7 +30,7 @@
       $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 = token_replace('[user]', 'user', user_load(array('name' => $message->sender_name))) . ' <'.$default_from.'>';
     } else {
       $from = $default_from;
     }