Index: returnpath.module
===================================================================
--- returnpath.module	(revision 976)
+++ returnpath.module	(working copy)
@@ -37,6 +37,8 @@
     ? $message['from']
     : $message['headers']['Return-Path'];
 
+  $return_path = preg_replace('/(.*<)?(.*?)>?/', "$2", $return_path);
+
   return mail(
     $message['to'],
     mime_header_encode($message['subject']),