sync with sylpheed 0.4.99cvs6

diff --git a/ChangeLog b/ChangeLog
index 21c6d9d4922544079b15259ce9025625a109f7b4..622e8a0a366f271e1ce3ddc37c89ac55eeb2ba97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-06-06
+
+       * src/imap.c: renamed imap_delete_messages() and
+         imap_delete_all_messages() to imap_delete_cached_messages() and
+         imap_delete_all_cached_messages(). Some code cleanups.
+       * src/utils.[ch]: added a function remove_all_numbered_files().
+       * src/mh.c: mh_remove_all_msg()
+         src/imap.c: imap_delete_all_cached_messages():
+         use remove_all_numbered_files().
+       * src/mainwindow.c
+         src/summaryview.c
+         src/compose.[ch]: added `Reply to sender'.
+         compose_reply()
+         compose_reply_set_entry(): added an argument `ignore_replyto'.
+
 2001-06-05
 
        * src/folderview.c: folderview_selected()

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0b94cf36579f5924890f448045ce99e601c29d15..5a3bff053ca5c5883802d5dc22806c94aa70ccc5 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2001-06-06 [paul]
+
+        0.4.99claws6
+
+        * sync with sylpheed 0.4.99cvs6
+
 2001-06-06 [hoa]
 
        * added src/quote_fmt_parse.h

diff --git a/ChangeLog.jp b/ChangeLog.jp
index c35156e7e6548c17b8bd81186318a779d190a99e..10dced5e910c3ec587403a45c5ec9ac76e6b3096 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,18 @@
+2001-06-06
+
+       * src/imap.c: imap_delete_messages() ¤È imap_delete_all_messages()
+         ¤ò imap_delete_cached_messages() ¤È
+         imap_delete_all_cached_messages() ¤Ë̾¾ÎÊѹ¹¡£¥³¡¼¥É¤ÎÀ°Íý¡£
+       * src/utils.[ch]: ´Ø¿ô remove_all_numbered_files() ¤òÄɲá£
+       * src/mh.c: mh_remove_all_msg()
+         src/imap.c: imap_delete_all_cached_messages():
+         remove_all_numbered_files() ¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/mainwindow.c
+         src/summaryview.c
+         src/compose.[ch]: ¡Öº¹½Ð¿Í¤ËÊÖ¿®¡×¤òÄɲá£
+         compose_reply()
+         compose_reply_set_entry(): °ú¿ô¤Ë `ignore_replyto' ¤òÄɲá£
+
 2001-06-05
 
        * src/folderview.c: folderview_selected()

diff --git a/configure.in b/configure.in
index db4f5cecc82de05b84211df73eb4d7f1e8a0143f..a1cc690864972e34dfaf0010a9e15aeebeafc9b4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=4
 MICRO_VERSION=99
 INTERFACE_AGE=99
 BINARY_AGE=99
-EXTRA_VERSION=claws5
+EXTRA_VERSION=claws6
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/po/ja.po b/po/ja.po
index b6bb6343fbc5d67dbdef6ac04ac7f0470e399f07..3f85861848dd07a2690fa28602d29b1dcfb5c73f 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
-"POT-Creation-Date: 2001-05-27 13:41+0900\n"
+"POT-Creation-Date: 2001-06-06 15:00+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -88,13 +88,13 @@ msgstr ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
 #: src/about.c:233 src/addressbook.c:1293 src/alertpanel.c:232
-#: src/compose.c:1465 src/compose.c:3121 src/export.c:185 src/foldersel.c:176
+#: src/compose.c:1468 src/compose.c:3124 src/export.c:185 src/foldersel.c:176
 #: src/import.c:189 src/inputdialog.c:160 src/main.c:334 src/main.c:342
-#: src/mainwindow.c:1658 src/mimeview.c:709 src/passphrase.c:119
+#: src/mainwindow.c:1660 src/mimeview.c:716 src/passphrase.c:119
 #: src/prefs.c:467 src/prefs_common.c:1821 src/prefs_common.c:2065
 #: src/prefs_common.c:2181 src/prefs_customheader.c:162
-#: src/prefs_display_header.c:203 src/summaryview.c:2017
-#: src/summaryview.c:2528
+#: src/prefs_display_header.c:203 src/summaryview.c:2019
+#: src/summaryview.c:2530
 msgid "OK"
 msgstr "OK"
 
@@ -128,7 +128,7 @@ msgid "Edit accounts"
 msgstr "¥¢¥«¥¦¥ó¥È¤ÎÊÔ½¸"
 
 #: src/account.c:388 src/addressbook.c:318 src/addressbook.c:1289
-#: src/compose.c:2233 src/mimeview.c:139 src/select-keys.c:301
+#: src/compose.c:2236 src/mimeview.c:139 src/select-keys.c:301
 msgid "Name"
 msgstr "̾Á°"
 
@@ -180,21 +180,21 @@ msgid "Do you really want to delete this account?"
 msgstr "ËÜÅö¤Ë¤³¤Î¥¢¥«¥¦¥ó¥È¤òºï½ü¤·¤Æ¤â¤¤¤¤¤Ç¤¹¤«?"
 
 #: src/account.c:509 src/addressbook.c:579 src/addressbook.c:1224
-#: src/compose.c:3295 src/folderview.c:1427 src/folderview.c:1469
-#: src/folderview.c:1558 src/folderview.c:1598 src/folderview.c:1697
-#: src/folderview.c:1730 src/mainwindow.c:949 src/prefs_customheader.c:543
+#: src/compose.c:3298 src/folderview.c:1439 src/folderview.c:1481
+#: src/folderview.c:1570 src/folderview.c:1610 src/folderview.c:1709
+#: src/folderview.c:1742 src/mainwindow.c:950 src/prefs_customheader.c:543
 #: src/prefs_filter.c:721 src/summary_search.c:297 src/summaryview.c:574
-#: src/summaryview.c:814
+#: src/summaryview.c:816
 msgid "Yes"
 msgstr "¤Ï¤¤"
 
-#: src/account.c:509 src/compose.c:3295 src/folderview.c:1427
-#: src/folderview.c:1469 src/folderview.c:1558 src/folderview.c:1598
-#: src/folderview.c:1697 src/folderview.c:1730
+#: src/account.c:509 src/compose.c:3298 src/folderview.c:1439
+#: src/folderview.c:1481 src/folderview.c:1570 src/folderview.c:1610
+#: src/folderview.c:1709 src/folderview.c:1742
 msgid "+No"
 msgstr "+¤¤¤¤¤¨"
 
-#: src/addressbook.c:229 src/compose.c:374 src/mainwindow.c:333
+#: src/addressbook.c:229 src/compose.c:375 src/mainwindow.c:333
 msgid "/_File"
 msgstr "/¥Õ¥¡¥¤¥ë(_F)"
 
@@ -210,7 +210,7 @@ msgstr "/
 msgid "/_File/New _folder"
 msgstr "/¥Õ¥¡¥¤¥ë(_F)/¿·µ¬¥Õ¥©¥ë¥À(_F)"
 
-#: src/addressbook.c:233 src/addressbook.c:236 src/compose.c:378
+#: src/addressbook.c:233 src/addressbook.c:236 src/compose.c:379
 #: src/mainwindow.c:344 src/mainwindow.c:347
 msgid "/_File/---"
 msgstr "/¥Õ¥¡¥¤¥ë(_F)/---"
@@ -223,15 +223,15 @@ msgstr "/
 msgid "/_File/_Delete"
 msgstr "/¥Õ¥¡¥¤¥ë(_F)/ºï½ü(_D)"
 
-#: src/addressbook.c:237 src/compose.c:379 src/mainwindow.c:348
+#: src/addressbook.c:237 src/compose.c:380 src/mainwindow.c:348
 msgid "/_File/_Close"
 msgstr "/¥Õ¥¡¥¤¥ë(_F)/ÊĤ¸¤ë(_C)"
 
-#: src/addressbook.c:238 src/compose.c:418 src/mainwindow.c:520
+#: src/addressbook.c:238 src/compose.c:419 src/mainwindow.c:521
 msgid "/_Help"
 msgstr "/¥Ø¥ë¥×(_H)"
 
-#: src/addressbook.c:239 src/compose.c:419 src/mainwindow.c:525
+#: src/addressbook.c:239 src/compose.c:420 src/mainwindow.c:526
 msgid "/_Help/_About"
 msgstr "/¥Ø¥ë¥×(_H)/¤³¤Î¥×¥í¥°¥é¥à¤Ë¤Ä¤¤¤Æ(_A)"
 
@@ -247,15 +247,15 @@ msgstr "/
 msgid "/New _folder"
 msgstr "/¿·µ¬¥Õ¥©¥ë¥À(_F)"
 
-#: src/addressbook.c:247 src/addressbook.c:257 src/compose.c:368
+#: src/addressbook.c:247 src/addressbook.c:257 src/compose.c:369
 #: src/folderview.c:206 src/folderview.c:208 src/folderview.c:217
 #: src/folderview.c:219 src/folderview.c:228 src/folderview.c:230
-#: src/summaryview.c:300 src/summaryview.c:306 src/summaryview.c:311
-#: src/summaryview.c:314
+#: src/summaryview.c:300 src/summaryview.c:307 src/summaryview.c:312
+#: src/summaryview.c:315
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:248 src/addressbook.c:258 src/compose.c:381
+#: src/addressbook.c:248 src/addressbook.c:258 src/compose.c:382
 #: src/mainwindow.c:351
 msgid "/_Edit"
 msgstr "/ÊÔ½¸(_E)"
@@ -272,7 +272,7 @@ msgstr "
 msgid "Remarks"
 msgstr "È÷¹Í"
 
-#: src/addressbook.c:325 src/compose.c:2793
+#: src/addressbook.c:325 src/compose.c:2796
 msgid "Address book"
 msgstr "¥¢¥É¥ì¥¹Ä¢"
 
@@ -280,7 +280,7 @@ msgstr "
 msgid "Name:"
 msgstr "̾Á°:"
 
-#: src/addressbook.c:436 src/addressbook.c:1224 src/mainwindow.c:1403
+#: src/addressbook.c:436 src/addressbook.c:1224 src/mainwindow.c:1405
 #: src/prefs_display_header.c:293 src/prefs_display_header.c:349
 #: src/prefs_filter.c:398
 msgid "Delete"
@@ -318,21 +318,21 @@ msgstr "
 msgid "Really delete the address(es)?"
 msgstr "ËÜÅö¤Ë¤³¤Î¥¢¥É¥ì¥¹¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/addressbook.c:579 src/addressbook.c:1224 src/mainwindow.c:949
+#: src/addressbook.c:579 src/addressbook.c:1224 src/mainwindow.c:950
 #: src/prefs_customheader.c:543 src/prefs_filter.c:721
-#: src/summary_search.c:297 src/summaryview.c:574 src/summaryview.c:814
+#: src/summary_search.c:297 src/summaryview.c:574 src/summaryview.c:816
 msgid "No"
 msgstr "¤¤¤¤¤¨"
 
-#: src/addressbook.c:1000 src/folderview.c:1305 src/folderview.c:1498
+#: src/addressbook.c:1000 src/folderview.c:1317 src/folderview.c:1510
 msgid "New folder"
 msgstr "¿·µ¬¥Õ¥©¥ë¥À"
 
-#: src/addressbook.c:1001 src/folderview.c:1306 src/folderview.c:1499
+#: src/addressbook.c:1001 src/folderview.c:1318 src/folderview.c:1511
 msgid "Input the name of new folder:"
 msgstr "¿·µ¬¥Õ¥©¥ë¥À¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:"
 
-#: src/addressbook.c:1002 src/folderview.c:1307 src/folderview.c:1500
+#: src/addressbook.c:1002 src/folderview.c:1319 src/folderview.c:1512
 msgid "NewFolder"
 msgstr "NewFolder"
 
@@ -378,18 +378,18 @@ msgstr "
 msgid "Edit address"
 msgstr "¥¢¥É¥ì¥¹¤ÎÊÔ½¸"
 
-#: src/addressbook.c:1290 src/compose.c:2792 src/select-keys.c:302
+#: src/addressbook.c:1290 src/compose.c:2795 src/select-keys.c:302
 msgid "Address"
 msgstr "¥¢¥É¥ì¥¹"
 
-#: src/addressbook.c:1294 src/compose.c:1465 src/compose.c:3122
-#: src/compose.c:3692 src/export.c:186 src/foldersel.c:177 src/import.c:190
-#: src/inputdialog.c:161 src/main.c:334 src/main.c:342 src/mainwindow.c:1658
-#: src/mimeview.c:709 src/passphrase.c:123 src/prefs.c:468
+#: src/addressbook.c:1294 src/compose.c:1468 src/compose.c:3125
+#: src/compose.c:3695 src/export.c:186 src/foldersel.c:177 src/import.c:190
+#: src/inputdialog.c:161 src/main.c:334 src/main.c:342 src/mainwindow.c:1660
+#: src/mimeview.c:716 src/passphrase.c:123 src/prefs.c:468
 #: src/prefs_common.c:2182 src/prefs_customheader.c:163
 #: src/prefs_display_header.c:204 src/progressdialog.c:75
-#: src/select-keys.c:326 src/summaryview.c:574 src/summaryview.c:2017
-#: src/summaryview.c:2528
+#: src/select-keys.c:326 src/summaryview.c:574 src/summaryview.c:2019
+#: src/summaryview.c:2530
 msgid "Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
@@ -402,12 +402,12 @@ msgstr "
 msgid "%s doesn't exist.\n"
 msgstr "%s ¤Ï¸ºß¤·¤Þ¤»¤ó¡£\n"
 
-#: src/addressbook.c:1550 src/addressbook.c:1843 src/imap.c:664
-#: src/mainwindow.c:675 src/mainwindow.c:1286 src/mh.c:860 src/mh.c:867
-#: src/news.c:657 src/procmsg.c:257 src/procmsg.c:321 src/summaryview.c:995
-#: src/summaryview.c:1201 src/summaryview.c:1283 src/summaryview.c:1344
-#: src/summaryview.c:1801 src/summaryview.c:2279 src/summaryview.c:2302
-#: src/summaryview.c:2323 src/summaryview.c:2416
+#: src/addressbook.c:1550 src/addressbook.c:1843 src/imap.c:649
+#: src/mainwindow.c:676 src/mainwindow.c:1288 src/mh.c:844 src/mh.c:851
+#: src/news.c:661 src/procmsg.c:257 src/procmsg.c:321 src/summaryview.c:997
+#: src/summaryview.c:1203 src/summaryview.c:1285 src/summaryview.c:1346
+#: src/summaryview.c:1803 src/summaryview.c:2281 src/summaryview.c:2304
+#: src/summaryview.c:2325 src/summaryview.c:2418
 msgid "done.\n"
 msgstr "´°Î»¡£\n"
 
@@ -419,7 +419,7 @@ msgstr "
 msgid "failed to write addressbook data.\n"
 msgstr "¥¢¥É¥ì¥¹Ä¢¤Î¥Ç¡¼¥¿¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: src/alertpanel.c:119 src/compose.c:3295 src/main.c:332
+#: src/alertpanel.c:119 src/compose.c:3298 src/main.c:332
 msgid "Notice"
 msgstr "Ãí°Õ"
 
@@ -437,149 +437,149 @@ msgstr "
 
 #: src/alertpanel.c:269
 msgid "Show this message next time"
-msgstr ""
+msgstr "¼¡²ó¤â¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨"
 
 #: src/codeconv.c:76 src/codeconv.c:87
 msgid "can't allocate memory\n"
 msgstr "¥á¥â¥ê¤ò³ÎÊݤǤ­¤Þ¤»¤ó\n"
 
-#: src/compose.c:366
+#: src/compose.c:367
 msgid "/_Add..."
 msgstr "/ÄɲÃ(_A)..."
 
-#: src/compose.c:367
+#: src/compose.c:368
 msgid "/_Remove"
 msgstr "/ºï½ü(_R)"
 
-#: src/compose.c:369 src/folderview.c:209 src/folderview.c:220
+#: src/compose.c:370 src/folderview.c:209 src/folderview.c:220
 #: src/folderview.c:231
 msgid "/_Property..."
 msgstr "/¥×¥í¥Ñ¥Æ¥£(_P)..."
 
-#: src/compose.c:375
+#: src/compose.c:376
 msgid "/_File/_Attach file"
 msgstr "/¥Õ¥¡¥¤¥ë(_F)/¥Õ¥¡¥¤¥ë¤òźÉÕ(_A)"
 
-#: src/compose.c:376
+#: src/compose.c:377
 msgid "/_File/_Insert file"
 msgstr "/¥Õ¥¡¥¤¥ë(_F)/¥Õ¥¡¥¤¥ë¤òÁÞÆþ(_I)"
 
-#: src/compose.c:377
+#: src/compose.c:378
 msgid "/_File/Insert si_gnature"
 msgstr "/¥Õ¥¡¥¤¥ë(_F)/½ð̾¤òÁÞÆþ(_G)"
 
-#: src/compose.c:382
+#: src/compose.c:383
 msgid "/_Edit/_Undo"
 msgstr "/ÊÔ½¸(_E)/¸µ¤ËÌ᤹(_U)"
 
-#: src/compose.c:383
+#: src/compose.c:384
 msgid "/_Edit/_Redo"
 msgstr "/ÊÔ½¸(_E)/¤ä¤êľ¤·(_R)"
 
-#: src/compose.c:384 src/compose.c:389 src/mainwindow.c:354
+#: src/compose.c:385 src/compose.c:390 src/mainwindow.c:354
 msgid "/_Edit/---"
 msgstr "/ÊÔ½¸(_E)/---"
 
-#: src/compose.c:385
+#: src/compose.c:386
 msgid "/_Edit/Cu_t"
 msgstr "/ÊÔ½¸(_E)/¥«¥Ã¥È(_T)"
 
-#: src/compose.c:386 src/mainwindow.c:352
+#: src/compose.c:387 src/mainwindow.c:352
 msgid "/_Edit/_Copy"
 msgstr "/ÊÔ½¸(_E)/¥³¥Ô¡¼(_C)"
 
-#: src/compose.c:387
+#: src/compose.c:388
 msgid "/_Edit/_Paste"
 msgstr "/ÊÔ½¸(_E)/¥Ú¡¼¥¹¥È(_E)"
 
-#: src/compose.c:388 src/mainwindow.c:353
+#: src/compose.c:389 src/mainwindow.c:353
 msgid "/_Edit/Select _all"
 msgstr "/ÊÔ½¸(_E)/Á´¤ÆÁªÂò(_A)"
 
-#: src/compose.c:390
+#: src/compose.c:391
 msgid "/_Edit/Wrap long _lines"
 msgstr "/ÊÔ½¸(_E)/Ť¤¹Ô¤òÀÞ¤êÊÖ¤¹(_L)"
 
-#: src/compose.c:391
+#: src/compose.c:392
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/ÊÔ½¸(_E)/³°Éô¥¨¥Ç¥£¥¿¤ÇÊÔ½¸(_X)"
 
-#: src/compose.c:394 src/mainwindow.c:444
+#: src/compose.c:395 src/mainwindow.c:444
 msgid "/_Message"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)"
 
-#: src/compose.c:395
+#: src/compose.c:396
 msgid "/_Message/_Send"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/Á÷¿®(_S)"
 
-#: src/compose.c:397
+#: src/compose.c:398
 msgid "/_Message/Send _later"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¸å¤ÇÁ÷¿®(_L)"
 
-#: src/compose.c:399
+#: src/compose.c:400
 msgid "/_Message/Save to _draft folder"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/Áð¹Æ¥Õ¥©¥ë¥À¤ËÊݸ(_D)"
 
-#: src/compose.c:401 src/compose.c:406 src/compose.c:408 src/compose.c:411
-#: src/mainwindow.c:448 src/mainwindow.c:451 src/mainwindow.c:458
-#: src/mainwindow.c:469
+#: src/compose.c:402 src/compose.c:407 src/compose.c:409 src/compose.c:412
+#: src/mainwindow.c:448 src/mainwindow.c:451 src/mainwindow.c:459
+#: src/mainwindow.c:470
 msgid "/_Message/---"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/---"
 
-#: src/compose.c:402
+#: src/compose.c:403
 msgid "/_Message/_To"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/°¸Àè(_T)"
 
-#: src/compose.c:403
+#: src/compose.c:404
 msgid "/_Message/_Cc"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/_Cc"
 
-#: src/compose.c:404
+#: src/compose.c:405
 msgid "/_Message/_Bcc"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/_Bcc"
 
-#: src/compose.c:405
+#: src/compose.c:406
 msgid "/_Message/_Reply to"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/ÊÖ¿®Àè¤ò»ØÄê(_R)"
 
-#: src/compose.c:407
+#: src/compose.c:408
 msgid "/_Message/_Followup to"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¥Õ¥©¥í¡¼Àè¤ò»ØÄê(_F)"
 
-#: src/compose.c:409
+#: src/compose.c:410
 msgid "/_Message/_Attach"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/źÉÕ(_A)"
 
-#: src/compose.c:412
+#: src/compose.c:413
 msgid "/_Message/Si_gn"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/½ð̾(_G)"
 
-#: src/compose.c:413
+#: src/compose.c:414
 msgid "/_Message/_Encrypt"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/°Å¹æ²½(_E)"
 
-#: src/compose.c:415 src/mainwindow.c:501
+#: src/compose.c:416 src/mainwindow.c:502
 msgid "/_Tool"
 msgstr "/¥Ä¡¼¥ë(_T)"
 
-#: src/compose.c:416
+#: src/compose.c:417
 msgid "/_Tool/Show _ruler"
 msgstr "/¥Ä¡¼¥ë(_T)/¥ë¡¼¥é¤òɽ¼¨(_R)"
 
-#: src/compose.c:417 src/mainwindow.c:502
+#: src/compose.c:418 src/mainwindow.c:503
 msgid "/_Tool/_Address book"
 msgstr "/¥Ä¡¼¥ë(_T)/¥¢¥É¥ì¥¹Ä¢(_A)"
 
-#: src/compose.c:487 src/compose.c:557 src/compose.c:617 src/procmsg.c:675
+#: src/compose.c:489 src/compose.c:559 src/compose.c:619 src/procmsg.c:675
 msgid "Can't get text part\n"
 msgstr "¥Æ¥­¥¹¥È¥Ñ¡¼¥È¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/compose.c:549
+#: src/compose.c:551
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤»¤ó\n"
 
-#: src/compose.c:561
+#: src/compose.c:563
 msgid ""
 "\n"
 "\n"
@@ -591,49 +591,49 @@ msgstr ""
 "Begin forwarded message:\n"
 "\n"
 
-#: src/compose.c:1229
+#: src/compose.c:1232
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¸ºß¤·¤Þ¤»¤ó\n"
 
-#: src/compose.c:1233
+#: src/compose.c:1236
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥µ¥¤¥º¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/compose.c:1237
+#: src/compose.c:1240
 #, c-format
 msgid "File %s is empty\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¶õ¤Ç¤¹\n"
 
-#: src/compose.c:1258
+#: src/compose.c:1261
 #, c-format
 msgid "Message: %s"
 msgstr "¥á¥Ã¥»¡¼¥¸: %s"
 
-#: src/compose.c:1364
+#: src/compose.c:1367
 msgid " [Edited]"
 msgstr " [¹¹¿·]"
 
-#: src/compose.c:1366
+#: src/compose.c:1369
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - ¥á¥Ã¥»¡¼¥¸¤ÎºîÀ®%s"
 
-#: src/compose.c:1369
+#: src/compose.c:1372
 #, c-format
 msgid "Compose message%s"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÎºîÀ®%s"
 
-#: src/compose.c:1391 src/compose.c:3585
+#: src/compose.c:1394 src/compose.c:3588
 msgid "Recipient is not specified."
 msgstr "°¸À褬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: src/compose.c:1409
+#: src/compose.c:1412
 msgid "can't get recipient list."
 msgstr "Á÷¿®Àè¤Î¥ê¥¹¥È¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/compose.c:1427
+#: src/compose.c:1430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -641,16 +641,16 @@ msgstr ""
 "¥á¡¼¥ë¤òÁ÷¿®¤¹¤ë¤¿¤á¤Î¥¢¥«¥¦¥ó¥È¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "Á÷¿®¤¹¤ëÁ°¤Ë¥á¡¼¥ë¥¢¥«¥¦¥ó¥È¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/compose.c:1448
+#: src/compose.c:1451
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò %s ¤Ë¥Ý¥¹¥È¤¹¤ëÅÓÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
 
-#: src/compose.c:1462
+#: src/compose.c:1465
 msgid "Queueing"
 msgstr "Á÷¿®ÂÔµ¡"
 
-#: src/compose.c:1463
+#: src/compose.c:1466
 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"
@@ -658,172 +658,172 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¤ÎÁ÷¿®Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
 "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®ÂÔ¤Á¥Õ¥©¥ë¥À¤ËÆþ¤ì¤Þ¤¹¤«?"
 
-#: src/compose.c:1469 src/compose.c:3597
+#: src/compose.c:1472 src/compose.c:3600
 msgid "Can't queue the message."
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®ÂÔµ¡¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/compose.c:1472
+#: src/compose.c:1475
 msgid "Error occurred while sending the message."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÎÁ÷¿®Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
 
-#: src/compose.c:1479 src/compose.c:3604
+#: src/compose.c:1482 src/compose.c:3607
 msgid "Can't save the message to outbox."
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¹µ¤ËÊݸ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/compose.c:1505 src/compose.c:1626 src/compose.c:1712 src/utils.c:1444
+#: src/compose.c:1508 src/compose.c:1629 src/compose.c:1715 src/utils.c:1482
 msgid "can't change file mode\n"
 msgstr "¥Õ¥¡¥¤¥ë¥â¡¼¥É¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/compose.c:1531
+#: src/compose.c:1534
 msgid "Can't convert the codeset of the message."
 msgstr "¥á¥Ã¥»¡¼¥¸¤Îʸ»ú¥³¡¼¥É¥»¥Ã¥È¤òÊÑ´¹¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/compose.c:1540
+#: src/compose.c:1543
 msgid "can't write headers\n"
 msgstr "¥Ø¥Ã¥À¤ò½ñ¤­¹þ¤á¤Þ¤»¤ó¡£\n"
 
-#: src/compose.c:1658
+#: src/compose.c:1661
 msgid "saving sent message...\n"
 msgstr "Á÷¿®¤·¤¿¥á¥Ã¥»¡¼¥¸¤òÊݸ¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: src/compose.c:1663
+#: src/compose.c:1666
 msgid "can't save message\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÊݸ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/compose.c:1669 src/compose.c:1776
+#: src/compose.c:1672 src/compose.c:1779
 msgid "can't open mark file\n"
 msgstr "¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: src/compose.c:1692
+#: src/compose.c:1695
 msgid "queueing message...\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®ÂÔ¤Á¤ËÆþ¤ì¤Æ¤¤¤Þ¤¹...\n"
 
-#: src/compose.c:1767
+#: src/compose.c:1770
 msgid "can't queue the message\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®ÂÔµ¡¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/compose.c:1805
+#: src/compose.c:1808
 #, c-format
 msgid "Can't open file %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: src/compose.c:2159
+#: src/compose.c:2162
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "À¸À®¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸ID: %s\n"
 
-#: src/compose.c:2233 src/compose.c:3093
+#: src/compose.c:2236 src/compose.c:3096
 msgid "MIME type"
 msgstr "MIME ¥¿¥¤¥×"
 
-#: src/compose.c:2233 src/mimeview.c:139 src/prefs_common.c:2176
-#: src/select-keys.c:299 src/summaryview.c:361
+#: src/compose.c:2236 src/mimeview.c:139 src/prefs_common.c:2176
+#: src/select-keys.c:299 src/summaryview.c:362
 msgid "Size"
 msgstr "¥µ¥¤¥º"
 
-#: src/compose.c:2250
+#: src/compose.c:2253
 msgid "Creating compose window...\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ºîÀ®¥¦¥£¥ó¥É¥¦¤òºîÀ®Ãæ...\n"
 
-#: src/compose.c:2296 src/headerview.c:54 src/summary_search.c:145
+#: src/compose.c:2299 src/headerview.c:54 src/summary_search.c:145
 msgid "From:"
 msgstr "º¹½Ð¿Í:"
 
-#: src/compose.c:2719 src/mainwindow.c:1357 src/prefs_account.c:501
+#: src/compose.c:2722 src/mainwindow.c:1359 src/prefs_account.c:501
 #: src/prefs_common.c:636
 msgid "Send"
 msgstr "Á÷¿®"
 
-#: src/compose.c:2720
+#: src/compose.c:2723
 msgid "Send message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®"
 
-#: src/compose.c:2727
+#: src/compose.c:2730
 msgid "Send later"
 msgstr "¸å¤ÇÁ÷¿®"
 
-#: src/compose.c:2728
+#: src/compose.c:2731
 msgid "Put into queue folder and send later"
 msgstr "Á÷¿®ÂÔ¤Á¥Õ¥©¥ë¥À¤ËÆþ¤ì¤Æ¸å¤ÇÁ÷¿®"
 
-#: src/compose.c:2735 src/folderview.c:738
+#: src/compose.c:2738 src/folderview.c:738
 msgid "Draft"
 msgstr "Áð¹Æ"
 
-#: src/compose.c:2736
+#: src/compose.c:2739
 msgid "Save to draft folder"
 msgstr "Áð¹Æ¥Õ¥©¥ë¥À¤ËÊݸ"
 
-#: src/compose.c:2745
+#: src/compose.c:2748
 msgid "Insert"
 msgstr "ÁÞÆþ"
 
-#: src/compose.c:2746
+#: src/compose.c:2749
 msgid "Insert file"
 msgstr "¥Õ¥¡¥¤¥ë¤òÁÞÆþ"
 
-#: src/compose.c:2753
+#: src/compose.c:2756
 msgid "Attach"
 msgstr "źÉÕ"
 
-#: src/compose.c:2754
+#: src/compose.c:2757
 msgid "Attach file"
 msgstr "¥Õ¥¡¥¤¥ë¤òźÉÕ"
 
-#: src/compose.c:2763 src/prefs_common.c:1035
+#: src/compose.c:2766 src/prefs_common.c:1035
 msgid "Signature"
 msgstr "½ð̾"
 
-#: src/compose.c:2764
+#: src/compose.c:2767
 msgid "Insert signature"
 msgstr "½ð̾¤òÁÞÆþ"
 
-#: src/compose.c:2772
+#: src/compose.c:2775
 msgid "Editor"
 msgstr "¥¨¥Ç¥£¥¿"
 
-#: src/compose.c:2773
+#: src/compose.c:2776
 msgid "Edit with external editor"
 msgstr "³°Éô¥¨¥Ç¥£¥¿¤ÇÊÔ½¸"
 
-#: src/compose.c:2781
+#: src/compose.c:2784
 msgid "Linewrap"
 msgstr "¼«Æ°²þ¹Ô"
 
-#: src/compose.c:2782
+#: src/compose.c:2785
 msgid "Wrap long lines"
 msgstr "Ť¤¹Ô¤òÀÞ¤êÊÖ¤¹"
 
-#: src/compose.c:2989
+#: src/compose.c:2992
 msgid "Invalid MIME type."
 msgstr "̵¸ú¤Ê MIME ¥¿¥¤¥×¤Ç¤¹¡£"
 
-#: src/compose.c:3007
+#: src/compose.c:3010
 msgid "File doesn't exist or is empty."
 msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¤«¤Þ¤¿¤Ï¶õ¤Ç¤¹¡£"
 
-#: src/compose.c:3075
+#: src/compose.c:3078
 msgid "Property"
 msgstr "¥×¥í¥Ñ¥Æ¥£"
 
-#: src/compose.c:3095
+#: src/compose.c:3098
 msgid "Encoding"
 msgstr "¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°"
 
-#: src/compose.c:3118
+#: src/compose.c:3121
 msgid "Path"
 msgstr "¥Ñ¥¹"
 
-#: src/compose.c:3119
+#: src/compose.c:3122
 msgid "File name"
 msgstr "¥Õ¥¡¥¤¥ë̾"
 
-#: src/compose.c:3266
+#: src/compose.c:3269
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "³°Éô¥¨¥Ç¥£¥¿¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤¬Ìµ¸ú¤Ç¤¹: `%s'\n"
 
-#: src/compose.c:3292
+#: src/compose.c:3295
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -834,54 +834,54 @@ msgstr ""
 "¥×¥í¥»¥¹¤ò¶¯À©½ªÎ»¤·¤Þ¤¹¤«?\n"
 "¥×¥í¥»¥¹¥°¥ë¡¼¥×ID: %d"
 
-#: src/compose.c:3305
+#: src/compose.c:3308
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "½ªÎ»¤·¤¿¥×¥í¥»¥¹¥°¥ë¡¼¥×ID: %d"
 
-#: src/compose.c:3306
+#: src/compose.c:3309
 #, c-format
 msgid "Temporary file: %s"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë: %s"
 
-#: src/compose.c:3330
+#: src/compose.c:3333
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose: ´Æ»ë¥×¥í¥»¥¹¤«¤é¤ÎÆþÎÏ\n"
 
 #. failed
-#: src/compose.c:3363
+#: src/compose.c:3366
 msgid "Couldn't exec external editor\n"
 msgstr "³°Éô¥¨¥Ç¥£¥¿¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/compose.c:3367
+#: src/compose.c:3370
 msgid "Couldn't write to file\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó\n"
 
-#: src/compose.c:3369
+#: src/compose.c:3372
 msgid "Pipe read failed\n"
 msgstr "¥Ñ¥¤¥×¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ\n"
 
-#: src/compose.c:3626
+#: src/compose.c:3629
 msgid "can't remove the old draft message\n"
 msgstr "¸Å¤¤Áð¹Æ¥á¥Ã¥»¡¼¥¸¤òºï½ü¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/compose.c:3654 src/compose.c:3666
+#: src/compose.c:3657 src/compose.c:3669
 msgid "Select file"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
 
-#: src/compose.c:3690
+#: src/compose.c:3693
 msgid "Discard message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÎÇË´þ"
 
-#: src/compose.c:3691
+#: src/compose.c:3694
 msgid "This message has been modified. discard it?"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ÇË´þ¤·¤Þ¤¹¤«?"
 
-#: src/compose.c:3692
+#: src/compose.c:3695
 msgid "Discard"
 msgstr "ÇË´þ"
 
-#: src/compose.c:3692
+#: src/compose.c:3695
 msgid "to Draft"
 msgstr "Áð¹Æ¤Ø"
 
@@ -974,12 +974,12 @@ msgstr "
 msgid "Setting folder info..."
 msgstr "¥Õ¥©¥ë¥À¾ðÊó¤òÀßÄêÃæ..."
 
-#: src/folderview.c:539 src/mainwindow.c:2076 src/setup.c:81
+#: src/folderview.c:539 src/mainwindow.c:2084 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "¥Õ¥©¥ë¥À¤ò¥¹¥­¥ã¥óÃæ (%s%c%s) ..."
 
-#: src/folderview.c:544 src/mainwindow.c:2081 src/setup.c:86
+#: src/folderview.c:544 src/mainwindow.c:2089 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "¥Õ¥©¥ë¥À¤ò¥¹¥­¥ã¥óÃæ (%s)..."
@@ -1004,31 +1004,31 @@ msgstr "
 msgid "Trash"
 msgstr "¤´¤ßÈ¢"
 
-#: src/folderview.c:1209
+#: src/folderview.c:1210
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "¥Õ¥©¥ë¥À %s ¤¬ÁªÂò¤µ¤ì¤Þ¤·¤¿\n"
 
-#: src/folderview.c:1311 src/folderview.c:1369 src/folderview.c:1504
+#: src/folderview.c:1323 src/folderview.c:1381 src/folderview.c:1516
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "¥Õ¥©¥ë¥À̾¤Ë `%c' ¤ò´Þ¤à¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/folderview.c:1319 src/folderview.c:1378 src/folderview.c:1512
+#: src/folderview.c:1331 src/folderview.c:1390 src/folderview.c:1524
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "¥Õ¥©¥ë¥À `%s' ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹¡£"
 
-#: src/folderview.c:1361
+#: src/folderview.c:1373
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' ¤Î¿·¤·¤¤Ì¾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:"
 
-#: src/folderview.c:1363
+#: src/folderview.c:1375
 msgid "Rename folder"
 msgstr "¥Õ¥©¥ë¥À̾¤ÎÊѹ¹"
 
-#: src/folderview.c:1423
+#: src/folderview.c:1435
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1037,16 +1037,16 @@ msgstr ""
 "`%s' °Ê²¼¤Î¥Õ¥©¥ë¥À¤È¥á¥Ã¥»¡¼¥¸¤ÏÁ´¤Æºï½ü¤µ¤ì¤Þ¤¹¡£\n"
 "ËÜÅö¤Ëºï½ü¤·¤Æ¤â¤¤¤¤¤Ç¤¹¤«?"
 
-#: src/folderview.c:1426 src/folderview.c:1557
+#: src/folderview.c:1438 src/folderview.c:1569
 msgid "Delete folder"
 msgstr "¥Õ¥©¥ë¥À¤Îºï½ü"
 
-#: src/folderview.c:1432 src/folderview.c:1563
+#: src/folderview.c:1444 src/folderview.c:1575
 #, c-format
 msgid "can't remove folder `%s'\n"
 msgstr "¥Õ¥©¥ë¥À `%s' ¤òºï½ü¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/folderview.c:1465
+#: src/folderview.c:1477
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1055,52 +1055,52 @@ msgstr ""
 "ËÜÅö¤Ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ `%s' ¤òºï½ü¤·¤Þ¤¹¤«?\n"
 "(¥á¥Ã¥»¡¼¥¸¤Ï¥Ç¥£¥¹¥¯¤«¤é¤Ïºï½ü¤µ¤ì¤Þ¤»¤ó)"
 
-#: src/folderview.c:1468
+#: src/folderview.c:1480
 msgid "Remove folder"
 msgstr "¥Õ¥©¥ë¥À¤Îºï½ü"
 
-#: src/folderview.c:1555
+#: src/folderview.c:1567
 #, c-format
 msgid "Really delete folder `%s'?"
 msgstr "ËÜÅö¤Ë¥Õ¥©¥ë¥À `%s' ¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/folderview.c:1595
+#: src/folderview.c:1607
 #, c-format
 msgid "Really delete IMAP4 server `%s'?"
 msgstr "ËÜÅö¤ËIMAP4¥µ¡¼¥Ð `%s' ¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/folderview.c:1597
+#: src/folderview.c:1609
 msgid "Delete IMAP4 server"
 msgstr "IMAP4¥µ¡¼¥Ð¤Îºï½ü"
 
-#: src/folderview.c:1638
+#: src/folderview.c:1650
 msgid "Subscribe newsgroup"
 msgstr "¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤Î¹ØÆÉ"
 
-#: src/folderview.c:1639
+#: src/folderview.c:1651
 msgid "Input subscribing newsgroup:"
 msgstr "¹ØÆɤ¹¤ë¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:"
 
-#: src/folderview.c:1648
+#: src/folderview.c:1660
 #, c-format
 msgid "The newsgroup `%s' already exists."
 msgstr "¥Ë¥å¡¼¥¹¥°¥ë¡¼¥× `%s' ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹¡£"
 
-#: src/folderview.c:1694
+#: src/folderview.c:1706
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "ËÜÅö¤Ë¥Ë¥å¡¼¥¹¥°¥ë¡¼¥× `%s' ¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/folderview.c:1696
+#: src/folderview.c:1708
 msgid "Delete newsgroup"
 msgstr "¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤Îºï½ü"
 
-#: src/folderview.c:1727
+#: src/folderview.c:1739
 #, c-format
 msgid "Really delete news server `%s'?"
 msgstr "ËÜÅö¤Ë¥Ë¥å¡¼¥¹¥µ¡¼¥Ð `%s' ¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1741
 msgid "Delete news server"
 msgstr "¥Ë¥å¡¼¥¹¥µ¡¼¥Ð¤Îºï½ü"
 
@@ -1120,11 +1120,11 @@ msgstr "
 msgid "Creating header view...\n"
 msgstr "¥Ø¥Ã¥À¥Ó¥å¡¼¤òºîÀ®Ãæ...\n"
 
-#: src/headerview.c:174 src/summaryview.c:1384
+#: src/headerview.c:174 src/summaryview.c:1386
 msgid "(No From)"
 msgstr "(º¹½Ð¿ÍÉÔÌÀ)"
 
-#: src/headerview.c:189 src/summaryview.c:1400
+#: src/headerview.c:189 src/summaryview.c:1402
 msgid "(No Subject)"
 msgstr "(·ï̾¤Ê¤·)"
 
@@ -1154,110 +1154,110 @@ msgstr "
 msgid "Can't load the image."
 msgstr "²èÁü¤òÆɤ߹þ¤á¤Þ¤»¤ó¡£"
 
-#: src/imap.c:145
+#: src/imap.c:150
 #, c-format
 msgid "IMAP4 connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d ¤Ø¤ÎIMAP4¤ÎÀܳ¤¬ÀÚ¤ì¤Æ¤¤¤Þ¤¹¡£ºÆÀܳ¤·¤Þ¤¹...\n"
 
-#: src/imap.c:168
+#: src/imap.c:172
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d ¤Ø¤ÎIMAP4¤ÎÀܳ¤ò³ÎΩÃæ...\n"
 
-#: src/imap.c:236 src/imap.c:424 src/imap.c:460
+#: src/imap.c:245 src/imap.c:431 src/imap.c:467
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "¥Õ¥©¥ë¥À %s ¤òÁªÂò¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/imap.c:309
+#: src/imap.c:316
 #, c-format
 msgid "message %d has been already cached.\n"
 msgstr "%d È֤Υá¥Ã¥»¡¼¥¸¤Ï¤¹¤Ç¤Ë¥­¥ã¥Ã¥·¥å¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/imap.c:318
+#: src/imap.c:325
 #, c-format
 msgid "getting message %d...\n"
 msgstr "%d È֤Υá¥Ã¥»¡¼¥¸¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: src/imap.c:324 src/procmsg.c:575
+#: src/imap.c:331 src/procmsg.c:575
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò¼è¤ê¹þ¤á¤Þ¤»¤ó\n"
 
-#: src/imap.c:345 src/imap.c:386 src/mh.c:188 src/mh.c:282 src/mh.c:353
+#: src/imap.c:352 src/imap.c:393 src/mh.c:188 src/mh.c:282 src/mh.c:353
 #: src/mh.c:437
 msgid "the src folder is identical to the dest.\n"
 msgstr "°ÜÆ°¸µ¥Õ¥©¥ë¥À¤¬°ÜÆ°Àè¤ÈƱ°ì¤Ç¤¹¡£\n"
 
-#: src/imap.c:355 src/imap.c:395 src/mh.c:201 src/mh.c:285
+#: src/imap.c:362 src/imap.c:402 src/mh.c:201 src/mh.c:285
 #, c-format
 msgid "Moving message %s%c%d to %s ...\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %s%c%d ¤ò %s ¤Ë°ÜÆ°¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: src/imap.c:431
+#: src/imap.c:438
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "deleted ¥Õ¥é¥°¤ò¥»¥Ã¥È¤Ç¤­¤Þ¤»¤ó: %d\n"
 
-#: src/imap.c:437 src/imap.c:473
+#: src/imap.c:444 src/imap.c:480
 msgid "can't expunge\n"
 msgstr "expunge ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/imap.c:467
+#: src/imap.c:474
 #, c-format
 msgid "can't set deleted flags: 1:%d\n"
 msgstr "deleted ¥Õ¥é¥°¤ò¥»¥Ã¥È¤Ç¤­¤Þ¤»¤ó: 1:%d\n"
 
-#: src/imap.c:512
+#: src/imap.c:519
 msgid "can't create mailbox\n"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºîÀ®¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/imap.c:541
+#: src/imap.c:548
 msgid "can't delete mailbox\n"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºï½ü¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/imap.c:567
+#: src/imap.c:574
 msgid "can't get envelope\n"
 msgstr "¥¨¥ó¥Ù¥í¡¼¥×¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/imap.c:573
+#: src/imap.c:580
 msgid "error occurred while getting envelope.\n"
 msgstr "¥¨¥ó¥Ù¥í¡¼¥×¤ò¼èÆÀÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
 
-#: src/imap.c:581
+#: src/imap.c:588
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "¥¨¥ó¥Ù¥í¡¼¥×¤ò²òÀϤǤ­¤Þ¤»¤ó: %s\n"
 
-#: src/imap.c:611
+#: src/imap.c:618
 #, c-format
 msgid "deleting message %d...\n"
 msgstr "%d È֤Υá¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: src/imap.c:646
+#: src/imap.c:643
 msgid "\tDeleting all cached messages... "
 msgstr "\tÁ´¤Æ¤Î¥­¥ã¥Ã¥·¥å¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Æ¤¤¤Þ¤¹... "
 
-#: src/imap.c:673
+#: src/imap.c:657
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4¥µ¡¼¥Ð: %s:%d ¤ËÀܳ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/imap.c:696
+#: src/imap.c:680
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4¤Î¥í¥°¥¤¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: src/imap.c:849
+#: src/imap.c:833
 #, c-format
 msgid "can't copy %d to %s\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò %s ¤Ë¥³¥Ô¡¼¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/imap.c:1156
+#: src/imap.c:1140
 #, c-format
 msgid "error while imap command: STORE %d:%d %s\n"
 msgstr "imap ¥³¥Þ¥ó¥ÉÃæ¤Î¥¨¥é¡¼: STORE %d:%d %s\n"
 
-#: src/imap.c:1204
+#: src/imap.c:1188
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap ¥³¥Þ¥ó¥ÉÃæ¤Î¥¨¥é¡¼: EXPUNGE\n"
 
@@ -1289,12 +1289,12 @@ msgstr "
 msgid "Retrieving new messages"
 msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¤ò¼õ¿®Ãæ"
 
-#: src/inc.c:384 src/news.c:126
+#: src/inc.c:384 src/news.c:128
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "%s (%s) ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:"
 
-#: src/inc.c:388 src/news.c:128
+#: src/inc.c:388 src/news.c:130
 msgid "Input password"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎÏ"
 
@@ -1683,245 +1683,249 @@ msgid "/_Message/_Reply"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/ÊÖ¿®(_R)"
 
 #: src/mainwindow.c:454
+msgid "/_Message/Repl_y to sender"
+msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/º¹½Ð¿Í¤ËÊÖ¿®(_Y)"
+
+#: src/mainwindow.c:455
 msgid "/_Message/Reply to a_ll"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/Á´°÷¤ËÊÖ¿®(_L)"
 
-#: src/mainwindow.c:455
+#: src/mainwindow.c:456
 msgid "/_Message/_Forward"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/žÁ÷(_F)"
 
-#: src/mainwindow.c:456
+#: src/mainwindow.c:457
 msgid "/_Message/Forward as an a_ttachment"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/źÉդȤ·¤ÆžÁ÷(_T)"
 
-#: src/mainwindow.c:459
+#: src/mainwindow.c:460
 msgid "/_Message/M_ove..."
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/°ÜÆ°(_O)..."
 
-#: src/mainwindow.c:460
+#: src/mainwindow.c:461
 msgid "/_Message/_Copy..."
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¥³¥Ô¡¼(_C)..."
 
-#: src/mainwindow.c:461
+#: src/mainwindow.c:462
 msgid "/_Message/_Delete"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/ºï½ü(_D)"
 
-#: src/mainwindow.c:462
+#: src/mainwindow.c:463
 msgid "/_Message/_Mark"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¥Þ¡¼¥¯(_M)"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:464
 msgid "/_Message/_Mark/_Mark"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¥Þ¡¼¥¯(_M)/¥Þ¡¼¥¯(_M)"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:465
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¥Þ¡¼¥¯(_M)/¥Þ¡¼¥¯²ò½ü(_U)"
 
-#: src/mainwindow.c:465
+#: src/mainwindow.c:466
 msgid "/_Message/_Mark/---"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¥Þ¡¼¥¯(_M)/---"
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:467
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¥Þ¡¼¥¯(_M)/̤ÆɤȤ·¤Æ¥Þ¡¼¥¯(_E)"
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:468
 msgid "/_Message/_Mark/Mark it as _being read"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¥Þ¡¼¥¯(_M)/Æɤó¤À¤³¤È¤Ë¤¹¤ë(_B)"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:471
 msgid "/_Message/Open in new _window"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¿·¤·¤¤¥¦¥£¥ó¥É¥¦¤Ç³«¤¯(_W)"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:472
 msgid "/_Message/View _source"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/¥½¡¼¥¹¤òɽ¼¨(_S)"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:473
 msgid "/_Message/Show all _header"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/Á´¤Æ¤Î¥Ø¥Ã¥À¤òɽ¼¨(_H)"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:474
 msgid "/_Message/Re_edit"
 msgstr "/¥á¥Ã¥»¡¼¥¸(_M)/ºÆÊÔ½¸(_E)"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:476
 msgid "/_Summary"
 msgstr "/¥µ¥Þ¥ê(_S)"
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:477
 msgid "/_Summary/_Delete duplicated messages"
 msgstr "/¥µ¥Þ¥ê(_S)/½ÅÊ£¥á¥Ã¥»¡¼¥¸¤òºï½ü(_D)"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:479
 msgid "/_Summary/_Filter messages"
 msgstr "/¥µ¥Þ¥ê(_S)/¥á¥Ã¥»¡¼¥¸¤ò¿¶¤êʬ¤±¤ë(_F)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:480
 msgid "/_Summary/E_xecute"
 msgstr "/¥µ¥Þ¥ê(_S)/¼Â¹Ô(_X)"
 
-#: src/mainwindow.c:480
+#: src/mainwindow.c:481
 msgid "/_Summary/_Update"
 msgstr "/¥µ¥Þ¥ê(_S)/ºÇ¿·¤Î¾õÂ֤˹¹¿·(_U)"
 
-#: src/mainwindow.c:481 src/mainwindow.c:485 src/mainwindow.c:487
+#: src/mainwindow.c:482 src/mainwindow.c:486 src/mainwindow.c:488
 msgid "/_Summary/---"
 msgstr "/¥µ¥Þ¥ê(_S)/---"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:483
 msgid "/_Summary/_Prev message"
 msgstr "/¥µ¥Þ¥ê(_S)/Á°¤Î¥á¥Ã¥»¡¼¥¸(_P)"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:484
 msgid "/_Summary/_Next message"
 msgstr "/¥µ¥Þ¥ê(_S)/¼¡¤Î¥á¥Ã¥»¡¼¥¸(_N)"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:485
 msgid "/_Summary/N_ext unread message"
 msgstr "/¥µ¥Þ¥ê(_S)/¼¡¤Î̤ÆÉ¥á¥Ã¥»¡¼¥¸(_E)"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:487
 msgid "/_Summary/_Go to other folder"
 msgstr "/¥µ¥Þ¥ê(_S)/Ê̤Υե©¥ë¥À¤Ë°ÜÆ°(_G)"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:489
 msgid "/_Summary/_Sort"
 msgstr "/¥µ¥Þ¥ê(_S)/¥½¡¼¥È(_S)"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:490
 msgid "/_Summary/_Sort/Sort by _number"
 msgstr "/¥µ¥Þ¥ê(_S)/¥½¡¼¥È(_S)/ÈÖ¹æ¤Ç¥½¡¼¥È(_N)"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:491
 msgid "/_Summary/_Sort/Sort by s_ize"
 msgstr "/¥µ¥Þ¥ê(_S)/¥½¡¼¥È(_S)/¥µ¥¤¥º¤Ç¥½¡¼¥È(_I)"
 
-#: src/mainwindow.c:491
+#: src/mainwindow.c:492
 msgid "/_Summary/_Sort/Sort by _date"
 msgstr "/¥µ¥Þ¥ê(_S)/¥½¡¼¥È(_S)/ÆüÉդǥ½¡¼¥È(_D)"
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:493
 msgid "/_Summary/_Sort/Sort by _from"
 msgstr "/¥µ¥Þ¥ê(_S)/¥½¡¼¥È(_S)/º¹½Ð¿Í¤Ç¥½¡¼¥È(_F)"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:494
 msgid "/_Summary/_Sort/Sort by _subject"
 msgstr "/¥µ¥Þ¥ê(_S)/¥½¡¼¥È(_S)/·ï̾¤Ç¥½¡¼¥È(_S)"
 
-#: src/mainwindow.c:494
+#: src/mainwindow.c:495
 msgid "/_Summary/_Sort/---"
 msgstr "/¥µ¥Þ¥ê(_S)/¥½¡¼¥È(_S)/---"
 
-#: src/mainwindow.c:495
+#: src/mainwindow.c:496
 msgid "/_Summary/_Sort/_Attract by subject"
 msgstr "/¥µ¥Þ¥ê(_S)/¥½¡¼¥È(_S)/·ï̾¤Ç´ó¤»¤ë(_A)"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:498
 msgid "/_Summary/_Thread view"
 msgstr "/¥µ¥Þ¥ê(_S)/¥¹¥ì¥Ã¥Éɽ¼¨(_T)"
 
-#: src/mainwindow.c:498
+#: src/mainwindow.c:499
 msgid "/_Summary/Unt_hread view"
 msgstr "/¥µ¥Þ¥ê(_S)/¥¹¥ì¥Ã¥É²ò½ü(_H)"
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:500
 msgid "/_Summary/Set display _item..."
 msgstr "/¥µ¥Þ¥ê(_S)/ɽ¼¨¹àÌܤÎÀßÄê(_I)..."
 
-#: src/mainwindow.c:503
+#: src/mainwindow.c:504
 msgid "/_Tool/_Log window"
 msgstr "/¥Ä¡¼¥ë(_T)/¥í¥°¥¦¥£¥ó¥É¥¦(_L)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:506
 msgid "/_Configuration"
 msgstr "/ÀßÄê(_C)"
 
-#: src/mainwindow.c:506
+#: src/mainwindow.c:507
 msgid "/_Configuration/_Common preferences..."
 msgstr "/ÀßÄê(_C)/Á´È̤ÎÀßÄê(_C)..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:509
 msgid "/_Configuration/_Filter setting..."
 msgstr "/ÀßÄê(_C)/¿¶¤êʬ¤±¤ÎÀßÄê(_F)..."
 
-#: src/mainwindow.c:510
+#: src/mainwindow.c:511
 msgid "/_Configuration/_Preferences per account..."
 msgstr "/ÀßÄê(_C)/¥¢¥«¥¦¥ó¥ÈËè¤ÎÀßÄê(_P)..."
 
-#: src/mainwindow.c:512
+#: src/mainwindow.c:513
 msgid "/_Configuration/---"
 msgstr "/ÀßÄê(_C)/---"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:514
 msgid "/_Configuration/Create _new account..."
 msgstr "/ÀßÄê(_C)/¿·µ¬¥¢¥«¥¦¥ó¥È¤ÎºîÀ®(_N)..."
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:516
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/ÀßÄê(_C)/¥¢¥«¥¦¥ó¥È¤ÎÊÔ½¸(_E)..."
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:518
 msgid "/_Configuration/C_hange current account"
 msgstr "/ÀßÄê(_C)/¸½ºß¤Î¥¢¥«¥¦¥ó¥È¤òÊѹ¹(_H)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:522
 msgid "/_Help/_Manual"
 msgstr "/¥Ø¥ë¥×(_H)/¥Þ¥Ë¥å¥¢¥ë(_M)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:523
 msgid "/_Help/_Manual/_English"
 msgstr "/¥Ø¥ë¥×(_H)/¥Þ¥Ë¥å¥¢¥ë(_M)/±Ñ¸ì(_E)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:524
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/¥Ø¥ë¥×(_H)/¥Þ¥Ë¥å¥¢¥ë(_M)/ÆüËܸì(_J)"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:525
 msgid "/_Help/---"
 msgstr "/¥Ø¥ë¥×(_H)/---"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:554
 msgid "Creating main window...\n"
 msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤òºîÀ®Ãæ...\n"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:673
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: ¿§¤Î³ä¤êÅö¤Æ %d ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: src/mainwindow.c:821 src/mainwindow.c:838
+#: src/mainwindow.c:822 src/mainwindow.c:839
 msgid "Untitled"
 msgstr "̾¾Î̤ÀßÄê"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:840
 msgid "none"
 msgstr "¤Ê¤·"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:849
 #, c-format
 msgid "Current account: %s"
 msgstr "¸½ºß¤Î¥¢¥«¥¦¥ó¥È: %s"
 
-#: src/mainwindow.c:939
+#: src/mainwindow.c:940
 #, c-format
 msgid "window position: x = %d, y = %d\n"
 msgstr "¥¦¥£¥ó¥É¥¦¤Î°ÌÃÖ: x = %d, y = %d\n"
 
-#: src/mainwindow.c:947
+#: src/mainwindow.c:948
 msgid "Empty trash"
 msgstr "¤´¤ßÈ¢¤ò¶õ¤Ë¤¹¤ë"
 
-#: src/mainwindow.c:948
+#: src/mainwindow.c:949
 msgid "Empty all messages in trash?"
 msgstr "¤´¤ßÈ¢¤ÎÃæ¤Î¥á¥Ã¥»¡¼¥¸¤òÁ´¤Æºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/mainwindow.c:976
+#: src/mainwindow.c:977
 msgid "Add mailbox"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òÄɲÃ"
 
-#: src/mainwindow.c:977
+#: src/mainwindow.c:978
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -1930,16 +1934,16 @@ msgstr ""
 "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î°ÌÃÖ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "¸ºß¤¹¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò»ØÄꤹ¤ë¤È¼«Æ°Åª¤Ë¥¹¥­¥ã¥ó¤·¤Þ¤¹¡£"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:984
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ `%s' ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹¡£"
 
-#: src/mainwindow.c:988 src/setup.c:57
+#: src/mainwindow.c:989 src/setup.c:57
 msgid "Mailbox"
 msgstr "¥á¡¼¥ëÈ¢"
 
-#: src/mainwindow.c:994 src/setup.c:63
+#: src/mainwindow.c:995 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -1948,111 +1952,111 @@ msgstr ""
 "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 "¤¤¤¯¤Ä¤«¤Î¥Õ¥¡¥¤¥ë¤¬¤¹¤Ç¤Ë¸ºß¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï½ñ¤­¹þ¤à¸¢¸Â¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: src/mainwindow.c:1139
+#: src/mainwindow.c:1141
 msgid "Setting widgets..."
 msgstr "¥¦¥£¥¸¥§¥Ã¥È¤ò¥»¥Ã¥È¤·¤Æ¤¤¤Þ¤¹..."
 
-#: src/mainwindow.c:1340
+#: src/mainwindow.c:1342
 msgid "Get"
 msgstr "¼õ¿®"
 
-#: src/mainwindow.c:1341
+#: src/mainwindow.c:1343
 msgid "Incorporate new mail"
 msgstr "¿·Ãå¥á¡¼¥ë¤Î¼è¹þ"
 
-#: src/mainwindow.c:1346
+#: src/mainwindow.c:1348
 msgid "Get all"
 msgstr "Á´¼õ¿®"
 
-#: src/mainwindow.c:1347
+#: src/mainwindow.c:1349
 msgid "Incorporate new mail of all accounts"
 msgstr "Á´¥¢¥«¥¦¥ó¥È¤Î¿·Ãå¥á¡¼¥ë¤Î¼è¹þ"
 
-#: src/mainwindow.c:1358
+#: src/mainwindow.c:1360
 msgid "Send queued message(s)"
 msgstr "Á÷¿®ÂÔµ¡Ãæ¤Î¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤¹¤ë"
 
-#: src/mainwindow.c:1368 src/prefs_account.c:503 src/prefs_common.c:638
+#: src/mainwindow.c:1370 src/prefs_account.c:503 src/prefs_common.c:638
 msgid "Compose"
 msgstr "ºîÀ®"
 
-#: src/mainwindow.c:1369
+#: src/mainwindow.c:1371
 msgid "Compose new message"
 msgstr "¿·µ¬¥á¥Ã¥»¡¼¥¸¤ÎºîÀ®"
 
-#: src/mainwindow.c:1376
+#: src/mainwindow.c:1378
 msgid "Reply"
 msgstr "ÊÖ¿®"
 
-#: src/mainwindow.c:1377
+#: src/mainwindow.c:1379
 msgid "Reply to the message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ËÊÖ¿®¤¹¤ë"
 
-#: src/mainwindow.c:1384
+#: src/mainwindow.c:1386
 msgid "Reply all"
 msgstr "Á´°÷¤ËÊÖ¿®"
 
-#: src/mainwindow.c:1385
+#: src/mainwindow.c:1387
 msgid "Reply to all"
 msgstr "Á´°÷¤ËÊÖ¿®"
 
-#: src/mainwindow.c:1392
+#: src/mainwindow.c:1394
 msgid "Forward"
 msgstr "žÁ÷"
 
-#: src/mainwindow.c:1393
+#: src/mainwindow.c:1395
 msgid "Forward the message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òžÁ÷¤¹¤ë"
 
-#: src/mainwindow.c:1404
+#: src/mainwindow.c:1406
 msgid "Delete the message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òºï½ü¤¹¤ë"
 
-#: src/mainwindow.c:1412
+#: src/mainwindow.c:1414
 msgid "Execute"
 msgstr "¼Â¹Ô"
 
-#: src/mainwindow.c:1413
+#: src/mainwindow.c:1415
 msgid "Execute marked process"
 msgstr "¥Þ¡¼¥¯¤µ¤ì¤¿½èÍý¤ò¼Â¹Ô"
 
-#: src/mainwindow.c:1421
+#: src/mainwindow.c:1423
 msgid "Next"
 msgstr "¼¡"
 
-#: src/mainwindow.c:1422
+#: src/mainwindow.c:1424
 msgid "Next unread message"
 msgstr "¼¡¤Î̤ÆÉ¥á¥Ã¥»¡¼¥¸"
 
-#: src/mainwindow.c:1432
+#: src/mainwindow.c:1434
 msgid "Prefs"
 msgstr "ÀßÄê"
 
-#: src/mainwindow.c:1433
+#: src/mainwindow.c:1435
 msgid "Common preference"
 msgstr "Á´È̤ÎÀßÄê"
 
-#: src/mainwindow.c:1440 src/progressdialog.c:50
+#: src/mainwindow.c:1442 src/progressdialog.c:50
 msgid "Account"
 msgstr "¥¢¥«¥¦¥ó¥È"
 
-#: src/mainwindow.c:1441
+#: src/mainwindow.c:1443
 msgid "Account setting"
 msgstr "¥¢¥«¥¦¥ó¥È¤ÎÀßÄê"
 
-#: src/mainwindow.c:1657 src/summaryview.c:2527
+#: src/mainwindow.c:1659 src/summaryview.c:2529
 msgid "Exit"
 msgstr "½ªÎ»"
 
-#: src/mainwindow.c:1657 src/summaryview.c:2527
+#: src/mainwindow.c:1659 src/summaryview.c:2529
 msgid "Exit this program?"
 msgstr "¤³¤Î¥×¥í¥°¥é¥à¤ò½ªÎ»¤·¤Þ¤¹¤«?"
 
-#: src/mainwindow.c:1791
+#: src/mainwindow.c:1793
 msgid "Sending queued message failed."
 msgstr "Á÷¿®ÂÔµ¡Ãæ¤Î¥á¥Ã¥»¡¼¥¸¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: src/mainwindow.c:1908
+#: src/mainwindow.c:1916
 #, c-format
 msgid "forced charset: %s\n"
 msgstr "¶¯À©»ØÄꥭ¥ã¥é¥¯¥¿¥»¥Ã¥È: %s\n"
@@ -2162,21 +2166,21 @@ msgstr "%s 
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %s%c%d ¤ò %s ¤Ë¥³¥Ô¡¼¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: src/mh.c:604
+#: src/mh.c:588
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s Æâ¤ÎºÇ¸å¤ÎÈÖ¹æ = %d\n"
 
-#: src/mh.c:803
+#: src/mh.c:787
 msgid "\tSearching uncached messages... "
 msgstr "\t¥­¥ã¥Ã¥·¥å¤µ¤ì¤Æ¤¤¤Ê¤¤¥á¥Ã¥»¡¼¥¸¤ò¸¡º÷Ãæ... "
 
-#: src/mh.c:858
+#: src/mh.c:842
 #, c-format
 msgid "%d uncached message(s) found.\n"
 msgstr "%d Ä̤Υ­¥ã¥Ã¥·¥å¤µ¤ì¤Æ¤¤¤Ê¤¤¥á¥Ã¥»¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿¡£\n"
 
-#: src/mh.c:864
+#: src/mh.c:848
 msgid "\tSorting uncached messages in numerical order... "
 msgstr "\t¥­¥ã¥Ã¥·¥å¤µ¤ì¤Æ¤¤¤Ê¤¤¥á¥Ã¥»¡¼¥¸¤òÈÖ¹æ½ç¤Ë¥½¡¼¥È¤·¤Æ¤¤¤Þ¤¹... "
 
@@ -2186,13 +2190,13 @@ msgstr "/
 
 #: src/mimeview.c:114
 msgid "/Open _with..."
-msgstr "/¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é³«¤¯(W)..."
+msgstr "/¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é³«¤¯(_W)..."
 
 #: src/mimeview.c:115
 msgid "/_Display as text"
 msgstr "/¥Æ¥­¥¹¥È¤È¤·¤Æɽ¼¨(_D)"
 
-#: src/mimeview.c:116 src/summaryview.c:312
+#: src/mimeview.c:116 src/summaryview.c:313
 msgid "/_Save as..."
 msgstr "/̾Á°¤òÉÕ¤±¤ÆÊݸ(_S)..."
 
@@ -2216,27 +2220,27 @@ msgstr "
 msgid "Can't get the part of multipart message."
 msgstr "¥Þ¥ë¥Á¥Ñ¡¼¥È¥á¥Ã¥»¡¼¥¸¤Î¥Ñ¡¼¥È¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/mimeview.c:667 src/mimeview.c:715 src/mimeview.c:734 src/mimeview.c:757
+#: src/mimeview.c:674 src/mimeview.c:722 src/mimeview.c:741 src/mimeview.c:764
 msgid "Can't save the part of multipart message."
 msgstr "¥Þ¥ë¥Á¥Ñ¡¼¥È¥á¥Ã¥»¡¼¥¸¤Î¥Ñ¡¼¥È¤òÊݸ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/mimeview.c:701 src/summaryview.c:2010
+#: src/mimeview.c:708 src/summaryview.c:2012
 msgid "Save as"
 msgstr "̾Á°¤òÉÕ¤±¤ÆÊݸ"
 
-#: src/mimeview.c:707 src/summaryview.c:2015
+#: src/mimeview.c:714 src/summaryview.c:2017
 msgid "Overwrite"
 msgstr "¾å½ñ¤­"
 
-#: src/mimeview.c:708 src/summaryview.c:2016
+#: src/mimeview.c:715 src/summaryview.c:2018
 msgid "Overwrite existing file?"
 msgstr "´û¸¤Î¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤Þ¤¹¤«?"
 
-#: src/mimeview.c:762
+#: src/mimeview.c:769
 msgid "Open with"
 msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é³«¤¯"
 
-#: src/mimeview.c:763
+#: src/mimeview.c:770
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -2245,96 +2249,96 @@ msgstr ""
 "¥Õ¥¡¥¤¥ë¤ò³«¤¯¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:\n"
 "(`%s' ¤Ï¥Õ¥¡¥¤¥ë̾¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹)"
 
-#: src/mimeview.c:815
+#: src/mimeview.c:822
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME ¥Ó¥å¡¼¥¢¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤¬Ìµ¸ú¤Ç¤¹: `%s'"
 
-#: src/news.c:90
+#: src/news.c:92
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "%s:%d ¤Ø¤Î NNTP ¤ÎÀܳ¤ò³ÎΩÃæ...\n"
 
-#: src/news.c:170
+#: src/news.c:175
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d ¤Ø¤Î NNTP ¤ÎÀܳ¤¬ÀÚ¤ì¤Æ¤¤¤Þ¤¹¡£ºÆÀܳ¤·¤Þ¤¹...\n"
 
-#: src/news.c:240
+#: src/news.c:244
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d È֤ε­»ö¤Ï¤¹¤Ç¤Ë¥­¥ã¥Ã¥·¥å¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/news.c:252
+#: src/news.c:256
 #, c-format
 msgid "can't select group %s\n"
 msgstr "¥°¥ë¡¼¥× %s ÁªÂò¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/news.c:257
+#: src/news.c:261
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d È֤ε­»ö¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: src/news.c:262
+#: src/news.c:266
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d È֤ε­»ö¤òÆɤá¤Þ¤»¤ó\n"
 
-#: src/news.c:294
+#: src/news.c:298
 msgid "can't post article.\n"
 msgstr "µ­»ö¤ò¥Ý¥¹¥È¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: src/news.c:318
+#: src/news.c:322
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "%d È֤ε­»ö¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/news.c:388
+#: src/news.c:392
 #, c-format
 msgid "can't set group: %s\n"
 msgstr "¥°¥ë¡¼¥×¤ò %s ¤Ë¥»¥Ã¥È¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/news.c:395
+#: src/news.c:399
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "̵¸ú¤Êµ­»ö¤ÎÈϰϤǤ¹: %d - %d\n"
 
-#: src/news.c:404
+#: src/news.c:408
 msgid "no new articles.\n"
 msgstr "¿·Ãåµ­»ö¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: src/news.c:417
+#: src/news.c:421
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d ¤ò¼èÆÀÃæ (%s)...\n"
 
-#: src/news.c:420
+#: src/news.c:424
 msgid "can't get xover\n"
 msgstr "xover ¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/news.c:426
+#: src/news.c:430
 msgid "error occurred while getting xover.\n"
 msgstr "xover ¾ðÊó¤ò¼èÆÀÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
 
-#: src/news.c:434
+#: src/news.c:438
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "̵¸ú¤Ê xover ¹Ô¤Ç¤¹: %s\n"
 
-#: src/news.c:451 src/news.c:476
+#: src/news.c:455 src/news.c:480
 msgid "can't get xhdr\n"
 msgstr "xhdr ¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: src/news.c:459 src/news.c:484
+#: src/news.c:463 src/news.c:488
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr ¾ðÊó¤ò¼èÆÀÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
 
-#: src/news.c:608
+#: src/news.c:612
 #, c-format
 msgid "deleting article %d...\n"
 msgstr "%d È֤ε­»ö¤òºï½ü¤·¤Æ¤¤¤Þ¤¹...\n"
 
-#: src/news.c:639
+#: src/news.c:643
 msgid "\tDeleting all cached articles... "
 msgstr "\tÁ´¤Æ¤Î¥­¥ã¥Ã¥·¥å¤µ¤ì¤¿µ­»ö¤òºï½ü¤·¤Æ¤¤¤Þ¤¹... "
 
@@ -3206,15 +3210,15 @@ msgstr "MIME"
 msgid "Number"
 msgstr "ÈÖ¹æ"
 
-#: src/prefs_common.c:2177 src/summaryview.c:352
+#: src/prefs_common.c:2177 src/summaryview.c:353
 msgid "Date"
 msgstr "ÆüÉÕ"
 
-#: src/prefs_common.c:2178 src/summaryview.c:353
+#: src/prefs_common.c:2178 src/summaryview.c:354
 msgid "From"
 msgstr "º¹½Ð¿Í"
 
-#: src/prefs_common.c:2179 src/summaryview.c:354
+#: src/prefs_common.c:2179 src/summaryview.c:355
 msgid "Subject"
 msgstr "·ï̾"
 
@@ -3718,54 +3722,58 @@ msgid "/_Reply"
 msgstr "/ÊÖ¿®(_R)"
 
 #: src/summaryview.c:302
+msgid "/Repl_y to sender"
+msgstr "/º¹½Ð¿Í¤ËÊÖ¿®(_Y)"
+
+#: src/summaryview.c:303
 msgid "/Reply to a_ll"
 msgstr "/Á´°÷¤ËÊÖ¿®(_L)"
 
-#: src/summaryview.c:303
+#: src/summaryview.c:304
 msgid "/_Forward"
 msgstr "/žÁ÷(_F)"
 
-#: src/summaryview.c:304
+#: src/summaryview.c:305
 msgid "/Forward as an a_ttachment"
 msgstr "/źÉդȤ·¤ÆžÁ÷(_T)"
 
-#: src/summaryview.c:307
+#: src/summaryview.c:308
 msgid "/Open in new _window"
 msgstr "/¿·¤·¤¤¥¦¥£¥ó¥É¥¦¤Ç³«¤¯(_W)"
 
-#: src/summaryview.c:308
+#: src/summaryview.c:309
 msgid "/View so_urce"
 msgstr "/¥½¡¼¥¹¤òɽ¼¨(_U)"
 
-#: src/summaryview.c:309
+#: src/summaryview.c:310
 msgid "/Show all _header"
 msgstr "/Á´¤Æ¤Î¥Ø¥Ã¥À¤òɽ¼¨(_H)"
 
-#: src/summaryview.c:310
+#: src/summaryview.c:311
 msgid "/Re_edit"
 msgstr "/ºÆÊÔ½¸(_E)"
 
-#: src/summaryview.c:313
+#: src/summaryview.c:314
 msgid "/_Print..."
 msgstr "/°õºþ(_P)..."
 
-#: src/summaryview.c:315
+#: src/summaryview.c:316
 msgid "/Select _all"
 msgstr "/Á´¤ÆÁªÂò(_A)"
 
-#: src/summaryview.c:321
+#: src/summaryview.c:322
 msgid "M"
 msgstr "M"
 
-#: src/summaryview.c:321
+#: src/summaryview.c:322
 msgid "U"
 msgstr "U"
 
-#: src/summaryview.c:336
+#: src/summaryview.c:337
 msgid "Creating summary view...\n"
 msgstr "¥µ¥Þ¥ê¥Ó¥å¡¼¤òºîÀ®Ãæ...\n"
 
-#: src/summaryview.c:351
+#: src/summaryview.c:352
 msgid "No."
 msgstr "ÈÖ¹æ"
 
@@ -3777,7 +3785,7 @@ msgstr "
 msgid "Some marks are left. Process it?"
 msgstr "¥Þ¡¼¥¯¤¬»Ä¤Ã¤Æ¤¤¤Þ¤¹¡£½èÍý¤·¤Þ¤¹¤«?"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:598
 msgid ""
 "empty folder\n"
 "\n"
@@ -3785,141 +3793,141 @@ msgstr ""
 "¶õ¥Õ¥©¥ë¥À\n"
 "\n"
 
-#: src/summaryview.c:609
+#: src/summaryview.c:610
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "¥Õ¥©¥ë¥À¤ò¥¹¥­¥ã¥óÃæ (%s)..."
 
-#: src/summaryview.c:678
+#: src/summaryview.c:679
 msgid "done."
 msgstr "´°Î»."
 
-#: src/summaryview.c:812
+#: src/summaryview.c:814
 msgid "No unread message"
 msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Ê¤·"
 
-#: src/summaryview.c:813
+#: src/summaryview.c:815
 msgid "No unread message found. Go to next folder?"
 msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó¡£¼¡¤Î¥Õ¥©¥ë¥À¤Ë°ÜÆ°¤·¤Þ¤¹¤«?"
 
-#: src/summaryview.c:949 src/summaryview.c:951
+#: src/summaryview.c:951 src/summaryview.c:953
 msgid "Attracting messages by subject..."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò·ï̾¤Ç´ó¤»¤Æ¤¤¤Þ¤¹..."
 
-#: src/summaryview.c:1094
+#: src/summaryview.c:1096
 #, c-format
 msgid "%d deleted"
 msgstr "%d Ä̺ï½ü"
 
-#: src/summaryview.c:1098
+#: src/summaryview.c:1100
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d ÄÌ°ÜÆ°"
 
-#: src/summaryview.c:1099 src/summaryview.c:1106
+#: src/summaryview.c:1101 src/summaryview.c:1108
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1104
+#: src/summaryview.c:1106
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d ÄÌ¥³¥Ô¡¼"
 
-#: src/summaryview.c:1121
+#: src/summaryview.c:1123
 msgid " item(s) selected"
 msgstr " Ä̤Υá¥Ã¥»¡¼¥¸¤òÁªÂò"
 
-#: src/summaryview.c:1132
+#: src/summaryview.c:1134
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "¿·Ãå %d ÄÌ, ̤ÆÉ %d ÄÌ, Áí¿ô %d ÄÌ (%s)"
 
-#: src/summaryview.c:1138
+#: src/summaryview.c:1140
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "¿·Ãå %d ÄÌ, ̤ÆÉ %d ÄÌ, Áí¿ô %d ÄÌ"
 
-#: src/summaryview.c:1179 src/summaryview.c:1180
+#: src/summaryview.c:1181 src/summaryview.c:1182
 msgid "Sorting summary..."
 msgstr "¥µ¥Þ¥ê¤ò¥½¡¼¥ÈÃæ..."
 
-#: src/summaryview.c:1218
+#: src/summaryview.c:1220
 msgid "\tSetting summary from message data..."
 msgstr "\t¥á¥Ã¥»¡¼¥¸¥Ç¡¼¥¿¤«¤é¥µ¥Þ¥ê¤òÀßÄêÃæ..."
 
-#: src/summaryview.c:1220
+#: src/summaryview.c:1222
 msgid "Setting summary from message data..."
 msgstr "¥á¥Ã¥»¡¼¥¸¥Ç¡¼¥¿¤«¤é¥µ¥Þ¥ê¤òÀßÄêÃæ..."
 
-#: src/summaryview.c:1329
+#: src/summaryview.c:1331
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "¥µ¥Þ¥ê¥­¥ã¥Ã¥·¥å¤ò½ñ¤­¹þ¤ßÃæ (%s)..."
 
-#: src/summaryview.c:1381
+#: src/summaryview.c:1383
 msgid "(No Date)"
 msgstr "(ÆüÉդʤ·)"
 
-#: src/summaryview.c:1646
+#: src/summaryview.c:1648
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò¥Þ¡¼¥¯¤·¤Þ¤·¤¿\n"
 
-#: src/summaryview.c:1675
+#: src/summaryview.c:1677
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò´ûÆɤȤ·¤Æ¥Þ¡¼¥¯¤·¤Þ¤·¤¿\n"
 
-#: src/summaryview.c:1710
+#: src/summaryview.c:1712
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò̤ÆɤȤ·¤Æ¥Þ¡¼¥¯¤·¤Þ¤·¤¿\n"
 
-#: src/summaryview.c:1752
+#: src/summaryview.c:1754
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %s/%d ¤òºï½ü¤¹¤ë¤è¤¦¤Ë¥»¥Ã¥È¤·¤Þ¤·¤¿\n"
 
-#: src/summaryview.c:1766
+#: src/summaryview.c:1768
 msgid "Current folder is Trash."
 msgstr "¸½ºß¤Î¥Õ¥©¥ë¥À¤Ï¤´¤ßÈ¢¤Ç¤¹¡£"
 
-#: src/summaryview.c:1788 src/summaryview.c:1790
+#: src/summaryview.c:1790 src/summaryview.c:1792
 msgid "Deleting duplicated messages..."
 msgstr "½ÅÊ£¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Æ¤¤¤Þ¤¹..."
 
-#: src/summaryview.c:1840
+#: src/summaryview.c:1842
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %s/%d ¤ò¥Þ¡¼¥¯²ò½ü¤·¤Þ¤·¤¿\n"
 
-#: src/summaryview.c:1877
+#: src/summaryview.c:1879
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò %s ¤Ë°ÜÆ°¤¹¤ë¤è¤¦¤Ë¥»¥Ã¥È¤·¤Þ¤·¤¿\n"
 
-#: src/summaryview.c:1889
+#: src/summaryview.c:1891
 msgid "Destination is same as current folder."
 msgstr "°ÜÆ°À褬¸½ºß¤Î¥Õ¥©¥ë¥À¤ÈƱ¤¸¤Ç¤¹¡£"
 
-#: src/summaryview.c:1938
+#: src/summaryview.c:1940
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò %s ¤Ë¥³¥Ô¡¼¤¹¤ë¤è¤¦¤Ë¥»¥Ã¥È¤·¤Þ¤·¤¿\n"
 
-#: src/summaryview.c:1951
+#: src/summaryview.c:1953
 msgid "Destination to copy is same as current folder."
 msgstr "¥³¥Ô¡¼À褬¸½ºß¤Î¥Õ¥©¥ë¥À¤ÈƱ¤¸¤Ç¤¹¡£"
 
-#: src/summaryview.c:1983
+#: src/summaryview.c:1985
 msgid "Selecting all messages..."
 msgstr "Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤òÁªÂòÃæ..."
 
-#: src/summaryview.c:2037
+#: src/summaryview.c:2039
 msgid "Print"
 msgstr "°õºþ"
 
-#: src/summaryview.c:2038
+#: src/summaryview.c:2040
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3928,7 +3936,7 @@ msgstr ""
 "°õºþ¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:\n"
 "(`%s' ¤Ï¥Õ¥¡¥¤¥ë̾¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹)"
 
-#: src/summaryview.c:2044
+#: src/summaryview.c:2046
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3937,27 +3945,27 @@ msgstr ""
 "°õºþ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤¬Ìµ¸ú¤Ç¤¹:\n"
 "`%s'"
 
-#: src/summaryview.c:2266 src/summaryview.c:2267
+#: src/summaryview.c:2268 src/summaryview.c:2269
 msgid "Building threads..."
 msgstr "¥¹¥ì¥Ã¥É¤ò¹½ÃÛÃæ..."
 
-#: src/summaryview.c:2289 src/summaryview.c:2290
+#: src/summaryview.c:2291 src/summaryview.c:2292
 msgid "Unthreading..."
 msgstr "¥¹¥ì¥Ã¥É¤ò²ò½üÃæ..."
 
-#: src/summaryview.c:2312
+#: src/summaryview.c:2314
 msgid "Unthreading for execution..."
 msgstr "¼Â¹Ô¤Î¤¿¤á¤Ë¥¹¥ì¥Ã¥É¤ò²ò½üÃæ..."
 
-#: src/summaryview.c:2399
+#: src/summaryview.c:2401
 msgid "filtering..."
 msgstr "¿¶¤êʬ¤±Ãæ..."
 
-#: src/summaryview.c:2400
+#: src/summaryview.c:2402
 msgid "Filtering..."
 msgstr "¿¶¤êʬ¤±Ãæ..."
 
-#: src/summaryview.c:2504
+#: src/summaryview.c:2506
 #, c-format
 msgid "Go to %s\n"
 msgstr "%s ¤Ë°ÜÆ°\n"
@@ -4024,12 +4032,12 @@ msgstr ""
 "¡Ö½ð̾¤ò¸¡¾Ú¡×¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
-#: src/utils.c:1451
+#: src/utils.c:1489
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s ¤Ø¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: src/utils.c:1612
+#: src/utils.c:1650
 #, c-format
 msgid "Open URI command line is invalid: `%s'"
 msgstr "URI ¤ò³«¤¯¤¿¤á¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤¬Ìµ¸ú¤Ç¤¹: `%s'"

diff --git a/src/compose.c b/src/compose.c
index c78da09ad916089713b89fdd5785729fde4b9018..a18c2ab095e40ae7efd51e4a29224a0b92ee0a73 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 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
@@ -143,7 +143,7 @@ static gchar *compose_quote_parse_fmt               (Compose        *compose,
 static void compose_reply_set_entry            (Compose        *compose,
                                                 MsgInfo        *msginfo,
                                                 gboolean        to_all,
-                                                gboolean        to_author);
+                                                gboolean        to_sender);
 static void compose_reedit_set_entry           (Compose        *compose,
                                                 MsgInfo        *msginfo);
 static void compose_insert_sig                 (Compose        *compose);
@@ -482,7 +482,7 @@ msginfo->folder->folder->change_flags(msginfo->folder->folder, \
 }
 
 void compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
-                  gboolean to_author)
+                  gboolean ignore_replyto)
 {
        Compose *compose;
        PrefsAccount *account;
@@ -496,7 +496,7 @@ void compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
        if (!account) account = cur_account;
        g_return_if_fail(account != NULL);
 
-       if (to_author && account->protocol == A_NNTP) {
+       if (ignore_replyto && account->protocol == A_NNTP) {
                reply_account =
                        account_find_mail_from_address(account->address);
                if (!reply_account)
@@ -515,7 +515,7 @@ void compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
        compose->mode = COMPOSE_REPLY;
 
        if (compose_parse_header(compose, msginfo) < 0) return;
-       compose_reply_set_entry(compose, msginfo, to_all, to_author);
+       compose_reply_set_entry(compose, msginfo, to_all, ignore_replyto);
 
        text = GTK_STEXT(compose->text);
        gtk_stext_freeze(text);
@@ -1333,7 +1333,7 @@ static gchar *compose_quote_parse_fmt(Compose *compose, MsgInfo *msginfo,
 */
 
 static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
-                                   gboolean to_all, gboolean to_author)
+                                   gboolean to_all, gboolean ignore_replyto)
 {
        GSList *cc_list;
        GSList *cur;
@@ -1345,7 +1345,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
 
        if (compose->account->protocol != A_NNTP)
                gtk_entry_set_text(GTK_ENTRY(compose->to_entry),
-                                  ( (compose->replyto && !to_author) 
+                                  ( (compose->replyto && !ignore_replyto) 
                                     ? compose->replyto
                                     : msginfo->from ? msginfo->from : ""));
        if (compose->account->protocol == A_NNTP)

diff --git a/src/compose.h b/src/compose.h
index 50c19a695f5100c057acdbe2054a977e6bac71a7..9e85cb01cf932acb52e14cee07eb881ebc411b13 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 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
@@ -51,12 +51,12 @@ typedef enum
        COMPOSE_REPLY,
        COMPOSE_REPLY_WITH_QUOTE,
        COMPOSE_REPLY_WITHOUT_QUOTE,
+       COMPOSE_REPLY_TO_SENDER,
+       COMPOSE_REPLY_TO_SENDER_WITH_QUOTE,
+       COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE,
        COMPOSE_REPLY_TO_ALL,
        COMPOSE_REPLY_TO_ALL_WITH_QUOTE,
        COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE,
-       COMPOSE_REPLY_TO_AUTHOR,
-       COMPOSE_REPLY_TO_AUTHOR_WITH_QUOTE,
-       COMPOSE_REPLY_TO_AUTHOR_WITHOUT_QUOTE,
        COMPOSE_FORWARD,
        COMPOSE_FORWARD_AS_ATTACH,
        COMPOSE_NEW,
@@ -176,7 +176,7 @@ Compose * compose_new_with_recipient        (PrefsAccount   *account,
 void compose_reply             (MsgInfo        *msginfo,
                                 gboolean        quote,
                                 gboolean        to_all,
-                                gboolean        to_author);
+                                gboolean        ignore_replyto);
 Compose * compose_forward      (PrefsAccount *account,
                                 MsgInfo        *msginfo,
                                 gboolean        as_attach);

diff --git a/src/imap.c b/src/imap.c
index 7c510791cf7ada11a5d41713a0c36a7e4874a2cf..1cfdb669a2780d372967f51d89eae3a5efaa1ed1 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 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
@@ -40,18 +40,20 @@
 #include "codeconv.h"
 #include "utils.h"
 
+#define IMAP4_PORT     143
+
 static GList *session_list = NULL;
 
 static gint imap_cmd_count = 0;
 
-static GSList *imap_get_uncached_messages(IMAPSession  *session,
-                                         FolderItem    *item,
-                                         gint          first,
-                                         gint          last);
-static GSList *imap_delete_messages     (GSList        *mlist,
-                                         gint          first,
-                                         gint          last);
-static void imap_delete_all_messages    (FolderItem    *item);
+static GSList *imap_get_uncached_messages      (IMAPSession    *session,
+                                                FolderItem     *item,
+                                                gint            first,
+                                                gint            last);
+static GSList *imap_delete_cached_messages     (GSList         *mlist,
+                                                gint            first,
+                                                gint            last);
+static void imap_delete_all_cached_messages    (FolderItem     *item);
 
 static SockInfo *imap_open     (const gchar    *server,
                                 gushort         port,
@@ -137,20 +139,22 @@ static IMAPSession *imap_session_connect_if_not(Folder *folder)
 
        if (!rfolder->session) {
                rfolder->session =
-                       imap_session_new(folder->account->recv_server, 143,
+                       imap_session_new(folder->account->recv_server,
+                                        IMAP4_PORT,
                                         folder->account->userid,
                                         folder->account->passwd);
-       } else {
-               if (imap_noop(rfolder->session->sock) != IMAP_SUCCESS) {
-                       log_warning(_("IMAP4 connection to %s:%d has been"
-                                     " disconnected. Reconnecting...\n"),
-                                   folder->account->recv_server, 143);
-                       session_destroy(rfolder->session);
-                       rfolder->session =
-                               imap_session_new(folder->account->recv_server,
-                                                143, folder->account->userid,
-                                                folder->account->passwd);
-               }
+               return IMAP_SESSION(rfolder->session);
+       }
+
+       if (imap_noop(rfolder->session->sock) != IMAP_SUCCESS) {
+               log_warning(_("IMAP4 connection to %s:%d has been"
+                             " disconnected. Reconnecting...\n"),
+                           folder->account->recv_server, IMAP4_PORT);
+               session_destroy(rfolder->session);
+               rfolder->session =
+                       imap_session_new(folder->account->recv_server,
+                                        IMAP4_PORT, folder->account->userid,
+                                        folder->account->passwd);
        }
 
        return IMAP_SESSION(rfolder->session);
@@ -214,6 +218,8 @@ GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
 {
        GSList *mlist = NULL;
        IMAPSession *session;
+       gint ok, exists = 0, recent = 0, unseen = 0, begin = 1;
+       gulong uid = 0, last_uid;
 
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
@@ -226,65 +232,66 @@ GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
                mlist = procmsg_read_cache(item, FALSE);
                item->last_num = procmsg_get_last_num_in_cache(mlist);
                procmsg_set_flags(mlist, item);
-       } else {
-               gint ok, exists = 0, recent = 0, unseen = 0, begin = 1;
-               gulong uid = 0, last_uid = item->mtime;
+               statusbar_pop_all();
 
-               ok = imap_select(SESSION(session)->sock, item->path,
-                                       &exists, &recent, &unseen, &uid);
-               if (ok != IMAP_SUCCESS) {
-                       log_warning(_("can't select folder: %s\n"), item->path);
-                       return NULL;
-               }
+               return mlist;
+       }
 
-               if (use_cache) {
-                       gint cache_last;
+       last_uid = item->mtime;
 
-                       mlist = procmsg_read_cache(item, FALSE);
-                       procmsg_set_flags(mlist, item);
-                       cache_last = procmsg_get_last_num_in_cache(mlist);
+       ok = imap_select(SESSION(session)->sock, item->path,
+                        &exists, &recent, &unseen, &uid);
+       if (ok != IMAP_SUCCESS) {
+               log_warning(_("can't select folder: %s\n"), item->path);
+               return NULL;
+       }
+
+       if (use_cache) {
+               gint cache_last;
 
-                       /* calculating the range of envelope to get */
-                       if (exists < cache_last) {
-                               /* some messages are deleted (get all) */
+               mlist = procmsg_read_cache(item, FALSE);
+               procmsg_set_flags(mlist, item);
+               cache_last = procmsg_get_last_num_in_cache(mlist);
+
+               /* calculating the range of envelope to get */
+               if (exists < cache_last) {
+                       /* some messages are deleted (get all) */
+                       begin = 1;
+               } else if (exists == cache_last) {
+                       if (last_uid != 0 && last_uid != uid) {
+                               /* some recent but deleted (get all) */
                                begin = 1;
-                       } else if (exists == cache_last) {
-                               if (last_uid != 0 && last_uid != uid) {
-                                       /* some recent but deleted (get all) */
-                                       begin = 1;
-                               } else {
-                                       /* mailbox unchanged (get none)*/
-                                       begin = -1;
-                               }
                        } else {
-                               if (exists == cache_last + recent) {
-                                       /* some recent */
-                                       begin = cache_last + 1;
-                               } else {
-                                       /* some recent but deleted (get all) */
-                                       begin = 1;
-                               }
+                               /* mailbox unchanged (get none)*/
+                               begin = -1;
+                       }
+               } else {
+                       if (exists == cache_last + recent) {
+                               /* some recent */
+                               begin = cache_last + 1;
+                       } else {
+                               /* some recent but deleted (get all) */
+                               begin = 1;
                        }
-
-                       item->mtime = uid;
                }
 
-               if (1 < begin && begin <= exists) {
-                       GSList *newlist;
-
-                       newlist = imap_get_uncached_messages
-                               (session, item, begin, exists);
-                       imap_delete_messages(mlist, begin, INT_MAX);
-                       mlist = g_slist_concat(mlist, newlist);
-               } else if (begin == 1) {
-                       mlist = imap_get_uncached_messages 
-                                       (session, item, 1, exists);
-                       imap_delete_all_messages(item);
-               }
+               item->mtime = uid;
+       }
+
+       if (1 < begin && begin <= exists) {
+               GSList *newlist;
 
-               item->last_num = exists;
+               newlist = imap_get_uncached_messages
+                       (session, item, begin, exists);
+               imap_delete_cached_messages(mlist, begin, INT_MAX);
+               mlist = g_slist_concat(mlist, newlist);
+       } else if (begin == 1) {
+               mlist = imap_get_uncached_messages(session, item, 1, exists);
+               imap_delete_all_cached_messages(item);
        }
 
+       item->last_num = exists;
+
        statusbar_pop_all();
 
        return mlist;
@@ -595,7 +602,8 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
        return newlist;
 }
 
-static GSList *imap_delete_messages(GSList *mlist, gint first, gint last)
+static GSList *imap_delete_cached_messages(GSList *mlist,
+                                          gint first, gint last)
 {
        GSList *cur, *next;
        MsgInfo *msginfo;
@@ -605,9 +613,8 @@ static GSList *imap_delete_messages(GSList *mlist, gint first, gint last)
                next = cur->next;
 
                msginfo = (MsgInfo *)cur->data;
-               if ((msginfo) && 
-                   (first <= msginfo->msgnum ) &&
-                   (msginfo->msgnum <= last)) {
+               if (msginfo != NULL && first <= msginfo->msgnum &&
+                   msginfo->msgnum <= last) {
                        debug_print(_("deleting message %d...\n"),
                                    msginfo->msgnum);
 
@@ -625,46 +632,23 @@ static GSList *imap_delete_messages(GSList *mlist, gint first, gint last)
        return mlist;
 }
 
-static void imap_delete_all_messages(FolderItem *item)
+static void imap_delete_all_cached_messages(FolderItem *item)
 {
-       DIR *dp;
-       struct dirent *d;
        gchar *dir;
-       gchar *file;
 
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->folder->type == F_IMAP);
 
-       dir = folder_item_get_path(item);
-       if ((dp = opendir(dir)) == NULL) {
-               FILE_OP_ERROR(dir, "opendir");
-               g_free(dir);
-               return;
-       }
-
        debug_print(_("\tDeleting all cached messages... "));
 
-       while ((d = readdir(dp)) != NULL) {
-               if (to_number(d->d_name) < 0) continue;
-
-               file = g_strconcat(dir, G_DIR_SEPARATOR_S, d->d_name, NULL);
-
-               if (is_file_exist(file)) {
-                       if (unlink(file) < 0)
-                               FILE_OP_ERROR(file, "unlink");
-               }
-
-               g_free(file);
-       }
-
-       closedir(dp);
+       dir = folder_item_get_path(item);
+       remove_all_numbered_files(dir);
        g_free(dir);
 
        debug_print(_("done.\n"));
 }
 
-
 static SockInfo *imap_open(const gchar *server, gushort port, gchar *buf)
 {
        SockInfo *sock;

diff --git a/src/mainwindow.c b/src/mainwindow.c
index c2353d1179a8069e0f29b8ab8eff74243fd5ef86..d0524876e5e563efb00df7348519471142a15b2f 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -116,7 +116,7 @@ static void toolbar_reply_cb                (GtkWidget      *widget,
                                         gpointer        data);
 static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
                                         gpointer        data);
-static void toolbar_reply_to_author_cb (GtkWidget      *widget,
+static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
                                         gpointer        data);
 static void toolbar_forward_cb         (GtkWidget      *widget,
                                         gpointer        data);
@@ -474,9 +474,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Compose _new message"),  "<alt>N",       compose_cb, 0, NULL},
        {N_("/_Message/_Reply"),                "<alt>R",       reply_cb, COMPOSE_REPLY, NULL},
+       {N_("/_Message/Repl_y to sender"),      "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/_Message/Reply to a_ll"),         "<shift><alt>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/_Message/Reply to author"),       NULL, reply_cb, COMPOSE_REPLY_TO_AUTHOR, NULL},
-       {N_("/_Message/_Forward"),              "<control>F",   reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Message/_Forward"),              "<control>F", reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/_Message/Forward as an a_ttachment"),
                                                "<shift><control>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
@@ -493,7 +493,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Open in new _window"),   "<shift><control>N", open_msg_cb, 0, NULL},
        {N_("/_Message/View _source"),          "<control>U", view_source_cb, 0, NULL},
-       {N_("/_Message/Show all _header"),      "<control>H",   header_window_show_cb,  0, NULL},
+       {N_("/_Message/Show all _header"),      "<control>H", header_window_show_cb, 0, NULL},
        {N_("/_Message/Re_edit"),               NULL, reedit_cb, 0, NULL},
 
        {N_("/_Summary"),                       NULL, NULL, 0, "<Branch>"},
@@ -1114,7 +1114,7 @@ void main_window_set_toolbar_sensitive(MainWindow *mainwin, gboolean sensitive)
 {
        gtk_widget_set_sensitive(mainwin->reply_btn,       sensitive);
        gtk_widget_set_sensitive(mainwin->replyall_btn,    sensitive);
-       gtk_widget_set_sensitive(mainwin->replyauthor_btn, sensitive);
+       gtk_widget_set_sensitive(mainwin->replysender_btn, sensitive);
        gtk_widget_set_sensitive(mainwin->fwd_btn,         sensitive);
        gtk_widget_set_sensitive(mainwin->exec_btn,        sensitive);
        gtk_widget_set_sensitive(mainwin->next_btn,        sensitive);
@@ -1146,8 +1146,8 @@ void main_window_set_menu_sensitive(MainWindow *mainwin, gint selection)
 
        menu_set_sensitive(ifactory, "/File/Save as...", sens);
        menu_set_sensitive(ifactory, "/Message/Reply", sens);
+       menu_set_sensitive(ifactory, "/Message/Reply to sender", sens);
        menu_set_sensitive(ifactory, "/Message/Reply to all", sens);
-       menu_set_sensitive(ifactory, "/Message/Reply to author", sens);
        menu_set_sensitive(ifactory, "/Message/Forward", sens);
        menu_set_sensitive(ifactory, "/Message/Forward as an attachment", sens);
        menu_set_sensitive(ifactory, "/Message/Open in new window", sens);
@@ -1427,7 +1427,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        GtkWidget *compose_btn;
        GtkWidget *reply_btn;
        GtkWidget *replyall_btn;
-       GtkWidget *replyauthor_btn;
+       GtkWidget *replysender_btn;
        GtkWidget *fwd_btn;
        GtkWidget *send_btn;
        /*
@@ -1499,12 +1499,12 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                               toolbar_reply_to_all_cb,
                                               mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_reply_to_author_xpm);
-       replyauthor_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                                 _("Reply author"),
-                                                 _("Reply to author"),
-                                                 "Reply to author",
+       replysender_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                                 _("Reply sender"),
+                                                 _("Reply to sender"),
+                                                 "Reply to sender",
                                                  icon_wid,
-                                                 toolbar_reply_to_author_cb,
+                                                 toolbar_reply_to_sender_cb,
                                                  mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_forward_xpm);
        fwd_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
@@ -1574,7 +1574,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        mainwin->compose_btn     = compose_btn;
        mainwin->reply_btn       = reply_btn;
        mainwin->replyall_btn    = replyall_btn;
-       mainwin->replyauthor_btn = replyauthor_btn;
+       mainwin->replysender_btn = replysender_btn;
        mainwin->fwd_btn         = fwd_btn;
        mainwin->send_btn        = send_btn;
        /*
@@ -1638,12 +1638,12 @@ static void toolbar_reply_to_all_cb     (GtkWidget      *widget,
        reply_cb(mainwin, COMPOSE_REPLY_TO_ALL, NULL);
 }
 
-static void toolbar_reply_to_author_cb (GtkWidget      *widget,
+static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
                                         gpointer        data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       reply_cb(mainwin, COMPOSE_REPLY_TO_AUTHOR, NULL);
+       reply_cb(mainwin, COMPOSE_REPLY_TO_SENDER, NULL);
 }
 
 static void toolbar_forward_cb (GtkWidget      *widget,
@@ -1967,13 +1967,13 @@ static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                compose_reply(msginfo, prefs_common.reply_with_quote,
                              FALSE, FALSE);
                break;
-       case COMPOSE_REPLY_TO_ALL:
+       case COMPOSE_REPLY_TO_SENDER:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, FALSE);
+                             FALSE, TRUE);
                break;
-       case COMPOSE_REPLY_TO_AUTHOR:
+       case COMPOSE_REPLY_TO_ALL:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE);
+                             TRUE, FALSE);
                break;
        case COMPOSE_FORWARD:
                compose_forward(NULL, msginfo, FALSE);
@@ -1982,8 +1982,7 @@ static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                compose_forward(NULL, msginfo, TRUE);
                break;
        default:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, FALSE);
+               g_warning("reply_cb(): invalid action type: %d\n", action);
        }
 
        summary_set_marks_selected(mainwin->summaryview);

diff --git a/src/mainwindow.h b/src/mainwindow.h
index bf7a178b523129f1d77b4cb6f0f9a63fafe20f4b..7a339d2d83e388c595a407e4bcb051820fdc6e2a 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -83,7 +83,7 @@ struct _MainWindow
        GtkWidget *compose_btn;
        GtkWidget *reply_btn;
        GtkWidget *replyall_btn;
-       GtkWidget *replyauthor_btn;
+       GtkWidget *replysender_btn;
        GtkWidget *fwd_btn;
        GtkWidget *send_btn;
        /*

diff --git a/src/mh.c b/src/mh.c
index 5cae5f3aee0317d6fbb40d0216dc9a6ce4235d23..4d8f91dfae111d5fe2d501c61f159bb99edf27f0 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -122,7 +122,6 @@ gchar *mh_fetch_msg(Folder *folder, FolderItem *item, gint num)
        path = folder_item_get_path(item);
        file = g_strconcat(path, G_DIR_SEPARATOR_S, itos(num), NULL);
        g_free(path);
-
        if (!is_file_exist(file)) {
                g_free(file);
                return NULL;
@@ -597,32 +596,16 @@ gint mh_remove_msg(Folder *folder, FolderItem *item, gint num)
 gint mh_remove_all_msg(Folder *folder, FolderItem *item)
 {
        gchar *path;
-       DIR *dp;
-       struct dirent *d;
+       gint val;
 
        g_return_val_if_fail(item != NULL, -1);
 
        path = folder_item_get_path(item);
        g_return_val_if_fail(path != NULL, -1);
-       if (change_dir(path) < 0) {
-               g_free(path);
-               return -1;
-       }
+       val = remove_all_numbered_files(path);
        g_free(path);
 
-       if ((dp = opendir(".")) == NULL) {
-               FILE_OP_ERROR(item->path, "opendir");
-               return -1;
-       }
-
-       while ((d = readdir(dp)) != NULL) {
-               if (to_number(d->d_name) < 0) continue;
-               if (unlink(d->d_name) < 0)
-                       FILE_OP_ERROR(d->d_name, "unlink");
-       }
-
-       closedir(dp);
-       return 0;
+       return val;
 }
 
 gboolean mh_is_msg_changed(Folder *folder, FolderItem *item, MsgInfo *msginfo)

diff --git a/src/news.c b/src/news.c
index 0a958774a6d4d6a29d5ff486689b1f91414e5cff..94a3b3f189b5363cb56654a58f4dd01a72d33be1 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -47,6 +47,8 @@
 #include "inputdialog.h"
 #include "alertpanel.h"
 
+#define NNTP_PORT      119
+
 static Session *news_session_new        (const gchar   *server,
                                          gushort        port,
                                          const gchar   *userid,
@@ -147,7 +149,7 @@ static Session *news_session_new_for_folder(Folder *folder)
                        passwd = news_query_password(ac->nntp_server, userid);
        }
 
-       session = news_session_new(ac->nntp_server, 119, userid, passwd);
+       session = news_session_new(ac->nntp_server, NNTP_PORT, userid, passwd);
        g_free(passwd);
 
        return session;
@@ -164,16 +166,18 @@ NNTPSession *news_session_get(Folder *folder)
        if (!REMOTE_FOLDER(folder)->session) {
                REMOTE_FOLDER(folder)->session =
                        news_session_new_for_folder(folder);
-       } else {
-               session = NNTP_SESSION(REMOTE_FOLDER(folder)->session);
-               if (nntp_mode(session->nntp_sock, FALSE) != NN_SUCCESS) {
-                       log_warning(_("NNTP connection to %s:%d has been"
-                                     " disconnected. Reconnecting...\n"),
-                                   folder->account->nntp_server, 119);
-                       session_destroy(REMOTE_FOLDER(folder)->session);
-                       REMOTE_FOLDER(folder)->session =
-                               news_session_new_for_folder(folder);
-               }
+               return NNTP_SESSION(REMOTE_FOLDER(folder)->session);
+       }
+
+       session = NNTP_SESSION(REMOTE_FOLDER(folder)->session);
+
+       if (nntp_mode(session->nntp_sock, FALSE) != NN_SUCCESS) {
+               log_warning(_("NNTP connection to %s:%d has been"
+                             " disconnected. Reconnecting...\n"),
+                           folder->account->nntp_server, NNTP_PORT);
+               session_destroy(REMOTE_FOLDER(folder)->session);
+               REMOTE_FOLDER(folder)->session =
+                       news_session_new_for_folder(folder);
        }
 
        return NNTP_SESSION(REMOTE_FOLDER(folder)->session);

diff --git a/src/summaryview.c b/src/summaryview.c
index 422fbaa7095ca662d8555f7a8701bd3fdbd6fd4d..2030e52faf49e10a2a4c22ff689d4362bf65484f 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -319,8 +319,8 @@ static GtkItemFactoryEntry summary_popup_entries[] =
                                        NULL, summary_mark_as_read, 0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Reply"),                 NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
+       {N_("/Repl_y to sender"),       NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/Reply to a_ll"),          NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/Reply to author"),        NULL, summary_reply_cb, COMPOSE_REPLY_TO_AUTHOR, NULL},
        {N_("/_Forward"),               NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/Forward as an a_ttachment"),
                                        NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
@@ -928,8 +928,8 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 
        sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
        menu_set_sensitive(ifactory, "/Reply",                    sens);
+       menu_set_sensitive(ifactory, "/Reply to sender",          sens);
        menu_set_sensitive(ifactory, "/Reply to all",             sens);
-       menu_set_sensitive(ifactory, "/Reply to author",          sens);
        menu_set_sensitive(ifactory, "/Forward",                  sens);
        menu_set_sensitive(ifactory, "/Forward as an attachment", sens);
 
@@ -3203,6 +3203,16 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
        case COMPOSE_REPLY_WITHOUT_QUOTE:
                compose_reply(msginfo, FALSE, FALSE, FALSE);
                break;
+       case COMPOSE_REPLY_TO_SENDER:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, FALSE, TRUE);
+               break;
        case COMPOSE_REPLY_TO_ALL:
                compose_reply(msginfo, prefs_common.reply_with_quote,
                              TRUE, FALSE);
@@ -3213,16 +3223,6 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
        case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
                compose_reply(msginfo, FALSE, TRUE, FALSE);
                break;
-       case COMPOSE_REPLY_TO_AUTHOR:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_AUTHOR_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_AUTHOR_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, TRUE);
-               break;
        case COMPOSE_FORWARD:
                compose_forward(NULL, msginfo, FALSE);
                break;
@@ -3230,8 +3230,7 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
                compose_forward(NULL, msginfo, TRUE);
                break;
        default:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, FALSE);
+               g_warning("summary_reply_cb(): invalid action: %d\n", action);
        }
 
        summary_set_marks_selected(summaryview);

diff --git a/src/utils.c b/src/utils.c
index 866b29a044b22fb9a97e66d139832aa713f15a63..a6bf0ec012590a9366db451292156d2ba3673fe9 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -1336,6 +1336,44 @@ gint remove_all_files(const gchar *dir)
        return 0;
 }
 
+gint remove_all_numbered_files(const gchar *dir)
+{
+       DIR *dp;
+       struct dirent *d;
+       gchar *prev_dir;
+
+       prev_dir = g_get_current_dir();
+
+       if (chdir(dir) < 0) {
+               FILE_OP_ERROR(dir, "chdir");
+               return -1;
+       }
+
+       if ((dp = opendir(".")) == NULL) {
+               FILE_OP_ERROR(dir, "opendir");
+               return -1;
+       }
+
+       while ((d = readdir(dp)) != NULL) {
+               if (to_number(d->d_name) < 0) continue;
+
+               if (unlink(d->d_name) < 0)
+                       FILE_OP_ERROR(d->d_name, "unlink");
+       }
+
+       closedir(dp);
+
+       if (chdir(prev_dir) < 0) {
+               FILE_OP_ERROR(prev_dir, "chdir");
+               g_free(prev_dir);
+               return -1;
+       }
+
+       g_free(prev_dir);
+
+       return 0;
+}
+
 gint remove_dir_recursive(const gchar *dir)
 {
        struct stat s;

diff --git a/src/utils.h b/src/utils.h
index 5fd8fd7169e673b11f44916aa6194d644dca1571..9240651abad5b91e10eed224e334c5bcad0fe29e 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -252,6 +252,7 @@ gboolean is_dir_exist               (const gchar    *dir);
 gint change_dir                        (const gchar    *dir);
 gint make_dir_hier             (const gchar    *dir);
 gint remove_all_files          (const gchar    *dir);
+gint remove_all_numbered_files (const gchar    *dir);
 gint remove_dir_recursive      (const gchar    *dir);
 gint copy_file                 (const gchar    *src,
                                 const gchar    *dest);