diff --git a/src/fe-common/core/windows.h b/src/fe-common/core/windows.h
index a74f575d..f96f5723 100644
--- a/src/fe-common/core/windows.h
+++ b/src/fe-common/core/windows.h
@@ -10,7 +10,10 @@ enum {
 
 /* All window items *MUST* have these variables in same order
    at the start of the structure - the server's type can of course be
-   replaced with the preferred record type. */
+   replaced with the preferred record type.
+
+   !!!! So IF YOU CHANGE THIS: REMEMBER TO UPDATE WI_IRC_REC, CHANNEL_REC
+   and QUERY_REC !!!! (I already forgot this once :) */
 typedef struct {
 	int type;
         GHashTable *module_data;
diff --git a/src/irc/core/channels.h b/src/irc/core/channels.h
index 03ae1a6e..3dc497c6 100644
--- a/src/irc/core/channels.h
+++ b/src/irc/core/channels.h
@@ -11,6 +11,7 @@ typedef struct {
 	char *name;
 
 	int new_data;
+	int last_color;
 
 	time_t createtime;
 
diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h
index 29560e28..5c549157 100644
--- a/src/irc/core/irc.h
+++ b/src/irc/core/irc.h
@@ -31,6 +31,7 @@ typedef struct {
 	char *name;
 
 	int new_data;
+	int last_color;
 } WI_IRC_REC;
 
 /* return TRUE if `item' is an IRC type. */
diff --git a/src/irc/core/query.h b/src/irc/core/query.h
index bac2ccc5..20ce79cc 100644
--- a/src/irc/core/query.h
+++ b/src/irc/core/query.h
@@ -11,6 +11,7 @@ typedef struct {
 	char *nick;
 
 	int new_data;
+	int last_color;
 
 	char *address;
 	char *server_tag;