diff -U4 -r irssi-0.8.12-rc1/src/fe-common/irc/fe-irc-queries.c irssi-0.8.12-rc1+byte/src/fe-common/irc/fe-irc-queries.c
--- irssi-0.8.12-rc1/src/fe-common/irc/fe-irc-queries.c	2007-08-26 21:04:29.000000000 +0100
+++ irssi-0.8.12-rc1+byte/src/fe-common/irc/fe-irc-queries.c	2007-09-05 17:39:34.000000000 +0100
@@ -67,9 +67,11 @@
 	    !settings_get_bool("query_track_nick_changes"))
                 return;
 
 	query = query_find(server, nick);
 	if (query == NULL) {
+		if (masks_match(server, settings_get_str("query_reconnect_ignore"), nick, address))
+			return;
 		/* check if there's query with another nick from the same
 		   address. it was probably a nick change or reconnect to
 		   server, so rename the query. */
 		query = query_find_address(server, address);
@@ -83,9 +86,9 @@
 
 void fe_irc_queries_init(void)
 {
         settings_add_bool("lookandfeel", "query_track_nick_changes", TRUE);
-
+	settings_add_str("lookandfeel", "query_reconnect_ignore", "");
 	signal_add_first("event privmsg", (SIGNAL_FUNC) event_privmsg);
 }
 
 void fe_irc_queries_deinit(void)