--- MoinMoin_util_mail.py	2009/03/26 12:27:40	1.1
+++ MoinMoin_util_mail.py	2009/03/27 09:27:33	1.3
@@ -27,14 +27,14 @@
     @rtype: string
     @return: encoded address
     """   
-    composite = re.compile(r'(?P<phrase>.+)(?P<angle_addr>\<.*\>)', 
+    composite = re.compile(r'(?P<phrase>.*?)(?P<blanks>\s*)(?P<angle_addr>\<.*\>)',
                            re.UNICODE)
     match = composite.match(address)
     if match:
         phrase = match.group('phrase').encode(config.charset)
         phrase = str(Header(phrase, charset))
         angle_addr = match.group('angle_addr').encode(config.charset)       
-        return phrase + angle_addr
+        return phrase + match.group('blanks') + angle_addr
     else:
         return address.encode(config.charset)