git » msnlib » commit e3cd6b7

diff --git a/msn b/msn
index ed99d3f..05b890b 100644
--- a/msn
+++ b/msn
@@ -408,7 +408,10 @@ def matchemail(begin, only_online = 0, start = 0):
 	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: