diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index 27940e1a..d5af0d51 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -1,4 +1,4 @@
-/*
+i/*
  fe-queries.c : irssi
 
     Copyright (C) 1999-2000 Timo Sirainen
@@ -64,7 +64,7 @@ static void signal_query_created(QUERY_REC *query, gpointer automatic)
 	}
 
 	printformat(query->server, query->name, MSGLEVEL_CLIENTNOTICE,
-		    TXT_QUERY_START, query->name);
+		    TXT_QUERY_START, query->name, query->server->tag);
 }
 
 static void signal_query_created_curwin(QUERY_REC *query)
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index dbb8bb3e..6018d2cb 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -133,7 +133,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	/* ---- */
 	{ NULL, "Queries", 0 },
 
-	{ "query_start", "Starting query with {nick $0}", 1, { 0 } },
+	{ "query_start", "Starting query in {server $1} with {nick $0}", 2, { 0, 0 } },
 	{ "query_stop", "Closing query with {nick $0}", 1, { 0 } },
 	{ "no_query", "No query with {nick $0}", 1, { 0 } },
 	{ "query_server_changed", "Query with {nick $0} changed to server {server $1}", 2, { 0, 0 } },