diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 2b5f10786..2a9f43f74 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -61,6 +61,7 @@ New features::
   * irc: add option `buffer` in command `/autojoin sort` (issue #1876)
   * irc: add `${username}` in server options "nicks" and "username", change their default values to use it
   * irc: add infos "irc_server_cap" and "irc_server_cap_value"
+  * irc: add option irc.look.display_host_notice
   * logger: add option logger.file.log_conditions (issue #1942)
   * logger: add info "logger_log_file"
   * relay: rename "ssl" options and protocol to "tls"
diff --git a/po/cs.po b/po/cs.po
index 41349ed6a..0d6dc2648 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-01 20:23+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8998,6 +8998,11 @@ msgstr "zobrazovat hosta ve zprávách o připojení"
 msgid "display host in join messages from local client"
 msgstr "zobrazovat hosta ve zprávách o připojení z lokálního klienta"
 
+#, fuzzy
+#| msgid "display host in join messages"
+msgid "display host in notice messages"
+msgstr "zobrazovat hosta ve zprávách o připojení"
+
 msgid "display host in part/quit messages"
 msgstr "zobrazovat hosta ve zprávách o odchodu/ukončení"
 
diff --git a/po/de.po b/po/de.po
index 7d2a7a5b5..44fab1f91 100644
--- a/po/de.po
+++ b/po/de.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-06-03 19:35+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -11171,6 +11171,11 @@ msgstr "zeigt den Host innerhalb einer join Nachricht an"
 msgid "display host in join messages from local client"
 msgstr "zeigt den Host innerhalb einer join Nachrichten des lokalen Client an"
 
+#, fuzzy
+#| msgid "display host in join messages"
+msgid "display host in notice messages"
+msgstr "zeigt den Host innerhalb einer join Nachricht an"
+
 msgid "display host in part/quit messages"
 msgstr "zeigt den Host innerhalb einer part/quit Nachricht an"
 
@@ -11889,14 +11894,12 @@ msgstr ""
 "Wert der Funktion, sofern es vom Server unterstützt wird (durch IRC Message "
 "005)"
 
-#| msgid "%s%s: client capability, enabled: %s"
 msgid "1 if capability is enabled in server"
 msgstr "1, falls Fähigkeit auf Server aktiviert ist"
 
 msgid "server,capability"
 msgstr "Server, Fähigkeit"
 
-#| msgid "%s%s: client capability, enabled: %s"
 msgid "value of capability, if enabled in server"
 msgstr "Wert der Fähigkeit, falls auf dem Server aktiviert"
 
@@ -16009,8 +16012,7 @@ msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat"
 
 msgid ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
-"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<"
-"return_code>\" [\"<post_action>\"]]]]]] "
+"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
 "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
 "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
 "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "
@@ -16018,8 +16020,7 @@ msgid ""
 "monitor [<filter>]"
 msgstr ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
-"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<"
-"return_code>\" [\"<post_action>\"]]]]]] "
+"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
 "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
 "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
 "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "
diff --git a/po/es.po b/po/es.po
index a804d1d06..0fcf0e9c6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-01 20:23+0200\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9674,6 +9674,11 @@ msgstr "muestra el host en mensajes de unión"
 msgid "display host in join messages from local client"
 msgstr "muestra el host en mensajes de unión desde el cliente local"
 
+#, fuzzy
+#| msgid "display host in join messages"
+msgid "display host in notice messages"
+msgstr "muestra el host en mensajes de unión"
+
 msgid "display host in part/quit messages"
 msgstr "muestra el host en mensajes de salida/abandono"
 
diff --git a/po/fr.po b/po/fr.po
index a09d81344..57a35b972 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
-"PO-Revision-Date: 2023-06-03 09:52+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
+"PO-Revision-Date: 2023-06-03 21:09+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -10961,6 +10961,9 @@ msgstr "afficher le nom d'hôte dans les messages join"
 msgid "display host in join messages from local client"
 msgstr "afficher le nom d'hôte dans les messages join du client local"
 
+msgid "display host in notice messages"
+msgstr "afficher le nom d'hôte dans les messages notice"
+
 msgid "display host in part/quit messages"
 msgstr "afficher le nom d'hôte dans les messages part/quit"
 
diff --git a/po/hu.po b/po/hu.po
index f6f028105..49f37d13a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-01 20:23+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8486,6 +8486,10 @@ msgstr "új üzenetet tartalmazó ablak színe"
 msgid "display host in join messages from local client"
 msgstr "új üzenetet tartalmazó ablak színe"
 
+#, fuzzy
+msgid "display host in notice messages"
+msgstr "új üzenetet tartalmazó ablak színe"
+
 #, fuzzy
 msgid "display host in part/quit messages"
 msgstr "alapértelmezett kilépő üzenet"
diff --git a/po/it.po b/po/it.po
index df79561a1..566e25457 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-01 20:23+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9385,6 +9385,11 @@ msgstr "visualizza l'host nei messaggi di entrata"
 msgid "display host in join messages from local client"
 msgstr "visualizza l'host nei messaggi di entrata dal client locale"
 
+#, fuzzy
+#| msgid "display host in join messages"
+msgid "display host in notice messages"
+msgstr "visualizza l'host nei messaggi di entrata"
+
 msgid "display host in part/quit messages"
 msgstr "visualizza host nei messaggi di uscita/abbandono"
 
diff --git a/po/ja.po b/po/ja.po
index 95101a0bf..e2dde9298 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-01 20:23+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -10560,6 +10560,11 @@ msgstr "参加メッセージにホスト名を表示"
 msgid "display host in join messages from local client"
 msgstr "ローカルクライアントからの参加メッセージにホスト名を表示"
 
+#, fuzzy
+#| msgid "display host in join messages"
+msgid "display host in notice messages"
+msgstr "参加メッセージにホスト名を表示"
+
 msgid "display host in part/quit messages"
 msgstr "退出/終了 メッセージにホスト名を表示"
 
diff --git a/po/pl.po b/po/pl.po
index 220956e66..6311f5fea 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-01 20:23+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -11555,6 +11555,11 @@ msgstr "wyświetlaj host w wiadomościach o wejściu na kanał"
 msgid "display host in join messages from local client"
 msgstr "wyświetlaj host podczas wchodzenia na kanał"
 
+#, fuzzy
+#| msgid "display host in join messages"
+msgid "display host in notice messages"
+msgstr "wyświetlaj host w wiadomościach o wejściu na kanał"
+
 msgid "display host in part/quit messages"
 msgstr "pokazuj host w wiadomościach o opuszczeniu kanału/wyjściu z IRC"
 
diff --git a/po/pt.po b/po/pt.po
index 1d894e0bf..7dbc39514 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-01 20:23+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -10320,6 +10320,11 @@ msgstr "mostrar host nas mensagens de join"
 msgid "display host in join messages from local client"
 msgstr "mostrar host nas mensagens de join do cliente local"
 
+#, fuzzy
+#| msgid "display host in join messages"
+msgid "display host in notice messages"
+msgstr "mostrar host nas mensagens de join"
+
 msgid "display host in part/quit messages"
 msgstr "mostrar host nas mensagens de part/quit"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 91c8f7418..1ff1a8a17 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-01 20:23+0200\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9024,6 +9024,11 @@ msgstr "exibir host em mensagens de entrada no canal"
 msgid "display host in join messages from local client"
 msgstr ""
 
+#, fuzzy
+#| msgid "display host in join messages"
+msgid "display host in notice messages"
+msgstr "exibir host em mensagens de entrada no canal"
+
 msgid "display host in part/quit messages"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 37f68345b..359a33e37 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-01 20:23+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8518,6 +8518,10 @@ msgstr "цвет  текущего окна с сообщениями"
 msgid "display host in join messages from local client"
 msgstr "цвет  текущего окна с сообщениями"
 
+#, fuzzy
+msgid "display host in notice messages"
+msgstr "цвет  текущего окна с сообщениями"
+
 #, fuzzy
 msgid "display host in part/quit messages"
 msgstr "сообщение о выходе по-умолчанию"
diff --git a/po/sr.po b/po/sr.po
index ddcb4a13c..cb9eadcba 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-14 15:29+0200\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10692,6 +10692,11 @@ msgstr "приказ хоста у порукама приступа"
 msgid "display host in join messages from local client"
 msgstr "приказ хоста у порукама приступа из локалног клијента"
 
+#, fuzzy
+#| msgid "display host in join messages"
+msgid "display host in notice messages"
+msgstr "приказ хоста у порукама приступа"
+
 msgid "display host in part/quit messages"
 msgstr "приказ хоста у порукама напуштања/изласка"
 
diff --git a/po/tr.po b/po/tr.po
index d4bed8001..992b8655f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2023-05-01 20:23+0200\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -11126,6 +11126,11 @@ msgstr "katılma iletilerinde makineyi görüntüle"
 msgid "display host in join messages from local client"
 msgstr "katılma iletilerinde yerel istemcideki makineyi görüntüle"
 
+#, fuzzy
+#| msgid "display host in join messages"
+msgid "display host in notice messages"
+msgstr "katılma iletilerinde makineyi görüntüle"
+
 msgid "display host in part/quit messages"
 msgstr "ayrılma/çıkma iletilerinde makineyi görüntüle"
 
diff --git a/po/weechat.pot b/po/weechat.pot
index 343b5e16d..313b1bf83 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-03 09:51+0200\n"
+"POT-Creation-Date: 2023-06-03 21:06+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7605,6 +7605,9 @@ msgstr ""
 msgid "display host in join messages from local client"
 msgstr ""
 
+msgid "display host in notice messages"
+msgstr ""
+
 msgid "display host in part/quit messages"
 msgstr ""
 
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index a0bef9006..0c40f86c7 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -74,6 +74,7 @@ struct t_config_option *irc_config_look_display_ctcp_unknown = NULL;
 struct t_config_option *irc_config_look_display_extended_join = NULL;
 struct t_config_option *irc_config_look_display_host_join = NULL;
 struct t_config_option *irc_config_look_display_host_join_local = NULL;
+struct t_config_option *irc_config_look_display_host_notice = NULL;
 struct t_config_option *irc_config_look_display_host_quit = NULL;
 struct t_config_option *irc_config_look_display_join_message = NULL;
 struct t_config_option *irc_config_look_display_old_topic = NULL;
@@ -3012,6 +3013,12 @@ irc_config_init ()
             N_("display host in join messages from local client"),
             NULL, 0, 0, "on", NULL, 0,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+        irc_config_look_display_host_notice = weechat_config_new_option (
+            irc_config_file, irc_config_section_look,
+            "display_host_notice", "boolean",
+            N_("display host in notice messages"),
+            NULL, 0, 0, "on", NULL, 0,
+            NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
         irc_config_look_display_host_quit = weechat_config_new_option (
             irc_config_file, irc_config_section_look,
             "display_host_quit", "boolean",
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index 8e25cf71c..51f845f19 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -110,6 +110,7 @@ extern struct t_config_option *irc_config_look_display_ctcp_unknown;
 extern struct t_config_option *irc_config_look_display_extended_join;
 extern struct t_config_option *irc_config_look_display_host_join;
 extern struct t_config_option *irc_config_look_display_host_join_local;
+extern struct t_config_option *irc_config_look_display_host_notice;
 extern struct t_config_option *irc_config_look_display_host_quit;
 extern struct t_config_option *irc_config_look_display_join_message;
 extern struct t_config_option *irc_config_look_display_old_topic;
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index b818f176a..ac8487bd1 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -2451,7 +2451,7 @@ IRC_PROTOCOL_CALLBACK(notice)
     const char *pos_target, *pos_args, *nick_address;
     struct t_irc_channel *ptr_channel;
     struct t_irc_nick *ptr_nick;
-    int notify_private, is_channel, is_channel_orig, nick_is_me;
+    int notify_private, is_channel, is_channel_orig, nick_is_me, display_host;
     struct t_gui_buffer *ptr_buffer;
 
     IRC_PROTOCOL_MIN_PARAMS(2);
@@ -2686,8 +2686,14 @@ IRC_PROTOCOL_CALLBACK(notice)
                 }
                 else
                 {
-                    nick_address = irc_protocol_nick_address (server, 0, NULL,
-                                                              nick, address);
+                    display_host = weechat_config_boolean (
+                        irc_config_look_display_host_notice);
+                    nick_address = irc_protocol_nick_address (
+                        server,
+                        0,
+                        NULL,
+                        nick,
+                        (display_host) ? address : NULL);
                     weechat_printf_date_tags (
                         ptr_buffer,
                         date,