diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index b2676ac7c..3153459cb 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -59,7 +59,7 @@ Bug fixes::
   * fset: remove extra spaces between min and max values when second format is used
   * fset: fix mouse actions when second format is used
   * fset: apply option fset.color.help_description (issue #1988)
-  * irc: don't open a new private buffer on `/msg` command when capability echo-message is enabled (issue #2016)
+  * irc: add option irc.look.open_pv_buffer_echo_msg to open private buffer on self message when capability echo-message is enabled (issue #2016)
   * irc: fix title of private buffers wrongly set to own address when capability echo-message is enabled (issue #2016)
   * irc: fix unexpected message sent to server when part of the second line of an IRC command (issue #1992)
   * irc: fix autojoin of channels when private buffers are opened (issue #2012)
diff --git a/po/cs.po b/po/cs.po
index 4cfe2af5c..2ce1fbf79 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9589,6 +9589,10 @@ msgstr ""
 "když se změní status nepřítomnosti přezdívky (výsledek příkazu whois), "
 "například: \"notify_highlight\", \"notify_message\" or \"notify_private\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "zavřít buffer, když je na kanálu spuštěn /part"
 
diff --git a/po/de.po b/po/de.po
index 04a9ec77a..18a0ed0bc 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-14 08:44+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -877,21 +877,18 @@ msgid ""
 "%sFailed to decrypt data: hash algorithm \"%s\" is not available (ligbcrypt "
 "version is too old?)"
 msgstr ""
-"%sFehler beim Entschlüsseln der Daten: Hash-Algorithmus „%s“ ist nicht"
-" verfügbar (ligbcrypt"
-"Version ist zu alt?)"
+"%sFehler beim Entschlüsseln der Daten: Hash-Algorithmus „%s“ ist nicht "
+"verfügbar (ligbcryptVersion ist zu alt?)"
 
 #, c-format
 msgid ""
 "%sFailed to decrypt data: cipher \"%s\" is not available (ligbcrypt version "
 "is too old?)"
 msgstr ""
-"%sDaten konnten nicht entschlüsselt werden: Cipher „%s“ ist nicht verfügbar"
-" (ligbcrypt-Version"
-"ist zu alt?)"
+"%sDaten konnten nicht entschlüsselt werden: Cipher „%s“ ist nicht verfügbar "
+"(ligbcrypt-Versionist zu alt?)"
 
 #, c-format
-#| msgid "%sFailed to decrypt data (wrong passphrase?)"
 msgid "%sFailed to decrypt data: wrong passphrase?"
 msgstr "%sFehler beim Entschlüsseln der Daten: falsche Passphrase?"
 
@@ -6078,7 +6075,6 @@ msgstr ""
 "umschalten"
 
 #. TRANSLATORS: "hash algorithm not supported"
-#| msgid "log not started"
 msgid "not supported"
 msgstr "nicht unterstützt"
 
@@ -6135,8 +6131,8 @@ msgstr ""
 msgid ""
 "%sOption %s.%s.%s can not be changed because there are still encrypted data"
 msgstr ""
-"%sOption %s.%s.%s kann nicht geändert werden, da noch verschlüsselte Daten"
-" vorhanden sind"
+"%sOption %s.%s.%s kann nicht geändert werden, da noch verschlüsselte Daten "
+"vorhanden sind"
 
 #, c-format
 msgid "%sPassphrase is not set, unable to decrypt data \"%s\""
@@ -6149,18 +6145,16 @@ msgid ""
 "%sFailed to decrypt data \"%s\": hash algorithm \"%s\" is not available "
 "(ligbcrypt version is too old?)"
 msgstr ""
-"%sFehler beim Entschlüsseln der Daten „%s“: Hash-Algorithmus „%s“ ist nicht"
-" verfügbar"
-"(ligbcrypt-Version ist zu alt?)"
+"%sFehler beim Entschlüsseln der Daten „%s“: Hash-Algorithmus „%s“ ist nicht "
+"verfügbar(ligbcrypt-Version ist zu alt?)"
 
 #, c-format
 msgid ""
 "%sFailed to decrypt data \"%s\": cipher \"%s\" is not available (ligbcrypt "
 "version is too old?)"
 msgstr ""
-"%sFehler beim Entschlüsseln der Daten „%s“: Cipher „%s“ ist nicht verfügbar"
-" (ligbcrypt"
-"Version ist zu alt?)"
+"%sFehler beim Entschlüsseln der Daten „%s“: Cipher „%s“ ist nicht verfügbar "
+"(ligbcryptVersion ist zu alt?)"
 
 #, c-format
 msgid "%sWrong passphrase, unable to decrypt data \"%s\""
@@ -6176,20 +6170,18 @@ msgid ""
 "%sFailed to encrypt data \"%s\": hash algorithm \"%s\" is not available "
 "(ligbcrypt version is too old?)"
 msgstr ""
-"%sFehler beim Verschlüsseln der Daten „%s“: Hash-Algorithmus „%s“ ist nicht"
-" verfügbar"
-"(ligbcrypt-Version ist zu alt?)"
+"%sFehler beim Verschlüsseln der Daten „%s“: Hash-Algorithmus „%s“ ist nicht "
+"verfügbar(ligbcrypt-Version ist zu alt?)"
 
 #, c-format
 msgid ""
 "%sFailed to encrypt data \"%s\": cipher \"%s\" is not available (ligbcrypt "
 "version is too old?)"
 msgstr ""
-"%sFehler beim Verschlüsseln der Daten „%s“: Cipher „%s“ ist nicht verfügbar"
-" (ligbcrypt-Version ist zu alt?)"
+"%sFehler beim Verschlüsseln der Daten „%s“: Cipher „%s“ ist nicht verfügbar "
+"(ligbcrypt-Version ist zu alt?)"
 
 #, c-format
-#| msgid "%sError encrypting data \"%s\" (%d)"
 msgid "%sFailed to encrypt data \"%s\" (%d)"
 msgstr "%sFehler beim Verschlüsseln der Daten „%s“ (%d)"
 
@@ -6205,10 +6197,9 @@ msgid ""
 "specific libgcrypt version: sha3-*: libgcrypt >= 1.7.0, blake2*: libgcrypt "
 ">= 1.8.0, sha512-*: libgcrypt >= 1.9.4"
 msgstr ""
-"Hash-Algorithmus zur Überprüfung der entschlüsselten Daten; einige von ihnen"
-" erfordern eine bestimmte libgcrypt-Version: sha3-*: libgcrypt >= 1.7.0,"
-" blake2*: libgcrypt "
-">= 1.8.0, sha512-*: libgcrypt >= 1.9.4"
+"Hash-Algorithmus zur Überprüfung der entschlüsselten Daten; einige von ihnen "
+"erfordern eine bestimmte libgcrypt-Version: sha3-*: libgcrypt >= 1.7.0, "
+"blake2*: libgcrypt >= 1.8.0, sha512-*: libgcrypt >= 1.9.4"
 
 msgid ""
 "read the passphrase from the output of this system command (only the first "
@@ -11950,6 +11941,10 @@ msgstr ""
 "(Rückgabe durch Befehl whois), zum Beispiel: \"notify_message\", "
 "\"notify_private\" oder \"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "schließt den Buffer wenn \"/part\" im Kanal ausgeführt wird"
 
@@ -16625,8 +16620,7 @@ msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat"
 msgid ""
 "list [-o|-ol|-i|-il] || 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 "
@@ -16635,8 +16629,7 @@ msgid ""
 msgstr ""
 "list [-o|-ol|-i|-il] || 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 5085fd2c9..cc1115cfb 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10296,6 +10296,10 @@ msgstr ""
 "cuando un apodo cambia su estado de ausencia (resultado del comando whois), "
 "por ejemplo: \"notify_highlight\", \"notify_message\" o \"notify_private\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "cerrar el buffer cuando /part es usado en un canal"
 
diff --git a/po/fr.po b/po/fr.po
index dd1e9b74b..aa9df68e3 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-09-13 15:07+0200\n"
-"PO-Revision-Date: 2023-09-13 15:07+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
+"PO-Revision-Date: 2023-09-14 20:10+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -11736,6 +11736,12 @@ msgstr ""
 "de la commande whois), par exemple : \"notify_message\", \"notify_private\" "
 "ou \"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+"ouvrir un tampon privé sur son propre message quand la capacité echo-message "
+"est activée"
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "fermer le tampon lorsque /part est exécuté sur un canal"
 
diff --git a/po/hu.po b/po/hu.po
index 0bacc5bb0..fb2541651 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9026,6 +9026,10 @@ msgid ""
 "\"notify_message\", \"notify_private\" or \"notify_highlight\""
 msgstr ""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index f920c4404..ed0bfa09c 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10019,6 +10019,10 @@ msgstr ""
 "whois), ad esempio: \"notify_message\", \"notify_private\" o "
 "\"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "chiude buffer quando viene digitato /part nel canale"
 
diff --git a/po/ja.po b/po/ja.po
index c3a2ad0e4..409f80b8d 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -11271,6 +11271,10 @@ msgstr ""
 "よって表示されたメッセージに使われたタグのコンマ区切りリスト、例: "
 "\"notify_message\"、\"notify_private\"、\"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "/part を実行した場合にバッファを閉じる"
 
diff --git a/po/pl.po b/po/pl.po
index 25f0d1c9e..43d91f37a 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -12482,6 +12482,10 @@ msgstr ""
 "komendy whois), na przykład: \"notify_message\", \"notify_private\" or "
 "\"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "zamyka bufor, kiedy na kanale wykonamy /part"
 
diff --git a/po/pt.po b/po/pt.po
index a086f9198..498c412e4 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -10968,6 +10968,10 @@ msgstr ""
 "whois), por exemplo: \"notify_message\", \"notify_private\" ou "
 "\"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "fechar o buffer ao executar /part num canal"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cb4a7ee40..5ad4335e9 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9608,6 +9608,10 @@ msgid ""
 "\"notify_message\", \"notify_private\" or \"notify_highlight\""
 msgstr ""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "fechar buffer quando o comando /part é executado em um canal"
 
diff --git a/po/ru.po b/po/ru.po
index 9c6131e04..06ea9e7d0 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9060,6 +9060,10 @@ msgid ""
 "\"notify_message\", \"notify_private\" or \"notify_highlight\""
 msgstr ""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 5b105adfd..ae4979c31 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -11523,6 +11523,10 @@ msgstr ""
 "се статус одсуства надимка промени (резултат команде whois), на пример: "
 "„notify_message”, „notify_private” или „notify_highlight”"
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "затварање бафера када се на каналу изврши /part"
 
diff --git a/po/tr.po b/po/tr.po
index e5de8e660..2c312d2cc 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-09-13 15:09+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+0200\n"
 "PO-Revision-Date: 2023-09-06 19:13+0200\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -11977,6 +11977,10 @@ msgstr ""
 "kullanılan etiketlerin virgülle ayrılmış listesi (komut whois'inin sonucu); "
 "örneğin: \"notify_message\", \"notify_private\" veya \"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "bir kanalda /part verildiğinde arabelleği kapat"
 
diff --git a/po/weechat.pot b/po/weechat.pot
index 4cdcb0951..a5c51dde0 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-09-13 15:07+0200\n"
+"POT-Creation-Date: 2023-09-14 19:39+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"
@@ -8128,6 +8128,10 @@ msgid ""
 "\"notify_message\", \"notify_private\" or \"notify_highlight\""
 msgstr ""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr ""
 
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index a3b25ac91..eb89e4fdb 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -108,6 +108,7 @@ struct t_config_option *irc_config_look_notice_welcome_redirect = NULL;
 struct t_config_option *irc_config_look_notice_welcome_tags = NULL;
 struct t_config_option *irc_config_look_notify_tags_ison = NULL;
 struct t_config_option *irc_config_look_notify_tags_whois = NULL;
+struct t_config_option *irc_config_look_open_pv_buffer_echo_msg = NULL;
 struct t_config_option *irc_config_look_part_closes_buffer = NULL;
 struct t_config_option *irc_config_look_pv_buffer = NULL;
 struct t_config_option *irc_config_look_pv_tags = NULL;
@@ -3401,6 +3402,13 @@ irc_config_init ()
                "\"notify_highlight\""),
             NULL, 0, 0, "notify_message", NULL, 0,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+        irc_config_look_open_pv_buffer_echo_msg = weechat_config_new_option (
+            irc_config_file, irc_config_section_look,
+            "open_pv_buffer_echo_msg", "boolean",
+            N_("open a private buffer on self message when capability "
+               "echo-message is enabled"),
+            NULL, 0, 0, "on", NULL, 0,
+            NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
         irc_config_look_part_closes_buffer = weechat_config_new_option (
             irc_config_file, irc_config_section_look,
             "part_closes_buffer", "boolean",
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index c5d078bdc..41291e887 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -143,6 +143,7 @@ extern struct t_config_option *irc_config_look_notice_welcome_redirect;
 extern struct t_config_option *irc_config_look_notice_welcome_tags;
 extern struct t_config_option *irc_config_look_notify_tags_ison;
 extern struct t_config_option *irc_config_look_notify_tags_whois;
+extern struct t_config_option *irc_config_look_open_pv_buffer_echo_msg;
 extern struct t_config_option *irc_config_look_part_closes_buffer;
 extern struct t_config_option *irc_config_look_pv_buffer;
 extern struct t_config_option *irc_config_look_pv_tags;
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 4493bda84..370aa0b3f 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -3265,7 +3265,8 @@ IRC_PROTOCOL_CALLBACK(privmsg)
             if (strcmp (ptr_channel->name, remote_nick) != 0)
                 irc_channel_pv_rename (server, ptr_channel, remote_nick);
         }
-        else if (!nick_is_me || !cap_echo_message)
+        else if (!nick_is_me || !cap_echo_message
+                 || weechat_config_boolean (irc_config_look_open_pv_buffer_echo_msg))
         {
             ptr_channel = irc_channel_new (server,
                                            IRC_CHANNEL_TYPE_PRIVATE,
diff --git a/tests/unit/plugins/irc/test-irc-protocol.cpp b/tests/unit/plugins/irc/test-irc-protocol.cpp
index abda9ebea..0aa4926f6 100644
--- a/tests/unit/plugins/irc/test-irc-protocol.cpp
+++ b/tests/unit/plugins/irc/test-irc-protocol.cpp
@@ -2799,9 +2799,17 @@ TEST(IrcProtocolWithServer, privmsg)
         {
             /* with echo-message */
             RECV(":alice!user@host PRIVMSG bob :this is the message ");
+            CHECK_PV_CLOSE("bob", "alice", "this is the message ",
+                           "irc_privmsg,self_msg,notify_none,no_highlight,"
+                           "prefix_nick_white,nick_alice,host_user@host,log1");
+            /* with echo-message, option irc.look.open_pv_buffer_echo_msg off */
+            config_file_option_set (irc_config_look_open_pv_buffer_echo_msg,
+                                    "off", 1);
+            RECV(":alice!user@host PRIVMSG bob :this is the message ");
             CHECK_SRV("--", "Msg(alice) -> bob: this is the message ",
                       "irc_privmsg,self_msg,notify_none,no_highlight,"
                       "nick_alice,host_user@host,log1");
+            config_file_option_reset (irc_config_look_open_pv_buffer_echo_msg, 1);
         }
 
         /*
@@ -2820,9 +2828,17 @@ TEST(IrcProtocolWithServer, privmsg)
         {
             /* with echo-message */
             RECV(":alice!user@host PRIVMSG nickserv :identify secret");
+            CHECK_PV_CLOSE("nickserv", "alice", "identify ******",
+                           "irc_privmsg,self_msg,notify_none,no_highlight,"
+                           "prefix_nick_white,nick_alice,host_user@host,log1");
+            /* with echo-message, option irc.look.open_pv_buffer_echo_msg off */
+            config_file_option_set (irc_config_look_open_pv_buffer_echo_msg,
+                                    "off", 1);
+            RECV(":alice!user@host PRIVMSG nickserv :identify secret");
             CHECK_SRV("--", "Msg(alice) -> nickserv: identify ******",
                       "irc_privmsg,self_msg,notify_none,no_highlight,"
                       "nick_alice,host_user@host,log1");
+            config_file_option_reset (irc_config_look_open_pv_buffer_echo_msg, 1);
         }
 
         /* broken CTCP to channel */