sync with sylpheed 0.7.0cvs24

diff --git a/ChangeLog b/ChangeLog
index 3eedeb1143353febaaa3a9e1bc3a090a4e836502..11d376d5427a2b1ee287a5b6de8507d7a7b05311 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-30
+
+       * src/compose.c: compose_wrap_line_all(): wrap quoted part even
+         if prefs_common.linewrap_quote is not set (it is only for
+         auto-wrapping on reply).
+       * src/prefs_account.c: prefs_account_open(): initialize tmp_ac_prefs
+         when creating a new account.
+

 2002-01-29
 
        * src/mimeview.c: fixed multiple dialog / moving by correcting
 2002-01-29
 
        * src/mimeview.c: fixed multiple dialog / moving by correcting


@@ -7,6 +15,8 @@
          mode.
        * src/prefs_filter.c: fixed a bug that didn't set the order of
          rules correctly.
          mode.
        * src/prefs_filter.c: fixed a bug that didn't set the order of
          rules correctly.

+       * src/prefs_common.c: prefs_keybind_apply_clicked(): fixed
+         empty_menurc string.

 
 2002-01-28
 
 
 2002-01-28
 

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 6af10325844cfd0ff4ca077a32af2c0b9089c875..4ed35dc032bd2fff951ff88ac8145ac876dd7bf4 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,17 @@
+2002-01-30 [paul]      0.7.0claws40
+
+       * sync with sylpheed 0.7.0cvs24
+               see ChangeLog entries 2002-01-29 (src/prefs_common.c)
+               and 2002-01-30
+
+       * src/compose.c
+               add {N_("/_Spelling"), ... "<Branch>"} to 
+               GtkItemFactoryEntry compose_entries[]
+
+       * src/prefs_common.c
+               add claws menu items to prefs_keybind_apply_clicked()
+               and remove non-claws menu items
+

 2002-01-29 [paul]      0.7.0claws39
 
        * sync with sylpheed 0.7.0cvs22
 2002-01-29 [paul]      0.7.0claws39
 
        * sync with sylpheed 0.7.0cvs22

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 696dc095ea8e2b7c55637ab3a507fd6bafcfb5e5..61b43f30f4bffd89312205626ad757eee9a38fc5 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,12 @@
+2002-01-30
+
+       * src/compose.c: compose_wrap_line_all():
+         prefs_common.linewrap_quote ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¯¤Æ¤â°úÍÑÉô¤òÀ°·Á
+         ¤¹¤ë¤è¤¦¤Ë¤·¤¿(prefs_common.linewrap_quote ¤Ïñ¤ËÊÖ¿®»þ¤Î¼«Æ°
+         ²þ¹Ô¤Î¤¿¤á¤Ë¤¢¤ë¤Î¤Ç)¡£
+       * src/prefs_account.c: prefs_account_open(): ¿·µ¬¥¢¥«¥¦¥ó¥È¤òºîÀ®
+         ¤¹¤ë¤È¤­¤Ë tmp_ac_prefs ¤ò½é´ü²½¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+

 2002-01-29
 
        * src/mimeview.c: ¥Ü¥¿¥ó / ¥­¡¼¥¤¥Ù¥ó¥È½èÍý¤ò½¤Àµ¤·¤Æ¿½Å¥À¥¤¥¢¥í¥°
 2002-01-29
 
        * src/mimeview.c: ¥Ü¥¿¥ó / ¥­¡¼¥¤¥Ù¥ó¥È½èÍý¤ò½¤Àµ¤·¤Æ¿½Å¥À¥¤¥¢¥í¥°


@@ -6,6 +15,8 @@
          src/textview.c: MIME ¥â¡¼¥É¤Ç¤¤¤¯¤Ä¤«¤Î¥­¡¼¥×¥ì¥¹¥¤¥Ù¥ó¥È¤ò
          MimeView ¤ËÅϤ¹¤è¤¦¤Ë¤·¤¿¡£
        * src/prefs_filter.c: ¥ë¡¼¥ë¤Î½ç½ø¤òÀµ¤·¤¯¥»¥Ã¥È¤·¤Ê¤¤¥Ð¥°¤ò½¤Àµ¡£
          src/textview.c: MIME ¥â¡¼¥É¤Ç¤¤¤¯¤Ä¤«¤Î¥­¡¼¥×¥ì¥¹¥¤¥Ù¥ó¥È¤ò
          MimeView ¤ËÅϤ¹¤è¤¦¤Ë¤·¤¿¡£
        * src/prefs_filter.c: ¥ë¡¼¥ë¤Î½ç½ø¤òÀµ¤·¤¯¥»¥Ã¥È¤·¤Ê¤¤¥Ð¥°¤ò½¤Àµ¡£

+       * src/prefs_common.c: prefs_keybind_apply_clicked(): empty_menurc
+         ¤Îʸ»úÎó¤ò½¤Àµ¡£

 
 2002-01-28
 
 
 2002-01-28
 

diff --git a/configure.in b/configure.in
index 33b87d3c88ef5f8f189b074ee9958a0b79c04e50..8558df138b5a5770da8183b244978dd49806cf85 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws39
+EXTRA_VERSION=claws40

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 3727269f8d7c05854bc1dbb8543353c51a0f466d..946ef3b15eb41e4189985d39e9c607bc1f03f355 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -567,6 +567,7 @@ static GtkItemFactoryEntry compose_entries[] =
        {N_("/_Edit/Edit with e_xternal editor"),
                                        "<control>X", compose_ext_editor_cb, 0, NULL},
 #if USE_PSPELL
        {N_("/_Edit/Edit with e_xternal editor"),
                                        "<control>X", compose_ext_editor_cb, 0, NULL},
 #if USE_PSPELL

+       {N_("/_Spelling"),              NULL, NULL, 0, "<Branch>"},

        {N_("/_Spelling/Check all or selection"),NULL, compose_check_all, 0, NULL},
        {N_("/_Spelling/Check backwards misspelled word"),      NULL, compose_check_backwards , 0, NULL},
        {N_("/_Spelling/Forward to next misspelled word"),      NULL, compose_check_forwards_go, 0, NULL},
        {N_("/_Spelling/Check all or selection"),NULL, compose_check_all, 0, NULL},
        {N_("/_Spelling/Check backwards misspelled word"),      NULL, compose_check_backwards , 0, NULL},
        {N_("/_Spelling/Forward to next misspelled word"),      NULL, compose_check_forwards_go, 0, NULL},


@@ -2345,7 +2346,7 @@ static void compose_wrap_line_all(Compose *compose)
        gint ch_len;
        gboolean is_new_line = TRUE, do_delete = FALSE;
        guint qlen = 0, i_len = 0;
        gint ch_len;
        gboolean is_new_line = TRUE, do_delete = FALSE;
        guint qlen = 0, i_len = 0;

-       guint linewrap_quote = prefs_common.linewrap_quote;
+       gboolean linewrap_quote = TRUE;

        guint linewrap_len = prefs_common.linewrap_len;
        gchar *qfmt = prefs_common.quotemark;
        gchar cbuf[MB_LEN_MAX];
        guint linewrap_len = prefs_common.linewrap_len;
        gchar *qfmt = prefs_common.quotemark;
        gchar cbuf[MB_LEN_MAX];

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 23cdfe56b310b4d84ebca23088964e564f14a73a..8c46a277affaa7b2c535518ec75ccce8216b15d3 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -526,6 +526,9 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
 
        if (!ac_prefs) {
                ac_prefs = g_new0(PrefsAccount, 1);
 
        if (!ac_prefs) {
                ac_prefs = g_new0(PrefsAccount, 1);

+               memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
+               prefs_set_default(param);
+               *ac_prefs = tmp_ac_prefs;

                ac_prefs->account_id = prefs_account_get_new_id();
                new_account = TRUE;
        }
                ac_prefs->account_id = prefs_account_get_new_id();
                new_account = TRUE;
        }

diff --git a/src/prefs_common.c b/src/prefs_common.c
index d6281f30d92ac7b27d7afef6b119d5a1fceb52af..268723082895aa93553897ddb5333231c59f193f 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -2495,9 +2495,9 @@ PACK_FRAME(vbox1, keybind_frame, _("Shortcut key"));
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 
        keybind_label = gtk_label_new
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 
        keybind_label = gtk_label_new

-               (_("Select the preset of key bindings.\n"
-                  "You can also modify each menu shortcuts by pressing\n"
-                  "any key when placing mouse pointer on the item."));
+               (_("Select the preset key bindings.\n"
+                  "You can also modify each menu shortcut by pressing\n"
+                  "any key(s) when placing the mouse pointer on the item."));

        gtk_widget_show (keybind_label);
        gtk_box_pack_start (GTK_BOX (hbox1), keybind_label, FALSE, FALSE, 0);
        gtk_label_set_justify (GTK_LABEL (keybind_label), GTK_JUSTIFY_LEFT);
        gtk_widget_show (keybind_label);
        gtk_box_pack_start (GTK_BOX (hbox1), keybind_label, FALSE, FALSE, 0);
        gtk_label_set_justify (GTK_LABEL (keybind_label), GTK_JUSTIFY_LEFT);


@@ -3469,7 +3469,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
        gchar *rc_str;
 
        static gchar *default_menurc =
        gchar *rc_str;
 
        static gchar *default_menurc =

-               "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
+               "(menu-path \"<Main>/File/Empty trash\" \"<shift>D\")\n"

                "(menu-path \"<Main>/File/Save as...\" \"<control>S\")\n"
                "(menu-path \"<Main>/File/Print...\" \"\")\n"
                "(menu-path \"<Main>/File/Exit\" \"<control>Q\")\n"
                "(menu-path \"<Main>/File/Save as...\" \"<control>S\")\n"
                "(menu-path \"<Main>/File/Print...\" \"\")\n"
                "(menu-path \"<Main>/File/Exit\" \"<control>Q\")\n"


@@ -3477,9 +3477,10 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
                "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
                "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
                "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
                "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
                "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"

-               "(menu-path \"<Main>/Edit/Search messages...\" \"<shift><control>F\")\n"
+               "(menu-path \"<Main>/Edit/Search folder...\" \"<shift><control>F\")\n"

 
 

-               "(menu-path \"<Main>/View/Toggle summary view\" \"V\")\n"
+               "(menu-path \"<Main>/View/Expand Summary View\" \"V\")\n"
+               "(menu-path \"<Main>/View/Expand Message View\" \"<shift>V\")\n"

                "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
                "(menu-path \"<Main>/View/Unthread view\" \"<shift><control>T\")\n"
                "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
                "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
                "(menu-path \"<Main>/View/Unthread view\" \"<shift><control>T\")\n"
                "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"


@@ -3494,12 +3495,12 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
                "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
                "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
 
                "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
                "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"

-               "(menu-path \"<Main>/Message/Compose new message\" \"<shift><control>N\")\n"
+               "(menu-path \"<Main>/Message/Compose an email message\" \"<shift><control>N\")\n"

                "(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
                "(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"

+               "(menu-path \"<Main>/Message/Reply to sender\" \"<control><alt>R\")\n"

                "(menu-path \"<Main>/Message/Reply to all\" \"<shift><control>R\")\n"
                "(menu-path \"<Main>/Message/Reply to all\" \"<shift><control>R\")\n"

-               "(menu-path \"<Main>/Message/Reply to sender\" \"\")\n"

                "(menu-path \"<Main>/Message/Forward\" \"<control><alt>F\")\n"
                "(menu-path \"<Main>/Message/Forward\" \"<control><alt>F\")\n"

-               "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n"
+               /* "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n" */

                "(menu-path \"<Main>/Message/Move...\" \"<control>O\")\n"
                "(menu-path \"<Main>/Message/Copy...\" \"<shift><control>O\")\n"
                "(menu-path \"<Main>/Message/Delete\" \"<control>D\")\n"
                "(menu-path \"<Main>/Message/Move...\" \"<control>O\")\n"
                "(menu-path \"<Main>/Message/Copy...\" \"<shift><control>O\")\n"
                "(menu-path \"<Main>/Message/Delete\" \"<control>D\")\n"


@@ -3518,9 +3519,10 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
                "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
                "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
                "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
                "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
                "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"

-               "(menu-path \"<Main>/Edit/Search messages...\" \"<control>S\")\n"
+               "(menu-path \"<Main>/Edit/Search folder...\" \"<control>S\")\n"

 
 

-               "(menu-path \"<Main>/View/Toggle summary view\" \"V\")\n"
+               "(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
+               "(menu-path \"<Main>/View/Expand Message View\" \"\")\n"

                "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
                "(menu-path \"<Main>/View/Unthread view\" \"<shift><control>T\")\n"
                "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
                "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
                "(menu-path \"<Main>/View/Unthread view\" \"<shift><control>T\")\n"
                "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"


@@ -3535,12 +3537,12 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
                "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
                "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"
 
                "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
                "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><control>I\")\n"

-               "(menu-path \"<Main>/Message/Compose new message\" \"W\")\n"
+               "(menu-path \"<Main>/Message/Compose an email message\" \"W\")\n"

                "(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"
                "(menu-path \"<Main>/Message/Reply\" \"<control>R\")\n"

-               "(menu-path \"<Main>/Message/Reply to all\" \"<shift>A\")\n"

                "(menu-path \"<Main>/Message/Reply to sender\" \"\")\n"
                "(menu-path \"<Main>/Message/Reply to sender\" \"\")\n"

+               "(menu-path \"<Main>/Message/Reply to all\" \"<shift>A\")\n"

                "(menu-path \"<Main>/Message/Forward\" \"F\")\n"
                "(menu-path \"<Main>/Message/Forward\" \"F\")\n"

-               "(menu-path \"<Main>/Message/Forward as attachment\" \"<shift>F\")\n"
+               /* "(menu-path \"<Main>/Message/Forward as attachment\" \"<shift>F\")\n" */

                "(menu-path \"<Main>/Message/Move...\" \"O\")\n"
                "(menu-path \"<Main>/Message/Copy...\" \"<shift>O\")\n"
                "(menu-path \"<Main>/Message/Delete\" \"D\")\n"
                "(menu-path \"<Main>/Message/Move...\" \"O\")\n"
                "(menu-path \"<Main>/Message/Copy...\" \"<shift>O\")\n"
                "(menu-path \"<Main>/Message/Delete\" \"D\")\n"


@@ -3559,9 +3561,10 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
                "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
                "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"
                "(menu-path \"<Main>/Edit/Copy\" \"<control>C\")\n"
                "(menu-path \"<Main>/Edit/Select all\" \"<control>A\")\n"
                "(menu-path \"<Main>/Edit/Find in current message...\" \"<control>F\")\n"

-               "(menu-path \"<Main>/Edit/Search messages...\" \"<control>S\")\n"
+               "(menu-path \"<Main>/Edit/Search folder...\" \"<control>S\")\n"

 
 

-               "(menu-path \"<Main>/View/Toggle summary view\" \"V\")\n"
+               "(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
+               "(menu-path \"<Main>/View/Expand Message View\" \"\")\n"

                "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
                "(menu-path \"<Main>/View/Unthread view\" \"<shift><control>T\")\n"
                "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"
                "(menu-path \"<Main>/View/Thread view\" \"<control>T\")\n"
                "(menu-path \"<Main>/View/Unthread view\" \"<shift><control>T\")\n"
                "(menu-path \"<Main>/View/Go to/Prev message\" \"P\")\n"


@@ -3576,12 +3579,12 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
                "(menu-path \"<Main>/Message/Get new mail\" \"<alt>I\")\n"
                "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><alt>I\")\n"
 
                "(menu-path \"<Main>/Message/Get new mail\" \"<alt>I\")\n"
                "(menu-path \"<Main>/Message/Get from all accounts\" \"<shift><alt>I\")\n"

-               "(menu-path \"<Main>/Message/Compose new message\" \"<alt>N\")\n"
+               "(menu-path \"<Main>/Message/Compose an email message\" \"<alt>N\")\n"

                "(menu-path \"<Main>/Message/Reply\" \"<alt>R\")\n"
                "(menu-path \"<Main>/Message/Reply\" \"<alt>R\")\n"

-               "(menu-path \"<Main>/Message/Reply to all\" \"<shift><alt>R\")\n"

                "(menu-path \"<Main>/Message/Reply to sender\" \"<control><alt>R\")\n"
                "(menu-path \"<Main>/Message/Reply to sender\" \"<control><alt>R\")\n"

+               "(menu-path \"<Main>/Message/Reply to all\" \"<shift><alt>R\")\n"

                "(menu-path \"<Main>/Message/Forward\" \"<shift><alt>F\")\n"
                "(menu-path \"<Main>/Message/Forward\" \"<shift><alt>F\")\n"

-               "(menu-path \"<Main>/Message/Forward as attachment\" \"<shift><control>F\")\n"
+               /* "(menu-path \"<Main>/Message/Forward as attachment\" \"<shift><control>F\")\n" */

                "(menu-path \"<Main>/Message/Move...\" \"<alt>O\")\n"
                "(menu-path \"<Main>/Message/Copy...\" \"\")\n"
                "(menu-path \"<Main>/Message/Delete\" \"<alt>D\")\n"
                "(menu-path \"<Main>/Message/Move...\" \"<alt>O\")\n"
                "(menu-path \"<Main>/Message/Copy...\" \"\")\n"
                "(menu-path \"<Main>/Message/Delete\" \"<alt>D\")\n"


@@ -3600,12 +3603,16 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/Edit/Copy\" \"\")\n"
                "(menu-path \"<Main>/Edit/Select all\" \"\")\n"
                "(menu-path \"<Main>/Edit/Find in current message...\" \"\")\n"
                "(menu-path \"<Main>/Edit/Copy\" \"\")\n"
                "(menu-path \"<Main>/Edit/Select all\" \"\")\n"
                "(menu-path \"<Main>/Edit/Find in current message...\" \"\")\n"

-               "(menu-path \"<Main>/Edit/Search messages...\" \"\")\n"
+               "(menu-path \"<Main>/Edit/Search folder...\" \"\")\n"

 
 

+               "(menu-path \"<Main>/View/Expand Summary View\" \"\")\n"
+               "(menu-path \"<Main>/View/Expand Message View\" \"\")\n"

                "(menu-path \"<Main>/View/Thread view\" \"\")\n"
                "(menu-path \"<Main>/View/Unthread view\" \"\")\n"
                "(menu-path \"<Main>/View/Go to/Prev message\" \"\")\n"
                "(menu-path \"<Main>/View/Go to/Next message\" \"\")\n"
                "(menu-path \"<Main>/View/Thread view\" \"\")\n"
                "(menu-path \"<Main>/View/Unthread view\" \"\")\n"
                "(menu-path \"<Main>/View/Go to/Prev message\" \"\")\n"
                "(menu-path \"<Main>/View/Go to/Next message\" \"\")\n"

+               "(menu-path \"<Main>/View/Go to/Prev unread message\" \"\")\n"
+               "(menu-path \"<Main>/View/Go to/Next unread message\" \"\")\n"

                "(menu-path \"<Main>/View/Go to/Other folder...\" \"\")\n"
                "(menu-path \"<Main>/View/Open in new window\" \"\")\n"
                "(menu-path \"<Main>/View/View source\" \"\")\n"
                "(menu-path \"<Main>/View/Go to/Other folder...\" \"\")\n"
                "(menu-path \"<Main>/View/Open in new window\" \"\")\n"
                "(menu-path \"<Main>/View/View source\" \"\")\n"


@@ -3614,12 +3621,12 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
                "(menu-path \"<Main>/Message/Get new mail\" \"\")\n"
                "(menu-path \"<Main>/Message/Get from all accounts\" \"\")\n"
 
                "(menu-path \"<Main>/Message/Get new mail\" \"\")\n"
                "(menu-path \"<Main>/Message/Get from all accounts\" \"\")\n"

-               "(menu-path \"<Main>/Message/Compose new message\" \"\")\n"
+               "(menu-path \"<Main>/Message/Compose an email message\" \"\")\n"

                "(menu-path \"<Main>/Message/Reply\" \"\")\n"
                "(menu-path \"<Main>/Message/Reply\" \"\")\n"

-               "(menu-path \"<Main>/Message/Reply to all\" \"\")\n"

                "(menu-path \"<Main>/Message/Reply to sender\" \"\")\n"
                "(menu-path \"<Main>/Message/Reply to sender\" \"\")\n"

+               "(menu-path \"<Main>/Message/Reply to all\" \"\")\n"

                "(menu-path \"<Main>/Message/Forward\" \"\")\n"
                "(menu-path \"<Main>/Message/Forward\" \"\")\n"

-               "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n"
+               /* "(menu-path \"<Main>/Message/Forward as attachment\" \"\")\n" */

                "(menu-path \"<Main>/Message/Move...\" \"\")\n"
                "(menu-path \"<Main>/Message/Copy...\" \"\")\n"
                "(menu-path \"<Main>/Message/Delete\" \"\")\n"
                "(menu-path \"<Main>/Message/Move...\" \"\")\n"
                "(menu-path \"<Main>/Message/Copy...\" \"\")\n"
                "(menu-path \"<Main>/Message/Delete\" \"\")\n"