35 files changed, 385 insertions, 221 deletions

diff --git a/ChangeLog b/ChangeLog
index ff470004..dfa07a1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-01-31
 
+	* version 3.4.0beta1
+
+2013-01-31
+
 	* src/mainwindow.c: help_command_line_show(): updated command line
 	  help.
 
diff --git a/README b/README
index adbf1d17..b48a1912 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 	Sylpheed - lightweight and user-friendly e-mail client
 
-   Copyright(C) 1999-2012 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
+   Copyright(C) 1999-2013 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/README.ja b/README.ja
index 1295fd29..66c439fd 100644
--- a/README.ja
+++ b/README.ja
@@ -1,6 +1,6 @@
 	Sylpheed - 軽量でユーザフレンドリーな電子メールクライアント
 
-   Copyright(C) 1999-2012 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
+   Copyright(C) 1999-2013 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/po/be.po b/po/be.po
index 41988bfa..42287a0c 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2010-06-20 15:36+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -2453,12 +2453,12 @@ msgstr "丕����舒仆舒��仍亠仆仆亠 ��仆��舒��仄舒������ 仗舒 从舒��舒仍仂亞��...\n
 msgid "Setting folder info..."
 msgstr "丕����舒仆舒��仍亠仆仆亠 ��仆��舒��仄舒������ 仗舒 从舒��舒仍仂亞��..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "����舒亞仍�磲 从舒��舒仍仂亞舒 %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "弌从舒仆舒于舒仆仆亠 从舒��舒仍仂亞舒 %s ..."
@@ -4070,6 +4070,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "丕亢��于舒仆仆亠: sylpheed [����丶乘亊]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4079,9 +4080,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4099,7 +4102,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4109,9 +4113,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4129,15 +4135,15 @@ msgstr ""
 "仗舒从舒亰舒���� 亞������ 亟舒于亠亟从�� �� 于��亶������\n"
 "仗舒从舒亰舒���� 亰于亠����从�� 仗��舒 于亠�������� �� 于��亶������"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "��仗������ ��仂仍��从�� 亟仍�� 舒从仂仆仆舒亞舒 ����亢��仄��:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport 仆��仄_仗仂����舒"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "亰舒亟舒���� 仗仂���� 亟仍�� 舒亟亟舒仍亠仆���� 亰舒亞舒亟舒�� IPC"
 
diff --git a/po/bg.po b/po/bg.po
index c8a1a899..0449dad7 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2537,12 +2537,12 @@ msgstr "丕����舒仆仂于�磦舒仆亠 亳仆��仂��仄舒��亳�� 亰舒 仗舒仗从舒...\n"
 msgid "Setting folder info..."
 msgstr "丕����舒仆仂于�磦舒仆亠 亳仆��仂��仄舒��亳�� 亰舒 仗舒仗从舒..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "弌从舒仆亳��舒仆亠 仆舒 仗舒仗从舒 %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "弌从舒仆亳��舒仆亠 仆舒 仗舒仗从舒 %s ..."
@@ -4245,14 +4245,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4262,22 +4264,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index e33fbb8d..adbbd24a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2011-01-23 01:42+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -2456,12 +2456,12 @@ msgstr "Nastavov叩n鱈 informace o slo転ce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavov叩n鱈 informace o slo転ce..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohled叩v叩 se slo転ka %s%c%s..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohled叩v叩 se slo転ka %s..."
@@ -4080,6 +4080,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Pou転it鱈: sylpheed [VOLBY]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4089,9 +4090,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4109,7 +4112,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4119,9 +4123,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4139,15 +4145,15 @@ msgstr ""
 "vyp鱈邸e tuto n叩pov��du a skon��鱈\n"
 "vyp鱈邸e informaci o verzi a skon��鱈"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Volba pouze pro Windows:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport ��鱈sloportu"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "ur��鱈 port pro vzd叩len辿 p��鱈kazy IPC"
 
diff --git a/po/da.po b/po/da.po
index f6fdb060..7079436e 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -2535,12 +2535,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennems淡ger mappe %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennems淡ger mappe %s ..."
@@ -4247,14 +4247,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4264,22 +4266,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index ff703469..f0a3290a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2011-08-17 10:15+0100\n"
 "Last-Translator: Volker Ribbert <volker.nospam@netcologne.de>\n"
 "Language-Team: de\n"
@@ -2462,12 +2462,12 @@ msgstr "Erstelle Ordnerinformation...\n"
 msgid "Setting folder info..."
 msgstr "Erstelle Ordnerinformation..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ordner %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ordner %s ..."
@@ -4089,6 +4089,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Anwendung: sylpheed [OPTION]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4098,9 +4099,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4118,7 +4121,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4128,9 +4132,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4148,15 +4154,15 @@ msgstr ""
 "diese Hilfe anzeigen und beenden\n"
 "Versionsinformationen anzeigen und beenden"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Windows-exklusive Option:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "den Port f端r \"IPC remote\"-Befehle festlegen"
 
diff --git a/po/el.po b/po/el.po
index cb074a43..bbd9aa07 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2522,12 +2522,12 @@ msgstr "����旅��亮���� ��了侶��凌��凌��旅�ﾎ� ��留虜劉了凌��...\n"
 msgid "Setting folder info..."
 msgstr "��劉���� ��旅�� ��了侶��凌��凌��溜竜�� ��留虜劉了��僚..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "裡略������侶 ��留虜劉了��僚 %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "裡略������侶 ��留虜劉了凌�� %s ..."
@@ -4200,9 +4200,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4219,7 +4221,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4230,9 +4232,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4249,15 +4253,15 @@ msgstr ""
 "竜亮��略僚旅��侶 留����流�� ��侶�� 硫凌流慮竜旅留��\n"
 "竜亮��略僚旅��侶 ��了侶��凌��凌��旅�ﾎ� 劉虜隆凌��侶��"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 3f4f8708..1ada4419 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2012-06-21 19:45+0200\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -2462,12 +2462,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:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -4084,6 +4084,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPCI��N]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4093,9 +4094,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4113,7 +4116,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4123,9 +4127,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4143,15 +4149,15 @@ msgstr ""
 "muestra esta ayuda y termina\n"
 "muestra la informaci坦n de la versi坦n y termina"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Opci坦n s坦lo para Windows:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport n尊puerto"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "especificar el puerto IPC para 坦rdenes remotas"
 
diff --git a/po/et.po b/po/et.po
index 9197de98..dddf2df9 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2545,12 +2545,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -4251,14 +4251,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4268,22 +4270,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index bffe6f84..ea4816aa 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2011-03-07 23:37+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <foo@bar.example>\n"
@@ -2431,12 +2431,12 @@ msgstr "Asetetaan kansion tietoja...\n"
 msgid "Setting folder info..."
 msgstr "Asetetaan kansion tietoja..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tutkitaan kansiota %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tutkitaan kansiota %s ..."
@@ -4052,6 +4052,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Ka��ytto��: sylpheed [VALITSIN]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4061,9 +4062,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4081,7 +4084,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4091,9 +4095,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4110,15 +4116,15 @@ msgstr ""
 "na��yta�� ta��ma�� ohje ja lopeta\n"
 "na��yta�� versiotiedot ja lopeta"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Windows-kohtainen valitsin:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport porttino"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "m辰辰rit辰 IPC-et辰komentojen portti"
 
diff --git a/po/fr.po b/po/fr.po
index b25aabd3..ebd44c8b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2012-06-19 00:01+0200\n"
 "Last-Translator: Tou Vu Yang <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -2476,12 +2476,12 @@ msgstr "Enregistrement des donn辿es des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des donn辿es des dossiers..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -4115,6 +4115,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilisation : sylpheed [OPTION]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4124,9 +4125,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4144,7 +4147,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4154,9 +4158,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4175,15 +4181,15 @@ msgstr ""
 "afficher l'aide-m辿moire et quitter\n"
 "afficher les informations de version et quitter"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Option pour Windows uniquement:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 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 c88d36b8..28870495 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -2543,12 +2543,12 @@ msgstr "Establecendo informaci坦n de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo informaci坦n de carpeta..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -4253,14 +4253,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4270,22 +4272,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 1c3d8d4e..257fdfdd 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2554,12 +2554,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretra転ujem spise %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretra転ujem spis %s ..."
@@ -4344,14 +4344,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4361,22 +4363,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 6c352d82..cf987818 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2012-05-18 17:41+0100\n"
 "Last-Translator: N辿meth Tam叩s <ntomasz@uhuklub.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -2461,12 +2461,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:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa 叩tvizsg叩l叩sa..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa 叩tvizsg叩l叩sa..."
@@ -4082,6 +4082,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Haszn叩lat: sylpheed [OPCI��]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4091,9 +4092,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4111,7 +4114,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4121,9 +4125,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4141,15 +4147,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:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Csak Windows opci坦:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport portsz叩m"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "IPC t叩voli parancsok portj叩nak megad叩sa"
 
diff --git a/po/it.po b/po/it.po
index 5529f589..523f4093 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2487,12 +2487,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -4138,6 +4138,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPZIONE]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4147,9 +4148,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4167,7 +4170,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4177,9 +4181,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4197,15 +4203,15 @@ msgstr ""
 "mostra questo aiuto ed esce\n"
 "mostra informazioni sulla versione ed esce"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 #, 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 e91f709c..b173e277 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2453,12 +2453,12 @@ msgstr "�����������������宴��荐�絎�筝�...\n"
 msgid "Setting folder info..."
 msgstr "�����������������宴��荐�絎�筝�..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "�����������������鴻����ｃ�割賢 (%s%c%s) ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "�����������������鴻����ｃ�割賢 (%s)..."
@@ -4078,9 +4078,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4092,13 +4094,15 @@ msgstr ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4108,9 +4112,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4122,21 +4128,23 @@ msgstr ""
 "��＜����祉�若�吾��膩���違��茵�腓冴�����\n"
 "��������������������倶�����茵�腓冴�����\n"
 "��違����������ｃ�潟�������с�＜����祉�若�吾��������\n"
+"��違����������ｃ�潟�������� rfc822 ��＜����祉�若�吾����＜�ゃ�����������\n"
 "荐�絎������＜�ゃ�������主�������������ｃ�����������������絎�������\n"
 "Sylpheed���腟�篋�������\n"
 "�����������違�≪�若��\n"
+"��祉�若����≪�若��\n"
 "������������������茵�腓冴�����腟�篋�������\n"
 "�����若�吾�с�恰����宴����阪��������腟�篋�������"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Windows 絨������������激�с��:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "IPC �����≪�若����潟����潟�������������若��������絎�������"
 
diff --git a/po/ko.po b/po/ko.po
index 9630bb83..3b0d748b 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2526,12 +2526,12 @@ msgstr "�启�� ���覲企ゼ ��れ�����������...\n"
 msgid "Setting folder info..."
 msgstr "�启�� ���覲企ゼ ��れ�����������..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s襯� ��れ�����������..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s �启��襯� ��れ�����������..."
@@ -4227,14 +4227,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4244,22 +4246,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 2fb987e3..f847f129 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2467,12 +2467,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas ���%s%c%s���..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas ���%s���..."
@@ -4109,6 +4109,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Naudojimas: sylpheed [PARAMETRAI]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4118,9 +4119,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4138,7 +4141,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4148,9 +4152,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4168,15 +4174,15 @@ msgstr ""
 "rodyti pagalbos tekst��\n"
 "rodyti versij��"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 45c60608..e54c9237 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2012-05-07 03:15+0200\n"
 "Last-Translator: Ward De Ridder <ward@warddr.eu>\n"
 "Language-Team: \n"
@@ -2471,12 +2471,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -4102,6 +4102,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Gebruik: sylpheed [OPTIES]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4111,9 +4112,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4130,7 +4133,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4140,9 +4144,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4160,15 +4166,15 @@ msgstr ""
 "dit bericht weergeven\n"
 "versieinformatie weergeven"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Optie alleen voor Windows:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "specificeer poort voor IPC commando's op afstand"
 
diff --git a/po/pl.po b/po/pl.po
index 9123911e..791b870a 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2011-01-07 12:00+0100\n"
 "Last-Translator: Jan St��pie�� <jstepien@users.sourceforge.net>\n"
 "Language-Team: Jan St��pie�� <jstepien@users.sourceforge.net>\n"
@@ -2450,12 +2450,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -4106,14 +4106,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4123,22 +4125,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0d1795b2..8893be2c 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2011-01-21 07:33-0200\n"
 "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n"
 "Language-Team: Portuguese/Brazil <(none)>\n"
@@ -2472,12 +2472,12 @@ msgstr "Configurando informa巽探es da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informa巽探es da pasta..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -4097,6 +4097,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OP����O]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4106,9 +4107,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4126,7 +4129,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4136,9 +4140,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4156,15 +4162,15 @@ msgstr ""
 "exibe esta ajuda e encerra\n"
 "exibe informa巽達o de vers達o e encerra"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Op巽達o para Windows apenas:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "Indique a porta para comandos IPC remotos"
 
diff --git a/po/ro.po b/po/ro.po
index 077a940d..44922a99 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2011-12-13 17:35+0200\n"
 "Last-Translator: Cristian Secar�� <cristi AT secarica DOT ro>\n"
 "Language-Team: Gnome Romanian Team <gnomero-list@lists.sourceforge.net>\n"
@@ -2508,12 +2508,12 @@ msgstr "Se stabilesc informa��iile dosarului...\n"
 msgid "Setting folder info..."
 msgstr "Se stabilesc informa��iile dosarului..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Se scaneaz�� dosarul %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Se scaneaz�� dosarul %s ..."
@@ -4161,6 +4161,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilizare: sylpheed [OP��IUNE]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4170,9 +4171,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4190,7 +4193,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4200,9 +4204,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4220,15 +4226,15 @@ msgstr ""
 "afi��eaz�� acest ajutor ��i ie��i\n"
 "afi��eaz�� versiunea ��i ie��i"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Op��iune doar pentru Windows:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "specific�� portul pentru comenzi la distan���� IPC"
 
diff --git a/po/ru.po b/po/ru.po
index b030e95d..217fff79 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2010-06-15 15:18+0400\n"
 "Last-Translator: \n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -2470,12 +2470,12 @@ msgstr "丕����舒仆仂于从舒 亳仆��仂��仄舒��亳亳 仂 仗舒仗从亠...\n"
 msgid "Setting folder info..."
 msgstr "丕����舒仆仂于从舒 亳仆��仂��仄舒��亳亳 仂 仗舒仗从亠..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "����仂��仄仂���� 仗舒仗从亳 %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "����仂��仄仂���� 仗舒仗从亳 %s ..."
@@ -4099,6 +4099,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "����仗仂仍��亰仂于舒仆亳亠: sylpheed [������������丐��]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4108,9 +4109,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4128,7 +4131,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4138,9 +4142,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4158,15 +4164,15 @@ msgstr ""
 "仂��仂弍��舒亰亳���� ����仂�� 仗仂亟��从舒亰从�� 亳 于��亶��亳\n"
 "于��于亠����亳 亳仆��仂��仄舒��亳�� 仂 于亠����亳亳 亳 于��亶��亳"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "弌仗亠��亳��亳��亠��从亳亠 亟仍�� Windows 仆舒������仂亶从亳:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport 仆仂仄亠�� 仗仂����舒"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "亰舒亟舒���� 仗仂����亟仍�� ��亟舒仍亠仆仆仂亶 从仂仄舒仆亟�� IPC"
 
diff --git a/po/sk.po b/po/sk.po
index 06409cb7..041fc6b8 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2541,12 +2541,12 @@ msgstr "Nastavujem inform叩cie o prie��inku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem inform叩cie o prie��inku..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preh直ad叩vam prie��inok %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preh直ad叩vam prie��inok %s ..."
@@ -4245,14 +4245,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4262,22 +4264,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index acc8463e..e229d9a5 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2545,12 +2545,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -4248,14 +4248,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4265,22 +4267,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 991c312f..1a6e8c5f 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -2540,12 +2540,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretra転ujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretra転ujem direktorijum %s ..."
@@ -4243,14 +4243,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4260,22 +4262,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 4ff2ac8c..e22c5845 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2500,12 +2500,12 @@ msgstr "St辰ller in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "St辰ller in mappinfo..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "S旦ker igenom mapp %s%c%s..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "S旦ker igenom mapp %s ..."
@@ -4180,14 +4180,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4197,22 +4199,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 0a0b677e..e0f6a269 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2012-06-18 19:03+0300\n"
 "Last-Translator: Doruk Fisek <dfisek@ozguryazilim.com.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -2458,12 +2458,12 @@ msgstr "Dizin bilgisi ayarlan脹yor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlan脹yor..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taran脹yor..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taran脹yor..."
@@ -4075,6 +4075,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kullan脹m: sylpheed [SE��ENEK]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4084,9 +4085,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4104,7 +4107,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4114,9 +4118,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4132,15 +4138,15 @@ msgstr ""
 "hata ay脹klama kipi\n"
 "s端r端m bilgisini g旦ster ve 巽脹k"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Yaln脹z Windows'ta ge巽erli se巽enek:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport kap脹no (portno)"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "IPC uzak komutlar脹 i巽in kap脹 (port) belirt"
 
diff --git a/po/uk.po b/po/uk.po
index a96c088b..86d18e4f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2012-12-11 03:12+0300\n"
 "Last-Translator: Vladimir Smolyar <v_2e@ukr.net>\n"
 "Language-Team: Ukrainian\n"
@@ -2456,12 +2456,12 @@ msgstr "������舒仆仂于仍亠仆仆�� ��仆��仂��仄舒������ 仗舒仗从亳...\n"
 msgid "Setting folder info..."
 msgstr "������舒仆仂于仍亠仆仆�� ��仆��仂��仄舒������ 仗舒仗从亳..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "��亠��亠亞仍�磲 仗舒仗从亳 %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "��亠��亠亞仍�磲 仗舒仗从亳 %s ..."
@@ -4072,6 +4072,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "��亳从仂��亳����舒仆仆��: sylpheed [����丶��亊]..."
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4081,9 +4082,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4101,7 +4104,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4111,9 +4115,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4131,15 +4137,15 @@ msgstr ""
 "仗仂从舒亰舒��亳 ���� 亟仂于��亟从�� �� 于亳亶��亳\n"
 "仗仂从舒亰舒��亳 ��仆��仂��仄舒������ 仗��仂 于亠�������� �� 于亳亶��亳"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "��仗������ ����仍��从亳 亟仍�� Windows:"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport 仗仂����"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport 仗仂����      于从舒亰舒��亳 仗仂���� 亟仍�� 于��亟亟舒仍亠仆亳�� 从仂仄舒仆亟 IPC"
 
diff --git a/po/vi.po b/po/vi.po
index f34714a8..59c92b56 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2473,12 +2473,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:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "��ang qu辿t th動 m畛�c %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "��ang qu辿t th動 m畛�c %s ..."
@@ -4144,9 +4144,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4163,7 +4165,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4174,9 +4176,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4193,15 +4197,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:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c334fad6..260217a3 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: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+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"
@@ -2493,12 +2493,12 @@ msgstr "罩ｅ��莅丞舟���篁九す篆≧��...\n"
 msgid "Setting folder info..."
 msgstr "罩ｅ��莅丞舟���篁九す篆≧��..."
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "罩ｅ�����������篁九す %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "罩ｅ�����������篁九す %s ..."
@@ -4169,14 +4169,16 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4186,22 +4188,24 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 800be5c4..6afc54f5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-31 11:34+0900\n"
+"POT-Creation-Date: 2013-01-31 14:03+0900\n"
 "PO-Revision-Date: 2011-08-13 16:46+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -2446,12 +2446,12 @@ msgstr "荐�絎�莖����紊鐘��\n"
 msgid "Setting folder info..."
 msgstr "荐�絎�莖����紊鐘��"
 
-#: src/folderview.c:911 src/mainwindow.c:4200 src/setup.c:305
+#: src/folderview.c:911 src/mainwindow.c:4204 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "�����顚����紊� %s%c%s ���"
 
-#: src/folderview.c:915 src/mainwindow.c:4205 src/setup.c:310
+#: src/folderview.c:915 src/mainwindow.c:4209 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "�����顚����紊� %s ���"
@@ -4057,6 +4057,7 @@ msgid "Usage: sylpheed [OPTION]..."
 msgstr "���羈�鐚�sylpheed [��檎��]���"
 
 #: src/mainwindow.c:4101
+#, fuzzy
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4066,9 +4067,11 @@ msgid ""
 "--status [folder]...\n"
 "--status-full [folder]...\n"
 "--open folderid/msgnum\n"
+"--open <file URL>\n"
 "--configdir dirname\n"
 "--exit\n"
 "--debug\n"
+"--safe-mode\n"
 "--help\n"
 "--version"
 msgstr ""
@@ -4086,7 +4089,8 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4120
+#, fuzzy
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4096,9 +4100,11 @@ msgid ""
 "show the total number of messages\n"
 "show the status of each folder\n"
 "open message in new window\n"
+"open an rfc822 message file in a new window\n"
 "specify directory which stores configuration files\n"
 "exit Sylpheed\n"
 "debug mode\n"
+"safe mode\n"
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
@@ -4116,15 +4122,15 @@ msgstr ""
 "蕁�腓咲��篁処�������九����∫��\n"
 "莠後�榊�����莖�荐���九����∫��"
 
-#: src/mainwindow.c:4136
+#: src/mainwindow.c:4140
 msgid "Windows-only option:"
 msgstr "Windows ��号����檎��鐚�"
 
-#: src/mainwindow.c:4144
+#: src/mainwindow.c:4148
 msgid "--ipcport portnum"
 msgstr "--ipcport ���荐����膩����"
 
-#: src/mainwindow.c:4149
+#: src/mainwindow.c:4153
 msgid "specify port for IPC remote commands"
 msgstr "���絎������� IPC ���腴���巡擦������荐����"
 
diff --git a/src/about.c b/src/about.c
index 5f4e5aa8..cfeac758 100644
--- a/src/about.c
+++ b/src/about.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -176,7 +176,7 @@ static void about_create(void)
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
 	label = gtk_label_new
-		("Copyright (C) 1999-2012 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>");
+		("Copyright (C) 1999-2013 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>");
 	gtk_label_set_selectable(GTK_LABEL(label), TRUE);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);