diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index 1924464a..4adf4945 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -103,6 +103,9 @@ static void signal_query_nick_changed(QUERY_REC *query, const char *oldnick)
 {
 	g_return_if_fail(query != NULL);
 
+	printformat(query->server, query->name, MSGLEVEL_NICKS,
+		    TXT_NICK_CHANGED, oldnick, query->name, query->name);
+
 	signal_emit("window item changed", 2,
 		    window_item_window((WI_ITEM_REC *) query), query);
 }
diff --git a/src/fe-common/irc/fe-irc-queries.c b/src/fe-common/irc/fe-irc-queries.c
index 2cc81ecf..58cc9a48 100644
--- a/src/fe-common/irc/fe-irc-queries.c
+++ b/src/fe-common/irc/fe-irc-queries.c
@@ -22,6 +22,7 @@
 #include "signals.h"
 #include "servers.h"
 #include "queries.h"
+#include "nicklist.h"
 
 #include "irc.h"
 
@@ -58,11 +59,8 @@ static void event_privmsg(SERVER_REC *server, const char *data,
 		   address. it was probably a nick change or reconnect to
 		   server, so rename the query. */
 		query = query_find_address(server, address);
-		if (query != NULL) {
-			signal_emit("message nick", 4, query->server,
-				    nick, query->name, query->address);
+		if (query != NULL)
 			query_change_nick(query, nick);
-		}
 	}
 }