diff --git a/TODO.mkdn b/TODO.mkdn
index 79d8d73..47edaa7 100644
--- a/TODO.mkdn
+++ b/TODO.mkdn
@@ -19,8 +19,7 @@ Bugs
 * Windows XP SP2: sometimes mouse clicks dont register? must be some kinda crash
 * When using mood sort, scroll position jumps to last selected chum
 * When switching chumhandles, OP doesn't appear to retain OP status (though they do)
-* Animations slow down pesterchum on not small conversations
-* Long line splitter will split in the middle of color tags
+* When left for a really long time, animations slow down pesterchum
 
 Mac Bugs
 --------
diff --git a/irc.py b/irc.py
index 8569e76..2b63a13 100644
--- a/irc.py
+++ b/irc.py
@@ -94,9 +94,11 @@ class PesterIRC(QtCore.QThread):
         textl = [unicode(text)]
         def splittext(l):
             if len(l[0]) > 450:
-                space = l[0].rfind(" ", 0,450)
+                space = l[0].rfind(" ", 0,430)
                 if space == -1:
                     space = 450
+                elif l[0][space+1:space+5] == "</c>":
+                    space = space+4
                 a = l[0][0:space+1]
                 b = l[0][space+1:]
                 if len(b) > 0: