aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2007-12-27 08:38:46 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2007-12-27 08:38:46 +0000
commit67898cdf65b54bd264007c914ad06fca8dd84615 (patch)
tree10083e31aa0865b5a1a98fb1b016a40483188979
parentbdcc354cda8859b86fea45e28419cf44ec42cd3b (diff)
added the option to treat HTML only messages as attachment.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1947 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.ja7
-rw-r--r--libsylph/prefs_common.c2
-rw-r--r--libsylph/prefs_common.h1
-rw-r--r--po/ja.po464
-rw-r--r--src/messageview.c3
-rw-r--r--src/prefs_common_dialog.c7
7 files changed, 260 insertions, 231 deletions
diff --git a/ChangeLog b/ChangeLog
index 45048fa4..32510909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-12-27
+ * libsylph/prefs_common.[ch]
+ src/messageview.c
+ src/prefs_common_dialog.c: added the option 'Treat HTML only
+ messages as attachment'.
+
+2007-12-27
+
* configure.in
src/Makefile.am: don't enable windres on non-win32 platforms.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 046858c1..e6095364 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,12 @@
2007-12-27
+ * libsylph/prefs_common.[ch]
+ src/messageview.c
+ src/prefs_common_dialog.c: 「HTML のみのメッセージを添付として
+ 扱う」オプションを追加。
+
+2007-12-27
+
* configure.in
src/Makefile.am: win32 以外のプラットフォームで windres を有効に
しないようにした。
diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c
index 590951ee..35270667 100644
--- a/libsylph/prefs_common.c
+++ b/libsylph/prefs_common.c
@@ -295,6 +295,8 @@ static PrefParam param[] = {
P_BOOL},
{"display_header", "TRUE", &prefs_common.display_header, P_BOOL},
{"render_html", "TRUE", &prefs_common.render_html, P_BOOL},
+ {"html_only_as_attach", "FALSE", &prefs_common.html_only_as_attach,
+ P_BOOL},
{"line_space", "2", &prefs_common.line_space, P_INT},
{"textview_cursor_visible", "FALSE",
diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h
index 18c1b134..2bd100df 100644
--- a/libsylph/prefs_common.h
+++ b/libsylph/prefs_common.h
@@ -191,6 +191,7 @@ struct _PrefsCommon
gboolean display_header;
gint line_space;
gboolean render_html;
+ gboolean html_only_as_attach;
gboolean textview_cursor_visible;
gboolean enable_smooth_scroll;
gint scroll_step;
diff --git a/po/ja.po b/po/ja.po
index 6323902a..8e323031 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-21 13:48+0900\n"
+"POT-Creation-Date: 2007-12-27 17:28+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"
@@ -504,11 +504,11 @@ msgstr "%s 荀ゃ障\n"
msgid "Configuration is saved.\n"
msgstr "荐絎篆絖障\n"
-#: libsylph/prefs_common.c:556
+#: libsylph/prefs_common.c:558
msgid "Junk mail filter (manual)"
msgstr "菴傑<若c ()"
-#: libsylph/prefs_common.c:559
+#: libsylph/prefs_common.c:561
msgid "Junk mail filter"
msgstr "菴傑<若c"
@@ -981,7 +981,7 @@ msgstr "/若鴻(_P)"
msgid "E-Mail address"
msgstr "糸<若 ≪"
-#: src/addressbook.c:524 src/prefs_common_dialog.c:2276 src/prefs_toolbar.c:87
+#: src/addressbook.c:524 src/prefs_common_dialog.c:2283 src/prefs_toolbar.c:87
msgid "Address book"
msgstr "≪劫験"
@@ -1155,7 +1155,7 @@ msgstr "≪劫験紊"
msgid "Address Book Conversion"
msgstr "≪劫験紊"
-#: src/addressbook.c:3164 src/prefs_common_dialog.c:2105
+#: src/addressbook.c:3164 src/prefs_common_dialog.c:2112
msgid "Interface"
msgstr "ゃ潟帥с若"
@@ -1754,7 +1754,7 @@ msgstr "<ゃ絖障腥冴с"
msgid "Properties"
msgstr ""
-#: src/compose.c:5799 src/prefs_common_dialog.c:1506
+#: src/compose.c:5799 src/prefs_common_dialog.c:1509
msgid "Encoding"
msgstr "潟潟若c潟"
@@ -2001,7 +2001,7 @@ msgstr "JPilot潟膩"
#: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:1908
+#: src/prefs_common_dialog.c:1915
msgid " ... "
msgstr " ... "
@@ -2302,7 +2302,7 @@ msgstr "若罕膀紊掩障"
msgid "Checking for new messages in all folders..."
msgstr "亥<祉若吾с筝..."
-#: src/folderview.c:1247 src/prefs_common_dialog.c:1852 src/prefs_toolbar.c:65
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1859 src/prefs_toolbar.c:65
msgid "Junk"
msgstr "菴傑<若"
@@ -3867,7 +3867,7 @@ msgstr "羞私"
msgid "Message View - Sylpheed"
msgstr "<祉若吾ャ - Sylpheed"
-#: src/messageview.c:764 src/summaryview.c:3743
+#: src/messageview.c:765 src/summaryview.c:3743
#, c-format
msgid "Can't save the file `%s'."
msgstr "<ゃ `%s' 篆絖с障"
@@ -4044,21 +4044,21 @@ msgstr "≪潟荐絎"
msgid "Creating account preferences window...\n"
msgstr "≪潟<潟鴻c潟篏筝...\n"
-#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:684
+#: src/prefs_account_dialog.c:554 src/prefs_common_dialog.c:687
msgid "Receive"
msgstr "篆"
-#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:686
+#: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:689
#: src/prefs_toolbar.c:47 src/prefs_toolbar.c:99
msgid "Send"
msgstr "篆"
-#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:688
+#: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:691
#: src/prefs_folder_item.c:140 src/prefs_toolbar.c:50
msgid "Compose"
msgstr "篏"
-#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:695
+#: src/prefs_account_dialog.c:561 src/prefs_common_dialog.c:698
msgid "Privacy"
msgstr "篋堺"
@@ -4066,7 +4066,7 @@ msgstr "篋堺"
msgid "SSL"
msgstr "SSL"
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2194
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2201
msgid "Advanced"
msgstr "蕭綺荐絎"
@@ -4190,7 +4190,7 @@ msgid "Authentication method"
msgstr "茯荐惹劫"
#: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:902 src/prefs_common_dialog.c:2581
+#: src/prefs_common_dialog.c:905 src/prefs_common_dialog.c:2588
msgid "Automatic"
msgstr ""
@@ -4234,8 +4234,8 @@ msgstr "<祉若ID"
msgid "Add user-defined header"
msgstr "若九臂菴遵"
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1611
-#: src/prefs_common_dialog.c:1638
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1615
+#: src/prefs_common_dialog.c:1642
msgid " Edit... "
msgstr " 膩... "
@@ -4259,7 +4259,7 @@ msgid "Authenticate with POP3 before sending"
msgstr "篆≦POP3茯荐若茵"
#. signature
-#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1011
+#: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1014
#: src/prefs_toolbar.c:114
msgid "Signature"
msgstr "臀峨"
@@ -4567,85 +4567,85 @@ msgstr "≪激с潟"
msgid "Do you really want to delete this action?"
msgstr "綵≪激с潟ゃс?"
-#: src/prefs_common_dialog.c:664
+#: src/prefs_common_dialog.c:667
msgid "Creating common preferences window...\n"
msgstr "<潟鴻c潟篏筝...\n"
-#: src/prefs_common_dialog.c:668
+#: src/prefs_common_dialog.c:671
msgid "Common Preferences"
msgstr "荐絎"
-#: src/prefs_common_dialog.c:690
+#: src/prefs_common_dialog.c:693
msgid "Display"
msgstr "茵腓"
-#: src/prefs_common_dialog.c:692
+#: src/prefs_common_dialog.c:695
msgid "Junk mail"
msgstr "菴傑<若"
-#: src/prefs_common_dialog.c:698
+#: src/prefs_common_dialog.c:701
msgid "Details"
msgstr "荅括完"
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
msgid "Auto-check new mail"
msgstr "亥<若с"
-#: src/prefs_common_dialog.c:754 src/prefs_common_dialog.c:1127
+#: src/prefs_common_dialog.c:757 src/prefs_common_dialog.c:1130
msgid "every"
msgstr " "
-#: src/prefs_common_dialog.c:766 src/prefs_common_dialog.c:1141
+#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:1144
msgid "minute(s)"
msgstr ""
-#: src/prefs_common_dialog.c:775
+#: src/prefs_common_dialog.c:778
msgid "Check new mail on startup"
msgstr "莎桁亥<若с"
-#: src/prefs_common_dialog.c:777
+#: src/prefs_common_dialog.c:780
msgid "Update all local folders after incorporation"
msgstr "篆≦鴻若贋違"
-#: src/prefs_common_dialog.c:782
+#: src/prefs_common_dialog.c:785
msgid "Execute command when new messages arrived"
msgstr "亥<祉若吾亥潟潟絎茵"
-#: src/prefs_common_dialog.c:794 src/prefs_common_dialog.c:2437
-#: src/prefs_common_dialog.c:2459 src/prefs_common_dialog.c:2481
+#: src/prefs_common_dialog.c:797 src/prefs_common_dialog.c:2444
+#: src/prefs_common_dialog.c:2466 src/prefs_common_dialog.c:2488
msgid "Command"
msgstr "潟潟"
-#: src/prefs_common_dialog.c:805
+#: src/prefs_common_dialog.c:808
#, c-format
msgid "`%d' will be replaced with the number of new messages."
msgstr "`%d' 亥<祉若御違х舟障"
-#: src/prefs_common_dialog.c:809
+#: src/prefs_common_dialog.c:812
msgid "Incorporate from local spool"
msgstr "若鴻若莨若"
-#: src/prefs_common_dialog.c:822
+#: src/prefs_common_dialog.c:825
msgid "Filter on incorporation"
msgstr "莨惹"
-#: src/prefs_common_dialog.c:828
+#: src/prefs_common_dialog.c:831
msgid "Spool path"
msgstr "鴻若"
-#: src/prefs_common_dialog.c:879
+#: src/prefs_common_dialog.c:882
msgid "Save sent messages to outbox"
msgstr "篆<<祉若吾篆≧ァ篆絖"
-#: src/prefs_common_dialog.c:881
+#: src/prefs_common_dialog.c:884
msgid "Apply filter rules to sent messages"
msgstr "篆<<祉若吾c帥若"
-#: src/prefs_common_dialog.c:888
+#: src/prefs_common_dialog.c:891
msgid "Transfer encoding"
msgstr "荵∫膃垸劫"
-#: src/prefs_common_dialog.c:911
+#: src/prefs_common_dialog.c:914
msgid ""
"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
"characters."
@@ -4653,15 +4653,15 @@ msgstr ""
"<祉若御ASCII絖篁ュ翫篏睡 Content-Transfer-Encoding "
"絎"
-#: src/prefs_common_dialog.c:918
+#: src/prefs_common_dialog.c:921
msgid "MIME filename encoding"
msgstr "MIME<ゃ潟潟若c潟"
-#: src/prefs_common_dialog.c:929
+#: src/prefs_common_dialog.c:932
msgid "MIME header"
msgstr "MIME"
-#: src/prefs_common_dialog.c:939
+#: src/prefs_common_dialog.c:942
msgid ""
"Specify encoding method for MIME filename with non-ASCII characters.\n"
"MIME header: most popular, but violates RFC 2047\n"
@@ -4671,172 +4671,172 @@ msgstr ""
"MIME: RFC 2047\n"
"RFC 2231: 罔羣羣"
-#: src/prefs_common_dialog.c:1007 src/prefs_common_dialog.c:1396
+#: src/prefs_common_dialog.c:1010 src/prefs_common_dialog.c:1399
#: src/prefs_folder_item.c:139
msgid "General"
msgstr "筝"
-#: src/prefs_common_dialog.c:1022
+#: src/prefs_common_dialog.c:1025
msgid "Signature separator"
msgstr "臀峨阪"
-#: src/prefs_common_dialog.c:1031
+#: src/prefs_common_dialog.c:1034
msgid "Insert automatically"
msgstr "水ャ"
-#: src/prefs_common_dialog.c:1033 src/prefs_toolbar.c:53
+#: src/prefs_common_dialog.c:1036 src/prefs_toolbar.c:53
msgid "Reply"
msgstr "菴篆"
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
msgid "Automatically select account for replies"
msgstr "菴篆≧≪潟御"
-#: src/prefs_common_dialog.c:1043
+#: src/prefs_common_dialog.c:1046
msgid "Quote message when replying"
msgstr "菴篆≧<祉若吾綣"
-#: src/prefs_common_dialog.c:1045
+#: src/prefs_common_dialog.c:1048
msgid "Reply button invokes mailing list reply"
msgstr "菴篆<帥潟с<若潟違鴻菴篆<"
-#: src/prefs_common_dialog.c:1047
+#: src/prefs_common_dialog.c:1050
msgid "Inherit recipients on reply to self messages"
msgstr "冴<祉若吾菴篆<翫絎綣膓"
#. editor
-#: src/prefs_common_dialog.c:1051 src/prefs_common_dialog.c:2400
+#: src/prefs_common_dialog.c:1054 src/prefs_common_dialog.c:2407
#: src/prefs_toolbar.c:117
msgid "Editor"
msgstr "c"
-#: src/prefs_common_dialog.c:1058
+#: src/prefs_common_dialog.c:1061
msgid "Automatically launch the external editor"
msgstr "紊c帥莎桁"
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
msgid "Undo level"
msgstr "≪潟ャ"
-#: src/prefs_common_dialog.c:1088
+#: src/prefs_common_dialog.c:1091
msgid "Wrap messages at"
msgstr "<祉若吾茹"
-#: src/prefs_common_dialog.c:1100
+#: src/prefs_common_dialog.c:1103
msgid "characters"
msgstr "絖ф壕"
-#: src/prefs_common_dialog.c:1110
+#: src/prefs_common_dialog.c:1113
msgid "Wrap quotation"
msgstr "綣翫就"
-#: src/prefs_common_dialog.c:1116
+#: src/prefs_common_dialog.c:1119
msgid "Wrap on input"
msgstr "ュ翫就"
-#: src/prefs_common_dialog.c:1125
+#: src/prefs_common_dialog.c:1128
msgid "Auto-save to draft"
msgstr "腮帥篆絖"
-#: src/prefs_common_dialog.c:1150
+#: src/prefs_common_dialog.c:1153
msgid "Format"
msgstr "後"
-#: src/prefs_common_dialog.c:1155
+#: src/prefs_common_dialog.c:1158
msgid "Spell checking"
msgstr "鴻с"
#. reply
-#: src/prefs_common_dialog.c:1207
+#: src/prefs_common_dialog.c:1210
msgid "Reply format"
msgstr "菴篆<後"
-#: src/prefs_common_dialog.c:1222 src/prefs_common_dialog.c:1264
+#: src/prefs_common_dialog.c:1225 src/prefs_common_dialog.c:1267
msgid "Quotation mark"
msgstr "綣膃"
#. forward
-#: src/prefs_common_dialog.c:1249
+#: src/prefs_common_dialog.c:1252
msgid "Forward format"
msgstr "荵∫後"
-#: src/prefs_common_dialog.c:1296
+#: src/prefs_common_dialog.c:1299
msgid " Description of symbols "
msgstr " 荐垩茯 "
-#: src/prefs_common_dialog.c:1325
+#: src/prefs_common_dialog.c:1328
msgid "Enable Spell checking"
msgstr "鴻с鴻"
-#: src/prefs_common_dialog.c:1337
+#: src/prefs_common_dialog.c:1340
msgid "Default language:"
msgstr "√荐茯:"
-#: src/prefs_common_dialog.c:1404
+#: src/prefs_common_dialog.c:1407
msgid "Text font"
msgstr "鴻潟"
#. ---- Folder View ----
-#: src/prefs_common_dialog.c:1416
+#: src/prefs_common_dialog.c:1419
msgid "Folder View"
msgstr "ャ"
-#: src/prefs_common_dialog.c:1424
+#: src/prefs_common_dialog.c:1427
msgid "Display unread number next to folder name"
msgstr "罔茯違茵腓冴"
-#: src/prefs_common_dialog.c:1426
+#: src/prefs_common_dialog.c:1429
msgid "Display message number columns in the folder view"
msgstr "ャ若<祉若御違茵腓冴"
-#: src/prefs_common_dialog.c:1435
+#: src/prefs_common_dialog.c:1438
msgid "Abbreviate newsgroups longer than"
msgstr "絖違"
-#: src/prefs_common_dialog.c:1450
+#: src/prefs_common_dialog.c:1453
msgid "letters"
msgstr "絖激ャ若鴻違若膂∞ヨ;腓"
#. ---- Summary ----
-#: src/prefs_common_dialog.c:1456
+#: src/prefs_common_dialog.c:1459
msgid "Summary View"
msgstr "泣ャ"
-#: src/prefs_common_dialog.c:1465
+#: src/prefs_common_dialog.c:1468
msgid "Display recipient on `From' column if sender is yourself"
msgstr "綏坂査翫 `綏坂査' 絎茵腓冴"
-#: src/prefs_common_dialog.c:1467
+#: src/prefs_common_dialog.c:1470
msgid "Expand threads"
msgstr "鴻絮"
-#: src/prefs_common_dialog.c:1475 src/prefs_common_dialog.c:2824
-#: src/prefs_common_dialog.c:2862
+#: src/prefs_common_dialog.c:1478 src/prefs_common_dialog.c:2831
+#: src/prefs_common_dialog.c:2869
msgid "Date format"
msgstr "ヤ後"
-#: src/prefs_common_dialog.c:1496
+#: src/prefs_common_dialog.c:1499
msgid " Set display item of summary... "
msgstr " 泣茵腓咲荐絎... "
-#: src/prefs_common_dialog.c:1502
+#: src/prefs_common_dialog.c:1505
msgid "Message"
msgstr "<祉若"
-#: src/prefs_common_dialog.c:1512
+#: src/prefs_common_dialog.c:1515
msgid "Default character encoding"
msgstr "√絖潟潟若c潟"
-#: src/prefs_common_dialog.c:1526
+#: src/prefs_common_dialog.c:1529
msgid "This is used when displaying messages with missing character encoding."
msgstr ""
"潟潟若c潟違絎<祉若吾茵腓冴篏睡障"
-#: src/prefs_common_dialog.c:1532
+#: src/prefs_common_dialog.c:1535
msgid "Outgoing character encoding"
msgstr "篆≧絖潟潟若c潟"
-#: src/prefs_common_dialog.c:1546
+#: src/prefs_common_dialog.c:1549
msgid ""
"If `Automatic' is selected, the optimal encoding for the current locale will "
"be used."
@@ -4844,89 +4844,93 @@ msgstr ""
"荐絎御翫憜荐茯荐絎潟潟若c潟違篏睡"
"障"
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1611
msgid "Enable coloration of message"
msgstr "<祉若吾蚊鴻"
-#: src/prefs_common_dialog.c:1622
+#: src/prefs_common_dialog.c:1626
msgid ""
"Display multi-byte alphabet and numeric as\n"
"ASCII character (Japanese only)"
msgstr "ゃ掩医 ASCII 絖ц;腓冴 (ユ茯)"
-#: src/prefs_common_dialog.c:1629
+#: src/prefs_common_dialog.c:1633
msgid "Display header pane above message view"
msgstr "<祉若吾ャ若筝ゃ潟茵腓冴"
-#: src/prefs_common_dialog.c:1636
+#: src/prefs_common_dialog.c:1640
msgid "Display short headers on message view"
msgstr "<祉若吾ャ若膂∞ャ茵腓冴"
-#: src/prefs_common_dialog.c:1648
+#: src/prefs_common_dialog.c:1652
msgid "Render HTML messages as text"
msgstr "HTML <祉若吾茹i鴻茵腓冴"
-#: src/prefs_common_dialog.c:1652
+#: src/prefs_common_dialog.c:1654
+msgid "Treat HTML only messages as attachment"
+msgstr "HTML 帥<祉若吾羞私宴"
+
+#: src/prefs_common_dialog.c:1658
msgid "Display cursor in message view"
msgstr "<祉若吾ャ若若純茵腓冴"
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1671
msgid "Line space"
msgstr "茵腥冴"
-#: src/prefs_common_dialog.c:1679 src/prefs_common_dialog.c:1717
+#: src/prefs_common_dialog.c:1685 src/prefs_common_dialog.c:1723
msgid "pixel(s)"
msgstr "祉"
-#: src/prefs_common_dialog.c:1684
+#: src/prefs_common_dialog.c:1690
msgid "Scroll"
msgstr "鴻若"
-#: src/prefs_common_dialog.c:1691
+#: src/prefs_common_dialog.c:1697
msgid "Half page"
msgstr "若後篏"
-#: src/prefs_common_dialog.c:1697
+#: src/prefs_common_dialog.c:1703
msgid "Smooth scroll"
msgstr "鴻若冴鴻若"
-#: src/prefs_common_dialog.c:1703
+#: src/prefs_common_dialog.c:1709
msgid "Step"
msgstr ""
-#: src/prefs_common_dialog.c:1723
+#: src/prefs_common_dialog.c:1729
msgid "Images"
msgstr "糸"
-#: src/prefs_common_dialog.c:1731
+#: src/prefs_common_dialog.c:1737
msgid "Resize attached large images to fit in the window"
msgstr "紊с羞私糸c潟泣ゃ冴"
-#: src/prefs_common_dialog.c:1733
+#: src/prefs_common_dialog.c:1739
msgid "Display images as inline"
msgstr "糸ゃ潟ゃ潟ц;腓冴"
-#: src/prefs_common_dialog.c:1818
+#: src/prefs_common_dialog.c:1825
msgid "Enable Junk mail control"
msgstr "菴傑<若絲丞鴻"
-#: src/prefs_common_dialog.c:1830
+#: src/prefs_common_dialog.c:1837
msgid "Learning command:"
msgstr "絖膺潟潟:"
-#: src/prefs_common_dialog.c:1839
+#: src/prefs_common_dialog.c:1846
msgid "(Select preset)"
msgstr "(祉御)"
-#: src/prefs_common_dialog.c:1864
+#: src/prefs_common_dialog.c:1871
msgid "Not Junk"
msgstr "菴傑<若"
-#: src/prefs_common_dialog.c:1879
+#: src/prefs_common_dialog.c:1886
msgid "Classifying command"
msgstr "ゅ潟潟"
-#: src/prefs_common_dialog.c:1890
+#: src/prefs_common_dialog.c:1897
msgid ""
"To classify junk mails automatically, both junk and not junk mails must be "
"learned manually to a certain extent."
@@ -4934,206 +4938,206 @@ msgstr ""
"菴傑<若ゅ菴傑<若菴傑<若筝≧鴻腮綺"
"фу膺綽荀障"
-#: src/prefs_common_dialog.c:1900
+#: src/prefs_common_dialog.c:1907
msgid "Junk folder"
msgstr "菴傑<若"
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1925
msgid "The messages which are set as junk mail will be moved to this folder."
msgstr "菴傑<若絎<祉若吾腱糸障"
-#: src/prefs_common_dialog.c:1929
+#: src/prefs_common_dialog.c:1936
msgid "Filter messages classified as junk on receiving"
msgstr "篆≧菴傑<若ゅ<祉若吾"
-#: src/prefs_common_dialog.c:1932
+#: src/prefs_common_dialog.c:1939
msgid "Filter junk mails before normal filtering"
msgstr "絽吾菴傑<若"
-#: src/prefs_common_dialog.c:1935
+#: src/prefs_common_dialog.c:1942
msgid "Delete junk mails from server on receiving"
msgstr "篆≧菴傑<若泣若ゃ"
-#: src/prefs_common_dialog.c:1940
+#: src/prefs_common_dialog.c:1947
msgid "Mark filtered junk mails as read"
msgstr "菴傑<若∵"
-#: src/prefs_common_dialog.c:1982
+#: src/prefs_common_dialog.c:1989
msgid "Automatically check signatures"
msgstr "臀峨罎荐若"
-#: src/prefs_common_dialog.c:1985
+#: src/prefs_common_dialog.c:1992
msgid "Show signature check result in a popup window"
msgstr "臀峨罎荐主≪c潟ц;腓冴"
-#: src/prefs_common_dialog.c:1988
+#: src/prefs_common_dialog.c:1995
msgid "Store passphrase in memory temporarily"
msgstr "鴻若冴<≪筝筝荐吟"
-#: src/prefs_common_dialog.c:2003
+#: src/prefs_common_dialog.c:2010
msgid "Expired after"
msgstr "号"
-#: src/prefs_common_dialog.c:2016
+#: src/prefs_common_dialog.c:2023
msgid "minute(s) "
msgstr ""
-#: src/prefs_common_dialog.c:2030
+#: src/prefs_common_dialog.c:2037
msgid "Setting to '0' will store the passphrase for the whole session."
msgstr "'0' 荐絎祉激с潟筝鴻若冴荐吟障"
-#: src/prefs_common_dialog.c:2039
+#: src/prefs_common_dialog.c:2046
msgid "Grab input while entering a passphrase"
msgstr "鴻若冴ュュ"
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2051
msgid "Display warning on startup if GnuPG doesn't work"
msgstr "GnuPG 篏翫莎桁茘茵腓冴"
-#: src/prefs_common_dialog.c:2113
+#: src/prefs_common_dialog.c:2120
msgid "Always open messages in summary when selected"
msgstr "泣с<祉若吾御絽吾"
-#: src/prefs_common_dialog.c:2117
+#: src/prefs_common_dialog.c:2124
msgid "Open first unread message when a folder is opened"
msgstr "茯<祉若吾"
-#: src/prefs_common_dialog.c:2124
+#: src/prefs_common_dialog.c:2131
msgid "Remember last selected message"
msgstr "緇御<祉若吾荐吟"
-#: src/prefs_common_dialog.c:2128
+#: src/prefs_common_dialog.c:2135
msgid "Only mark message as read when opened in new window"
msgstr "域c潟ч帥<祉若吾∵若"
-#: src/prefs_common_dialog.c:2132
+#: src/prefs_common_dialog.c:2139
msgid "Open inbox after receiving new mail"
msgstr "亥<若篆<緇篆∞宴"
-#: src/prefs_common_dialog.c:2134
+#: src/prefs_common_dialog.c:2141
msgid "Open inbox on startup"
msgstr "莎桁篆∞宴"
-#: src/prefs_common_dialog.c:2142
+#: src/prefs_common_dialog.c:2149
msgid "Execute immediately when moving or deleting messages"
msgstr "<祉若吾腱糸障ゃ喝婚絎茵"
-#: src/prefs_common_dialog.c:2154
+#: src/prefs_common_dialog.c:2161
msgid "Messages will be marked until execution if this is turned off."
msgstr ""
"≦鴻<祉若吾絎茵障с若倶障"
-#: src/prefs_common_dialog.c:2163
+#: src/prefs_common_dialog.c:2170
msgid "Make the order of buttons comply with GNOME HIG"
msgstr "帥潟臀GNOME HIG羣"
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2173
msgid "Display tray icon"
msgstr "ゃ≪ゃ潟潟茵腓冴"
-#: src/prefs_common_dialog.c:2168
+#: src/prefs_common_dialog.c:2175
msgid "Minimize to tray icon"
msgstr "絨ゃ≪ゃ潟潟主"
-#: src/prefs_common_dialog.c:2170
+#: src/prefs_common_dialog.c:2177
msgid "Toggle window on trayicon click"
msgstr "ゃ≪ゃ潟潟сc潟茵腓冴篋や帥"
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2187
msgid " Set key bindings... "
msgstr " 若ゃ潟荐絎... "
-#: src/prefs_common_dialog.c:2186 src/select-keys.c:347
+#: src/prefs_common_dialog.c:2193 src/select-keys.c:347
msgid "Other"
msgstr "篁"
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2197
msgid "External commands"
msgstr "紊潟潟"
-#: src/prefs_common_dialog.c:2243
+#: src/prefs_common_dialog.c:2250
msgid "Receive dialog"
msgstr "篆<ゃ≪"
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2260
msgid "Show receive dialog"
msgstr "篆<ゃ≪違"
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2270
msgid "Always"
msgstr "絽吾茵腓"
-#: src/prefs_common_dialog.c:2264
+#: src/prefs_common_dialog.c:2271
msgid "Only on manual receiving"
msgstr "у篆<翫粋;腓"
-#: src/prefs_common_dialog.c:2266
+#: src/prefs_common_dialog.c:2273
msgid "Never"
msgstr "茵腓冴"
-#: src/prefs_common_dialog.c:2271
+#: src/prefs_common_dialog.c:2278
msgid "Don't popup error dialog on receive error"
msgstr "篆<惹若ゃ≪違≪"
-#: src/prefs_common_dialog.c:2274
+#: src/prefs_common_dialog.c:2281
msgid "Close receive dialog when finished"
msgstr "絎篋篆<ゃ≪違"
-#: src/prefs_common_dialog.c:2285
+#: src/prefs_common_dialog.c:2292
msgid "Add address to destination when double-clicked"
msgstr "≪鴻絎菴遵"
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2294
msgid "On exit"
msgstr "腟篋"
-#: src/prefs_common_dialog.c:2295
+#: src/prefs_common_dialog.c:2302
msgid "Confirm on exit"
msgstr "腟篋腆肴"
-#: src/prefs_common_dialog.c:2302
+#: src/prefs_common_dialog.c:2309
msgid "Empty trash on exit"
msgstr "腟篋睡宴腥冴"
-#: src/prefs_common_dialog.c:2304
+#: src/prefs_common_dialog.c:2311
msgid "Ask before emptying"
msgstr "腥冴絨"
-#: src/prefs_common_dialog.c:2308
+#: src/prefs_common_dialog.c:2315
msgid "Warn if there are queued messages"
msgstr "篆≦罘筝<祉若吾域"
-#: src/prefs_common_dialog.c:2363
+#: src/prefs_common_dialog.c:2370
#, c-format
msgid "External commands (%s will be replaced with file name / URI)"
msgstr "紊潟潟 (%s <ゃURIх舟障)"
-#: src/prefs_common_dialog.c:2372
+#: src/prefs_common_dialog.c:2379
msgid "Web browser"
msgstr "Web"
-#: src/prefs_common_dialog.c:2384 src/prefs_common_dialog.c:3829
-#: src/prefs_common_dialog.c:3850
+#: src/prefs_common_dialog.c:2391 src/prefs_common_dialog.c:3836
+#: src/prefs_common_dialog.c:3857
msgid "(Default browser)"
msgstr "(√)"
-#: src/prefs_common_dialog.c:2425
+#: src/prefs_common_dialog.c:2432
msgid "Use external program for printing"
msgstr "医激紊違篏睡"
-#: src/prefs_common_dialog.c:2447
+#: src/prefs_common_dialog.c:2454
msgid "Use external program for incorporation"
msgstr "<若篆<紊違篏睡"
-#: src/prefs_common_dialog.c:2469
+#: src/prefs_common_dialog.c:2476
msgid "Use external program for sending"
msgstr "<若篆<紊違篏睡"
-#: src/prefs_common_dialog.c:2528
+#: src/prefs_common_dialog.c:2535
msgid "Enable strict checking of the integrity of summary caches"
msgstr "泣c激ャ翫сウ絲с"
-#: src/prefs_common_dialog.c:2531
+#: src/prefs_common_dialog.c:2538
msgid ""
"Enable this if the contents of folders have the possibility of modification "
"by other applications.\n"
@@ -5143,275 +5147,275 @@ msgstr ""
"\n"
"激с潟泣茵腓冴ц純篏筝障"
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2545
msgid "Socket I/O timeout:"
msgstr "純宴 I/O 帥ゃ≪:"
-#: src/prefs_common_dialog.c:2551
+#: src/prefs_common_dialog.c:2558
msgid "second(s)"
msgstr "腱"
-#: src/prefs_common_dialog.c:2579
+#: src/prefs_common_dialog.c:2586
msgid "Automatic (Recommended)"
msgstr "荐絎 (ィ絅)"
-#: src/prefs_common_dialog.c:2584
+#: src/prefs_common_dialog.c:2591
msgid "7bit ascii (US-ASCII)"
msgstr "7bit ascii (US-ASCII)"
-#: src/prefs_common_dialog.c:2586
+#: src/prefs_common_dialog.c:2593
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: src/prefs_common_dialog.c:2588
+#: src/prefs_common_dialog.c:2595
msgid "Western European (ISO-8859-1)"
msgstr "罨х嘘 (ISO-8859-1)"
-#: src/prefs_common_dialog.c:2589
+#: src/prefs_common_dialog.c:2596
msgid "Western European (ISO-8859-15)"
msgstr "罨х嘘 (ISO-8859-15)"
-#: src/prefs_common_dialog.c:2591
+#: src/prefs_common_dialog.c:2598
msgid "Western European (Windows-1252)"
msgstr "罨х嘘 (Windows-1252)"
-#: src/prefs_common_dialog.c:2595
+#: src/prefs_common_dialog.c:2602
msgid "Central European (ISO-8859-2)"
msgstr "筝罨 (ISO-8859-2)"
-#: src/prefs_common_dialog.c:2597
+#: src/prefs_common_dialog.c:2604
msgid "Baltic (ISO-8859-13)"
msgstr "茫後 (ISO-8859-13)"
-#: src/prefs_common_dialog.c:2598
+#: src/prefs_common_dialog.c:2605
msgid "Baltic (ISO-8859-4)"
msgstr "茫後 (ISO-8859-4)"
-#: src/prefs_common_dialog.c:2599
+#: src/prefs_common_dialog.c:2606
msgid "Baltic (Windows-1257)"
msgstr "茫後 (Windows-1257)"
-#: src/prefs_common_dialog.c:2601
+#: src/prefs_common_dialog.c:2608
msgid "Greek (ISO-8859-7)"
msgstr "激h (ISO-8859-7)"
-#: src/prefs_common_dialog.c:2603
+#: src/prefs_common_dialog.c:2610
msgid "Arabic (ISO-8859-6)"
msgstr "≪∵ (ISO-8859-4)"
-#: src/prefs_common_dialog.c:2604
+#: src/prefs_common_dialog.c:2611
msgid "Arabic (Windows-1256)"
msgstr "≪∵ (Windows-1251)"
-#: src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:2613
msgid "Hebrew (ISO-8859-8)"
msgstr "よ (ISO-8859-8)"
-#: src/prefs_common_dialog.c:2607
+#: src/prefs_common_dialog.c:2614
msgid "Hebrew (Windows-1255)"
msgstr "よ (Windows-1255)"
-#: src/prefs_common_dialog.c:2609
+#: src/prefs_common_dialog.c:2616
msgid "Turkish (ISO-8859-9)"
msgstr "活 (ISO-8859-9)"
-#: src/prefs_common_dialog.c:2611
+#: src/prefs_common_dialog.c:2618
msgid "Cyrillic (ISO-8859-5)"
msgstr "絖 (ISO-8859-5)"
-#: src/prefs_common_dialog.c:2612
+#: src/prefs_common_dialog.c:2619
msgid "Cyrillic (KOI8-R)"
msgstr "絖 (KOI8-R)"
-#: src/prefs_common_dialog.c:2613
+#: src/prefs_common_dialog.c:2620
msgid "Cyrillic (KOI8-U)"
msgstr "絖 (KOI8-U)"
-#: src/prefs_common_dialog.c:2614
+#: src/prefs_common_dialog.c:2621
msgid "Cyrillic (Windows-1251)"
msgstr "絖 (Windows-1251)"
-#: src/prefs_common_dialog.c:2616
+#: src/prefs_common_dialog.c:2623
msgid "Japanese (ISO-2022-JP)"
msgstr "ユ茯 (ISO-2022-JP)"
-#: src/prefs_common_dialog.c:2618
+#: src/prefs_common_dialog.c:2625
msgid "Japanese (EUC-JP)"
msgstr "ユ茯 (EUC-JP)"
-#: src/prefs_common_dialog.c:2619
+#: src/prefs_common_dialog.c:2626
msgid "Japanese (Shift_JIS)"
msgstr "ユ茯 (Shift_JIS)"
-#: src/prefs_common_dialog.c:2622
+#: src/prefs_common_dialog.c:2629
msgid "Simplified Chinese (GB2312)"
msgstr "膂>絖筝処 (GB2312)"
-#: src/prefs_common_dialog.c:2623
+#: src/prefs_common_dialog.c:2630
msgid "Simplified Chinese (GBK)"
msgstr "膂>絖筝処 (GBK)"
-#: src/prefs_common_dialog.c:2624
+#: src/prefs_common_dialog.c:2631
msgid "Traditional Chinese (Big5)"
msgstr "膵篏絖筝処 (Big5)"
-#: src/prefs_common_dialog.c:2626
+#: src/prefs_common_dialog.c:2633
msgid "Traditional Chinese (EUC-TW)"
msgstr "膵篏絖筝処 (EUC-TW)"
-#: src/prefs_common_dialog.c:2627
+#: src/prefs_common_dialog.c:2634
msgid "Chinese (ISO-2022-CN)"
msgstr "筝処 (ISO-2022-CN)"
-#: src/prefs_common_dialog.c:2630
+#: src/prefs_common_dialog.c:2637
msgid "Korean (EUC-KR)"
msgstr "処 (EUC-KR)"
-#: src/prefs_common_dialog.c:2632
+#: src/prefs_common_dialog.c:2639
msgid "Thai (TIS-620)"
msgstr "帥よ (TIS-620)"
-#: src/prefs_common_dialog.c:2633
+#: src/prefs_common_dialog.c:2640
msgid "Thai (Windows-874)"
msgstr "帥よ (Windows-874)"
-#: src/prefs_common_dialog.c:2800
+#: src/prefs_common_dialog.c:2807
msgid "the full abbreviated weekday name"
msgstr "ャュ"
-#: src/prefs_common_dialog.c:2801
+#: src/prefs_common_dialog.c:2808
msgid "the full weekday name"
msgstr "ャ絎"
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2809
msgid "the abbreviated month name"
msgstr "ュ"
-#: src/prefs_common_dialog.c:2803
+#: src/prefs_common_dialog.c:2810
msgid "the full month name"
msgstr "絎"
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2811
msgid "the preferred date and time for the current locale"
msgstr "憜医筝ヤ祉茵荐"
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2812
msgid "the century number (year/100)"
msgstr "筝膣(茱炊綛眼筝2罅)"
-#: src/prefs_common_dialog.c:2806
+#: src/prefs_common_dialog.c:2813
msgid "the day of the month as a decimal number"
msgstr "(10我域;荐)"
-#: src/prefs_common_dialog.c:2807
+#: src/prefs_common_dialog.c:2814
msgid "the hour as a decimal number using a 24-hour clock"
msgstr "24荐с"
-#: src/prefs_common_dialog.c:2808
+#: src/prefs_common_dialog.c:2815
msgid "the hour as a decimal number using a 12-hour clock"
msgstr "12荐с"
-#: src/prefs_common_dialog.c:2809
+#: src/prefs_common_dialog.c:2816
msgid "the day of the year as a decimal number"
msgstr "綛眼膊ユ(10我域;荐)"
-#: src/prefs_common_dialog.c:2810
+#: src/prefs_common_dialog.c:2817
msgid "the month as a decimal number"
msgstr "(10我域;荐)"
-#: src/prefs_common_dialog.c:2811
+#: src/prefs_common_dialog.c:2818
msgid "the minute as a decimal number"
msgstr "(10我域;荐)"
-#: src/prefs_common_dialog.c:2812
+#: src/prefs_common_dialog.c:2819
msgid "either AM or PM"
msgstr "障緇"
-#: src/prefs_common_dialog.c:2813
+#: src/prefs_common_dialog.c:2820
msgid "the second as a decimal number"
msgstr "腱(10我域;荐)"
-#: src/prefs_common_dialog.c:2814
+#: src/prefs_common_dialog.c:2821
msgid "the day of the week as a decimal number"
msgstr "宴篏ャ(10我域;荐)"
-#: src/prefs_common_dialog.c:2815
+#: src/prefs_common_dialog.c:2822
msgid "the preferred date for the current locale"
msgstr "憜医筝ヤ茵荐"
-#: src/prefs_common_dialog.c:2816
+#: src/prefs_common_dialog.c:2823
msgid "the last two digits of a year"
msgstr "茱炊筝2罅(筝膣障綛)"
-#: src/prefs_common_dialog.c:2817
+#: src/prefs_common_dialog.c:2824
msgid "the year as a decimal number"
msgstr "(4罅)茱炊綛"
-#: src/prefs_common_dialog.c:2818
+#: src/prefs_common_dialog.c:2825
msgid "the time zone or name or abbreviation"
msgstr "帥ゃ障若潟障障若喝障ュ"
-#: src/prefs_common_dialog.c:2839
+#: src/prefs_common_dialog.c:2846
msgid "Specifier"
msgstr "絎絖"
-#: src/prefs_common_dialog.c:2840
+#: src/prefs_common_dialog.c:2847
msgid "Description"
msgstr "茯"
-#: src/prefs_common_dialog.c:2880
+#: src/prefs_common_dialog.c:2887
msgid "Example"
msgstr "箴"
-#: src/prefs_common_dialog.c:2961
+#: src/prefs_common_dialog.c:2968
msgid "Set message colors"
msgstr "<祉若吾蚊絎"
-#: src/prefs_common_dialog.c:2969
+#: src/prefs_common_dialog.c:2976
msgid "Colors"
msgstr ""
-#: src/prefs_common_dialog.c:3003
+#: src/prefs_common_dialog.c:3010
msgid "Quoted Text - First Level"
msgstr "綣 - 1罧級"
-#: src/prefs_common_dialog.c:3009
+#: src/prefs_common_dialog.c:3016
msgid "Quoted Text - Second Level"
msgstr "綣 - 2罧級"
-#: src/prefs_common_dialog.c:3015
+#: src/prefs_common_dialog.c:3022
msgid "Quoted Text - Third Level"
msgstr "綣 - 3罧級"
-#: src/prefs_common_dialog.c:3021
+#: src/prefs_common_dialog.c:3028
msgid "URI link"
msgstr "URI 潟"
-#: src/prefs_common_dialog.c:3028
+#: src/prefs_common_dialog.c:3035
msgid "Recycle quote colors"
msgstr "綣蚊緇"
-#: src/prefs_common_dialog.c:3095
+#: src/prefs_common_dialog.c:3102
msgid "Pick color for quotation level 1"
msgstr "綣1蚊御"
-#: src/prefs_common_dialog.c:3098
+#: src/prefs_common_dialog.c:3105
msgid "Pick color for quotation level 2"
msgstr "綣2蚊御"
-#: src/prefs_common_dialog.c:3101
+#: src/prefs_common_dialog.c:3108
msgid "Pick color for quotation level 3"
msgstr "綣3蚊御"
-#: src/prefs_common_dialog.c:3104
+#: src/prefs_common_dialog.c:3111
msgid "Pick color for URI"
msgstr "URI 蚊御"
-#: src/prefs_common_dialog.c:3244
+#: src/prefs_common_dialog.c:3251
msgid "Description of symbols"
msgstr "荐垩茯"
-#: src/prefs_common_dialog.c:3300
+#: src/prefs_common_dialog.c:3307
msgid ""
"Date\n"
"From\n"
@@ -5435,11 +5439,11 @@ msgstr ""
"ャ若鴻違若\n"
"<祉若ID"
-#: src/prefs_common_dialog.c:3313
+#: src/prefs_common_dialog.c:3320
msgid "If x is set, displays expr"
msgstr "x絎expr茵腓"
-#: src/prefs_common_dialog.c:3317
+#: src/prefs_common_dialog.c:3324
msgid ""
"Message body\n"
"Quoted message body\n"
@@ -5453,7 +5457,7 @@ msgstr ""
"綣膃篁<祉若御(臀峨)\n"
"絖 %"
-#: src/prefs_common_dialog.c:3325
+#: src/prefs_common_dialog.c:3332
msgid ""
"Literal backslash\n"
"Literal question mark\n"
@@ -5465,19 +5469,19 @@ msgstr ""
"絖 筝綣\n"
"絖 筝綣"
-#: src/prefs_common_dialog.c:3371
+#: src/prefs_common_dialog.c:3378
msgid "Key bindings"
msgstr "若ゃ潟"
-#: src/prefs_common_dialog.c:3384
+#: src/prefs_common_dialog.c:3391
msgid "Select the preset of key bindings."
msgstr " 若ゃ潟祉御"
-#: src/prefs_common_dialog.c:3394 src/prefs_common_dialog.c:3718
+#: src/prefs_common_dialog.c:3401 src/prefs_common_dialog.c:3725
msgid "Default"
msgstr "罔羣"
-#: src/prefs_common_dialog.c:3397 src/prefs_common_dialog.c:3727
+#: src/prefs_common_dialog.c:3404 src/prefs_common_dialog.c:3734
msgid "Old Sylpheed"
msgstr "Sylpheed"
diff --git a/src/messageview.c b/src/messageview.c
index 59e2bb3d..828c442b 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -520,7 +520,8 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
textview_set_all_headers(messageview->mimeview->textview, all_headers);
if (mimeinfo->mime_type != MIME_TEXT &&
- mimeinfo->mime_type != MIME_TEXT_HTML) {
+ (prefs_common.html_only_as_attach ||
+ mimeinfo->mime_type != MIME_TEXT_HTML)) {
messageview_change_view_type(messageview, MVIEW_MIME);
mimeview_show_message(messageview->mimeview, mimeinfo, file);
} else {
diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c
index df1dcb00..7c8bed77 100644
--- a/src/prefs_common_dialog.c
+++ b/src/prefs_common_dialog.c
@@ -143,6 +143,7 @@ static struct Message {
GtkWidget *chkbtn_disphdrpane;
GtkWidget *chkbtn_disphdr;
GtkWidget *chkbtn_html;
+ GtkWidget *chkbtn_htmlonly;
GtkWidget *spinbtn_linespc;
GtkObject *spinbtn_linespc_adj;
@@ -386,6 +387,8 @@ static PrefsUIData ui_data[] = {
prefs_set_data_from_toggle, prefs_set_toggle},
{"render_html", &message.chkbtn_html,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"html_only_as_attach", &message.chkbtn_htmlonly,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"line_space", &message.spinbtn_linespc,
prefs_set_data_from_spinbtn, prefs_set_spinbtn},
@@ -1573,6 +1576,7 @@ static GtkWidget *prefs_message_create(void)
GtkWidget *chkbtn_disphdr;
GtkWidget *button_edit_disphdr;
GtkWidget *chkbtn_html;
+ GtkWidget *chkbtn_htmlonly;
GtkWidget *hbox_linespc;
GtkWidget *label_linespc;
GtkObject *spinbtn_linespc_adj;
@@ -1646,6 +1650,8 @@ static GtkWidget *prefs_message_create(void)
PACK_CHECK_BUTTON(vbox2, chkbtn_html,
_("Render HTML messages as text"));
+ PACK_CHECK_BUTTON(vbox2, chkbtn_htmlonly,
+ _("Treat HTML only messages as attachment"));
#if 0
PACK_CHECK_BUTTON(vbox2, chkbtn_cursor,
@@ -1737,6 +1743,7 @@ static GtkWidget *prefs_message_create(void)
message.chkbtn_disphdrpane = chkbtn_disphdrpane;
message.chkbtn_disphdr = chkbtn_disphdr;
message.chkbtn_html = chkbtn_html;
+ message.chkbtn_htmlonly = chkbtn_htmlonly;
message.spinbtn_linespc = spinbtn_linespc;
message.chkbtn_smoothscroll = chkbtn_smoothscroll;