diff --git a/src/irc.c b/src/irc.c
--- a/src/irc.c
+++ b/src/irc.c
@@ -252,7 +252,7 @@
                         *ptr = '\0';
                     return command;
                 case PRIVMSG:
-                    if ((message->email = strchr (message->user, '=')))
+                    if ((message->email = strchr (message->user, '@')))
                         ++message->email;
                     if ((ptr = strchr (message->user, '!')))
                         *ptr = '\0';