diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index bdaa1376..4e57aa45 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -215,7 +215,7 @@ static void cmd_msg(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
     {
         /* private message */
 	printformat(server, target, MSGLEVEL_MSGS | MSGLEVEL_NOHILIGHT,
-		    channel == NULL ? IRCTXT_OWN_MSG_PRIVATE : IRCTXT_OWN_MSG_PRIVATE_QUERY, target, msg, server->nick);
+		    query_find(server, target) == NULL ? IRCTXT_OWN_MSG_PRIVATE : IRCTXT_OWN_MSG_PRIVATE_QUERY, target, msg, server->nick);
     }
     g_free_not_null(freestr);
 
diff --git a/src/fe-text/gui-statusbar-items.c b/src/fe-text/gui-statusbar-items.c
index 1bb1c6f0..1cb3740e 100644
--- a/src/fe-text/gui-statusbar-items.c
+++ b/src/fe-text/gui-statusbar-items.c
@@ -579,12 +579,14 @@ static void read_settings(void)
 		signal_add("window changed", (SIGNAL_FUNC) sig_statusbar_topic_redraw);
 		signal_add("window item changed", (SIGNAL_FUNC) sig_statusbar_topic_redraw);
 		signal_add("channel topic changed", (SIGNAL_FUNC) sig_statusbar_topic_redraw);
+		signal_add("query address changed", (SIGNAL_FUNC) sig_statusbar_topic_redraw);
 	} else if (topic_tag != -1 && !settings_get_bool("toggle_show_topicbar")) {
 		gui_statusbar_delete(TRUE, 0);
 		topic_tag = -1;
 		signal_remove("window changed", (SIGNAL_FUNC) sig_statusbar_topic_redraw);
 		signal_remove("window item changed", (SIGNAL_FUNC) sig_statusbar_topic_redraw);
 		signal_remove("channel topic changed", (SIGNAL_FUNC) sig_statusbar_topic_redraw);
+		signal_remove("query address changed", (SIGNAL_FUNC) sig_statusbar_topic_redraw);
 	}
 
 	lag_min_show = settings_get_int("lag_min_show")*10;