diff --git a/IrcTokens/Line.cs b/IrcTokens/Line.cs
index 79d8b2d..36899bf 100644
--- a/IrcTokens/Line.cs
+++ b/IrcTokens/Line.cs
@@ -43,9 +43,9 @@ namespace IrcTokens
             {
                 Tags = new Dictionary<string, string>();
 
-                split = line.Split(" ");
+                split = line.Split(" ", 2);
                 var messageTags = split[0];
-                line = string.Join(" ", split.Skip(1));
+                line = split[1];
 
                 foreach (var part in messageTags.Substring(1).Split(';'))
                     if (part.Contains('=', StringComparison.Ordinal))