diff --git a/src/drivers/__init__.py b/src/drivers/__init__.py
index 333ec8258..03cf9e59b 100644
--- a/src/drivers/__init__.py
+++ b/src/drivers/__init__.py
@@ -210,11 +210,9 @@ def newDriver(irc, moduleName=None):
     return driver
 
 def parseMsg(s):
-    start = time.time()
     s = s.strip()
     if s:
         msg = ircmsgs.IrcMsg(s)
-        msg.tag('receivedAt', start)
         return msg
     else:
         return None
diff --git a/src/irclib.py b/src/irclib.py
index 4f7fc7951..164f23050 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -777,6 +777,7 @@ class Irc(IrcCommandDispatcher):
         """Called by the IrcDriver; feeds a message received."""
         msg.tag('receivedBy', self)
         msg.tag('receivedOn', self.network)
+        msg.tag('receivedAt', time.time())
         if msg.args and self.isChannel(msg.args[0]):
             channel = msg.args[0]
         else: