updated po files.

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

29 files changed, 6122 insertions, 5437 deletions

diff --git a/po/be.po b/po/be.po
index 16d3f77b..18d70e3b 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -307,7 +307,7 @@ msgstr "крынічны каталог ідэнтычны з прызначэн
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Капіраванне паведамленняў %s/%d у %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1221,15 +1221,15 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабовы адрас"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Заўвага"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Папярэджанне"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Памылка"
 
@@ -1272,7 +1272,7 @@ msgstr "Карычневы"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Няма"
 
@@ -1612,7 +1612,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку складанага паведамлення."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
@@ -1804,7 +1804,7 @@ msgstr "тып MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Памер"
 
@@ -2214,7 +2214,7 @@ msgstr "Экспарт"
 msgid "Specify source folder and destination file."
 msgstr "Укажыце крынічны каталог і файл прызначэння."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 msgid "File format:"
 msgstr "Фармат файла:"
 
@@ -2226,7 +2226,7 @@ msgstr "Крынічны каталог:"
 msgid "Destination:"
 msgstr "Прызначэнне:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr "UNIX mbox"
 
@@ -2238,7 +2238,7 @@ msgstr "eml (нумар + .eml)"
 msgid "MH (number only)"
 msgstr "MH (толькі нумар)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Выбраць... "
@@ -2409,12 +2409,12 @@ msgstr "Устанаўленне інфармацыі па каталогу...\n
 msgid "Setting folder info..."
 msgstr "Устанаўленне інфармацыі па каталогу..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Прагляд каталога %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканаванне каталога %s ..."
@@ -2590,7 +2590,7 @@ msgid "Creating header view...\n"
 msgstr "Стварэнне прагляду загалоўкаў...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Без Адпраўніка)"
 
@@ -2602,60 +2602,73 @@ msgstr "Стварэнне прагляду рысунка...\n"
 msgid "Can't load the image."
 msgstr "Нельга загрузіць рысунак."
 
-#: src/import.c:187
+#: src/import.c:200
 msgid "The source file does not exist."
 msgstr "Крынічны файл не існуе."
 
-#: src/import.c:198
+#: src/import.c:211
 msgid "Can't find the destination folder."
 msgstr "Нельга знайсці каталог прызначэння."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, c-format
 msgid "Importing %s ..."
 msgstr "Імпартаванне %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 msgid "Importing"
 msgstr "Імпартаванне"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 msgid "Scanning folder..."
 msgstr "Сканаванне каталога..."
 
-#: src/import.c:235
+#: src/import.c:252
 msgid "Error occurred on import."
 msgstr "Памылка пад час імпартавання."
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Нельга стварыць каталог '%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Імпарт"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 msgid "Specify source file and destination folder."
 msgstr "Укажыце крынічны файл і каталог прызначэння."
 
-#: src/import.c:340
+#: src/import.c:619
 msgid "Source:"
 msgstr "Крыніца:"
 
-#: src/import.c:345
+#: src/import.c:624
 msgid "Destination folder:"
 msgstr "Каталог прызначэння:"
 
-#: src/import.c:358
+#: src/import.c:637
 msgid "eml (folder)"
 msgstr "eml (каталог)"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Укажыце крынічны каталог з файламі eml і каталог прызначэння."
 
-#: src/import.c:437
+#: src/import.c:719
 msgid "Select importing folder"
 msgstr "Выберыце каталог імпарту"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Выберыце імпартаваны файл"
 
@@ -2830,124 +2843,124 @@ msgstr "Скасавана"
 msgid "Standby"
 msgstr "Чаканне"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Скасавана"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Атрыманне"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d паведамленне(яў) (%s) атрымана"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, c-format
 msgid "no new messages"
 msgstr "няма новых паведамленняў"
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Зроблена"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Злучэнне не атрымалася"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Аўтарызацыя схібіла"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Замкнута"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершана (%d новы(х) ліст(оў))"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Завершана (няма новых паведамленняў)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Здарыліся памылкі пад час атрымання пошты."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "атрыманне новых паведамленняў акаунта %s ...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Аўтэнтыфікацыя POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Атрыманне новых паведамленняў"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Злучэнне з POP3 серверам: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Нельга злучыцца з серверам POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Аўтэнтыфікацыя..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Атрыманне паведамленняў з %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Атрыманне колькасці новых паведамленняў (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Атрыманне колькасці новых паведамленняў (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Атрыманне колькасці новых паведамленняў (UIDL)"
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Атрыманне памеру паведамленняў (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Сціранне паведамлення %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Адлучэнне"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Атрыманне ліста (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2955,15 +2968,15 @@ msgstr ""
 "Выкананне загаду фільтравання спаму схібіла.\n"
 "Калі ласка, праверце настаўленні кантролю спаму."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Злучэнне не атрымалася."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Памылка здарылася пад час апрацоўкі пошты."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2972,29 +2985,29 @@ msgstr ""
 "Здарылася памылка пад час апрацоўкі пошты:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Не засталося месца на дыску."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Нельга запісаць файл."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Памылка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Злучэнне закрытае аддаленым серверам."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Скрынка замкнутая."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3003,11 +3016,11 @@ msgstr ""
 "Паштовая скрынка замкнутая:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Аўтэнтыфікацыя схібіла."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3016,15 +3029,15 @@ msgstr ""
 "Аўтэнтыфікацыя схібіла:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Таймаут сеансу."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Атрыманне скасавана\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Атрыманне новых паведамленняў з %s у %s...\n"
@@ -3042,16 +3055,16 @@ msgstr "Увядзіце пароль"
 msgid "Protocol log"
 msgstr "Журнал пратакола"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Ужыванне: %s [ОПЦЫЯ]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адрас]      адкрыць акно напісання паведамлення"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3061,23 +3074,23 @@ msgstr ""
 "                         адкрыць акно напісання паведамлення з далучаным\n"
 "                         дадаткам з азначанага файла (файлаў)"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              атрымаць новую пошту"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          атрымаць новую пошту для ўсіх акаунтаў"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 выслаць усе паведамленні з чаргі"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [каталог]...  паказаць агульную колькасць паведамленняў"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3085,45 +3098,45 @@ msgstr ""
 "  --status-full [каталог]...\n"
 "                         паказаць статус кожнага каталога"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open id_каталога/нум_ліста адкрыць паведамленне ў новым акне"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir dirname    задаць каталог з файламі канфігурацыі"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport нум_порта    задаць порт для аддаленых загадаў IPC"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 выйсці з Сілфіда"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                рэжым адладкі"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 паказаць гэту даведку і выйсці"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              паказаць звесткі пра версію і выйсці"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Націсніце любую клавішу..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Кадаванне імён файлаў"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3147,19 +3160,19 @@ msgstr ""
 "\n"
 "Працягваць?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Паведамленне ў працэсе напісання. Сапраўды выйсці?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Лісты ў чарзе"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "У чарзе засталіся недасланыя паведамленні. Выйсці зараз?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3167,20 +3180,20 @@ msgstr ""
 "Праграма GnuPG не устаноўлена як след, ці яе версія надта старая.\n"
 "Падтрымка OpenPGP адключаная."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr "Загрузка плагінаў..."
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "другі экземпляр Сілфіда ужо выконваецца.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Міграцыя канфігурацыі"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3829,8 +3842,8 @@ msgstr "Стварэнне галоўнага вакна...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: размяшчэнне колеру %d схібіла\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "зроблена.\n"
 
@@ -3877,11 +3890,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Скрынка `%s' ужо існуе."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Скрынка"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4104,7 +4117,7 @@ msgstr "Дадаткі"
 msgid "Message View - Sylpheed"
 msgstr "Прагляд паведамлення - Сілфід"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Нельга запісаць файл `%s'."
@@ -6188,19 +6201,19 @@ msgstr "Дадатак"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Тэма"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Адпраўнік"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Дата"
 
@@ -6210,7 +6223,7 @@ msgid "Number"
 msgstr "Нумар"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "Каму"
 
@@ -6518,7 +6531,7 @@ msgstr "Пошук %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Пошук %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Без Даты)"
 
@@ -6615,7 +6628,7 @@ msgstr "_Аб праграме"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - Адлеглая скрынка POP3"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Нум."
 
@@ -6850,19 +6863,19 @@ msgstr "Нельга злучыцца з серверам SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Нельга злучыцца з серверам SMTP: %s:%d"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Настаўленне скрынкі"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr "Гэты дыялог зробіць пачатковыя настаўленні паштовай скрынкі."
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr "Стварыць паштовую скрынку ў прадвызначаным месцы:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
@@ -6870,7 +6883,7 @@ msgstr ""
 "Стварыць паштовую скрынку ў наступным месцы:\n"
 "(упішыце назву каталога ці поўны шлях да каталога)"
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
@@ -6878,24 +6891,24 @@ msgstr ""
 "Калі вы жадаеце дадаць потым паштовую скрынку ў другім месцы, выберыце 'Файл "
 "- Паштовая скрынка - Дадаць скрынку...' у галоўным меню."
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Скасавана"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr "Працягваць без стварэння паштовай скрынкі?"
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr "Увядзіце назву каталога ці поўны шлях да каталога."
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Паштовая скрынка `%s' ужо існуе."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
@@ -6903,77 +6916,77 @@ msgstr ""
 "Месцазнаходжанне '%s' утрымлівае каталог настаўленняў. Калі ласка, выберыце "
 "іншае месца."
 
-#: src/setup.c:467
+#: src/setup.c:473
 msgid "Cancel mail account setup?"
 msgstr "Скасаваць настаўленне акаунта пошты?"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 msgid "Input value is not valid."
 msgstr "Уведзеная велічыня недапушчальная."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 msgid "POP3 server:"
 msgstr "Сервер POP3:"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 msgid "IMAP4 server:"
 msgstr "Сервер IMAP4:"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 msgid "New account setup"
 msgstr "Настаўлене новага акаунта"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr "Гэты дыялог зробіць пачатковыя настаўленні новага акаунта пошты."
 
-#: src/setup.c:743
+#: src/setup.c:749
 msgid "Select account type:"
 msgstr "Выберыце тып акаунта:"
 
-#: src/setup.c:766
+#: src/setup.c:772
 msgid "Input your name and mail address:"
 msgstr "Увядзіце сваё імя і адрас пошты:"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 msgid "Display name:"
 msgstr "Паказваць імя:"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 msgid "E-mail address:"
 msgstr "Адрас эл.пошты:"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr "Гэта імя будзе паказана атрымальніку (напр. А. Іваноў)"
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr "Увядзіце ідэнтыфікатар карыстальніка і сервер пошты:"
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 msgid "User ID:"
 msgstr "ID карыстальніка:"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 msgid "SMTP server:"
 msgstr "SMTP-сервер:"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 msgid "Use SSL"
 msgstr "Ужываць SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 msgid "Use SMTP authentication"
 msgstr "Ужываць SMTP-аўтэнтыфікацыю"
 
-#: src/setup.c:874
+#: src/setup.c:880
 #, fuzzy
 msgid "Your new mail account has been set up with the following settings."
 msgstr "Ваш новы паштовы акаунт быў устаноўлены з наступнымі настаўленнямі."
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
@@ -6983,6 +6996,19 @@ msgstr ""
 "'Канфігурацыя - Настаўленні бягучага акаунта' або\n"
 "'Канфігурацыя - Рэдагаваць акаунты' у галоўным меню."
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "/Ф_айл/Імпартаваць по_шту..."
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Вынік праверкі подпісу"
@@ -7309,235 +7335,235 @@ msgstr "Сканаванне каталога (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Немагчыма устанавіць злучэнне IMAP4.\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "Шукаць яшчэ"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Нечытаных лістоў больш няма"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Нечытаных паведамленняў не знойдзена.\n"
 "Шукаць ад канца?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Няма нечытаных паведамленняў."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr ""
 "Нечытаных паведамленняў не знойдзена.\n"
 "Перайсці да наступнага каталога?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Новых паведамленняў больш няма"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Новых паведамленняў не знойдзена.\n"
 "Шукаць ад канца?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Няма новых паведамленняў."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "Новых паведамленняў не знойдзена.\n"
 "Перайсці ў наступны каталог?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Няма болей маркіраваных паведамленняў"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Не знойдзена маркіраваных паведамленняў.\n"
 "Паўтарыць пошук ад канца?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Няма маркіраваных паведамленняў."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Не знойдзена маркіраваных паведамленняў.\n"
 "Паўтарыць пошук ад пачатку?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Няма болей памечаных паведамленняў"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Не знойдзена памечаных паведамленняў.\n"
 "Паўтарыць пошук ад канца?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Няма памечаных паведамленняў."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Не знойдзена памечаных паведамленняў.\n"
 "Паўтарыць пошук ад пачатку?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Сцягванне паведамленняў па тэме..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d сцёрта"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перанесена"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скапіравана"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " элемент(ы) вылучаны"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d нечытаных, агулам %d (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d нечытаных, %d агулам"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Упарадкаванне зводкі..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tВызначэнне зводкі з дадзеных паведамленняў..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Вызначэнне зводкі з дадзеных паведамлення..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запісанне кэшу зводкі (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Паведамленне %d маркіраванае\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Паведамленне %d маркіраванае як чытанае\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Паведамленне %d маркіраванае як нечытанае\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Паведамленне %s/%d пазначанае да сцірання\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Сцерці паведамленне(і)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Сапраўды жадаеце сцерці паведамленне(і) са сметніцы?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Сціранне падвоеных паведамленняў..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Паведамленне %s/%d размаркіраванае\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Паведамленне %d пазначанае да пераносу ў %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Каталог прызначэння супадае з бягучым."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 msgid "Select folder to move"
 msgstr "Выберыце каталог для пераносу"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Паведамленне %d пазначанае да капіравання ў %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Каталог прызначэння копіі супадае з бягучым."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 msgid "Select folder to copy"
 msgstr "Выберыце каталог для капіравання"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Памылка падчас апрацоўкі паведамленняў."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Зборка нітак..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Разгрупаванне..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтраванне (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "фільтраванне..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Фільтраванне..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d ліст(ы) прафільтраваны."
diff --git a/po/bg.po b/po/bg.po
index 56ec9b01..54b86ec3 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -312,7 +312,7 @@ msgstr "изходната папка е еднаква с назначение�
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1240,15 +1240,15 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Забележка"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Грешка"
 
@@ -1291,7 +1291,7 @@ msgstr "Кафяв"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Никой"
 
@@ -1672,7 +1672,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
@@ -1864,7 +1864,7 @@ msgstr "MIME тип"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Размер"
 
@@ -2282,7 +2282,7 @@ msgstr "Изнасяне"
 msgid "Specify source folder and destination file."
 msgstr "Укажете mbox файл и папка."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Формат на датата"
@@ -2297,7 +2297,7 @@ msgstr "Директрия източник:"
 msgid "Destination:"
 msgstr "Назначение"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2309,7 +2309,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Избор..."
@@ -2490,12 +2490,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -2672,7 +2672,7 @@ msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Няма От)"
 
@@ -2684,71 +2684,84 @@ msgstr "Създаване изглед на изображение...\n"
 msgid "Can't load the image."
 msgstr "Не може да се зареди изображението."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Укажете mbox файл и папка."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Внасяне"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Появи се грешка при публикуване\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Папката `%s' не може да бъде създадена."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Внасяне"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Укажете mbox файл и папка."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Директрия източник:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Папка назначение:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Нова папка"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Укажете mbox файл и папка."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Изберете файл за внасяне"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Изберете файл за внасяне"
 
@@ -2932,140 +2945,140 @@ msgstr "Отказ"
 msgid "Standby"
 msgstr "Изчакване"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Отказан"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Получаване"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Завършено (%d съобщения (%s) получени)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Няма нови съобщения."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Изпълнено."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Връзката се провали"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Удостоверяването се провали"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Заключен"
 
-#: src/inc.c:749
+#: src/inc.c:754
 #, fuzzy
 msgid "Timeout"
 msgstr "Пауза (сек)"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Възникнаха грешки при получаване на пощата."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получаване на нови съобщения от акаунт %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Удостоверяване"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получаване на нови съобщения"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Свързване с POP3 сървър: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Взимане на броят на нови съобщения (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Взимане на броят на нови съобщения (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Взимане на размерът на съобщенията (LIST)... "
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Прекъсване"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Връзката провалена"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Възникна грешка при обработка на пощата"
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3074,29 +3087,29 @@ msgstr ""
 "Възникна грешка при обработка на пощата:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Няма свободно място на диска"
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Файлът не може да се запише."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Грешка в сокет."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Връзката е прекратена от отдалечения хост."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Пощенската кутия е заключена."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3105,11 +3118,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3118,16 +3131,16 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Обединяването е отменено\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получаване на нови съобшения от %s в %s...\n"
@@ -3145,16 +3158,16 @@ msgstr "Въведете парола"
 msgid "Protocol log"
 msgstr "Протоколен журнал"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr " --compose [адрес]    отваряне на прозорец за съставяне"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3164,23 +3177,23 @@ msgstr ""
 "                         отваряне на прозорец за съставяне с прикрепени\n"
 "                         указаните файлове."
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive             получаване на нови съобщения"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all\t     получаване на нови съобщения от всички акаунти"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 изпращане на всички съобщения в опашката"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...   показване на пълния брой на съобщения"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3188,50 +3201,50 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         показване на състоянието на всяка папка"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                режим на дебъг"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим на дебъг"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr ""
 "  --help                 извеждане на тази помощна информация и излизане"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              извеждане на версията и излизане"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "или натиснете бутона `y'.\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Изходяща кодова таблица"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3245,20 +3258,20 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Съставя се ново съобщение. Желаете ли изход от програмата?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Съобщения в опашката"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Някои неизпратени съобщения са в опашката. Желаете ли изход от програмата?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3266,21 +3279,21 @@ msgstr ""
 "GnuPG не е инсталиран правилно, или версията му е твърде стара.\n"
 "OpenPGP поддръжката е отменена."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "друг Sylpheed е стартиран вече.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфигурация на действия"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3974,8 +3987,8 @@ msgstr "Създаване на главен прозорец...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "готово.\n"
 
@@ -4025,11 +4038,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4234,7 +4247,7 @@ msgstr "Притурки"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
@@ -6428,19 +6441,19 @@ msgstr "Притурка"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Дата"
 
@@ -6450,7 +6463,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "До:"
@@ -6777,7 +6790,7 @@ msgstr "Филтриране..."
 msgid "Searching %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
@@ -6885,7 +6898,7 @@ msgstr "Относно"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "No."
 
@@ -7118,142 +7131,155 @@ msgstr "Не може да се установи връзка с NNTP сървъ
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Не може да се установи връзка с NNTP сървър: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Настройки на пощенската кутия"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr ""
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Отказ"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Конфигуриране на акаунт"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Не е въведено име на менюто."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP сървър"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP сървър"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Конфигуриране на акаунт"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Изтриване на акаунт"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Избор на ключ по вашия email адрес"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Екранно Име"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "E-Mail адрес"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Потребителски ID"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP сървър (изпращане)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Удостоверяване"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Внасяне на файл:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
@@ -7589,223 +7615,223 @@ msgstr "Сканиране на папка (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "Търсене отново"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Няма повече непрочетени съобщения"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Не е намерено непрочетено съобщение. Търсене от края?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Няма непрочетени съобщения."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Не е намерено непрочетено съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Няма повече нови съобщения"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Не е намерено ново съобщение. Търсене от края?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Няма нови съобщения."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Не е намерено ново съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Няма повече маркирани съобщения"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Не е намерено маркирано съобщение. Търсене от края?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Няма маркирани съобщения."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не е намерено маркирано съобщение. Търсене от началото?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Няма повече съобщения с етикет"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Не е намерено съобщение с етикет. Търсене от края?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Няма съобщения с етикет"
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не е намерено съобщение с етикет. Търсене от началото?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Събиране на съобщения по тема..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d изтрити"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d преместени"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копирани"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr "избран(и)"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нови, %d непрочетени, %d общо (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нови, %d непрочетени, %d общо"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Сортиране на извадката..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tСъставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Съставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Избор на папка"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Избор на папка"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
@@ -7955,9 +7981,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread не се поддържа от glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Внасяне на файл:"
-
 #, fuzzy
 #~ msgid "Destination file:"
 #~ msgstr "Папка назначение:"
diff --git a/po/da.po b/po/da.po
index e01de604..9e4e1b8b 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -314,7 +314,7 @@ msgstr "fra og til mappe er ens.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1238,15 +1238,15 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Note"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Fejl"
 
@@ -1289,7 +1289,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Ingen"
 
@@ -1670,7 +1670,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
@@ -1862,7 +1862,7 @@ msgstr "MIME type"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Størrelse"
 
@@ -2280,7 +2280,7 @@ msgstr "Eksportere"
 msgid "Specify source folder and destination file."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Dato format"
@@ -2295,7 +2295,7 @@ msgstr "Fra sti:"
 msgid "Destination:"
 msgstr "Mål"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2307,7 +2307,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Vælg... "
@@ -2488,12 +2488,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -2671,7 +2671,7 @@ msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Ingen Fra)"
 
@@ -2683,71 +2683,84 @@ msgstr "Opretter billed visning...\n"
 msgid "Can't load the image."
 msgstr "Kan ikke læse billede."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Importere"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Fejl ved afsendelse\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Kan ikke oprette mappe `%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importere"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Fra sti:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Til sti:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Ny mappe"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Vælg fil til import"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Vælg fil til import"
 
@@ -2931,143 +2944,143 @@ msgstr "Afbryd"
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Modtager"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Hentet (%d meddelelse(r) (%s)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Ingen nye meddelelser."
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Afsluttet"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:749
+#: src/inc.c:754
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Fejl ved hentning af e-post."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "modtager nye meddelelser fra konto %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Godkender"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: henter nye meddelelser"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Forbinder til POP3 server: %s ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Modtager antal nye meddelelser (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Modtager antal nye meddelelser (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Modtager antal nye meddelelser (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 #, fuzzy
 msgid "Connection failed."
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 #, fuzzy
 msgid "Error occurred while processing mail."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3076,30 +3089,30 @@ msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Ingen fri disk plads."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "postkasse er låst\n"
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3108,11 +3121,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3121,16 +3134,16 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Hentning afbrudt\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -3148,16 +3161,16 @@ msgstr "Indtast adgangskode"
 msgid "Protocol log"
 msgstr "Protokol log"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    åbner nyt meddelelses vindue"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3167,23 +3180,23 @@ msgstr ""
 "                         åbn ny meddelelse med disse filer vedhæftet\n"
 "                         ."
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              modtager nye meddelelser"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          modtager nye meddelelser fra alle konti"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 send alle meddelelser i kø"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappe]...   viser antal meddelelser"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3191,49 +3204,49 @@ msgstr ""
 "  --status-full [mappe]...\n"
 "                         viser status for hver mappe"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 viser denne hjælp"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              viser version og afslutter"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "eller tast `y'.\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Udgående tegnsæt"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3247,19 +3260,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Du er ved at skrive ny meddelelse. Virklig afslutte?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Meddeleser i kø"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nogle usendte meddelelser i kø. Afslut nu?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3267,21 +3280,21 @@ msgstr ""
 "GnuPG er ike korrekt installeret eller i for gammel version\n"
 "OpenPGP ikke mulig."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "sylpheed kører allerede.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Handlingsopsæt"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3976,8 +3989,8 @@ msgstr "Opretter hoved vindue...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
@@ -4027,11 +4040,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4236,7 +4249,7 @@ msgstr "Vedhæftet"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
@@ -6425,19 +6438,19 @@ msgstr "Vedhæftet"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Dato"
 
@@ -6447,7 +6460,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Til:"
@@ -6772,7 +6785,7 @@ msgstr "Filtrering..."
 msgid "Searching %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
@@ -6881,7 +6894,7 @@ msgstr "Om"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Slet mappe"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Nr."
 
@@ -7118,142 +7131,155 @@ msgstr "Ingen forbindelse til SMTP server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ingen forbindelse til SMTP server: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Mailbox opsætning"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr ""
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Konto indstillinger"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Menu navn ikke opsat."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP server"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP server"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Konto indstillinger"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Slet konto"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Vælg nøgle efter e-post adresse"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Vis navn"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "E-post adresse"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Bruger ID"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP server (afsendelse)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Godkendelse"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Importerer fil:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
@@ -7590,226 +7616,226 @@ msgstr "Søger mappe (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "Søg igen"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Ingen ulæste meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Ingen ulæste meddelelser."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Ingen ulæste meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Ikke flere nye meddelelser"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Ingen nye meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Ingen nye meddelelser."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Ingen nye meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Ingen markérede meddelelser fundet. Søg bagfra?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Ingen markérede eddelelser."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Ikke flere markérede eddelelser"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Ingen markérede meddelelser funder. Søg bagfra?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Ingen markérede meddelelser."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Samler meddelelser via Emne..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttet"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopieret"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " valgte"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nye, %d ulæst, %d total (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nye, %d ulæste, %d total"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Sorterer oversigt..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tOpretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Opretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelelse %d er markéret til flytning til %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Vælg mappe"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelelse %d er markéret til kopiering til %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Vælg mappe"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
@@ -7960,9 +7986,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread er ikke understøttet i glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Importerer fil:"
-
 #, fuzzy
 #~ msgid "Destination file:"
 #~ msgstr "Til sti:"
diff --git a/po/de.po b/po/de.po
index ff259352..302ac5de 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -312,7 +312,7 @@ msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiere Nachricht %s/%d nach %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1230,15 +1230,15 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Notiz"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Fehler"
 
@@ -1281,7 +1281,7 @@ msgstr "Braun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Keine"
 
@@ -1621,7 +1621,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -1818,7 +1818,7 @@ msgstr "MIME-Typ"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Größe"
 
@@ -2232,7 +2232,7 @@ msgstr "Exportieren"
 msgid "Specify source folder and destination file."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Datumsformat"
@@ -2247,7 +2247,7 @@ msgstr "Quellverzeichnis"
 msgid "Destination:"
 msgstr "Zielverzeichnis:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2259,7 +2259,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Auswählen... "
@@ -2434,12 +2434,12 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
@@ -2615,7 +2615,7 @@ msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Kein Von)"
 
@@ -2627,71 +2627,84 @@ msgstr "Erstelle Bilderansicht...\n"
 msgid "Can't load the image."
 msgstr "Kann das Bild nicht laden."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Suche %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Importieren"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Fehler beim Senden\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Kann Ablage '%s' nicht erstellen."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importieren"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Quellverzeichnis"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Zielverzeichnis:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Neue Ablage"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Wähle importierte Datei"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Wähle importierte Datei"
 
@@ -2867,125 +2880,125 @@ msgstr "Abgebrochen"
 msgid "Standby"
 msgstr "Warten"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Empfange"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Fertig (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Keine neuen Nachrichten."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Fertig."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Beglaubigung fehlgeschlagen"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Blockiert"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Beendet (%d neue Nachricht(en))"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Beendet (keine neuen Nachrichten)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Fehler während des Empfanges der E-Mails."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "erhalte neue Nachrichten vom Account %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Beglaubigen mit POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Beenden"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2993,15 +3006,15 @@ msgstr ""
 "Ausführung des Spamfilter-Kommandos fehlgeschlagen.\n"
 "Bite überprüfen Sie die Spamfilter-Einstellungen."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3010,29 +3023,29 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Kein Platz mehr auf der Festplatte."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Mailbox ist blockiert."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3041,11 +3054,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3054,15 +3067,15 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Empfangen abgebrochen\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -3080,16 +3093,16 @@ msgstr "Kennwort eingeben"
 msgid "Protocol log"
 msgstr "Mitschrift des Protokolls"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3099,23 +3112,23 @@ msgstr ""
 "                         öffne Verfassen-Fenster mit angegebenen Dateien\n"
 "                         angehängt"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Accounts"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sendet alle Nachrichten aus der Warteschlange"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ablage]...   zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3123,47 +3136,47 @@ msgstr ""
 "  --status-full [Ablage]...\n"
 "                         zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open OrdnerID/msgnum öffnet Nachrichten in neuem Fenster"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "··--configdir·dirname····gib das Verzeichnis an, in dem die "
 "Konfigurationsdateien gespeichert werden"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portnum      definiert Port für \"IPC remote\" Befehle"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                Beende Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                Fehlersuche"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 diese Hilfe"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              gibt Version aus und beendet"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Drücken Sie eine Taste"
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Dateiname Zeichensatz"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3187,19 +3200,19 @@ msgstr ""
 "\n"
 "Weiter?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Verfasste Nachricht existiert. Wirklich beenden?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3207,20 +3220,20 @@ msgstr ""
 "GnuPG is nicht richtig installiert, oder die Version ist zu alt.\n"
 "OpenPGP-Unterstützung ausgeschaltet"
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "Ein anderes Sylpheed läuft schon.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Konfigurationsmigration"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3877,8 +3890,8 @@ msgstr "Erstelle Hauptfenster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "Fertig.\n"
 
@@ -3925,11 +3938,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4152,7 +4165,7 @@ msgstr "Anhänge"
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
@@ -6263,19 +6276,19 @@ msgstr "Anhang"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Datum"
 
@@ -6285,7 +6298,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "An"
 
@@ -6597,7 +6610,7 @@ msgstr "Suche %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Suche %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
@@ -6699,7 +6712,7 @@ msgstr "_Über"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Nr."
 
@@ -6936,144 +6949,157 @@ msgstr "keine Verbindung mit NNTP-Server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "keine Verbindung mit NNTP-Server: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Setze Mailbox"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "Die folgenden Aktionen ausführen:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 #, fuzzy
 msgid "Cancel"
 msgstr "Abgebrochen"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Accounteinstellungen"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Menüname ist nicht gesetzt."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP-Server"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP-Server"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Accounteinstellungen"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Account löschen"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Wähle Schlüssel nach E-Mail Adresse"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Namen anzeigen"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "E-Mail Adresse"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Benutzer-ID"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP-Server (senden)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Beglaubigung"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Importiere Datei:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Zeige das Ergebnis der Prüfung der digitalen Unterschrift an"
@@ -7421,221 +7447,221 @@ msgstr "Durchsuche Ablage (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Kann IMAP4-Sitzung mit %s:%d nicht aufbauen\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "Weiter_suchen"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Keine weiteren neuen ungelesenen Nachrichten"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Keine markieten Nachrichten."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Keine weiteren etikettierten Nachrichten"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Keine etikettierten Nachrichten."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " Einträge gewählt"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tErstelle Ablageninhalt aus Nachrichtendaten"
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Papierkorb löschen?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Nachricht %d ist markiert zum Verschieben nach %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Wähle Ablage"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Nachricht %d ist markiert zum Kopieren nach %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Wähle Ablage"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
@@ -7779,9 +7805,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread wird nicht unterstützt von Glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Importiere Datei:"
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "Wähle Datei"
diff --git a/po/el.po b/po/el.po
index 4dbd8f5e..0b5afe50 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -316,7 +316,7 @@ msgstr "ο φάκελος προορισμού είναι ο ίδιος με τ�
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Αντιγραφή μηνύματος %s%c%d στο %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1257,15 +1257,15 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Σημείωση"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -1309,7 +1309,7 @@ msgstr "Καφέ"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Κανένα"
 
@@ -1651,7 +1651,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
@@ -1852,7 +1852,7 @@ msgstr "τύπος MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Μέγεθος"
 
@@ -2270,7 +2270,7 @@ msgstr "Εξαγωγή"
 msgid "Specify source folder and destination file."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Μορφοποίηση ημερομηνίας"
@@ -2285,7 +2285,7 @@ msgstr "Πηγαίος κατάλογος:"
 msgid "Destination:"
 msgstr "Κατάλογος προορισμού:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2297,7 +2297,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Επιλογή ... "
@@ -2475,12 +2475,12 @@ msgstr "Ορισμός πληροφοριών φακέλου...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες φακέλων..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση φακέλων %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση φακέλου %s ..."
@@ -2657,7 +2657,7 @@ msgid "Creating header view...\n"
 msgstr "Δημιουργία προβολής κεφαλίδων...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
 
@@ -2669,71 +2669,84 @@ msgstr "Δημιουργία προβολής εικόνας...\n"
 msgid "Can't load the image."
 msgstr "Δεν είναι δυνατό το φόρτωμα της εικόνας"
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Αναζήτηση για %s..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Εισαγωγή"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Σάρωση φακέλου %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Προέκυψε σφάλμα κατά την αποστολή\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Δεν είναι δυνατή η δημιουργία του φακέλου `%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Πηγαίος κατάλογος:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Κατάλογος προορισμού:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Νέος φάκελος"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Επέλεξε αρχείο εισαγωγής"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Επέλεξε αρχείο εισαγωγής"
 
@@ -2917,140 +2930,140 @@ msgstr "Ακυρώθηκε"
 msgid "Standby"
 msgstr "Σε αναμονή"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Λήψη"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Ολοκληρώθηκε (%d μηνύματα (%s) παρελήφθησαν)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Δεν υπάρχουν νέα μηνύματα."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Έγινε."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Η εντολή Auth απέτυχε"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Κλειδωμένο"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Όριο χρόνου"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Ολοκληρώθηκε (%d νέα μηνύματα)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Ολοκληρώθηκε (δεν υπάρχουν νέα μηνύματα)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Συνέβησαν σφάλματα κατά την αποστολή των μηνυμάτων στην ουρά."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "λήψη νέων μηνυμάτων λογαριασμού %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Πιστοποίηση με POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Λήψη νέων μηνυμάτων"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Σύνδεση με το διακομιστή POP3: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Πιστοποίηση..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Λήψη μηνυμάτων από %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Λήψη μεγέθους μηνυμάτων (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Διαγραφή μηνύματος %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Κλείνω τη σύνδεση"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Λαμβάνεται το μήνυμα (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Η σύνδεση απέτυχε."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το μήνυμα."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3059,29 +3072,29 @@ msgstr ""
 "Δημιουργήθηκε σφάλμα κατά την επεξεργασία μηνυμάτων:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Δεν υπάρχει άλλος χώρος στο δίσκο."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Δεν είναι δυνατή η εγγραφή του αρχείου."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Σφάλμα σύνδεσης."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Η σύνδεση έκλεισε από τον απομακρυσμένο υπολογιστή."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Το γραμματοκιβώτιο είναι κλειδωμένο."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3090,11 +3103,11 @@ msgstr ""
 "Το γραμματοκιβώτιο είναι κλειδωμένο:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3103,15 +3116,15 @@ msgstr ""
 "Η πιστοποίηση απέτυχε:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Λήξη χρόνου σύνδεσης."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Η ενσωμάτωση ακυρώθηκε\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Λήψη μηνυμάτων από %s στο %s ...\n"
@@ -3129,16 +3142,16 @@ msgstr "Δώστε τον κωδικό"
 msgid "Protocol log"
 msgstr "Καταγραφή πρωτοκόλλου"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [διεύθυνση]  άνοιγμα παραθύρου σύνθεσης"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3148,23 +3161,23 @@ msgstr ""
 "                         άνοιγμα του παραθύρου σύνθεσης μηνύματος με\n"
 "                         τα καθορισμένα αρχεία συνημμένα"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          λήψη νέων μηνυμάτων όλων των λογαριασμών"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 αποστολή όλων των μηνυμάτων στην ουρά"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [φάκελος]...  εμφάνιση του συνολικού αριθμού μηνυμάτων"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3172,47 +3185,47 @@ msgstr ""
 "  --status-full [φάκελος]...\n"
 "                         εμφάνιση της κατάστασης του φακέλου"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --config-dir κατάλογος  ορίζει τον κατάλογο που αποθηκεύονται τα αρχεία "
 "ρυθμίσεων"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 έξοδος από το Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                λειτουργία αποσφαλμάτωσης"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 εμφάνιση αυτού του κειμένου και έξοδος"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              εμφάνιση της έκδοσης και έξοδος"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Πατήστε ένα πλήκτρο..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Κωδικοποίηση ονομάτων αρχείων"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3237,19 +3250,19 @@ msgstr ""
 "\n"
 "Συνέχεια;"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Υπάρχει ήδη μήνυμα υπό σύνθεση. Να γίνει έξοδος;"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Μηνύματα στην ουρά"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Μερικά μηνύματα δεν έχουν σταλεί και είναι στην ουρά. Να κλείσω;"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3257,20 +3270,20 @@ msgstr ""
 "Το GnuPG δεν έχει εγκατασταθεί σωστά, ή χρειάζεται αναβάθμιση.\n"
 "Η υποστήριξη OpenPGP απενεργοποιήθηκε."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "Τρέχει ήδη ένα Sylpheed.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Μεταφορά ρυθμίσεων"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3935,8 +3948,8 @@ msgstr "Δημιουργία κύριου παραθύρου...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "έγινε.\n"
 
@@ -3983,11 +3996,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Το γραμματοκιβώτιο '%s' υπάρχει ήδη."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Γραμματοκιβώτιο"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4214,7 +4227,7 @@ msgstr "Συνημμένα"
 msgid "Message View - Sylpheed"
 msgstr "Προβολή μηνύματος - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν είναι δυνατή η αποθήκευση του αρχείου '%s'."
@@ -6324,19 +6337,19 @@ msgstr "Συνημμένο"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6346,7 +6359,7 @@ msgid "Number"
 msgstr "Αριθμός"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Προς:"
@@ -6659,7 +6672,7 @@ msgstr "Αναζήτηση για %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Αναζήτηση για %s..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
@@ -6764,7 +6777,7 @@ msgstr "_Σχετικά"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Αφαίρεση γραμματοκιβωτίου"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Όχι."
 
@@ -7001,144 +7014,157 @@ msgstr "Δεν μπορώ να συνδεθώ στον NNTP server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Δεν μπορώ να συνδεθώ στον NNTP server: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Ρυθμίσεις γραμματοκιβωτίου"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "Εκτέλεση ακόλουθων ενεργειών:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 #, fuzzy
 msgid "Cancel"
 msgstr "Ακυρώθηκε"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Το γραμματοκιβώτιο '%s' υπάρχει ήδη."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Ρύθμιση λογαριασμού"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Δεν έχει οριστεί το όνομα του μενού."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "Διακομιστής LDAP"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "Διακομιστής LDAP"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Ρύθμιση λογαριασμού"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Διαγραφή λογαριασμού"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Επιλογή κλειδιού με βάση την διεύθυνση αλληλογραφίας"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Εμφανιζόμενο όνομα"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Όνομα χρήστη"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "Διακομιστής SMTP (αποστολή)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Πιστοποίηση"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Εισαγωγή αρχείου:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Αποτέλεσμα ελέγχου υπογραφής"
@@ -7471,225 +7497,225 @@ msgstr "Σάρωση φακέλου (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "Εύρεση _ξανά"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Δεν υπάρχουν άλλα μη αναγνωσμένα μηνύματα"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μη αναγνωσμένα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Δεν υπάρχουν μη αναγνωσμένα μηνύματα."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Δεν υπάρχουν άλλα νέα μηνύματα"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Δεν βρέθηκαν νέα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Δεν υπάρχουν νέα μηνύματα."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Δεν βρέθηκαν νέα μηνύματα. Μετάβαση στον επόμενο φάκελο;"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Δεν υπάρχουν σημειωμένα μηνύματα."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 #, fuzzy
 msgid "No marked message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να γίνει αναζήτηση από την αρχή;"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 #, fuzzy
 msgid "No labeled message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μη αναγνωσμένα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 #, fuzzy
 msgid "No labeled messages."
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 #, fuzzy
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να γίνει αναζήτηση από την αρχή;"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d διαγράφηκαν"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d μετακινήθηκαν"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d αντιγράφηκαν"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " επιλεγμένα αντικείμενα"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Περίληψη ταξινόμησης..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tΟρισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Ορισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Εγγραφή προσωρινής μνήμης περιλήψεων (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο ως αναγνωσμένο\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο ως μη αναγνωσμένο\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d είναι προς διαγραφή\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος(ων)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τα μηνύματα από τα απορρίμματα;"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, fuzzy, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα είναι ανεπιθύμητο"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, fuzzy, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Αποτυχία ορισμού μετακίνησης ποντικιού: %d."
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Επιλογή φακέλου"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, fuzzy, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Αντιγραφή επιλεγμένων μηνυμάτων στο πρόχειρο"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Επιλογή φακέλου"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Συνέβη ένα σφάλμα κατά την επεξεργασία του μηνύματος."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Εφαρμογή φίλτρων (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "Εφαρμογή φίλτρων..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Φιλτραρίστηκαν %d μηνύματα."
@@ -7829,9 +7855,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "το g_thread δεν υποστηρίζεται από την glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Εισαγωγή αρχείου:"
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "Επιλογή αρχείου"
diff --git a/po/es.po b/po/es.po
index 65bda604..cf508364 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -309,7 +309,7 @@ msgstr "las carpetas de origen y destino son idénticas.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensaje %s/%d a %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1226,15 +1226,15 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Error"
 
@@ -1277,7 +1277,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Ninguno"
 
@@ -1617,7 +1617,7 @@ msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1810,7 +1810,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Tamaño"
 
@@ -2223,7 +2223,7 @@ msgstr "Exportar"
 msgid "Specify source folder and destination file."
 msgstr "Especifique la carpeta de origen y el fichero de destino."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 msgid "File format:"
 msgstr "Formato de fichero:"
 
@@ -2235,7 +2235,7 @@ msgstr "Carpeta de origen:"
 msgid "Destination:"
 msgstr "Destino:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr "mbox de UNIX"
 
@@ -2247,7 +2247,7 @@ msgstr "eml (número + .eml)"
 msgid "MH (number only)"
 msgstr "MH (sólo número)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Seleccionar..."
@@ -2418,12 +2418,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:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2599,7 +2599,7 @@ msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Sin remitente)"
 
@@ -2611,62 +2611,75 @@ msgstr "Creando vista de imagen...\n"
 msgid "Can't load the image."
 msgstr "No se puede cargar la imagen."
 
-#: src/import.c:187
+#: src/import.c:200
 msgid "The source file does not exist."
 msgstr "El fichero de origen no existe."
 
-#: src/import.c:198
+#: src/import.c:211
 msgid "Can't find the destination folder."
 msgstr "No se encuentra la carpeta de destino."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, c-format
 msgid "Importing %s ..."
 msgstr "Importando %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 msgid "Importing"
 msgstr "Importación"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 msgid "Scanning folder..."
 msgstr "Revisando carpeta..."
 
-#: src/import.c:235
+#: src/import.c:252
 msgid "Error occurred on import."
 msgstr "Hubo un error al importar."
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "No se puede crear la carpeta «%s»."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importar"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 msgid "Specify source file and destination folder."
 msgstr "Especifique el fichero de origen y la carpeta de destino."
 
-#: src/import.c:340
+#: src/import.c:619
 msgid "Source:"
 msgstr "Origen:"
 
-#: src/import.c:345
+#: src/import.c:624
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
-#: src/import.c:358
+#: src/import.c:637
 msgid "eml (folder)"
 msgstr "eml (carpeta)"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 msgid "Specify source folder including eml files and destination folder."
 msgstr ""
 "Especifique la carpeta de origen que contiene los ficheros eml y la carpeta "
 "de destino."
 
-#: src/import.c:437
+#: src/import.c:719
 msgid "Select importing folder"
 msgstr "Seleccionar la carpeta a importar"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Seleccionar el fichero a importar"
 
@@ -2841,124 +2854,124 @@ msgstr "Cancelar"
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d mensaje(s) (%s) recibido(s)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, c-format
 msgid "no new messages"
 msgstr "no hay mensajes nuevos"
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Hecho"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Authorización fallida"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Hubo algún error obteniendo el correo."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obteniendo nuevos mensajes de la cuenta %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentificando con POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2966,15 +2979,15 @@ msgstr ""
 "La ejecución de la orden del filtro de correo basura falló.\n"
 "Por favor, compruebe la configuración del filtro de correo basura."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Conexión fallida."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Hubo un error mientras se procesaba el correo."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2983,29 +2996,29 @@ msgstr ""
 "Hubo un error procesando el correo:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "El buzón esta bloqueado."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3014,11 +3027,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3027,15 +3040,15 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Se agotó el tiempo de espera de la sesión."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -3053,16 +3066,16 @@ msgstr "Contraseña"
 msgid "Protocol log"
 msgstr "Traza del protocolo"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de composición"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3072,23 +3085,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recive los mensajes nuevos"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe nuevos para todas las cuentas"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3096,47 +3109,47 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open idcarpeta/nºmsj abre el mensaje en una ventana nueva"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir nombredir  indicar el directorio con ficheros de configuración"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport numpuerto    especificar el puerto IPC para órdenes remotas"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 finalizar Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta ayuda y finaliza"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              da la información de la versión y finaliza"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Pulse cualquier tecla..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Codificación de los nombres de fichero"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3160,19 +3173,19 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Está componiendo un mensaje. ¿Seguro que quiere salir?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3180,20 +3193,20 @@ msgstr ""
 "GnuPG no esta convenientemente instalado, o es una versión antigua.\n"
 "Soporte para OpenPGP deshabilitado."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr "Cargando complementos..."
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "ya hay otro Sylpheed en ejecución.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3842,8 +3855,8 @@ msgstr "Creando ventana principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "hecho.\n"
 
@@ -3890,11 +3903,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4119,7 +4132,7 @@ msgstr "Adjuntos"
 msgid "Message View - Sylpheed"
 msgstr "Vista de mensaje - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
@@ -6204,19 +6217,19 @@ msgstr "Adjunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Fecha"
 
@@ -6226,7 +6239,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "Para"
 
@@ -6534,7 +6547,7 @@ msgstr "Buscando %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Buscando %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
@@ -6631,7 +6644,7 @@ msgstr "A_cerca de"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - Buzón remoto POP3"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "No."
 
@@ -6866,19 +6879,19 @@ msgstr "No se puede conectar con el servidor SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "No se puede conectar con el servidor SMTP: %s:%d"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Configurar buzón"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr "Este diálogo realizará la configuración inicial del buzón."
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr "Crear buzón en la ubicación por omisión siguiente:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
@@ -6886,7 +6899,7 @@ msgstr ""
 "Crear buzón en la siguiente ubicación:\n"
 "(introduzca el nombre o la ruta completa de la carpeta)"
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
@@ -6894,24 +6907,24 @@ msgstr ""
 "Si posteriormente desea añadir un buzón en otra ubicación, por favor use "
 "«Fichero - Buzón - Añadir buzón...» en el menú."
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr "¿Continuar sin crear el buzón?"
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr "Por favor introduzca el nombre o la ruta completa de la carpeta."
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
@@ -6919,78 +6932,78 @@ msgstr ""
 "La ubicación «%s» incluye una carpeta de configuración. Por favor especifique "
 "otra ubicación."
 
-#: src/setup.c:467
+#: src/setup.c:473
 msgid "Cancel mail account setup?"
 msgstr "¿Cancelar la configuración de la cuenta de correo?"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 msgid "Input value is not valid."
 msgstr "El valor introducido no es válido."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 msgid "POP3 server:"
 msgstr "Servidor POP3:"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 msgid "IMAP4 server:"
 msgstr "Servidor IMAP4:"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 msgid "New account setup"
 msgstr "Configurar nueva cuenta"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr "Este diálogo realizará la configuración inicial de una nueva cuenta."
 
-#: src/setup.c:743
+#: src/setup.c:749
 msgid "Select account type:"
 msgstr "Seleccionar tipo de cuenta:"
 
-#: src/setup.c:766
+#: src/setup.c:772
 msgid "Input your name and mail address:"
 msgstr "Introduzca su nombre y dirección de correo:"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 msgid "Display name:"
 msgstr "Nombre mostrado:"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 msgid "E-mail address:"
 msgstr "Dirección de correo:"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr "Este nombre se verá al lado de los destinatarios (ej.: Juan Nadie)"
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr "Introduzca el ID de usuario y el servidor de correo:"
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 msgid "SMTP server:"
 msgstr "Servidor SMTP:"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 msgid "Use SMTP authentication"
 msgstr "Usar autentificación SMTP"
 
-#: src/setup.c:874
+#: src/setup.c:880
 #, fuzzy
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 "Su nueva cuenta de correo ha sido creada con la siguiente configuración."
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
@@ -7000,6 +7013,19 @@ msgstr ""
 "«Configuración - Preferencias para la cuenta actual» o\n"
 "«Configuración - Editar cuentas» en el menú principal."
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "/_Fichero/I_mportar correo..."
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Resultado de comprobación de la firma"
@@ -7327,219 +7353,219 @@ msgstr "Revisando carpeta (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "No puedo establecer la conexión IMAP4.\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "_Buscar de nuevo"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por asunto..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevos, %d no leídos, %d totales (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuevos, %d no leídos, %d totales"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Ordenando cabeceras..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tExtrayendo cabeceras de los mensajes..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 msgid "Select folder to move"
 msgstr "Seleccionar carpeta a mover"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "El destino de la copia es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 msgid "Select folder to copy"
 msgstr "Seleccionar carpeta a copiar"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
diff --git a/po/et.po b/po/et.po
index f78d937b..a2c24e4a 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -317,7 +317,7 @@ msgstr "lähtekaust on identne sihtkaustale.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1245,15 +1245,15 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Märkus"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Viga"
 
@@ -1296,7 +1296,7 @@ msgstr "Pruun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Mittemiski"
 
@@ -1678,7 +1678,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
@@ -1870,7 +1870,7 @@ msgstr "MIME tüüp"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Suurus"
 
@@ -2289,7 +2289,7 @@ msgstr "Väljasta"
 msgid "Specify source folder and destination file."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Kuupäeva formaat"
@@ -2304,7 +2304,7 @@ msgstr "Lähte kataloog"
 msgid "Destination:"
 msgstr "Sihtkaust"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2316,7 +2316,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Vali... "
@@ -2498,12 +2498,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -2683,7 +2683,7 @@ msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Eikelleltki)"
 
@@ -2695,71 +2695,84 @@ msgstr "Loon pildi vaadet...\n"
 msgid "Can't load the image."
 msgstr "Ei suuda lugeda pilti."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Impordi"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Kirja saatmisel tekkis viga\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Ei suuda luua kausta %s."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Impordi"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Lähte kataloog"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Sihtkataloog:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Uus kaust"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Märgi importiv fail"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Märgi importiv fail"
 
@@ -2943,198 +2956,198 @@ msgstr "Loobu"
 msgid "Standby"
 msgstr "*Juures"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Tirin"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Uusi kirju ei ole."
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Tehtud"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Autoriseerimine ebaõnnestus"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: src/inc.c:749
+#: src/inc.c:754
 #, fuzzy
 msgid "Timeout"
 msgstr "Ajalimiit (sek)"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Lõpetatud (uusi kirju pole)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Tekksiid mõned vead kirjade võtmisel."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "võtan uued kirjad kontolt %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autoriseerimine"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Uute kirjade võtmine"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ühendan POP3 serveriga: %s ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Võtan uute kirjade arvu (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Võtan kirjade suuruse (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Väljun"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Võtan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 #, fuzzy
 msgid "Connection failed."
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Ketas täis."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 #, fuzzy
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Sissekanne peatatud\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Võtame uued teated %s-ist %s-i.\n"
@@ -3152,16 +3165,16 @@ msgstr "Sisesta parool"
 msgid "Protocol log"
 msgstr "Protokolli sündmustik"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [aadress]    ava kirjakirjutamise aken"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3171,73 +3184,73 @@ msgstr ""
 "                          ava uue kirja aken nii, et märgitud failid\n"
 "                          on manustatud kirjale"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              võta uued kirjad"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          võta uued kirjad kõigilt konto"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --saada              saada kõik järjekorras olevad kirjad"
 
-#: src/main.c:585
+#: src/main.c:590
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:586
+#: src/main.c:591
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                veaotsimise režiim"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                veaotsimise režiim"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 näita seda teadet ja välju"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              näita versiooni informatsiooni ja välju"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "või vajuta 'y' klahvi.\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Väljuva kirja kooditabel"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3251,19 +3264,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Kirjakirjutamine on pooleli. Tõesti lõpetame?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "kirjad järjekorras"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Mõned saatmata kirjad on järjekooras. Lõpetame?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3271,21 +3284,21 @@ msgstr ""
 "GnuPG pole installeeritud, või on liialt vana.\n"
 "OpenPGP toetus keelustatud."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "üks teine Sylpheed juba töötab.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3981,8 +3994,8 @@ msgstr "Loon peamise akna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "tehtud.\n"
 
@@ -4031,11 +4044,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4240,7 +4253,7 @@ msgstr "Manused"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
@@ -6431,19 +6444,19 @@ msgstr "Manus"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -6453,7 +6466,7 @@ msgid "Number"
 msgstr "Number"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Kellele:"
@@ -6778,7 +6791,7 @@ msgstr "Filtreerin..."
 msgid "Searching %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
@@ -6887,7 +6900,7 @@ msgstr "Sellest"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Ei."
 
@@ -7120,142 +7133,155 @@ msgstr "Ei saa ühendust SMTP serveriga: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ei saa ühendust SMTP serveriga: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Kirjakasti seaded"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr ""
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Loobu"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Konto seaded"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Menüü nime ei ole sisestatud."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP Server"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP Server"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Konto seaded"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Kustuta konto"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Vali võti elektronposti aadressi juurest"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Ekraani nimi"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "E-Posti aadress"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Kasutajanimi"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "Saatmise server (SMTP)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Autoriseerimine"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Faili importimine:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
@@ -7592,224 +7618,224 @@ msgstr "Tuhnin kaustas (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "Otsi uuesti"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Pole rohkem kirju, mida pole loetud."
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Pole rohkem kirju, mida pole loetud. Otsime alates lõpust?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Ei leidunud kirju mida pole loetud. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Pole rohkem kirju"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Pole rohkem uusi kirju. Otsime alates lõpust?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Uusi kirju ei ole."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Uusi kirju ei leidu. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Pole Rohkem märgitud kirju"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Märgitud kirju ei ole."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime algusest?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Rohkem sildiga kirju ei leitud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Rohkem sildiga kirju ei ole."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Rohkem seildiga kirju ei leitud. Kas otsime algusest?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "*Võtan kirju päälkirja järgi..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d on kustutatud"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d on ülekantud"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d on kopeeritud"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " kirja märgitud"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "uusi %d, mitteloetuid %d, kokku %d (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "uusi %d, mitteloetuid %d, kokku %d"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Sorteerin kirjaloendi..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\t sätin kokkuvõtte kirja andmetest..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Teen kokkuvõtte teadete andmetest..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Kas te tõesti soovite kirju eemaldada prügikastist?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Kiri %d on määratud ülekandmiseks %s-i\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Vali kaust"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Kiri %d on määratud kopeerimisele %s-i\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Vali kaust"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
@@ -7960,9 +7986,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread ei ole glib poolt toetatud.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Faili importimine:"
-
 #, fuzzy
 #~ msgid "Destination file:"
 #~ msgstr "Sihtkataloog:"
diff --git a/po/fr.po b/po/fr.po
index 6c44d334..1ee70956 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -319,7 +319,7 @@ msgstr "dossier source identique à la destination.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copie du message %s/%d vers %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1242,15 +1242,15 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Erreur"
 
@@ -1293,7 +1293,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Aucun"
 
@@ -1635,7 +1635,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -1826,7 +1826,7 @@ msgstr "Type MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Taille"
 
@@ -2240,7 +2240,7 @@ msgstr "Exporter"
 msgid "Specify source folder and destination file."
 msgstr "Indiquer le dossier source et le fichier cible."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 msgid "File format:"
 msgstr "Format de fichier:"
 
@@ -2252,7 +2252,7 @@ msgstr "Dossier source:"
 msgid "Destination:"
 msgstr "Cible:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr "UNIX mbox"
 
@@ -2264,7 +2264,7 @@ msgstr "eml (numéro + eml)"
 msgid "MH (number only)"
 msgstr "MH (numéro uniquement)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Choisir... "
@@ -2435,12 +2435,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:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -2617,7 +2617,7 @@ msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
@@ -2629,62 +2629,75 @@ msgstr "Création de la vue de l'image...\n"
 msgid "Can't load the image."
 msgstr "Impossible de charger l'image."
 
-#: src/import.c:187
+#: src/import.c:200
 msgid "The source file does not exist."
 msgstr "Le fichier source n'existe pas."
 
-#: src/import.c:198
+#: src/import.c:211
 msgid "Can't find the destination folder."
 msgstr "Le dossier cible n'existe pas."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, c-format
 msgid "Importing %s ..."
 msgstr "En cours d'importation %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 msgid "Importing"
 msgstr "Importation"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 msgid "Scanning folder..."
 msgstr "Analyse du dossier..."
 
-#: src/import.c:235
+#: src/import.c:252
 msgid "Error occurred on import."
 msgstr "Erreur lors de l'importation."
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Impossible de créer le dossier « %s »."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importer"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 msgid "Specify source file and destination folder."
 msgstr "Indiquer le fichier source et le dossier cible."
 
-#: src/import.c:340
+#: src/import.c:619
 msgid "Source:"
 msgstr "Source:"
 
-#: src/import.c:345
+#: src/import.c:624
 msgid "Destination folder:"
 msgstr "Dossier cible:"
 
-#: src/import.c:358
+#: src/import.c:637
 msgid "eml (folder)"
 msgstr "eml (dossier)"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 msgid "Specify source folder including eml files and destination folder."
 msgstr ""
 "Indiquer le dossier contenant les fichiers eml à importer et le dossier "
 "cible."
 
-#: src/import.c:437
+#: src/import.c:719
 msgid "Select importing folder"
 msgstr "Choix du dossier à importer"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Choix du fichier à importer"
 
@@ -2861,124 +2874,124 @@ msgstr "Annuler"
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d message(s) (%s) reçu(s)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, c-format
 msgid "no new messages"
 msgstr "pas de nouveau message"
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Terminé"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Erreur lors de la récupération des messages."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Récupération des nouveaux messages du compte %s ...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s : Authentification POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Réception des messages de %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2986,15 +2999,15 @@ msgstr ""
 "Erreur dans la gestion des messages indésirables.\n"
 "Vérifier les paramètres."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "La connexion a échoué."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3003,29 +3016,29 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Impossible d'écrire dans le fichier."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Boîte verrouillée."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3034,11 +3047,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3047,15 +3060,15 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Relève du courrier annulée\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -3073,16 +3086,16 @@ msgstr "Saisissez le mot de passe"
 msgid "Protocol log"
 msgstr "Journal de connexion"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3093,24 +3106,24 @@ msgstr ""
 "(s)\n"
 "                         jointe(s) le(s) fichier(s) spécifié(s)"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              récupérer les nouveaux messages"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dossier]...  afficher le nombre total de messages"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3118,50 +3131,50 @@ msgstr ""
 "  --status-full [dossier]...\n"
 "                         afficher l'état de chaque dossier"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 "  --open [id dossier]/[numéro du message] ouvrir le message dans une "
 "nouvelle fenêtre"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dossier    indiquer le dossier contenant les fichiers de "
 "configuration"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport portnum      spécifier le port pour les commandes IPC distantes"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 quitter Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                afficher les informations de mise au point"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afficher l'aide-mémoire"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              afficher les informations de version"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Appuyez sur une touche..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Jeu de caractères du nom de fichier"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3185,23 +3198,23 @@ msgstr ""
 "\n"
 "Poursuivre ?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Une fenêtre de composition de message existe.\n"
 "Voulez-vous vraiment quitter ?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Quitter "
 "maintenant ?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3209,20 +3222,20 @@ msgstr ""
 "GnuPG n'est pas installé correctement.\n"
 "Support OpenPGP désactivé."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr "Chargement des plug-ins..."
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3875,8 +3888,8 @@ msgstr "Création de la fenêtre principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -3922,11 +3935,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4150,7 +4163,7 @@ msgstr "Pièces jointes"
 msgid "Message View - Sylpheed"
 msgstr "Fenêtre des messages - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
@@ -6250,19 +6263,19 @@ msgstr "Pièces jointes"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Date"
 
@@ -6272,7 +6285,7 @@ msgid "Number"
 msgstr "Numéro"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "À"
 
@@ -6582,7 +6595,7 @@ msgstr "Recherche %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Recherche %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(aucune date)"
 
@@ -6679,7 +6692,7 @@ msgstr "À _propos"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - boîte POP3 à distance"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "N°"
 
@@ -6914,19 +6927,19 @@ msgstr "Impossible de se connecter au serveur SMTP "
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Impossible de se connecter au serveur SMTP : %s:%d"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Paramètres de la boîte aux lettres"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr "Ce dialogue permettra la configuration initiale la boîte aux lettres."
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr "Créer la boîte aux lettres à l'emplacement par défaut suivant:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
@@ -6934,7 +6947,7 @@ msgstr ""
 "Créer une boîte aux lettres à l'emplacement suivant:\n"
 "(entrer le nom d'un dossier ou son chemin complet)"
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
@@ -6942,24 +6955,24 @@ msgstr ""
 "Pour ajouter par la suite une boîte aux lettres à un autre emplacement, "
 "aller à 'Fichier - Boîte aux lettres - Ajouter une boîte aux lettres'."
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr "Continuer sans créer de boîte aux lettres?"
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr "Entrer le nom d'un dossier ou son chemin complet."
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
@@ -6967,77 +6980,77 @@ msgstr ""
 "L'emplacement '%s' comprend le dossier de configuration. Choisir un autre "
 "emplacement."
 
-#: src/setup.c:467
+#: src/setup.c:473
 msgid "Cancel mail account setup?"
 msgstr "Abandonner la configuration du compte?"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 msgid "Input value is not valid."
 msgstr "Valeur invalide "
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 msgid "POP3 server:"
 msgstr "Serveur POP3:"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 msgid "IMAP4 server:"
 msgstr "Serveur IMAP4:"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 msgid "New account setup"
 msgstr "Configuration du nouveau compte"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 "Ce dialogue permettra la configuration initiale de la boîte aux lettres."
 
-#: src/setup.c:743
+#: src/setup.c:749
 msgid "Select account type:"
 msgstr "Sélectionner le type de compte:"
 
-#: src/setup.c:766
+#: src/setup.c:772
 msgid "Input your name and mail address:"
 msgstr "Entrer votre nom et votre adresse électronique:"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 msgid "Display name:"
 msgstr "Nom affiché:"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 msgid "E-mail address:"
 msgstr "Adresse électronique:"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr "Ce nom apparaîtra à côté des destinataires (ex: John Doe)"
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr "Entrer l'identité de l'utilisateur et le serveur mail:"
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 msgid "User ID:"
 msgstr "Nom de l'utilisateur:"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 msgid "SMTP server:"
 msgstr "Serveur SMTP:"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 msgid "Use SSL"
 msgstr "Utiliser SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 msgid "Use SMTP authentication"
 msgstr "Utiliser l'authentification SMTP"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr "Votre nouveau compte mail a été configuré comme suivant."
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
@@ -7047,6 +7060,19 @@ msgstr ""
 "'Configuration - Configuration du compte courant' ou\n"
 "'Configuration - Édition des comptes' dans le menu principal"
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Fichier mbox :"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Résultat de la vérification de signature"
@@ -7376,221 +7402,221 @@ msgstr "Analyse du dossier (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Impossible d'établir un session IMAP.\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "_Chercher encore"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Pas de message non lu. Passer au dossier non lu suivant ?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Pas de nouveaux messages."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "Plus de nouveaux messages. Aller au prochain dossier avec des nouveaux "
 "messages?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Plus de messages marqués."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d effacé"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " élément(s) sélectionné(s)"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nouveau(x), %d non lu(s), %d au total"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Tri de l'index..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tDéfinition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement ce(s) message(s) de la "
 "corbeille ?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Le message %d est marqué pour déplacement dans %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 msgid "Select folder to move"
 msgstr "Choisir le dossier à déplacer"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 msgid "Select folder to copy"
 msgstr "Choisir le dossier à copier"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrage (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
@@ -7730,9 +7756,6 @@ msgstr "Impossible de trouver la version."
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread non supporté par glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Fichier mbox :"
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "Choisissez un fichier"
diff --git a/po/gl.po b/po/gl.po
index ce56ba18..bf970b2f 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -316,7 +316,7 @@ msgstr "carpetas de orixen e destiño idénticas.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1244,15 +1244,15 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Erro"
 
@@ -1295,7 +1295,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Ningún"
 
@@ -1677,7 +1677,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1869,7 +1869,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Tamaño"
 
@@ -2288,7 +2288,7 @@ msgstr "Exportar"
 msgid "Specify source folder and destination file."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Formato de data"
@@ -2303,7 +2303,7 @@ msgstr "Carpeta orixen:"
 msgid "Destination:"
 msgstr "Destiño"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2315,7 +2315,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Seleccionar..."
@@ -2496,12 +2496,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:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2679,7 +2679,7 @@ msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -2691,71 +2691,84 @@ msgstr "Creando vista de imaxen...\n"
 msgid "Can't load the image."
 msgstr "Non se pode cargar a imaxen."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Importar"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Ocurríu un erro mentras se enviaba\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Non se pode crear a carpeta `%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importar"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Carpeta orixen:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Carpeta de destiño:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nova carpeta"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Seleccionar ficheiro a importar"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Seleccionar ficheiro a importar"
 
@@ -2939,141 +2952,141 @@ msgstr "Cancelar"
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Non hai mensaxes novas."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Feito."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:749
+#: src/inc.c:754
 #, fuzzy
 msgid "Timeout"
 msgstr "Tiempo límite (seg.)"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Finalizado (non hai mensaxes novos)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Ocurriu algún erro obtendo o correo."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensaxes da conta %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autenticando"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensaxes"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ó servidor POP3: %s ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Non se pode conectar ó servirdor POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensaxes (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Saíndo"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexión fallida"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3082,29 +3095,29 @@ msgstr ""
 "Ocurriu un erro mentras se procesaba o correo:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Non hai espacio libre no disco."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "a caixa de correo esta bloqueada."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3113,12 +3126,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3127,15 +3140,15 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -3153,16 +3166,16 @@ msgstr "Contrasinal"
 msgid "Protocol log"
 msgstr "Rexistro do protocolo"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre a fiestra de edición"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3172,73 +3185,73 @@ msgstr ""
 "                         abre a fiestra de composición con os ficheiros\n"
 "                         especificados como adxuntos"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe as mensaxes novas"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe novas mensaxes para todas as contas"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todas as mensaxes na cola"
 
-#: src/main.c:585
+#: src/main.c:590
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:586
+#: src/main.c:591
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta axuda e finaliza"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              da a información da versión e finaliza"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ou pulse a tecla `y'.\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Codificación para enviar"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3252,19 +3265,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Está compoñendo unha mensaxe. ¿Quere sair?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Mensaxes en cola"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hai mensaxes sin enviar na cola. ¿Sair agora?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3272,21 +3285,21 @@ msgstr ""
 "GnuPG non esta convenientemente instalado, ou é unha versión antiga.\n"
 "Soporte para OpenPGP deshabilitado."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "xa hai outro Sylpheed executándose.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "configuración das accions"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3981,8 +3994,8 @@ msgstr "Creando Fiestra principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "feito.\n"
 
@@ -4032,11 +4045,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4242,7 +4255,7 @@ msgstr "Adxuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
@@ -6430,19 +6443,19 @@ msgstr "Adxunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Data"
 
@@ -6452,7 +6465,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Para:"
@@ -6777,7 +6790,7 @@ msgstr "Filtrando..."
 msgid "Searching %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Sin data)"
 
@@ -6885,7 +6898,7 @@ msgstr "Acerca de"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Non."
 
@@ -7119,142 +7132,155 @@ msgstr "Non se pode conectar con o servidor SMTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Non se pode conectar con o servidor SMTP: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Configurar caixa de correo"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr ""
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Preferencias da conta"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Non se estableceu o nome de menú."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "Servidor LDAP"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "Servidor LDAP"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Preferencias da conta"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Borrar conta"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Seleccionar clave por dirección de correo"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Nome mostrado"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "Enderezo e-mail"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Usuario"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Autenticación"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Ficheiro a importar:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
@@ -7591,224 +7617,224 @@ msgstr "Revisando carpeta (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Non podo establecer unha sesión IMAP4 con: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "Búscar de novo"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Non hai mais mensaxes sin ler"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Non hai mensaxes sin ler. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Non hai mensaxes sin leer."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Non hai mensaxes sen ler. ¿Ir á carpeta seguinte?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Non hai mais mensaxes novas"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Non hai mais mensaxes novas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Non hai mensaxes novas."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Non hai máis mensaxes novas. ¿Ir a a carpeta seguinte?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Non hai mais mensaxes marcadas"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Non hai mensaxes etiquetadas."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensaxes por asunto..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d non leídos, %d totales (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d non leídos, %d totales"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Ordeando cabeceiras..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tExtraindo cabeceiras das mensaxes..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Resumindo as mensaxes..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quere realmente borrar a/as mensaxe(s) da papeleira?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Seleccionar carpeta"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Seleccionar carpeta"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
@@ -7959,9 +7985,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread non está soportado por glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Ficheiro a importar:"
-
 #, fuzzy
 #~ msgid "Destination file:"
 #~ msgstr "Carpeta de destiño:"
diff --git a/po/hr.po b/po/hr.po
index d78f79b4..79129da8 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -318,7 +318,7 @@ msgstr "izvorni spis jednak je destinaciji.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1242,15 +1242,15 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Obavijest"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Greška"
 
@@ -1293,7 +1293,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Ništa"
 
@@ -1685,7 +1685,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1875,7 +1875,7 @@ msgstr "MIME tip"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Veličina"
 
@@ -2295,7 +2295,7 @@ msgstr "Iznesi"
 msgid "Specify source folder and destination file."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Format datuma"
@@ -2310,7 +2310,7 @@ msgstr "Izvorni dir:"
 msgid "Destination:"
 msgstr "Destinacija"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2322,7 +2322,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Odaberite... "
@@ -2507,12 +2507,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
@@ -2694,7 +2694,7 @@ msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
 
@@ -2706,71 +2706,84 @@ msgstr "Kreiram pregled slika...\n"
 msgid "Can't load the image."
 msgstr "Ne mogu prikazati sliku."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Uvezi"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Došlo je do greške prilikom slanja\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Ne mogu stvoriti spis `%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Uvezi"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Izvorni dir:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Destinacijski dir:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Novi spis"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Odaberite datoteku za uvoz"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Odaberite datoteku za uvoz"
 
@@ -2965,201 +2978,201 @@ msgstr "Odustani"
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Nema nepročitanih poruka."
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Gotovo"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Identifikacija nije uspjela"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:749
+#: src/inc.c:754
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, fuzzy, c-format
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:808
+#: src/inc.c:813
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke s računa %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autorizacija"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 poslužitelj: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Primam broj novih poruka (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Primam broj novih poruka (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Primam veličinu poruka (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Nema više mjesta na disku."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 #, fuzzy
 msgid "Socket error."
 msgstr "protokol greška\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Prima novu poštu"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke s %s u %s...\n"
@@ -3177,90 +3190,90 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prima sve poruke sa svih računa"
 
-#: src/main.c:584
+#: src/main.c:589
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:585
+#: src/main.c:590
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:586
+#: src/main.c:591
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                debug način"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikazuje ovu pomoć i izlazi"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ili pritisnite `y´ tipku.\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3274,19 +3287,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Pisanje poruke postoji. Uistinu prekinuti?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlane poruke su odložene. Izaći odmah?"
 
-#: src/main.c:894
+#: src/main.c:899
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -3295,21 +3308,21 @@ msgstr ""
 "GnuPG nije pravilno instaliran.\n"
 "OpenPGP podrška je onemogućena."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem konfiguraciju filtera...\n"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -4071,8 +4084,8 @@ msgstr "Kreiram glavne prozore...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4122,11 +4135,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4335,7 +4348,7 @@ msgstr "Prilog"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
@@ -6518,19 +6531,19 @@ msgstr "Prilog"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Datum"
 
@@ -6540,7 +6553,7 @@ msgid "Number"
 msgstr "Broj"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -6868,7 +6881,7 @@ msgstr "Filtriranje..."
 msgid "Searching %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6977,7 +6990,7 @@ msgstr "O"
 msgid "%s - POP3 Remote mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Ne."
 
@@ -7211,142 +7224,155 @@ msgstr "Ne mogu se povezati na SMTP poslužitelj: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ne mogu se povezati na SMTP poslužitelj: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Postavke sandučića"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr ""
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Odustani"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Postavke računa"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP Poslužitelj"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP Poslužitelj"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Postavke računa"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Obriši račun"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Odaberi ključ po e-mail adresi"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Prikaz imena"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "E-mail adresa"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "ID korisnika"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP poslužitelj (slanje)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Autorizacija"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Uvozim datoteku:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
@@ -7693,227 +7719,227 @@ msgstr "Pregledavam spis (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "Polje potrage"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 #, fuzzy
 msgid "No new messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Nema više label poruka"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema label poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Nema label poruka."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema label poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Prihvaćam poruke po temi..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premješteno"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Postavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premještanje u %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Odaberite spis"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Odaberite spis"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
@@ -8063,9 +8089,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread nije podržan od glib-a.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Uvozim datoteku:"
-
 #, fuzzy
 #~ msgid "Destination file:"
 #~ msgstr "Destinacijski dir:"
diff --git a/po/hu.po b/po/hu.po
index 3c3e0499..9d14de32 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -311,7 +311,7 @@ msgstr "A forrás- és célmappa azonos.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "%s/%d levél másolása ide: %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1227,15 +1227,15 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Megjegyzés"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Hiba"
 
@@ -1278,7 +1278,7 @@ msgstr "Barna"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Semmi"
 
@@ -1618,7 +1618,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Egy több részes levél egy darabja nem hozzáférhető."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
@@ -1812,7 +1812,7 @@ msgstr "MIME típus"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Méret"
 
@@ -2223,7 +2223,7 @@ msgstr "Exportálás"
 msgid "Specify source folder and destination file."
 msgstr "Adja meg a forrásmappát és a célfájlt!"
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 msgid "File format:"
 msgstr "Fájlformátum:"
 
@@ -2235,7 +2235,7 @@ msgstr "Forrásmappa:"
 msgid "Destination:"
 msgstr "Cél:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr "UNIX mbox"
 
@@ -2247,7 +2247,7 @@ msgstr "eml (szám + .eml)"
 msgid "MH (number only)"
 msgstr "MH (csak szám)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Kiválaszt... "
@@ -2418,12 +2418,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:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -2599,7 +2599,7 @@ msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
@@ -2611,60 +2611,73 @@ msgstr "Kép nézet létrehozása...\n"
 msgid "Can't load the image."
 msgstr "Nem lehet betölteni a képet."
 
-#: src/import.c:187
+#: src/import.c:200
 msgid "The source file does not exist."
 msgstr "A forrásfájl nem létezik."
 
-#: src/import.c:198
+#: src/import.c:211
 msgid "Can't find the destination folder."
 msgstr "A célmappa nem található."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, c-format
 msgid "Importing %s ..."
 msgstr "%s importálása..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 msgid "Importing"
 msgstr "Importálás"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 msgid "Scanning folder..."
 msgstr "Mappa átvizsgálása..."
 
-#: src/import.c:235
+#: src/import.c:252
 msgid "Error occurred on import."
 msgstr "Hiba történt importálás közben."
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "`%s' nem hozható létre."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importálás"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 msgid "Specify source file and destination folder."
 msgstr "Adja meg a forrásfájlt és a célmappát!"
 
-#: src/import.c:340
+#: src/import.c:619
 msgid "Source:"
 msgstr "Forrás:"
 
-#: src/import.c:345
+#: src/import.c:624
 msgid "Destination folder:"
 msgstr "Célkönyvtár:"
 
-#: src/import.c:358
+#: src/import.c:637
 msgid "eml (folder)"
 msgstr "eml (mappa)"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Adja meg az eml fájlokat tartalmazó forrásmappát és a célmappát!"
 
-#: src/import.c:437
+#: src/import.c:719
 msgid "Select importing folder"
 msgstr "Importálandó mappa választása"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Importálandó fájl választása"
 
@@ -2839,124 +2852,124 @@ msgstr "Mégse"
 msgid "Standby"
 msgstr "Készenlét"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Fogadás"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d levél (%s) fogadva"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, c-format
 msgid "no new messages"
 msgstr "nincs új levél."
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Kész"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Kapcsolat megszakadt"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Azonosítás nem sikerült"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Zárolt"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Befejezve (%d új levél)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Befejezve (nincs új levél)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Hiba történt a levelek fogadásakor."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "új levelek letöltése %s fióknál...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: POP3 azonosítás"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Új levelek fogadása"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Levelek fogadása innen: %s ..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Új levelek számának megszerzése (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Új levelek számának megszerzése (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Új levelek számának megszerzése (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Új levelek méretének megszerzése (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d levél törlése"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Kilépés"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Levél letöltése (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2964,15 +2977,15 @@ msgstr ""
 "A levélszemét szűréshez használt parancs futtatása nem sikerült.\n"
 "Ellenőrizze a levélszemét szűrők beállításait."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Kapcsolat megszakadt."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2981,29 +2994,29 @@ msgstr ""
 "Hiba a levelek feldolgozása közben:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Nincs több szabad hely a lemezen."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Nem lehet a fájlba írni."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "A távoli fél bezárta a kapcsolatot."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "A postaláda zárolt."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3012,11 +3025,11 @@ msgstr ""
 "A postaláda zárolt:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3025,15 +3038,15 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Menet időtúllépése."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Fogadás megszakítva\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s új leveleinek letöltése a(z) %s mappába...\n"
@@ -3051,16 +3064,16 @@ msgstr "Adja meg a jelszót"
 msgid "Protocol log"
 msgstr "Protokoll napló"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Használat: %s [OPCIÓ]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [cím]    szerkesztőablak megnyitása"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3070,23 +3083,23 @@ msgstr ""
 "                          szerkesztőablak nyitása a megadott fájl(ok)\n"
 "                          csatolásával"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              új levelek letöltése"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          új levelek letöltése minden fióknál"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 minden várakozó levél küldése"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappa]...    kiírja a levelek számát"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3094,46 +3107,46 @@ msgstr ""
 "  --status-full [mappa]...\n"
 "                       megjeleníti minden egyes mappa állapotát"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum  levél megnyitása új ablakban"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    a konfigurációs fájlokat tároló mappa megadása"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portszám      IPC távoli parancsok portjának megadása"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                kilépés a Sylpheedből"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                hibakereső üzemmód"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 e segítség megjelenítése és kilépés"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              verzió információk kiírása és kilépés"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Nyomjon meg egy billentyűt..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Fájlnév karakterkódolása"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3157,19 +3170,19 @@ msgstr ""
 "\n"
 "Folytatja?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Levél szerkesztés alatt. Tényleg kilép?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Várakozó levelek"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vannak elküldetlen levelek. Kilépés most?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3177,20 +3190,20 @@ msgstr ""
 "A GnuPG nincs megfelelően telepítve, vagy túl régi a verziója.\n"
 "OpenPGP támogatás kikapcsolva."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr "Kiegészítések betöltése..."
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "egy másik Sylpheed már fut.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Beállítások migrálása"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3839,8 +3852,8 @@ msgstr "Főablak létrehozása...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "kész.\n"
 
@@ -3887,11 +3900,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "A(z) `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4115,7 +4128,7 @@ msgstr "Csatolások"
 msgid "Message View - Sylpheed"
 msgstr "Levélnézet - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
@@ -6206,19 +6219,19 @@ msgstr "Csatolás"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Dátum"
 
@@ -6228,7 +6241,7 @@ msgid "Number"
 msgstr "Sorszám"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "Címzett"
 
@@ -6536,7 +6549,7 @@ msgstr "%s keresése (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "%s keresése..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
@@ -6633,7 +6646,7 @@ msgstr "_Névjegy"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 Távoli postaláda"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Ssz."
 
@@ -6868,19 +6881,19 @@ msgstr "Nem lehet csatlakozni az SMTP szerverhez."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nem lehet csatlakozni az SMTP szerverhez: %s:%d"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Postaláda beállítások"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr "Ez a beállító meg fogja csinálni a postaláda alapvető beállításait."
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr "Postaláda létrehozása a következő alapértelmezett helyen:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
@@ -6888,7 +6901,7 @@ msgstr ""
 "Postaláda létrehozása a következő helyen:\n"
 "(adja meg a mappa nevét vagy a mappa teljes elérési útját)"
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
@@ -6896,100 +6909,100 @@ msgstr ""
 "Amennyiben a későbbiekben további postaládát szeretne létrehozni, használja "
 "a 'Fájl - Postaláda - Postaláda hozzáadása...' gombot a menüben."
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Mégse"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr "Folytatja postaláda létrehozás nélkül?"
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr "Adja meg a mappa nevét vagy a mappa teljes elérési útvonalát."
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A(z) `%s' postaláda már létezik."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr "A(z) '%s' hely beállításokat tartalmazó mappa. Válasszon másik helyet."
 
-#: src/setup.c:467
+#: src/setup.c:473
 msgid "Cancel mail account setup?"
 msgstr "Megszakítja a postaláda beállítót?"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 msgid "Input value is not valid."
 msgstr "Nem érvényes bemeneti érték."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 msgid "POP3 server:"
 msgstr "POP3 szerver:"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 msgid "IMAP4 server:"
 msgstr "IMAP4 szerver:"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 msgid "New account setup"
 msgstr "Új fiók beállító"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr "Ez a beállító meg fogja csinálni az új fiók alapvető beállításait."
 
-#: src/setup.c:743
+#: src/setup.c:749
 msgid "Select account type:"
 msgstr "Válassza ki a fiók típusát:"
 
-#: src/setup.c:766
+#: src/setup.c:772
 msgid "Input your name and mail address:"
 msgstr "Adja meg nevét és email címét:"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 msgid "Display name:"
 msgstr "Megjelenített név:"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 msgid "E-mail address:"
 msgstr "Email cím:"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr "Ez a név lesz látható a címzetteknél (pl.: Kovács János)"
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr "Adja meg a felhasználónevét és a levélküldő szervert:"
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 msgid "User ID:"
 msgstr "Felhasználónév:"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 msgid "SMTP server:"
 msgstr "SMTP szerver:"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 msgid "Use SSL"
 msgstr "SSL használata"
 
-#: src/setup.c:857
+#: src/setup.c:863
 msgid "Use SMTP authentication"
 msgstr "SMTP azonosítás használata"
 
-#: src/setup.c:874
+#: src/setup.c:880
 #, fuzzy
 msgid "Your new mail account has been set up with the following settings."
 msgstr "Az Ön új fiókja elkészült a következő beállításokkal."
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
@@ -6999,6 +7012,19 @@ msgstr ""
 "'Beállítások - Aktuális fiók beállításai' vagy a\n"
 "'Beállítások - Fiókok szerkesztése...' gombot a főmenüben."
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "/_Fájl/_Levéladatok importálása..."
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Aláírásellenőrzés eredménye"
@@ -7325,219 +7351,219 @@ msgstr "(%s) mappa átvizsgálása..."
 msgid "Could not establish a connection to the server."
 msgstr "Nem lehet IMAP kapcsolatot létesíteni.\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "Keresés ú_jra"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Nincs további olvasatlan levél"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Nem található olvasatlan levél. Keresés a végéről?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Nincs olvasatlan levél.."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nem található olvasatlan levél. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Nincs több új levél"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Nem található új levél. Keresés a végéről?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Nincs új levél."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nem található új levél. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Nincs további kijelölt levél"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Nem található kijelölt levél. Keresés a végéről?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Nincs kijelölt levél."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nem található kijelölt levél. Keresés az elejéről?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Nincs további címkézett levél."
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Nem található címkézett levél. Keresés a végéről?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Nincs címkézett levél."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem található címkézett levél. Keresés az elejéről?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Levelek rendezése tárgy szerint..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d törölve"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mozgatva"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d másolva"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " elem kiválasztva"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d új, %d olvasatlan, %d összesen (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d új, %d olvasatlan, %d összesen"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Összefoglaló rendezése..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tÖsszefoglaló beállítása a levelek adataiból..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Összefoglaló beállítása a levelek adataiból..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d levél kijelölve\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d levél olvasottnak jelölve\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d levél olvasatlannak jelölve\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d levél törlésre kijelölve\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Levél(ek) törlése"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Tényleg törölni szeretné az levél(eke)t a kukából?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező levelek törlése..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d levél kijelölésének megszüntetése\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d levél kijelölve %s mappába mozgatásra\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 msgid "Select folder to move"
 msgstr "Áthelyezendő mappa kiválasztása"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d levél kijelölve a(z) %s mappába másolásra\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "A másolás célja megegyezik az aktuális mappával."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 msgid "Select folder to copy"
 msgstr "Másolandó mappa kiválasztása"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Szálak felépítése..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Szál lebontása..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d levél szűrése megtörtént."
diff --git a/po/it.po b/po/it.po
index 14106d30..595055c6 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -311,7 +311,7 @@ msgstr "la cartella sorgente é identica a quella di destinazione.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copia del messaggio %s%d in %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1230,15 +1230,15 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Avviso"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Errore"
 
@@ -1281,7 +1281,7 @@ msgstr "Marrone"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Niente"
 
@@ -1621,7 +1621,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
@@ -1822,7 +1822,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Dimensione"
 
@@ -2238,7 +2238,7 @@ msgstr "Esporta"
 msgid "Specify source folder and destination file."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Formato della data"
@@ -2253,7 +2253,7 @@ msgstr "Directory di origine:"
 msgid "Destination:"
 msgstr "Directory di destinazione:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2265,7 +2265,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Seleziona... "
@@ -2440,12 +2440,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:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -2622,7 +2622,7 @@ msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
@@ -2634,71 +2634,84 @@ msgstr "Creazione della vista dell'immagine...\n"
 msgid "Can't load the image."
 msgstr "Impossibile caricare l'immagine."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Il file %s non esiste."
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Ricerca in %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Importa"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Analisi della cartella %s..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Si è verificato un errore durante l'invio dell'articolo\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Impossibile creare la cartella «%s»."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importa"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Directory di origine:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Directory di destinazione:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nuova cartella"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Selezione del file da importare"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Selezione del file da importare"
 
@@ -2873,125 +2886,125 @@ msgstr "Cancellato"
 msgid "Standby"
 msgstr "Attesa"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Recupero"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Fatto (ricevuti %d messaggio(i) (%s))"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Non esistono messaggi nuovi."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Fatto."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finito (%d nuovo(i) messaggio(i))"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Finito (non ci sono nuovi messaggi)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Ci sono stati degli errori durante la ricezione della posta."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ricezione dei nuovi messaggi dell'account %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: autenticazione con POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recupero i nuovi messaggi"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connessione al server POP3: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Esco"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2999,15 +3012,15 @@ msgstr ""
 "L'esecuzione del comando del filtro spazzatura è fallita.\n"
 "Controllare l'impostazione del controllo della mail spazzatura."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Si è verificato un errore durante l'elaborazione della posta."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3016,29 +3029,29 @@ msgstr ""
 "Si è verificato un errore durante l'elaborazione della posta:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Spazio su disco esaurito."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Impossibile scrivere il file."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "La casella postale è bloccata."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3047,11 +3060,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3060,15 +3073,15 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Incorporazione cancellata\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -3086,16 +3099,16 @@ msgstr "Inserire la password"
 msgid "Protocol log"
 msgstr "Log del protocollo"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPZIONE]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [indirizzo]  apre una finestra di composizione"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3105,23 +3118,23 @@ msgstr ""
 "                         apre la finestra di composizione con allegati\n"
 "                         i file specificati"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              riceve i nuovi messaggi"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          riceve i nuovi messaggi di tutti gli account"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 invia tutti i messaggi accodati"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [cartella]... mostra il numero totale dei messaggi"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3129,47 +3142,47 @@ msgstr ""
 "  --status-full [cartella]...\n"
 "                         mostra lo stato di ogni cartella"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum apre il messaggio in una nuova finestra"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    specifica la directory che contiene i file di "
 "configurazione"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portnum      specifca la porta per i comandi IPC da remoto"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 esce da Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                modalità di debug"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 mostra questo aiuto ed esce"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informazioni sulla versione ed esce"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Premere un tasto qualsiasi..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Codifica nome file"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3193,19 +3206,19 @@ msgstr ""
 "\n"
 "Continuo?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "C'è un messaggio in composizione. Uscire?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Messaggi accodati"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ci sono messaggi non spediti in «Coda». Uscire ora ?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3213,20 +3226,20 @@ msgstr ""
 "GnuPG non è installato correttamente, o questa versione è troppo vecchia.\n"
 "Il supporto per OpenPGP è disabilitato."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "un altro Sylpheed è già in esecuzione.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Migrazione della configurazione"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3884,8 +3897,8 @@ msgstr "Creazione della finestra principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "fatto.\n"
 
@@ -3932,11 +3945,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4161,7 +4174,7 @@ msgstr "Allegati"
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
@@ -6266,19 +6279,19 @@ msgstr "Allegato"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Data"
 
@@ -6288,7 +6301,7 @@ msgid "Number"
 msgstr "Numero"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "A"
 
@@ -6600,7 +6613,7 @@ msgstr "Ricerca in %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Ricerca in %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
@@ -6703,7 +6716,7 @@ msgstr "Informazioni"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "No."
 
@@ -6939,144 +6952,157 @@ msgstr "Impossibile connettersi al server NNTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Impossibile connettersi al server NNTP: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Impostazione della casella postale"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "Eseguire le seguenti azioni:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 #, fuzzy
 msgid "Cancel"
 msgstr "Cancellato"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Modifica degli account"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Il nome del menù non è impostato."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "Server LDAP"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "Server LDAP"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Modifica degli account"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Elimina account"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Scegli la chiave per il tuo indirizzo email"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Nome da visualizzare"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "Indirizzo e-mail"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "User ID"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "Server SMTP (spedisce)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Autenticazione"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "File da importare:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Risultato del controllo della firma"
@@ -7413,223 +7439,223 @@ msgstr "Esame della cartella (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Impossibile stabilire la sessione IMAP4 con: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "_Ricerca ancora"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Non esistono più messaggi non letti"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio non letto. Ricerco dalla fine?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Non esistono messaggi non letti."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio non letto. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Non esistono più messaggi nuovi"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio nuovo. Ricerco dalla fine?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Non esistono messaggi nuovi."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "Non è stato trovato nessun messaggio nuovo. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Non esistono più messaggi segnati"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Non esistono messaggi segnati."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Non esistono più messaggi etichettati"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Non esistono messaggi etichettati."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Raggruppamento dei messaggi per oggetto..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d spostato"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiato"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " voci selezionate"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totale (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuovi, %d non letti, %d totale"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tImpostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Impostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Il messaggio %d è impostato per lo spostamento in %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Selezione della cartella"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Il messaggio %d è impostato per la copia in %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Selezione della cartella"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
@@ -7771,9 +7797,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread non è supportato da glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "File da importare:"
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "Selezione del file"
diff --git a/po/ja.po b/po/ja.po
index a2c74e36..9e149898 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -309,7 +309,7 @@ msgstr "移動元フォルダが移動先と同一です。\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "メッセージ %s/%d を %s にコピーしています...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1224,15 +1224,15 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "エラー"
 
@@ -1275,7 +1275,7 @@ msgstr "茶"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "なし"
 
@@ -1615,7 +1615,7 @@ msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
@@ -1806,7 +1806,7 @@ msgstr "MIME タイプ"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "サイズ"
 
@@ -2216,7 +2216,7 @@ msgstr "エクスポート"
 msgid "Specify source folder and destination file."
 msgstr "エクスポート元のフォルダとエクスポート先のファイルを指定してください。"
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 msgid "File format:"
 msgstr "ファイル形式:"
 
@@ -2228,7 +2228,7 @@ msgstr "エクスポート元フォルダ:"
 msgid "Destination:"
 msgstr "エクスポート先:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr "UNIX mbox"
 
@@ -2240,7 +2240,7 @@ msgstr "eml (番号 + .eml)"
 msgid "MH (number only)"
 msgstr "MH (番号のみ)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " 選択... "
@@ -2410,12 +2410,12 @@ msgstr "フォルダ情報を設定中...\n"
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
@@ -2589,7 +2589,7 @@ msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(差出人不明)"
 
@@ -2601,62 +2601,75 @@ msgstr "イメージビューを作成中...\n"
 msgid "Can't load the image."
 msgstr "画像を読み込めません。"
 
-#: src/import.c:187
+#: src/import.c:200
 msgid "The source file does not exist."
 msgstr "インポート元のファイルが存在しません。"
 
-#: src/import.c:198
+#: src/import.c:211
 msgid "Can't find the destination folder."
 msgstr "インポート先のフォルダが見つかりません。"
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, c-format
 msgid "Importing %s ..."
 msgstr "%s をインポート中..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 msgid "Importing"
 msgstr "インポート中"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 msgid "Scanning folder..."
 msgstr "フォルダをスキャン中..."
 
-#: src/import.c:235
+#: src/import.c:252
 msgid "Error occurred on import."
 msgstr "インポート中にエラーが発生しました。"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr "Outlook Express のフォルダをインポート中"
+
+#: src/import.c:537
+#, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "フォルダ '%s' を作成できません。"
+
+#: src/import.c:585
 msgid "Import"
 msgstr "インポート"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 msgid "Specify source file and destination folder."
 msgstr "インポート元のファイルとインポート先のフォルダを指定してください。"
 
-#: src/import.c:340
+#: src/import.c:619
 msgid "Source:"
 msgstr "インポート元:"
 
-#: src/import.c:345
+#: src/import.c:624
 msgid "Destination folder:"
 msgstr "インポート先フォルダ:"
 
-#: src/import.c:358
+#: src/import.c:637
 msgid "eml (folder)"
 msgstr "eml (フォルダ)"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr "Outlook Express (dbx)"
+
+#: src/import.c:689
 msgid "Specify source folder including eml files and destination folder."
 msgstr ""
 "emlファイルを含むインポート元のフォルダとインポート先のフォルダを指定してくだ"
 "さい。"
 
-#: src/import.c:437
+#: src/import.c:719
 msgid "Select importing folder"
 msgstr "インポートするフォルダを選択"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "インポートするファイルを選択"
 
@@ -2830,124 +2843,124 @@ msgstr "すべてキャンセル(_A)"
 msgid "Standby"
 msgstr "待機中"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "キャンセル"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "受信中"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d 通 (%s) 受信"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, c-format
 msgid "no new messages"
 msgstr "新着メッセージなし"
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "完了"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "認証失敗"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "ロック中"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "タイムアウト"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完了 (%d 通の新着メッセージ)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完了 (新着メッセージなし)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "メールの取得中にエラーが発生しました。"
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "アカウント %s の新着メッセージを取り込んでいます...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: POP3で認証中"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 新着メッセージを受信中"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3サーバ: %s に接続中..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "認証中..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s からメッセージを受信中..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "新着メッセージの数を取得中 (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "新着メッセージの数を取得中 (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "新着メッセージの数を取得中 (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "メッセージのサイズを取得中 (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "メッセージ %d を削除中"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "切断中"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2955,15 +2968,15 @@ msgstr ""
 "迷惑メールフィルタコマンドの実行に失敗しました。\n"
 "迷惑メール対策の設定を確認してください。"
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "接続に失敗しました。"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "メールの処理中にエラーが発生しました。"
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2972,29 +2985,29 @@ msgstr ""
 "メールの処理中にエラーが発生しました:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "ディスクの空き容量がありません。"
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "ファイルに書き込めません。"
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "ソケットエラーです。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "リモートホストによって接続を切断されました。"
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "メールボックスはロックされています。"
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3003,11 +3016,11 @@ msgstr ""
 "メールボックスはロックされています:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3016,15 +3029,15 @@ msgstr ""
 "認証に失敗しました:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "セッションがタイムアウトしました。"
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "受信をキャンセルしました\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "新しいメッセージを %s から %s に取り込んでいます...\n"
@@ -3042,16 +3055,16 @@ msgstr "パスワードの入力"
 msgid "Protocol log"
 msgstr "プロトコルログ"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用法: %s [オプション]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    メッセージ作成ウィンドウを開く"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3061,23 +3074,23 @@ msgstr ""
 "                         指定したファイルを添付してメッセージ作成\n"
 "                         ウィンドウを開く"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              新着メッセージを受信する"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          全アカウントの新着メッセージを受信する"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送信待機中のメッセージをすべて送信する"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   メッセージの総数を表示する"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3085,45 +3098,45 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         各フォルダの状態を表示する"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum 新しいウィンドウでメッセージを開く"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir dirname    設定ファイルを格納するディレクトリを指定する"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portnum      IPC リモートコマンド用のポートを指定する"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 Sylpheed を終了する"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                デバッグモード"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 このヘルプを表示して終了する"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              バージョン情報を出力して終了する"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "何かキーを押してください..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "ファイル名エンコーディング"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3146,19 +3159,19 @@ msgstr ""
 "\n"
 "続行しますか?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "作成中のメッセージが存在します。本当に終了しますか?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "送信待機中のメッセージ"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "送信待機中の未送信メッセージがあります。終了しますか?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3166,20 +3179,20 @@ msgstr ""
 "GnuPG が正しくインストールされていないか、バージョンが古すぎます。\n"
 "OpenPGP サポートは無効です。"
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr "プラグインをロード中..."
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "別の Sylpheed がすでに起動しています。\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "設定の移行"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3827,8 +3840,8 @@ msgstr "メインウィンドウを作成中...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "完了。\n"
 
@@ -3874,11 +3887,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4100,7 +4113,7 @@ msgstr "添付"
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
@@ -6181,19 +6194,19 @@ msgstr "添付"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "日付"
 
@@ -6203,7 +6216,7 @@ msgid "Number"
 msgstr "番号"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "宛先"
 
@@ -6509,7 +6522,7 @@ msgstr "%s を検索中 (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "%s を検索中..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(日付なし)"
 
@@ -6606,7 +6619,7 @@ msgstr "このプログラムについて(_A)"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 リモートメールボックス"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "番号"
 
@@ -6841,19 +6854,19 @@ msgstr "SMTPサーバに接続できません。"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "SMTPサーバ: %s:%d に接続できません。"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "メールボックスの設定"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr "このダイアログではメールボックスの初期設定を行います。"
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr "メールボックスを以下の標準の場所に作成する:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
@@ -6861,7 +6874,7 @@ msgstr ""
 "メールボックスを以下の場所に作成する:\n"
 "(フォルダ名または完全なフォルダのパスを入力してください)"
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
@@ -6869,99 +6882,99 @@ msgstr ""
 "後から別の場所にメールボックスを追加したい場合は、メニューの「ファイル - メー"
 "ルボックス - メールボックスを追加...」を選択してください。"
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr "メールボックスを作成せずに続行しますか?"
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr "フォルダ名または完全なフォルダのパスを入力してください。"
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "メールボックス '%s' はすでに存在します。"
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr "'%s' 以下に設定フォルダが含まれています。別の場所を指定してください。"
 
-#: src/setup.c:467
+#: src/setup.c:473
 msgid "Cancel mail account setup?"
 msgstr "メールアカウントの作成を中止しますか?"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 msgid "Input value is not valid."
 msgstr "入力された内容が正しくありません。"
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 msgid "POP3 server:"
 msgstr "POP3サーバ:"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 msgid "IMAP4 server:"
 msgstr "IMAP4サーバ:"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 msgid "New account setup"
 msgstr "新規アカウントの作成"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr "このダイアログでは新規メールアカウントの初期設定を行います。"
 
-#: src/setup.c:743
+#: src/setup.c:749
 msgid "Select account type:"
 msgstr "アカウントのタイプを選択してください:"
 
-#: src/setup.c:766
+#: src/setup.c:772
 msgid "Input your name and mail address:"
 msgstr "名前とメールアドレスを入力してください:"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 msgid "Display name:"
 msgstr "表示名:"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 msgid "E-mail address:"
 msgstr "電子メールアドレス:"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr "この名前は受信者側で表示されます (例: Tarou Yamada)"
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr "ユーザIDとメールサーバを入力してください:"
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 msgid "User ID:"
 msgstr "ユーザID:"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 msgid "SMTP server:"
 msgstr "SMTPサーバ:"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 msgid "Use SSL"
 msgstr "SSLを使用"
 
-#: src/setup.c:857
+#: src/setup.c:863
 msgid "Use SMTP authentication"
 msgstr "SMTP認証を使用"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr "新しいメールアカウントは以下の設定で作成されました。"
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
@@ -6971,6 +6984,22 @@ msgstr ""
 "「設定 - 現在のアカウントの設定」もしくは\n"
 "「設定 - アカウントの編集」を選択してください。"
 
+#: src/setup.c:1134
+msgid "Importing mail data"
+msgstr "メールデータのインポート"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+"Outlook Express のメールデータがみつかりました。 Outlook Express のメールデー"
+"タをインポートしますか?\n"
+"\n"
+"(フォルダ構造は再現されません)"
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "署名の検証結果"
@@ -7294,218 +7323,218 @@ msgstr "フォルダをスキャン中 (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "サーバに接続できませんでした。"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "再検索(_S)"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "未読メッセージなし"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "未読メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "未読メッセージがありません。"
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 msgid "No unread message found. Go to next unread folder?"
 msgstr "未読メッセージがありません。次の未読フォルダに移動しますか?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "新着メッセージなし"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "新着メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "新着メッセージがありません。"
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "新着メッセージがありません。次の新着メッセージありフォルダに移動しますか?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "マーク付きメッセージなし"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "マーク付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "マーク付きメッセージがありません。"
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "マーク付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "ラベル付きメッセージなし"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "ラベル付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "ラベル付きメッセージがありません。"
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "ラベル付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "メッセージを件名でまとめています..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d 通削除"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 通移動"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 通コピー"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " 通選択"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通 (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "サマリをソート中..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tメッセージデータからサマリを作成中..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "メッセージデータからサマリを作成中..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "サマリキャッシュを書き込み中 (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "メッセージ %d をマークしました\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "メッセージ %d を既読としてマークしました\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "メッセージ %d を未読としてマークしました\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "メッセージ %s/%d を削除するようにセットしました\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "メッセージの削除"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "本当にごみ箱からメッセージを削除してもいいですか?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "重複メッセージを削除しています..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "メッセージ %s/%d をマーク解除しました\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "メッセージ %d を %s に移動するようにセットしました\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "移動先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 msgid "Select folder to move"
 msgstr "移動先のフォルダを選択してください"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "メッセージ %d を %s にコピーするようにセットしました\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 msgid "Select folder to copy"
 msgstr "コピー先のフォルダを選択してください"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "振り分け中 (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
diff --git a/po/ko.po b/po/ko.po
index 474d364c..dae8c36d 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -317,7 +317,7 @@ msgstr "옮길 폴더와 옮겨질 폴더가 같습니다.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1228,15 +1228,15 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "알림"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "에러"
 
@@ -1279,7 +1279,7 @@ msgstr "갈색"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "없음"
 
@@ -1661,7 +1661,7 @@ msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
@@ -1852,7 +1852,7 @@ msgstr "마임 타입"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "크기"
 
@@ -2271,7 +2271,7 @@ msgstr ""
 msgid "Specify source folder and destination file."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "날짜 형식"
@@ -2286,7 +2286,7 @@ msgstr "새 폴더"
 msgid "Destination:"
 msgstr "저장 폴더"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2298,7 +2298,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "고르기..."
@@ -2479,12 +2479,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -2662,7 +2662,7 @@ msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(???)"
 
@@ -2674,71 +2674,84 @@ msgstr "이미지 뷰를 생성합니다...\n"
 msgid "Can't load the image."
 msgstr "이미지를 불러올 수가 없습니다."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "가져오기"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "글을 올리는 도중 에러 발생\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "`%s' 폴더를 생성할 수가 없습니다."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "가져오기"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "새 폴더"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "저장할 폴더:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "새 폴더"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "불러올 파일을 선택"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "불러올 파일을 선택"
 
@@ -2922,196 +2935,196 @@ msgstr "취소"
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "취소되었습니다"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "완료."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "인증이 실패했습니다."
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "끝났습니다 (새 메시지 없음)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "편지를 받다가 에러가 발생했습니다."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s 계정으로부터 새 메시지를 얻습니다...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "인증"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 새 메시지를 가져옴"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 서버 %s에 연결합니다..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "새 메시지의 갯수를 얻는 중 (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "새 메시지의 갯수를 얻는 중 (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "메시지의 크기를 얻는 중 (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "끝마치는 중"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 #, fuzzy
 msgid "Connection failed."
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "디스크에 남은 공간이 없슴."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "파일에 쓸 수가 없습니다."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "소켓 에러."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "인증 방법"
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "병합이 취소되었습니다.\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s로부터 %s로 새 메시지를 가져옴...\n"
@@ -3129,16 +3142,16 @@ msgstr "암호 입력"
 msgid "Protocol log"
 msgstr "프로토콜 로그"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [주소]       편집 창을 엽니다"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3148,71 +3161,71 @@ msgstr ""
 "                         지정된 파일을 첨부해서 편지 작성 창\n"
 "                         attached"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              새 메시지를 받습니다"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          모든 계정에서 새 메시지를 받습니다"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 큐에 있는 모든 메시지를 보냅니다"
 
-#: src/main.c:585
+#: src/main.c:590
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:586
+#: src/main.c:591
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                디버깅 모드"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                디버깅 모드"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 이 도움말을 표시하고 끝마침니다"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              버번 정보 출력하고 종료"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr ""
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "보내는 메일의 문자셋"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3226,19 +3239,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "메시지를 편집하는 창이 있습니다. 정말 끝내시겠습니까?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "보내지지 않은 메시지가 큐에 있습니다. 지금 종료할까요?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3246,21 +3259,21 @@ msgstr ""
 "GnuPG가 적절하게 인스톨되지 않았거나 너무 오래된 버전입니다.\n"
 "OpenPGP 지원기능을 끕니다."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "동작 설정을 씁니다...\n"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3956,8 +3969,8 @@ msgstr "새 창을 만듭니다...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "마침.\n"
 
@@ -4007,11 +4020,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4216,7 +4229,7 @@ msgstr "첨부"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
@@ -6381,19 +6394,19 @@ msgstr "첨부"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "날짜"
 
@@ -6403,7 +6416,7 @@ msgid "Number"
 msgstr "숫자"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "받는 사람:"
@@ -6721,7 +6734,7 @@ msgstr "필터링..."
 msgid "Searching %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
@@ -6829,7 +6842,7 @@ msgstr "이 프로그램은"
 msgid "%s - POP3 Remote mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "번호"
 
@@ -7061,142 +7074,155 @@ msgstr "%s:%d SMPT 서버에 연결할 수가 없습니다\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "%s:%d SMPT 서버에 연결할 수가 없습니다\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "메일박스 설정"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr ""
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "취소"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "계정을 설정합니다"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "메뉴 이름이 지정되지않음"
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP 서버"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP 서버"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "계정을 설정합니다"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "계정 삭제"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "당신의 전자우편 주소로 키 선택"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "표시 명"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "이메일 주소"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "사용자 계정"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP 서버(발송용)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "인증"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "가져올 파일:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
@@ -7532,224 +7558,224 @@ msgstr "폴더(%s)를 스캔..."
 msgid "Could not establish a connection to the server."
 msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "다시 찾기"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "안 읽은 메시지가 없슴 "
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "안 읽은 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "안 읽은 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "새 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "새 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "표시된 메시지가 없습니다"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "표시된 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "표시된 메시지가 없습니다."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "표시된 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "꼬리표있는 메시지가 없습니다"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "꼬리표있는 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "꼬리표있는 메시지가 없습니다."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "꼬리표있는 메시지가 없습니다. 처음부터 찾을까요?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d개 삭제됨"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d개 이동"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " 아이템 선택"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지(%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "요약을 정렬합니다..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\t메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "폴더 선택"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "폴더 선택"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
@@ -7900,9 +7926,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread가 glib에의해 지원되지않습니다.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "가져올 파일:"
-
 #, fuzzy
 #~ msgid "Destination file:"
 #~ msgstr "저장할 폴더:"
diff --git a/po/lt.po b/po/lt.po
index 079d3fb7..cfa9c5ce 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -310,7 +310,7 @@ msgstr "pradinis katalogas identiškas paskirties katalogui.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopijuojamas laiškas %s/%d į %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1222,15 +1222,15 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Pranešimas"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Klaida"
 
@@ -1273,7 +1273,7 @@ msgstr "Ruda"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Nieko"
 
@@ -1613,7 +1613,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
@@ -1805,7 +1805,7 @@ msgstr "MIME tipas"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Dydis"
 
@@ -2218,7 +2218,7 @@ msgstr "Eksportuoti"
 msgid "Specify source folder and destination file."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Datos formatas"
@@ -2233,7 +2233,7 @@ msgstr "Pradinis katalogas:"
 msgid "Destination:"
 msgstr "Paskyrimo katalogas:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2245,7 +2245,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Pasirinkti... "
@@ -2420,12 +2420,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
@@ -2601,7 +2601,7 @@ msgid "Creating header view...\n"
 msgstr "Sukuria antraščių peržiūra...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
 
@@ -2613,71 +2613,84 @@ msgstr "Sukuriama paveikslėlio peržiūra...\n"
 msgid "Can't load the image."
 msgstr "Negaliu įkelti paveikslėlio."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Ieškoma „%s“..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Importuoti"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Klaida skelbiant žinutę\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Negaliu sukurti katalogo „%s“."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importuoti"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Pradinis katalogas:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Paskyrimo katalogas:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Naujas katalogas"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Pažymėkite importuojamą failą"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Pažymėkite importuojamą failą"
 
@@ -2852,139 +2865,139 @@ msgstr "Nutraukta"
 msgid "Standby"
 msgstr "Laukiama"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Gaunama"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Atlikta (gauta laiškų: %d (%s))"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Nėra naujų laiškų."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Atlikta."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Nepavyko patvirtinti autentiškumo"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Baigėsi skirtasis laikas"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Baigta (Nauji laiškai: %d)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, fuzzy, c-format
 msgid "Finished (no new messages)"
 msgstr "Baigta (Nėra naujų laiškų: %d)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Klaidos gaunant paštą."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "gaunami „%s“ sąskaitos laiškai...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Tikrinamas autentiškumas (POP3)"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: gaunami nauji laiškai"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Jungiuosi prie POP3 serverio: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Gaunami laiškai iš %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Gaunamas naujų laiškų skaičius (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Gaunamas naujų laiškų skaičius (UILD)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Gaunamas naujų laiškų dydis (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Trinamas laiškas %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Išeinu"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Gaunamas laiškas (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Nepavyko prisijungti."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Klaida tvarkant paštą."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2993,29 +3006,29 @@ msgstr ""
 "Klaida tvarkant paštą:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Nėra vietos diske."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Negaliu įrašyti į failą."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Prisijungimas uždarytas nuotolinio serverio."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Dėžutė užrakinta."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3024,11 +3037,11 @@ msgstr ""
 "Dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Nepavyko patvirtinti autentiškumo."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3037,15 +3050,15 @@ msgstr ""
 "Nepavyko patvirtinti autentiškumo:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Baigėsi sesijos laikas."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Prijungimas nutrauktas\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Gaunami nauji laiškai iš %s į %s...\n"
@@ -3063,16 +3076,16 @@ msgstr "Įveskite slaptažodį"
 msgid "Protocol log"
 msgstr "Protokolo logas"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Naudojimas: %s [PARAMETRAI]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    atverti rašymo langą"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3082,23 +3095,23 @@ msgstr ""
 "                         atverti rašymo langą su prisegtais nurodytais\n"
 "                         failais"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              gauti naujus laiškus"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          gauti naujus laiškus iš visų sąskaitų"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 siųsti laiškus eilėje"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalogas]... rodyti bendrą laiškų skaičių"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3106,45 +3119,45 @@ msgstr ""
 "  --status-full [katalogas]...\n"
 "                         rodyti kiekvieno katalogo būseną"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir kelias     nurodyti konfigūracijos katalogą"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 uždaryti „Sylpheed“"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                derinimo rėžimas"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 rodyti šią pagalbą ir baigti"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              išvesti versiją ir baigti"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Spauskite bet kurį klavišą..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Failų vardų koduotė"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3168,19 +3181,19 @@ msgstr ""
 "\n"
 "Tęsti?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Rašomas laiškas. Tikrai išeiti?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Laiškai eilėje"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Eilėje yra neišsiųstų laiškų. Išeiti dabar?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3188,20 +3201,20 @@ msgstr ""
 "GnuPG nėra įdiegtas, arba jo versija per sena.\n"
 "OpenPGP palaikymas išjungtas."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed jau paleistas.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Konfigūracijos atnaujinimas"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3858,8 +3871,8 @@ msgstr "Kuriamas pagrindinis langas..\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "atlikta.\n"
 
@@ -3906,11 +3919,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4133,7 +4146,7 @@ msgstr "Priedai"
 msgid "Message View - Sylpheed"
 msgstr "Laiško peržiūra - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti failo „%s“."
@@ -6226,19 +6239,19 @@ msgstr "Priedas"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Data"
 
@@ -6248,7 +6261,7 @@ msgid "Number"
 msgstr "Numeris"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Kam:"
@@ -6560,7 +6573,7 @@ msgstr "Ieškoma %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Ieškoma „%s“..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Be datos)"
 
@@ -6663,7 +6676,7 @@ msgstr "Apie"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Nr."
 
@@ -6899,144 +6912,157 @@ msgstr "Negaliu prisijungti prie NNTP serverio: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Negaliu prisijungti prie NNTP serverio: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Dėžutės nustatymai"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "Atlikti veiksmus:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 #, fuzzy
 msgid "Cancel"
 msgstr "Nutraukta"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Redaguoti sąskaitas"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Nėra meniu pavadinimo."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP serveris"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP serveris"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Redaguoti sąskaitas"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Pašalinti sąskaitą"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Parinkti raktą pagal jūsų el. pašto adresą"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Rodomas vardas"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "El. pašto adresas"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Vartotojo ID"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP serveris (siuntimui)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Autentiškumo patikrinimas"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Importuojamas failas:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Parašo tikrinimo rezultatas"
@@ -7365,221 +7391,221 @@ msgstr "Skanuojamas katalogas (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "_Ieškoti dar kartą"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Daugiau nėra neskaitytų laiškų."
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Nėra neskaitytų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Nėra neskaitytų laiškų."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nėra neskaitytų laiškų. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Daugiau nėra naujų laiškų."
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Nėra naujų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Nėra naujų laiškų."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nėra naujų laiškų. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Daugiau nėra pažymėtų laiškų"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Nėra pažymėtų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Nėra pažymėtų laiškų."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nėra pažymėtų laiškų. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Daugiau nėra laiškų su etiketėmis"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Nėra laiškų su etiketėmis. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Nėra laiškų su etiketėmis."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nėra laiškų su etiketėmis. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Laiškai pritraukiami pagal temą..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d ištrinta"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d perkelta"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d nukopijuota"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " objektas(-ai) pažymėti"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nauji: %d, neskaityti: %d, viso: %d (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nauji: %d, neskaityti: %d, viso: %d"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Rikiuojama santrauka..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tNustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Nustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Rašoma santraukos laikinoji atmintis (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Laiškas %d pažymėtas\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Laiškas %d pažymėtas kaip skaitytas\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Laiškas %d pažymėtas kaip neskaitytas\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Laiškas %s/%d pažymėtas trinimui\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ar tikrai norite ištrinti laiškus iš šiukšlinės?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Trinami identiški laiškai..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Laiškas %s/%d atžymėtas\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Laiškas %d pažymėtas perkėlimui į %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Pasirinkti katalogą"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Laiškas %d pažymėtas kopijavimui į %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Pasirinkti katalogą"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su laiškais."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota laiškų: %d"
@@ -7719,9 +7745,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "glib nepalaiko g_thread.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Importuojamas failas:"
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "Žymėti failą"
diff --git a/po/nl.po b/po/nl.po
index 72164c56..6a6b0d52 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -313,7 +313,7 @@ msgstr "de bronmap is hetzelfde als de doelmap.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1245,15 +1245,15 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Fout"
 
@@ -1296,7 +1296,7 @@ msgstr "Bruin"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Geen"
 
@@ -1640,7 +1640,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -1832,7 +1832,7 @@ msgstr "MIME-type"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Grootte"
 
@@ -2250,7 +2250,7 @@ msgstr "Exporteren"
 msgid "Specify source folder and destination file."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Datumopmaak"
@@ -2265,7 +2265,7 @@ msgstr "Bronmap:"
 msgid "Destination:"
 msgstr "Doelmap:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2277,7 +2277,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Selecteer..."
@@ -2454,12 +2454,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -2636,7 +2636,7 @@ msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
@@ -2648,71 +2648,84 @@ msgstr "Plaatje wordt weergegeven...\n"
 msgid "Can't load the image."
 msgstr "Kan plaatje niet weergeven."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Doorzoeken van %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Importeren"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Er is een fout opgetreden bij het versturen\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Kan map '%s' niet aanmaken."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importeren"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Bronmap:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Doelmap:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nieuwe map"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Selecteer het te importeren bestand"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Selecteer het te importeren bestand"
 
@@ -2897,139 +2910,139 @@ msgstr "Afgebroken"
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Geen nieuwe berichten."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Klaar."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Identificatie mislukt"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Vergrendeld"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Time-out"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Er is een fout opgetreden bij het ophalen van de e-mail."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Bezig met identificatie"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinden met POP3-server: %s ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Berichten ophalen van %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Verbinding mislukt."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3038,30 +3051,30 @@ msgstr ""
 "Fout bij het verwerken van de e-mail:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Socket-fout."
 
 #  consider EOF right after QUIT successful
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Verbinding verbroken door verbindingspartner."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3070,11 +3083,11 @@ msgstr ""
 "Mailbox is vergrendeld:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Identificatie mislukt."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3083,15 +3096,15 @@ msgstr ""
 "Identificatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Sessie is verlopen."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "E-mail verwerken geannuleerd\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -3109,16 +3122,16 @@ msgstr "Geef wachtwoord"
 msgid "Protocol log"
 msgstr "Protocol-logboek"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3128,23 +3141,23 @@ msgstr ""
 "                         venster 'bericht opstellen' openen met de\n"
 "                         gespecificeerde bestanden als bijlagen"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          Berichten ophalen van alle accounts"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verstuur alle berichten uit de wachtrij"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [map]...      totaal aantal berichten weergeven"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3152,47 +3165,47 @@ msgstr ""
 "  --status-full [map]...\n"
 "                         status van iedere map weergeven"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir mapnaam    de map waar de configuratiebestanden zich in "
 "bevinden"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 Sylpheed afsluiten"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug modus"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 geef deze hulp weer"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr " --version\t\tgeef versie informatie en sluit af"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Druk op een toets..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Bestandscodering"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3216,21 +3229,21 @@ msgstr ""
 "\n"
 "Toch doorgaan?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "U bent een bericht aan het opstellen.\n"
 "Wilt u werkelijk het programma afsluiten?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3238,20 +3251,20 @@ msgstr ""
 "GnuPG is niet goed geïnstalleerd of is te oud.\n"
 "OpenPGP ondersteuning wordt uitgeschakeld."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "er draait al een Sylpheed.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Configuratie omzetten"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3914,8 +3927,8 @@ msgstr "Hoofdvenster wordt aangemaakt...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "klaar.\n"
 
@@ -3962,11 +3975,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4197,7 +4210,7 @@ msgstr "Bijlagen"
 msgid "Message View - Sylpheed"
 msgstr "Nieuw bericht - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
@@ -6317,19 +6330,19 @@ msgstr "Bijlage"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Datum"
 
@@ -6339,7 +6352,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Aan:"
@@ -6663,7 +6676,7 @@ msgstr "Doorzoeken van %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Doorzoeken van %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
@@ -6766,7 +6779,7 @@ msgstr "_Info"
 msgid "%s - POP3 Remote mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Nr."
 
@@ -7003,144 +7016,157 @@ msgstr "Kan niet verbinden met de NNTP-server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Kan niet verbinden met de NNTP-server: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Mailboxinstellingen"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "De volgende acties uitvoeren:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 #, fuzzy
 msgid "Cancel"
 msgstr "Afgebroken"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Accountinstellingen"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Menunaam is niet ingesteld."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP Server"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP Server"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Accountinstellingen"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Account verwijderen"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Selecteer sleutel naar e-mail adres"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Naam in de lijst"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "E-mail adres"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Gebruikersnaam"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP server (om te verzenden)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Identificatie"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Te importeren bestand:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Resultaat van handtekeningcontrole"
@@ -7471,222 +7497,222 @@ msgstr "Bezig met inlezen van map (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Kan gaan sessie opzetten met de IMAP4 server: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "_Opnieuw zoeken"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten meer"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten meer"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuw bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Geen gemarkeerde berichten meer"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen gelabeld bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Geen gelabelde berichten."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen gelablede berichten gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr "item(s) geselecteerd"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\t"
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bericht %s/%d staat klaar om verwijderd te worden\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Wilt u dit bericht / deze berichten werkelijk verwijderen uit de prullenbak?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bericht %d staat klaar om verplaatst te worden naar %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Selecteer map"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Doel voor kopiëren is gelijk aan de huidige map."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Selecteer map"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de berichten."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Er zijn %d berichten gefilterd."
@@ -7827,9 +7853,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread is niet ondersteunt door glib\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Te importeren bestand:"
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "Selecteer bestand"
diff --git a/po/pl.po b/po/pl.po
index 406097e6..d108162f 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -308,7 +308,7 @@ msgstr "katalog źródłowy jest taki sam jak docelowy.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiowanie wiadomości %s/%d do %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1223,15 +1223,15 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Notatka"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Błąd"
 
@@ -1274,7 +1274,7 @@ msgstr "Brązowy"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Brak"
 
@@ -1615,7 +1615,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
@@ -1805,7 +1805,7 @@ msgstr "typ MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -2219,7 +2219,7 @@ msgstr "Eksport"
 msgid "Specify source folder and destination file."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Format daty"
@@ -2234,7 +2234,7 @@ msgstr "Katalog źródłowy:"
 msgid "Destination:"
 msgstr "Katalog docelowy:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2246,7 +2246,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Wybierz... "
@@ -2421,12 +2421,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -2602,7 +2602,7 @@ msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Bez Od)"
 
@@ -2614,71 +2614,84 @@ msgstr "Tworzenie widoku obrazu...\n"
 msgid "Can't load the image."
 msgstr "Nie można załadować obrazu."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Plik %s nie istnieje."
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Importuj"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Wystąpił błąd podczas publikowania\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Nie można utworzyć katalog '%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importuj"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Katalog źródłowy:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Katalog docelowy:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nowy katalog"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Wybierz importowany plik"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Wybierz importowany plik"
 
@@ -2855,125 +2868,125 @@ msgstr "Anulowano"
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Gotowe (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Brak nowych wiadomości"
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Gotowe."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Błąd połączenia"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Błąd autoryzacji"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Zablokowano"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Opóźnienie"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Zakończono (brak nowych wiadomości)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Wystąpiły błędy podczas pobierania poczty."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "pobieranie nowych wiadomości z konta %s ...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Uwierzytelnianie POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby nowych wiadomości (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby nowych wiadomości (UIDL)"
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2982,15 +2995,15 @@ msgstr ""
 "niepowodzeniem.\n"
 "Sprawdź ustawienia filtrów niechcianej poczty."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Błąd połączenia."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2999,29 +3012,29 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zamknięte przez zdalny komputer."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Skrzynka jest zablokowana."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3030,11 +3043,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3043,15 +3056,15 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Sesja wygasła."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Odbieranie anulowano\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
@@ -3069,16 +3082,16 @@ msgstr "Wprowadź hasło"
 msgid "Protocol log"
 msgstr "Dziennik protokołu"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      otwiera okno tworzenia wiadomości"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3088,23 +3101,23 @@ msgstr ""
 "                         otwiera okno tworzenia wiadomości z plikami,\n"
 "                         które mają zostać dołączone"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              odbiera nowe wiadomości"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          odbiera nowe wiadomości dla wszystkich kont"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 wysyła wszystkie skolejkowane wiadomości"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalog]...    pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3112,47 +3125,47 @@ msgstr ""
 "  --status-full [katalog]...\n"
 "                         pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum otwórz wiadomość w nowym oknie"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    podaj katalog, który zawiera pliki konfiguracyjne"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 zakończ Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                tryb debugowania"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 wyświetla tę pomoc i wychodzi"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version              wyświetla informację o wersji i kończy działanie"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Wciśnij dowolny klawisz..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Kodowanie nazwy pliku"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3166,19 +3179,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Tworzenie nowej wiadomości. Czy zakończyć?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Skolejkowane wiadomości"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewysłane wiadomości zostały skolejkowane. Czy wyjść?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3186,20 +3199,20 @@ msgstr ""
 "Program GnuPG nie jest poprawnie zainstalowany, lub jego\n"
 "wersja jest zbyt stara. Obsługa OpenPGP została wyłączona."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Migracja ustawień"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3857,8 +3870,8 @@ msgstr "Tworzenie głównego okna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "gotowe.\n"
 
@@ -3907,11 +3920,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4114,7 +4127,7 @@ msgstr "Załączniki"
 msgid "Message View - Sylpheed"
 msgstr "Widok wiadomości - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
@@ -6278,19 +6291,19 @@ msgstr "Załącznik"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Data"
 
@@ -6300,7 +6313,7 @@ msgid "Number"
 msgstr "Numer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Do:"
@@ -6625,7 +6638,7 @@ msgstr "Filtowanie..."
 msgid "Searching %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
@@ -6733,7 +6746,7 @@ msgstr "O programie"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Nr"
 
@@ -6968,144 +6981,157 @@ msgstr "Nie można połączyć się z serwerem NNTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nie można połączyć się z serwerem NNTP: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Ustawienia skrzynki"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "Podejmij działania:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 #, fuzzy
 msgid "Cancel"
 msgstr "Anulowano"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Ustawienia konta"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Nie ustawiono nazwy w menu."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "Serwer LDAP"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "Serwer LDAP"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Ustawienia konta"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Usuń konto"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Wybieranie klucz poprzez swój adres e-mail"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Wyświetlana nazwa"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "Adres e-mail"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Identyfikator użytkownika"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "Serwer SMTP (dla wysyłania)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Uwierzytelnianie"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Importowanie pliku:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Wyniku sprawdzenia podpisu"
@@ -7452,238 +7478,238 @@ msgstr "Skanowanie katalogu (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Nie można ustanowić sesji IMAP4 z: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "Szukaj ponownie"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Nie ma więcej nieprzeczytanych wiadomości"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomości."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Nie ma więcej nowych wiadomości"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Brak nowych wiadomości"
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Nie ma więcej zaznaczonych wiadomości"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpoczać wyszukiwanie od końca?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomości"
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Nie ma więcej etykietowanych wiadomości"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Brak etykietowanych wiadomości."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Łączenie wiadomości wg tematu..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d usunięto"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " element(ów) wybrany(o)"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nowych, %d nieprzeczytanych, %d razem"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tUstawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Wiadomość %d ustawiona do przesunięcia do %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Wybierz katalog"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Wybierz katalog"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
@@ -7839,9 +7865,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "Bibltioteka glib nie obsługuje wywołania g_thread.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Importowanie pliku:"
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "Wybierz plik"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4376e720..3c3c2a86 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -319,7 +319,7 @@ msgstr "as pastas de origem e destino são idênticas.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensagem %s/%d para %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1238,15 +1238,15 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Notificação"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Erro"
 
@@ -1289,7 +1289,7 @@ msgstr "Marrom"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1629,7 +1629,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) desta mensagem."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
@@ -1822,7 +1822,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Tamanho"
 
@@ -2236,7 +2236,7 @@ msgstr "Exportar"
 msgid "Specify source folder and destination file."
 msgstr "Especifique o diretório de origem e o arquivo de destino."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 msgid "File format:"
 msgstr "Formato do arquivo:"
 
@@ -2248,7 +2248,7 @@ msgstr "Origem:"
 msgid "Destination:"
 msgstr "Destino:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr "Caixa postal UNIX (mbox)"
 
@@ -2260,7 +2260,7 @@ msgstr "eml (número+\".eml\")"
 msgid "MH (number only)"
 msgstr "MH (somente número)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Selecionar..."
@@ -2431,12 +2431,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:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -2612,7 +2612,7 @@ msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
@@ -2624,60 +2624,73 @@ msgstr "Criando visualizador de imagem...\n"
 msgid "Can't load the image."
 msgstr "Não foi possível carregar a imagem."
 
-#: src/import.c:187
+#: src/import.c:200
 msgid "The source file does not exist."
 msgstr "O arquivo de origem não existe."
 
-#: src/import.c:198
+#: src/import.c:211
 msgid "Can't find the destination folder."
 msgstr "Não foi possível encontrar a pasta de destino."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, c-format
 msgid "Importing %s ..."
 msgstr "Importando %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 msgid "Importing"
 msgstr "Importando"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 msgid "Scanning folder..."
 msgstr "Processando pasta..."
 
-#: src/import.c:235
+#: src/import.c:252
 msgid "Error occurred on import."
 msgstr "Houve um erro ao importar."
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Não foi possível criar a pasta \"%s\"."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importar"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 msgid "Specify source file and destination folder."
 msgstr "Especifique o arquivo mbox e a pasta de destino."
 
-#: src/import.c:340
+#: src/import.c:619
 msgid "Source:"
 msgstr "Origem:"
 
-#: src/import.c:345
+#: src/import.c:624
 msgid "Destination folder:"
 msgstr "Pasta de destino:"
 
-#: src/import.c:358
+#: src/import.c:637
 msgid "eml (folder)"
 msgstr "Pasta com arquivos \".eml\""
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Especifique o diretório com os arquivos \".eml\" e a pasta de destino."
 
-#: src/import.c:437
+#: src/import.c:719
 msgid "Select importing folder"
 msgstr "Selecionar diretório a importar"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Selecionar arquivo a importar"
 
@@ -2854,124 +2867,124 @@ msgstr "Cancelar"
 msgid "Standby"
 msgstr "Ocioso"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d mensagen(s) (%s) recebida(s)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, c-format
 msgid "no new messages"
 msgstr "Não há novas mensagens"
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Concluído"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Autenticação falhou"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Travado"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Concluído (%d nova(s) mensagem(ns))"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Concluído (Não há mensagens novas)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Houve alguns erros ao receber as mensagens"
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Recebendo novas mensagens da conta %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autenticando via POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ao servidor POP3: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recebendo mensagens de %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Recebendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Recebendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Recebendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Recebendo o número de novas mensagens (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Excluindo mensagem %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recebendo mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2979,15 +2992,15 @@ msgstr ""
 "A execução do filtro de spam falhou.\n"
 "Por favor verifique as definições do filtro de spam."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Falha na conexão"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2996,29 +3009,29 @@ msgstr ""
 "Erro ao processar mensagens:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "erro de rede."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Conexão finalizada pelo servidor"
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "A caixa de correio está bloqueada"
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3027,11 +3040,11 @@ msgstr ""
 "A caixa de correio está bloqueada:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3040,15 +3053,15 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Incorporação cancelada\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Recebendo novas mensagens de %s até %s...\n"
@@ -3066,16 +3079,16 @@ msgstr "Digite a senha"
 msgid "Protocol log"
 msgstr "Log do protocolo"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPÇÃO]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endreço]    abre janela de composição"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3085,23 +3098,23 @@ msgstr ""
 "                         abrir a janela de composição anexando os\n"
 "                         arquivos especificados"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensgens"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da fila"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...   mostra o número total de mensagens"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3109,47 +3122,47 @@ msgstr ""
 "  --status-full [pasta]...\n"
 "                         exibe o status de cada pasta"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open pasta/número abre a mensagem 'número' em uma nova janela"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir diretório    especifica o diretório que armazena os arquivos "
 "de configuração"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport porta        número da porta para comandos remotos via IPC"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 sair do Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo debug"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 exibe esta ajuda e sai"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informação de versão e sai"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Pressione qualquer tecla..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Codificação de nome de arquivo"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3173,20 +3186,20 @@ msgstr ""
 "\n"
 "Continuar?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Ainda há mensagens sendo escritas. Você realmente deseja sair?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Mensagens enviadas para a fila"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Há mensagens não enviadas na caixa de saída. Você realmente deseja sair?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3194,20 +3207,20 @@ msgstr ""
 "O GnuPG não está instalado corretamente.\n"
 "Suporte à OpenPGP desabilitado."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr "Carregando plug-ins..."
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "outra cópia do Sylpheed já está sendo executada.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Migração da configuração"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3856,8 +3869,8 @@ msgstr "Criando janela principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "Pronto.\n"
 
@@ -3904,11 +3917,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio \"%s\" já existe."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4132,7 +4145,7 @@ msgstr "Anexos"
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo \"%s\"."
@@ -6221,19 +6234,19 @@ msgstr "Anexo"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Data"
 
@@ -6243,7 +6256,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "Para"
 
@@ -6551,7 +6564,7 @@ msgstr "Procurando %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Procurando %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Sem data)"
 
@@ -6648,7 +6661,7 @@ msgstr "_Sobre"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - Caixa de mensagens remota POP3"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Nº"
 
@@ -6883,19 +6896,19 @@ msgstr "Não foi possível conectar ao SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Não foi possível conectar ao servidor SMTP: %s:%d"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Configuração da caixa de correio"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr "Este diálogo configurará sua caixa-postal inicial"
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr "Criar caixa-postal no seguinte local padrão:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
@@ -6903,7 +6916,7 @@ msgstr ""
 "Criar uma caixa-postal no seguinte local:\n"
 "(digite o nome da pasta ou caminho completo)"
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
@@ -6911,101 +6924,101 @@ msgstr ""
 "Se você deseja adicionar uma caixa-postal em outro local, selecione a opção "
 "\"Arquivo - Caixa-postal - Adicionar caixa-postal...\" no menu principal."
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr "Continuar sem criar uma caixa postal?"
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr "Por favor, indique o nome do diretório ou caminho completo."
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa de correio \"%s\" já existe."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 "O caminho \"%s\" já possui um diretório de preferências. Indique outro local."
 
-#: src/setup.c:467
+#: src/setup.c:473
 msgid "Cancel mail account setup?"
 msgstr "Você deseja cancelar a cancelar configuração desta conta?"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 msgid "Input value is not valid."
 msgstr "O valor digitado não é válido."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 msgid "POP3 server:"
 msgstr "Servidor POP3:"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 msgid "IMAP4 server:"
 msgstr "Servidor IMAP4:"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 msgid "New account setup"
 msgstr "Configurar nova conta"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr "Este diálogo configurará sua nova conta de email."
 
-#: src/setup.c:743
+#: src/setup.c:749
 msgid "Select account type:"
 msgstr "Selecione o tipo de conta:"
 
-#: src/setup.c:766
+#: src/setup.c:772
 msgid "Input your name and mail address:"
 msgstr "Digite seu nome e endereço de email:"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 msgid "Display name:"
 msgstr "Nome:"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 msgid "E-mail address:"
 msgstr "Endereço de email:"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr "Este nome será visto pelos destinatários (ex. Fulano de Tal)"
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr "Digite o nome de usuário e o servidor de email:"
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 msgid "User ID:"
 msgstr "Nome de Usuário:"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 msgid "SMTP server:"
 msgstr "Servidor SMTP:"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 msgid "Use SMTP authentication"
 msgstr "Usar autenticação SMTP"
 
-#: src/setup.c:874
+#: src/setup.c:880
 #, fuzzy
 msgid "Your new mail account has been set up with the following settings."
 msgstr "Sua nova conta foi configurada com as opções a seguir."
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
@@ -7015,6 +7028,19 @@ msgstr ""
 "\"Configurações -- Preferências para a conta atual\" ou\n"
 "\"Configurações --Editar contas\" no menu principal."
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Importando arquivo:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Resultado da verificação de assinatura"
@@ -7341,219 +7367,219 @@ msgstr "Revisando pasta (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Não foi possível estabelecer uma conexão IMAP.\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "Procurar _novamente"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não lidas"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Nenhuma mensagens não lidas encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Nenhuma mensagens nova encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Não há mensagens novas."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Não há mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas"
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do início?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens etiquetadas"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Nenhuma mensagem etiquetada foi encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Não há mensagens etiquetadas."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenhuma mensagem não lida encontrada. Procurar do início?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens por assunto..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d excluídas"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidas"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiadas"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " item(ns) selecionado(s)"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d não lidas, %d  no total (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d não lidas, %d no total"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Ordenando resumos..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tConfigurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Configurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como lida\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para exclusão\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Excluir a(s) mensagem(s)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Você realmente deseja excluir a(s) mensagem(s) da lixeira?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Excluindo mensagens duplicadas..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensagem %d marcada para ser movida para %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 msgid "Select folder to move"
 msgstr "Selecione a pasta a ser movida"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensagem %d está marcada para ser copiada para %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 msgid "Select folder to copy"
 msgstr "Selecione a pasta a ser copiada"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Organizando conversas..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Desfazendo conversas..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
@@ -7695,9 +7721,6 @@ msgstr "Não foi possível obter a informações de versão."
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread não é suportada pela glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Importando arquivo:"
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "Selecionar arquivo"
diff --git a/po/ro.po b/po/ro.po
index 9da8da77..e1c6cc17 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -319,7 +319,7 @@ msgstr "dosarul sursă este identic cu cel de destinație.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiere mesaj %s/%d în %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1252,15 +1252,15 @@ msgstr "Adrese comune"
 msgid "Personal address"
 msgstr "Adrese personale"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Notificare"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Eroare"
 
@@ -1305,7 +1305,7 @@ msgstr "Maro"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Niciunul"
 
@@ -1648,7 +1648,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
@@ -1843,7 +1843,7 @@ msgstr "Tip MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Dimensiune"
 
@@ -2259,7 +2259,7 @@ msgstr "Export"
 msgid "Specify source folder and destination file."
 msgstr "Specificați dosarul sursă și fișierul de destinație."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 msgid "File format:"
 msgstr "Format de fișier:"
 
@@ -2271,7 +2271,7 @@ msgstr "Dosar sursă:"
 msgid "Destination:"
 msgstr "Destinație:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr "Mbox Unix"
 
@@ -2283,7 +2283,7 @@ msgstr "eml (număr + .eml)"
 msgid "MH (number only)"
 msgstr "MH (doar număr)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Selectează... "
@@ -2456,12 +2456,12 @@ msgstr "Configurare informații dosar...\n"
 msgid "Setting folder info..."
 msgstr "Configurare informații dosar..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare dosar %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare dosar %s ..."
@@ -2644,7 +2644,7 @@ msgid "Creating header view...\n"
 msgstr "Creare vizualizare antet...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Fără expeditor)"
 
@@ -2656,63 +2656,76 @@ msgstr "Creare vizualizare imagine...\n"
 msgid "Can't load the image."
 msgstr "Imaginea nu a putut fi încărcată."
 
-#: src/import.c:187
+#: src/import.c:200
 msgid "The source file does not exist."
 msgstr "Fișierul sursă nu există."
 
-#: src/import.c:198
+#: src/import.c:211
 msgid "Can't find the destination folder."
 msgstr "Nu se poate găsi dosarul de destinație."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, c-format
 msgid "Importing %s ..."
 msgstr "Se importă %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 msgid "Importing"
 msgstr "Import"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 msgid "Scanning folder..."
 msgstr "Se scanează dosarul..."
 
-#: src/import.c:235
+#: src/import.c:252
 msgid "Error occurred on import."
 msgstr "A apărut o eroare în timpul importului."
 
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Dosarul „%s” nu a putut fi creat."
+
 # titlu la import mbox
-#: src/import.c:306
+#: src/import.c:585
 msgid "Import"
 msgstr "Import"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 msgid "Specify source file and destination folder."
 msgstr "Specificați fișierul sursă și dosarul de destinație."
 
-#: src/import.c:340
+#: src/import.c:619
 msgid "Source:"
 msgstr "Sursă:"
 
-#: src/import.c:345
+#: src/import.c:624
 msgid "Destination folder:"
 msgstr "Dosar de destinație:"
 
-#: src/import.c:358
+#: src/import.c:637
 msgid "eml (folder)"
 msgstr "eml (dosar)"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 msgid "Specify source folder including eml files and destination folder."
 msgstr ""
 "Specificați dosarul sursă care include fișiere eml și dosarul de destinație."
 
 # hm ? sau importat ?
-#: src/import.c:437
+#: src/import.c:719
 msgid "Select importing folder"
 msgstr "Selectați dosarul de import"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Selectați fișierul de importat"
 
@@ -2892,124 +2905,124 @@ msgstr "Anulare"
 msgid "Standby"
 msgstr "Așteptare"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Anulat"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Recepționare"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d mesaj(e) (%s) primit(e)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, c-format
 msgid "no new messages"
 msgstr "nu sunt mesaje noi"
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Gata"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Autentificarea a eșuat"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Blocat"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Timp expirat"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminat (%d mesaj(e) noi)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Terminat (nu sunt mesaje noi)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Au apărut unele erori în timpul obținerii mail-ului."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obținere mesaje noi pentru contul %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentificare cu POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: recepționare mesaje noi"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectare la serverul POP3: %s ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recepționare mesaje de la %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obținerea numărului de mesaje noi (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obținerea numărului de mesaje noi (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obținerea numărului de mesaje noi (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obținerea dimensiunii mesajelor (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Ștergere mesaje %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Părăsire"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recepționare mesaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3017,15 +3030,15 @@ msgstr ""
 "Execuția comenzii filtrului de spam a eșuat.\n"
 "Verificați configurările controlului de spam."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "A apărut o eroare în timpul procesării mail-ului."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3034,29 +3047,29 @@ msgstr ""
 "A apărut o eroare în timpul procesării mail-ului.\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Nu mai este spațiu pe disc."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Nu se poate scrie fișierul."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Eroare socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Conexiune închisă de serverul de la distanță."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Căsuța poștală este blocată"
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3065,11 +3078,11 @@ msgstr ""
 "Căsuța poștală este blocată:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Autentificarea a eșuat."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3078,15 +3091,15 @@ msgstr ""
 "Autentificarea a eșuat:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Timpul sesiunii a expirat."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Încorporarea a fost anulată\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obținere mesaje noi de la %s în %s...\n"
@@ -3104,16 +3117,16 @@ msgstr "Introduceți parola"
 msgid "Protocol log"
 msgstr "Log protocol"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilizare: %s [OPȚIUNE]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    deschide fereastra de compoziție"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3123,23 +3136,23 @@ msgstr ""
 "                         deschide fereastra de compoziție cu fișierele\n"
 "                         specificate atașate"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              primește mesaje noi"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          primește mesaje noi pentru toate conturile"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 trimite toate mesajele din coada de așteptare"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   arată numărul total de mesaje"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3147,48 +3160,48 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         arată starea fiecărui dosar"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum deschide mesajul în fereastră nouă"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    specifică directorul care conține fișierele de "
 "configurare"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport portnum      specifică portul pentru comenzi la distanță IPC"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 ieșire Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                mod debug"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afișează acest ajutor și ieși"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              afișează versiunea și ieși"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Apăsați orice tastă..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Codare de nume fișier"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3213,24 +3226,24 @@ msgstr ""
 "Continuați ?"
 
 # hm ? sigur cu \n
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Există cel puțin un mesaj în curs de compunere.\n"
 "Sigur doriți să ieșiți ?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Mesaje în coada de așteptare"
 
 # hm ? sigur cu \n
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "În coada de așteptare se află unul sau mai multe mesaje netrimise.\n"
 "Ieșiți acum ?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3238,20 +3251,20 @@ msgstr ""
 "GnuPG nu este instalat corespunzător, sau versiunea lui este prea veche.\n"
 "Suportul pentru OpenPGP a fost dezactivat."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr "Se încarcă plugin-urile..."
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "rulează deja o altă sesiune Sylpheed.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Migrarea configurației"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3909,8 +3922,8 @@ msgstr "Creare fereastră principală...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eșuat\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "gata.\n"
 
@@ -3957,11 +3970,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Căsuța poștală „%s” există deja."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Căsuță poștală"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4185,7 +4198,7 @@ msgstr "Atașamente"
 msgid "Message View - Sylpheed"
 msgstr "Vizualizare mesaje - Syplheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nu se poate salva fișierul „%s”."
@@ -6300,19 +6313,19 @@ msgstr "Atașament"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Expeditor"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Dată"
 
@@ -6322,7 +6335,7 @@ msgid "Number"
 msgstr "Număr"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "Către"
 
@@ -6637,7 +6650,7 @@ msgstr "Căutare %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Căutare %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
@@ -6743,7 +6756,7 @@ msgstr "_Despre"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s -  Căsuță poștală POP3 la distanță"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Nr."
 
@@ -6979,19 +6992,19 @@ msgstr "Nu se poate efectua conexiunea la serverul SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nu se poate efectua conexiunea la serverul SMTP: %s:%d"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Configurare căsuță poștală"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr "Acest dialog va face configurarea inițială a căsuței poștale."
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr "Creează căsuța poștală în această locație implicită:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
@@ -6999,7 +7012,7 @@ msgstr ""
 "Creează căsuța poștală în următoarea locație:\n"
 "(introduceți numele sau calea completă a dosarului)"
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
@@ -7007,101 +7020,101 @@ msgstr ""
 "Dacă vreți să adăugați ulterior o căsuță poștală la o altă locație, "
 "selectați „Fișier -> Căsuță poștală -> Adaugă o căsuță poștală...” în meniu."
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Anulare"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr "Continuați fără crearea unei căsuțe poștale ?"
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr "Introduceți numele dosarului sau calea completă a dosarului."
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Căsuța poștală „%s” există deja."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr "Locația „%s” include dosarul de configurări. Specificați altă locație."
 
-#: src/setup.c:467
+#: src/setup.c:473
 msgid "Cancel mail account setup?"
 msgstr "Anulați configurarea contului de corespondență ?"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 msgid "Input value is not valid."
 msgstr "Valoarea de intrare nu este validă."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 msgid "POP3 server:"
 msgstr "Server POP3:"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 msgid "IMAP4 server:"
 msgstr "Server IMAP4:"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 msgid "New account setup"
 msgstr "Configurare cont nou"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 "Acest dialog va face configurarea inițială a noului cont de corespondență."
 
-#: src/setup.c:743
+#: src/setup.c:749
 msgid "Select account type:"
 msgstr "Selectați tipul de cont:"
 
-#: src/setup.c:766
+#: src/setup.c:772
 msgid "Input your name and mail address:"
 msgstr "Introduceți numele dumneavoastră și adresa de corespondență:"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 msgid "Display name:"
 msgstr "Nume afișat:"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 msgid "E-mail address:"
 msgstr "Adresă de e-mail:"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr "Acest nume va fi văzut de către destinatari (de exemplu: Ion Popescu) "
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr "Introduceți ID-ul utilizatorului și serverul de corespondență:"
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 msgid "User ID:"
 msgstr "ID utilizator:"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 msgid "SMTP server:"
 msgstr "Server SMTP:"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 msgid "Use SSL"
 msgstr "Folosește SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 msgid "Use SMTP authentication"
 msgstr "Folosește autentificare SMTP"
 
 # hm ? cu punct sau două puncte ?
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr "Noul cont de corespondență a fost creat cu următoarele configurări:"
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
@@ -7111,6 +7124,19 @@ msgstr ""
 "„Configurare -> Preferințe pentru contul curent...” sau\n"
 "„Configurare -> Editare conturi...” în meniul principal."
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Fișier de import:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Rezultat verificare semnătură"
@@ -7438,219 +7464,219 @@ msgstr "Scanare dosar (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Nu s-a putut stabili conexiunea IMAP.\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "_Caută din nou"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Nu mai sunt mesaje necitite"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj necitit. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Nu sunt mesaje necitite."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nu s-a găsit nici un mesaj necitit. Mergeți la dosarul următor ?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Nu mai sunt mesaje noi"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj nou. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Nu sunt mesaje noi."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nu s-a găsit nici un mesaj nou. Mergeți la dosarul următor ?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Nu mai sunt mesaje marcate"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj marcat. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Nu sunt mesaje marcate."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nu s-a găsit nici un mesaj marcat. Căutați de la început ?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Nu mai sunt mesaje etichetate"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj etichetat. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Nu sunt mesaje etichetate"
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nu s-a găsit nici un mesaje etichetat. Căutați de la început ?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Atracție mesaje după subiect..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d șters(e)"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mutat(e)"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiat(e)"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " element(e) selectat(e)"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d noi, %d necitite, %d în total (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nou(i), %d necitit(e), %d în total"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Sortare sumar..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tSe configurează sumarul din datele de mesaj..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Se configurează sumarul din datele de mesaj..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scriere cache sumar (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mesajul %d este marcat\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mesajul %d este marcat ca citit\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mesajul %d este marcat ca necitit\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mesajul %s/%d este marcat pentru ștergere\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Ștergere mesaj(e)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Chiar vreți să ștergeți mesajul (sau mesajele) din gunoi ?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Ștergere mesaje duplicate..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mesajul %s/%d este demarcat\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Destinația este aceeași cu dosarul curent."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 msgid "Select folder to move"
 msgstr "Selectați dosarul de mutat"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mesajul %d este setat pentru copiere în %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Destinația pentru copiere este aceeași cu dosarul curent."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 msgid "Select folder to copy"
 msgstr "Selectați dosarul de copiat"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "A apărut o eroare în timpul procesării mesajelor."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Construire fire de discuție..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuție..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrare (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d messaj(e) au fost filtrate."
@@ -7798,9 +7824,6 @@ msgstr "Nu s-a putut obține informația despre versiune."
 #~ msgid "Exporting file:"
 #~ msgstr "Fișier de export:"
 
-#~ msgid "Importing file:"
-#~ msgstr "Fișier de import:"
-
 #~ msgid "Creating progress dialog...\n"
 #~ msgstr "Creare dialog de progres...\n"
 
diff --git a/po/ru.po b/po/ru.po
index eed0f195..38ca384a 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+0900\n"
 "PO-Revision-Date: 2010-06-15 15:18+0400\n"
 "Last-Translator: \n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -317,7 +317,7 @@ msgstr "исходная папка совпадает с папкой назн�
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копирование сообщения %s/%d·to·%s·...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1235,15 +1235,15 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Уведомление"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Ошибка"
 
@@ -1286,7 +1286,7 @@ msgstr "Коричневый"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Нет"
 
@@ -1626,7 +1626,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
@@ -1816,7 +1816,7 @@ msgstr "Тип MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Размер"
 
@@ -2228,7 +2228,7 @@ msgstr "Экспорт"
 msgid "Specify source folder and destination file."
 msgstr "Укажите исходную папку и файл назначения."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 msgid "File format:"
 msgstr "Формат файла:"
 
@@ -2240,7 +2240,7 @@ msgstr "Исходная папка:"
 msgid "Destination:"
 msgstr "Каталог назначения:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr "Почтовый ящик UNIX"
 
@@ -2252,7 +2252,7 @@ msgstr "eml (число + .eml)"
 msgid "MH (number only)"
 msgstr "MH (только участник)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Выбор... "
@@ -2423,12 +2423,12 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -2604,7 +2604,7 @@ msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Без отправителя)"
 
@@ -2616,60 +2616,73 @@ msgstr "Создание области просмотра изображени�
 msgid "Can't load the image."
 msgstr "Ошибка загрузки изображения"
 
-#: src/import.c:187
+#: src/import.c:200
 msgid "The source file does not exist."
 msgstr "Исходный файл не существует."
 
-#: src/import.c:198
+#: src/import.c:211
 msgid "Can't find the destination folder."
 msgstr "Невозможно найти папку назначения."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, c-format
 msgid "Importing %s ..."
 msgstr "Импортирование \"%s\"..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 msgid "Importing"
 msgstr "Импортирование"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 msgid "Scanning folder..."
 msgstr "Просмотр папки..."
 
-#: src/import.c:235
+#: src/import.c:252
 msgid "Error occurred on import."
 msgstr "При импорте произошла ошибка."
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Не удалось создать папку \"%s\"."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Импорт"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 msgid "Specify source file and destination folder."
 msgstr "Укажите исходный файл и папку назначения."
 
-#: src/import.c:340
+#: src/import.c:619
 msgid "Source:"
 msgstr "Исходная папка:"
 
-#: src/import.c:345
+#: src/import.c:624
 msgid "Destination folder:"
 msgstr "Каталог назначения:"
 
-#: src/import.c:358
+#: src/import.c:637
 msgid "eml (folder)"
 msgstr "eml (папка)"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Укажите исходную папку с eml-файлами и папку назначения."
 
-#: src/import.c:437
+#: src/import.c:719
 msgid "Select importing folder"
 msgstr "Выбор папки для импорта"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Выбор импортируемого файла"
 
@@ -2844,124 +2857,124 @@ msgstr "Отмена"
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Отменена"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "принято сообщений: %d (%s)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, c-format
 msgid "no new messages"
 msgstr "нет новых сообщений"
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Выполнено."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Ошибка соединения"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Неверный пароль"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Занято"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Нет ответа"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "При получении сообщений возникли ошибки."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получение новых сообщений для учётной записи %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Аутентификация POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Соединение с сервером POP3: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получение сообщений с %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Удаление сообщения %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2969,15 +2982,15 @@ msgstr ""
 "Не удалось выполненить команду фильтрации спама.\n"
 "Проверьте настройки фильтрации спама."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Ошибка соединения"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2986,29 +2999,29 @@ msgstr ""
 "Произошла ошибка при обработке сообщений:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Нет места на диске."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Ошибка записи в файл."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Сервер закрыл соединение."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик занят."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3017,11 +3030,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3030,15 +3043,15 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Приём сообщений прерван\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получение новых сообщений из %s в %s...\n"
@@ -3056,16 +3069,16 @@ msgstr "Ввод пароля"
 msgid "Protocol log"
 msgstr "Журнал"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Использование: %s [ПАРАМЕТР]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адрес]      открыть окно создания сообщения"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3075,24 +3088,24 @@ msgstr ""
 "                         открыть окно создания сообщения с присоединёнными\n"
 "                         файлами"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              получить новые сообщения"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          получить новые сообщения со всех учётных записей"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 отослать все сообщения из очереди"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...    вывести суммарное количество сообщений"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3100,45 +3113,45 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         вывести состояние указанных папок"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "··--open·folderid/msgnum·открыть сообщение в новом окне"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir каталог    указать каталог с файлами конфигурации"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "··--ipcport·portnum······задать портдля удаленной команды IPC"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 завершить работу Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим отладки"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 отобразить это описание и выйти"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              вывести информацию о версии и выйти"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Нажмите любую клавишу..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Кодировка имён файлов"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3162,19 +3175,19 @@ msgstr ""
 "\n"
 "Продолжить?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Есть редактируемое сообщение. Выходить?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Сообщения в очереди"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "В очереди есть неотправленные сообщения. Выходить?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3182,20 +3195,20 @@ msgstr ""
 "GnuPG установлен неправильно, или установлена устаревшая версия.\n"
 "Поддержка OpenPGP отключена."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr "Загрузка модулей..."
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "другая копия Sylpheed уже запущена.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Импорт предыдущей конфигурации"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3844,8 +3857,8 @@ msgstr "Создание главного окна...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "выполнено.\n"
 
@@ -3892,11 +3905,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик \"%s\" уже существует."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4120,7 +4133,7 @@ msgstr "Вложения"
 msgid "Message View - Sylpheed"
 msgstr "Окно сообщения - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла \"%s\"."
@@ -6209,19 +6222,19 @@ msgstr "Вложение"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Дата"
 
@@ -6231,7 +6244,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "Кому"
 
@@ -6539,7 +6552,7 @@ msgstr "Поиск в папке \"%s\" (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Поиск в папке \"%s\"..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
@@ -6636,7 +6649,7 @@ msgstr "О программе"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 удаленный почтовый ящик"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Номер"
 
@@ -6871,19 +6884,19 @@ msgstr "Ошибка соединения с сервером NNTP: %s:%d"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ошибка соединения с сервером NNTP: %s:%d"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Установки почтового ящика"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr "Этот диалог выполнит начальную настройку почтового ящика."
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr "Создать почтовый ящик в месте по умолчанию:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
@@ -6891,7 +6904,7 @@ msgstr ""
 "Создать почтовый ящик в следующем месте:\n"
 "(введите название папки или полный путь)"
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
@@ -6899,24 +6912,24 @@ msgstr ""
 "Если вы в последствии хотите добавить почтовый ящик в другое место, выберите "
 "'Файл - Почтовый ящик - Добавить почтовый ящик...' в меню."
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr "Продолжить без созданного почтового ящика?"
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr "Пожалуйста введите имя папки или полный путь."
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Почтовый ящик \"%s\" уже существует."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
@@ -6924,76 +6937,76 @@ msgstr ""
 "'%s\" включает в себя папку настроек. Пожалуйста, выберите другое "
 "расположение."
 
-#: src/setup.c:467
+#: src/setup.c:473
 msgid "Cancel mail account setup?"
 msgstr "Отменить настройку профиля?"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 msgid "Input value is not valid."
 msgstr "Введено неверное значение."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 msgid "POP3 server:"
 msgstr "Сервер POP3:"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 msgid "IMAP4 server:"
 msgstr "Сервер IMAP4:"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 msgid "New account setup"
 msgstr "Настройка нового профиля"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr "Этот диалог выполнит начальную настройку нового профиля."
 
-#: src/setup.c:743
+#: src/setup.c:749
 msgid "Select account type:"
 msgstr "Выберите тип профиля:"
 
-#: src/setup.c:766
+#: src/setup.c:772
 msgid "Input your name and mail address:"
 msgstr "Введите ваше имя и адрес email:"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 msgid "Display name:"
 msgstr "Отображаемое имя:"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 msgid "E-mail address:"
 msgstr "Адрес E-Mail:"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr "Это имя будет видимо получателям (например Иван Петров)"
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr "Введите ID пользователя и почтовый сервер:"
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 msgid "User ID:"
 msgstr "Имя пользователя:"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 msgid "SMTP server:"
 msgstr "Сервер SMTP (для отправки):"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 msgid "Use SSL"
 msgstr "Использовать SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 msgid "Use SMTP authentication"
 msgstr "Использовать SMTP с авторизацией"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr "Ваш новый почтовый профиль был настроен со следующими параметрами:"
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
@@ -7003,6 +7016,19 @@ msgstr ""
 "'Настройка - Настройка текущей учетной записи' или\n"
 "'Настройка - Редактирование учетных записей' в главном меню."
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Импорт файла:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Результат проверки подписи"
@@ -7329,217 +7355,217 @@ msgstr "Просмотр папки (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Не удалось открыть сеанс связи IMAP4.\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "Искать снова"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Нет непрочитанных сообщений"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Непрочитанные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Нет непрочитанных сообщений."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Непрочитанные сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Нет новых сообщений"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Новые сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Нет новых сообщений."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Новые сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Нет выделенных цветом сообщений"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Нет выделенных цветом сообщений."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Группировка сообщений по темам..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d удалено"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перемещено"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопировано"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " сообщений выбрано"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d непрочитанных, %d всего (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d непрочитанных, %d всего"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Сортировка..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tФормирование списка сообщений..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Формирование списка сообщений..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удалённое\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Удаление повторяющихся сообщений..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 msgid "Select folder to move"
 msgstr "Выбор папки назначения"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 msgid "Select folder to copy"
 msgstr "Выбор папки назначения"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
@@ -7685,8 +7711,5 @@ msgstr "Невозможно получить информацию о верси
 #~ msgid "Exporting file:"
 #~ msgstr "Экспортировать в файл:"
 
-#~ msgid "Importing file:"
-#~ msgstr "Импорт файла:"
-
 #~ msgid "Creating progress dialog...\n"
 #~ msgstr "Создание диалогового окна прогресса...\n"
diff --git a/po/sk.po b/po/sk.po
index 721fdeb0..c6fb7521 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -314,7 +314,7 @@ msgstr "zdrojový priečinok je ten istý ako cieľový.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1242,15 +1242,15 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Chyba"
 
@@ -1293,7 +1293,7 @@ msgstr "Hnedá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Žiadna"
 
@@ -1674,7 +1674,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
@@ -1866,7 +1866,7 @@ msgstr "MIME typ"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -2286,7 +2286,7 @@ msgstr "Exportovať"
 msgid "Specify source folder and destination file."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Formát dátumu"
@@ -2301,7 +2301,7 @@ msgstr "Zdrojový priečinok:"
 msgid "Destination:"
 msgstr "Cieľ"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2313,7 +2313,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Zvoľte..."
@@ -2494,12 +2494,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:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -2676,7 +2676,7 @@ msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
@@ -2688,71 +2688,84 @@ msgstr "Vytváram náhľad obrázku...\n"
 msgid "Can't load the image."
 msgstr "Nedá sa načítať obrázok."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Importovať"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Pri odosielaní sa vyskytla chyba\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Nedá sa vytvoriť priečinok `%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importovať"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Zdrojový priečinok:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Cieľový priečinok:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nový priečinok"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Zvoľte súbor pre import"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Zvoľte súbor pre import"
 
@@ -2936,140 +2949,140 @@ msgstr "Storno"
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Žiadne nové správy."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Hotovo."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Zamknuté"
 
-#: src/inc.c:749
+#: src/inc.c:754
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (v sekundách)"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Pri prijímaní pošty sa vyskytli chyby."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "prijímam nové správy pre konto %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentizácia"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3078,29 +3091,29 @@ msgstr ""
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3109,11 +3122,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3122,16 +3135,16 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Prijímam nové správy z %s do %s...\n"
@@ -3149,16 +3162,16 @@ msgstr "Zadajte heslo"
 msgid "Protocol log"
 msgstr "Záznam protokolu"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]    otvorí okno pre písanie novej správy"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3169,23 +3182,23 @@ msgstr ""
 "uvedenými\n"
 "                         súbormi"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy pre všetky kontá"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [priečinok]...   zobrazí celkový počet správ"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3193,50 +3206,50 @@ msgstr ""
 "  --status-full [priečinok]...\n"
 "                        zobrazí stav jednotlivých priečinkov"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                zobrazí túto nápovedu a ukončí program"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version                zobrazí informácie o verzii a ukončí program"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "alebo stlačte klávesu 'y'.\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Výstupné kódovanie znakov"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3250,19 +3263,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Máte rozpísanú správu. Naozaj ukončiť?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3270,21 +3283,21 @@ msgstr ""
 "GnuPG nie je nainštalované správne, alebo jeho verzia je príliš stará.\n"
 "Podpora OpenPGP je vypnutá."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "už beží iná kópia Sylpheedu.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavenie akcií"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3973,8 +3986,8 @@ msgstr "Vytváram hlavné okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -4024,11 +4037,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4234,7 +4247,7 @@ msgstr "Prílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
@@ -6426,19 +6439,19 @@ msgstr "Príloha"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Dátum"
 
@@ -6448,7 +6461,7 @@ msgid "Number"
 msgstr "Číslo"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Komu:"
@@ -6775,7 +6788,7 @@ msgstr "Filtrujem..."
 msgid "Searching %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
@@ -6883,7 +6896,7 @@ msgstr "O programe"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Č."
 
@@ -7116,142 +7129,155 @@ msgstr "Nedá sa pripojiŤ k serveru NNTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nedá sa pripojiŤ k serveru NNTP: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Nastavenie mailboxu"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr ""
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Storno"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Nastavenie konta"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Nebol zadaný názov menu."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP server"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP server"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Nastavenie konta"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Zmazať konto"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Zobraziť meno"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "E-mailová adresa"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Prihlasovacie meno"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP server (odosielanie)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Autentizácia"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Importovaný súbor:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
@@ -7587,224 +7613,224 @@ msgstr "Prehľadávam priečinok (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "Hľadať znova"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Hľadať od konca?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr ""
 "Neboli nájdené žiadne neprečítané správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Neboli nájdené žiadne nové správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správu podľa názvu..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " položiek zvolených"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tVytváram zoznam správ..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Správa %s/%d je určená na zmazanie\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Správa %d je určená k presunutiu do %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Zvoľte priečinok"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Správa %d je určená ku kopírovaniu do %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Zvoľte priečinok"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
@@ -7954,9 +7980,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "glib nepodporuje g_thread.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Importovaný súbor:"
-
 #, fuzzy
 #~ msgid "Destination file:"
 #~ msgstr "Cieľový priečinok:"
diff --git a/po/sl.po b/po/sl.po
index e9c7b10c..17fcc8f8 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -317,7 +317,7 @@ msgstr "Izvorna mapa je identična ciljni.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1247,15 +1247,15 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Opomba"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Napaka"
 
@@ -1298,7 +1298,7 @@ msgstr "Rjava"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Nič"
 
@@ -1680,7 +1680,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
@@ -1871,7 +1871,7 @@ msgstr "Tip MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Velikost"
 
@@ -2290,7 +2290,7 @@ msgstr "Izvozi"
 msgid "Specify source folder and destination file."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Oblika datuma"
@@ -2305,7 +2305,7 @@ msgstr "Izvorni imenik:"
 msgid "Destination:"
 msgstr "Cilj"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2317,7 +2317,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Izberi... "
@@ -2498,12 +2498,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -2681,7 +2681,7 @@ msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
 
@@ -2693,71 +2693,84 @@ msgstr "Delam gledanje slike...\n"
 msgid "Can't load the image."
 msgstr "Ne morem naložiti slike."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Uvozi"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Med pošiljanjem je prišlo do napake\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Ne morem narediti mape '%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Uvozi"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Izvorni imenik:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Ciljni imenik:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nova mapa"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Izberite datoteko za uvoz"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Izberite datoteko za uvoz"
 
@@ -2941,197 +2954,197 @@ msgstr "Prekliči"
 msgid "Standby"
 msgstr "V pripravljenosti"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Prenašam"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Ni novih sporočil."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Opravljeno."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Overovitev ni uspela"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: src/inc.c:749
+#: src/inc.c:754
 #, fuzzy
 msgid "Timeout"
 msgstr "Čas izteka (sek.)"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Končano (ni novih sporočil)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Med prejemanjem pošte je prišlo do nekaterih napak."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "sprejemam nova sporočila z računa %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Overovljam"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prenašam nova sporočila"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se s strežnikom POP: %s"
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom POP: %s%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ugotavljam število novih sporočil (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ugotavljam število novih sporočil (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ugotavljam velikost sporočil (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Zapuščam"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 #, fuzzy
 msgid "Connection failed."
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Na disku ni prostora."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Ne morem napisati datoteke."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "napaka v priključku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Pripojitev odpovedana\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobiram nova sporočila iz %s v %s...\n"
@@ -3149,16 +3162,16 @@ msgstr "Vnesite geslo"
 msgid "Protocol log"
 msgstr "Dnevnik protokola"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [naslov]     odpri okno za sestavljanje novega sporočila"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3168,73 +3181,73 @@ msgstr ""
 "                         odpri okno za sestavljanje s pripetimi\n"
 "                         podanimi datotekami"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              poberi nova sporočila"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          poberi nova sporočila z vseh računov"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošlji vsa čakajoča sporočila"
 
-#: src/main.c:585
+#: src/main.c:590
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:586
+#: src/main.c:591
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                razhroščevalni način"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                razhroščevalni način"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaži to pomoč in končaj"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikaži informacijo o različici in končaj"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ali pritisnite tipko `y'.\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izhodni nabor znakov"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3248,19 +3261,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Še vedno sestavljate sporočilo. Ali naj res končam?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Čakajoča sporočila"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nekaj neposlamih sporočil je na čakanju. Ali naj končam?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3268,21 +3281,21 @@ msgstr ""
 "GnuPG ni pravilno nameščen ali pa je različica prestara.\n"
 "Podpora za OpenPGP je izključena."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed že teče.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem nastavitve dejanj..\n"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3977,8 +3990,8 @@ msgstr "Ustvarjam glavno okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
@@ -4028,11 +4041,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4237,7 +4250,7 @@ msgstr "Priloge"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
@@ -6428,19 +6441,19 @@ msgstr "Priloga"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Datum"
 
@@ -6450,7 +6463,7 @@ msgid "Number"
 msgstr "Število"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -6775,7 +6788,7 @@ msgstr "Filtriram..."
 msgid "Searching %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
@@ -6883,7 +6896,7 @@ msgstr "O"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Ne."
 
@@ -7115,142 +7128,155 @@ msgstr "Ne morem se povezati s strežnikom SMTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ne morem se povezati s strežnikom SMTP: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Nastavitev poštnega predala"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr ""
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Nastavitev računa"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Ime menija ni nastavljeno."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "Strežnik LDAP"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "Strežnik LDAP"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Nastavitev računa"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Brisanje računa"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Izberi ključ glede na vaš el. naslov"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Prikaži ime"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "Elektronski naslov"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Uporabniško ime"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "Strežnik SMTP (pošiljanje)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Overovitev"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Uvažam datoteko:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
@@ -7587,225 +7613,225 @@ msgstr "Preiskujem mapo (%s) ..."
 msgid "Could not establish a connection to the server."
 msgstr "Ne morem vzpostaviti seje IMAP4 z: %s%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "Ponovno iskanje"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Nobeno neprebrano sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Ni neprebranih sporočil."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr ""
 "Nobeno neprebrano sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Ni novih sporočil."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Ni več označenih sporočil"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Ni označenih sporočil."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Ni več sporočil z oznako"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Ni sporočil z oznako"
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Privlačim sporočila po zadevi..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d izbrisanih"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d prestavljenih"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d presnetih"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " izbranih kosov"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d neprebranih, skupaj %d (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d neprebranih, skupaj %d"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Razvrščam povzetka..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Nastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Sporočilo %d je označeno, kot da se bere\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prestavitev v %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Izberi mapo"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prepis v %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Izberi mapo"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
@@ -7956,9 +7982,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread ni podprt v glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Uvažam datoteko:"
-
 #, fuzzy
 #~ msgid "Destination file:"
 #~ msgstr "Ciljni imenik:"
diff --git a/po/sr.po b/po/sr.po
index 777763f7..503f83bf 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -318,7 +318,7 @@ msgstr "izvorni direktorijum jednak je destinaciji.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1241,15 +1241,15 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Obaveštenje"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Greška"
 
@@ -1292,7 +1292,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Ništa"
 
@@ -1674,7 +1674,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1866,7 +1866,7 @@ msgstr "MIME tip"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Veličina"
 
@@ -2285,7 +2285,7 @@ msgstr "Izvezi"
 msgid "Specify source folder and destination file."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Format datuma"
@@ -2300,7 +2300,7 @@ msgstr "Izvorni dir:"
 msgid "Destination:"
 msgstr "Odredište"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2312,7 +2312,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Odaberite... "
@@ -2493,12 +2493,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
@@ -2676,7 +2676,7 @@ msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
@@ -2688,71 +2688,84 @@ msgstr "Kreiram pregled slika...\n"
 msgid "Can't load the image."
 msgstr "Ne mogu prikazati sliku."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Uvezi"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Došlo je do greške prilikom slanja\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Ne mogu napraviti direktorijum `%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Uvezi"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Izvorni dir:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Odredišni dir:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Novi direktorijum"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Odaberite datoteku za uvoz"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Odaberite datoteku za uvoz"
 
@@ -2936,196 +2949,196 @@ msgstr "Odustani"
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Nema novih poruka."
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Gotovo"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Identifikacija nije uspela"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Zaključano"
 
-#: src/inc.c:749
+#: src/inc.c:754
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke za nalog %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Provera identiteta"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 server: %s ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Preuzimam broj novih poruka (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Preuzimam broj novih poruka (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Preuzimam veličinu poruka (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Nema više mesta na disku."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Incorporation otkazano\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke od %s u %s...\n"
@@ -3143,16 +3156,16 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3162,73 +3175,73 @@ msgstr ""
 "                         otvara prozor za pisanje sa navedenim datotekama\n"
 "                         dodato"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          primi sve poruke sa svih naloga"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 šalje sve odložene poruke"
 
-#: src/main.c:585
+#: src/main.c:590
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:586
+#: src/main.c:591
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                debug način"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaž ovu pomoć izađi"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ili pritisnite `y´ tipku.\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3242,19 +3255,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Napisana poruka postoji. Zaista prekinuti?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlate poruke su odložene. Izaći odmah?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3262,21 +3275,21 @@ msgstr ""
 "GnuPG nije pravilno instaliran ili je verzija suviše stara.\n"
 "OpenPGP podrška je onemogućena."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3972,8 +3985,8 @@ msgstr "Kreiranje glavnih prozora...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4023,11 +4036,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4232,7 +4245,7 @@ msgstr "Dodatak"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
@@ -6422,19 +6435,19 @@ msgstr "Dodatak"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Datum"
 
@@ -6444,7 +6457,7 @@ msgid "Number"
 msgstr "Broj"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -6769,7 +6782,7 @@ msgstr "Filtriranje..."
 msgid "Searching %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6878,7 +6891,7 @@ msgstr "O"
 msgid "%s - POP3 Remote mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Ne."
 
@@ -7111,142 +7124,155 @@ msgstr "Ne mogu se povezati na SMTP server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ne mogu se povezati na SMTP server: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Podešavanje sandučeta"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr ""
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Odustani"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Podešavanja naloga"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Ime menija nije podešeno."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP Server"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP Server"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Podešavanja naloga"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Obriši nalog"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Odaberi ključ po adresi e-pošte"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Prikaz imena"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "Adresa e-pošte"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "ID korisnika"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP server (slanje)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Provera identiteta"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Uvozim datoteku:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
@@ -7583,224 +7609,224 @@ msgstr "Pregledanje direktorijuma (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Ne mogu se povezati s IMAP4 serverom: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "Pretraži ponovo"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nema više nepročitanih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Nema više novih poruka"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Nema više novih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Nema novih poruka."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nema više novih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Nema više obeleženih poruka"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema više obeleženih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Nema obeleženih poruka."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema više obeleženih poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Prihvatanje poruka po temi..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premešteno"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li zaista obrisati poruku/e iz smeća?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premeštanje u %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Odaberite direktorijum"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Odaberite direktorijum"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
@@ -7951,9 +7977,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "glib ne podržava g_thread.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Uvozim datoteku:"
-
 #, fuzzy
 #~ msgid "Destination file:"
 #~ msgstr "Odredišni dir:"
diff --git a/po/sv.po b/po/sv.po
index 1bc615e2..dbbba39f 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -311,7 +311,7 @@ msgstr "ursprungsmappen är identisk med dest.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopierar meddelande %s%c%d till %s...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1238,15 +1238,15 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Notera"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Fel"
 
@@ -1289,7 +1289,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Ingen"
 
@@ -1638,7 +1638,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
@@ -1831,7 +1831,7 @@ msgstr "MIME-typ"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Storlek"
 
@@ -2248,7 +2248,7 @@ msgstr "Exportera"
 msgid "Specify source folder and destination file."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Datumformat"
@@ -2263,7 +2263,7 @@ msgstr "Ursprungskatalog:"
 msgid "Destination:"
 msgstr "Destinationskatalog:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2275,7 +2275,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Välj... "
@@ -2453,12 +2453,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -2636,7 +2636,7 @@ msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Inget Från)"
 
@@ -2648,71 +2648,84 @@ msgstr "Skapar bildvy...\n"
 msgid "Can't load the image."
 msgstr "Kan inte öppna bilden."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Importera"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Fel uppstod vid postning\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Kan inte skapa mappen \"%s\"."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Importera"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Ursprungskatalog:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Destinationskatalog:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Ny mapp"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Välj fil att importera"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Välj fil att importera"
 
@@ -2896,139 +2909,139 @@ msgstr "Avbryt"
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Färdig (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Inga nya meddelanden."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Färdig."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Slut på väntetid"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Avslutad (%d nya meddelanden)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Avslutad (inga nya meddelanden)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Fel uppstod vid hämtning av post."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "hämtar nya meddelanden från kontot %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentiserar"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ansluter till POP3-server: %s ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot meddelandenas antal (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot meddelandenas antal (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot meddelandenas storlek (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Förbindelse misslyckades."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod när e-posten behandlades."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3037,29 +3050,29 @@ msgstr ""
 "Fel uppstod när e-posten behandlades:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Kan inte skriva fil."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen stängdes av fjärrvärden."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3068,11 +3081,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3081,15 +3094,15 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporering avbruten\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Hämtar nya meddelanden från %s till %s...\n"
@@ -3107,16 +3120,16 @@ msgstr "Skriv in lösenord"
 msgid "Protocol log"
 msgstr "Protokollogg"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adress]    öppna skrivfönster"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3126,23 +3139,23 @@ msgstr ""
 "                         öppna skrivfönster med angivna filer\n"
 "                         bifogade"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive             ta emot nya meddelanden"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all         ta emot nya meddelanden från alla konton"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                skicka alla köade meddelanden"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mapp]...    visar det totala antalet meddelanden"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3150,48 +3163,48 @@ msgstr ""
 "  --status-full [mapp]...\n"
 "                          visa status för varje mapp"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug               felsökningsläge"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug               felsökningsläge"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                visa denna hjälp och avsluta"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version             skriv ut versionsinformation och avsluta"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "eller tryck på \"y\"-tangenten.\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Filnamn kodning"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3215,19 +3228,19 @@ msgstr ""
 "\n"
 "Fortsätt?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Ett skrivet meddelande finns. Avsluta ändå?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Meddelanden i kö"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Några oskickade meddelanden ligger i kö. Avsluta nu?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3235,20 +3248,20 @@ msgstr ""
 "GnuPG är inte installerad riktigt eller så är versionen för gammal.\n"
 "OpenPGP-stöd avstängt."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "en annan instans av Sylpheed är redan igång.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3915,8 +3928,8 @@ msgstr "Skapar huvudfönster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "färdigt.\n"
 
@@ -3963,11 +3976,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4169,7 +4182,7 @@ msgstr "Bilagor"
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
@@ -6302,19 +6315,19 @@ msgstr "Bilaga"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Datum"
 
@@ -6324,7 +6337,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Till:"
@@ -6650,7 +6663,7 @@ msgstr "Filtrerar..."
 msgid "Searching %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
@@ -6758,7 +6771,7 @@ msgstr "Om"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Nr."
 
@@ -6995,143 +7008,156 @@ msgstr "Kan inte ansluta till NNTP-server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Kan inte ansluta till NNTP-server: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Brevlådeinställning"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "Utför följande åtgärder:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Kontoinställningar"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Menynamn är inte angivet."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP-server"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP-server"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Kontoinställningar"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Ta bort konto"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Välj nyckel genom din e-postadress"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Visat namn"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "E-postadress"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Användar-ID"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "Server att skicka med (SMTP)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Autentisering"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Fil att importera:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Resultat av signaturundersökning"
@@ -7464,221 +7490,221 @@ msgstr "Söker igenom mapp (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Kan inte skapa IMAP4-session med: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "_Sök igen"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Inget oläst meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Inga olästa meddelanden."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Inget oläst meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Inga fler nya meddelanden"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Inget nytt meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Inget nytt meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Inget markerat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Inget markerat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget färgat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Inga färgade meddelanden."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Inget färgat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter ärende..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " objekt valda"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nya, %d olästa, %d totalt (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nya, %d olästa, %d totalt"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Sorterar summering..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tSkapar summering från meddelandedata..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Skapar summering från meddelandedata..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelande %d är valt för att flyttas till %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Välj mapp"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelandet %d är valt för att kopieras till %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Välj mapp"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
@@ -7823,9 +7849,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread stöds inte av glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Fil att importera:"
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "Välj fil"
diff --git a/po/tr.po b/po/tr.po
index cab8e35d..a025d409 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -322,7 +322,7 @@ msgstr "kaynak dizini hedef dizinle aynı.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1246,15 +1246,15 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Not"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Hata"
 
@@ -1297,7 +1297,7 @@ msgstr "Kahverengi"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -1670,7 +1670,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
@@ -1871,7 +1871,7 @@ msgstr "MIME türü"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Boyut"
 
@@ -2290,7 +2290,7 @@ msgstr "Aktar"
 msgid "Specify source folder and destination file."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Tarih biçimi"
@@ -2305,7 +2305,7 @@ msgstr "Kaynak dizini:"
 msgid "Destination:"
 msgstr "Hedef dizini:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr "UNIX mbox"
 
@@ -2317,7 +2317,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr "MH (yalnız numara)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Seç... "
@@ -2496,12 +2496,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -2678,7 +2678,7 @@ msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
 
@@ -2690,71 +2690,84 @@ msgstr "Resim görüntüsü oluşturuluyor...\n"
 msgid "Can't load the image."
 msgstr "Resim yüklenemedi."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Dışarıdan Aktar"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "%s dizini taranıyor..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Postalama sırasında hata\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "`%s' dizini oluşturulamıyor."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Dışarıdan Aktar"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Kaynak dizini:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Hedef dizini:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Yeni dizin"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Eklenecek dosyayı seçin"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Eklenecek dosyayı seçin"
 
@@ -2938,125 +2951,125 @@ msgstr "İptal"
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Tamamlandı (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Yeni ileti yok."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Tamamlandı."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Bağlantıda hata"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Kimlik denetiminde hata"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Tamamlandı (yeni mesaj yok)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr " İletiler alınırken bazı hatalar oluştu."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hesabındaki yeni iletiler alınıyor...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr " Kimlik denetimi"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti numaraları alınıyor (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti numaraları alınıyor (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3064,15 +3077,15 @@ msgstr ""
 "Gereksiz mesaj filtresi komutu çalıştırılamadı.<br> Lütfen gereksiz mesaj "
 "kontrol ayarlarınızı kontrol ediniz."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Bağlantıda hata oluştu."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "İletiler işlenirken bir hata oluştu."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3081,29 +3094,29 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Dosyaya yazılamadı."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "protokol hatası"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli"
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3112,11 +3125,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata oluştu."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3125,15 +3138,15 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Oturum zaman aşımına uğradı."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "İptal edildi\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s'den yeni mesajlar %s e alınıyor...\n"
@@ -3151,16 +3164,16 @@ msgstr "Parolayı girin"
 msgid "Protocol log"
 msgstr "Protokol günlüğü"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]    düzenleme penceresini açar"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3170,23 +3183,23 @@ msgstr ""
 "                         düzenleme penceresini belirtilen dosyalar\n"
 "                         postaya eklenmiş halde açar"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive               yeni mesajları alır"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          tüm hesaplardaki yeni mesajları alır"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 kuyruktaki postaları gönderir"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dizin]...   toplam mesaj sayısını göster"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3194,49 +3207,49 @@ msgstr ""
 "  --status-full [dizin]...\n"
 "                         her dizinin durumunu göster"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                hata ayıklama modu"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                hata ayıklama modu"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 bu yardımı gösterir ve çıkar"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              sürüm bilgisini gösterir ve çıkar"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ya da `y' tuşuna basın.\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Giden ileti kod kümesi"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3250,19 +3263,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Mesajı göndermeden çıkmak istediğinizden emin misiniz?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Kuyruktaki iletiler"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hala gönderilmemiş bazı iletiler kuyrukta bekliyor. Şimdi çıkılsın mı?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3270,21 +3283,21 @@ msgstr ""
 "GnuPG düzgün kurulmamış veya versiyonu çok eski\n"
 "OpenPGP desteği kapatıldı."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr "Eklentiler yükleniyor..."
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Eylem ayarları"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3966,8 +3979,8 @@ msgstr "Yeni pencere oluşturuluyor...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "AnaPencere: renk bölüştürmesi %d sırasında hata oluştu\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "bitti.\n"
 
@@ -4016,11 +4029,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4222,7 +4235,7 @@ msgstr "Ekler"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
@@ -6381,19 +6394,19 @@ msgstr "Ek"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Tarih"
 
@@ -6403,7 +6416,7 @@ msgid "Number"
 msgstr "Numara"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "Kime"
 
@@ -6721,7 +6734,7 @@ msgstr "Arıyor %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Arıyor %s..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
@@ -6824,7 +6837,7 @@ msgstr "_Hakkında"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 Uzak posta kutusu"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Hayır."
 
@@ -7059,21 +7072,21 @@ msgstr "SMTP sunucusuna bağlantı yapılamadı."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "SMTP sunucusuna bağlantı yapılamadı: %s:%d"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Posta kutusu ayarları"
 
-#: src/setup.c:159
+#: src/setup.c:165
 #, fuzzy
 msgid "This dialog will make initial setup of mailbox."
 msgstr "Bu diyalog posta kutunuzun başlangıç ayarlarını yapacaktır."
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "Aşağıdaki eylemleri gerçekleştir:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 #, fuzzy
 msgid ""
 "Create mailbox at the following location:\n"
@@ -7082,116 +7095,116 @@ msgstr ""
 "Şu adreste posta kutusunu oluştur:\n"
 "(dizin adın veya dizinin tam yolunu giriniz)"
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/setup.c:234
+#: src/setup.c:240
 #, fuzzy
 msgid "Continue without creating mailbox?"
 msgstr "Posta kutusunu oluşturmadan devam edeyim mi?"
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr "Lütfen dizin adını veya tam dizin yolunu giriniz."
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 "Bu adres '%s' ayar dizinini içeriyor. Lütfen başka bir adres belirtiniz."
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Hesap ayarları"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Menü adı belirtilmedi."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 msgid "POP3 server:"
 msgstr "POP3 sunucusu:"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 msgid "IMAP4 server:"
 msgstr "IMAP4 sunucusu:"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 msgid "New account setup"
 msgstr "Yeni hesap ayarları"
 
-#: src/setup.c:720
+#: src/setup.c:726
 #, fuzzy
 msgid "This dialog will make initial setup of new mail account."
 msgstr "Bu diyalog posta hesabınızın başlangıç ayarlarını yapacaktır."
 
-#: src/setup.c:743
+#: src/setup.c:749
 msgid "Select account type:"
 msgstr "Hesap türünü seç:"
 
-#: src/setup.c:766
+#: src/setup.c:772
 msgid "Input your name and mail address:"
 msgstr "Adınızı ve posta adresinizi girin:"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Görüntülenecek isim:"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "İleti adresi"
 
-#: src/setup.c:795
+#: src/setup.c:801
 #, fuzzy
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr "Bu isim alıcıların tarafında görünecektir (örn: John Doe)"
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "Kullanıcı Adı:"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 msgid "SMTP server:"
 msgstr "SMTP sunucusu:"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 msgid "Use SSL"
 msgstr "SSL kullan"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "SMTP yetkilendirmesi kullan"
 
-#: src/setup.c:874
+#: src/setup.c:880
 #, fuzzy
 msgid "Your new mail account has been set up with the following settings."
 msgstr "Yeni posta hesabınız şu ayarlar ile oluşturuldu."
 
-#: src/setup.c:877
+#: src/setup.c:883
 #, fuzzy
 msgid ""
 "If you want to modify the settings, select\n"
@@ -7202,6 +7215,19 @@ msgstr ""
 "'Yapılandırma - Güncel hesap tercihleri' veya\n"
 "'Yapılandırma - Hesapları düzenle'yi seçiniz."
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "/_Dosya/Posta k_utusu dosyasını aktar..."
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "İmza kontrol sonuçları"
@@ -7542,222 +7568,222 @@ msgstr "Dizin taranıyor (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "IMAP4 oturumuna %s:%d ile bağlantı kurulamadı\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "Yeniden ara"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Başka okunmamış ileti yok"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Okunmamış ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Okunmamış ileti yok."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Okunamamış ileti yok. Diğer dizine geçilsin mi?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Başka ileti yok"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Yeni ileti yok. Sondan itibaren aransın mı?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Yeni ileti yok."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Yeni ileti yok. Sonraki dizine geçilsin mi?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Başka işaretlenmiş posta yok"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "İşaretlenmiş ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "İşaretlenmiş ileti yok."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "İşaretlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Başka etiketlenmiş ileti yok"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Başka etiketlenlenmiş ileti yok. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Başka etiketlenmiş ileti yok."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Etkiketlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Konularına göre postalar çekiliyor..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d silindi"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d taşındı"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopyalandı"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " öğe seçildi"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d yeni, %d okunmamış, toplam %d (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d yeni, %d okunmamış, toplam %d"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Özet sıralanıyor..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tİleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "İleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Taşınacak dizini seç"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Dizini seç"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
diff --git a/po/uk.po b/po/uk.po
index 23112163..059075cc 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -315,7 +315,7 @@ msgstr "папка призначення ідентична до вихідно
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копіюємо лист %s/%d в %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1226,15 +1226,15 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Примітка"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Помилка"
 
@@ -1277,7 +1277,7 @@ msgstr "Коричневий"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Ніякий"
 
@@ -1617,7 +1617,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
@@ -1808,7 +1808,7 @@ msgstr "тип MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Розмір"
 
@@ -2219,7 +2219,7 @@ msgstr "Експортувати"
 msgid "Specify source folder and destination file."
 msgstr "Визначте папку-джерело і файл призначення."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 msgid "File format:"
 msgstr "Формат файла:"
 
@@ -2231,7 +2231,7 @@ msgstr "Папка-джерело:"
 msgid "Destination:"
 msgstr "Призначення:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr "UNIX mbox"
 
@@ -2243,7 +2243,7 @@ msgstr "eml (номер + .eml)"
 msgid "MH (number only)"
 msgstr "MH (тільки номер)"
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " Обрати... "
@@ -2414,12 +2414,12 @@ msgstr "Встановлюємо інформацію папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
@@ -2595,7 +2595,7 @@ msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Без відправника)"
 
@@ -2607,60 +2607,73 @@ msgstr "Створюємо область перегляду зображенн�
 msgid "Can't load the image."
 msgstr "Не вдалось завантажити зображення."
 
-#: src/import.c:187
+#: src/import.c:200
 msgid "The source file does not exist."
 msgstr "Файл-джерело не існує."
 
-#: src/import.c:198
+#: src/import.c:211
 msgid "Can't find the destination folder."
 msgstr "Не вдалось знайти папку призначення."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, c-format
 msgid "Importing %s ..."
 msgstr "Імпортуємо %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 msgid "Importing"
 msgstr "Імпортуємо"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 msgid "Scanning folder..."
 msgstr "Перечитуємо папку ..."
 
-#: src/import.c:235
+#: src/import.c:252
 msgid "Error occurred on import."
 msgstr "Трапилась помилка при імпорті."
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Не вдалось створити папку `%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Імпортувати"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 msgid "Specify source file and destination folder."
 msgstr "Визначте файл-джерело і папку призначення."
 
-#: src/import.c:340
+#: src/import.c:619
 msgid "Source:"
 msgstr "Джерело:"
 
-#: src/import.c:345
+#: src/import.c:624
 msgid "Destination folder:"
 msgstr "Папка призначення:"
 
-#: src/import.c:358
+#: src/import.c:637
 msgid "eml (folder)"
 msgstr "eml (папка)"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Визначте папку-джерело з eml-файлами і папку призначення."
 
-#: src/import.c:437
+#: src/import.c:719
 msgid "Select importing folder"
 msgstr "Обрати імпортовану папку"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Обрати імпортований файл"
 
@@ -2835,124 +2848,124 @@ msgstr "Скасувати"
 msgid "Standby"
 msgstr "Очікування"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Скасовано"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Отримання"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d лист(ів) (%s) отримано"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, c-format
 msgid "no new messages"
 msgstr "немає нових листів"
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "Виконано"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Невдача з'єднання"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Невдача автентифікації"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Заблоковано"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Закінчено (%d нових листів)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Закінчено (немає нових листів)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "При отриманні пошти трапились деякі помилки."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "отримання нової пошти для запису %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Автентифікація з POP3"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Отримання нових листів"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "З'єднуємось з сервером POP3: %s ..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Автентифікація..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Отримуємо листи від %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Отримуємо кількість нових листів (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Отримуємо кількість нових листів (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Отримуємо кількість нових листів (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Отримуємо розмір листів (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Видаляємо лист %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Виходимо"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Отримуємо лист (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2960,15 +2973,15 @@ msgstr ""
 "Невдача виконання команди фільтрування мотлоху.\n"
 "Будь-ласка, перевірте налаштування."
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Невдача з'єднання."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2977,29 +2990,29 @@ msgstr ""
 "При обробці пошти трапилась помилка:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Немає вільного місця на диску."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Не вдалось писати в файл."
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Помилка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "З'єднання закрито віддаленим хостом."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Скриньку заблоковано."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3008,11 +3021,11 @@ msgstr ""
 "Скриньку заблоковано:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Невдача автентифікації."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3021,15 +3034,15 @@ msgstr ""
 "Невдача автентифікації:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Таймаут сесії."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Включення скасовано\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Отримуємо нові листи від %s в %s...\n"
@@ -3047,16 +3060,16 @@ msgstr "Введіть пароль"
 msgid "Protocol log"
 msgstr "Журнал протоколу"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Вживання: %s [ОПЦІЇ]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    відкрити вікно для нового листа"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3066,23 +3079,23 @@ msgstr ""
 "                         відкрити вікно створення з приєднанням вказаних\n"
 "                         файлів"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              отримати нові листи"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          отримати нові листи для всіх записів"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 відіслати всі відкладені листи"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   показати загальну кількість листів"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3090,45 +3103,45 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         показати стан кожної папки"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum відкрити лист у новому вікні"
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir ім'я папки     вказати папку для файлів налаштувань"
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portnum      вказати порт для віддалених команд IPC"
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 вийти з Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим відлагодження"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 показати цю довідку і вийти"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              видати інформацію про версію і вийти"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr "Натисніть яку-небудь кнопку..."
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Кодова таблиця для імен файлів"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3152,19 +3165,19 @@ msgstr ""
 "\n"
 "Продовжити?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Є незавершені листи. Справді вийти?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Листи в черзі"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Деякі невідіслані листи - в черзі. Вийти зараз?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3172,20 +3185,20 @@ msgstr ""
 "GnuPG не встановлено належно, або надто стара версія.\n"
 "Відключено підтримку OpenPGP."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr "Завантажуємо плагіни..."
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "вже запущено інший Sylpheed.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Перенесення налаштувань"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3834,8 +3847,8 @@ msgstr "Створюємо головне вікно...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "виконано.\n"
 
@@ -3882,11 +3895,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4110,7 +4123,7 @@ msgstr "Вкладення"
 msgid "Message View - Sylpheed"
 msgstr "Зміст листа - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
@@ -6192,19 +6205,19 @@ msgstr "Вкладення"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Дата"
 
@@ -6214,7 +6227,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 msgid "To"
 msgstr "Кому:"
 
@@ -6522,7 +6535,7 @@ msgstr "Шукаємо %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Шукаємо %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Без дати)"
 
@@ -6619,7 +6632,7 @@ msgstr "Про програму"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - віддалена POP3-скринька"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Номер"
 
@@ -6854,19 +6867,19 @@ msgstr "Не вдалось з'єднатись з сервером SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Не вдалось з'єднатись з сервером SMTP: %s:%d"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Налаштування скриньки"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr "Тут ми початково налаштуємо поштову скриньку."
 
-#: src/setup.c:173
+#: src/setup.c:179
 msgid "Create mailbox at the following default location:"
 msgstr "Створити поштову скриньку у стандартному місці:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
@@ -6874,7 +6887,7 @@ msgstr ""
 "Створити поштову скриньку у такому місці:\n"
 "(введіть назву папки чи повний шлях до неї)"
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
@@ -6882,101 +6895,101 @@ msgstr ""
 "Якщо ви забажаєте створити скриньку в іншому місці пізніше, оберіть 'Файл - "
 "Скринька - Додати скриньку...' в меню."
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr "Продовжити без створення скриньки?"
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr "Введіть, будь ласка, назву папки чи повний шлях до неї."
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Скринька '%s' вже існує."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 "Розташування '%s' включає папку налаштувань. Оберіть, будь ласка, інше місце."
 
-#: src/setup.c:467
+#: src/setup.c:473
 msgid "Cancel mail account setup?"
 msgstr "Скасувати налаштування облікового запису?"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 msgid "Input value is not valid."
 msgstr "Введено непридатне значення."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 msgid "POP3 server:"
 msgstr "Сервер POP3:"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 msgid "IMAP4 server:"
 msgstr "Сервер IMAP4:"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 msgid "New account setup"
 msgstr "Налаштування нового облікового запису"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr "Тут ми початково налаштуємо новий обліковий запис."
 
-#: src/setup.c:743
+#: src/setup.c:749
 msgid "Select account type:"
 msgstr "Оберіть тип облікового запису:"
 
-#: src/setup.c:766
+#: src/setup.c:772
 msgid "Input your name and mail address:"
 msgstr "Введіть ваше ім'я і адресу e-mail:"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 msgid "Display name:"
 msgstr "Ім'я для списку:"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 msgid "E-mail address:"
 msgstr "Адреса e-mail:"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr "Це ім'я (напр., Іван Петренко) бачитимуть отримувачі"
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr "Введіть ID користувача і поштовий сервер:"
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 msgid "User ID:"
 msgstr "ID (ім'я) користувача:"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 msgid "SMTP server:"
 msgstr "Сервер SMTP:"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 msgid "Use SSL"
 msgstr "Вживати SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 msgid "Use SMTP authentication"
 msgstr "Вживати автентифікацію SMTP"
 
-#: src/setup.c:874
+#: src/setup.c:880
 #, fuzzy
 msgid "Your new mail account has been set up with the following settings."
 msgstr "Ось налаштування нового облікового запису."
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
@@ -6986,6 +6999,19 @@ msgstr ""
 "'Конфігурація - Налаштування поточного запису' чи\n"
 "'Конфігурація - Редагувати облікові записи' у меню."
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Імпортуємо файл:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Результат перевірки підпису"
@@ -7312,219 +7338,219 @@ msgstr "Перечитуємо папку (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Не вдалось встановити з'єднання IMAP.\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "Шукати знову"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Більше немає непрочитаних листів"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Не знайдено непрочитаних листів. Шукати з кінця?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Немає непрочитаних листів"
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Не знайдено непрочитаних листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Більше немає нових листів"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Не знайдено нових листів. Шукати з кінця?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Немає нових листів"
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Не знайдено нових листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Більше немає позначених листів"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Не знайдено позначених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Немає позначених листів."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не знайдено позначених листів. Шукати з початку?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Більше немає виділених листів"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Не знайдено виділених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Немає виділених листів"
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не знайдено виділених листів. Шукати з початку?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Групування листів за темами..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d видалено"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d переміщено"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопійовано"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " записів обрано"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нових, %d непрочитаних, %d загалом (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нових, %d непрочитаних, %d загалом"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Сортуємо список..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tФормуємо список з даних листів..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Формуємо список з даних листів..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Пишемо кеш списка (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Лист %d позначено\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Лист %d позначено як прочитаний\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Лист %d позначено як непрочитаний\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Лист %s/%d призначено до видалення\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Видалити лист(и)"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Справді видалити лист(и) з кошика?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Видаляємо повторювані листи..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "З листа %s/%d знято позначки\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Лист %d призначено до переміщення в %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Призначення збігається з поточною папкою."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 msgid "Select folder to move"
 msgstr "Обрати папку для перенесення"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Лист %d призначено до копіювання в %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 msgid "Select folder to copy"
 msgstr "Обрати папку для копіювання"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтрування (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
@@ -7665,9 +7691,6 @@ msgstr "Не вдалось отримати інформацію про вер�
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread не підтримується glib.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Імпортуємо файл:"
-
 #~ msgid "eml (file)"
 #~ msgstr "eml (файл)"
 
diff --git a/po/vi.po b/po/vi.po
index 0215ae04..a9abd0ae 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -309,7 +309,7 @@ msgstr "thư mục nguồn cũng chính là thư mục gốc.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Đang chép thư %s%c%d tới %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1220,15 +1220,15 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "Chú ý"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "Lỗi"
 
@@ -1271,7 +1271,7 @@ msgstr "Nâu"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "Không"
 
@@ -1615,7 +1615,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
@@ -1807,7 +1807,7 @@ msgstr "Kiểu MIME"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "Kích thước"
 
@@ -2222,7 +2222,7 @@ msgstr "Xuất khẩu"
 msgid "Specify source folder and destination file."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "Định dạng thời gian"
@@ -2237,7 +2237,7 @@ msgstr "Thư mục nguồn:"
 msgid "Destination:"
 msgstr "Thư mục đến:"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2249,7 +2249,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "Chọn... "
@@ -2426,12 +2426,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:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, 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:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
@@ -2608,7 +2608,7 @@ msgid "Creating header view...\n"
 msgstr "Đang tạo khung xem header...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
 
@@ -2620,71 +2620,84 @@ msgstr "Đang tạo khung xem ảnh...\n"
 msgid "Can't load the image."
 msgstr "Không thể tải anh."
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Đang tìm %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "Nhập khẩu"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Đang quét thư mục %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Có lỗi khi gửi\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "Không tạo được thư mục `%s'."
+
+#: src/import.c:585
 msgid "Import"
 msgstr "Nhập khẩu"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "Thư mục nguồn:"
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Thư mục đến:"
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Thư mục mới"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Chọn tập tin nhập khẩu"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "Chọn tập tin nhập khẩu"
 
@@ -2868,139 +2881,139 @@ msgstr "Đã bị huỷ bỏ"
 msgid "Standby"
 msgstr "Đợi"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "Đã bị huỷ bỏ"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "Đang tải về"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "Xong (%d thư (%s) nhận được)"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "Không có thư mới."
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "Xong."
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "Kết nối thất bại"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "Xác thực thất bại"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "Đã khoá"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "Hết giờ"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hoàn tất (%d thư mới)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Hoàn tất (không có thư mới)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "Xảy ra một số lỗi khi nhận thư."
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "đang nhận thư mới của tài khoản %s...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Đang xác thực"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Đang nhận thư mới"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Đang kết nối tới máy chủ POP3: %s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy thủ POP3: %s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Đang lấy thư trên %s..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Đang xác định số lượng thư mới (STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Đang xác định số lượng thư mới (LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Đang xác định số lượng thư mới (UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "Đang xác định kích thước thư (LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "Đang xoá thư %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "Đang thoát"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Đang lấy thư (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "Kết nối thất bại."
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3009,29 +3022,29 @@ msgstr ""
 "Có lỗi khi xử lí thư:\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "Ổ cứng bị đầy."
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "Không thể ghi lên tập tin"
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Lỗi socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "Kết nối bị ngắt bởi máy từ xa."
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "Hộp thư bị khoá."
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3040,11 +3053,11 @@ msgstr ""
 "Hộp thư bị khoá:\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "Xác thực thất bại."
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3053,15 +3066,15 @@ msgstr ""
 "Xác thực thất bại:\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "Phiên làm việc hết giờ."
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "Sáp nhập bị huỷ bỏ\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Đang lấy thư từ %s vào %s...\n"
@@ -3079,16 +3092,16 @@ msgstr "Nhập mật khẩu"
 msgid "Protocol log"
 msgstr "Theo dõi giao thức"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Cách dùng: %s [TUỲ CHỌN]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [địa chỉ]    mở cửa sổ soạn thảo"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3098,23 +3111,23 @@ msgstr ""
 "                         mở cửa sổ soạn thảo với tập tin đính kèm\n"
 "                         đã chỉ định"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              nhận thư mới"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          nhận thư mới từ mọi tài khoản"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 gửi mọi thư đã xếp hàng"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [thư mục]...   hiện tổng số thư"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3122,45 +3135,45 @@ msgstr ""
 "  --status-full [thư mục]...\n"
 "                         hiện trạng thái của từng thư mục"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                đóng Sylpheed"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                chế độ gỡ lỗi"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 hiển thị phần giúp đỡ này và thoát"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              đưa ra thông tin phiên bản và thoát"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr ""
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "Mã của tên tập tin"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3184,19 +3197,19 @@ msgstr ""
 "\n"
 "Tiếp tục?"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "Đang viết thư. Bạn thực sự muốn thoát?"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "Các thư đang đợi gửi"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Một số thư chưa gửi đã được xếp hàng. Thoát bây giờ?"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3204,20 +3217,20 @@ msgstr ""
 "GnuPG không được cài đặt hoàn hảo, hoặc phiên bản quá cũ.\n"
 "Việc hỗ trợ OpenGPG bị cấm."
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "một tiến trình Sylpheed khác đang chạy.\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "Di trú cấu hình"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3880,8 +3893,8 @@ msgstr "Đang tạo cửa sổ chính...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "xong.\n"
 
@@ -3928,11 +3941,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "Hộp thư"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4158,7 +4171,7 @@ msgstr "Đính kèm"
 msgid "Message View - Sylpheed"
 msgstr "Khung xem thư - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
@@ -6267,19 +6280,19 @@ msgstr "Đính kèm"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "Thời gian"
 
@@ -6289,7 +6302,7 @@ msgid "Number"
 msgstr "Số"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "Người nhận:"
@@ -6612,7 +6625,7 @@ msgstr "Đang tìm %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Đang tìm %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
@@ -6715,7 +6728,7 @@ msgstr "Giới t_hiệu"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "Số "
 
@@ -6952,144 +6965,157 @@ msgstr "Không kết nối được với máy chủ NNTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Không kết nối được với máy chủ NNTP: %s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "Thiết lập hộp thư"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "Thực hiện các thao tác sau:"
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 #, fuzzy
 msgid "Cancel"
 msgstr "Đã bị huỷ bỏ"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "Thiết lập tài khoản"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "Chưa đặt tên trình đơn."
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "Máy chủ LDAP"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "Máy chủ LDAP"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "Thiết lập tài khoản"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "Xoá tài khoản"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "Chọn khoá theo địa chỉ thư của bạn"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "Tên hiển thị"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "Địa chỉ email"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "ID người dùng"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "Máy chủ SMTP (gửi)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "Xác thực"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "Tập tin được nhập:"
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Kết quả kiểm tra chữ kí"
@@ -7420,221 +7446,221 @@ msgstr "Đang quét thư mục (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "Không thể tạo phiên IMAP4 với: %s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "_Tìm lại"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "Không có thêm thư chưa đọc"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "Không thấy thư nào chưa đọc. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "Không có thư nào chưa đọc."
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Không thấy thư nào chưa đọc. Chuyển sang thư mục tiếp theo?"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "Không có thêm thư mới"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "Không có thư mới. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "Không có thư mới."
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Không thấy thư mới nào. Tìm trong thư mục tiếp theo?"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "Không có thêm thư được đánh dấu"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "Không có thư nào được dánh dấu."
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ đầu?"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "Không có thêm thư được đánh dấu nào"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "Không thấy nào được gán nhãn. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "Không có thư được gán nhãn."
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Không thấy thư nào được gán nhãn. Tìm từ đầu?"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "Tập trung thư theo tiêu đề..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "đã xoá %d"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "đã chuyển %s%d"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "đã chép %s%d"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " mục được chọn"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d mới, %d chưa đọc, %d tổng số (%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d mới, %d chưa đọc, %d tổng số"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "Đang sắp xếp bảng tóm tắt..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\tĐang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "Đang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Đang ghi bộ đệm cho phần tóm tắt (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bức thư %d đã được đánh dấu\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bức thư %d được đánh dấu là đã đọc\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bức thư %d được đánh dấu là chưa đọc\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bức thư %s/%d được chọn để xoá\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "Xoá thư"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Bạn có thực sự muốn xoá thư khỏi thùng rác?"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "Đang xoá thư trùng nhau..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Thư %s/%d được bỏ đánh đấu\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bức thư %d được chọn để chuyển tới %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại."
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Chọn thư mục"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bức thư %d được chọn để chép đến %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại"
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Chọn thư mục"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc (%d / %d)..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
@@ -7768,9 +7794,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "g_thread không được glib hỗ trợ.\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "Tập tin được nhập:"
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "Chọn tập tin"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 38453c6d..745dfb3f 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -314,7 +314,7 @@ msgstr "源文件夹与目的文件夹是同一个。\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1229,15 +1229,15 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "错误"
 
@@ -1280,7 +1280,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "没有"
 
@@ -1632,7 +1632,7 @@ msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -1823,7 +1823,7 @@ msgstr "MIME 类型"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "大小"
 
@@ -2240,7 +2240,7 @@ msgstr "导出"
 msgid "Specify source folder and destination file."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "日期格式"
@@ -2255,7 +2255,7 @@ msgstr "源目录："
 msgid "Destination:"
 msgstr "目标文件夹"
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2267,7 +2267,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr " 选择... "
@@ -2446,12 +2446,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -2628,7 +2628,7 @@ msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "(没有发件人)"
 
@@ -2640,71 +2640,84 @@ msgstr "正在创建图像视图...\n"
 msgid "Can't load the image."
 msgstr "无法加载该图像。"
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "导入"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "发表文章时发生错误\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "无法创建文件夹“%s”。"
+
+#: src/import.c:585
 msgid "Import"
 msgstr "导入"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "源目录："
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "目标目录："
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "新建文件夹"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "选择导入文件"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "选择导入文件"
 
@@ -2888,138 +2901,138 @@ msgstr "取消"
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "完成 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "没有新邮件"
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Done"
 msgstr "完成"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "锁住"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "超时"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3028,29 +3041,29 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3059,11 +3072,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3072,15 +3085,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3098,16 +3111,16 @@ msgstr "输入密码"
 msgid "Protocol log"
 msgstr "协议记录"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    打开撰写窗口"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3116,23 +3129,23 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开撰写窗口并添加指定的附件"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送队列中的邮件"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [文件夹]...   显示邮件总数"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3140,49 +3153,49 @@ msgstr ""
 "  --status-full [文件夹]...\n"
 "                         显示每个文件夹的状态"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示该帮助并退出"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              输出版本信息并退出"
 
-#: src/main.c:600
+#: src/main.c:605
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "或按下“y”键。\n"
 "\n"
 
-#: src/main.c:731
+#: src/main.c:736
 #, fuzzy
 msgid "Filename encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3196,19 +3209,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "正在撰写邮件。真的要退出吗？"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "队列中的邮件"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "一些未发送的信件被放入队列。现在退出吗？"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3216,20 +3229,20 @@ msgstr ""
 "没有正确安装 GnuPG，或者版本太老。\n"
 "已禁用 OpenPGP 支持。"
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3903,8 +3916,8 @@ msgstr "正在创建主窗口...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3952,11 +3965,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4158,7 +4171,7 @@ msgstr "附件"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
@@ -6305,19 +6318,19 @@ msgstr "附件"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "日期"
 
@@ -6327,7 +6340,7 @@ msgid "Number"
 msgstr "序号"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "收件人："
@@ -6652,7 +6665,7 @@ msgstr "正在过滤..."
 msgid "Searching %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(没有日期)"
 
@@ -6760,7 +6773,7 @@ msgstr "关于"
 msgid "%s - POP3 Remote mailbox"
 msgstr "删除邮箱"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "No."
 
@@ -6997,143 +7010,156 @@ msgstr "无法连接SMTP服务器：%s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "无法连接SMTP服务器：%s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "信箱设置"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "执行下列动作："
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 msgid "Cancel"
 msgstr "取消"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "帐号设置"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "没有设置菜单名。"
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP 服务器"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP 服务器"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "帐号设置"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "删除帐号"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "按照邮件地址选择密钥"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "显示姓名"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "电子邮件地址"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "用户名"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP服务器(发送)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "验证"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "导入文件："
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "签名检查结果"
@@ -7468,222 +7494,222 @@ msgstr "正在扫描文件夹 (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 #, fuzzy
 msgid "_Search again"
 msgstr "再次查找"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "没发现未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "没发现未读邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "没发现新邮件。从后面开始查找？"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "没发现新邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "没有标记过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有标记过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到用颜色标注过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "没有用颜色标注的邮件。"
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到用颜色标注过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "正在按标题归类邮件..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "删除了 %d 个邮件"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "移动了 %s%d"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "复制了 %s%d"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " 项被选中"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 个新邮件，%d 个未读邮件，共 %d 个邮件(%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "选择文件夹"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "选择文件夹"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
@@ -7834,9 +7860,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "glib 不支持 g_thread。\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "导入文件："
-
 #, fuzzy
 #~ msgid "Destination file:"
 #~ msgstr "目标目录："
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c5ed800b..06777668 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-30 15:06+0900\n"
+"POT-Creation-Date: 2010-08-09 16:25+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"
@@ -313,7 +313,7 @@ msgstr "來源與目的資料夾相同。\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "正在複製訊息 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:186
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:185
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1234,15 +1234,15 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:770
+#: src/alertpanel.c:142 src/compose.c:6729 src/main.c:775
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:893
+#: src/alertpanel.c:155 src/main.c:898
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:746
+#: src/alertpanel.c:168 src/inc.c:751
 msgid "Error"
 msgstr "錯誤"
 
@@ -1285,7 +1285,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5127
 msgid "None"
 msgstr "無"
 
@@ -1634,7 +1634,7 @@ msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
 #: src/compose.c:2864 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2411
+#: src/rpop3.c:667 src/summaryview.c:2416
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
@@ -1825,7 +1825,7 @@ msgstr "MIME 型態"
 #. S_COL_DATE
 #: src/compose.c:5305 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5266
+#: src/summaryview.c:5276
 msgid "Size"
 msgstr "大小"
 
@@ -2241,7 +2241,7 @@ msgstr "匯出郵件"
 msgid "Specify source folder and destination file."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/export.c:341 src/import.c:335
+#: src/export.c:341 src/import.c:614
 #, fuzzy
 msgid "File format:"
 msgstr "日期格式"
@@ -2256,7 +2256,7 @@ msgstr "來源資料夾："
 msgid "Destination:"
 msgstr "目標目錄："
 
-#: src/export.c:361 src/import.c:355
+#: src/export.c:361 src/import.c:634
 msgid "UNIX mbox"
 msgstr ""
 
@@ -2268,7 +2268,7 @@ msgstr ""
 msgid "MH (number only)"
 msgstr ""
 
-#: src/export.c:381 src/export.c:387 src/import.c:372 src/import.c:378
+#: src/export.c:381 src/export.c:387 src/import.c:654 src/import.c:660
 #: src/prefs_account_dialog.c:958
 msgid " Select... "
 msgstr "選擇..."
@@ -2446,12 +2446,12 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4148 src/setup.c:304
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4153 src/setup.c:309
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
@@ -2629,7 +2629,7 @@ msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2414
+#: src/summaryview.c:2419
 msgid "(No From)"
 msgstr "（沒有來源）"
 
@@ -2641,71 +2641,84 @@ msgstr "產生圖片的視窗...\n"
 msgid "Can't load the image."
 msgstr "無法載入圖片。"
 
-#: src/import.c:187
+#: src/import.c:200
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "檔案 %s 不存在\n"
 
-#: src/import.c:198
+#: src/import.c:211
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/import.c:203
+#: src/import.c:216 src/import.c:543
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/import.c:205
+#: src/import.c:218 src/import.c:501
 #, fuzzy
 msgid "Importing"
 msgstr "匯入"
 
-#: src/import.c:224
+#: src/import.c:241 src/import.c:548
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/import.c:235
+#: src/import.c:252
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "發表文章時發生錯誤\n"
 
-#: src/import.c:306
+#: src/import.c:502
+msgid "Importing Outlook Express folders"
+msgstr ""
+
+#: src/import.c:537
+#, fuzzy, c-format
+msgid "Cannot create the folder '%s'."
+msgstr "無法建立資料夾「%s」。"
+
+#: src/import.c:585
 msgid "Import"
 msgstr "匯入"
 
-#: src/import.c:325 src/import.c:410
+#: src/import.c:604 src/import.c:692
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/import.c:340
+#: src/import.c:619
 #, fuzzy
 msgid "Source:"
 msgstr "來源資料夾："
 
-#: src/import.c:345
+#: src/import.c:624
 #, fuzzy
 msgid "Destination folder:"
 msgstr "目標目錄："
 
-#: src/import.c:358
+#: src/import.c:637
 #, fuzzy
 msgid "eml (folder)"
 msgstr "新資料夾"
 
-#: src/import.c:407
+#: src/import.c:640
+msgid "Outlook Express (dbx)"
+msgstr ""
+
+#: src/import.c:689
 #, fuzzy
 msgid "Specify source folder including eml files and destination folder."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/import.c:437
+#: src/import.c:719
 #, fuzzy
 msgid "Select importing folder"
 msgstr "選擇匯入檔案"
 
-#: src/import.c:440
+#: src/import.c:722
 msgid "Select importing file"
 msgstr "選擇匯入檔案"
 
@@ -2889,139 +2902,139 @@ msgstr "取消"
 msgid "Standby"
 msgstr "等待處理中"
 
-#: src/inc.c:702 src/inc.c:752
+#: src/inc.c:707 src/inc.c:757
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:713
+#: src/inc.c:718
 msgid "Retrieving"
 msgstr "讀取中"
 
-#: src/inc.c:722 src/inc.c:1031
+#: src/inc.c:727 src/inc.c:1050
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "完成 （已接收 %d 封郵件 (%s)）"
 
-#: src/inc.c:726
+#: src/inc.c:731
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "沒有新郵件。"
 
-#: src/inc.c:727
+#: src/inc.c:732
 #, fuzzy
 msgid "Done"
 msgstr "完成"
 
-#: src/inc.c:732
+#: src/inc.c:737
 msgid "Connection failed"
 msgstr "連線失敗。"
 
-#: src/inc.c:735
+#: src/inc.c:740
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:739
+#: src/inc.c:744
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:749
+#: src/inc.c:754
 msgid "Timeout"
 msgstr "逾時"
 
-#: src/inc.c:796
+#: src/inc.c:801
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:799
+#: src/inc.c:804
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:808
+#: src/inc.c:813
 msgid "Some errors occurred while getting mail."
 msgstr "取得郵件時發生錯誤。"
 
-#: src/inc.c:842
+#: src/inc.c:847
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "取得 %s 的新郵件中, 請稍候...\n"
 
-#: src/inc.c:846
+#: src/inc.c:851
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "認證中..."
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 取得新郵件中, 請稍候..."
 
-#: src/inc.c:854
+#: src/inc.c:859
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:868
+#: src/inc.c:873
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:955 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:951
+#: src/inc.c:956
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:956
+#: src/inc.c:961
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:960
+#: src/inc.c:965
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:964
+#: src/inc.c:969
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:968
+#: src/inc.c:973
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:978
+#: src/inc.c:983
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:985 src/send_message.c:835
+#: src/inc.c:990 src/send_message.c:835
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:1010
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
+#: src/inc.c:1286 src/inc.c:1309 src/summaryview.c:4654
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1332
+#: src/inc.c:1368
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1338
+#: src/inc.c:1374
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1343
+#: src/inc.c:1379
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3030,40 +3043,40 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1349
+#: src/inc.c:1385
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1354
+#: src/inc.c:1390
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1359
+#: src/inc.c:1395
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1401 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1371
+#: src/inc.c:1407
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次擷取未完成。"
 
-#: src/inc.c:1375
+#: src/inc.c:1411
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1417 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1422 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3072,15 +3085,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1427 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1432
+#: src/inc.c:1468
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1541
+#: src/inc.c:1577
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
@@ -3098,16 +3111,16 @@ msgstr "輸入密碼"
 msgid "Protocol log"
 msgstr "通訊協定紀錄"
 
-#: src/main.c:575
+#: src/main.c:580
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [選項]...\n"
 
-#: src/main.c:578
+#: src/main.c:583
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [郵件地址]   直接開啟撰寫郵件視窗"
 
-#: src/main.c:579
+#: src/main.c:584
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3116,68 +3129,68 @@ msgstr ""
 "  --attach 檔案1 [檔案2]...\n"
 "                         開啟撰寫郵件視窗，並將指定的檔案附加上去"
 
-#: src/main.c:582
+#: src/main.c:587
 msgid "  --receive              receive new messages"
 msgstr "  --receive              直接接收新郵件"
 
-#: src/main.c:583
+#: src/main.c:588
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          直接接收所有帳號的新郵件"
 
-#: src/main.c:584
+#: src/main.c:589
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送出所有暫存資料夾中的郵件"
 
-#: src/main.c:585
+#: src/main.c:590
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [資料夾]...   顯示資料夾內總共有多少郵件"
 
-#: src/main.c:586
+#: src/main.c:591
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [資料夾]...     顯示每個資料夾中有多少郵件"
 
-#: src/main.c:588
+#: src/main.c:593
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:589
+#: src/main.c:594
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:591
+#: src/main.c:596
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:593
+#: src/main.c:598
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:594
+#: src/main.c:599
 msgid "  --debug                debug mode"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:595
+#: src/main.c:600
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 顯示本說明並離開"
 
-#: src/main.c:596
+#: src/main.c:601
 msgid "  --version              output version information and exit"
 msgstr "  --version              顯示版本資訊"
 
-#: src/main.c:600
+#: src/main.c:605
 #, c-format
 msgid "Press any key..."
 msgstr ""
 
-#: src/main.c:731
+#: src/main.c:736
 msgid "Filename encoding"
 msgstr "檔案名稱編碼"
 
-#: src/main.c:732
+#: src/main.c:737
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3198,19 +3211,19 @@ msgstr ""
 "\n"
 "要繼續嗎？"
 
-#: src/main.c:771
+#: src/main.c:776
 msgid "Composing message exists. Really quit?"
 msgstr "有郵件正在編輯。確定要離開嗎？"
 
-#: src/main.c:782
+#: src/main.c:787
 msgid "Queued messages"
 msgstr "有未送出郵件"
 
-#: src/main.c:783
+#: src/main.c:788
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "有些郵件正在暫存資料夾中尚未送出。確定要離開嗎？"
 
-#: src/main.c:894
+#: src/main.c:899
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3218,20 +3231,20 @@ msgstr ""
 "GnuPG 並未安裝好，或版本過舊。\n"
 "關閉 OpenPGP 支援項目。"
 
-#: src/main.c:1127
+#: src/main.c:1132
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1298
+#: src/main.c:1315
 msgid "another Sylpheed is already running.\n"
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/main.c:1580
+#: src/main.c:1597
 msgid "Migration of configuration"
 msgstr "設定資料轉移"
 
-#: src/main.c:1581
+#: src/main.c:1598
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3898,8 +3911,8 @@ msgstr "建立主視窗...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
-#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
+#: src/mainwindow.c:1211 src/summaryview.c:2568 src/summaryview.c:2655
+#: src/summaryview.c:4219 src/summaryview.c:4348 src/summaryview.c:4736
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3946,11 +3959,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/mainwindow.c:1815 src/setup.c:272
+#: src/mainwindow.c:1815 src/setup.c:278
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1821 src/setup.c:278
+#: src/mainwindow.c:1821 src/setup.c:284
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4152,7 +4165,7 @@ msgstr "附加檔"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3767
+#: src/messageview.c:765 src/summaryview.c:3777
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
@@ -6272,19 +6285,19 @@ msgstr "附加檔案"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5259
+#: src/summaryview.c:5269
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5262
+#: src/summaryview.c:5272
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5264
+#: src/summaryview.c:5274
 msgid "Date"
 msgstr "日期"
 
@@ -6294,7 +6307,7 @@ msgid "Number"
 msgstr "編號"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5270
+#: src/prefs_summary_column.c:74 src/summaryview.c:5280
 #, fuzzy
 msgid "To"
 msgstr "收件人"
@@ -6619,7 +6632,7 @@ msgstr "過濾中..."
 msgid "Searching %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2340
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
@@ -6727,7 +6740,7 @@ msgstr "關於"
 msgid "%s - POP3 Remote mailbox"
 msgstr "移除信箱"
 
-#: src/rpop3.c:414 src/summaryview.c:5268
+#: src/rpop3.c:414 src/summaryview.c:5278
 msgid "No."
 msgstr "No."
 
@@ -6964,144 +6977,157 @@ msgstr "無法連線到新聞伺服器：%s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "無法連線到新聞伺服器：%s:%d\n"
 
-#: src/setup.c:116 src/setup.c:140
+#: src/setup.c:122 src/setup.c:146
 msgid "Mailbox setting"
 msgstr "信箱設定"
 
-#: src/setup.c:159
+#: src/setup.c:165
 msgid "This dialog will make initial setup of mailbox."
 msgstr ""
 
-#: src/setup.c:173
+#: src/setup.c:179
 #, fuzzy
 msgid "Create mailbox at the following default location:"
 msgstr "執行下列動作："
 
-#: src/setup.c:193
+#: src/setup.c:199
 msgid ""
 "Create mailbox at the following location:\n"
 "(enter folder name or full folder path)"
 msgstr ""
 
-#: src/setup.c:211
+#: src/setup.c:217
 msgid ""
 "If you want to add a mailbox at another location afterward, please select "
 "'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
-#: src/setup.c:234 src/setup.c:467
+#: src/setup.c:240 src/setup.c:473
 #, fuzzy
 msgid "Cancel"
 msgstr "取消"
 
-#: src/setup.c:234
+#: src/setup.c:240
 msgid "Continue without creating mailbox?"
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:250
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:253
+#: src/setup.c:259
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/setup.c:259
+#: src/setup.c:265
 #, c-format
 msgid ""
 "The location '%s' includes settings folder. Please specify another location."
 msgstr ""
 
-#: src/setup.c:467
+#: src/setup.c:473
 #, fuzzy
 msgid "Cancel mail account setup?"
 msgstr "帳號設定"
 
-#: src/setup.c:487 src/setup.c:495
+#: src/setup.c:493 src/setup.c:501
 #, fuzzy
 msgid "Input value is not valid."
 msgstr "指令目錄名稱未設定"
 
-#: src/setup.c:525 src/setup.c:540 src/setup.c:576 src/setup.c:598
-#: src/setup.c:819 src/setup.c:901
+#: src/setup.c:531 src/setup.c:546 src/setup.c:582 src/setup.c:604
+#: src/setup.c:825 src/setup.c:907
 #, fuzzy
 msgid "POP3 server:"
 msgstr "LDAP 伺服器"
 
-#: src/setup.c:531 src/setup.c:550 src/setup.c:589 src/setup.c:606
+#: src/setup.c:537 src/setup.c:556 src/setup.c:595 src/setup.c:612
 #, fuzzy
 msgid "IMAP4 server:"
 msgstr "LDAP 伺服器"
 
-#: src/setup.c:665 src/setup.c:701
+#: src/setup.c:671 src/setup.c:707
 #, fuzzy
 msgid "New account setup"
 msgstr "帳號設定"
 
-#: src/setup.c:720
+#: src/setup.c:726
 msgid "This dialog will make initial setup of new mail account."
 msgstr ""
 
-#: src/setup.c:743
+#: src/setup.c:749
 #, fuzzy
 msgid "Select account type:"
 msgstr "刪除帳號"
 
-#: src/setup.c:766
+#: src/setup.c:772
 #, fuzzy
 msgid "Input your name and mail address:"
 msgstr "根據你的電子郵件地址選擇金鑰"
 
-#: src/setup.c:775 src/setup.c:889
+#: src/setup.c:781 src/setup.c:895
 #, fuzzy
 msgid "Display name:"
 msgstr "顯示名稱"
 
-#: src/setup.c:779 src/setup.c:893
+#: src/setup.c:785 src/setup.c:899
 #, fuzzy
 msgid "E-mail address:"
 msgstr "E-Mail 地址"
 
-#: src/setup.c:795
+#: src/setup.c:801
 msgid "This name will be seen at the side of recipients (e.g. John Doe)"
 msgstr ""
 
-#: src/setup.c:806
+#: src/setup.c:812
 msgid "Input user ID and mail server:"
 msgstr ""
 
-#: src/setup.c:815 src/setup.c:897
+#: src/setup.c:821 src/setup.c:903
 #, fuzzy
 msgid "User ID:"
 msgstr "帳號"
 
-#: src/setup.c:824 src/setup.c:905
+#: src/setup.c:830 src/setup.c:911
 #, fuzzy
 msgid "SMTP server:"
 msgstr "SMTP 郵件伺服器 (發信)"
 
-#: src/setup.c:849 src/setup.c:861
+#: src/setup.c:855 src/setup.c:867
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
 
-#: src/setup.c:857
+#: src/setup.c:863
 #, fuzzy
 msgid "Use SMTP authentication"
 msgstr "認證"
 
-#: src/setup.c:874
+#: src/setup.c:880
 msgid "Your new mail account has been set up with the following settings."
 msgstr ""
 
-#: src/setup.c:877
+#: src/setup.c:883
 msgid ""
 "If you want to modify the settings, select\n"
 "'Configuration - Preferences for current account' or\n"
 "'Configuration - Edit accounts' in the main menu."
 msgstr ""
 
+#: src/setup.c:1134
+#, fuzzy
+msgid "Importing mail data"
+msgstr "匯入檔案："
+
+#: src/setup.c:1134
+msgid ""
+"The mail store of Outlook Express was found. Do you want to import the mail "
+"data of Outlook Express?\n"
+"\n"
+"(The folder structure will not be reproduced)"
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "將數位簽章檢查結果"
@@ -7434,221 +7460,221 @@ msgstr "掃描資料夾 (%s)..."
 msgid "Could not establish a connection to the server."
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1534
 msgid "_Search again"
 msgstr "再次搜尋(_S)"
 
-#: src/summaryview.c:1551 src/summaryview.c:1560
+#: src/summaryview.c:1556 src/summaryview.c:1565
 msgid "No more unread messages"
 msgstr "沒有其他未讀郵件"
 
-#: src/summaryview.c:1552
+#: src/summaryview.c:1557
 msgid "No unread message found. Search from the end?"
 msgstr "沒有找到未讀郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1554
+#: src/summaryview.c:1559
 msgid "No unread messages."
 msgstr "沒有未讀郵件。"
 
-#: src/summaryview.c:1561
+#: src/summaryview.c:1566
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "沒有未讀郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1569 src/summaryview.c:1578
+#: src/summaryview.c:1574 src/summaryview.c:1583
 msgid "No more new messages"
 msgstr "沒有其他新郵件"
 
-#: src/summaryview.c:1570
+#: src/summaryview.c:1575
 msgid "No new message found. Search from the end?"
 msgstr "沒有找到新郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1572
+#: src/summaryview.c:1577
 msgid "No new messages."
 msgstr "沒有新郵件。"
 
-#: src/summaryview.c:1579
+#: src/summaryview.c:1584
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "沒有新郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1587 src/summaryview.c:1596
+#: src/summaryview.c:1592 src/summaryview.c:1601
 msgid "No more marked messages"
 msgstr "沒有其他已標記郵件"
 
-#: src/summaryview.c:1588
+#: src/summaryview.c:1593
 msgid "No marked message found. Search from the end?"
 msgstr "沒有找到已標記郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1590 src/summaryview.c:1599
+#: src/summaryview.c:1595 src/summaryview.c:1604
 msgid "No marked messages."
 msgstr "沒有已標記郵件。"
 
-#: src/summaryview.c:1597
+#: src/summaryview.c:1602
 msgid "No marked message found. Search from the beginning?"
 msgstr "沒有找到已標記郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1605 src/summaryview.c:1614
+#: src/summaryview.c:1610 src/summaryview.c:1619
 msgid "No more labeled messages"
 msgstr "沒有已標記顏色之郵件"
 
-#: src/summaryview.c:1606
+#: src/summaryview.c:1611
 msgid "No labeled message found. Search from the end?"
 msgstr "沒有找到已標記顏色之郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1608 src/summaryview.c:1617
+#: src/summaryview.c:1613 src/summaryview.c:1622
 msgid "No labeled messages."
 msgstr "沒有已標記顏色之郵件。"
 
-#: src/summaryview.c:1615
+#: src/summaryview.c:1620
 msgid "No labeled message found. Search from the beginning?"
 msgstr "沒有找到已標記顏色之郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1967
 msgid "Attracting messages by subject..."
 msgstr "依主旨展開郵件中..."
 
-#: src/summaryview.c:2156
+#: src/summaryview.c:2161
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:2160
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:2161 src/summaryview.c:2166
+#: src/summaryview.c:2166 src/summaryview.c:2171
 msgid ", "
 msgstr "， "
 
-#: src/summaryview.c:2165
+#: src/summaryview.c:2170
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:2180
+#: src/summaryview.c:2185
 msgid " item(s) selected"
 msgstr " 封已選擇"
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2207
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封(%s)"
 
-#: src/summaryview.c:2206
+#: src/summaryview.c:2211
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封"
 
-#: src/summaryview.c:2242
+#: src/summaryview.c:2247
 msgid "Sorting summary..."
 msgstr "郵件排序中..."
 
-#: src/summaryview.c:2498
+#: src/summaryview.c:2503
 msgid "\tSetting summary from message data..."
 msgstr "\t產生郵件列表中..."
 
-#: src/summaryview.c:2500
+#: src/summaryview.c:2505
 msgid "Setting summary from message data..."
 msgstr "產生郵件列表中..."
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2612
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2942
+#: src/summaryview.c:2947
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:3014
+#: src/summaryview.c:3019
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:3227
+#: src/summaryview.c:3232
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:3292
+#: src/summaryview.c:3297
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:3320
+#: src/summaryview.c:3325
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:3321
+#: src/summaryview.c:3326
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:3397
+#: src/summaryview.c:3402
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:3435
+#: src/summaryview.c:3440
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:3499
+#: src/summaryview.c:3504
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:3531
+#: src/summaryview.c:3536
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:3568
+#: src/summaryview.c:3573
 #, fuzzy
 msgid "Select folder to move"
 msgstr "選擇資料夾"
 
-#: src/summaryview.c:3598
+#: src/summaryview.c:3603
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3629
+#: src/summaryview.c:3634
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3665
+#: src/summaryview.c:3670
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "選擇資料夾"
 
-#: src/summaryview.c:3810
+#: src/summaryview.c:3820
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:4116 src/summaryview.c:4117
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:4267 src/summaryview.c:4268
+#: src/summaryview.c:4277 src/summaryview.c:4278
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4561 src/summaryview.c:4622
+#: src/summaryview.c:4571 src/summaryview.c:4632
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4687
+#: src/summaryview.c:4697
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4688
+#: src/summaryview.c:4698
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4733
+#: src/summaryview.c:4743
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
@@ -7792,9 +7818,6 @@ msgstr ""
 #~ msgid "g_thread is not supported by glib.\n"
 #~ msgstr "glib 不支援 g_thread。\n"
 
-#~ msgid "Importing file:"
-#~ msgstr "匯入檔案："
-
 #, fuzzy
 #~ msgid "eml (file)"
 #~ msgstr "選擇檔案"