diff --git a/ChangeLog b/ChangeLog
index 087c2681e..c36d82c55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ Version 0.3.4 (under dev!)
 * api: add priority for hooks (task #10550)
 * api: add new functions: hashtable_get_string, hook_info_hashtable,
   info_get_hashtable
+* irc: display old channel topic when topic is unset (task #9780)
 * irc: add new info_hashtable "irc_parse_message"
 * irc: fix bug with hostmasks in command /ignore (bug #30716)
 * rmodifier: new plugin "rmodifier": alter modifier strings with regular
diff --git a/po/cs.po b/po/cs.po
index 2640223e3..3d68eda27 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-02 00:26+0200\n"
+"POT-Creation-Date: 2010-10-06 18:24+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5023,6 +5023,10 @@ msgstr "%s%s%s%s změnil téma pro %s%s%s z \"%s%s\" na \"%s%s\""
 msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s změnil téma pro %s%s%s na \"%s%s\""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgstr "%s%s%s%s změnil téma pro %s%s%s na \"%s%s\""
+
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
 msgstr "%s%s%s%s zrušil téma pro %s%s%s"
diff --git a/po/de.po b/po/de.po
index 41249bc19..d1c75559a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-02 00:26+0200\n"
+"POT-Creation-Date: 2010-10-06 18:24+0200\n"
 "PO-Revision-Date: 2010-09-28 09:34+0200\n"
 "Last-Translator: Nils G.\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5233,6 +5233,10 @@ msgstr ""
 msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s hat das Topic für den Channel %s%s%s auf \"%s%s\" gesetzt."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgstr "%s%s%s%s hat das Topic für den Channel %s%s%s auf \"%s%s\" gesetzt."
+
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
 msgstr "%s%s%s%s hat das Topic von %s%s%s entfernt"
diff --git a/po/es.po b/po/es.po
index 42235f1af..e28ca53f5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-02 00:26+0200\n"
+"POT-Creation-Date: 2010-10-06 18:24+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5088,6 +5088,10 @@ msgstr "%s%s%s%s ha cambiado el tema para %s%s%s de \"%s%s\" a \"%s%s\""
 msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s ha cambiado el tema para %s%s%s a \"%s%s\""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgstr "%s%s%s%s ha cambiado el tema para %s%s%s a \"%s%s\""
+
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
 msgstr "%s%s%s%s ha borrado el tema para %s%s%s"
diff --git a/po/fr.po b/po/fr.po
index b2d000956..9d80af95e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-02 00:26+0200\n"
-"PO-Revision-Date: 2010-10-02 00:26+0200\n"
+"POT-Creation-Date: 2010-10-06 18:24+0200\n"
+"PO-Revision-Date: 2010-10-06 18:24+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -5135,6 +5135,10 @@ msgstr "%s%s%s%s a changé le titre pour %s%s%s de \"%s%s\" en \"%s%s\""
 msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s a changé le titre pour %s%s%s en \"%s%s\""
 
+#, c-format
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgstr "%s%s%s%s a retiré le titre pour %s%s%s (ancien titre: \"%s%s\")"
+
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
 msgstr "%s%s%s%s a retiré le titre pour %s%s%s"
diff --git a/po/hu.po b/po/hu.po
index 9a66b0bc9..8e44fa78c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-02 00:26+0200\n"
+"POT-Creation-Date: 2010-10-06 18:24+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4807,6 +4807,10 @@ msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:"
 msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:"
+
 #, fuzzy, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
 msgstr "%s%s%s törölte a %s%s szoba témáját\n"
diff --git a/po/it.po b/po/it.po
index aa9bb4438..c851e1c4a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-02 00:26+0200\n"
+"POT-Creation-Date: 2010-10-06 18:24+0200\n"
 "PO-Revision-Date: 2010-09-22 15:27+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5103,6 +5103,10 @@ msgstr "%s%s%s%s ha cambiato l'argomento per %s%s%s da \"%s%s\" a \"%s%s\""
 msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s ha cambiato argomento per %s%s%s in \"%s%s\""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgstr "%s%s%s%s ha cambiato argomento per %s%s%s in \"%s%s\""
+
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
 msgstr "%s%s%s%s ha rimosso l'argomento per %s%s%s"
diff --git a/po/pl.po b/po/pl.po
index 3662522d4..3c88cb318 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-02 00:26+0200\n"
+"POT-Creation-Date: 2010-10-06 18:24+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5061,6 +5061,10 @@ msgstr "%s%s%s%s zmienił temat %s%s%s z \"%s%s\" na \"%s%s\""
 msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s%s zmienił temat %s%s%s na \"%s%s\""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgstr "%s%s%s%s zmienił temat %s%s%s na \"%s%s\""
+
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
 msgstr "%s%s%s%s usunął temat %s%s%s"
diff --git a/po/ru.po b/po/ru.po
index c691c2b3c..2207bfdfb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-02 00:26+0200\n"
+"POT-Creation-Date: 2010-10-06 18:24+0200\n"
 "PO-Revision-Date: 2010-08-07 10:46+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4815,6 +4815,10 @@ msgstr "%s%s%s сменил тему %s%s%s на:"
 msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr "%s%s%s сменил тему %s%s%s на:"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgstr "%s%s%s сменил тему %s%s%s на:"
+
 #, fuzzy, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
 msgstr "%s%s%s удалил тему канала для %s%s\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 4bf991cd0..62c07a241 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-02 00:26+0200\n"
+"POT-Creation-Date: 2010-10-06 18:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4128,6 +4128,10 @@ msgstr ""
 msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\""
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")"
+msgstr ""
+
 #, c-format
 msgid "%s%s%s%s has unset topic for %s%s%s"
 msgstr ""
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 884d1d6d5..5940034a5 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -1776,16 +1776,39 @@ IRC_PROTOCOL_CALLBACK(topic)
         }
         else
         {
-            weechat_printf_tags (ptr_buffer,
-                                 irc_protocol_tags (command, NULL),
-                                 _("%s%s%s%s has unset topic for %s%s%s"),
-                                 weechat_prefix ("network"),
-                                 IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
-                                 nick,
-                                 IRC_COLOR_CHAT,
-                                 IRC_COLOR_CHAT_CHANNEL,
-                                 argv[2],
-                                 IRC_COLOR_CHAT);
+            if (weechat_config_boolean (irc_config_look_display_old_topic))
+            {
+                old_topic_color = irc_color_decode (ptr_channel->topic,
+                                                    weechat_config_boolean (irc_config_network_colors_receive));
+                weechat_printf_tags (ptr_buffer,
+                                     irc_protocol_tags (command, NULL),
+                                     _("%s%s%s%s has unset topic for %s%s%s "
+                                       "(old topic: \"%s%s\")"),
+                                     weechat_prefix ("network"),
+                                     IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
+                                     nick,
+                                     IRC_COLOR_CHAT,
+                                     IRC_COLOR_CHAT_CHANNEL,
+                                     argv[2],
+                                     IRC_COLOR_CHAT,
+                                     (old_topic_color) ? old_topic_color : ptr_channel->topic,
+                                     IRC_COLOR_CHAT);
+                if (old_topic_color)
+                    free (old_topic_color);
+            }
+            else
+            {
+                weechat_printf_tags (ptr_buffer,
+                                     irc_protocol_tags (command, NULL),
+                                     _("%s%s%s%s has unset topic for %s%s%s"),
+                                     weechat_prefix ("network"),
+                                     IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
+                                     nick,
+                                     IRC_COLOR_CHAT,
+                                     IRC_COLOR_CHAT_CHANNEL,
+                                     argv[2],
+                                     IRC_COLOR_CHAT);
+            }
         }
     }