diff --git a/docs/signals.txt b/docs/signals.txt
index 897ee5ab..94fbbbe7 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -305,6 +305,9 @@ fe-irc-messages.c:
  "message irc own_ctcp", SERVER_REC, char *cmd, char *data, char *target
  "message irc ctcp", SERVER_REC, char *cmd, char *data, char *nick, char *address, char *target
 
+fe-modes.c:
+ "message irc mode", SERVER_REC, char *channel, char *nick, char *addr, char *mode
+
 dcc/fe-dcc-chat-messages.c:
  "message dcc own", DCC_REC *dcc, char *msg
  "message dcc own_action", DCC_REC *dcc, char *msg
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index e8a9bbef..88839238 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -205,7 +205,7 @@ static void event_mode(IRC_SERVER_REC *server, const char *data,
 	params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
 				  &channel, &mode);
 
-	signal_emit("message mode", 5, server, channel, nick, addr,
+	signal_emit("message irc mode", 5, server, channel, nick, addr,
 		    g_strchomp(mode));
 	g_free(params);
 }
diff --git a/src/fe-common/irc/fe-modes.c b/src/fe-common/irc/fe-modes.c
index 753b8ac1..8b436107 100644
--- a/src/fe-common/irc/fe-modes.c
+++ b/src/fe-common/irc/fe-modes.c
@@ -157,7 +157,7 @@ static void msg_multi_mode(IRC_CHANNEL_REC *channel, const char *sender,
 	signal_stop();
 }
 
-/* FIXME: should be moved to fe-common/core/fe-messages.c.. */
+/* FIXME: should be moved to fe-irc-messages.c.. */
 static void sig_message_mode(IRC_SERVER_REC *server, const char *channel,
 			     const char *nick, const char *addr,
 			     const char *mode)
@@ -215,7 +215,7 @@ void fe_modes_init(void)
         mode_tag = -1;
 
 	read_settings();
-	signal_add("message mode", (SIGNAL_FUNC) sig_message_mode);
+	signal_add("message irc mode", (SIGNAL_FUNC) sig_message_mode);
 	signal_add("setup changed", (SIGNAL_FUNC) read_settings);
 }
 
@@ -224,7 +224,7 @@ void fe_modes_deinit(void)
 	if (mode_tag != -1)
 		g_source_remove(mode_tag);
 
-	signal_remove("message mode", (SIGNAL_FUNC) sig_message_mode);
+	signal_remove("message irc mode", (SIGNAL_FUNC) sig_message_mode);
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
 
 	signal_remove("print starting", (SIGNAL_FUNC) sig_print_starting);
diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 400b198c..90cf76b7 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -399,11 +399,11 @@ static void read_settings(void)
 	if (old_hide && !hide_netsplit_quits) {
 		signal_remove("message quit", (SIGNAL_FUNC) msg_quit);
 		signal_remove("message join", (SIGNAL_FUNC) msg_join);
-		signal_remove("message mode", (SIGNAL_FUNC) msg_mode);
+		signal_remove("message irc mode", (SIGNAL_FUNC) msg_mode);
 	} else if (!old_hide && hide_netsplit_quits) {
 		signal_add("message quit", (SIGNAL_FUNC) msg_quit);
 		signal_add("message join", (SIGNAL_FUNC) msg_join);
-		signal_add("message mode", (SIGNAL_FUNC) msg_mode);
+		signal_add("message irc mode", (SIGNAL_FUNC) msg_mode);
 	}
 }
 
@@ -432,5 +432,5 @@ void fe_netjoin_deinit(void)
 
 	signal_remove("message quit", (SIGNAL_FUNC) msg_quit);
 	signal_remove("message join", (SIGNAL_FUNC) msg_join);
-	signal_remove("message mode", (SIGNAL_FUNC) msg_mode);
+	signal_remove("message irc mode", (SIGNAL_FUNC) msg_mode);
 }