--- a/mcabber/TODO	Mon Jan 09 19:40:29 2006 +0100
+++ b/mcabber/TODO	Mon Jan 09 21:56:03 2006 +0100
@@ -10,7 +10,6 @@
 
 * UTF-8 support (Can somebody help me?)
 * Implement automatic reconnection after network failure
-  Note: "New message" flags are currently lost on connection failure
 * Presence notification is always accepted.  We should ask...
 * Display status / chat mode (a status line would be great)
 * Pending message flag is not displayed when buddy is outside Contact window,
@@ -25,7 +24,9 @@
 * Persistent room in the roster (join every connect)
 * MUC: advanced settings for room creation
 * MUC: join password-protected room
-* JEP-0022: Message events (composing, etc.)
+* MUC: display roles of room members
+* JEP-0022/0085: Message events / chat states (composing, etc.)
+* Add a way to lock the buffer scrolling
 
 * File transfer? :)