diff --git a/config/upgrade1.sql b/config/upgrade1.sql
index 0245737..19533c8 100644
--- a/config/upgrade1.sql
+++ b/config/upgrade1.sql
@@ -6,4 +6,5 @@ UPDATE irclog SET opcode='join', nick=left(line, instr(line, ' ')) WHERE nick IS
 UPDATE irclog SET opcode='leave', nick=left(line, instr(line, ' ')) WHERE nick IS NULL AND opcode IS NULL AND line LIKE '% has left #%';
 UPDATE irclog SET opcode='kick', nick=left(line, instr(line, ' ')) WHERE nick IS NULL AND opcode IS NULL AND line LIKE '% was kicked from #%';
 UPDATE irclog SET opcode='nick', nick=left(line, instr(line, ' ')) WHERE nick IS NULL AND opcode IS NULL AND line LIKE '% is now known as %';
-UPDATE irclog SET opcode='quit', nick=left(line, instr(line, ' ')) WHERE nick IS NULL AND opcode IS NULL AND line LIKE '% has quit%';
\ No newline at end of file
+UPDATE irclog SET opcode='quit', nick=left(line, instr(line, ' ')) WHERE nick IS NULL AND opcode IS NULL AND line LIKE '% has quit%';
+UPDATE irclog SET nick=TRIM(nick) WHERE nick IS NOT NULL;
\ No newline at end of file
diff --git a/lib/irclogger/message.rb b/lib/irclogger/message.rb
index 10b523b..69fb7d1 100644
--- a/lib/irclogger/message.rb
+++ b/lib/irclogger/message.rb
@@ -28,7 +28,8 @@ def info?
   end
 
   def self.nicks(messages)
-    messages.filter('nick is not null').
+    messages.
+        filter('nick is not null').
         select(:nick).distinct(:nick).
         map(&:nick).to_set
   end