Tue Apr 12 17:53:47 ART 2005  Alberto Bertogli <albertogli@telpin.com.ar>
  * Return nicks only if they don't contain spaces.
diff -rN -u old-msnlib/msn new-msnlib/msn
--- old-msnlib/msn	2005-05-27 13:09:28.000000000 -0300
+++ new-msnlib/msn	2005-05-27 13:09:28.000000000 -0300
@@ -408,7 +408,10 @@
 	if found:
 		if findemailnick(emails[pos], begin) == 1:
 			# return the nick
-			return email2nick(emails[pos])
+			nick = email2nick(emails[pos])
+			if ' ' in nick:
+				return emails[pos]
+			return nick
 		else:
 			return emails[pos]
 	else: