show error dialog on concatenation failure.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2613 ee746299-78ed-0310-b773-934348b2243d

30 files changed, 1050 insertions, 930 deletions

diff --git a/po/be.po b/po/be.po
index 030fd13f..4c7b129b 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2010-02-22 15:22+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -649,7 +649,7 @@ msgstr ""
 "гэтай праграмай; калі гэтага не адбылося, напішыце ў Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1868,7 +1868,7 @@ msgstr ""
 "Вонкавы рэдактар яшчэ працуе.\n"
 "Скончыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "На_ставіць стужку прылад..."
 
@@ -2399,12 +2399,12 @@ msgstr "Устанаўленне інфармацыі па каталогу...\n
 msgid "Setting folder info..."
 msgstr "Устанаўленне інфармацыі па каталогу..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Прагляд каталога %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканаванне каталога %s ..."
@@ -3869,91 +3869,95 @@ msgstr ""
 "Стварэнне паштовай скрынкі схібіла.\n"
 "Магчыма, файлы ўжо існуюць, ці вы не маеце дазволу на запіс у тым месцы."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Сілфід - Прагляд Каталогаў"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Сілфід - Прагляд Паведамлення"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/Ад_казаць"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Адказаць усім"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Адказаць адпраўніку"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/А_дказаць у спіс рассылкі"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Пер_аправіць"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Перасла_ць як дадатак"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Перанакіраваць"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Іконкі і тэкст"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Тэкст справа ад і_конак"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "Іконкі"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "Тэкст"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "Нічога"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Вы не злучаныя. Клікніце іконку, каб злучыцца."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы ў злучэнні. Клікніце іконку, каб адлучыцца."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Выхад"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Выйсці з праграмы?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 msgid "Select folder to open"
 msgstr "Выберыце каталог"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Опцыі загаднага радка"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Ужыванне: sylpheed [ОПЦЫЯ]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3983,7 +3987,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4013,15 +4017,15 @@ msgstr ""
 "паказаць гэту даведку і выйсці\n"
 "паказаць звесткі пра версію і выйсці"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport нум_порта    задаць порт для аддаленых загадаў IPC"
diff --git a/po/bg.po b/po/bg.po
index 513076c5..ac810c0f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -650,7 +650,7 @@ msgstr ""
 "програмата; в случай, че не сте, обърнете се към Free Software Foundation, "
 "Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1926,7 +1926,7 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2480,12 +2480,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -4017,100 +4017,104 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Текст"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Никой"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Избор на папка"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Не е въведен команден ред."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4127,7 +4131,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4144,15 +4148,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 60752975..3c86535b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2010-02-18 23:39+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -657,7 +657,7 @@ msgstr ""
 "programem; pokud se tak nestalo, napište o ni Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1873,7 +1873,7 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
@@ -2405,12 +2405,12 @@ msgstr "Nastavování informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavování informace o složce..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledává se složka %s%c%s..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledává se složka %s..."
@@ -3880,91 +3880,95 @@ msgstr ""
 "Může to být tím, že část schránky již existuje, nebo nemáte dostatečná práva "
 "na zápis."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Strom složek"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Odpovědět _všem"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _odesílateli"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _elektronické konferenci"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Předat dál _jako přílohu"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Ikony _a text"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Text naprav_o od ikon"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "_Ikony"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "_Text"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "_Nezobrazovat"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Jste v režimu offline. Kliknutím na ikonu přejdete do režimu online."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Jste v režimu online. Kliknutím na ikonu přejdete do režimu offline."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Ukončit"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Opravdu ukončit Sylpheed?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 msgid "Select folder to open"
 msgstr "Vyberte složku, kterou chcete otevřít"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Přepínače příkazové řádky"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použití: sylpheed [VOLBY]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3994,7 +3998,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4024,15 +4028,15 @@ msgstr ""
 "vypíše tuto nápovědu a skončí\n"
 "vypíše informaci o verzi a skončí"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport čísloportu             určí port pro vzdálené příkazy IPC"
diff --git a/po/da.po b/po/da.po
index cd73c322..ae533a0a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -654,7 +654,7 @@ msgstr ""
 "program.Hvis ikke, så skriv til Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1924,7 +1924,7 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2478,12 +2478,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -4019,100 +4019,104 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Ingen"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Vælg mappe"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4129,7 +4133,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4146,15 +4150,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 85113dab..be16d3df 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -654,7 +654,7 @@ msgstr ""
 "erhalten haben; wenn nicht, dann schreiben Sie an Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1883,7 +1883,7 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "_Werkzeugleiste anpassen"
 
@@ -2424,12 +2424,12 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
@@ -3917,92 +3917,96 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Grafik _und Text"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Text rechts vom Symbol"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "_Grafik"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "_Text"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "_Keine"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Sie sind nicht verbunden. Wählen sie das Bild zum Verbinden."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Sie sind verbunden. Wählen sie das Bild, um die Verbindung zu beenden."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Wähle Ablage"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Kommandozeilenoptionen"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Aufruf: sylpheed [OPTION]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4032,7 +4036,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4061,15 +4065,15 @@ msgstr ""
 "diese Hilfe anzeigen und beenden\n"
 "Versionsinformationen anzeigen und beenden"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portnum      definiert Port für \"IPC remote\" Befehle"
diff --git a/po/el.po b/po/el.po
index a394b533..df6c042a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -665,7 +665,7 @@ msgstr ""
 "(Free Software Foundation) στη διεύθυνση Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02110-1301, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1916,7 +1916,7 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
@@ -2465,12 +2465,12 @@ msgstr "Ορισμός πληροφοριών φακέλου...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες φακέλων..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση φακέλων %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση φακέλου %s ..."
@@ -3975,96 +3975,100 @@ msgstr ""
 "Η δημιουργία του γραμματοκιβωτίου απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Προβολή φακέλων"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Προβολή μηνύματος"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Απάντηση"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "Απάντηση σε Ό_λους"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον απο_στολέα"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση στη _λίστα ηλεκτρονικού ταχυδρομείου"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Πρ_οώθηση"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως συ_νημμένο"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Ε_κτροπή"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr ""
 "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/Κείμενο στα _δεξιά του εικονιδίου"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Κείμενο"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Κανένα"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Είστε συνδεδεμένος. Κάντε κλικ στο εικονίδιο για να αποσυνδεθείτε."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Είστε συνδεδεμένος. Κάντε κλικ στο εικονίδιο για να αποσυνδεθείτε."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Έξοδος από το πρόγραμμα;"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Επιλογή φακέλου"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Επιλογές γραμμής εντολών"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Χρήση: sylpheed [ΕΠΙΛΟΓΗ]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4094,7 +4098,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4124,15 +4128,15 @@ msgstr ""
 "εμφάνιση αυτής της βοήθειας\n"
 "εμφάνιση πληροφοριών έκδοσης"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 84ce41ba..6369911e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2010-02-24 08:05+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -652,7 +652,7 @@ msgstr ""
 "junto con este programa; en caso contrario, escriba a la Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1875,7 +1875,7 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
@@ -2408,12 +2408,12 @@ msgstr "Estableciendo la información de la carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo la información de la carpeta..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -3883,91 +3883,95 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Icono _y texto"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Texto a la de_recha del icono"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "_Icono"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "_Texto"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga clic en el icono para conectar."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga clic en el icono para desconectar."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 msgid "Select folder to open"
 msgstr "Seleccionar carpeta a abrir"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Opciones de línea de ordenes"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPCIÓN]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3997,7 +4001,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4027,15 +4031,15 @@ msgstr ""
 "muestra esta ayuda y termina\n"
 "muestra la información de la versión y termina"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr ""
diff --git a/po/et.po b/po/et.po
index 2216d3b4..887c756a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -658,7 +658,7 @@ msgstr ""
 "programmiga; kui ei, siis kirjuta: Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1933,7 +1933,7 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2488,12 +2488,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -4023,100 +4023,104 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Mittemiski"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Vali kaust"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4133,7 +4137,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4150,15 +4154,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 0c0ee9d8..0fcd5b03 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2010-06-19 02:21+0200\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -664,7 +664,7 @@ msgstr ""
 "programme. Si ce n'est pas le cas, écrivez à la Free Software Foundation, "
 "Inc.,, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1890,7 +1890,7 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
@@ -2425,12 +2425,12 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -3915,91 +3915,95 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Icônes _et textes"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Textes à _droite des icônes"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "_Icônes seulement"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "_Textes seulement"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "_Pas de barre d'outils"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Vous êtes déconnecté. Cliquer sur l'icône pour vous connecter."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Vous êtes connecté. Cliquer sur l'icône pour vous déconnecter."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 msgid "Select folder to open"
 msgstr "Choix d'un dossier à ouvrir"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Options de la ligne de commande"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilisation : sylpheed [OPTION]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4029,7 +4033,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4060,15 +4064,15 @@ msgstr ""
 "afficher l'aide-mémoire et quitter\n"
 "afficher les informations de version et quitter"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr "Option pour Windows uniquement:"
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr "spécifier le port pour les commandes IPC distantes"
 
diff --git a/po/gl.po b/po/gl.po
index 8bd11343..61aa3cf0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -656,7 +656,7 @@ msgstr ""
 "con este programa; en caso contrario, escriba a  Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1931,7 +1931,7 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2486,12 +2486,12 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -4025,100 +4025,104 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Texto"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Ningún"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Seleccionar carpeta"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4135,7 +4139,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4152,15 +4156,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 860a023d..99861ec8 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -663,7 +663,7 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1938,7 +1938,7 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2497,12 +2497,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
@@ -4114,102 +4114,106 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Pregled/_Traka alata/_Slike"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Ništa"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Odaberite spis"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4226,7 +4230,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4243,15 +4247,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index ac652367..520acd74 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2010-02-13 14:38+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@uhuklub.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -655,7 +655,7 @@ msgstr ""
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. http://www."
 "fsf.org "
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1877,7 +1877,7 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
@@ -2408,12 +2408,12 @@ msgstr "Mappa információ beállítása...\n"
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -3879,92 +3879,96 @@ msgstr ""
 "A postaláda létrehozása nem sikerült.\n"
 "Talán néhány fájl már létezik, vagy nincs írási joga a könyvtárba."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappanézet"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Levélnézet"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Ikon é_s szöveg"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Szöveg az ikontól _jobbra"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "_Ikon"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "S_zöveg"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "S_emmi"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Ön kapcsolat nélküli módban van. Kattintson az ikonra a kapcsolódáshoz."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Ön kapcsolódva van. Kattintson az ikonra a kapcsolat nélküli módhoz."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 msgid "Select folder to open"
 msgstr "Megnyitandó mappa kiválasztása"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Parancssori opciók"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Használat: sylpheed [OPCIÓ]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3994,7 +3998,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4024,15 +4028,15 @@ msgstr ""
 "megjeleníti ezt a súgót, majd kilép\n"
 "kiírja a verzió információkat, majd kilép"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portszám      IPC távoli parancsok portjának megadása"
diff --git a/po/it.po b/po/it.po
index 32a2c58c..9b48ffe1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -654,7 +654,7 @@ msgstr ""
 "insieme a questo programma; in caso contrario, scrivete alla Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1887,7 +1887,7 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
@@ -2430,12 +2430,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -3925,92 +3925,96 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Icon_a e testo"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Testo a dest_ra dell'icona"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "_Icona"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "_Testo"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "_Niente"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Selezione della cartella"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Opzioni della linea di comando"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPZIONE]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4040,7 +4044,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4070,15 +4074,15 @@ msgstr ""
 "mostra questo aiuto ed esce\n"
 "mostra informazioni sulla versione ed esce"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portnum      specifca la porta per i comandi IPC da remoto"
diff --git a/po/ja.po b/po/ja.po
index dfbd2c52..e708bbeb 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: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+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"
@@ -652,7 +652,7 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1870,7 +1870,7 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
@@ -2401,12 +2401,12 @@ msgstr "フォルダ情報を設定中...\n"
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
@@ -3870,91 +3870,95 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "ファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "アイコンと文字(_A)"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "アイコンの右に文字(_R)"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "アイコン(_I)"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "文字(_T)"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "非表示(_N)"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr "選択したメッセージを結合できませんでした。"
+
+#: src/mainwindow.c:3853
 msgid "Select folder to open"
 msgstr "開くフォルダを選択してください"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "コマンドラインオプション"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "使用法: sylpheed [オプション]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3984,7 +3988,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4014,15 +4018,15 @@ msgstr ""
 "このヘルプを表示して終了する\n"
 "バージョン情報を出力して終了する"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr "Windows 専用オプション:"
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr "IPC リモートコマンド用のポートを指定する"
 
diff --git a/po/ko.po b/po/ko.po
index 63382da2..3614fb68 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -647,7 +647,7 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1915,7 +1915,7 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2469,12 +2469,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -3999,100 +3999,104 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "텍스트"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "없음"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "폴더 선택"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "명령이 지정되지않음"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4109,7 +4113,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4126,15 +4130,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index b7f8d06c..9c36c21e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -652,7 +652,7 @@ msgstr ""
 "adresu „Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA“."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1869,7 +1869,7 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "_Derinti įrankių juostą..."
 
@@ -2410,12 +2410,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
@@ -3898,92 +3898,96 @@ msgstr ""
 "Nepavyko sukurti dėžutės.\n"
 "Galbūt kai kurie failai jau egzistuoja arba jūs neturite leidimo rašyti ten."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Laiško peržiūra"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Tekstas piktogramos dešinėje"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "P_iktograma"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "_Tekstas"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "_Nieko"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Pasirinkti katalogą"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Komandinės eilutės parametrai"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Naudojimas: sylpheed [PARAMETRAI]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4013,7 +4017,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4043,15 +4047,15 @@ msgstr ""
 "rodyti pagalbos tekstą\n"
 "rodyti versiją"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 1d2e9462..7279a7cd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -661,7 +661,7 @@ msgstr ""
 "bij de Free Software Foundation Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1897,7 +1897,7 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2444,12 +2444,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -3955,99 +3955,103 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/_Iedereen beantwoorden"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/_Afzender beantwoorden"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/_Discussielijst beantwoorden"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Afbeelding"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Geen"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "U bent off-line aan het werken. Klik op het pictogram om on-line te gaan "
 "werken."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "U bent on-line aan het werken. Klik op het pictogram om off-line te gaan "
 "werken."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Selecteer map"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Gebruik: Sylpheed [OPTIES]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4077,7 +4081,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4107,15 +4111,15 @@ msgstr ""
 "dit bericht weergeven\n"
 "versieinformatie weergeven"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 8a5c9e27..c1fa6c67 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2008-06-17 22:25+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -646,7 +646,7 @@ msgstr ""
 "Licencji Publicznej GNU (GNU General Public License);jeśli nie - napisz do "
 "Free Software Foundation, Inc., 675 Mass Ave,Cambridge, MA 02139, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1870,7 +1870,7 @@ msgstr ""
 "Zewnętrzny edytor wciąż pracuje.\n"
 "Czy wymusić zakończenie procesu (pid: %d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "_Dostosuj pasek narzędzi..."
 
@@ -2411,12 +2411,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -3900,97 +3900,101 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Ikony i _tekst"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "_Ikony"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Brak"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Wybierz katalog"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4007,7 +4011,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4024,15 +4028,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c817412..bd199781 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2010-02-22 15:47-0300\n"
 "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n"
 "Language-Team: Portuguese/Brazil <(none)>\n"
@@ -662,7 +662,7 @@ msgstr ""
 "programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple "
 "Place, Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1887,7 +1887,7 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "_Personalizar a barra de ferramentas..."
 
@@ -2421,12 +2421,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -3897,91 +3897,95 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão de escrita para "
 "o caminho indicado."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a _lista"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Encami_nhar"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Encamin_har como anexo"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Ícone _e texto"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Texto à _direita do ícone"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "Í_cone"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "_Texto"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "_Nenhuma"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Você deseja sair deste programa?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 msgid "Select folder to open"
 msgstr "Selecione uma pasta para abrir"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Opções de linha de comando"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPÇÃO]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4011,7 +4015,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4041,15 +4045,15 @@ msgstr ""
 "exibe esta ajuda e encerra\n"
 "exibe informação de versão e encerra"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport porta        número da porta para comandos remotos via IPC"
diff --git a/po/ro.po b/po/ro.po
index 7a72f8b6..6e122b22 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2010-05-09 12:41+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: Gnome Romanian Team <gnomero-list@lists.sourceforge.net>\n"
@@ -662,7 +662,7 @@ msgstr ""
 "acest program; dacă nu, scrieți la Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1908,7 +1908,7 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
@@ -2446,12 +2446,12 @@ msgstr "Configurare informații dosar...\n"
 msgid "Setting folder info..."
 msgstr "Configurare informații dosar..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare dosar %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare dosar %s ..."
@@ -3949,91 +3949,95 @@ msgstr ""
 "Crearea căsuței poștale a eșuat.\n"
 "Poate că unele fișiere există deja, sau acolo nu aveți permisiuni de scriere."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vizualizare dosar"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vizualizare mesaj"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Răspunde _tuturor"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Răspunde _expeditorului"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _listei de discuții"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Îna_intează"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Înaintează ca _atașament"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Redirecționea_ză"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Pictogr_ame și text"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Text la d_reapta pictogramelor"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "P_ictograme"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "_Text"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "_Nimic"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Sunteți offline. Clic pe pictogramă pentru a trece online."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Sunteți online. Clic pe pictogramă pentru a trece offline."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Ieșire"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Ieșiți din acest program ?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 msgid "Select folder to open"
 msgstr "Selectați dosarul de deschis"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Opțiuni de line de comandă"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilizare: sylpheed [OPȚIUNE]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4063,7 +4067,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4093,15 +4097,15 @@ msgstr ""
 "afișează acest ajutor și ieși\n"
 "afișează versiunea și ieși"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 84b3be12..1e4b79e8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2010-06-15 15:18+0400\n"
 "Last-Translator: \n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -660,7 +660,7 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
 "1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1881,7 +1881,7 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "Настроить панель инструментов"
 
@@ -2413,12 +2413,12 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -3885,92 +3885,96 @@ msgstr ""
 "Возможно, некоторые файлы уже существуют, или вы не имеете прав на запись в "
 "каталог."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Иконка и текст"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Текст справа от иконки"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "Иконка"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "Текст"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "Нет"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щёлкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щёлкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 msgid "Select folder to open"
 msgstr "Выбор папки"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Параметры командной строки"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Использование: sylpheed [ПАРАМЕТР]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4000,7 +4004,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4030,15 +4034,15 @@ msgstr ""
 "отобразить этоу подсказку и выйти\n"
 "вывести информацию о версии и выйти"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr "Специфические для Windows настройки:"
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr "--ipcport номер порта"
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr "задать портдля удаленной команды IPC"
 
diff --git a/po/sk.po b/po/sk.po
index 8967e024..cd1e6b14 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -652,7 +652,7 @@ msgstr ""
 "programom. Ak to tak nie je, napíšte na adresu Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1928,7 +1928,7 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2484,12 +2484,12 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -4017,100 +4017,104 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Text"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Žiadna"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Zvoľte priečinok"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4127,7 +4131,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4144,15 +4148,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index 606c2057..ef2bbf41 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -660,7 +660,7 @@ msgstr ""
 "programom; če ga niste, pišite na Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, ZDA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1934,7 +1934,7 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2488,12 +2488,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -4020,100 +4020,104 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Besedilo"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Nič"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Izberi mapo"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4130,7 +4134,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4147,15 +4151,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 28485b50..583d5c8b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -660,7 +660,7 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1929,7 +1929,7 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2483,12 +2483,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
@@ -4015,100 +4015,104 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ikone"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Ništa"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Odaberite direktorijum"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Linija za neredbe nije podešena."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4125,7 +4129,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4142,15 +4146,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 6d755fec..d291d067 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -656,7 +656,7 @@ msgstr ""
 "program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple Place "
 "- Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1897,7 +1897,7 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2443,12 +2443,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -3955,97 +3955,101 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Text"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Ingen"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Du är frånkopplad. Klicka på ikonen för att ansluta."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Du är ansluten. Klicka på ikonen för att koppla från."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Välj mapp"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4062,7 +4066,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4079,15 +4083,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index b2c2b3ac..fff93b5c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2010-02-20 16:54+0200\n"
 "Last-Translator: Doruk Fisek <dfisek@fisek.com.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -657,7 +657,7 @@ msgstr ""
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA adresine konuyla ilgili "
 "yazınız."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1933,7 +1933,7 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2486,12 +2486,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -4008,97 +4008,101 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Simge"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Metin"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Hiçbiri"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Çevrimdışısınız. Çevrimiçi olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Dizini seç"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "Komut satırı belirtilmedi."
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4115,7 +4119,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4132,15 +4136,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index b4ca4f93..49777b66 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2010-03-01 22:30+0300\n"
 "Last-Translator: O.R. Nykyforchyn <oleh.nyk@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -659,7 +659,7 @@ msgstr ""
 "програмою; якщо це не так, пишіть у Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1873,7 +1873,7 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr "Налаштувати панель інструментів..."
 
@@ -2404,12 +2404,12 @@ msgstr "Встановлюємо інформацію папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
@@ -3875,91 +3875,95 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr "Іконка і текст"
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 msgid "Text at the _right of icon"
 msgstr "Текст справа від іконки"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr "Іконка"
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 msgid "_Text"
 msgstr "Текст"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 msgid "_None"
 msgstr "Ніякий"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 msgid "Select folder to open"
 msgstr "Обрати папку для відкриття"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Опції командного рядка"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Вживання: sylpheed [ОПЦІЇ]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3989,7 +3993,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4019,15 +4023,15 @@ msgstr ""
 "показати цю довідку і вийти\n"
 "показати інформацію про версію і вийти"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portnum      вказати порт для віддалених команд IPC"
diff --git a/po/vi.po b/po/vi.po
index 6da559b0..b6740760 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -639,7 +639,7 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1871,7 +1871,7 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2416,12 +2416,12 @@ msgstr "Thiết lập thông tin thư mục...\n"
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
@@ -3920,95 +3920,99 @@ msgstr ""
 "Việc tạo hộp thư đã thất bại.\n"
 "Có thể một số tập tin đã có trước, hoặc bạn không có quyền ghi lên đó."
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Khung thư mục"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Khung đọc thư"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/_Hồi âm"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/Hồi âm _tất cả"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/Hồi âm cho người _gửi"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/Hồi âm cho _hộp thư chung"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/_Chuyển tiếp"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/Chu_yển hướng"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Biểu tượng"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "Văn bản"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "Không"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "Bạn đang ngoại tuyến. Nhấn vào biểu tượng để chuyển sang trực tuyến."
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "Bạn đang trực tuyến. Nhấn vào biểu tượng để chuyển sang ngoại tuyến."
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "Thoát"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "Thoát chương trình này?"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Chọn thư mục"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 msgid "Command line options"
 msgstr "Tuỳ chọn dòng lệnh"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Cách dùng: sylpheed [TUỲ CHỌN]..."
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4038,7 +4042,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4068,15 +4072,15 @@ msgstr ""
 "hiện thông tin trợ giúp này và thoát\n"
 "đưa ra thông tin phiên bản và thoát"
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fc81c9f7..37c30c51 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -649,7 +649,7 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
 "1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1885,7 +1885,7 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2436,12 +2436,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -3944,97 +3944,101 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标(_I)"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "文本"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "没有"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "选择文件夹"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "没有设置命令行。"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4051,7 +4055,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4068,15 +4072,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d43d0092..f5448e9d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-13 13:59+0900\n"
+"POT-Creation-Date: 2010-07-13 14:34+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -654,7 +654,7 @@ msgstr ""
 "您應該已經隨軟體收到一份 GPL；若沒有，請寫信到自由軟體基金會，地址是：\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3937
+#: src/account_dialog.c:139 src/mainwindow.c:3940
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -1890,7 +1890,7 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:7048 src/mainwindow.c:3027
+#: src/compose.c:7048 src/mainwindow.c:3029
 msgid "_Customize toolbar..."
 msgstr ""
 
@@ -2436,12 +2436,12 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:907 src/mainwindow.c:4136 src/setup.c:298
+#: src/folderview.c:907 src/mainwindow.c:4139 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4141 src/setup.c:303
+#: src/folderview.c:911 src/mainwindow.c:4144 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
@@ -3938,97 +3938,101 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2335
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾檢視"
 
-#: src/mainwindow.c:2352
+#: src/mainwindow.c:2354
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2548 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2550 src/mimeview.c:142 src/summaryview.c:422
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2549
+#: src/mainwindow.c:2551
 msgid "/Reply to _all"
 msgstr "/全部回覆(_A)"
 
-#: src/mainwindow.c:2550
+#: src/mainwindow.c:2552
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_S)"
 
-#: src/mainwindow.c:2551
+#: src/mainwindow.c:2553
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2556 src/summaryview.c:429
+#: src/mainwindow.c:2558 src/summaryview.c:429
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2557 src/summaryview.c:430
+#: src/mainwindow.c:2559 src/summaryview.c:430
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:2558 src/summaryview.c:431
+#: src/mainwindow.c:2560 src/summaryview.c:431
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
-#: src/mainwindow.c:3020
+#: src/mainwindow.c:3022
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3021
+#: src/mainwindow.c:3023
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/圖樣(_I)"
 
-#: src/mainwindow.c:3023
+#: src/mainwindow.c:3025
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3024
+#: src/mainwindow.c:3026
 #, fuzzy
 msgid "_Text"
 msgstr "文字"
 
-#: src/mainwindow.c:3025
+#: src/mainwindow.c:3027
 #, fuzzy
 msgid "_None"
 msgstr "無"
 
-#: src/mainwindow.c:3055
+#: src/mainwindow.c:3057
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3068
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:3340
+#: src/mainwindow.c:3342
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
-#: src/mainwindow.c:3850
+#: src/mainwindow.c:3745
+msgid "The selected messages could not be combined."
+msgstr ""
+
+#: src/mainwindow.c:3853
 #, fuzzy
 msgid "Select folder to open"
 msgstr "選擇資料夾"
 
-#: src/mainwindow.c:4024
+#: src/mainwindow.c:4027
 #, fuzzy
 msgid "Command line options"
 msgstr "未設定執行指令"
 
-#: src/mainwindow.c:4037
+#: src/mainwindow.c:4040
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [選項]...\n"
 
-#: src/mainwindow.c:4045
+#: src/mainwindow.c:4048
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4045,7 +4049,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4062
+#: src/mainwindow.c:4065
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4062,15 +4066,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4080
+#: src/mainwindow.c:4083
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4088
+#: src/mainwindow.c:4091
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4096
 msgid "specify port for IPC remote commands"
 msgstr ""