diff --git a/ChangeLog b/ChangeLog
index 8df3fc17b..8363873fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.2-rc1, 2013-09-02
+v0.4.2-rc1, 2013-09-03
 
 
 This document lists all changes for each version.
@@ -17,9 +17,9 @@ Version 0.4.2 (under dev!)
 * core: fix computation of columns in output of /help (take care about size of
   time/buffer/prefix)
 * core: display day change message dynamically (do not store it as a line in
-  buffer), rename option weechat.look.day_change_time_format to
-  weechat.look.day_change_message, new options weechat.look.day_change_message2
-  and weechat.color.chat_day_change (task #12775)
+  buffer), split option weechat.look.day_change_time_format into two options
+  weechat.look.day_change_message_{1date|2dates}, new option
+  weechat.color.chat_day_change (task #12775)
 * core: add syntax "@buffer:item" in bar items to force the buffer used when
   displaying the bar item (task #12717)
 * core: add search of regular expression in buffer, don't reset search type on
diff --git a/NEWS b/NEWS
index 4fd0693e3..4f5fe3daa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 WeeChat Release Notes
 =====================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.2-rc1, 2013-09-02
+v0.4.2-rc1, 2013-09-03
 
 
 This document lists important changes for each version, that require manual
@@ -21,12 +21,11 @@ Version 0.4.2 (under dev!)
 The day change message is now dynamically displayed, and therefore is not stored
 as a line in buffer any more.
 
-Option 'weechat.look.day_change_time_format' has been renamed to
-'weechat.look.day_change_message' (color codes are allowed in this option, see
-`/help eval`).
+Option 'weechat.look.day_change_time_format' has been split into two options
+'weechat.look.day_change_message_{1date|2dates}' (color codes are allowed in
+these options, see `/help eval`).
 
-New options 'weechat.look.day_change_message2' and
-'weechat.color.chat_day_change' have been added.
+New color option 'weechat.color.chat_day_change' has been added.
 
 After `/upgrade` from an old version, you will see two messages for each day
 change. This is a normal behavior and will not happen again with the next day
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index 5116ff441..0502af22b 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -483,12 +483,12 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
-* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+* [[option_weechat.look.day_change_message_1date]] *weechat.look.day_change_message_1date*
 ** Beschreibung: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"-- %a, %d %b %Y --"`)
 
-* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+* [[option_weechat.look.day_change_message_2dates]] *weechat.look.day_change_message_2dates*
 ** Beschreibung: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 7a2adaba5..a20e530ab 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -483,12 +483,12 @@
 ** type: boolean
 ** values: on, off (default value: `on`)
 
-* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+* [[option_weechat.look.day_change_message_1date]] *weechat.look.day_change_message_1date*
 ** description: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** type: string
 ** values: any string (default value: `"-- %a, %d %b %Y --"`)
 
-* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+* [[option_weechat.look.day_change_message_2dates]] *weechat.look.day_change_message_2dates*
 ** description: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** type: string
 ** values: any string (default value: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 630cef4d8..72845e04c 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -483,12 +483,12 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `on`)
 
-* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+* [[option_weechat.look.day_change_message_1date]] *weechat.look.day_change_message_1date*
 ** description: `message affiché lorsque le jour a changé, avec une date affichée (par exemple au début d'un tampon) (voir man strftime pour le format de date/heure) (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"-- %a, %d %b %Y --"`)
 
-* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+* [[option_weechat.look.day_change_message_2dates]] *weechat.look.day_change_message_2dates*
 ** description: `message affiché lorsque le jour a changé, avec deux dates affichées (entre deux messages); les formats pour la seconde date doivent démarrer par deux "%" car strftime est appelé deux fois sur cette chaîne (voir man strftime pour le format de date/heure) (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index d52cb23b8..f39c015ae 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -483,12 +483,12 @@
 ** tipo: bool
 ** valori: on, off (valore predefinito: `on`)
 
-* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+* [[option_weechat.look.day_change_message_1date]] *weechat.look.day_change_message_1date*
 ** descrizione: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"-- %a, %d %b %Y --"`)
 
-* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+* [[option_weechat.look.day_change_message_2dates]] *weechat.look.day_change_message_2dates*
 ** descrizione: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index d90944bc8..33011990c 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -483,12 +483,12 @@
 ** タイプ: ブール
 ** 値: on, off (デフォルト値: `on`)
 
-* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+* [[option_weechat.look.day_change_message_1date]] *weechat.look.day_change_message_1date*
 ** 説明: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `"-- %a, %d %b %Y --"`)
 
-* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+* [[option_weechat.look.day_change_message_2dates]] *weechat.look.day_change_message_2dates*
 ** 説明: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index f2a86341d..a08bcc0a8 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -99,8 +99,8 @@ struct t_config_option *config_look_color_real_white;
 struct t_config_option *config_look_command_chars;
 struct t_config_option *config_look_confirm_quit;
 struct t_config_option *config_look_day_change;
-struct t_config_option *config_look_day_change_message;
-struct t_config_option *config_look_day_change_message2;
+struct t_config_option *config_look_day_change_message_1date;
+struct t_config_option *config_look_day_change_message_2dates;
 struct t_config_option *config_look_eat_newline_glitch;
 struct t_config_option *config_look_emphasized_attributes;
 struct t_config_option *config_look_highlight;
@@ -2069,18 +2069,18 @@ config_weechat_init_options ()
         "day_change", "boolean",
         N_("display special message when day changes"),
         NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
-    config_look_day_change_message = config_file_new_option (
+    config_look_day_change_message_1date = config_file_new_option (
         weechat_config_file, ptr_section,
-        "day_change_message", "string",
+        "day_change_message_1date", "string",
         /* TRANSLATORS: string "${color:xxx}" must NOT be translated */
         N_("message displayed when the day has changed, with one date displayed "
            "(for example at beginning of buffer) (see man strftime for "
            "date/time specifiers) (note: content is evaluated, so you can use "
            "colors with format \"${color:xxx}\", see /help eval)"),
         NULL, 0, 0, "-- %a, %d %b %Y --", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
-    config_look_day_change_message2 = config_file_new_option (
+    config_look_day_change_message_2dates = config_file_new_option (
         weechat_config_file, ptr_section,
-        "day_change_message2", "string",
+        "day_change_message_2dates", "string",
         /* TRANSLATORS: string "${color:xxx}" must NOT be translated */
         N_("message displayed when the day has changed, with two dates displayed "
            "(between two messages); the second date specifiers must start with "
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index 77200875d..a8012af51 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -116,8 +116,8 @@ extern struct t_config_option *config_look_color_real_white;
 extern struct t_config_option *config_look_command_chars;
 extern struct t_config_option *config_look_confirm_quit;
 extern struct t_config_option *config_look_day_change;
-extern struct t_config_option *config_look_day_change_message;
-extern struct t_config_option *config_look_day_change_message2;
+extern struct t_config_option *config_look_day_change_message_1date;
+extern struct t_config_option *config_look_day_change_message_2dates;
 extern struct t_config_option *config_look_eat_newline_glitch;
 extern struct t_config_option *config_look_emphasized_attributes;
 extern struct t_config_option *config_look_highlight;
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 5756efd5d..7bc653c2a 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -606,13 +606,13 @@ gui_chat_display_day_changed (struct t_gui_window *window,
     if (date1)
     {
         strftime (temp_message, sizeof (temp_message),
-                  CONFIG_STRING(config_look_day_change_message2), date1);
+                  CONFIG_STRING(config_look_day_change_message_2dates), date1);
         strftime (message, sizeof (message), temp_message, date2);
     }
     else
     {
         strftime (message, sizeof (message),
-                  CONFIG_STRING(config_look_day_change_message), date2);
+                  CONFIG_STRING(config_look_day_change_message_1date), date2);
     }
 
     message_with_color = (strstr (message, "${")) ?