diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index b13ae437..43a4f1e0 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -26,9 +26,9 @@
 #include "levels.h"
 #include "netsplit.h"
 
-static void sig_netsplit_servers(NETSPLIT_SERVER_REC *rec)
+static void sig_netsplit_servers(IRC_SERVER_REC *server, NETSPLIT_SERVER_REC *rec)
 {
-        printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETSPLIT, rec->server, rec->destserver);
+    printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETSPLIT, rec->server, rec->destserver, server->tag);
 }
 
 static void split_print(const char *nick, NETSPLIT_REC *rec)
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index b1040d40..0319bc34 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -42,7 +42,7 @@ FORMAT_REC fecommon_irc_formats[] =
     { "setupserver_header", "Server               Port  IRC Net    Settings", 0 },
     { "setupserver_line", "%|$[!20]0 $[5]1 $[10]2 $3", 4, { 0, 1, 0, 0 } },
     { "setupserver_footer", "", 0 },
-    { "netsplit", "%RNetsplit%n detected between servers %_$0%_ and %_$1%_%:Use /NETSPLIT to see who left", 2, { 0, 0 } },
+    { "netsplit", "[%_$2%_] %RNetsplit%n detected between servers %_$0%_ and %_$1%_%:Use /NETSPLIT to see who left", 3, { 0, 0, 0 } },
     { "no_netsplits", "There are no net splits", 0 },
     { "netsplits_header", "Nick      Channel    Server               Splitted server", 0 },
     { "netsplits_line", "$[9]0 $[10]1 $[20]2 $3", 4, { 0, 0, 0, 0 } },
diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index c5a4ff49..e6bb199c 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -56,7 +56,7 @@ static NETSPLIT_SERVER_REC *netsplit_server_create(IRC_SERVER_REC *server, const
 	rec->destserver = g_strdup(destserver);
 
 	server->split_servers = g_slist_append(server->split_servers, rec);
-	signal_emit("netsplit new server", 1, rec);
+	signal_emit("netsplit new server", 2, server, rec);
 	return rec;
 }
 
@@ -185,8 +185,6 @@ int quitmsg_is_split(const char *msg)
 
 	g_return_val_if_fail(msg != NULL, FALSE);
 
-	if (msg[strlen(msg)-1] == ' ') msg[strlen(msg)-1] = '\0'; /*FIXME: remove - for debugging!*/
-
 	/* must have only two words */
 	p = strchr(msg, ' ');
 	if (p == NULL || strchr(p+1, ' ') != NULL) return FALSE;