diff --git a/src/irc.c b/src/irc.c
--- a/src/irc.c
+++ b/src/irc.c
@@ -169,7 +169,7 @@
     else
         garbage_collector = theLine;
 
-    message->user = message->email = NULL;
+    message->user = message->domain = NULL;
     message->command = NULL;
     message->channel = message->line = NULL;
 
@@ -253,8 +253,8 @@
                         *ptr = '\0';
                     return command;
                 case PRIVMSG:
-                    if ((message->email = strchr (message->user, '@')))
-                        ++message->email;
+                    if ((message->domain = strchr (message->user, '@')))
+                        ++message->domain;
                     if ((ptr = strchr (message->user, '!')))
                         *ptr = '\0';