[balsa] Updated Serbian translation



commit 72181f66842a82eb565efa58faabdb92c55096e5
Author: Мирослав Николић <miroslavnikolic rocketmail com>
Date:   Mon Dec 28 11:12:07 2015 +0100

    Updated Serbian translation

 po/sr.po       | 3504 ++++++++++++++++++++++++++------------------------------
 po/sr latin po | 3504 ++++++++++++++++++++++++++------------------------------
 2 files changed, 3294 insertions(+), 3714 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 906cc1e..abcf76c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the balsa package.
 # Maintainer: Данило Шеган <dsegan gmx net>
 # Милош Поповић <gpopac gmail com>, 2012.
-# Мирослав Николић <miroslavnikolic rocketmail com>, 2012.
+# Мирослав Николић <miroslavnikolic rocketmail com>, 2012—2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=balsa&";
-"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-18 01:07+0000\n"
-"PO-Revision-Date: 2012-12-06 10:28+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=balsa&k";
+"eywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-03-01 20:55+0000\n"
+"PO-Revision-Date: 2015-12-28 11:05+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -37,266 +37,266 @@ msgstr "Програм за ел. пошту"
 msgid "Balsa Mail Client"
 msgstr "Сандуче ел. поште Балза"
 
-#: ../libbalsa/address-book.c:314 ../libbalsa/filter-error.c:47
+#: ../libbalsa/address-book.c:312 ../libbalsa/filter-error.c:45
 msgid "No error"
 msgstr "Нема грешке"
 
-#: ../libbalsa/address-book.c:315
+#: ../libbalsa/address-book.c:313
 msgid "Cannot read from address book"
 msgstr "Не могу да читам из адресара"
 
-#: ../libbalsa/address-book.c:316
+#: ../libbalsa/address-book.c:314
 msgid "Cannot write to address book"
 msgstr "Не могу да пишем у адресар"
 
-#: ../libbalsa/address-book.c:317
+#: ../libbalsa/address-book.c:315
 msgid "Cannot connect to the server"
 msgstr "Не могу да се повежем са сервером"
 
-#: ../libbalsa/address-book.c:318
+#: ../libbalsa/address-book.c:316
 msgid "Cannot search in the address book"
 msgstr "Не могу да претражујем адресар"
 
-#: ../libbalsa/address-book.c:320
+#: ../libbalsa/address-book.c:318
 msgid "Cannot add duplicate entry"
 msgstr "Не могу да додам исти унос два пута"
 
-#: ../libbalsa/address-book.c:322
+#: ../libbalsa/address-book.c:320
 msgid "Cannot find address in address book"
 msgstr "Не могу да нађем адресу у адресару"
 
-#: ../libbalsa/address-book.c:323 ../src/main-window.c:2389
-#: ../src/main-window.c:4839 ../src/sendmsg-window.c:4192
+#: ../libbalsa/address-book.c:321 ../src/main-window.c:2387
+#: ../src/main-window.c:4837 ../src/sendmsg-window.c:4201
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
 #. The externq database doesn't support Id's, sorry!
-#: ../libbalsa/address-book-extern.c:210 ../libbalsa/address-book-ldap.c:495
-#: ../libbalsa/address-book-ldif.c:332
+#: ../libbalsa/address-book-extern.c:208 ../libbalsa/address-book-ldap.c:493
+#: ../libbalsa/address-book-ldif.c:330
 msgid "No-Id"
 msgstr "Без-ИБ"
 
-#: ../libbalsa/address-book-extern.c:215 ../libbalsa/address-book-extern.c:370
-#: ../libbalsa/address-book-ldap.c:501 ../libbalsa/address-book-ldif.c:311
-#: ../libbalsa/address-book-ldif.c:335 ../libbalsa/address-book-ldif.c:354
-#: ../libbalsa/address-book-ldif.c:358 ../libbalsa/address-book-vcard.c:160
-#: ../libbalsa/address-book-vcard.c:258 ../libbalsa/address.c:403
+#: ../libbalsa/address-book-extern.c:213 ../libbalsa/address-book-extern.c:368
+#: ../libbalsa/address-book-ldap.c:499 ../libbalsa/address-book-ldif.c:309
+#: ../libbalsa/address-book-ldif.c:333 ../libbalsa/address-book-ldif.c:352
+#: ../libbalsa/address-book-ldif.c:356 ../libbalsa/address-book-vcard.c:158
+#: ../libbalsa/address-book-vcard.c:256 ../libbalsa/address.c:401
 msgid "No-Name"
 msgstr "Без-имена"
 
-#: ../libbalsa/address-book-ldap.c:283
+#: ../libbalsa/address-book-ldap.c:281
 msgid "SASL Interaction\n"
 msgstr "САСЛ међудејство\n"
 
-#: ../libbalsa/address-book-ldap.c:330
+#: ../libbalsa/address-book-ldap.c:328
 msgid "TLS requested but not compiled in"
 msgstr "Тражен је ТЛС али није уграђен"
 
-#: ../libbalsa/address-book-ldap.c:610
+#: ../libbalsa/address-book-ldap.c:608
 msgid "Undefined location of user address book"
 msgstr "Није одређена путања до вашег адресара"
 
-#: ../libbalsa/address.c:955
+#: ../libbalsa/address.c:953
 msgid "D_isplayed Name:"
 msgstr "Приказано _име:"
 
-#: ../libbalsa/address.c:956
+#: ../libbalsa/address.c:954
 msgid "_First Name:"
 msgstr "_Име:"
 
-#: ../libbalsa/address.c:957
+#: ../libbalsa/address.c:955
 msgid "_Last Name:"
 msgstr "_Презиме:"
 
-#: ../libbalsa/address.c:958
+#: ../libbalsa/address.c:956
 msgid "_Nickname:"
 msgstr "_Надимак:"
 
-#: ../libbalsa/address.c:959
+#: ../libbalsa/address.c:957
 msgid "O_rganization:"
 msgstr "О_рганизација:"
 
-#: ../libbalsa/address.c:960
+#: ../libbalsa/address.c:958
 msgid "_Email Address:"
 msgstr "Адреса _ел. поште:"
 
 #. Right/Add button
-#: ../libbalsa/address.c:979 ../src/filter-edit-callbacks.c:1088
-#: ../src/filter-run-dialog.c:329
+#: ../libbalsa/address.c:977 ../src/filter-edit-callbacks.c:1086
+#: ../src/filter-run-dialog.c:327
 msgid "A_dd"
 msgstr "_Додај"
 
-#: ../libbalsa/address-view.c:129 ../src/balsa-mime-widget-message.c:738
-#: ../src/balsa-print-object-header.c:170 ../src/sendmsg-window.c:1113
-#: ../src/sendmsg-window.c:3855 ../src/store-address.c:341
+#: ../libbalsa/address-view.c:127 ../src/balsa-mime-widget-message.c:747
+#: ../src/balsa-print-object-header.c:168 ../src/sendmsg-window.c:1121
+#: ../src/sendmsg-window.c:3864 ../src/store-address.c:339
 msgid "To:"
 msgstr "Прима:"
 
-#: ../libbalsa/address-view.c:130 ../src/balsa-mime-widget-message.c:739
-#: ../src/balsa-print-object-header.c:172 ../src/sendmsg-window.c:1113
-#: ../src/sendmsg-window.c:3863 ../src/store-address.c:342
+#: ../libbalsa/address-view.c:128 ../src/balsa-mime-widget-message.c:748
+#: ../src/balsa-print-object-header.c:170 ../src/sendmsg-window.c:1121
+#: ../src/sendmsg-window.c:3872 ../src/store-address.c:340
 msgid "Cc:"
 msgstr "Копија:"
 
-#: ../libbalsa/address-view.c:131 ../src/balsa-mime-widget-message.c:740
-#: ../src/balsa-print-object-header.c:174 ../src/sendmsg-window.c:1113
-#: ../src/store-address.c:343
+#: ../libbalsa/address-view.c:129 ../src/balsa-mime-widget-message.c:749
+#: ../src/balsa-print-object-header.c:172 ../src/sendmsg-window.c:1121
+#: ../src/store-address.c:341
 msgid "Bcc:"
 msgstr "Невидљива копија:"
 
-#: ../libbalsa/address-view.c:133
+#: ../libbalsa/address-view.c:131
 msgid "Reply To:"
 msgstr "Одговори:"
 
-#: ../libbalsa/body.c:123 ../libbalsa/mailbox_local.c:1762
-#: ../libbalsa/message.c:845
+#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1760
+#: ../libbalsa/message.c:843
 msgid "(No subject)"
 msgstr "(без наслова)"
 
-#: ../libbalsa/body.c:352 ../libbalsa/body.c:399
+#: ../libbalsa/body.c:388 ../libbalsa/body.c:435
 #, c-format
 msgid "Failed to create output stream"
 msgstr "Не могу да изградим излазни ток"
 
-#: ../libbalsa/body.c:543
+#: ../libbalsa/body.c:579
 #, c-format
 msgid "Could not read embedded message"
 msgstr "Не могу да прочитам уграђену поруку"
 
-#: ../libbalsa/filter.c:129 ../libbalsa/mailbox_local.c:842
+#: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:840
 msgid "Unable to load message body to match filter"
 msgstr "Не могу да учитам тело поруке које одговара пропуснику"
 
-#: ../libbalsa/filter.c:236
+#: ../libbalsa/filter.c:234
 #, c-format
 msgid "Invalid filter: %s"
 msgstr "Неисправан пропусник: %s"
 
-#: ../libbalsa/filter.c:284 ../libbalsa/filter.c:307
+#: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
 #, c-format
 msgid "Bad mailbox name for filter: %s"
 msgstr "Лош назив сандучета за пропусник: %s"
 
-#: ../libbalsa/filter.c:288
+#: ../libbalsa/filter.c:286
 #, c-format
 msgid "Error when copying messages: %s"
 msgstr "Грешка при умножавању порука: %s"
 
-#: ../libbalsa/filter.c:298
+#: ../libbalsa/filter.c:296
 #, c-format
 msgid "Error when trashing messages: %s"
 msgstr "Грешка при премештању порука у смеће: %s"
 
-#: ../libbalsa/filter.c:311
+#: ../libbalsa/filter.c:309
 #, c-format
 msgid "Error when moving messages: %s"
 msgstr "Грешка при премештању порука: %s"
 
-#: ../libbalsa/filter-error.c:48
+#: ../libbalsa/filter-error.c:46
 msgid "Syntax error in the filter configuration file"
 msgstr "Грешка синтаксе у датотеци подешавања пропусника"
 
-#: ../libbalsa/filter-error.c:49
+#: ../libbalsa/filter-error.c:47
 msgid "Unable to allocate memory"
 msgstr "Не могу да доделим меморију"
 
-#: ../libbalsa/filter-error.c:50
+#: ../libbalsa/filter-error.c:48
 msgid "Error in regular expression syntax"
 msgstr "Грешка у синтакси регуларног израза"
 
-#: ../libbalsa/filter-error.c:51
+#: ../libbalsa/filter-error.c:49
 msgid "Attempt to apply an invalid filter"
 msgstr "Покушавам да применим неисправан пропусник"
 
-#: ../libbalsa/filter-file.c:141
+#: ../libbalsa/filter-file.c:137
 #, c-format
 msgid "Invalid filters %s for mailbox %s"
 msgstr "Неисправни пропусники %s за сандуче %s"
 
 #. FIXME: this is hack!
-#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:1055
+#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:1053
 msgid "To"
 msgstr "Прима"
 
-#: ../libbalsa/filter-funcs.c:384 ../src/balsa-index.c:359
+#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:357
 msgid "From"
 msgstr "Шаље"
 
-#: ../libbalsa/filter-funcs.c:385 ../src/balsa-index.c:375
-#: ../src/pref-manager.c:418
+#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:373
+#: ../src/pref-manager.c:416
 msgid "Subject"
 msgstr "Тема"
 
-#: ../libbalsa/filter-funcs.c:386
+#: ../libbalsa/filter-funcs.c:384
 msgid "Cc"
 msgstr "Копија"
 
-#: ../libbalsa/filter-funcs.c:387
+#: ../libbalsa/filter-funcs.c:385
 msgid "Body"
 msgstr "Тело"
 
-#: ../libbalsa/filter-funcs.c:392
+#: ../libbalsa/filter-funcs.c:390
 #, c-format
 msgid "Header:%s"
 msgstr "Заглавље:%s"
 
-#: ../libbalsa/filter-funcs.c:398 ../libbalsa/filter-funcs.c:426
+#: ../libbalsa/filter-funcs.c:396 ../libbalsa/filter-funcs.c:424
 #, c-format
 msgid ",%s"
 msgstr ",%s"
 
-#: ../libbalsa/filter-funcs.c:414
+#: ../libbalsa/filter-funcs.c:412
 msgid "New"
 msgstr "Ново"
 
-#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:1011
+#: ../libbalsa/filter-funcs.c:413 ../src/filter-edit-callbacks.c:1009
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: ../libbalsa/filter-funcs.c:416 ../src/filter-edit-callbacks.c:1011
+#: ../libbalsa/filter-funcs.c:414 ../src/filter-edit-callbacks.c:1009
 msgid "Replied"
 msgstr "Одговорено"
 
-#: ../libbalsa/filter-funcs.c:417 ../src/filter-edit-callbacks.c:1011
+#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:1009
 msgid "Flagged"
 msgstr "Означено"
 
-#: ../libbalsa/filter-funcs.c:441
+#: ../libbalsa/filter-funcs.c:439
 msgid "Not "
 msgstr "Није "
 
-#: ../libbalsa/filter-funcs.c:457
+#: ../libbalsa/filter-funcs.c:455
 msgid "From %Y-%m-%d"
 msgstr "Од %d.%m.%Y"
 
-#: ../libbalsa/filter-funcs.c:463
+#: ../libbalsa/filter-funcs.c:461
 msgid "To %Y-%m-%d"
 msgstr "До %d.%m.%Y"
 
-#: ../libbalsa/filter-funcs.c:471
+#: ../libbalsa/filter-funcs.c:469
 msgid "And"
 msgstr "И"
 
-#: ../libbalsa/filter-funcs.c:474
+#: ../libbalsa/filter-funcs.c:472
 msgid "Or"
 msgstr "Или"
 
-#: ../libbalsa/gmime-application-pkcs7.c:125
+#: ../libbalsa/gmime-application-pkcs7.c:123
 #, c-format
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Не могу да дешифрујем МИМЕ део: грешка у обради"
 
-#: ../libbalsa/gmime-multipart-crypt.c:225
+#: ../libbalsa/gmime-multipart-crypt.c:223
 msgid "Cannot verify multipart/signed part due to missing subparts."
 msgstr ""
 "Не могу да проверим вишеделни/потписани део јер неки подделови недостају."
 
-#: ../libbalsa/gmime-multipart-crypt.c:251
+#: ../libbalsa/gmime-multipart-crypt.c:249
 #, c-format
 msgid "unsupported protocol '%s'"
 msgstr "неподржан протокол „%s“"
 
-#: ../libbalsa/gmime-multipart-crypt.c:264
+#: ../libbalsa/gmime-multipart-crypt.c:262
 msgid ""
 "Cannot verify multipart/signed part: signature content-type does not match "
 "protocol."
@@ -304,7 +304,7 @@ msgstr ""
 "Не могу да проверим вишеделни/потписани део: врста садржаја потписа се не "
 "подудара са протоколом."
 
-#: ../libbalsa/gmime-multipart-crypt.c:487
+#: ../libbalsa/gmime-multipart-crypt.c:485
 #, c-format
 msgid ""
 "Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
@@ -313,11 +313,11 @@ msgstr ""
 "Не могу да дешифрујем вишеделни/шифровани део: није подржано шифровање за "
 "протокол „%s“."
 
-#: ../libbalsa/gmime-multipart-crypt.c:488
+#: ../libbalsa/gmime-multipart-crypt.c:486
 msgid "(none)"
 msgstr "(ништа)"
 
-#: ../libbalsa/gmime-multipart-crypt.c:501
+#: ../libbalsa/gmime-multipart-crypt.c:499
 msgid ""
 "Cannot decrypt multipart/encrypted part: content-type does not match "
 "protocol."
@@ -325,24 +325,24 @@ msgstr ""
 "Не могу да дешифрујем вишеделни/шифровани део: врста садржаја не одговара "
 "протоколу."
 
-#: ../libbalsa/gmime-multipart-crypt.c:516
+#: ../libbalsa/gmime-multipart-crypt.c:514
 msgid "Cannot decrypt multipart/encrypted part: unexpected content type"
 msgstr ""
 "Не могу да дешифрујем вишеделни/шифровани део: неочекивана врста садржаја"
 
-#: ../libbalsa/gmime-multipart-crypt.c:558
+#: ../libbalsa/gmime-multipart-crypt.c:556
 msgid ""
 "Cannot decrypt multipart/encrypted part: failed to parse decrypted content"
 msgstr ""
 "Не могу да дешифрујем вишеделни/шифровани део: не могу да обрадим шифровани "
 "садржај"
 
-#: ../libbalsa/html.c:68
+#: ../libbalsa/html.c:66
 #, c-format
 msgid "Could not get an HTML part: %s"
 msgstr "Не могу да преузмем ХТМЛ део: %s"
 
-#: ../libbalsa/html.c:340
+#: ../libbalsa/html.c:338
 msgid ""
 "This message part contains images from a remote server. To protect your "
 "privacy, Balsa has not downloaded them. You may choose to download them if "
@@ -352,153 +352,158 @@ msgstr ""
 "приватност, Балза није преузела те делове. Можете их преузети уколико сте "
 "сигурни да је порука безбедна."
 
-#: ../libbalsa/html.c:348
+#: ../libbalsa/html.c:346
 msgid "_Download images"
 msgstr "Преузми _слике"
 
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1881
-#: ../libbalsa/mailbox_local.c:1883 ../src/sendmsg-window.c:4089
-#: ../src/sendmsg-window.c:4091
+#: ../libbalsa/identity.c:101 ../libbalsa/mailbox_local.c:1879
+#: ../libbalsa/mailbox_local.c:1881 ../src/sendmsg-window.c:4098
+#: ../src/sendmsg-window.c:4100
 msgid "Re:"
 msgstr "Re:"
 
-#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:4029
-#: ../src/sendmsg-window.c:4030 ../src/sendmsg-window.c:4031
+#: ../libbalsa/identity.c:102 ../src/sendmsg-window.c:4038
+#: ../src/sendmsg-window.c:4039 ../src/sendmsg-window.c:4040
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: ../libbalsa/identity.c:165
+#: ../libbalsa/identity.c:164
 msgid "New Identity"
 msgstr "Нови идентитет"
 
-#: ../libbalsa/identity.c:344
+#: ../libbalsa/identity.c:343
 #, c-format
 msgid "Error executing signature generator %s"
 msgstr "Грешка извршавања творца потписа %s"
 
-#: ../libbalsa/identity.c:354
+#: ../libbalsa/identity.c:353
 #, c-format
 msgid "Cannot open signature file '%s' for reading"
 msgstr "Не могу да отворим датотеку потписа „%s“ ради читања"
 
-#: ../libbalsa/identity.c:360
+#: ../libbalsa/identity.c:359
 #, c-format
 msgid "Error reading signature from %s"
 msgstr "Грешка читања потписа из %s"
 
-#: ../libbalsa/identity.c:365
+#: ../libbalsa/identity.c:364
 #, c-format
 msgid "Signature in %s is not a UTF-8 text."
 msgstr "Потпис у „%s“ није УТФ-8 текст."
 
-#: ../libbalsa/identity.c:496
+#: ../libbalsa/identity.c:495
 msgid "Current"
 msgstr "Тренутно"
 
-#: ../libbalsa/identity.c:750 ../libbalsa/smtp-server.c:266
+#: ../libbalsa/identity.c:749 ../libbalsa/smtp-server.c:264
 msgid "Default"
 msgstr "Основно"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:949
+#: ../libbalsa/identity.c:948
 msgid "_Face Path"
 msgstr "Путања до _сличице"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:955
+#: ../libbalsa/identity.c:954
 msgid "_X-Face Path"
 msgstr "Путања до _X-сличице"
 
 #. create the "General" tab
-#: ../libbalsa/identity.c:983
+#: ../libbalsa/identity.c:982
 msgid "General"
 msgstr "Опште"
 
-#: ../libbalsa/identity.c:985
+#: ../libbalsa/identity.c:984
 msgid "_Identity name:"
 msgstr "_Име идентитета:"
 
-#: ../libbalsa/identity.c:987
+#: ../libbalsa/identity.c:986
 msgid "_Full name:"
 msgstr "_Пуно име:"
 
-#: ../libbalsa/identity.c:989
+#: ../libbalsa/identity.c:988
 msgid "_Mailing address:"
 msgstr "_Поштанске адресе:"
 
-#: ../libbalsa/identity.c:991
+#: ../libbalsa/identity.c:990
 msgid "Reply _to:"
 msgstr "_Одговори:"
 
-#: ../libbalsa/identity.c:993
+#: ../libbalsa/identity.c:992
 msgid "_Domain:"
 msgstr "_Домен:"
 
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:997
+#: ../libbalsa/identity.c:996
 msgid "Messages"
 msgstr "Поруке"
 
-#: ../libbalsa/identity.c:999
+#: ../libbalsa/identity.c:998
 msgid "_Bcc:"
 msgstr "_Невидљива копија:"
 
-#: ../libbalsa/identity.c:1001
+#: ../libbalsa/identity.c:1000
 msgid "Reply _string:"
 msgstr "Ниска за _одговоре:"
 
-#: ../libbalsa/identity.c:1003
+#: ../libbalsa/identity.c:1002
 msgid "F_orward string:"
 msgstr "Ниска за _прослеђивање:"
 
-#: ../libbalsa/identity.c:1006
+#: ../libbalsa/identity.c:1005
 msgid "send messages in both plain text and _HTML format"
 msgstr "шаљи поруке и као чист текст и као _ХТМЛ"
 
-#: ../libbalsa/identity.c:1009
-#| msgid "Message Disposition Notification Requests"
+#: ../libbalsa/identity.c:1008
+#| msgid "request _Message Disposition Notification by default"
+msgid "request positive (successful) _Delivery Status Notification by default"
+msgstr ""
+"захтевај _обавештење о стању позитивне (успешне) испоруке поруке по основи"
+
+#: ../libbalsa/identity.c:1011
 msgid "request _Message Disposition Notification by default"
 msgstr "захтевај _обавештење о приспећу поруке по основи"
 
-#: ../libbalsa/identity.c:1019
+#: ../libbalsa/identity.c:1021
 msgid "SMT_P server:"
 msgstr "СМТ_П сервер:"
 
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:1024
+#: ../libbalsa/identity.c:1026
 msgid "Signature"
 msgstr "Потпис"
 
-#: ../libbalsa/identity.c:1027
+#: ../libbalsa/identity.c:1029
 msgid "Signature _path"
 msgstr "Путања до _потписа"
 
-#: ../libbalsa/identity.c:1030
+#: ../libbalsa/identity.c:1032
 msgid "_Execute signature"
 msgstr "_Изврши потпис"
 
-#: ../libbalsa/identity.c:1033
+#: ../libbalsa/identity.c:1035
 msgid "Incl_ude signature"
 msgstr "_Укључи потпис"
 
-#: ../libbalsa/identity.c:1036
+#: ../libbalsa/identity.c:1038
 msgid "Include signature when for_warding"
 msgstr "Укључи потпис при _прослеђивању"
 
-#: ../libbalsa/identity.c:1039
+#: ../libbalsa/identity.c:1041
 msgid "Include signature when rep_lying"
 msgstr "Укључи потпис при _одговарању"
 
-#: ../libbalsa/identity.c:1042
+#: ../libbalsa/identity.c:1044
 msgid "_Add signature separator"
 msgstr "_Додај раздвајач потписа"
 
-#: ../libbalsa/identity.c:1045
+#: ../libbalsa/identity.c:1047
 msgid "Prepend si_gnature"
 msgstr "Постави потпис _на почетак"
 
-#: ../libbalsa/identity.c:1051
+#: ../libbalsa/identity.c:1053
 msgid ""
 "Signing and encrypting messages are possible\n"
 "only if Balsa is built with cryptographic support."
@@ -506,31 +511,31 @@ msgstr ""
 "Потписивање и шифровање порука је могуће само ако\n"
 "је Балса изграђена са подршком за шифровање."
 
-#: ../libbalsa/identity.c:1056
+#: ../libbalsa/identity.c:1058
 msgid "Security"
 msgstr "Сигурност"
 
-#: ../libbalsa/identity.c:1059
+#: ../libbalsa/identity.c:1061
 msgid "sign messages by default"
 msgstr "потпиши поруке по основи"
 
-#: ../libbalsa/identity.c:1062
+#: ../libbalsa/identity.c:1064
 msgid "encrypt messages by default"
 msgstr "шифруј поруке по основи"
 
-#: ../libbalsa/identity.c:1065
+#: ../libbalsa/identity.c:1067
 msgid "default protocol"
 msgstr "основни протокол"
 
-#: ../libbalsa/identity.c:1068
+#: ../libbalsa/identity.c:1070
 msgid "always trust GnuPG keys when encrypting"
 msgstr "увек веруј ГнуПГ кључевима приликом шифровања"
 
-#: ../libbalsa/identity.c:1071
+#: ../libbalsa/identity.c:1073
 msgid "remind me if messages can be encrypted"
 msgstr "подсети ме уколико је могуће потписати поруку"
 
-#: ../libbalsa/identity.c:1074
+#: ../libbalsa/identity.c:1076
 msgid ""
 "use secret key with this id for signing\n"
 "(leave empty for automatic selection)"
@@ -538,64 +543,64 @@ msgstr ""
 "користи тајни кључ уз овај иб за потписивање\n"
 "(оставите празно за самостално бирање)"
 
-#: ../libbalsa/identity.c:1208
+#: ../libbalsa/identity.c:1210
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Грешка читања датотеке „%s“: %s"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1218
+#: ../libbalsa/identity.c:1220
 #, c-format
 msgid "Face header file %s is too long (%lu bytes)."
 msgstr "Сличица заглавља „%s“ је превелика (%lu бајта)."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1228
+#: ../libbalsa/identity.c:1230
 #, c-format
 msgid "Face header file %s contains binary data."
 msgstr "Сличица заглавља „%s“ садржи бинарне податке."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1248 ../src/balsa-message.c:1573
+#: ../libbalsa/identity.c:1250 ../src/balsa-message.c:1571
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Не могу да учитам сличицу: %s"
 
-#: ../libbalsa/identity.c:1427
+#: ../libbalsa/identity.c:1429
 msgid "Error: The identity does not have a name"
 msgstr "Грешка: Идентитет нема име"
 
-#: ../libbalsa/identity.c:1437
+#: ../libbalsa/identity.c:1439
 msgid "Error: An identity with that name already exists"
 msgstr "Грешка: Идентитет са тим именом већ постоји"
 
-#: ../libbalsa/identity.c:1636
+#: ../libbalsa/identity.c:1639
 msgid "Do you really want to delete the selected identity?"
 msgstr "Да ли заиста желите да обришете изабрани идентитет?"
 
-#: ../libbalsa/identity.c:1673
+#: ../libbalsa/identity.c:1676
 #, c-format
 msgid "Error displaying help for identities: %s\n"
 msgstr "Грешка приказивања помоћи за личности: %s\n"
 
-#: ../libbalsa/identity.c:1719
+#: ../libbalsa/identity.c:1722
 msgid "Manage Identities"
 msgstr "Управљајте личностима"
 
-#: ../libbalsa/identity.c:2116
+#: ../libbalsa/identity.c:2123
 msgid "GnuPG MIME mode"
 msgstr "ГнуПГ МИМЕ режим"
 
-#: ../libbalsa/identity.c:2118
+#: ../libbalsa/identity.c:2125
 msgid "GnuPG OpenPGP mode"
 msgstr "ГнуПГ ОпенПГП режим"
 
-#: ../libbalsa/identity.c:2121
+#: ../libbalsa/identity.c:2128
 msgid "GpgSM S/MIME mode"
 msgstr "ГпгСМ С/МИМЕ режим"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:319
+#: ../libbalsa/imap-server.c:317
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -605,33 +610,33 @@ msgstr ""
 "%s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:323
+#: ../libbalsa/imap-server.c:321
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr "Грешка ИМАП сервера %s: %s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:329
+#: ../libbalsa/imap-server.c:327
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../libbalsa/imap-server.c:575 ../libbalsa/server.c:348
-#: ../libbalsa/server.c:392
+#: ../libbalsa/imap-server.c:573 ../libbalsa/server.c:346
+#: ../libbalsa/server.c:390
 msgid "Balsa passwords"
 msgstr "Балсине лозинке"
 
-#: ../libbalsa/imap-server.c:626
+#: ../libbalsa/imap-server.c:624
 #, c-format
 msgid "Cannot connect to %s"
 msgstr "Не могу да се повежем на %s"
 
-#: ../libbalsa/imap-server.c:631 ../libbalsa/imap-server.c:636
+#: ../libbalsa/imap-server.c:629 ../libbalsa/imap-server.c:634
 #, c-format
 msgid "Cannot connect to the server: %s"
 msgstr "Не могу да се повежем на сервер: %s"
 
-#: ../libbalsa/imap-server.c:784
+#: ../libbalsa/imap-server.c:782
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Прекорачен је број веза са сервером „%s“"
@@ -640,8 +645,8 @@ msgstr "Прекорачен је број веза са сервером „%s
 msgid "Invalid date"
 msgstr "Погрешан датум"
 
-#: ../libbalsa/libbalsa.c:401 ../src/pref-manager.c:1408
-#: ../src/pref-manager.c:1504
+#: ../libbalsa/libbalsa.c:401 ../src/pref-manager.c:1406
+#: ../src/pref-manager.c:1502
 msgid "Unknown"
 msgstr "Непознато"
 
@@ -719,69 +724,64 @@ msgstr "Унутрашње прекорачење оставе"
 msgid "Bad X-Face data"
 msgstr "Неисправна X-сличица"
 
-#: ../libbalsa/libbalsa-conf.c:143
+#: ../libbalsa/libbalsa-conf.c:141
 msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
 msgstr "Ваша подешавања Балсе су сада смештена у „~/.balsa/config“."
 
-#: ../libbalsa/libbalsa-gpgme.c:245 ../libbalsa/libbalsa-gpgme.c:256
-#: ../libbalsa/libbalsa-gpgme.c:358 ../libbalsa/libbalsa-gpgme.c:481
-#: ../libbalsa/libbalsa-gpgme.c:574
-#| msgid "%s: could not get data from stream: %s"
+#: ../libbalsa/libbalsa-gpgme.c:243 ../libbalsa/libbalsa-gpgme.c:254
+#: ../libbalsa/libbalsa-gpgme.c:356 ../libbalsa/libbalsa-gpgme.c:479
+#: ../libbalsa/libbalsa-gpgme.c:572
 msgid "could not get data from stream"
 msgstr "не могу да добавим податке из тока"
 
-#: ../libbalsa/libbalsa-gpgme.c:269 ../libbalsa/rfc3156.c:394
-#: ../libbalsa/rfc3156.c:399 ../libbalsa/rfc3156.c:571
-#: ../libbalsa/rfc3156.c:577
+#: ../libbalsa/libbalsa-gpgme.c:267 ../libbalsa/rfc3156.c:392
+#: ../libbalsa/rfc3156.c:397 ../libbalsa/rfc3156.c:569
+#: ../libbalsa/rfc3156.c:575
 msgid "signature verification failed"
 msgstr "провера потписа није успела"
 
-#: ../libbalsa/libbalsa-gpgme.c:366 ../libbalsa/libbalsa-gpgme.c:490
-#: ../libbalsa/libbalsa-gpgme.c:582
-#| msgid "%s: could not create new data object: %s"
+#: ../libbalsa/libbalsa-gpgme.c:364 ../libbalsa/libbalsa-gpgme.c:488
+#: ../libbalsa/libbalsa-gpgme.c:580
 msgid "could not create new data object"
 msgstr "не могу да створим нови објекат података"
 
-#: ../libbalsa/libbalsa-gpgme.c:375
+#: ../libbalsa/libbalsa-gpgme.c:373
 msgid "signing failed"
 msgstr "потписивање није успело"
 
-#: ../libbalsa/libbalsa-gpgme.c:449
+#: ../libbalsa/libbalsa-gpgme.c:447
 #, c-format
-#| msgid "combined signing and encryption is only defined for RFC 2440"
 msgid "combined signing and encryption is defined only for RFC 2440"
 msgstr "мешање потписивања и шифровања је одређено једино за РФЦ 2440"
 
-#: ../libbalsa/libbalsa-gpgme.c:517
+#: ../libbalsa/libbalsa-gpgme.c:515
 msgid "signing and encryption failed"
 msgstr "потписивање и шифровање није успело"
 
-#: ../libbalsa/libbalsa-gpgme.c:519
+#: ../libbalsa/libbalsa-gpgme.c:517
 msgid "encryption failed"
 msgstr "шифровање није успело"
 
-#: ../libbalsa/libbalsa-gpgme.c:592 ../libbalsa/rfc3156.c:472
-#: ../libbalsa/rfc3156.c:477
+#: ../libbalsa/libbalsa-gpgme.c:590 ../libbalsa/rfc3156.c:470
+#: ../libbalsa/rfc3156.c:475
 msgid "decryption failed"
 msgstr "дешифровање није успело"
 
-#: ../libbalsa/libbalsa-gpgme.c:693
-#| msgid "%s: could not create context: %s"
+#: ../libbalsa/libbalsa-gpgme.c:691
 msgid "could not create context"
 msgstr "не могу да образујем контекст"
 
-#: ../libbalsa/libbalsa-gpgme.c:697
+#: ../libbalsa/libbalsa-gpgme.c:695
 #, c-format
 msgid "could not set protocol '%s'"
 msgstr "не могу да подесим протокол „%s“"
 
-#: ../libbalsa/libbalsa-gpgme.c:736 ../libbalsa/libbalsa-gpgme.c:764
+#: ../libbalsa/libbalsa-gpgme.c:734 ../libbalsa/libbalsa-gpgme.c:762
 #, c-format
-#| msgid "%s: could not list keys for %s: %s"
 msgid "could not list keys for \"%s\""
 msgstr "не могу да побројим кључеве за „%s“"
 
-#: ../libbalsa/libbalsa-gpgme.c:782
+#: ../libbalsa/libbalsa-gpgme.c:780
 #, c-format
 msgid ""
 "%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
@@ -789,12 +789,12 @@ msgstr ""
 "%s: кључ за „%s“ је присутан, али је истекао, искључен, опозван или "
 "неисправан"
 
-#: ../libbalsa/libbalsa-gpgme.c:787
+#: ../libbalsa/libbalsa-gpgme.c:785
 #, c-format
 msgid "%s: could not find a key for %s"
 msgstr "%s: не могу да нађем кључ за %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:794
+#: ../libbalsa/libbalsa-gpgme.c:792
 #, c-format
 msgid ""
 "%s: a key with id %s is present, but it is expired, disabled, revoked or "
@@ -803,78 +803,73 @@ msgstr ""
 "%s: кључ са иб-ом %s је присутан, али је истекао, искључен, опозван или "
 "неисправан"
 
-#: ../libbalsa/libbalsa-gpgme.c:799
+#: ../libbalsa/libbalsa-gpgme.c:797
 #, c-format
-#| msgid "%s: could not find a key for %s"
 msgid "%s: could not find a key with id %s"
 msgstr "%s: не могу да нађем кључ са иб-ом %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:816
+#: ../libbalsa/libbalsa-gpgme.c:814
 #, c-format
 msgid "%s: multiple keys for %s"
 msgstr "%s: више кључева за %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:862
+#: ../libbalsa/libbalsa-gpgme.c:860
 #, c-format
 msgid "%s: insufficient validity for uid %s"
 msgstr "%s: недовољно ваљаности за уиб %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:144
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
 msgid "User ID"
 msgstr "ИБ корисника"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:144
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
 msgid "Key ID"
 msgstr "ИБ кључа"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:144
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
 msgid "Length"
 msgstr "Дужина"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:144
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
 msgid "Validity"
 msgstr "Исправност"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:159
+#: ../libbalsa/libbalsa-gpgme-cb.c:158
 msgid "Select key"
 msgstr "Изаберите кључ"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:175
+#: ../libbalsa/libbalsa-gpgme-cb.c:174
 #, c-format
 msgid "Select the private key for the signer %s"
 msgstr "Изаберите приватни кључ за потписника %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:179
+#: ../libbalsa/libbalsa-gpgme-cb.c:178
 #, c-format
 msgid "Select the public key for the recipient %s"
 msgstr "Изаберите јавни кључ за примаоца %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:302
+#: ../libbalsa/libbalsa-gpgme-cb.c:301
 #, c-format
 msgid "Insufficient trust for recipient %s"
 msgstr "Недовољно поверења за примаоца %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:306
+#: ../libbalsa/libbalsa-gpgme-cb.c:305
 #, c-format
 msgid "The validity of the key with user ID \"%s\" is \"%s\"."
 msgstr "Исправност кључа са корисничким ИБ-ом „%s“ је „%s“."
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:317
+#: ../libbalsa/libbalsa-gpgme-cb.c:316
 msgid "Use this key anyway?"
 msgstr "Да ипак користим овај кључ?"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:343
+#: ../libbalsa/libbalsa-gpgme-cb.c:342
 msgid "Enter Passphrase"
 msgstr "Унесите лозинку"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:370
+#: ../libbalsa/libbalsa-gpgme-cb.c:369
 #, c-format
-#| msgid ""
-#| "The passphrase for this key was bad, please try again!\n"
-#| "\n"
-#| "Key: %s"
 msgid ""
 "%s\n"
 "The passphrase for this key was bad, please try again!\n"
@@ -886,12 +881,8 @@ msgstr ""
 "\n"
 "Кључ: %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:375
+#: ../libbalsa/libbalsa-gpgme-cb.c:374
 #, c-format
-#| msgid ""
-#| "Please enter the passphrase for the secret key!\n"
-#| "\n"
-#| "Key: %s"
 msgid ""
 "%s\n"
 "Please enter the passphrase for the secret key!\n"
@@ -903,93 +894,85 @@ msgstr ""
 "\n"
 "Кључ: %s"
 
-#: ../libbalsa/libbalsa-vfs.c:558 ../src/sendmsg-window.c:5226
+#: ../libbalsa/libbalsa-vfs.c:556 ../src/sendmsg-window.c:5239
 #, c-format
-#| msgid "%s isn't a regular file."
 msgid "not a regular file"
 msgstr "није обична датотека"
 
-#: ../libbalsa/libbalsa-vfs.c:610
+#: ../libbalsa/libbalsa-vfs.c:608
 #, c-format
 msgid "Cannot launch, missing application"
 msgstr "Не могу да покренем, недостаје програм"
 
-#: ../libbalsa/libbalsa-vfs.c:676
+#: ../libbalsa/libbalsa-vfs.c:674
 #, c-format
 msgid "Open with %s"
 msgstr "Отвори програмом „%s“"
 
-#: ../libbalsa/libbalsa-vfs.c:729
+#: ../libbalsa/libbalsa-vfs.c:727
 #, c-format
 msgid "Open _part with %s"
 msgstr "Прегледај _део помоћу „%s“"
 
-#: ../libbalsa/mailbox.c:522
+#: ../libbalsa/mailbox.c:520
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "Не могу да учитам сандуче „%s“"
 
-#: ../libbalsa/mailbox.c:529
+#: ../libbalsa/mailbox.c:527
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "Не постоји ова врста сандучета: %s"
 
-#: ../libbalsa/mailbox.c:546
+#: ../libbalsa/mailbox.c:544
 #, c-format
 msgid "Bad local mailbox path \"%s\""
 msgstr "Лоша путања месног сандучета „%s“"
 
-#: ../libbalsa/mailbox.c:551
+#: ../libbalsa/mailbox.c:549
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "Нисам могао да створим сандуче врсте „%s“"
 
-#: ../libbalsa/mailbox.c:874
+#: ../libbalsa/mailbox.c:872
 #, c-format
-#| msgid "Error displaying filter help: %s\n"
 msgid "Applying filter rules to %s"
 msgstr "Примењујем правила пропусника на „%s“"
 
 # bug: plural-forms
-#: ../libbalsa/mailbox.c:1029
+#: ../libbalsa/mailbox.c:1027
 #, c-format
-#| msgid "Copying %d messages to %s..."
 msgid "Copying from %s to %s"
 msgstr "Умножавам из „%s“ у „%s“"
 
-#: ../libbalsa/mailbox.c:1936
+#: ../libbalsa/mailbox.c:1934
 #, c-format
 msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
 msgstr "библбалса_сандуче_добави_поруку: сандуче „%s“ је затворено"
 
-#: ../libbalsa/mailbox.c:2146
+#: ../libbalsa/mailbox.c:2144
 #, c-format
-#| msgid "Remove duplicated messages from the selected mailbox"
 msgid "Removing messages from source mailbox failed"
 msgstr "Нисам успео да уклоним порука из сандучета извора"
 
-#: ../libbalsa/mailbox.c:3019
-#| msgid "unknown"
+#: ../libbalsa/mailbox.c:3017
 msgid "from unknown"
 msgstr "из непознатог"
 
-#: ../libbalsa/mailbox.c:3021
-#| msgid "Logging in..."
+#: ../libbalsa/mailbox.c:3019
 msgid "Loading..."
 msgstr "Учитавам..."
 
-#: ../libbalsa/mailbox.c:3991
+#: ../libbalsa/mailbox.c:3989
 #, c-format
-#| msgid "Set identity to use for this message"
 msgid "Searching %s for partial messages"
 msgstr "Претражујем „%s“ за делимичним порукама"
 
-#: ../libbalsa/mailbox.c:4081
-#| msgid "Continue message"
+#: ../libbalsa/mailbox.c:4079
 msgid "Reconstructing message"
 msgstr "Реконструишем поруку"
 
-#: ../libbalsa/mailbox.c:4350
+#: ../libbalsa/mailbox.c:4348
 #, c-format
 msgid "Finding duplicate messages in source mailbox failed"
 msgstr "Нисам успео да уклоним двоструке поруке из сандучета извора"
@@ -997,37 +980,37 @@ msgstr "Нисам успео да уклоним двоструке порук
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:619
+#: ../libbalsa/mailbox_imap.c:617
 msgid "IMAP connection has been severed. Reconnecting..."
 msgstr "ИМАП веза је раскинута. Поново се повезујем..."
 
-#: ../libbalsa/mailbox_imap.c:622
+#: ../libbalsa/mailbox_imap.c:620
 msgid "IMAP protocol error. Try enabling bug workarounds."
 msgstr "Грешка ИМАП протокола. Покушавам да укључим сређивање проблема."
 
-#: ../libbalsa/mailbox_imap.c:625
+#: ../libbalsa/mailbox_imap.c:623
 #, c-format
 msgid "IMAP server has shut the connection: %s Reconnecting..."
 msgstr "ИМАП сервер је угасио везу: %s Поново се повезујем..."
 
-#: ../libbalsa/mailbox_imap.c:637
+#: ../libbalsa/mailbox_imap.c:635
 #, c-format
 msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
 msgstr ""
 "Неусклађена ИМАП наредба „%s“ не може бити извршена. Поново се повезујем..."
 
-#: ../libbalsa/mailbox_imap.c:1128 ../libbalsa/mailbox_maildir.c:511
-#: ../libbalsa/mailbox_mbox.c:750 ../libbalsa/mailbox_mh.c:547
+#: ../libbalsa/mailbox_imap.c:1126 ../libbalsa/mailbox_maildir.c:509
+#: ../libbalsa/mailbox_mbox.c:748 ../libbalsa/mailbox_mh.c:543
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: Отварам %s Рефброј: %d\n"
 
-#: ../libbalsa/mailbox_imap.c:1215
+#: ../libbalsa/mailbox_imap.c:1213
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "Преузимам %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:1614
+#: ../libbalsa/mailbox_imap.c:1612
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
@@ -1036,104 +1019,103 @@ msgstr ""
 "Наредба ПРЕТРАЖИ ИМАП није успела за сандуче „%s“\n"
 "враћам се на подразумевани начин претраге"
 
-#: ../libbalsa/mailbox_imap.c:1674
+#: ../libbalsa/mailbox_imap.c:1672
 #, c-format
 msgid "No path found for mailbox \"%s\", using \"%s\""
 msgstr "Нисам пронашао путању за сандуче „%s“, користим „%s“"
 
-#: ../libbalsa/mailbox_imap.c:1802 ../libbalsa/mailbox_imap.c:1843
+#: ../libbalsa/mailbox_imap.c:1800 ../libbalsa/mailbox_imap.c:1841
 #, c-format
 msgid "Cannot get IMAP handle"
 msgstr "Не могу да добавим ИМАП управљање"
 
-#: ../libbalsa/mailbox_imap.c:2447 ../libbalsa/mailbox_imap.c:2513
+#: ../libbalsa/mailbox_imap.c:2445 ../libbalsa/mailbox_imap.c:2511
 #, c-format
 msgid "Error fetching message from IMAP server: %s"
 msgstr "Грешка довлачења поруке са ИМАП сервера: %s"
 
-#: ../libbalsa/mailbox_imap.c:2481
+#: ../libbalsa/mailbox_imap.c:2479
 #, c-format
 msgid "Downloading %u kB"
 msgstr "Преузимам %u kB"
 
-#: ../libbalsa/mailbox_imap.c:2525
+#: ../libbalsa/mailbox_imap.c:2523
 #, c-format
 msgid "Cannot create temporary file"
 msgstr "Не могу да направим привремену датотеку"
 
-#: ../libbalsa/mailbox_imap.c:2545
+#: ../libbalsa/mailbox_imap.c:2543
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "Не могу да пишем у привремену датотеку „%s“"
 
-#: ../libbalsa/mailbox_imap.c:2774 ../libbalsa/mailbox_imap.c:2893
+#: ../libbalsa/mailbox_imap.c:2772 ../libbalsa/mailbox_imap.c:2891
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "Шаљем %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:3196
+#: ../libbalsa/mailbox_imap.c:3194
 msgid "Server-side threading not supported."
 msgstr "Није подржано темачење са стране сервера."
 
-#: ../libbalsa/mailbox_local.c:540
+#: ../libbalsa/mailbox_local.c:538
 #, c-format
 msgid "Failed to save cache file \"%s\": %s."
 msgstr "Нисам успео да сачувам датотеку оставе „%s“: %s."
 
-#: ../libbalsa/mailbox_local.c:572
+#: ../libbalsa/mailbox_local.c:570
 #, c-format
 msgid "Cache file for mailbox %s will be created"
 msgstr "Биће направљена датотека оставе за сандуче „%s“"
 
-#: ../libbalsa/mailbox_local.c:581
+#: ../libbalsa/mailbox_local.c:579
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Нисам успео да прочитам датотеку оставе „%s“: %s"
 
-#: ../libbalsa/mailbox_local.c:599 ../libbalsa/mailbox_local.c:616
-#: ../libbalsa/mailbox_local.c:640
+#: ../libbalsa/mailbox_local.c:597 ../libbalsa/mailbox_local.c:614
+#: ../libbalsa/mailbox_local.c:638
 #, c-format
 msgid "Cache file for mailbox %s will be repaired"
 msgstr "Биће поправљена датотека оставе за сандуче „%s“"
 
-#: ../libbalsa/mailbox_local.c:1166
+#: ../libbalsa/mailbox_local.c:1164
 #, c-format
 msgid "Filtering %s"
 msgstr "Разврставам %s"
 
-#: ../libbalsa/mailbox_local.c:1254
+#: ../libbalsa/mailbox_local.c:1252
 #, c-format
-#| msgid "Reading %s..."
 msgid "Preparing %s"
 msgstr "Припремам %s"
 
-#: ../libbalsa/mailbox_local.c:2050
+#: ../libbalsa/mailbox_local.c:2048
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "Нисам успео да отворим „%s“. Грешка број %d, "
 
-#: ../libbalsa/mailbox_local.c:2072
+#: ../libbalsa/mailbox_local.c:2070
 #, c-format
 msgid "Failed to sync mailbox \"%s\""
 msgstr "Нисам успео да ускладим сандуче „%s“"
 
-#: ../libbalsa/mailbox_maildir.c:197
+#: ../libbalsa/mailbox_maildir.c:195
 #, c-format
 msgid "Mailbox %s does not appear to be a Maildir mailbox."
 msgstr "Сандуче %s не изгледа као сандуче врсте „Maildir“."
 
-#: ../libbalsa/mailbox_maildir.c:206
+#: ../libbalsa/mailbox_maildir.c:204
 #, c-format
 msgid "Could not create a MailDir directory at %s (%s)"
 msgstr "Не могу да створим „MailDir“ директоријум у %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:214 ../libbalsa/mailbox_maildir.c:223
-#: ../libbalsa/mailbox_maildir.c:234
+#: ../libbalsa/mailbox_maildir.c:212 ../libbalsa/mailbox_maildir.c:221
+#: ../libbalsa/mailbox_maildir.c:232
 #, c-format
 msgid "Could not create a MailDir at %s (%s)"
 msgstr "Не могу да створим „MailDir“ у %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:341 ../libbalsa/mailbox_mh.c:294
+#: ../libbalsa/mailbox_maildir.c:339 ../libbalsa/mailbox_mh.c:292
 #, c-format
 msgid ""
 "Could not remove contents of %s:\n"
@@ -1142,8 +1124,8 @@ msgstr ""
 "Не могу да уклоним садржај %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:347 ../libbalsa/mailbox_mbox.c:326
-#: ../libbalsa/mailbox_mh.c:300
+#: ../libbalsa/mailbox_maildir.c:345 ../libbalsa/mailbox_mbox.c:324
+#: ../libbalsa/mailbox_mh.c:298
 #, c-format
 msgid ""
 "Could not remove %s:\n"
@@ -1152,138 +1134,132 @@ msgstr ""
 "Не могу да уклоним %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:490 ../libbalsa/mailbox_mbox.c:694
-#: ../libbalsa/mailbox_mh.c:528
+#: ../libbalsa/mailbox_maildir.c:488 ../libbalsa/mailbox_mbox.c:692
+#: ../libbalsa/mailbox_mh.c:524
 #, c-format
 msgid "Mailbox does not exist."
 msgstr "Сандуче не постоји."
 
-#: ../libbalsa/mailbox_maildir.c:931 ../libbalsa/mailbox_mbox.c:2031
-#: ../libbalsa/mailbox_mh.c:1110
+#: ../libbalsa/mailbox_maildir.c:929 ../libbalsa/mailbox_mbox.c:2029
+#: ../libbalsa/mailbox_mh.c:1106
 #, c-format
 msgid "Data copy error"
 msgstr "Грешка умножавања података"
 
-#: ../libbalsa/mailbox_mbox.c:211
+#: ../libbalsa/mailbox_mbox.c:209
 #, c-format
 msgid "Mailbox %s does not appear to be an Mbox mailbox."
 msgstr "Сандуче „%s“ не изгледа као сандуче врсте „Mbox“."
 
-#: ../libbalsa/mailbox_mbox.c:429
+#: ../libbalsa/mailbox_mbox.c:427
 #, c-format
-#| msgid ""
-#| "Could not remove %s:\n"
-#| "%s"
 msgid "Could not write file %s: %s"
 msgstr "Не могу да запишем датотеку „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:441
+#: ../libbalsa/mailbox_mbox.c:439
 #, c-format
 msgid "Failed to create temporary file \"%s\": %s"
 msgstr "Нисам успео да направим привремену датотеку „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:453
+#: ../libbalsa/mailbox_mbox.c:451
 #, c-format
 msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
 msgstr ""
 "Нисам успео да сачувам датотеку оставе „%s“: %s.  Ново издање је сачувано "
 "као „%s“"
 
-#: ../libbalsa/mailbox_mbox.c:461
+#: ../libbalsa/mailbox_mbox.c:459
 #, c-format
-#| msgid "Could not save %s: %s"
 msgid "Could not unlink file %s: %s"
 msgstr "Не могу да развежем датотеку „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:702
+#: ../libbalsa/mailbox_mbox.c:700
 #, c-format
 msgid "Cannot open mailbox."
 msgstr "Не могу да отворим сандуче."
 
-#: ../libbalsa/mailbox_mbox.c:714
+#: ../libbalsa/mailbox_mbox.c:712
 #, c-format
 msgid "Mailbox is not in mbox format."
 msgstr "Сандуче није у „mbox“ запису."
 
-#: ../libbalsa/mailbox_mbox.c:722
+#: ../libbalsa/mailbox_mbox.c:720
 #, c-format
 msgid "Cannot lock mailbox."
 msgstr "Не могу да закључам сандуче."
 
-#: ../libbalsa/mailbox_mbox.c:1988
+#: ../libbalsa/mailbox_mbox.c:1986
 #, c-format
 msgid "%s: could not open %s."
 msgstr "%s: не могу да отворим %s."
 
-#: ../libbalsa/mailbox_mbox.c:1999
+#: ../libbalsa/mailbox_mbox.c:1997
 #, c-format
 msgid "%s: could not get new mime stream."
 msgstr "%s: не могу да добавим нови миме ток."
 
-#: ../libbalsa/mailbox_mbox.c:2007
+#: ../libbalsa/mailbox_mbox.c:2005
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: „%s“ није у „mbox“ запису."
 
-#: ../libbalsa/mailbox_mh.c:175
+#: ../libbalsa/mailbox_mh.c:173
 #, c-format
 msgid "Mailbox %s does not appear to be a Mh mailbox."
 msgstr "Сандуче „%s“ не изгледа као сандуче врсте „Mh“."
 
-#: ../libbalsa/mailbox_mh.c:185
+#: ../libbalsa/mailbox_mh.c:183
 #, c-format
 msgid "Could not create MH directory at %s (%s)"
 msgstr "Не могу да створим директоријум врсте „MH“ у %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:197
+#: ../libbalsa/mailbox_mh.c:195
 #, c-format
 msgid "Could not create MH structure at %s (%s)"
 msgstr "Не могу да створим структуру врсте „MH“ у %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:1091
+#: ../libbalsa/mailbox_mh.c:1087
 #, c-format
 msgid "Cannot create message"
 msgstr "Не могу да направим поруку"
 
-#: ../libbalsa/mailbox_mh.c:1135
+#: ../libbalsa/mailbox_mh.c:1131
 #, c-format
 msgid "Message rename error"
 msgstr "Грешка преименовања поруке"
 
-#: ../libbalsa/mailbox_pop3.c:192
+#: ../libbalsa/mailbox_pop3.c:190
 #, c-format
 msgid "Error appending message %d from %s to %s: %s"
 msgstr "Грешка прилагања поруке „%d“ из „%s“ у „%s“: %s"
 
-#: ../libbalsa/mailbox_pop3.c:341
+#: ../libbalsa/mailbox_pop3.c:339
 #, c-format
-#| msgid "Saving POP message to %s failed."
 msgid "Saving POP message to %s failed"
 msgstr "Нисам успео да сачувам ПОП поруку у „%s“"
 
-#: ../libbalsa/mailbox_pop3.c:348
+#: ../libbalsa/mailbox_pop3.c:346
 #, c-format
 msgid "Retrieving Message %d of %d"
 msgstr "Преузимам поруку %d од %d"
 
 # bug: plural-forms
-#: ../libbalsa/mailbox_pop3.c:371
+#: ../libbalsa/mailbox_pop3.c:369
 #, c-format
 msgid "Received %ld kB of %ld"
 msgstr "Примљено је %ld kB од %ld"
 
-#: ../libbalsa/mailbox_pop3.c:385
+#: ../libbalsa/mailbox_pop3.c:383
 #, c-format
 msgid "Saving POP message to %s failed."
 msgstr "Нисам успео да сачувам ПОП поруку у „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:395
+#: ../libbalsa/mailbox_pop3.c:393
 #, c-format
-#| msgid "Transfering POP message to %s failed."
 msgid "Transferring POP message to %s failed."
 msgstr "Нисам успео да пренесем ПОП поруку у „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:477
+#: ../libbalsa/mailbox_pop3.c:475
 #, c-format
 msgid ""
 "POP3 mailbox %s temp file error:\n"
@@ -1292,32 +1268,32 @@ msgstr ""
 "Грешка привремене датотеке ПОП3 сандучета %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_pop3.c:502
+#: ../libbalsa/mailbox_pop3.c:500
 #, c-format
 msgid "POP3 mailbox %s error: %s\n"
 msgstr "Грешка ПОП3 сандучета %s: %s\n"
 
-#: ../libbalsa/mailbox_pop3.c:540
+#: ../libbalsa/mailbox_pop3.c:538
 #, c-format
 msgid "POP3 message %d oversized: %d kB - skipped."
 msgstr "Премашена је величина ПОП3 поруке „%d“: %d kB — прескачем."
 
-#: ../libbalsa/mailbox_pop3.c:552
+#: ../libbalsa/mailbox_pop3.c:550
 #, c-format
 msgid "POP3 error: cannot open %s for writing."
 msgstr "ПОП3 грешка: не могу да отворим „%s“ ради уписа."
 
-#: ../libbalsa/mailbox_pop3.c:560
+#: ../libbalsa/mailbox_pop3.c:558
 #, c-format
 msgid "POP3 error: cannot close %s."
 msgstr "ПОП3 грешка: не могу да затворим „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:595
+#: ../libbalsa/mailbox_pop3.c:593
 #, c-format
 msgid "POP3 error: %s."
 msgstr "ПОП3 грешка: %s."
 
-#: ../libbalsa/message.c:617
+#: ../libbalsa/message.c:615
 #, c-format
 msgid "Mailbox (%s) is readonly: cannot change flags."
 msgstr "Сандуче (%s) је само за читање: не могу да изменим опције."
@@ -1427,187 +1403,181 @@ msgstr "Чекам на покушај закључавања „flock“... %d"
 msgid "LDAP Directory for %s"
 msgstr "ЛДАП каталог за %s"
 
-#: ../libbalsa/rfc2445.c:90 ../libbalsa/rfc2445.c:683
-#: ../libbalsa/rfc2445.c:702 ../libbalsa/rfc3156.c:716
+#: ../libbalsa/rfc2445.c:88 ../libbalsa/rfc2445.c:681
+#: ../libbalsa/rfc2445.c:700 ../libbalsa/rfc3156.c:714
 msgid "unknown"
 msgstr "непознато"
 
-#: ../libbalsa/rfc2445.c:91
+#: ../libbalsa/rfc2445.c:89
 msgid "needs action"
 msgstr "захтева радњу"
 
-#: ../libbalsa/rfc2445.c:92
-#| msgid "_Accept Once"
+#: ../libbalsa/rfc2445.c:90
 msgid "accepted"
 msgstr "прихваћено"
 
-#: ../libbalsa/rfc2445.c:93
-#| msgid "undefined"
+#: ../libbalsa/rfc2445.c:91
 msgid "declined"
 msgstr "одбијено"
 
-#: ../libbalsa/rfc2445.c:94
+#: ../libbalsa/rfc2445.c:92
 msgid "tentatively accepted"
 msgstr "прихваћено с резервом"
 
-#: ../libbalsa/rfc2445.c:95
-#| msgid "Deleted"
+#: ../libbalsa/rfc2445.c:93
 msgid "delegated"
 msgstr "изаслано"
 
-#: ../libbalsa/rfc2445.c:96
+#: ../libbalsa/rfc2445.c:94
 msgid "completed"
 msgstr "завршено"
 
-#: ../libbalsa/rfc2445.c:97
+#: ../libbalsa/rfc2445.c:95
 msgid "in process"
 msgstr "у току"
 
-#: ../libbalsa/rfc2445.c:684
-#| msgid "Notification:"
+#: ../libbalsa/rfc2445.c:682
 msgid "Event Notification"
 msgstr "Обавештење догађаја"
 
-#: ../libbalsa/rfc2445.c:685
+#: ../libbalsa/rfc2445.c:683
 msgid "Event Request"
 msgstr "Захтев догађаја"
 
-#: ../libbalsa/rfc2445.c:686
-#| msgid "Reply to mailing list"
+#: ../libbalsa/rfc2445.c:684
 msgid "Reply to Event Request"
 msgstr "Одговори на захтев догађаја"
 
-#: ../libbalsa/rfc2445.c:687
+#: ../libbalsa/rfc2445.c:685
 msgid "Event Cancellation"
 msgstr "Брисање догађаја"
 
-#: ../libbalsa/rfc2445.c:703
-#| msgid "thai"
+#: ../libbalsa/rfc2445.c:701
 msgid "chair"
 msgstr "председник"
 
-#: ../libbalsa/rfc2445.c:704
+#: ../libbalsa/rfc2445.c:702
 msgid "required participant"
 msgstr "обавезан учесник"
 
-#: ../libbalsa/rfc2445.c:705
+#: ../libbalsa/rfc2445.c:703
 msgid "optional participant"
 msgstr "могући учесник"
 
-#: ../libbalsa/rfc2445.c:706
+#: ../libbalsa/rfc2445.c:704
 msgid "non-participant, information only"
 msgstr "не-учествујући, само податак"
 
-#: ../libbalsa/rfc3156.c:626 ../libbalsa/rfc3156.c:633
+#: ../libbalsa/rfc3156.c:624 ../libbalsa/rfc3156.c:631
 msgid "decryption and signature verification failed"
 msgstr "није успело дешифровање и провера потписа"
 
-#: ../libbalsa/rfc3156.c:659
+#: ../libbalsa/rfc3156.c:657
 msgid "The signature is valid."
 msgstr "Потпис је исправан."
 
-#: ../libbalsa/rfc3156.c:661
+#: ../libbalsa/rfc3156.c:659
 msgid "The signature is valid but expired."
 msgstr "Потпис је исправан али је истекао."
 
-#: ../libbalsa/rfc3156.c:664
+#: ../libbalsa/rfc3156.c:662
 msgid ""
 "The signature is valid but the key used to verify the signature has expired."
 msgstr "Потпис је исправан али је кључ за потврду потписа истекао."
 
-#: ../libbalsa/rfc3156.c:667
+#: ../libbalsa/rfc3156.c:665
 msgid ""
 "The signature is valid but the key used to verify the signature has been "
 "revoked."
 msgstr "Потпис је исправан али је кључ за потврду потписа повучен."
 
-#: ../libbalsa/rfc3156.c:670
+#: ../libbalsa/rfc3156.c:668
 msgid "The signature is invalid."
 msgstr "Потпис није исправан."
 
-#: ../libbalsa/rfc3156.c:673
+#: ../libbalsa/rfc3156.c:671
 msgid "The signature could not be verified due to a missing key."
 msgstr "Потпис није могао да буде проверен због непостојања кључа."
 
-#: ../libbalsa/rfc3156.c:675
+#: ../libbalsa/rfc3156.c:673
 msgid "This part is not a real PGP signature."
 msgstr "Овај део није прави ПГП потпис."
 
-#: ../libbalsa/rfc3156.c:678
+#: ../libbalsa/rfc3156.c:676
 msgid "The signature could not be verified due to an invalid crypto engine."
 msgstr ""
 "Потпис није могао да буде проверен због неисправног механизма шифровања."
 
-#: ../libbalsa/rfc3156.c:681 ../libbalsa/rfc3156.c:1044
+#: ../libbalsa/rfc3156.c:679 ../libbalsa/rfc3156.c:1042
 msgid "GnuPG is rebuilding the trust database and is currently unavailable."
 msgstr "ГнуПГ поново изграђује базу повереника и тренутно је недоступан."
 
-#: ../libbalsa/rfc3156.c:684
+#: ../libbalsa/rfc3156.c:682
 msgid "An error prevented the signature verification."
 msgstr "Грешка је спречила проверу потписа."
 
-#: ../libbalsa/rfc3156.c:694
+#: ../libbalsa/rfc3156.c:692
 msgid "The user ID is of unknown validity."
 msgstr "Кориснички ИБ је непознате исправности."
 
-#: ../libbalsa/rfc3156.c:696
+#: ../libbalsa/rfc3156.c:694
 msgid "The validity of the user ID is undefined."
 msgstr "Исправност корисничког ИБ-а није одређена."
 
-#: ../libbalsa/rfc3156.c:698
+#: ../libbalsa/rfc3156.c:696
 msgid "The user ID is never valid."
 msgstr "Кориснички ИБ никада није исправан."
 
-#: ../libbalsa/rfc3156.c:700
+#: ../libbalsa/rfc3156.c:698
 msgid "The user ID is marginally valid."
 msgstr "Кориснички ИБ је делом исправан."
 
-#: ../libbalsa/rfc3156.c:702
+#: ../libbalsa/rfc3156.c:700
 msgid "The user ID is fully valid."
 msgstr "Кориснички ИБ је у потпуности исправан."
 
-#: ../libbalsa/rfc3156.c:704
+#: ../libbalsa/rfc3156.c:702
 msgid "The user ID is ultimately valid."
 msgstr "Кориснички ИБ је увек исправан."
 
-#: ../libbalsa/rfc3156.c:706 ../libbalsa/rfc3156.c:728
+#: ../libbalsa/rfc3156.c:704 ../libbalsa/rfc3156.c:726
 msgid "bad validity"
 msgstr "лоша исправност"
 
-#: ../libbalsa/rfc3156.c:718
+#: ../libbalsa/rfc3156.c:716
 msgid "undefined"
 msgstr "неодређено"
 
-#: ../libbalsa/rfc3156.c:720 ../libbalsa/rfc3156.c:755
-#: ../src/address-book-config.c:200
+#: ../libbalsa/rfc3156.c:718 ../libbalsa/rfc3156.c:753
+#: ../src/address-book-config.c:198
 msgid "never"
 msgstr "никад"
 
-#: ../libbalsa/rfc3156.c:722
+#: ../libbalsa/rfc3156.c:720
 msgid "marginal"
 msgstr "делом"
 
-#: ../libbalsa/rfc3156.c:724
+#: ../libbalsa/rfc3156.c:722
 msgid "full"
 msgstr "потпуно"
 
-#: ../libbalsa/rfc3156.c:726
+#: ../libbalsa/rfc3156.c:724
 msgid "ultimate"
 msgstr "увек"
 
-#: ../libbalsa/rfc3156.c:738
+#: ../libbalsa/rfc3156.c:736
 msgid "PGP signature: "
 msgstr "ПГП потпис: "
 
-#: ../libbalsa/rfc3156.c:740
+#: ../libbalsa/rfc3156.c:738
 msgid "S/MIME signature: "
 msgstr "С/МИМЕ потпис: "
 
-#: ../libbalsa/rfc3156.c:742
+#: ../libbalsa/rfc3156.c:740
 msgid "(unknown protocol) "
 msgstr "(непознат протокол) "
 
-#: ../libbalsa/rfc3156.c:772
+#: ../libbalsa/rfc3156.c:770
 #, c-format
 msgid ""
 "\n"
@@ -1616,7 +1586,7 @@ msgstr ""
 "\n"
 "Исправност потписа: %s"
 
-#: ../libbalsa/rfc3156.c:775
+#: ../libbalsa/rfc3156.c:773
 #, c-format
 msgid ""
 "\n"
@@ -1625,7 +1595,7 @@ msgstr ""
 "\n"
 "Потписан: %s"
 
-#: ../libbalsa/rfc3156.c:777
+#: ../libbalsa/rfc3156.c:775
 #, c-format
 msgid ""
 "\n"
@@ -1634,7 +1604,7 @@ msgstr ""
 "\n"
 "Веровање кључу власника: %s"
 
-#: ../libbalsa/rfc3156.c:781
+#: ../libbalsa/rfc3156.c:779
 #, c-format
 msgid ""
 "\n"
@@ -1643,10 +1613,7 @@ msgstr ""
 "\n"
 "Отисак кључа: %s"
 
-#: ../libbalsa/rfc3156.c:795
-#| msgid ""
-#| "\n"
-#| "User ID: %s"
+#: ../libbalsa/rfc3156.c:793
 msgid ""
 "\n"
 "User ID's:"
@@ -1654,8 +1621,7 @@ msgstr ""
 "\n"
 "ИБ корисника:"
 
-#: ../libbalsa/rfc3156.c:798
-#| msgid "User ID"
+#: ../libbalsa/rfc3156.c:796
 msgid ""
 "\n"
 "User ID:"
@@ -1663,15 +1629,15 @@ msgstr ""
 "\n"
 "ИБ корисника:"
 
-#: ../libbalsa/rfc3156.c:809
+#: ../libbalsa/rfc3156.c:807
 msgid " [Revoked]"
 msgstr " [Повучен]"
 
-#: ../libbalsa/rfc3156.c:811
+#: ../libbalsa/rfc3156.c:809
 msgid " [Invalid]"
 msgstr " [Неисправан]"
 
-#: ../libbalsa/rfc3156.c:838
+#: ../libbalsa/rfc3156.c:836
 #, c-format
 msgid ""
 "\n"
@@ -1680,7 +1646,7 @@ msgstr ""
 "\n"
 "Подкључ је створен: %s"
 
-#: ../libbalsa/rfc3156.c:840
+#: ../libbalsa/rfc3156.c:838
 #, c-format
 msgid ""
 "\n"
@@ -1689,25 +1655,25 @@ msgstr ""
 "\n"
 "Подкључ истиче: %s"
 
-#: ../libbalsa/rfc3156.c:849
+#: ../libbalsa/rfc3156.c:847
 msgid " revoked"
 msgstr " повучен"
 
-#: ../libbalsa/rfc3156.c:854
+#: ../libbalsa/rfc3156.c:852
 msgid " expired"
 msgstr " истекао"
 
-#: ../libbalsa/rfc3156.c:859
+#: ../libbalsa/rfc3156.c:857
 msgid " disabled"
 msgstr " искључен"
 
-#: ../libbalsa/rfc3156.c:864
+#: ../libbalsa/rfc3156.c:862
 msgid " invalid"
 msgstr " неисправан"
 
 #. ngettext: string begins with a single space, so no space
 #. * after the colon is correct punctuation (in English).
-#: ../libbalsa/rfc3156.c:868
+#: ../libbalsa/rfc3156.c:866
 #, c-format
 msgid ""
 "\n"
@@ -1728,7 +1694,7 @@ msgstr[3] ""
 "\n"
 "Особина подкључа:%s"
 
-#: ../libbalsa/rfc3156.c:880
+#: ../libbalsa/rfc3156.c:878
 #, c-format
 msgid ""
 "\n"
@@ -1737,7 +1703,7 @@ msgstr ""
 "\n"
 "Издавач: %s"
 
-#: ../libbalsa/rfc3156.c:884
+#: ../libbalsa/rfc3156.c:882
 #, c-format
 msgid ""
 "\n"
@@ -1746,7 +1712,7 @@ msgstr ""
 "\n"
 "Серијски број издавача: %s"
 
-#: ../libbalsa/rfc3156.c:887
+#: ../libbalsa/rfc3156.c:885
 #, c-format
 msgid ""
 "\n"
@@ -1755,17 +1721,13 @@ msgstr ""
 "\n"
 "ИБ ланца: %s"
 
-#: ../libbalsa/rfc3156.c:946
+#: ../libbalsa/rfc3156.c:944
 #, c-format
-#| msgid "Could not launch %s to get the public key %s."
 msgid "Could not launch %s to query the public key %s."
 msgstr "Не могу да покренем „%s“ да бих пропитао јавни кључ „%s“."
 
-#: ../libbalsa/rfc3156.c:996
+#: ../libbalsa/rfc3156.c:994
 #, c-format
-#| msgid ""
-#| "Running gpg failed with return value %d:\n"
-#| "%s"
 msgid ""
 "Running %s failed with return value %d:\n"
 "%s"
@@ -1773,11 +1735,8 @@ msgstr ""
 "Покретање „%s“ није успело са повратном вредношћу „%d:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1003
+#: ../libbalsa/rfc3156.c:1001
 #, c-format
-#| msgid ""
-#| "Running gpg successful:\n"
-#| "%s"
 msgid ""
 "Running %s successful:\n"
 "%s"
@@ -1785,19 +1744,19 @@ msgstr ""
 "Покретање „%s“ је успело:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1045
+#: ../libbalsa/rfc3156.c:1043
 msgid "Try again later."
 msgstr "Покушајте касније."
 
-#: ../libbalsa/send.c:253 ../libbalsa/send.c:260
+#: ../libbalsa/send.c:251 ../libbalsa/send.c:258
 msgid "Sending Mail..."
 msgstr "Шаљем пошту..."
 
-#: ../libbalsa/send.c:256 ../src/main-window.c:2876
+#: ../libbalsa/send.c:254 ../src/main-window.c:2874
 msgid "_Hide"
 msgstr "_Сакриј"
 
-#: ../libbalsa/send.c:951
+#: ../libbalsa/send.c:964
 #, c-format
 msgid ""
 "Could not send the message to %s:\n"
@@ -1808,12 +1767,12 @@ msgstr ""
 "%d: %s\n"
 "Порука је задржана у сандучету „Одлазна“.\n"
 
-#: ../libbalsa/send.c:997
+#: ../libbalsa/send.c:1010
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Нисам успео да сачувам послату поруку у „%s“: %s"
 
-#: ../libbalsa/send.c:1027 ../libbalsa/send.c:1039
+#: ../libbalsa/send.c:1040 ../libbalsa/send.c:1052
 #, c-format
 msgid ""
 "Relaying refused:\n"
@@ -1824,7 +1783,7 @@ msgstr ""
 "%d: %s\n"
 "Порука је остала у одлазној пошти.\n"
 
-#: ../libbalsa/send.c:1046
+#: ../libbalsa/send.c:1059
 msgid ""
 "Message submission problem, placing it into your outbox.\n"
 "System will attempt to resubmit the message until you delete it."
@@ -1832,39 +1791,39 @@ msgstr ""
 "Проблем са слањем поруке, смештам је у „Одлазну“.\n"
 "Систем ће покушавати са поновним слањем поруке све док је не обришете."
 
-#: ../libbalsa/send.c:1076
+#: ../libbalsa/send.c:1089
 msgid "Connected to MTA"
 msgstr "Повезан сам на АПП"
 
 #. status code, mailbox
-#: ../libbalsa/send.c:1085
+#: ../libbalsa/send.c:1098
 #, c-format
 msgid "From: %d <%s>"
 msgstr "Шаље: %d <%s>"
 
 #. mailbox, status code, status text
-#: ../libbalsa/send.c:1089
+#: ../libbalsa/send.c:1102
 #, c-format
 msgid "From %s: %d %s"
 msgstr "Шаље %s: %d %s"
 
 #. status code, mailbox
-#: ../libbalsa/send.c:1100
+#: ../libbalsa/send.c:1113
 #, c-format
 msgid "To: %d <%s>"
 msgstr "Прима: %d <%s>"
 
 #. mailbox, status code, status text
-#: ../libbalsa/send.c:1104
+#: ../libbalsa/send.c:1117
 #, c-format
 msgid "To %s: %d %s"
 msgstr "Прима %s: %d %s"
 
-#: ../libbalsa/send.c:1142
+#: ../libbalsa/send.c:1155
 msgid "Disconnected"
 msgstr "Неповезан"
 
-#: ../libbalsa/send.c:1424
+#: ../libbalsa/send.c:1437
 msgid ""
 "SMTP server refused connection.\n"
 "Check your internet connection."
@@ -1872,7 +1831,7 @@ msgstr ""
 "СМТП сервер је одбио везу.\n"
 "Проверите вашу интернет везу."
 
-#: ../libbalsa/send.c:1429
+#: ../libbalsa/send.c:1442
 msgid ""
 "SMTP server cannot be reached.\n"
 "Check your internet connection."
@@ -1880,11 +1839,11 @@ msgstr ""
 "СМТП сервер не може бити приступљен.\n"
 "Проверите вашу интернет везу."
 
-#: ../libbalsa/send.c:1438
+#: ../libbalsa/send.c:1451
 msgid "Message left in Outbox (try again later)"
 msgstr "Остала је порука у сандучету (покушајте касније"
 
-#: ../libbalsa/send.c:1442
+#: ../libbalsa/send.c:1455
 #, c-format
 msgid ""
 "SMTP server problem (%d): %s\n"
@@ -1893,24 +1852,24 @@ msgstr ""
 "Проблем СМТП сервера (%d): %s\n"
 "Порука је остала у одлазном."
 
-#: ../libbalsa/send.c:1757 ../libbalsa/send.c:1826
+#: ../libbalsa/send.c:1770 ../libbalsa/send.c:1839
 #, c-format
 msgid "Cannot read %s: %s"
 msgstr "Не могу да прочитам %s: %s"
 
-#: ../libbalsa/send.c:1760 ../libbalsa/send.c:1829
+#: ../libbalsa/send.c:1773 ../libbalsa/send.c:1842
 #, c-format
 msgid "Cannot read %s"
 msgstr "Не могу да прочитам „%s“"
 
-#: ../libbalsa/send.c:1790
+#: ../libbalsa/send.c:1803
 #, c-format
 msgid "Cannot determine charset for text file `%s'; sending as mime type `%s'"
 msgstr ""
 "Не могу да одредим знаковни скуп за текстуалну датотеку „%s“; шаљем као миме "
 "врсту „%s“"
 
-#: ../libbalsa/send.c:2142
+#: ../libbalsa/send.c:2173
 msgid "This message will not be encrypted for the BCC: recipient."
 msgid_plural "This message will not be encrypted for the BCC: recipients."
 msgstr[0] "Ова порука неће бити шифрована за невидљиву копију: прималац."
@@ -1918,154 +1877,154 @@ msgstr[1] "Ова порука неће бити шифрована за нев
 msgstr[2] "Ова порука неће бити шифрована за невидљиву копију: примаоци."
 msgstr[3] "Ова порука неће бити шифрована за невидљиву копију: прималац."
 
-#: ../libbalsa/send.c:2230
+#: ../libbalsa/send.c:2261
 msgid "This message will not be encrypted for the BCC: recipient(s)."
 msgstr "Ова порука неће бити шифрована за невидљиву копију: прималац(оци)."
 
 #. host, authentication method
-#: ../libbalsa/server.c:431
+#: ../libbalsa/server.c:429
 #, c-format
 msgid "Logging in to %s using %s"
 msgstr "Пријављујем се на „%s“ користећи %s"
 
-#: ../libbalsa/smtp-server.c:386 ../libbalsa/smtp-server.c:394
-#: ../src/mailbox-conf.c:210 ../src/mailbox-conf.c:1510
-#: ../src/pref-manager.c:404 ../src/pref-manager.c:3430
+#: ../libbalsa/smtp-server.c:384 ../libbalsa/smtp-server.c:392
+#: ../src/mailbox-conf.c:208 ../src/mailbox-conf.c:1508
+#: ../src/pref-manager.c:402 ../src/pref-manager.c:3428
 msgid "Never"
 msgstr "Никад"
 
-#: ../libbalsa/smtp-server.c:388 ../libbalsa/smtp-server.c:395
-#: ../src/mailbox-conf.c:211 ../src/mailbox-conf.c:1511
+#: ../libbalsa/smtp-server.c:386 ../libbalsa/smtp-server.c:393
+#: ../src/mailbox-conf.c:209 ../src/mailbox-conf.c:1509
 msgid "If Possible"
 msgstr "Ако је могуће"
 
-#: ../libbalsa/smtp-server.c:390 ../libbalsa/smtp-server.c:396
-#: ../src/mailbox-conf.c:212
+#: ../libbalsa/smtp-server.c:388 ../libbalsa/smtp-server.c:394
+#: ../src/mailbox-conf.c:210
 msgid "Required"
 msgstr "Увек"
 
-#: ../libbalsa/smtp-server.c:430
+#: ../libbalsa/smtp-server.c:428
 #, c-format
 msgid "Error displaying server help: %s\n"
 msgstr "Грешка приказивања помоћи сервера: %s\n"
 
-#: ../libbalsa/smtp-server.c:545
+#: ../libbalsa/smtp-server.c:543
 msgid "SMTP Server"
 msgstr "СМТП сервер"
 
-#: ../libbalsa/smtp-server.c:572
+#: ../libbalsa/smtp-server.c:570
 msgid "_Descriptive Name:"
 msgstr "Описни _назив:"
 
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:579 ../src/folder-conf.c:377
-#: ../src/mailbox-conf.c:1234 ../src/mailbox-conf.c:1347
+#: ../libbalsa/smtp-server.c:577 ../src/folder-conf.c:375
+#: ../src/mailbox-conf.c:1232 ../src/mailbox-conf.c:1345
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../libbalsa/smtp-server.c:586
+#: ../libbalsa/smtp-server.c:584
 msgid "_User Name:"
 msgstr "_Корисничко име:"
 
-#: ../libbalsa/smtp-server.c:593
+#: ../libbalsa/smtp-server.c:591
 msgid "_Pass Phrase:"
 msgstr "_Лозинка:"
 
-#: ../libbalsa/smtp-server.c:602 ../src/mailbox-conf.c:242
+#: ../libbalsa/smtp-server.c:600 ../src/mailbox-conf.c:240
 msgid "Use _TLS:"
 msgstr "Користи _ТЛС:"
 
-#: ../libbalsa/smtp-server.c:607
+#: ../libbalsa/smtp-server.c:605
 msgid "C_ertificate Pass Phrase:"
 msgstr "Лозинка _уверења:"
 
-#: ../libbalsa/smtp-server.c:619
+#: ../libbalsa/smtp-server.c:617
 msgid "Sp_lit message larger than"
 msgstr "_Подели поруке веће од"
 
-#: ../libbalsa/smtp-server.c:625 ../src/pref-manager.c:1918
+#: ../libbalsa/smtp-server.c:623 ../src/pref-manager.c:1916
 msgid "MB"
 msgstr "MB"
 
 #. Top level
 #. Menus
-#: ../libbalsa/source-viewer.c:46 ../src/ab-main.c:553
-#: ../src/main-window.c:346 ../src/message-window.c:239
-#: ../src/sendmsg-window.c:320
+#: ../libbalsa/source-viewer.c:44 ../src/ab-main.c:551
+#: ../src/main-window.c:344 ../src/message-window.c:237
+#: ../src/sendmsg-window.c:322
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../libbalsa/source-viewer.c:47 ../src/filter-edit-dialog.c:332
-#: ../src/main-window.c:347 ../src/message-window.c:240
-#: ../src/sendmsg-window.c:321
+#: ../libbalsa/source-viewer.c:45 ../src/filter-edit-dialog.c:330
+#: ../src/main-window.c:345 ../src/message-window.c:238
+#: ../src/sendmsg-window.c:323
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../libbalsa/source-viewer.c:48 ../src/main-window.c:348
-#: ../src/message-window.c:241
+#: ../libbalsa/source-viewer.c:46 ../src/main-window.c:346
+#: ../src/message-window.c:239
 msgid "_View"
 msgstr "_Преглед"
 
 #. Items
-#: ../libbalsa/source-viewer.c:50 ../src/mailbox-node.c:1096
-#: ../src/main-window.c:521 ../src/message-window.c:248
-#: ../src/sendmsg-window.c:350
+#: ../libbalsa/source-viewer.c:48 ../src/mailbox-node.c:1094
+#: ../src/main-window.c:519 ../src/message-window.c:246
+#: ../src/sendmsg-window.c:352
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../libbalsa/source-viewer.c:51
+#: ../libbalsa/source-viewer.c:49
 msgid "Close the window"
 msgstr "Затворите овај прозор"
 
 #. Edit menu items
-#: ../libbalsa/source-viewer.c:52 ../src/main-window.c:421
-#: ../src/main-window.c:587 ../src/message-window.c:251
-#: ../src/sendmsg-window.c:358
+#: ../libbalsa/source-viewer.c:50 ../src/main-window.c:419
+#: ../src/main-window.c:585 ../src/message-window.c:249
+#: ../src/sendmsg-window.c:360
 msgid "_Copy"
 msgstr "_Умножи"
 
-#: ../libbalsa/source-viewer.c:53
+#: ../libbalsa/source-viewer.c:51
 msgid "Copy text"
 msgstr "Умножите изабрани текст"
 
-#: ../libbalsa/source-viewer.c:54 ../src/main-window.c:589
+#: ../libbalsa/source-viewer.c:52 ../src/main-window.c:587
 msgid "_Select Text"
 msgstr "_Изабери текст"
 
-#: ../libbalsa/source-viewer.c:55 ../src/main-window.c:590
+#: ../libbalsa/source-viewer.c:53 ../src/main-window.c:588
 msgid "Select entire mail"
 msgstr "Изаберите читаву поруку"
 
-#: ../libbalsa/source-viewer.c:60
+#: ../libbalsa/source-viewer.c:58
 msgid "_Escape Special Characters"
 msgstr "Истакни _нарочите знаке"
 
-#: ../libbalsa/source-viewer.c:61
+#: ../libbalsa/source-viewer.c:59
 msgid "Escape special and non-ASCII characters"
 msgstr "Истакните нарочите и не-енглеске знаке"
 
-#: ../libbalsa/source-viewer.c:159
+#: ../libbalsa/source-viewer.c:157
 msgid "Mailbox closed"
 msgstr "Сандуче је затворено"
 
-#: ../libbalsa/source-viewer.c:280
+#: ../libbalsa/source-viewer.c:278
 msgid "Message Source"
 msgstr "Извор поруке"
 
-#: ../libinit_balsa/assistant_helper.c:68
+#: ../libinit_balsa/assistant_helper.c:66
 #, c-format
 msgid "Error loading %s: %s\n"
 msgstr "Грешка учитавања „%s“: %s\n"
 
-#: ../libinit_balsa/assistant_helper.c:216
+#: ../libinit_balsa/assistant_helper.c:214
 #, c-format
 msgid "The path %s must be relative to the filesystem root (start with /)."
-msgstr "Путања „%s“ мора да се односи на корен система датотека (почните са /)."
+msgstr ""
+"Путања „%s“ мора да се односи на корен система датотека (почните са /)."
 
-#: ../libinit_balsa/assistant_helper.c:228
+#: ../libinit_balsa/assistant_helper.c:226
 #, c-format
-#| msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
 msgid ""
 "Couldn't create a directory: mkdir() failed on pathname \"%s\", with error "
 "\"%s\"."
@@ -2073,20 +2032,20 @@ msgstr ""
 "Не могу да створим директоријум: није успела функција „mkdir()“ за назив "
 "путање „%s“, са грешком „%s“."
 
-#: ../libinit_balsa/assistant_helper.c:240
-#: ../libinit_balsa/assistant_helper.c:263
+#: ../libinit_balsa/assistant_helper.c:238
+#: ../libinit_balsa/assistant_helper.c:261
 #, c-format
 msgid "The file with pathname \"%s\" is not a directory."
 msgstr "Датотека са називом путање „%s“ није директоријум."
 
-#: ../libinit_balsa/assistant_helper.c:254
+#: ../libinit_balsa/assistant_helper.c:252
 #, c-format
 msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
 msgstr ""
 "Не могу да створим директоријум: није успела функција „mkdir()“ за назив "
 "путање „%s“."
 
-#: ../libinit_balsa/assistant_init.c:51
+#: ../libinit_balsa/assistant_init.c:49
 msgid ""
 "This will exit Balsa.\n"
 "Do you really want to do this?"
@@ -2094,69 +2053,68 @@ msgstr ""
 "Овим ће се изаћи из Балсе.\n"
 "Да ли заиста желите то да урадите?"
 
-#: ../libinit_balsa/assistant_init.c:74
+#: ../libinit_balsa/assistant_init.c:72
 msgid "GnomeCard Address Book"
 msgstr "Адресар Гномове картице"
 
-#: ../libinit_balsa/assistant_init.c:81 ../libinit_balsa/assistant_init.c:89
-#: ../src/ab-window.c:236
+#: ../libinit_balsa/assistant_init.c:79 ../libinit_balsa/assistant_init.c:87
+#: ../src/ab-window.c:234
 msgid "Address Book"
 msgstr "Адресар"
 
-#: ../libinit_balsa/assistant_init.c:148
+#: ../libinit_balsa/assistant_init.c:146
 msgid "Configure Balsa"
 msgstr "Подесите Балсу"
 
-#: ../libinit_balsa/assistant_page_defclient.c:59
-#| msgid "Use balsa as default email client?"
+#: ../libinit_balsa/assistant_page_defclient.c:57
 msgid "Use Balsa as default email client?"
 msgstr "Да користим Балсу као основни програм за пошту?"
 
-#: ../libinit_balsa/assistant_page_defclient.c:63
+#: ../libinit_balsa/assistant_page_defclient.c:61
 msgid "_Yes"
 msgstr "_Да"
 
-#: ../libinit_balsa/assistant_page_defclient.c:65
+#: ../libinit_balsa/assistant_page_defclient.c:63
 msgid "_No"
 msgstr "_Не"
 
-#: ../libinit_balsa/assistant_page_defclient.c:102
+#: ../libinit_balsa/assistant_page_defclient.c:100
 msgid "Default Client"
 msgstr "Основни програм"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:58
 msgid "_Inbox:"
 msgstr "_Долазна:"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:58
 msgid "_Outbox:"
 msgstr "_Одлазна:"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:58
 msgid "_Sentbox:"
 msgstr "_Послане:"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:58
 msgid "_Draftbox:"
 msgstr "_Скице:"
 
-#: ../libinit_balsa/assistant_page_directory.c:61
+#: ../libinit_balsa/assistant_page_directory.c:59
 msgid "_Trash:"
 msgstr "Сме_ће:"
 
-#: ../libinit_balsa/assistant_page_directory.c:95
+#: ../libinit_balsa/assistant_page_directory.c:93
 #, c-format
 msgid ""
 "The pathname \"%s\" must be specified canonically -- it must start with a "
 "'/'."
 msgstr "Путања „%s“ мора да буде задана у потпуности – мора да почиње са „/“."
 
-#: ../libinit_balsa/assistant_page_directory.c:161
+#: ../libinit_balsa/assistant_page_directory.c:159
 #, c-format
 msgid "The mailbox \"%s\" does not appear to be valid."
 msgstr "Сандуче „%s“ не изгледа исправно."
 
-#: ../libinit_balsa/assistant_page_directory.c:204
+#: ../libinit_balsa/assistant_page_directory.c:202
 msgid ""
 "Please verify the locations of your default mail files.\n"
 "These will be created if necessary."
@@ -2164,12 +2122,12 @@ msgstr ""
 "Молим проверите места ваших основних датотека поште.\n"
 "Оне ће бити створене по потреби."
 
-#: ../libinit_balsa/assistant_page_directory.c:266
+#: ../libinit_balsa/assistant_page_directory.c:264
 msgid "Mail Files"
 msgstr "Датотеке поште"
 
-#: ../libinit_balsa/assistant_page_directory.c:362
-#: ../libinit_balsa/assistant_page_directory.c:396
+#: ../libinit_balsa/assistant_page_directory.c:360
+#: ../libinit_balsa/assistant_page_directory.c:394
 #, c-format
 msgid ""
 "Problem Creating Mailboxes\n"
@@ -2178,7 +2136,7 @@ msgstr ""
 "Проблем приликом стварања сандучића\n"
 "%s"
 
-#: ../libinit_balsa/assistant_page_finish.c:44
+#: ../libinit_balsa/assistant_page_finish.c:42
 msgid ""
 "You've successfully set up Balsa. Have fun!\n"
 "   -- The Balsa development team"
@@ -2186,11 +2144,11 @@ msgstr ""
 "Успешно сте подесили Балсу. Забавите се!\n"
 "   — Развојна екипа Балсе"
 
-#: ../libinit_balsa/assistant_page_finish.c:49
+#: ../libinit_balsa/assistant_page_finish.c:47
 msgid "All Done!"
 msgstr "Све је урађено!"
 
-#: ../libinit_balsa/assistant_page_user.c:57
+#: ../libinit_balsa/assistant_page_user.c:55
 msgid ""
 "The following settings are also needed (and you can find them later, if need "
 "be, in the Email application in the 'Preferences' and 'Identities' commands "
@@ -2200,7 +2158,7 @@ msgstr ""
 "било потребно, у програму ел. поште у наредбама „Поставке“ и „Личности“ у "
 "изборнику „Алати“)"
 
-#: ../libinit_balsa/assistant_page_user.c:63
+#: ../libinit_balsa/assistant_page_user.c:61
 msgid ""
 " Whoever provides your email account should be able to give you the "
 "following information (if you have a Network Administrator, they may already "
@@ -2210,65 +2168,64 @@ msgstr ""
 "следеће податке (ако имате администратора мреже, можда је он ово већ "
 "подесио):"
 
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
 msgid "Yes, remember it"
 msgstr "Да, запамти је"
 
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
 msgid "No, type it in every time"
 msgstr "Не, упиши је сваки пут"
 
-#: ../libinit_balsa/assistant_page_user.c:103
+#: ../libinit_balsa/assistant_page_user.c:101
 msgid "Name of mail server for incoming _mail:"
 msgstr "Назив сервера поште за долазну _пошту:"
 
-#: ../libinit_balsa/assistant_page_user.c:108
+#: ../libinit_balsa/assistant_page_user.c:106
 msgid "_Type of mail server:"
 msgstr "_Врста сервера поште:"
 
-#: ../libinit_balsa/assistant_page_user.c:112
+#: ../libinit_balsa/assistant_page_user.c:110
 msgid "Connect using _SSL:"
 msgstr "Повежи се користећи _ССЛ:"
 
-#: ../libinit_balsa/assistant_page_user.c:115
+#: ../libinit_balsa/assistant_page_user.c:113
 msgid "Your email _login name:"
 msgstr "Ваше име за _пријављивање:"
 
-#: ../libinit_balsa/assistant_page_user.c:118
+#: ../libinit_balsa/assistant_page_user.c:116
 msgid "Your _password:"
 msgstr "Ваша _лозинка:"
 
-#: ../libinit_balsa/assistant_page_user.c:126
+#: ../libinit_balsa/assistant_page_user.c:124
 msgid "_SMTP Server:"
 msgstr "_СМТП сервер:"
 
 #. 2.1
-#: ../libinit_balsa/assistant_page_user.c:131
+#: ../libinit_balsa/assistant_page_user.c:129
 msgid "Your real _name:"
 msgstr "Ваше право _име:"
 
-#: ../libinit_balsa/assistant_page_user.c:137
+#: ../libinit_balsa/assistant_page_user.c:135
 msgid "Your _Email Address, for this email account:"
 msgstr "Ваша адреса _ел. поште, за овај налог:"
 
-#: ../libinit_balsa/assistant_page_user.c:142
+#: ../libinit_balsa/assistant_page_user.c:140
 msgid "_Remember your password:"
 msgstr "_Запамтите вашу лозинку:"
 
-#: ../libinit_balsa/assistant_page_user.c:148
+#: ../libinit_balsa/assistant_page_user.c:146
 msgid "_Local mail directory:"
 msgstr "_Месни директоријум поште:"
 
-#: ../libinit_balsa/assistant_page_user.c:167
+#: ../libinit_balsa/assistant_page_user.c:165
 msgid "User Settings"
 msgstr "Корисничка подешавања"
 
-#: ../libinit_balsa/assistant_page_user.c:289
-#| msgid "Select Identity"
+#: ../libinit_balsa/assistant_page_user.c:287
 msgid "Default Identity"
 msgstr "Основна личност"
 
-#: ../libinit_balsa/assistant_page_user.c:334
+#: ../libinit_balsa/assistant_page_user.c:332
 #, c-format
 msgid ""
 "Local Mail Problem\n"
@@ -2277,11 +2234,11 @@ msgstr ""
 "Проблем са месном поштом\n"
 "%s"
 
-#: ../libinit_balsa/assistant_page_welcome.c:29
+#: ../libinit_balsa/assistant_page_welcome.c:27
 msgid "Welcome to Balsa!"
 msgstr "Добродошли у Балсу!"
 
-#: ../libinit_balsa/assistant_page_welcome.c:32
+#: ../libinit_balsa/assistant_page_welcome.c:30
 msgid ""
 "Before you can send or receive email:\n"
 "\n"
@@ -2313,161 +2270,158 @@ msgstr "Покретање програма"
 msgid "New mail notification"
 msgstr "Обавештење о новој пошти"
 
-#: ../src/ab-main.c:228 ../src/ab-window.c:702
+#: ../src/ab-main.c:226 ../src/ab-window.c:700
 msgid " address book: "
 msgstr " адресар: "
 
-#: ../src/ab-main.c:554
+#: ../src/ab-main.c:552
 msgid "_Entry"
 msgstr "_Унос"
 
-#: ../src/ab-main.c:555 ../src/main-window.c:352
+#: ../src/ab-main.c:553 ../src/main-window.c:350
 msgid "_Help"
 msgstr "_Помоћ"
 
 #. new button
-#: ../src/ab-main.c:556 ../src/filter-edit-dialog.c:237
-#: ../src/mailbox-node.c:1061 ../src/main-window.c:354
-#: ../src/main-window.c:609 ../src/main-window.c:618
+#: ../src/ab-main.c:554 ../src/filter-edit-dialog.c:235
+#: ../src/mailbox-node.c:1059 ../src/main-window.c:352
+#: ../src/main-window.c:607 ../src/main-window.c:616
 msgid "_New"
 msgstr "_Нова"
 
-#: ../src/ab-main.c:557 ../src/address-book-config.c:868
+#: ../src/ab-main.c:555 ../src/address-book-config.c:866
 msgid "VCard Address Book (GnomeCard)"
 msgstr "Адресар Вкартице (Гномова картица)"
 
-#: ../src/ab-main.c:559 ../src/address-book-config.c:874
+#: ../src/ab-main.c:557 ../src/address-book-config.c:872
 msgid "External query (a program)"
 msgstr "Спољашњи упит (програм)"
 
-#: ../src/ab-main.c:561 ../src/address-book-config.c:879
+#: ../src/ab-main.c:559 ../src/address-book-config.c:877
 msgid "LDIF Address Book"
 msgstr "ЛДИФ адресар"
 
-#: ../src/ab-main.c:564 ../src/address-book-config.c:885
+#: ../src/ab-main.c:562 ../src/address-book-config.c:883
 msgid "LDAP Address Book"
 msgstr "ЛДАП адресар"
 
-#: ../src/ab-main.c:568 ../src/address-book-config.c:507
-#: ../src/address-book-config.c:892
+#: ../src/ab-main.c:566 ../src/address-book-config.c:505
+#: ../src/address-book-config.c:890
 msgid "GPE Address Book"
 msgstr "ГПЕ адресар"
 
-#: ../src/ab-main.c:572
-#| msgid "Address Book"
+#: ../src/ab-main.c:570
 msgid "Rubrica Address Book"
 msgstr "Адресар рубрике"
 
-#: ../src/ab-main.c:575
+#: ../src/ab-main.c:573
 msgid "_Properties"
 msgstr "_Својства"
 
-#: ../src/ab-main.c:576
+#: ../src/ab-main.c:574
 msgid "Edit address book properties"
 msgstr "Уредите својства адресара"
 
-#: ../src/ab-main.c:577 ../src/balsa-index.c:1911
-#: ../src/filter-edit-dialog.c:243 ../src/mailbox-node.c:1088
-#: ../src/mailbox-node.c:1104 ../src/pref-manager.c:1716
-#: ../src/pref-manager.c:1791 ../src/pref-manager.c:2968
+#: ../src/ab-main.c:575 ../src/balsa-index.c:1909
+#: ../src/filter-edit-dialog.c:241 ../src/mailbox-node.c:1086
+#: ../src/mailbox-node.c:1102 ../src/pref-manager.c:1714
+#: ../src/pref-manager.c:1789 ../src/pref-manager.c:2966
 msgid "_Delete"
 msgstr "_Обриши"
 
-#: ../src/ab-main.c:578
-#| msgid "Open the address book"
+#: ../src/ab-main.c:576
 msgid "Delete address book"
 msgstr "Обришите адресар"
 
-#: ../src/ab-main.c:579 ../src/main-window.c:389
+#: ../src/ab-main.c:577 ../src/main-window.c:387
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: ../src/ab-main.c:579
+#: ../src/ab-main.c:577
 msgid "Exit the program"
 msgstr "Напустите програм"
 
-#: ../src/ab-main.c:581
+#: ../src/ab-main.c:579
 msgid "_New Entry"
 msgstr "_Нови унос"
 
-#: ../src/ab-main.c:582
+#: ../src/ab-main.c:580
 msgid "Add new entry"
 msgstr "Додајте нови унос"
 
-#: ../src/ab-main.c:583
+#: ../src/ab-main.c:581
 msgid "_Delete Entry"
 msgstr "_Обриши унос"
 
-#: ../src/ab-main.c:584
+#: ../src/ab-main.c:582
 msgid "Delete entry"
 msgstr "Обришите унос"
 
-#: ../src/ab-main.c:585 ../src/main-window.c:481
+#: ../src/ab-main.c:583 ../src/main-window.c:479
 msgid "_About"
 msgstr "_О програму"
 
-#: ../src/ab-main.c:817
+#: ../src/ab-main.c:815
 msgid "_Name"
 msgstr "_Назив"
 
-#: ../src/ab-main.c:833
+#: ../src/ab-main.c:831
 msgid "_Address"
 msgstr "_Адреса"
 
-#: ../src/ab-main.c:959
+#: ../src/ab-main.c:957
 msgid "F_ilter:"
 msgstr "_Пропусник:"
 
-#: ../src/ab-window.c:172 ../src/filter-edit-dialog.c:220
-#: ../src/filter-export-dialog.c:92 ../src/filter-run-dialog.c:223
-#: ../src/filter-run-dialog.c:297
+#: ../src/ab-window.c:170 ../src/filter-edit-dialog.c:218
+#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:221
+#: ../src/filter-run-dialog.c:295
 msgid "Name"
 msgstr "Назив"
 
-#: ../src/ab-window.c:180
+#: ../src/ab-window.c:178
 msgid "E-Mail Address"
 msgstr "Адреса ел. поште"
 
 #. -- table column 1 --
 #. Entry widget for finding an address
-#: ../src/ab-window.c:292
+#: ../src/ab-window.c:290
 msgid "_Search for Name:"
 msgstr "_Тражи име:"
 
-#: ../src/ab-window.c:327
+#: ../src/ab-window.c:325
 msgid "Run Editor"
 msgstr "Покрени уређивача"
 
-#: ../src/ab-window.c:334
+#: ../src/ab-window.c:332
 msgid "_Re-Import"
 msgstr "_Поново увези"
 
 #. -- table column 3 --
 #. label for selected addresses in compose mode
-#: ../src/ab-window.c:366
+#: ../src/ab-window.c:364
 msgid "Send-To"
 msgstr "Пошаљи"
 
 #. mode switching stuff
-#: ../src/ab-window.c:381
+#: ../src/ab-window.c:379
 msgid "Treat multiple addresses as:"
 msgstr "Сматрај више адреса као:"
 
-#: ../src/ab-window.c:385
+#: ../src/ab-window.c:383
 msgid "alternative addresses for the same person"
 msgstr "алтернативне адресе исте особе"
 
-#: ../src/ab-window.c:390
+#: ../src/ab-window.c:388
 msgid "a distribution list"
 msgstr "списак прималаца"
 
-#: ../src/ab-window.c:433
+#: ../src/ab-window.c:431
 #, c-format
-#| msgid "Could not save %s: %s"
 msgid "Could not launch %s: %s"
 msgstr "Не могу да покренем %s: %s"
 
-#: ../src/ab-window.c:730
+#: ../src/ab-window.c:728
 #, c-format
 msgid ""
 "Error opening address book '%s':\n"
@@ -2476,107 +2430,99 @@ msgstr ""
 "Грешка отварања адресара „%s“\n"
 "%s"
 
-#: ../src/address-book-config.c:177
-#| msgid "Treat multiple addresses as:"
+#: ../src/address-book-config.c:175
 msgid "Suggest complete addresses:"
 msgstr "Предложи завршене адресе:"
 
-#: ../src/address-book-config.c:183
+#: ../src/address-book-config.c:181
 msgid "as I type"
 msgstr "када куцам"
 
-#: ../src/address-book-config.c:192
+#: ../src/address-book-config.c:190
 msgid "when I hit the Escape key"
 msgstr "када притиснем тастер „Ескејп“"
 
-#: ../src/address-book-config.c:229 ../src/address-book-config.c:330
+#: ../src/address-book-config.c:227 ../src/address-book-config.c:328
 #, c-format
-#| msgid "Modify Address Book"
 msgid "Modify %s Address Book"
 msgstr "Измени адресар „%s“"
 
-#: ../src/address-book-config.c:233 ../src/address-book-config.c:333
+#: ../src/address-book-config.c:231 ../src/address-book-config.c:331
 #, c-format
-#| msgid "Add Address Book"
 msgid "Add %s Address Book"
 msgstr "Додај адресар „%s“"
 
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:253 ../src/address-book-config.c:372
-#: ../src/address-book-config.c:438 ../src/address-book-config.c:505
-#| msgid "A_ddress Book Name"
+#: ../src/address-book-config.c:251 ../src/address-book-config.c:370
+#: ../src/address-book-config.c:436 ../src/address-book-config.c:503
 msgid "A_ddress Book Name:"
 msgstr "Назив _адресара:"
 
-#: ../src/address-book-config.c:377
-#| msgid "Load program location"
+#: ../src/address-book-config.c:375
 msgid "Load program location:"
 msgstr "Место програма за учитавање:"
 
-#: ../src/address-book-config.c:383
+#: ../src/address-book-config.c:381
 msgid "Select load program for address book"
 msgstr "Изаберите програм за учитавање адресара"
 
-#: ../src/address-book-config.c:390
-#| msgid "Save program location"
+#: ../src/address-book-config.c:388
 msgid "Save program location:"
 msgstr "Место програма за чување:"
 
-#: ../src/address-book-config.c:396
+#: ../src/address-book-config.c:394
 msgid "Select save program for address book"
 msgstr "Изаберите програм за чување адресара"
 
-#: ../src/address-book-config.c:443
+#: ../src/address-book-config.c:441
 msgid "_Host Name"
 msgstr "_Назив домаћина"
 
-#: ../src/address-book-config.c:448
+#: ../src/address-book-config.c:446
 msgid "Base Domain _Name"
 msgstr "Основни назив _домена"
 
-#: ../src/address-book-config.c:453
+#: ../src/address-book-config.c:451
 msgid "_User Name (Bind DN)"
 msgstr "_Корисничко име (Bind DN)"
 
-#: ../src/address-book-config.c:458
+#: ../src/address-book-config.c:456
 msgid "_Password"
 msgstr "_Лозинка"
 
-#: ../src/address-book-config.c:464
+#: ../src/address-book-config.c:462
 msgid "_User Address Book DN"
 msgstr "ДН _корисничког адресара"
 
-#: ../src/address-book-config.c:470
+#: ../src/address-book-config.c:468
 msgid "Enable _TLS"
 msgstr "Укључи _ТЛС"
 
-#: ../src/address-book-config.c:538 ../src/main-window.c:2721
-#: ../src/main-window.c:4486
+#: ../src/address-book-config.c:536 ../src/main-window.c:2719
+#: ../src/main-window.c:4484
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Грешка приказивања помоћи: %s\n"
 
-#: ../src/address-book-config.c:615
+#: ../src/address-book-config.c:613
 msgid "No path found.  Do you want to give one?"
 msgstr "Нисам пронашао путању.  Да ли желите да дате неку?"
 
-#: ../src/address-book-config.c:899
-#| msgid "Address Book"
+#: ../src/address-book-config.c:897
 msgid "Rubrica2 Address Book"
 msgstr "Адресар Рубрике2"
 
-#: ../src/balsa-app.c:79 ../src/folder-conf.c:276 ../src/mailbox-conf.c:1328
-#| msgid "_Remember password"
+#: ../src/balsa-app.c:77 ../src/folder-conf.c:274 ../src/mailbox-conf.c:1326
 msgid "_Remember password in keyring"
 msgstr "_Запамти лозинку у привеску кључева"
 
-#: ../src/balsa-app.c:82 ../src/folder-conf.c:279 ../src/mailbox-conf.c:1331
+#: ../src/balsa-app.c:80 ../src/folder-conf.c:277 ../src/mailbox-conf.c:1329
 msgid "_Remember password"
 msgstr "_Запамти лозинку"
 
-#: ../src/balsa-app.c:88
+#: ../src/balsa-app.c:86
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -2585,95 +2531,94 @@ msgstr ""
 "Отварам удаљено сандуче %s.\n"
 "_Лозинка за „%s %s“:"
 
-#: ../src/balsa-app.c:93
+#: ../src/balsa-app.c:91
 #, c-format
-#| msgid "Mailbox _password for %s %s:"
 msgid "_Password for %s %s (%s):"
 msgstr "_Лозинка за „%s %s“ (%s):"
 
-#: ../src/balsa-app.c:96
+#: ../src/balsa-app.c:94
 msgid "Password needed"
 msgstr "Неопходна је лозинка"
 
-#: ../src/balsa-app.c:551
+#: ../src/balsa-app.c:549
 #, c-format
 msgid "Couldn't open mailbox \"%s\""
 msgstr "Не могу да отворим сандуче „%s“"
 
-#: ../src/balsa-index.c:392 ../src/pref-manager.c:419
+#: ../src/balsa-index.c:390 ../src/pref-manager.c:417
 msgid "Date"
 msgstr "Датум"
 
-#: ../src/balsa-index.c:407 ../src/pref-manager.c:420
-#: ../src/sendmsg-window.c:3039
+#: ../src/balsa-index.c:405 ../src/pref-manager.c:418
+#: ../src/sendmsg-window.c:3048
 msgid "Size"
 msgstr "Величина"
 
-#: ../src/balsa-index.c:1726
+#: ../src/balsa-index.c:1724
 #, c-format
 msgid "Move to Trash failed: %s"
 msgstr "Премештање у смеће није успело: %s"
 
 #. Message menu items
-#: ../src/balsa-index.c:1884 ../src/main-window.c:537
-#: ../src/message-window.c:268
+#: ../src/balsa-index.c:1882 ../src/main-window.c:535
+#: ../src/message-window.c:266
 msgid "_Reply..."
 msgstr "_Одговори..."
 
-#: ../src/balsa-index.c:1886
+#: ../src/balsa-index.c:1884
 msgid "Reply To _All..."
 msgstr "Одговори _свима..."
 
-#: ../src/balsa-index.c:1888
+#: ../src/balsa-index.c:1886
 msgid "Reply To _Group..."
 msgstr "Одговори _групи..."
 
-#: ../src/balsa-index.c:1890
+#: ../src/balsa-index.c:1888
 msgid "_Forward Attached..."
 msgstr "_Проследи као прилог..."
 
-#: ../src/balsa-index.c:1892
+#: ../src/balsa-index.c:1890
 msgid "Forward _Inline..."
 msgstr "Проследи у _телу поруке..."
 
-#: ../src/balsa-index.c:1894 ../src/main-window.c:564
+#: ../src/balsa-index.c:1892 ../src/main-window.c:562
 msgid "_Pipe through..."
 msgstr "_Преспој..."
 
-#: ../src/balsa-index.c:1896 ../src/main-window.c:544
+#: ../src/balsa-index.c:1894 ../src/main-window.c:542
 msgid "_Store Address..."
 msgstr "_Ускладишти адресу..."
 
-#: ../src/balsa-index.c:1916
+#: ../src/balsa-index.c:1914
 msgid "_Undelete"
 msgstr "_Поништи брисање"
 
-#: ../src/balsa-index.c:1921
+#: ../src/balsa-index.c:1919
 msgid "Move To _Trash"
 msgstr "Премести у _смеће"
 
-#: ../src/balsa-index.c:1925
+#: ../src/balsa-index.c:1923
 msgid "T_oggle"
 msgstr "_Промени"
 
 #. Message:toggle-flag submenu items
-#: ../src/balsa-index.c:1929 ../src/main-window.c:614 ../src/main-window.c:659
+#: ../src/balsa-index.c:1927 ../src/main-window.c:612 ../src/main-window.c:657
 msgid "_Flagged"
 msgstr "_Означено"
 
-#: ../src/balsa-index.c:1932
+#: ../src/balsa-index.c:1930
 msgid "_Unread"
 msgstr "_Непрочитано"
 
-#: ../src/balsa-index.c:1940
+#: ../src/balsa-index.c:1938
 msgid "_Move to"
 msgstr "_Премести"
 
-#: ../src/balsa-index.c:1948
+#: ../src/balsa-index.c:1946
 msgid "_View Source"
 msgstr "_Погледај извор"
 
-#: ../src/balsa-index.c:2193
+#: ../src/balsa-index.c:2191
 #, c-format
 msgid "Failed to copy %d message to mailbox \"%s\": %s"
 msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
@@ -2682,224 +2627,216 @@ msgstr[1] "Нисам успео да умножим %d поруке у санд
 msgstr[2] "Нисам успео да умножим %d порука у сандуче „%s“: %s"
 msgstr[3] "Нисам успео да умножим %d поруку у сандуче „%s“: %s"
 
-#: ../src/balsa-index.c:2205
+#: ../src/balsa-index.c:2203
 #, c-format
 msgid "Copied to \"%s\"."
 msgstr "Умножено је у „%s“."
 
-#: ../src/balsa-index.c:2206
+#: ../src/balsa-index.c:2204
 #, c-format
 msgid "Moved to \"%s\"."
 msgstr "Премештено је у „%s“."
 
-#: ../src/balsa-index.c:2308
+#: ../src/balsa-index.c:2306
 #, c-format
 msgid "Committing mailbox %s failed."
 msgstr "Нисам успео да пошаљем сандуче „%s“."
 
-#: ../src/balsa-index.c:2406
+#: ../src/balsa-index.c:2404
 #, c-format
-#| msgid "Cannot access the message's body\n"
 msgid "Cannot process the message: %s"
 msgstr "Не могу да обрадим поруку: %s"
 
-#: ../src/balsa-index.c:2529
+#: ../src/balsa-index.c:2527
 #, c-format
-#| msgid "Cannot access the message's body\n"
 msgid "Cannot access message %u to pass to %s"
 msgstr "Не могу да приступим поруци „%u“ да бих прошао у %s"
 
-#: ../src/balsa-index.c:2556
+#: ../src/balsa-index.c:2554
 #, c-format
 msgid "Cannot read message %u to pass to %s"
 msgstr "Не могу да прочитам поруку „%u“ да бих прошао у %s"
 
-#: ../src/balsa-index.c:2725
+#: ../src/balsa-index.c:2723
 msgid "Pipe message through a program"
 msgstr "Проследи поруку кроз програм"
 
-#: ../src/balsa-index.c:2728
+#: ../src/balsa-index.c:2726
 msgid "_Run"
 msgstr "_Покрени"
 
-#: ../src/balsa-index.c:2740
+#: ../src/balsa-index.c:2738
 msgid "Specify the program to run:"
 msgstr "Наведите програм за покретање:"
 
-#: ../src/balsa-mblist.c:364
+#: ../src/balsa-mblist.c:362
 msgid "Mailbox"
 msgstr "Сандуче"
 
-#: ../src/balsa-mblist.c:1144 ../src/balsa-mblist.c:1194
+#: ../src/balsa-mblist.c:1142 ../src/balsa-mblist.c:1192
 msgid "Failed to find mailbox"
 msgstr "Нисам успео да пронађем сандуче"
 
-#: ../src/balsa-mblist.c:1780
+#: ../src/balsa-mblist.c:1778
 msgid "_Other..."
 msgstr "_Друго..."
 
-#: ../src/balsa-mblist.c:1848
+#: ../src/balsa-mblist.c:1846
 msgid "Choose destination folder"
 msgstr "Изаберите одредишну фасциклу"
 
-#: ../src/balsa-mblist.c:2061
+#: ../src/balsa-mblist.c:2059
 msgid "Other..."
 msgstr "Друго..."
 
-#: ../src/balsa-message.c:303
+#: ../src/balsa-message.c:301
 msgid "Check cryptographic signature"
 msgstr "Провери криптографски потпис"
 
-#: ../src/balsa-message.c:324
+#: ../src/balsa-message.c:322
 msgid "Select message part to display"
 msgstr "Изабери део поруке за приказивање"
 
-#: ../src/balsa-message.c:411
-#| msgid "_Wrap"
+#: ../src/balsa-message.c:409
 msgid "Wrapped"
 msgstr "Преломљено"
 
-#: ../src/balsa-message.c:415
-#| msgid "Host not found"
+#: ../src/balsa-message.c:413
 msgid "Not found"
 msgstr "Нисам пронашао"
 
-#: ../src/balsa-message.c:604
-#| msgid "Fwd:"
+#: ../src/balsa-message.c:602
 msgid "Find:"
 msgstr "Пронађи:"
 
-#: ../src/balsa-message.c:617 ../src/toolbar-factory.c:142
+#: ../src/balsa-message.c:615 ../src/toolbar-factory.c:140
 msgid "Previous"
 msgstr "Претходну"
 
-#: ../src/balsa-message.c:625 ../src/toolbar-factory.c:143
+#: ../src/balsa-message.c:623 ../src/toolbar-factory.c:141
 msgid "Next"
 msgstr "Следећу"
 
-#: ../src/balsa-message.c:714
+#: ../src/balsa-message.c:712
 msgid "Content"
 msgstr "Садржај"
 
-#: ../src/balsa-message.c:807
+#: ../src/balsa-message.c:805
 msgid "Message parts"
 msgstr "Делови поруке"
 
-#: ../src/balsa-message.c:983
+#: ../src/balsa-message.c:981
 msgid "Save selected as..."
 msgstr "Сачувај изабрано као..."
 
-#: ../src/balsa-message.c:990
+#: ../src/balsa-message.c:988
 msgid "Save selected to folder..."
 msgstr "Сачувај изабрано у фасциклу..."
 
-#: ../src/balsa-message.c:1083
+#: ../src/balsa-message.c:1081
 msgid "(No sender)"
 msgstr "(нема пошиљаоца)"
 
-#: ../src/balsa-message.c:1137 ../src/balsa-message.c:1149
+#: ../src/balsa-message.c:1135 ../src/balsa-message.c:1147
 #, c-format
 msgid "Could not access message %u in mailbox \"%s\"."
 msgstr "Не могу да приступим поруци „%u“ у сандучету „%s“."
 
-#: ../src/balsa-message.c:1323
+#: ../src/balsa-message.c:1321
 msgid "mixed parts"
 msgstr "измешани делови"
 
-#: ../src/balsa-message.c:1325
+#: ../src/balsa-message.c:1323
 msgid "alternative parts"
 msgstr "допунски делови"
 
-#: ../src/balsa-message.c:1327
+#: ../src/balsa-message.c:1325
 msgid "signed parts"
 msgstr "потписани делови"
 
-#: ../src/balsa-message.c:1329
+#: ../src/balsa-message.c:1327
 msgid "encrypted parts"
 msgstr "шифровани делови"
 
-#: ../src/balsa-message.c:1331
+#: ../src/balsa-message.c:1329
 msgid "rfc822 message"
 msgstr "рфц822 порука"
 
-#: ../src/balsa-message.c:1333
+#: ../src/balsa-message.c:1331
 #, c-format
 msgid "\"%s\" parts"
 msgstr "„%s“ делови"
 
-#: ../src/balsa-message.c:1381
+#: ../src/balsa-message.c:1379
 msgid "force inline for all parts"
 msgstr "присили унутрашње за све делове"
 
-#: ../src/balsa-message.c:1424
+#: ../src/balsa-message.c:1422
 #, c-format
 msgid "rfc822 message (from %s, subject \"%s\")"
 msgstr "рфц822 порука (шаље %s, тема „%s“)"
 
-#: ../src/balsa-message.c:1436
+#: ../src/balsa-message.c:1434
 msgid "complete message"
 msgstr "целокупна порука"
 
-#: ../src/balsa-message.c:1453
+#: ../src/balsa-message.c:1451
 #, c-format
 msgid "part %s: %s (file %s)"
 msgstr "део %s: %s (датотека %s)"
 
-#: ../src/balsa-message.c:1464
+#: ../src/balsa-message.c:1462
 #, c-format
 msgid "part %s: %s"
 msgstr "део %s: %s"
 
-#: ../src/balsa-message.c:1479
+#: ../src/balsa-message.c:1477
 msgid "encrypted: "
 msgstr "шифровано: "
 
-#: ../src/balsa-message.c:1616
+#: ../src/balsa-message.c:1614
 #, c-format
 msgid "Reading embedded message failed: %s"
 msgstr "Нисам успео да прочитам уграђену поруку: %s"
 
-#: ../src/balsa-message.c:1624
+#: ../src/balsa-message.c:1622
 #, c-format
 msgid "Appending message to %s failed: %s"
 msgstr "Нисам успео да прикачим поруку у „%s“: %s"
 
-#: ../src/balsa-message.c:1653
-#| msgid "Save..."
+#: ../src/balsa-message.c:1651
 msgid "_Save..."
 msgstr "_Сачувај..."
 
-#: ../src/balsa-message.c:1662 ../src/balsa-mime-widget-message.c:458
-#| msgid "Copy to folder:"
+#: ../src/balsa-message.c:1660 ../src/balsa-mime-widget-message.c:467
 msgid "_Copy to folder..."
 msgstr "_Умножи у фасциклу..."
 
-#: ../src/balsa-message.c:1745
+#: ../src/balsa-message.c:1743
 msgid "Select folder for saving selected parts"
 msgstr "Изаберите фасциклу за чување изабраних делова"
 
-#: ../src/balsa-message.c:1769
+#: ../src/balsa-message.c:1767
 #, c-format
 msgid "Could not create URI for %s"
 msgstr "Не могу да направим путању за „%s“"
 
-#: ../src/balsa-message.c:1794
+#: ../src/balsa-message.c:1792
 #, c-format
 msgid "%s message part"
 msgstr "%s дела поруке"
 
-#: ../src/balsa-message.c:1827 ../src/balsa-mime-widget-callbacks.c:165
+#: ../src/balsa-message.c:1825 ../src/balsa-mime-widget-callbacks.c:163
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "Не могу да сачувам %s: %s"
 
-#: ../src/balsa-message.c:2486 ../src/balsa-message.c:2630
+#: ../src/balsa-message.c:2484 ../src/balsa-message.c:2628
 #, c-format
-#| msgid "Message Disposition Notification Requests"
 msgid "Sending the disposition notification failed: %s"
 msgstr "Нисам успео да пошаљем обавештење о приспећу: %s"
 
-#: ../src/balsa-message.c:2583
+#: ../src/balsa-message.c:2581
 #, c-format
 msgid ""
 "The sender of this mail, %s, requested \n"
@@ -2910,11 +2847,11 @@ msgstr ""
 "обавештење о приспећу поруке (ОПП) буде враћено на „%s“.\n"
 "Да ли желите да пошаљете ово обавештење?"
 
-#: ../src/balsa-message.c:2593
+#: ../src/balsa-message.c:2591
 msgid "Reply to MDN?"
 msgstr "Да одговорим на ОПП?"
 
-#: ../src/balsa-message.c:2804
+#: ../src/balsa-message.c:2802
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once.\n"
@@ -2924,18 +2861,18 @@ msgstr ""
 "пута.\n"
 "Молим затворите остале примерке ове поруке и покушајте опет."
 
-#: ../src/balsa-message.c:2825 ../src/balsa-message.c:2910
-#: ../src/balsa-message.c:3032
+#: ../src/balsa-message.c:2823 ../src/balsa-message.c:2908
+#: ../src/balsa-message.c:3030
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Нисам успео да обрадим део поруке: %s"
 
-#: ../src/balsa-message.c:2826 ../src/balsa-message.c:2911
-#: ../src/balsa-message.c:3033
+#: ../src/balsa-message.c:2824 ../src/balsa-message.c:2909
+#: ../src/balsa-message.c:3031
 msgid "Possible disk space problem."
 msgstr "Могуће је да недостаје простор на диску."
 
-#: ../src/balsa-message.c:2840
+#: ../src/balsa-message.c:2838
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains an encrypted part, but "
@@ -2944,7 +2881,7 @@ msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи шифровани део, али је њена "
 "структура неисправна."
 
-#: ../src/balsa-message.c:2848
+#: ../src/balsa-message.c:2846
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
@@ -2953,7 +2890,7 @@ msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи ПГП шифровани део, али овај "
 "протокол шифровања није доступан."
 
-#: ../src/balsa-message.c:2861
+#: ../src/balsa-message.c:2859
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a S/MIME encrypted part, "
@@ -2962,7 +2899,7 @@ msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи С/МИМЕ шифровани део, али овај "
 "протокол шифровања није доступан."
 
-#: ../src/balsa-message.c:2928
+#: ../src/balsa-message.c:2926
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a signed part, but its "
@@ -2971,7 +2908,7 @@ msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи део са потписом, али је "
 "структура неисправна. Потпис, ако уопште постоји, се не може проверити."
 
-#: ../src/balsa-message.c:2941
+#: ../src/balsa-message.c:2939
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a %s signed part, but "
@@ -2980,28 +2917,28 @@ msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи „%s“ потписани део, али овај "
 "протокол шифровања није доступан."
 
-#: ../src/balsa-message.c:2944
+#: ../src/balsa-message.c:2942
 msgid "PGP"
 msgstr "ПГП"
 
-#: ../src/balsa-message.c:2944 ../src/balsa-mime-widget-crypto.c:78
-#: ../src/print-gtk.c:201
+#: ../src/balsa-message.c:2942 ../src/balsa-mime-widget-crypto.c:76
+#: ../src/print-gtk.c:199
 msgid "S/MIME"
 msgstr "С/МИМЕ"
 
-#: ../src/balsa-message.c:2968 ../src/balsa-message.c:3095
+#: ../src/balsa-message.c:2966 ../src/balsa-message.c:3093
 msgid "Detected a good signature"
 msgstr "Открио сам добар потпис"
 
-#: ../src/balsa-message.c:2974
+#: ../src/balsa-message.c:2972
 msgid "Detected a good signature with insufficient validity"
 msgstr "Препознао сам исправан потпис са недовољно исправности"
 
-#: ../src/balsa-message.c:2979 ../src/balsa-message.c:3099
+#: ../src/balsa-message.c:2977 ../src/balsa-message.c:3097
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr "Препознао сам исправан потпис са недовољно исправности/поверења"
 
-#: ../src/balsa-message.c:2986 ../src/balsa-message.c:3105
+#: ../src/balsa-message.c:2984 ../src/balsa-message.c:3103
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" "
@@ -3011,7 +2948,7 @@ msgstr ""
 "Провера потписа поруке коју је послао %s са темом „%s“ је вратило:\n"
 "%s"
 
-#: ../src/balsa-message.c:2998
+#: ../src/balsa-message.c:2996
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" failed "
@@ -3020,15 +2957,14 @@ msgstr ""
 "Провера потписа поруке коју је послао %s са темом „%s“ није успела и вратила "
 "је грешку!"
 
-#: ../src/balsa-message.c:3057
+#: ../src/balsa-message.c:3055
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once."
 msgstr ""
-"Дешифровање не може бити обављено зато што је ова порука приказана више "
-"пута."
+"Дешифровање не може бити обављено зато што је ова порука приказана више пута."
 
-#: ../src/balsa-message.c:3059
+#: ../src/balsa-message.c:3057
 msgid ""
 "The signature check and removal of the OpenPGP armor cannot be performed "
 "because this message is displayed more than once."
@@ -3036,67 +2972,64 @@ msgstr ""
 "Провера потписа и уклањање ОпенПГП оклопа не може бити обављено зато што је "
 "ова порука приказана више пута."
 
-#: ../src/balsa-message.c:3062
+#: ../src/balsa-message.c:3060
 msgid "Please close the other instances of this message and try again."
 msgstr "Молим затворите остале примерке ове поруке и покушајте опет."
 
-#: ../src/balsa-mime-widget.c:237 ../src/balsa-mime-widget-message.c:163
-#: ../src/balsa-mime-widget-message.c:209
+#: ../src/balsa-mime-widget.c:236 ../src/balsa-mime-widget-message.c:172
+#: ../src/balsa-mime-widget-message.c:218
 #, c-format
 msgid "File name: %s"
 msgstr "Назив датотеке: %s"
 
-#: ../src/balsa-mime-widget.c:256
+#: ../src/balsa-mime-widget.c:255
 #, c-format
 msgid "Error reading message part: %s"
 msgstr "Грешка читања дела поруке: %s"
 
-#: ../src/balsa-mime-widget.c:280
+#: ../src/balsa-mime-widget.c:279
 #, c-format
 msgid "Type: %s (%s)"
 msgstr "Врста: %s (%s)"
 
-#: ../src/balsa-mime-widget.c:284
+#: ../src/balsa-mime-widget.c:283
 #, c-format
 msgid "Content Type: %s"
 msgstr "Врста садржаја: %s"
 
-#: ../src/balsa-mime-widget.c:297
-#| msgid "No open or view action defined in GNOME MIME for this content type"
+#: ../src/balsa-mime-widget.c:296
 msgid "No open or view action defined for this content type"
 msgstr "Није одређена радња за отварање или преглед ове врсте садржаја"
 
-#: ../src/balsa-mime-widget.c:302
+#: ../src/balsa-mime-widget.c:301
 msgid "S_ave part"
 msgstr "Сачувај _део"
 
-#: ../src/balsa-mime-widget-callbacks.c:54 ../src/sendmsg-window.c:1804
+#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1813
 #, c-format
 msgid "Could not launch application: %s"
 msgstr "Не могу да покренем програм: %s"
 
-#: ../src/balsa-mime-widget-callbacks.c:81
+#: ../src/balsa-mime-widget-callbacks.c:79
 #, c-format
 msgid "Save %s MIME Part"
 msgstr "Сачувај %s МИМЕ део"
 
-#: ../src/balsa-mime-widget-callbacks.c:123
+#: ../src/balsa-mime-widget-callbacks.c:121
 #, c-format
-#| msgid "Could not connect to %s (%s)."
 msgid "Could not construct URI from %s"
 msgstr "Не могу да направим путању из „%s“"
 
-#: ../src/balsa-mime-widget-callbacks.c:142
+#: ../src/balsa-mime-widget-callbacks.c:140
 msgid "File already exists. Overwrite?"
 msgstr "Датотека већ постоји. Да препишем преко?"
 
-#: ../src/balsa-mime-widget-callbacks.c:152
+#: ../src/balsa-mime-widget-callbacks.c:150
 #, c-format
-#| msgid "%s: %s"
 msgid "Unlink %s: %s"
 msgstr "Развежи %s: %s"
 
-#: ../src/balsa-mime-widget-crypto.c:76
+#: ../src/balsa-mime-widget-crypto.c:74
 #, c-format
 msgid ""
 "This is an inline %s signed %s message part:\n"
@@ -3105,218 +3038,212 @@ msgstr ""
 "Ово је непосредно %s потписани %s део поруке:\n"
 "%s"
 
-#: ../src/balsa-mime-widget-crypto.c:78 ../src/print-gtk.c:201
+#: ../src/balsa-mime-widget-crypto.c:76 ../src/print-gtk.c:199
 msgid "OpenPGP"
 msgstr "ОпенПГП"
 
-#: ../src/balsa-mime-widget-crypto.c:96
+#: ../src/balsa-mime-widget-crypto.c:94
 msgid "_Run GnuPG to import this key"
 msgstr "_Покрени ГнуПГ за увоз овог кључа"
 
-#: ../src/balsa-mime-widget-crypto.c:100
+#: ../src/balsa-mime-widget-crypto.c:98
 msgid "_Run GnuPG to check for an update of this key"
 msgstr "_Покрени ГнуПГ за проверу ажурирања овог кључа"
 
-#: ../src/balsa-mime-widget-image.c:54 ../src/balsa-mime-widget-image.c:178
+#: ../src/balsa-mime-widget-image.c:52 ../src/balsa-mime-widget-image.c:176
 #, c-format
 msgid "Error loading attached image: %s\n"
 msgstr "Грешка учитавања приложене слике: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:161
-#: ../src/balsa-mime-widget-message.c:173
-#: ../src/balsa-mime-widget-message.c:201
-#: ../src/balsa-mime-widget-message.c:254
+#: ../src/balsa-mime-widget-message.c:140
+#| msgid "Message parts"
+msgid "message headers"
+msgstr "заглавља поруке"
+
+#: ../src/balsa-mime-widget-message.c:170
+#: ../src/balsa-mime-widget-message.c:182
+#: ../src/balsa-mime-widget-message.c:210
+#: ../src/balsa-mime-widget-message.c:263
 msgid "Content Type: external-body\n"
 msgstr "Врста садржаја: спољашње тело\n"
 
-#: ../src/balsa-mime-widget-message.c:162
+#: ../src/balsa-mime-widget-message.c:171
 #, c-format
 msgid "Access type: local-file\n"
 msgstr "Врста приступа: локална датотека\n"
 
-#: ../src/balsa-mime-widget-message.c:174
+#: ../src/balsa-mime-widget-message.c:183
 #, c-format
 msgid "Access type: URL\n"
 msgstr "Врста приступа: адреса\n"
 
-#: ../src/balsa-mime-widget-message.c:175
+#: ../src/balsa-mime-widget-message.c:184
 #, c-format
 msgid "URL: %s"
 msgstr "Адреса: %s"
 
-#: ../src/balsa-mime-widget-message.c:202
+#: ../src/balsa-mime-widget-message.c:211
 #, c-format
 msgid "Access type: %s\n"
 msgstr "Врста приступа: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:206
+#: ../src/balsa-mime-widget-message.c:215
 #, c-format
 msgid "FTP site: %s\n"
 msgstr "ФТП сајт: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:208
+#: ../src/balsa-mime-widget-message.c:217
 #, c-format
 msgid "Directory: %s\n"
 msgstr "Директоријум: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:255
+#: ../src/balsa-mime-widget-message.c:264
 msgid "Access type: mail-server\n"
 msgstr "Врста приступа: сервер поште\n"
 
-#: ../src/balsa-mime-widget-message.c:256
+#: ../src/balsa-mime-widget-message.c:265
 #, c-format
 msgid "Mail server: %s\n"
 msgstr "Сервер поште: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:258
+#: ../src/balsa-mime-widget-message.c:267
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:275
+#: ../src/balsa-mime-widget-message.c:284
 msgid "Se_nd message to obtain this part"
 msgstr "Пошаљи _поруку да добијеш овај део"
 
-#: ../src/balsa-mime-widget-message.c:296 ../src/balsa-mime-widget-text.c:811
-#: ../src/sendmsg-window.c:1825
+#: ../src/balsa-mime-widget-message.c:305 ../src/balsa-mime-widget-text.c:809
+#: ../src/sendmsg-window.c:1834
 #, c-format
 msgid "Error showing %s: %s\n"
 msgstr "Грешка приказивања „%s“: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:331
+#: ../src/balsa-mime-widget-message.c:340
 #, c-format
 msgid "Could not get a part: %s"
 msgstr "Не могу да преузмем део: %s"
 
-#: ../src/balsa-mime-widget-message.c:363
+#: ../src/balsa-mime-widget-message.c:372
 #, c-format
 msgid "Sending the external body request failed: %s"
 msgstr "Нисам успео да пошаљем захтев спољног тела: %s"
 
-#: ../src/balsa-mime-widget-message.c:450
-#| msgid "_Reply..."
+#: ../src/balsa-mime-widget-message.c:459
 msgid "Reply..."
 msgstr "Одговори..."
 
-#: ../src/balsa-mime-widget-message.c:555
+#: ../src/balsa-mime-widget-message.c:564
 msgid "... [truncated]"
 msgstr "... [скраћено]"
 
 #. Gmail sometimes fails to do that.
-#: ../src/balsa-mime-widget-message.c:705
+#: ../src/balsa-mime-widget-message.c:714
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../src/balsa-mime-widget-message.c:706
+#: ../src/balsa-mime-widget-message.c:715
 msgid "IMAP server did not report message structure"
 msgstr "ИМАП сервер није известио о структури поруке"
 
-#: ../src/balsa-mime-widget-message.c:718
-#: ../src/balsa-print-object-header.c:155 ../src/sendmsg-window.c:1144
-#: ../src/sendmsg-window.c:1146 ../src/sendmsg-window.c:1236
-#: ../src/sendmsg-window.c:3840 ../src/sendmsg-window.c:5762
+#: ../src/balsa-mime-widget-message.c:727
+#: ../src/balsa-print-object-header.c:153 ../src/sendmsg-window.c:1152
+#: ../src/sendmsg-window.c:1154 ../src/sendmsg-window.c:1244
+#: ../src/sendmsg-window.c:3849 ../src/sendmsg-window.c:5776
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../src/balsa-mime-widget-message.c:722
-#: ../src/balsa-print-object-header.c:163 ../src/sendmsg-window.c:3836
+#: ../src/balsa-mime-widget-message.c:731
+#: ../src/balsa-print-object-header.c:161 ../src/sendmsg-window.c:3845
 msgid "Date:"
 msgstr "Датум:"
 
 #. addresses
-#: ../src/balsa-mime-widget-message.c:728
-#: ../src/balsa-print-object-header.c:168 ../src/sendmsg-window.c:3847
-#: ../src/store-address.c:340
+#: ../src/balsa-mime-widget-message.c:737
+#: ../src/balsa-print-object-header.c:166 ../src/sendmsg-window.c:3856
+#: ../src/store-address.c:338
 msgid "From:"
 msgstr "Шаље:"
 
-#: ../src/balsa-mime-widget-message.c:735
+#: ../src/balsa-mime-widget-message.c:744
 msgid "Reply-To:"
 msgstr "Одговори на:"
 
-#: ../src/balsa-mime-widget-message.c:744
-#: ../src/balsa-print-object-header.c:176
+#: ../src/balsa-mime-widget-message.c:753
+#: ../src/balsa-print-object-header.c:174
 msgid "Fcc:"
 msgstr "Умножак датотеке:"
 
-#: ../src/balsa-mime-widget-message.c:751
-#: ../src/balsa-print-object-header.c:179
+#: ../src/balsa-mime-widget-message.c:760
+#: ../src/balsa-print-object-header.c:177
 msgid "Disposition-Notification-To:"
 msgstr "Порука о приспећу:"
 
-#: ../src/balsa-mime-widget-text.c:174
+#: ../src/balsa-mime-widget-text.c:172
 #, c-format
 msgid "Could not save a text part: %s"
 msgstr "Не могу да сачувам текстуални део: %s"
 
-#: ../src/balsa-mime-widget-text.c:518
+#: ../src/balsa-mime-widget-text.c:516
 msgid "Copy link"
 msgstr "Умножи везу"
 
-#: ../src/balsa-mime-widget-text.c:523
-#| msgid "Open next"
+#: ../src/balsa-mime-widget-text.c:521
 msgid "Open link"
 msgstr "Отвори везу"
 
-#: ../src/balsa-mime-widget-text.c:528
-#| msgid "Sending Mail..."
+#: ../src/balsa-mime-widget-text.c:526
 msgid "Send link..."
 msgstr "Пошаљи везу..."
 
-#: ../src/balsa-mime-widget-text.c:561 ../src/balsa-mime-widget-text.c:1053
+#: ../src/balsa-mime-widget-text.c:559 ../src/balsa-mime-widget-text.c:1051
 msgid "Save..."
 msgstr "Сачувај..."
 
-#: ../src/balsa-mime-widget-text.c:571
-#| msgid "Highlight cited text"
+#: ../src/balsa-mime-widget-text.c:569
 msgid "Highlight structured phrases"
 msgstr "Истакни сређене изразе"
 
-#: ../src/balsa-mime-widget-text.c:798
+#: ../src/balsa-mime-widget-text.c:796
 #, c-format
 msgid "Calling URL %s..."
 msgstr "Позивам адресу %s..."
 
-#: ../src/balsa-mime-widget-text.c:1167
-#| msgid "Address Book"
+#: ../src/balsa-mime-widget-text.c:1165
 msgid "Address"
 msgstr "Адресар"
 
-#: ../src/balsa-mime-widget-text.c:1170
+#: ../src/balsa-mime-widget-text.c:1168
 msgid "S_tore"
 msgstr "_Смести"
 
-#: ../src/balsa-mime-widget-text.c:1178 ../src/balsa-print-object-text.c:508
-#| msgid "_Full Name:"
+#: ../src/balsa-mime-widget-text.c:1176 ../src/balsa-print-object-text.c:506
 msgid "Full Name"
 msgstr "Име и презиме"
 
-#: ../src/balsa-mime-widget-text.c:1179 ../src/balsa-print-object-text.c:510
-#| msgid "_Nickname:"
+#: ../src/balsa-mime-widget-text.c:1177 ../src/balsa-print-object-text.c:508
 msgid "Nick Name"
 msgstr "Надимак"
 
-#: ../src/balsa-mime-widget-text.c:1180 ../src/balsa-print-object-text.c:512
-#| msgid "_First Name:"
+#: ../src/balsa-mime-widget-text.c:1178 ../src/balsa-print-object-text.c:510
 msgid "First Name"
 msgstr "Име"
 
-#: ../src/balsa-mime-widget-text.c:1181 ../src/balsa-print-object-text.c:514
-#| msgid "_Last Name:"
+#: ../src/balsa-mime-widget-text.c:1179 ../src/balsa-print-object-text.c:512
 msgid "Last Name"
 msgstr "Презиме"
 
-#: ../src/balsa-mime-widget-text.c:1182 ../src/balsa-print-object-text.c:516
-#| msgid "O_rganization:"
+#: ../src/balsa-mime-widget-text.c:1180 ../src/balsa-print-object-text.c:514
 msgid "Organization"
 msgstr "Организација"
 
-#: ../src/balsa-mime-widget-text.c:1184 ../src/balsa-print-object-text.c:519
-#| msgid "_Email Address:"
+#: ../src/balsa-mime-widget-text.c:1182 ../src/balsa-print-object-text.c:517
 msgid "Email Address"
 msgstr "Адреса ел. поште"
 
-#: ../src/balsa-mime-widget-text.c:1213
+#: ../src/balsa-mime-widget-text.c:1211
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains 8-bit characters, but no "
@@ -3325,408 +3252,404 @@ msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи 8-битне знакове, али не и "
 "заглавље које описује коришћени скуп кодова (пребачено у %s)"
 
-#: ../src/balsa-mime-widget-vcalendar.c:67
+#: ../src/balsa-mime-widget-vcalendar.c:65
 #, c-format
 msgid "This is an iTIP calendar \"%s\" message."
 msgstr "Ово је порука иТИП календара „%s“."
 
-#: ../src/balsa-mime-widget-vcalendar.c:169
-#: ../src/balsa-print-object-text.c:665
+#: ../src/balsa-mime-widget-vcalendar.c:167
+#: ../src/balsa-print-object-text.c:663
 msgid "Summary"
 msgstr "Сажетак"
 
-#: ../src/balsa-mime-widget-vcalendar.c:170
-#: ../src/balsa-print-object-text.c:667
+#: ../src/balsa-mime-widget-vcalendar.c:168
+#: ../src/balsa-print-object-text.c:665
 msgid "Organizer"
 msgstr "Организатор"
 
-#: ../src/balsa-mime-widget-vcalendar.c:171
-#: ../src/balsa-print-object-text.c:669
+#: ../src/balsa-mime-widget-vcalendar.c:169
+#: ../src/balsa-print-object-text.c:667
 msgid "Start"
 msgstr "Почетак"
 
-#: ../src/balsa-mime-widget-vcalendar.c:172
-#: ../src/balsa-print-object-text.c:671
+#: ../src/balsa-mime-widget-vcalendar.c:170
+#: ../src/balsa-print-object-text.c:669
 msgid "End"
 msgstr "Крај"
 
-#: ../src/balsa-mime-widget-vcalendar.c:173
-#: ../src/balsa-print-object-text.c:673
+#: ../src/balsa-mime-widget-vcalendar.c:171
+#: ../src/balsa-print-object-text.c:671
 msgid "Location"
 msgstr "Место"
 
-#: ../src/balsa-mime-widget-vcalendar.c:205
-#: ../src/balsa-print-object-text.c:682
+#: ../src/balsa-mime-widget-vcalendar.c:203
+#: ../src/balsa-print-object-text.c:680
 msgid "Attendees"
 msgstr "Званице"
 
-#: ../src/balsa-mime-widget-vcalendar.c:205
-#: ../src/balsa-print-object-text.c:682
+#: ../src/balsa-mime-widget-vcalendar.c:203
+#: ../src/balsa-print-object-text.c:680
 msgid "Attendee"
 msgstr "Званица"
 
-#: ../src/balsa-mime-widget-vcalendar.c:208
-#: ../src/balsa-print-object-text.c:696 ../src/sendmsg-window.c:3051
+#: ../src/balsa-mime-widget-vcalendar.c:206
+#: ../src/balsa-print-object-text.c:694 ../src/sendmsg-window.c:3060
 msgid "Description"
 msgstr "Опис"
 
-#: ../src/balsa-mime-widget-vcalendar.c:229
+#: ../src/balsa-mime-widget-vcalendar.c:227
 msgid "The sender asks you for a reply to this request:"
 msgstr "Пошиљалац је затражио да одговорите на овај захтев:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:236
+#: ../src/balsa-mime-widget-vcalendar.c:234
 msgid "Accept"
 msgstr "Прихвати"
 
-#: ../src/balsa-mime-widget-vcalendar.c:245
-#| msgid "_Accept Once"
+#: ../src/balsa-mime-widget-vcalendar.c:243
 msgid "Accept tentatively"
 msgstr "Прихвати уз резерву"
 
-#: ../src/balsa-mime-widget-vcalendar.c:253
+#: ../src/balsa-mime-widget-vcalendar.c:251
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../src/balsa-mime-widget-vcalendar.c:300
+#: ../src/balsa-mime-widget-vcalendar.c:298
 msgid "iTip Calendar Request"
 msgstr "Захтев иТИП календара"
 
-#: ../src/balsa-mime-widget-vcalendar.c:334
+#: ../src/balsa-mime-widget-vcalendar.c:332
 #, c-format
 msgid "Sending the iTip calendar reply failed: %s"
 msgstr "Нисам успео да пошаљем одговор иТИП календара: %s"
 
+#: ../src/balsa-print-object-default.c:151
 #: ../src/balsa-print-object-default.c:153
-#: ../src/balsa-print-object-default.c:155
-#: ../src/balsa-print-object-default.c:158
+#: ../src/balsa-print-object-default.c:156
 msgid "Type:"
 msgstr "Врста:"
 
-#: ../src/balsa-print-object-default.c:163
-#: ../src/balsa-print-object-default.c:167
+#: ../src/balsa-print-object-default.c:161
+#: ../src/balsa-print-object-default.c:165
 msgid "File name:"
 msgstr "Назив датотеке:"
 
-#: ../src/filter-edit-callbacks.c:337
+#: ../src/filter-edit-callbacks.c:335
 msgid "One of the specified fields contains:"
 msgstr "Једно од задатих поља садржи:"
 
-#: ../src/filter-edit-callbacks.c:338
+#: ../src/filter-edit-callbacks.c:336
 msgid "None of the specified fields contains:"
 msgstr "Ниједно од задатих поља не садржи:"
 
-#: ../src/filter-edit-callbacks.c:340
+#: ../src/filter-edit-callbacks.c:338
 msgid "One of the regular expressions matches"
 msgstr "Један од регуларних израза одговара"
 
-#: ../src/filter-edit-callbacks.c:341
+#: ../src/filter-edit-callbacks.c:339
 msgid "None of the regular expressions matches"
 msgstr "Ниједан од регуларних израза не одговара"
 
-#: ../src/filter-edit-callbacks.c:343
+#: ../src/filter-edit-callbacks.c:341
 msgid "Match when date is in the interval:"
 msgstr "Одговара када је датум у интервалу:"
 
-#: ../src/filter-edit-callbacks.c:344
+#: ../src/filter-edit-callbacks.c:342
 msgid "Match when date is outside the interval:"
 msgstr "Одговара када датум није у интервалу:"
 
-#: ../src/filter-edit-callbacks.c:346 ../src/filter-edit-callbacks.c:1155
+#: ../src/filter-edit-callbacks.c:344 ../src/filter-edit-callbacks.c:1153
 msgid "Match when one of these flags is set:"
 msgstr "Одговара када је нека од ових ознака постављена:"
 
-#: ../src/filter-edit-callbacks.c:347
+#: ../src/filter-edit-callbacks.c:345
 msgid "Match when none of these flags is set:"
 msgstr "Одговара када ниједна од ових ознака није постављена:"
 
-#: ../src/filter-edit-callbacks.c:554
+#: ../src/filter-edit-callbacks.c:552
 msgid "You must specify the name of the user header to match on"
 msgstr "Морате да задате назив корисничког заглавља које се упоређује"
 
-#: ../src/filter-edit-callbacks.c:565
+#: ../src/filter-edit-callbacks.c:563
 msgid "You must specify at least one field for matching"
 msgstr "Морате да задате бар једно поље за упоређивање"
 
-#: ../src/filter-edit-callbacks.c:575
+#: ../src/filter-edit-callbacks.c:573
 msgid "You must provide a string"
 msgstr "Морате да обезбедите ниску"
 
-#: ../src/filter-edit-callbacks.c:583
+#: ../src/filter-edit-callbacks.c:581
 msgid "You must provide at least one regular expression"
 msgstr "Морате да обезбедите бар један регуларни израз"
 
-#: ../src/filter-edit-callbacks.c:596
+#: ../src/filter-edit-callbacks.c:594
 msgid "Low date is incorrect"
 msgstr "Почетни датум је неисправан"
 
-#: ../src/filter-edit-callbacks.c:607
+#: ../src/filter-edit-callbacks.c:605
 msgid "High date is incorrect"
 msgstr "Завршни датум је неисправан"
 
-#: ../src/filter-edit-callbacks.c:615
+#: ../src/filter-edit-callbacks.c:613
 msgid "Low date is greater than high date"
 msgstr "Почетни датум је већи од завршног"
 
-#: ../src/filter-edit-callbacks.c:910
+#: ../src/filter-edit-callbacks.c:908
 #, c-format
 msgid "Error displaying condition help: %s\n"
 msgstr "Грешка приказивања помоћи за услове: %s\n"
 
-#: ../src/filter-edit-callbacks.c:951
+#: ../src/filter-edit-callbacks.c:949
 msgid "Match Fields"
 msgstr "Поклопи поља"
 
-#: ../src/filter-edit-callbacks.c:961
+#: ../src/filter-edit-callbacks.c:959
 msgid "_All"
 msgstr "_Све"
 
-#: ../src/filter-edit-callbacks.c:962
+#: ../src/filter-edit-callbacks.c:960
 msgid "C_lear"
 msgstr "_Очисти"
 
-#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:4362
+#: ../src/filter-edit-callbacks.c:962 ../src/main-window.c:4360
 msgid "_Body"
 msgstr "_Тело"
 
-#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:4363
+#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:4361
 msgid "_To:"
 msgstr "_Прима:"
 
-#: ../src/filter-edit-callbacks.c:966 ../src/main-window.c:4364
+#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:4362
 msgid "_From:"
 msgstr "_Шаље:"
 
-#: ../src/filter-edit-callbacks.c:967
+#: ../src/filter-edit-callbacks.c:965
 msgid "_Subject"
 msgstr "_Тема"
 
-#: ../src/filter-edit-callbacks.c:968 ../src/main-window.c:4366
+#: ../src/filter-edit-callbacks.c:966 ../src/main-window.c:4364
 msgid "_Cc:"
 msgstr "_Копија:"
 
-#: ../src/filter-edit-callbacks.c:970
+#: ../src/filter-edit-callbacks.c:968
 msgid "_User header:"
 msgstr "_Корисничко заглавље:"
 
-#: ../src/filter-edit-callbacks.c:1011
+#: ../src/filter-edit-callbacks.c:1009
 msgid "Unread"
 msgstr "Непрочитано"
 
-#: ../src/filter-edit-callbacks.c:1026
+#: ../src/filter-edit-callbacks.c:1024
 msgid "One of the specified f_ields contains"
 msgstr "Једно од задатих поља _садржи"
 
-#: ../src/filter-edit-callbacks.c:1041
+#: ../src/filter-edit-callbacks.c:1039
 msgid "Contain/Does _Not Contain"
 msgstr "Садржи/_не садржи"
 
-#: ../src/filter-edit-callbacks.c:1061
+#: ../src/filter-edit-callbacks.c:1059
 msgid "_One of the regular expressions matches"
 msgstr "_Један од регуларних израза одговара"
 
 #. Left/Remove button
-#: ../src/filter-edit-callbacks.c:1092 ../src/filter-edit-dialog.c:341
-#: ../src/filter-run-dialog.c:334
+#: ../src/filter-edit-callbacks.c:1090 ../src/filter-edit-dialog.c:339
+#: ../src/filter-run-dialog.c:332
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../src/filter-edit-callbacks.c:1096
+#: ../src/filter-edit-callbacks.c:1094
 msgid "One _Matches/None Matches"
 msgstr "_Један одговара/ниједан не одговара"
 
-#: ../src/filter-edit-callbacks.c:1107
-#| msgid "Error in regular expression syntax"
+#: ../src/filter-edit-callbacks.c:1105
 msgid "Filtering using regular expressions is not yet implemented."
 msgstr "Пробирање употребом регуларних израза још није примењено."
 
-#: ../src/filter-edit-callbacks.c:1117
+#: ../src/filter-edit-callbacks.c:1115
 msgid "Match when message date is in the interval:"
 msgstr "Одговара када је датум поруке у интервалу:"
 
-#: ../src/filter-edit-callbacks.c:1137
+#: ../src/filter-edit-callbacks.c:1135
 msgid "Inside/outside the date interval"
 msgstr "Унутар/ван интервала датума"
 
-#: ../src/filter-edit-callbacks.c:1184
+#: ../src/filter-edit-callbacks.c:1182
 msgid "Match when one flag is set/when no flag is set"
 msgstr ""
 "Одговара када је једна ознака постављена/када ниједна ознака није постављена"
 
-#: ../src/filter-edit-callbacks.c:1203
+#: ../src/filter-edit-callbacks.c:1201
 msgid "Search T_ype:"
 msgstr "_Врста претраге:"
 
-#: ../src/filter-edit-callbacks.c:1280
+#: ../src/filter-edit-callbacks.c:1278
 msgid "Edit condition for filter: "
 msgstr "Уреди услов пропусника: "
 
-#: ../src/filter-edit-callbacks.c:1498 ../src/save-restore.c:1973
+#: ../src/filter-edit-callbacks.c:1496 ../src/save-restore.c:1971
 msgid "Filter with no condition was omitted"
 msgstr "Пропусник без услова је изостављен"
 
-#: ../src/filter-edit-callbacks.c:1524
+#: ../src/filter-edit-callbacks.c:1522
 #, c-format
 msgid "Error displaying filter help: %s\n"
 msgstr "Грешка приказивања помоћи пропусника: %s\n"
 
-#: ../src/filter-edit-callbacks.c:1723
+#: ../src/filter-edit-callbacks.c:1721
 msgid "New filter"
 msgstr "Нови пропусник"
 
-#: ../src/filter-edit-callbacks.c:1852
+#: ../src/filter-edit-callbacks.c:1850
 msgid "No filter name specified."
 msgstr "Није наведен назив пропусника."
 
-#: ../src/filter-edit-callbacks.c:1857
+#: ../src/filter-edit-callbacks.c:1855
 #, c-format
 msgid "Filter \"%s\" already exists."
 msgstr "Пропусник „%s“ већ постоји."
 
-#: ../src/filter-edit-callbacks.c:1867
+#: ../src/filter-edit-callbacks.c:1865
 msgid "Filter must have conditions."
 msgstr "Пропусник мора да има услове."
 
-#: ../src/filter-edit-callbacks.c:1953
+#: ../src/filter-edit-callbacks.c:1951
 msgid "Filter has matched"
 msgstr "Пропусник се поклапа"
 
-#: ../src/filter-edit-callbacks.c:1973
+#: ../src/filter-edit-callbacks.c:1971
 msgid "You must provide a sound to play"
 msgstr "Морате да обезбедите звук за пуштање"
 
-#: ../src/filter-edit-callbacks.c:2155
+#: ../src/filter-edit-callbacks.c:2153
 #, c-format
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Пример: 31. децембар 2000. пишите као %s)"
 
-#: ../src/filter-edit-dialog.c:97 ../src/pref-manager.c:426
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:424
 msgid "Simple"
 msgstr "Једноставно"
 
-#: ../src/filter-edit-dialog.c:98
+#: ../src/filter-edit-dialog.c:96
 msgid "Regular Expression"
 msgstr "Регуларни изрази"
 
-#: ../src/filter-edit-dialog.c:99
+#: ../src/filter-edit-dialog.c:97
 msgid "Date interval"
 msgstr "Интервал датума"
 
-#: ../src/filter-edit-dialog.c:100
+#: ../src/filter-edit-dialog.c:98
 msgid "Flag condition"
 msgstr "Услов ознаке"
 
-#: ../src/filter-edit-dialog.c:104
+#: ../src/filter-edit-dialog.c:102
 msgid "Copy to folder:"
 msgstr "Умножи у фасциклу:"
 
-#: ../src/filter-edit-dialog.c:105
+#: ../src/filter-edit-dialog.c:103
 msgid "Move to folder:"
 msgstr "Премести у фасциклу:"
 
-#: ../src/filter-edit-dialog.c:106
-#| msgid "Colors"
+#: ../src/filter-edit-dialog.c:104
 msgid "Colorize"
 msgstr "Обоји"
 
-#: ../src/filter-edit-dialog.c:107
+#: ../src/filter-edit-dialog.c:105
 msgid "Print on printer:"
 msgstr "Штампај на штампачу:"
 
-#: ../src/filter-edit-dialog.c:108
+#: ../src/filter-edit-dialog.c:106
 msgid "Run program:"
 msgstr "Покрени програм:"
 
-#: ../src/filter-edit-dialog.c:109
+#: ../src/filter-edit-dialog.c:107
 msgid "Send to Trash"
 msgstr "Пошаљи у „смеће“"
 
-#: ../src/filter-edit-dialog.c:113
+#: ../src/filter-edit-dialog.c:111
 msgid "OR"
 msgstr "ИЛИ"
 
-#: ../src/filter-edit-dialog.c:114
+#: ../src/filter-edit-dialog.c:112
 msgid "AND"
 msgstr "И"
 
 #. The name entry
-#: ../src/filter-edit-dialog.c:269
+#: ../src/filter-edit-dialog.c:267
 msgid "_Filter name:"
 msgstr "Назив _пропусника:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:287
+#: ../src/filter-edit-dialog.c:285
 msgid "Operation between conditions"
 msgstr "Операција над условима"
 
-#: ../src/filter-edit-dialog.c:337
+#: ../src/filter-edit-dialog.c:335
 msgid "Ne_w"
 msgstr "Но_во"
 
-#: ../src/filter-edit-dialog.c:365
+#: ../src/filter-edit-dialog.c:363
 msgid "Foreground"
 msgstr "Прочеље"
 
-#: ../src/filter-edit-dialog.c:376
+#: ../src/filter-edit-dialog.c:374
 msgid "Background"
 msgstr "Позадина"
 
 #. The notification area
-#: ../src/filter-edit-dialog.c:401
+#: ../src/filter-edit-dialog.c:399
 msgid "Notification:"
 msgstr "Обавештење:"
 
 #. Notification buttons
-#: ../src/filter-edit-dialog.c:411
+#: ../src/filter-edit-dialog.c:409
 msgid "Play sound:"
 msgstr "Пусти звук:"
 
-#: ../src/filter-edit-dialog.c:417
+#: ../src/filter-edit-dialog.c:415
 msgid "Use Sound..."
 msgstr "Користи звук..."
 
-#: ../src/filter-edit-dialog.c:438
+#: ../src/filter-edit-dialog.c:436
 msgid "Popup text:"
 msgstr "Прикажи текст:"
 
 #. The action area
-#: ../src/filter-edit-dialog.c:459
+#: ../src/filter-edit-dialog.c:457
 msgid "Action to perform:"
 msgstr "Радња за обављање:"
 
-#: ../src/filter-edit-dialog.c:512
+#: ../src/filter-edit-dialog.c:510
 msgid "Match"
 msgstr "Поклапање"
 
-#: ../src/filter-edit-dialog.c:515
+#: ../src/filter-edit-dialog.c:513
 msgid "Action"
 msgstr "Радња"
 
-#: ../src/filter-edit-dialog.c:527
+#: ../src/filter-edit-dialog.c:525
 msgid "Revert"
 msgstr "Врати"
 
-#: ../src/filter-edit-dialog.c:578
-#| msgid "A filter run dialog is open.Close it before you can modify filters."
+#: ../src/filter-edit-dialog.c:576
 msgid "A filter run dialog is open. Close it before you can modify filters."
 msgstr ""
 "Отворено је прозорче за покретање пропусника. Затворите га да бисте могли да "
 "мењате пропуснике."
 
-#: ../src/filter-edit-dialog.c:591
+#: ../src/filter-edit-dialog.c:589
 msgid "Balsa Filters"
 msgstr "Балсини пропусници"
 
-#: ../src/filter-edit-dialog.c:660
+#: ../src/filter-edit-dialog.c:658
 #, c-format
 msgid "Filter \"%s\" has no condition."
 msgstr "Пропусник „%s“ нема услов."
 
-#: ../src/filter-export-callbacks.c:59
+#: ../src/filter-export-callbacks.c:57
 #, c-format
 msgid "Unable to export filter %s, an error occurred."
 msgstr "Не могу да извезем пропусник %s, дошло је до грешке."
 
-#: ../src/filter-export-dialog.c:65
+#: ../src/filter-export-dialog.c:63
 msgid ""
 "There are opened filter run dialogs, close them before you can modify "
 "filters."
@@ -3734,25 +3657,25 @@ msgstr ""
 "Отворени су прозорчићи за покретање пропусника. Затворите их да бисте могли "
 "да мењате пропуснике."
 
-#: ../src/filter-export-dialog.c:77
+#: ../src/filter-export-dialog.c:75
 msgid "Balsa Filters Export"
 msgstr "Извоз Балсиних пропусника"
 
-#: ../src/filter-run-callbacks.c:184
+#: ../src/filter-run-callbacks.c:182
 #, c-format
 msgid "Error displaying run filters help: %s\n"
 msgstr "Грешка приказивања помоћи за покретање пропусника: %s\n"
 
-#: ../src/filter-run-callbacks.c:234 ../src/filter-run-callbacks.c:256
+#: ../src/filter-run-callbacks.c:232 ../src/filter-run-callbacks.c:254
 msgid "Error when applying filters"
 msgstr "Грешка при примени пропусника"
 
-#: ../src/filter-run-callbacks.c:237 ../src/filter-run-callbacks.c:259
+#: ../src/filter-run-callbacks.c:235 ../src/filter-run-callbacks.c:257
 #, c-format
 msgid "Filter applied to \"%s\"."
 msgstr "Пропусник је примењен на „%s“."
 
-#: ../src/filter-run-callbacks.c:298
+#: ../src/filter-run-callbacks.c:296
 #, c-format
 msgid ""
 "The destination mailbox of the filter \"%s\" is \"%s\".\n"
@@ -3761,7 +3684,7 @@ msgstr ""
 "Одредишно сандуче за пропусник „%s“ је „%s“.\n"
 "Не можете га придружити са истим сандучетом (то изазива дубачење)."
 
-#: ../src/filter-run-callbacks.c:306
+#: ../src/filter-run-callbacks.c:304
 #, c-format
 msgid ""
 "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
@@ -3773,37 +3696,37 @@ msgstr ""
 "Ово се догађа када нпр. користите регуларне изразе са ИМАП сандучићима, онда "
 "се користи веома спор начин; ако је могуће, користите обичне ниске."
 
-#: ../src/filter-run-dialog.c:191
+#: ../src/filter-run-dialog.c:189
 msgid "Balsa Filters of Mailbox: "
 msgstr "Балсини пропусници сандучета: "
 
-#: ../src/filter-run-dialog.c:232
+#: ../src/filter-run-dialog.c:230
 msgid "On reception"
 msgstr "При пријему"
 
-#: ../src/filter-run-dialog.c:244
+#: ../src/filter-run-dialog.c:242
 msgid "On exit"
 msgstr "При излазу"
 
-#: ../src/filter-run-dialog.c:318
+#: ../src/filter-run-dialog.c:316
 msgid "Apply Selected"
 msgstr "Примени изабрано"
 
 #. up button
-#: ../src/filter-run-dialog.c:366
+#: ../src/filter-run-dialog.c:364
 msgid "_Up"
 msgstr "_Горе"
 
 #. down button
-#: ../src/filter-run-dialog.c:371
+#: ../src/filter-run-dialog.c:369
 msgid "Do_wn"
 msgstr "_Доле"
 
-#: ../src/filter-run-dialog.c:377
+#: ../src/filter-run-dialog.c:375
 msgid "A_pply Now!"
 msgstr "_Примени сада!"
 
-#: ../src/filter-run-dialog.c:421
+#: ../src/filter-run-dialog.c:419
 msgid ""
 "The filters dialog is opened, close it before you can run filters on any "
 "mailbox"
@@ -3811,93 +3734,89 @@ msgstr ""
 "Отворено је прозорче пропусника, затворите га да бисте могли да покренете "
 "пропуснике над било ком сандучету"
 
-#: ../src/folder-conf.c:110
+#: ../src/folder-conf.c:108
 #, c-format
-#| msgid "Error displaying condition help: %s\n"
 msgid "Error displaying config help: %s\n"
 msgstr "Грешка приказивања помоћи подешавања: %s\n"
 
-#: ../src/folder-conf.c:298
+#: ../src/folder-conf.c:296
 msgid "Remote IMAP folder"
 msgstr "Удаљена фасцикла ИМАП-а"
 
 #. must NOT be modal
-#: ../src/folder-conf.c:301 ../src/folder-conf.c:789 ../src/mailbox-conf.c:573
+#: ../src/folder-conf.c:299 ../src/folder-conf.c:787 ../src/mailbox-conf.c:571
 msgid "_Update"
 msgstr "_Ажурирај"
 
-#: ../src/folder-conf.c:301
+#: ../src/folder-conf.c:299
 msgid "C_reate"
 msgstr "_Направи"
 
-#: ../src/folder-conf.c:327 ../src/mailbox-conf.c:1226
-#: ../src/mailbox-conf.c:1338
+#: ../src/folder-conf.c:325 ../src/mailbox-conf.c:1224
+#: ../src/mailbox-conf.c:1336
 msgid "_Basic"
 msgstr "_Основно"
 
-#: ../src/folder-conf.c:332
-#| msgid "Exceeded the number of connections per server %s"
+#: ../src/folder-conf.c:330
 msgid "_Max number of connections:"
 msgstr "_Највећи број повезивања:"
 
-#: ../src/folder-conf.c:339 ../src/mailbox-conf.c:1401
+#: ../src/folder-conf.c:337 ../src/mailbox-conf.c:1399
 msgid "Enable _persistent cache"
 msgstr "Укључи _сталну оставу"
 
-#: ../src/folder-conf.c:347
+#: ../src/folder-conf.c:345
 msgid "Use IDLE command"
 msgstr "Користи наредбу „МИРУЈЕ“"
 
-#: ../src/folder-conf.c:354 ../src/mailbox-conf.c:1405
+#: ../src/folder-conf.c:352 ../src/mailbox-conf.c:1403
 msgid "Enable _bug workarounds"
 msgstr "Укључи заобилажење _грешке"
 
-#: ../src/folder-conf.c:361
+#: ../src/folder-conf.c:359
 msgid "Use STATUS for mailbox checking"
 msgstr "Користи „СТАЊЕ“ за проверу сандучета"
 
-#: ../src/folder-conf.c:367 ../src/mailbox-conf.c:1280
-#: ../src/mailbox-conf.c:1407
+#: ../src/folder-conf.c:365 ../src/mailbox-conf.c:1278
+#: ../src/mailbox-conf.c:1405
 msgid "_Advanced"
 msgstr "_Напредно"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:370
-#| msgid "Descriptive _Name:"
+#: ../src/folder-conf.c:368
 msgid "Descriptive _name:"
 msgstr "Описни _назив:"
 
 #. username
-#: ../src/folder-conf.c:385 ../src/mailbox-conf.c:1242
+#: ../src/folder-conf.c:383 ../src/mailbox-conf.c:1240
 msgid "Use_r name:"
 msgstr "Корисничко _име:"
 
-#: ../src/folder-conf.c:391
+#: ../src/folder-conf.c:389
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: ../src/folder-conf.c:396 ../src/mailbox-conf.c:1363
+#: ../src/folder-conf.c:394 ../src/mailbox-conf.c:1361
 msgid "_Anonymous access"
 msgstr "_Неприметни приступ"
 
-#: ../src/folder-conf.c:405
+#: ../src/folder-conf.c:403
 msgid "Subscribed _folders only"
 msgstr "Само _фасцикле претплате"
 
-#: ../src/folder-conf.c:407
+#: ../src/folder-conf.c:405
 msgid "Always show _INBOX"
 msgstr "_Увек прикажи „ДОЛАЗНО“"
 
-#: ../src/folder-conf.c:410
-#| msgid "Pr_efix"
+#: ../src/folder-conf.c:408
 msgid "Pr_efix:"
 msgstr "Пр_ефикс:"
 
-#: ../src/folder-conf.c:556
+#: ../src/folder-conf.c:554
 msgid "Select parent folder"
 msgstr "Изабери родитељску фасциклу"
 
-#: ../src/folder-conf.c:634
+#: ../src/folder-conf.c:632
 #, c-format
 msgid ""
 "Renaming INBOX is special!\n"
@@ -3912,29 +3831,29 @@ msgstr ""
 "„ДОЛАЗНО“ и њене подфасцикле ће остати.\n"
 "Шта желите да урадите?"
 
-#: ../src/folder-conf.c:640
+#: ../src/folder-conf.c:638
 msgid "Question"
 msgstr "Питање"
 
-#: ../src/folder-conf.c:645
+#: ../src/folder-conf.c:643
 msgid "Rename INBOX"
 msgstr "Преименуј „ДОЛАЗНО“"
 
-#: ../src/folder-conf.c:647
+#: ../src/folder-conf.c:645
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../src/folder-conf.c:672
+#: ../src/folder-conf.c:670
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Нисам успео да преименујем фасциклу. Ево зашто: %s"
 
-#: ../src/folder-conf.c:724
+#: ../src/folder-conf.c:722
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Нисам успео да направим фасциклу. Ево зашто: %s"
 
-#: ../src/folder-conf.c:771
+#: ../src/folder-conf.c:769
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -3942,72 +3861,68 @@ msgstr ""
 "Фасцикла ИМАП-а која није сандуче\n"
 "нема особине које се могу мењати."
 
-#: ../src/folder-conf.c:786
+#: ../src/folder-conf.c:784
 msgid "Remote IMAP subfolder"
 msgstr "Удаљена подфасцикла ИМАП-а"
 
-#: ../src/folder-conf.c:789
+#: ../src/folder-conf.c:787
 msgid "_Create"
 msgstr "_Направи"
 
-#: ../src/folder-conf.c:820
+#: ../src/folder-conf.c:818
 msgid "Create subfolder"
 msgstr "Направи подфасциклу"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:828
+#: ../src/folder-conf.c:826
 msgid "_Folder name:"
 msgstr "Назив _фасцикле:"
 
-#: ../src/folder-conf.c:834
+#: ../src/folder-conf.c:832
 msgid "Host:"
 msgstr "Домаћин:"
 
-#: ../src/folder-conf.c:843
-#| msgid "_Subfolder of:"
+#: ../src/folder-conf.c:841
 msgid "Subfolder of:"
 msgstr "Подфасцикла:"
 
-#: ../src/folder-conf.c:848
+#: ../src/folder-conf.c:846
 msgid "_Browse..."
 msgstr "_Разгледај..."
 
-#: ../src/folder-conf.c:862
-#| msgid "Mailbox is read-only."
+#: ../src/folder-conf.c:860
 msgid "read-only"
 msgstr "само за читање"
 
-#: ../src/folder-conf.c:863
+#: ../src/folder-conf.c:861
 msgid "read-write"
 msgstr "читање-писање"
 
-#: ../src/folder-conf.c:864
+#: ../src/folder-conf.c:862
 msgid "admin"
 msgstr "администратор"
 
-#: ../src/folder-conf.c:865
+#: ../src/folder-conf.c:863
 msgid "post"
 msgstr "уписивање"
 
-#: ../src/folder-conf.c:866
-#| msgid "Send"
+#: ../src/folder-conf.c:864
 msgid "append"
 msgstr "прикачињање"
 
-#: ../src/folder-conf.c:867
-#| msgid "_Undelete"
+#: ../src/folder-conf.c:865
 msgid "delete"
 msgstr "брисање"
 
-#: ../src/folder-conf.c:868
+#: ../src/folder-conf.c:866
 msgid "special"
 msgstr "посебно"
 
-#: ../src/folder-conf.c:874
+#: ../src/folder-conf.c:872
 msgid "Permissions:"
 msgstr "Овлашћења:"
 
-#: ../src/folder-conf.c:881
+#: ../src/folder-conf.c:879
 msgid ""
 "\n"
 "detailed permissions are available only for open folders"
@@ -4015,7 +3930,7 @@ msgstr ""
 "\n"
 "детаљнија овлашћења су доступна само за отворене фасцикле"
 
-#: ../src/folder-conf.c:888
+#: ../src/folder-conf.c:886
 msgid ""
 "\n"
 "the server does not support ACL's"
@@ -4023,34 +3938,32 @@ msgstr ""
 "\n"
 "сервер не подржава АЦЛ-е"
 
-#: ../src/folder-conf.c:897
-#| msgid "minutes"
+#: ../src/folder-conf.c:895
 msgid "mine: "
 msgstr "моје: "
 
-#: ../src/folder-conf.c:936
-#| msgid "Quoted"
+#: ../src/folder-conf.c:934
 msgid "Quota:"
 msgstr "Удео:"
 
-#: ../src/folder-conf.c:940
+#: ../src/folder-conf.c:938
 msgid "quota information available only for open folders"
 msgstr "податак о уделу је доступан само за отворене фасцикле"
 
-#: ../src/folder-conf.c:945
+#: ../src/folder-conf.c:943
 msgid "the server does not support quotas"
 msgstr "сервер не подржава уделе"
 
-#: ../src/folder-conf.c:947
+#: ../src/folder-conf.c:945
 msgid "no limits"
 msgstr "без ограничења"
 
-#: ../src/folder-conf.c:952
+#: ../src/folder-conf.c:950
 #, c-format
 msgid "%s of %s (%.1f%%) used"
 msgstr "%s од %s (%.1f%%) је искоришћено"
 
-#: ../src/folder-conf.c:989
+#: ../src/folder-conf.c:987
 msgid ""
 "This folder is not stored in configuration. I do not yet know how to remove "
 "it from remote server."
@@ -4058,7 +3971,7 @@ msgstr ""
 "Ова фасцикла није смештена у подешавањима. Ја још увек не знам како да је "
 "уклоним са удаљеног сервера."
 
-#: ../src/folder-conf.c:998
+#: ../src/folder-conf.c:996
 #, c-format
 msgid ""
 "This will remove the folder \"%s\" from the list.\n"
@@ -4068,30 +3981,30 @@ msgstr ""
 "Касније можете користити ставку „Нова фасцикла ИМАП-а“ да поново додате ову "
 "фасциклу.\n"
 
-#: ../src/folder-conf.c:1006
+#: ../src/folder-conf.c:1004
 msgid "Confirm"
 msgstr "Потврди"
 
-#: ../src/information-dialog.c:232
+#: ../src/information-dialog.c:230
 msgid "Information - Balsa"
 msgstr "Информација — Балса"
 
-#: ../src/information-dialog.c:359
+#: ../src/information-dialog.c:357
 #, c-format
 msgid "WARNING: "
 msgstr "УПОЗОРЕЊЕ: "
 
-#: ../src/information-dialog.c:362
+#: ../src/information-dialog.c:360
 #, c-format
 msgid "ERROR: "
 msgstr "ГРЕШКА: "
 
-#: ../src/information-dialog.c:365
+#: ../src/information-dialog.c:363
 #, c-format
 msgid "FATAL: "
 msgstr "КОБНО: "
 
-#: ../src/mailbox-conf.c:223
+#: ../src/mailbox-conf.c:221
 msgid ""
 "Balsa was built without SSL support.\n"
 "Neither SSL nor TLS can be used."
@@ -4099,15 +4012,15 @@ msgstr ""
 "Балса је изграђена без ССЛ подршке.\n"
 "Не могу бити коришћени ни ССЛ ни ТЛС."
 
-#: ../src/mailbox-conf.c:235
+#: ../src/mailbox-conf.c:233
 msgid "Use _SSL"
 msgstr "Користи _ССЛ"
 
-#: ../src/mailbox-conf.c:374
+#: ../src/mailbox-conf.c:372
 msgid "No mailbox selected."
 msgstr "Ниједно сандуче није изабрано."
 
-#: ../src/mailbox-conf.c:404
+#: ../src/mailbox-conf.c:402
 #, c-format
 msgid ""
 "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
@@ -4118,7 +4031,7 @@ msgstr ""
 "Ако заиста желите да га уклоним, доделите његову функцију\n"
 "неком другом сандучету."
 
-#: ../src/mailbox-conf.c:414
+#: ../src/mailbox-conf.c:412
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
@@ -4133,15 +4046,15 @@ msgstr ""
 "бисте поново приступили сандучету.\n"
 "Шта бисте желели да урадим?"
 
-#: ../src/mailbox-conf.c:426
+#: ../src/mailbox-conf.c:424
 msgid "Remove from _list"
 msgstr "Уклони са _списка"
 
-#: ../src/mailbox-conf.c:427
+#: ../src/mailbox-conf.c:425
 msgid "Remove from list and _disk"
 msgstr "Уклони са списка и са _диска"
 
-#: ../src/mailbox-conf.c:435
+#: ../src/mailbox-conf.c:433
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" and all its messages from your IMAP "
@@ -4156,11 +4069,11 @@ msgstr ""
 "под овим именом.\n"
 "Шта бисте желели да урадим?"
 
-#: ../src/mailbox-conf.c:448
+#: ../src/mailbox-conf.c:446
 msgid "_Remove from server"
 msgstr "_Уклони са сервера"
 
-#: ../src/mailbox-conf.c:455
+#: ../src/mailbox-conf.c:453
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.\n"
@@ -4172,26 +4085,26 @@ msgstr ""
 "сандучету.\n"
 "Шта бисте желели да урадим?"
 
-#: ../src/mailbox-conf.c:464
+#: ../src/mailbox-conf.c:462
 msgid "_Remove from list"
 msgstr "_Уклони са списка"
 
-#: ../src/mailbox-conf.c:508
+#: ../src/mailbox-conf.c:506
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
 msgstr "Нисам успео да обришем фасциклу. Ево зашто: %s"
 
-#: ../src/mailbox-conf.c:577 ../src/pref-manager.c:1712
-#: ../src/pref-manager.c:1784 ../src/pref-manager.c:2962
+#: ../src/mailbox-conf.c:575 ../src/pref-manager.c:1710
+#: ../src/pref-manager.c:1782 ../src/pref-manager.c:2960
 msgid "_Add"
 msgstr "_Додај"
 
-#: ../src/mailbox-conf.c:800
+#: ../src/mailbox-conf.c:798
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: ../src/mailbox-conf.c:942
+#: ../src/mailbox-conf.c:940
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -4200,80 +4113,72 @@ msgstr ""
 "Нисам успео да преименујем „%s“ у „%s“:\n"
 "%s"
 
-#: ../src/mailbox-conf.c:1152
-#| msgid "Mailbox _Name:"
+#: ../src/mailbox-conf.c:1150
 msgid "_Mailbox Name:"
 msgstr "_Назив сандучета:"
 
-#: ../src/mailbox-conf.c:1161
+#: ../src/mailbox-conf.c:1159
 #, c-format
-#| msgid ""
-#| "Local Mail Problem\n"
-#| "%s"
 msgid "Local %s Mailbox Properties"
 msgstr "Својства месног „%s“ сандучета"
 
-#: ../src/mailbox-conf.c:1162
+#: ../src/mailbox-conf.c:1160
 #, c-format
-#| msgid "Local MH mailbox..."
 msgid "New Local %s Mailbox"
 msgstr "Ново месно „%s“ сандуче"
 
-#: ../src/mailbox-conf.c:1204
+#: ../src/mailbox-conf.c:1202
 msgid "Remote Mailbox Configurator"
 msgstr "Подешавач удаљеног сандучета"
 
 #. mailbox name
-#: ../src/mailbox-conf.c:1229 ../src/mailbox-conf.c:1341
-#| msgid "Mailbox _Name:"
+#: ../src/mailbox-conf.c:1227 ../src/mailbox-conf.c:1339
 msgid "Mailbox _name:"
 msgstr "Назив _сандучета:"
 
 #. password field
-#: ../src/mailbox-conf.c:1248 ../src/mailbox-conf.c:1375
+#: ../src/mailbox-conf.c:1246 ../src/mailbox-conf.c:1373
 msgid "Pass_word:"
 msgstr "Ло_зинка:"
 
-#: ../src/mailbox-conf.c:1256
+#: ../src/mailbox-conf.c:1254
 msgid "_Delete messages from server after download"
 msgstr "_Обриши поруке са сервера након преузимања"
 
-#: ../src/mailbox-conf.c:1261
+#: ../src/mailbox-conf.c:1259
 msgid "_Enable check for new mail"
 msgstr "_Укључи проверу за новом поштом"
 
-#: ../src/mailbox-conf.c:1266
+#: ../src/mailbox-conf.c:1264
 msgid "_Filter messages through procmail"
 msgstr "_Пропусти поруке кроз „procmail“"
 
-#: ../src/mailbox-conf.c:1270
+#: ../src/mailbox-conf.c:1268
 msgid "Fi_lter Command:"
 msgstr "Наредба за _пропуштање:"
 
-#: ../src/mailbox-conf.c:1284
+#: ../src/mailbox-conf.c:1282
 msgid "Disable _APOP"
 msgstr "Искључи _АПОП"
 
 #. username
-#: ../src/mailbox-conf.c:1355
+#: ../src/mailbox-conf.c:1353
 msgid "_Username:"
 msgstr "_Корисничко име:"
 
-#: ../src/mailbox-conf.c:1380
-#| msgid "F_older Path:"
+#: ../src/mailbox-conf.c:1378
 msgid "F_older path:"
 msgstr "_Путања фасцикле:"
 
-#: ../src/mailbox-conf.c:1470
-#| msgid "Identity:"
+#: ../src/mailbox-conf.c:1468
 msgid "_Identity:"
 msgstr "_Личност:"
 
-#: ../src/mailbox-conf.c:1512 ../src/pref-manager.c:3432
+#: ../src/mailbox-conf.c:1510 ../src/pref-manager.c:3430
 msgid "Always"
 msgstr "Увек"
 
-#: ../src/mailbox-conf.c:1516
+#: ../src/mailbox-conf.c:1514
 msgid ""
 "_Decrypt and check\n"
 "signatures automatically:"
@@ -4281,25 +4186,24 @@ msgstr ""
 "_Дешифруј и провери\n"
 "потписе самостално:"
 
-#: ../src/mailbox-conf.c:1547
+#: ../src/mailbox-conf.c:1545
 msgid "Show _Recipient column instead of Sender"
 msgstr "Прикажи колону _примаоца уместо пошиљаоца"
 
-#: ../src/mailbox-conf.c:1560
-#| msgid "_Enable check for new mail"
+#: ../src/mailbox-conf.c:1558
 msgid "_Subscribe for new mail check"
 msgstr "_Претплати се за проверу нове поште"
 
-#: ../src/mailbox-node.c:316
+#: ../src/mailbox-node.c:314
 msgid "The folder edition to be written."
 msgstr "Издање фасцикле за упис."
 
-#: ../src/mailbox-node.c:491
+#: ../src/mailbox-node.c:489
 #, c-format
 msgid "Scanning %s. Please wait..."
 msgstr "Прегледам „%s“. Молим сачекајте..."
 
-#: ../src/mailbox-node.c:507
+#: ../src/mailbox-node.c:505
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
@@ -4308,205 +4212,202 @@ msgstr ""
 "Прегледање „%s“ није успело: %s\n"
 "Проверите повезаност на мрежу."
 
-#: ../src/mailbox-node.c:509
+#: ../src/mailbox-node.c:507
 #, c-format
 msgid "Scanning of %s failed: %s"
 msgstr "Прегледање „%s“ није успело: %s"
 
-#: ../src/mailbox-node.c:1046
+#: ../src/mailbox-node.c:1044
 msgid "Local _mbox mailbox..."
 msgstr "Месно сандуче „_mbox“..."
 
-#: ../src/mailbox-node.c:1048
+#: ../src/mailbox-node.c:1046
 msgid "Local Mail_dir mailbox..."
 msgstr "Месно сандуче „Mail_dir“..."
 
-#: ../src/mailbox-node.c:1050
+#: ../src/mailbox-node.c:1048
 msgid "Local M_H mailbox..."
 msgstr "Месно сандуче „M_H“..."
 
-#: ../src/mailbox-node.c:1052
+#: ../src/mailbox-node.c:1050
 msgid "Remote _IMAP mailbox..."
 msgstr "Удаљено сандуче _ИМАП-а..."
 
-#: ../src/mailbox-node.c:1055
+#: ../src/mailbox-node.c:1053
 msgid "Remote IMAP _folder..."
 msgstr "Удаљена _фасцикла ИМАП-а..."
 
-#: ../src/mailbox-node.c:1057
+#: ../src/mailbox-node.c:1055
 msgid "Remote IMAP _subfolder..."
 msgstr "Удаљена подфа_сцикла ИМАП-а..."
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:1068 ../src/mailbox-node.c:1084
+#: ../src/mailbox-node.c:1066 ../src/mailbox-node.c:1082
 msgid "_Rescan"
 msgstr "Поново п_регледај"
 
-#: ../src/mailbox-node.c:1078 ../src/main-window.c:508
+#: ../src/mailbox-node.c:1076 ../src/main-window.c:506
 msgid "_Properties..."
 msgstr "_Својства..."
 
-#: ../src/mailbox-node.c:1094
+#: ../src/mailbox-node.c:1092
 msgid "_Open"
 msgstr "_Отвори"
 
-#: ../src/mailbox-node.c:1108
+#: ../src/mailbox-node.c:1106
 msgid "_Subscribe"
 msgstr "Пре_тплати се"
 
-#: ../src/mailbox-node.c:1110
+#: ../src/mailbox-node.c:1108
 msgid "_Unsubscribe"
 msgstr "_Поништи претплату"
 
-#: ../src/mailbox-node.c:1116
+#: ../src/mailbox-node.c:1114
 msgid "Mark as _Inbox"
 msgstr "Означи као „_долазно“"
 
-#: ../src/mailbox-node.c:1118
+#: ../src/mailbox-node.c:1116
 msgid "_Mark as Sentbox"
 msgstr "Означи као „_одлазно“"
 
-#: ../src/mailbox-node.c:1120
+#: ../src/mailbox-node.c:1118
 msgid "Mark as _Trash"
 msgstr "Означи као „_смеће“"
 
-#: ../src/mailbox-node.c:1122
+#: ../src/mailbox-node.c:1120
 msgid "Mark as D_raftbox"
 msgstr "Означи као „с_кице“"
 
-#: ../src/mailbox-node.c:1125
+#: ../src/mailbox-node.c:1123
 msgid "_Empty trash"
 msgstr "_Избаци смеће"
 
-#: ../src/mailbox-node.c:1130
+#: ../src/mailbox-node.c:1128
 msgid "_Edit/Apply filters"
 msgstr "_Уреди/примени пропуснике"
 
-#: ../src/mailbox-node.c:1218
+#: ../src/mailbox-node.c:1216
 #, c-format
 msgid "The path \"%s\" does not lead to a mailbox."
 msgstr "Путања „%s“ не води ка сандучету."
 
-#: ../src/mailbox-node.c:1231
+#: ../src/mailbox-node.c:1229
 #, c-format
 msgid "Local mailbox %s loaded as: %s\n"
 msgstr "Месно сандуче „%s“ је учитано као: %s\n"
 
-#: ../src/mailbox-node.c:1262
+#: ../src/mailbox-node.c:1260
 #, c-format
 msgid "Local folder %s\n"
 msgstr "Месна фасцикла „%s“\n"
 
-#: ../src/main.c:212
+#: ../src/main.c:210
 #, c-format
-#| msgid ""
-#| "Could not remove %s:\n"
-#| "%s"
 msgid "Could not write to %s: %s"
 msgstr "Не могу да упишем у „%s“: %s"
 
-#: ../src/main.c:462 ../src/main.c:511
+#: ../src/main.c:460 ../src/main.c:509
 msgid "Get new mail on startup"
 msgstr "Преузима нове поруке при покретању"
 
-#: ../src/main.c:464 ../src/main.c:513
+#: ../src/main.c:462 ../src/main.c:511
 msgid "Compose a new email to EMAIL ADDRESS"
 msgstr "Саставља нову поруку за „АДРЕСА ЕЛ ПОШТЕ“"
 
-#: ../src/main.c:466
+#: ../src/main.c:464
 msgid "Attach file at PATH"
 msgstr "Прилаже датотеку из путање"
 
-#: ../src/main.c:468 ../src/main.c:518
+#: ../src/main.c:466 ../src/main.c:516
 msgid "Opens MAILBOXNAME"
 msgstr "Отвара НАЗИВСАНДУЧЕТА"
 
-#: ../src/main.c:468 ../src/main.c:518
+#: ../src/main.c:466 ../src/main.c:516
 msgid "MAILBOXNAME"
 msgstr "НАЗИВСАНДУЧЕТА"
 
-#: ../src/main.c:471 ../src/main.c:521
+#: ../src/main.c:469 ../src/main.c:519
 msgid "Opens first unread mailbox"
 msgstr "Отвара прво непрочитано сандуче"
 
-#: ../src/main.c:474 ../src/main.c:524
+#: ../src/main.c:472 ../src/main.c:522
 msgid "Opens default Inbox on startup"
 msgstr "Отвара основно сандуче „долазно“ при покретању"
 
-#: ../src/main.c:477 ../src/main.c:527
+#: ../src/main.c:475 ../src/main.c:525
 msgid "Prints number unread and unsent messages"
 msgstr "Исписује број непрочитаних и непослатих порука"
 
-#: ../src/main.c:479 ../src/main.c:529
+#: ../src/main.c:477 ../src/main.c:527
 msgid "Debug POP3 connection"
 msgstr "Поправља ПОП3 везу"
 
-#: ../src/main.c:481 ../src/main.c:531
+#: ../src/main.c:479 ../src/main.c:529
 msgid "Debug IMAP connection"
 msgstr "Поправља ИМАП везу"
 
-#: ../src/main.c:503
+#: ../src/main.c:501
 msgid "The Balsa E-Mail Client"
 msgstr "Програм за ел. пошту Балса"
 
-#: ../src/main.c:515
-#| msgid "Attach file at PATH"
+#: ../src/main.c:513
 msgid "Attach file at URI"
 msgstr "Прилаже датотеку из путање"
 
-#: ../src/main.c:556
+#: ../src/main.c:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Покрените „%s --help“ да видите потпун списак доступних параметара линије "
+msgstr ""
+"Покрените „%s --help“ да видите потпун списак доступних параметара линије "
 "наредби.\n"
 
-#: ../src/main.c:603 ../src/main.c:608 ../src/main.c:614 ../src/main.c:620
-#: ../src/main.c:626
+#: ../src/main.c:601 ../src/main.c:606 ../src/main.c:612 ../src/main.c:618
+#: ../src/main.c:624
 #, c-format
 msgid "Balsa cannot open your \"%s\" mailbox."
 msgstr "Балса не може да отвори ваше сандуче „%s“."
 
-#: ../src/main.c:603
+#: ../src/main.c:601
 msgid "Inbox"
 msgstr "Примљене"
 
-#: ../src/main.c:609
+#: ../src/main.c:607
 msgid "Outbox"
 msgstr "Послате"
 
-#: ../src/main.c:615
+#: ../src/main.c:613
 msgid "Sentbox"
 msgstr "За слање"
 
-#: ../src/main.c:621
+#: ../src/main.c:619
 msgid "Draftbox"
 msgstr "Нацрти"
 
-#: ../src/main.c:626
+#: ../src/main.c:624
 msgid "Trash"
 msgstr "Смеће"
 
-#: ../src/main.c:847
+#: ../src/main.c:843
 msgid "Compressing mail folders..."
 msgstr "Пакујем фасцикле поште..."
 
-#: ../src/main-window.c:324
+#: ../src/main-window.c:322
 msgid "Balsa closes files and connections. Please wait..."
 msgstr "Балса је затворила датотеке и везе. Сачекајте..."
 
-#: ../src/main-window.c:349
+#: ../src/main-window.c:347
 msgid "Mail_box"
 msgstr "_Сандуче"
 
-#: ../src/main-window.c:350 ../src/message-window.c:243
+#: ../src/main-window.c:348 ../src/message-window.c:241
 msgid "_Message"
 msgstr "_Порука"
 
-#: ../src/main-window.c:351
+#: ../src/main-window.c:349
 msgid "_Settings"
 msgstr "_Подешавања"
 
-#: ../src/main-window.c:357
+#: ../src/main-window.c:355
 msgid "Mail_boxes"
 msgstr "_Сандучићи"
 
@@ -4515,392 +4416,392 @@ msgstr "_Сандучићи"
 #. Less frequently used entries of the 'File' menu
 #. Less frequently used entries of the 'Edit' menu
 #. Less frequently used entries of the 'Tools' menu
-#: ../src/main-window.c:359 ../src/main-window.c:364
-#: ../src/sendmsg-window.c:328 ../src/sendmsg-window.c:330
-#: ../src/sendmsg-window.c:332
+#: ../src/main-window.c:357 ../src/main-window.c:362
+#: ../src/sendmsg-window.c:330 ../src/sendmsg-window.c:332
+#: ../src/sendmsg-window.c:334
 msgid "_More"
 msgstr "_Још"
 
-#: ../src/main-window.c:360
+#: ../src/main-window.c:358
 msgid "_Headers"
 msgstr "_Заглавља"
 
-#: ../src/main-window.c:361
+#: ../src/main-window.c:359
 msgid "_Sort Mailbox"
 msgstr "Поре_ђај сандуче"
 
-#: ../src/main-window.c:362
+#: ../src/main-window.c:360
 msgid "H_ide messages"
 msgstr "_Сакриј поруке"
 
-#: ../src/main-window.c:365 ../src/sendmsg-window.c:326
+#: ../src/main-window.c:363 ../src/sendmsg-window.c:328
 msgid "_Tools"
 msgstr "_Алатке"
 
-#: ../src/main-window.c:366
+#: ../src/main-window.c:364
 msgid "_Filters"
 msgstr "_Пропусници"
 
-#: ../src/main-window.c:367
+#: ../src/main-window.c:365
 msgid "F_ilters"
 msgstr "Прописн_ици"
 
-#: ../src/main-window.c:368 ../src/main-window.c:424
+#: ../src/main-window.c:366 ../src/main-window.c:422
 msgid "Manage filters"
 msgstr "Управљајте пропусницима"
 
 #. File menu items
 #. Not in the touchpad menu, but still available as a toolbar
 #. * button:
-#: ../src/main-window.c:373
+#: ../src/main-window.c:371
 msgid "_Continue"
 msgstr "_Настави"
 
-#: ../src/main-window.c:374
+#: ../src/main-window.c:372
 msgid "Continue editing current message"
 msgstr "Наставите уређивање тренутне поруке"
 
-#: ../src/main-window.c:376
+#: ../src/main-window.c:374
 msgid "_Get New Mail"
 msgstr "_Преузми нову пошту"
 
-#: ../src/main-window.c:377
+#: ../src/main-window.c:375
 msgid "Fetch new incoming mail"
 msgstr "Преузмите нову пошту"
 
-#: ../src/main-window.c:378
+#: ../src/main-window.c:376
 msgid "_Send Queued Mail"
 msgstr "Пошаљи пошту која _чека"
 
-#: ../src/main-window.c:379
+#: ../src/main-window.c:377
 msgid "Send messages from the outbox"
 msgstr "Пошаљите поруке из одлазног сандучета"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:380
 msgid "Send and _Receive Mail"
 msgstr "Пошаљи и _прими пошту"
 
-#: ../src/main-window.c:383
+#: ../src/main-window.c:381
 msgid "Send and Receive messages"
 msgstr "Пошаљите и примите поруке"
 
-#: ../src/main-window.c:385 ../src/message-window.c:244
-#: ../src/sendmsg-window.c:345
+#: ../src/main-window.c:383 ../src/message-window.c:242
+#: ../src/sendmsg-window.c:347
 msgid "Page _Setup"
 msgstr "_Подеси страницу"
 
-#: ../src/main-window.c:386 ../src/message-window.c:245
-#: ../src/sendmsg-window.c:346
+#: ../src/main-window.c:384 ../src/message-window.c:243
+#: ../src/sendmsg-window.c:348
 msgid "Set up page for printing"
 msgstr "Подесите особине странице за штампање"
 
-#: ../src/main-window.c:387
+#: ../src/main-window.c:385
 msgid "_Address Book..."
 msgstr "_Адресар..."
 
-#: ../src/main-window.c:388
+#: ../src/main-window.c:386
 msgid "Open the address book"
 msgstr "Отворите адресар"
 
-#: ../src/main-window.c:389
+#: ../src/main-window.c:387
 msgid "Quit Balsa"
 msgstr "Изађите из Балсе"
 
 #. File:New submenu items
-#: ../src/main-window.c:392
+#: ../src/main-window.c:390
 msgid "_Message..."
 msgstr "_Порука..."
 
-#: ../src/main-window.c:393
+#: ../src/main-window.c:391
 msgid "Compose a new message"
 msgstr "Саставите нову поруку"
 
-#: ../src/main-window.c:395
+#: ../src/main-window.c:393
 msgid "Local mbox mailbox..."
 msgstr "Месно мбокс сандуче..."
 
-#: ../src/main-window.c:396 ../src/main-window.c:405
+#: ../src/main-window.c:394 ../src/main-window.c:403
 msgid "Add a new mbox style mailbox"
 msgstr "Додајте ново мбокс сандуче"
 
-#: ../src/main-window.c:398
+#: ../src/main-window.c:396
 msgid "Local Maildir mailbox..."
 msgstr "Месно Мејлдир сандуче..."
 
-#: ../src/main-window.c:399 ../src/main-window.c:408
+#: ../src/main-window.c:397 ../src/main-window.c:406
 msgid "Add a new Maildir style mailbox"
 msgstr "Додајте ново Мејлдир сандуче"
 
-#: ../src/main-window.c:401
+#: ../src/main-window.c:399
 msgid "Local MH mailbox..."
 msgstr "Месно МХ сандуче..."
 
-#: ../src/main-window.c:402 ../src/main-window.c:411
+#: ../src/main-window.c:400 ../src/main-window.c:409
 msgid "Add a new MH style mailbox"
 msgstr "Додајте ново МХ сандуче"
 
-#: ../src/main-window.c:404
+#: ../src/main-window.c:402
 msgid "New mailbox..."
 msgstr "Ново сандуче..."
 
-#: ../src/main-window.c:407
+#: ../src/main-window.c:405
 msgid "New \"Maildir\" mailbox..."
 msgstr "Ново „Мејлдир“ сандуче..."
 
-#: ../src/main-window.c:410
+#: ../src/main-window.c:408
 msgid "New \"MH\" mailbox..."
 msgstr "Ново „MХ“ сандуче..."
 
-#: ../src/main-window.c:413 ../src/pref-manager.c:3281
+#: ../src/main-window.c:411 ../src/pref-manager.c:3279
 msgid "Remote IMAP mailbox..."
 msgstr "Удаљено ИМАП сандуче..."
 
-#: ../src/main-window.c:414
+#: ../src/main-window.c:412
 msgid "Add a new IMAP mailbox"
 msgstr "Додајте ново ИМАП сандуче"
 
-#: ../src/main-window.c:415 ../src/pref-manager.c:3286
+#: ../src/main-window.c:413 ../src/pref-manager.c:3284
 msgid "Remote IMAP folder..."
 msgstr "Удаљена ИМАП фасцикла..."
 
-#: ../src/main-window.c:416
+#: ../src/main-window.c:414
 msgid "Add a new IMAP folder"
 msgstr "Додајте нову ИМАП фасциклу"
 
-#: ../src/main-window.c:417
+#: ../src/main-window.c:415
 msgid "Remote IMAP subfolder..."
 msgstr "Удаљена ИМАП подфасцикла..."
 
-#: ../src/main-window.c:418
+#: ../src/main-window.c:416
 msgid "Add a new IMAP subfolder"
 msgstr "Додајте нову ИМАП подфасциклу"
 
-#: ../src/main-window.c:423
+#: ../src/main-window.c:421
 msgid "F_ilters..."
 msgstr "_Пропусници..."
 
 #. Export selected filters to a text file.
-#: ../src/main-window.c:426
+#: ../src/main-window.c:424
 msgid "_Export Filters..."
 msgstr "_Извези пропуснике..."
 
-#: ../src/main-window.c:427
+#: ../src/main-window.c:425
 msgid "Export filters as Sieve scripts"
 msgstr "Извезите пропуснике као Сјев скрипте"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:426
 msgid "Prefere_nces"
 msgstr "Пос_тавке"
 
 #. View menu items
-#: ../src/main-window.c:431
+#: ../src/main-window.c:429
 msgid "E_xpand All"
 msgstr "_Рашири све"
 
-#: ../src/main-window.c:432
+#: ../src/main-window.c:430
 msgid "Expand all threads"
 msgstr "Раширите све поруке"
 
-#: ../src/main-window.c:433
+#: ../src/main-window.c:431
 msgid "_Collapse All"
 msgstr "_Скупи све"
 
-#: ../src/main-window.c:434
+#: ../src/main-window.c:432
 msgid "Collapse all expanded threads"
 msgstr "Скупите све раширене поруке"
 
-#: ../src/main-window.c:436 ../src/message-window.c:259
+#: ../src/main-window.c:434 ../src/message-window.c:257
 msgid "Zoom _In"
 msgstr "У_већај"
 
-#: ../src/main-window.c:437 ../src/message-window.c:260
+#: ../src/main-window.c:435 ../src/message-window.c:258
 msgid "Increase magnification"
 msgstr "Увећајте приказ"
 
-#: ../src/main-window.c:438 ../src/message-window.c:261
+#: ../src/main-window.c:436 ../src/message-window.c:259
 msgid "Zoom _Out"
 msgstr "У_мањи"
 
-#: ../src/main-window.c:439 ../src/message-window.c:262
+#: ../src/main-window.c:437 ../src/message-window.c:260
 msgid "Decrease magnification"
 msgstr "Умањите приказ"
 
 #. To warn msgfmt that the % sign isn't a format specifier:
-#: ../src/main-window.c:442 ../src/message-window.c:265
+#: ../src/main-window.c:440 ../src/message-window.c:263
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Увећај на _100%"
 
-#: ../src/main-window.c:443 ../src/message-window.c:266
+#: ../src/main-window.c:441 ../src/message-window.c:264
 msgid "No magnification"
 msgstr "Без увеличања"
 
 #. Mailbox menu item that does not require a mailbox
-#: ../src/main-window.c:446 ../src/main-window.c:447
-#: ../src/message-window.c:300 ../src/message-window.c:301
+#: ../src/main-window.c:444 ../src/main-window.c:445
+#: ../src/message-window.c:298 ../src/message-window.c:299
 msgid "Next Unread Message"
 msgstr "Следећа непрочитана порука"
 
-#: ../src/main-window.c:449
+#: ../src/main-window.c:447
 msgid "Empty _Trash"
 msgstr "Испразни _смеће"
 
-#: ../src/main-window.c:450
+#: ../src/main-window.c:448
 msgid "Delete messages from the Trash mailbox"
 msgstr "Обришите све поруке из смећа"
 
 #. Settings menu items
-#: ../src/main-window.c:453
+#: ../src/main-window.c:451
 msgid "_Toolbars..."
 msgstr "_Палете алатки..."
 
-#: ../src/main-window.c:454
+#: ../src/main-window.c:452
 msgid "Customize toolbars"
 msgstr "Прилагодите палете алатки"
 
-#: ../src/main-window.c:455
+#: ../src/main-window.c:453
 msgid "_Identities..."
 msgstr "_Личности..."
 
-#: ../src/main-window.c:456
+#: ../src/main-window.c:454
 msgid "Create and set current identities"
 msgstr "Направите и поставите текућу личност"
 
 #. Help menu items
-#: ../src/main-window.c:459
+#: ../src/main-window.c:457
 msgid "_Contents"
 msgstr "_Садржај"
 
-#: ../src/main-window.c:460
+#: ../src/main-window.c:458
 msgid "Table of Contents"
 msgstr "Прикажите садржај помоћи"
 
 #. license ?
-#: ../src/main-window.c:481 ../src/main-window.c:2776
+#: ../src/main-window.c:479 ../src/main-window.c:2774
 msgid "About Balsa"
 msgstr "О Балси"
 
 #. Edit menu items
-#: ../src/main-window.c:488 ../src/message-window.c:253
-#: ../src/sendmsg-window.c:362
+#: ../src/main-window.c:486 ../src/message-window.c:251
+#: ../src/sendmsg-window.c:364
 msgid "Select _All"
 msgstr "Изабери _све"
 
-#: ../src/main-window.c:490
+#: ../src/main-window.c:488
 msgid "_Find"
 msgstr "_Нађи"
 
-#: ../src/main-window.c:492
+#: ../src/main-window.c:490
 msgid "Find Ne_xt"
 msgstr "Нађи _следеће"
 
 #. Mailbox menu items
-#: ../src/main-window.c:495 ../src/main-window.c:496
-#: ../src/message-window.c:298 ../src/message-window.c:299
+#: ../src/main-window.c:493 ../src/main-window.c:494
+#: ../src/message-window.c:296 ../src/message-window.c:297
 msgid "Next Message"
 msgstr "Следећа порука"
 
-#: ../src/main-window.c:497 ../src/main-window.c:498
-#: ../src/message-window.c:303 ../src/message-window.c:304
+#: ../src/main-window.c:495 ../src/main-window.c:496
+#: ../src/message-window.c:301 ../src/message-window.c:302
 msgid "Previous Message"
 msgstr "Претходна порука"
 
-#: ../src/main-window.c:499 ../src/main-window.c:500
-#: ../src/message-window.c:305 ../src/message-window.c:306
+#: ../src/main-window.c:497 ../src/main-window.c:498
+#: ../src/message-window.c:303 ../src/message-window.c:304
 msgid "Next Flagged Message"
 msgstr "Следећа означена порука"
 
-#: ../src/main-window.c:502
+#: ../src/main-window.c:500
 msgid "_Hide Messages"
 msgstr "_Сакриј поруке"
 
-#: ../src/main-window.c:503
+#: ../src/main-window.c:501
 msgid "_Reset Filter"
 msgstr "_Очисти пропусник"
 
-#: ../src/main-window.c:504
+#: ../src/main-window.c:502
 msgid "Reset mailbox filter"
 msgstr "Очистите пропусник сандучета"
 
-#: ../src/main-window.c:505
+#: ../src/main-window.c:503
 msgid "_Select All"
 msgstr "Изабери _све"
 
-#: ../src/main-window.c:506
+#: ../src/main-window.c:504
 msgid "Select all messages in current mailbox"
 msgstr "Изаберите све поруке у тренутном сандучету"
 
-#: ../src/main-window.c:509
+#: ../src/main-window.c:507
 msgid "Edit the selected mailbox"
 msgstr "Уредите изабрано сандуче"
 
-#: ../src/main-window.c:510
+#: ../src/main-window.c:508
 msgid "_Delete..."
 msgstr "_Обриши..."
 
-#: ../src/main-window.c:511
+#: ../src/main-window.c:509
 msgid "Delete the selected mailbox"
 msgstr "Обришите изабрано сандуче"
 
 # bug: plural-forms
-#: ../src/main-window.c:514 ../src/main-window.c:517
+#: ../src/main-window.c:512 ../src/main-window.c:515
 msgid "E_xpunge Deleted Messages"
 msgstr "_Избаци обрисане поруке"
 
-#: ../src/main-window.c:515 ../src/main-window.c:518
+#: ../src/main-window.c:513 ../src/main-window.c:516
 msgid "Expunge messages marked as deleted in the current mailbox"
 msgstr "Избаците поруке које су обрисане из тренутног сандучета"
 
-#: ../src/main-window.c:521
+#: ../src/main-window.c:519
 msgid "Close mailbox"
 msgstr "Затворите сандуче"
 
-#: ../src/main-window.c:523
+#: ../src/main-window.c:521
 msgid "Select _Filters"
 msgstr "Изабери _пропуснике"
 
-#: ../src/main-window.c:524
+#: ../src/main-window.c:522
 msgid "Select filters to be applied automatically to current mailbox"
 msgstr ""
 "Изаберите пропуснике који ће бити примењени аутоматски за тренутно сандуче"
 
-#: ../src/main-window.c:527
+#: ../src/main-window.c:525
 msgid "_Remove Duplicates"
 msgstr "_Уклони дупликате"
 
-#: ../src/main-window.c:528
+#: ../src/main-window.c:526
 msgid "Remove duplicated messages from the current mailbox"
 msgstr "Уклоните дуплиране поруке из тренутног сандучета"
 
-#: ../src/main-window.c:538 ../src/message-window.c:269
+#: ../src/main-window.c:536 ../src/message-window.c:267
 msgid "Reply to the current message"
 msgstr "Одговорите на тренутну поруку"
 
-#: ../src/main-window.c:539 ../src/message-window.c:270
+#: ../src/main-window.c:537 ../src/message-window.c:268
 msgid "Reply to _All..."
 msgstr "Одговори _свима..."
 
-#: ../src/main-window.c:540 ../src/message-window.c:271
+#: ../src/main-window.c:538 ../src/message-window.c:269
 msgid "Reply to all recipients of the current message"
 msgstr "Одговорите свим примаоцима тренутне поруке"
 
-#: ../src/main-window.c:542 ../src/message-window.c:273
+#: ../src/main-window.c:540 ../src/message-window.c:271
 msgid "Reply to _Group..."
 msgstr "Одговори _групи..."
 
-#: ../src/main-window.c:543 ../src/message-window.c:274
+#: ../src/main-window.c:541 ../src/message-window.c:272
 msgid "Reply to mailing list"
 msgstr "Одговорите на дописну листу"
 
-#: ../src/main-window.c:545
+#: ../src/main-window.c:543
 msgid "Store address of sender in addressbook"
 msgstr "Сачувајте адресу пошиљаоца у адресар"
 
-#: ../src/main-window.c:547 ../src/message-window.c:278
+#: ../src/main-window.c:545 ../src/message-window.c:276
 msgid "_View Source..."
 msgstr "Прикажи _изворно..."
 
-#: ../src/main-window.c:548 ../src/message-window.c:279
+#: ../src/main-window.c:546 ../src/message-window.c:277
 msgid "View source form of the message"
 msgstr "Прикажите изворни код поруке"
 
@@ -4908,205 +4809,204 @@ msgstr "Прикажите изворни код поруке"
 #. * stock_id; the first in this list defines the action tied to the
 #. * toolbar's Forward button, so "ForwardDefault" must come before
 #. * the others.
-#: ../src/main-window.c:554
+#: ../src/main-window.c:552
 msgid "_Forward..."
 msgstr "_Проследи..."
 
-#: ../src/main-window.c:555 ../src/message-window.c:285
+#: ../src/main-window.c:553 ../src/message-window.c:283
 msgid "Forward the current message"
 msgstr "Проследите тренутну поруку"
 
-#: ../src/main-window.c:558 ../src/message-window.c:287
+#: ../src/main-window.c:556 ../src/message-window.c:285
 msgid "_Forward attached..."
 msgstr "Проследи као _прилог..."
 
-#: ../src/main-window.c:559 ../src/message-window.c:288
+#: ../src/main-window.c:557 ../src/message-window.c:286
 msgid "Forward the current message as attachment"
 msgstr "Проследите тренутну поруку као прилог"
 
-#: ../src/main-window.c:561 ../src/message-window.c:290
+#: ../src/main-window.c:559 ../src/message-window.c:288
 msgid "Forward _inline..."
 msgstr "Проследи у _телу..."
 
-#: ../src/main-window.c:562 ../src/message-window.c:291
+#: ../src/main-window.c:560 ../src/message-window.c:289
 msgid "Forward the current message inline"
 msgstr "Проследите тренутну поруку у телу поруке"
 
-#: ../src/main-window.c:565
+#: ../src/main-window.c:563
 msgid "Pipe the message through another program"
 msgstr "Преспојте поруку кроз други програм"
 
-#: ../src/main-window.c:567
+#: ../src/main-window.c:565
 msgid "Select _Thread"
 msgstr "Изабери _тему"
 
-#: ../src/main-window.c:568
-#| msgid "Select all messages in current mailbox"
+#: ../src/main-window.c:566
 msgid "Select all messages in current thread"
 msgstr "Изаберите све поруке у тренутној теми"
 
 #. File menu item
-#: ../src/main-window.c:576 ../src/message-window.c:246
-#: ../src/sendmsg-window.c:348
+#: ../src/main-window.c:574 ../src/message-window.c:244
+#: ../src/sendmsg-window.c:350
 msgid "_Print..."
 msgstr "_Штампај..."
 
-#: ../src/main-window.c:577 ../src/message-window.c:247
+#: ../src/main-window.c:575 ../src/message-window.c:245
 msgid "Print current message"
 msgstr "Штампајте тренутну поруку"
 
-#: ../src/main-window.c:578 ../src/message-window.c:275
+#: ../src/main-window.c:576 ../src/message-window.c:273
 msgid "Save Current Part..."
 msgstr "Сачувај текући део..."
 
-#: ../src/main-window.c:579 ../src/message-window.c:276
+#: ../src/main-window.c:577 ../src/message-window.c:274
 msgid "Save currently displayed part of message"
 msgstr "Сачувајте тренутно приказани део поруке"
 
-#: ../src/main-window.c:582 ../src/message-window.c:293
+#: ../src/main-window.c:580 ../src/message-window.c:291
 msgid "_Next Part"
 msgstr "_Следећи део"
 
-#: ../src/main-window.c:583 ../src/message-window.c:294
+#: ../src/main-window.c:581 ../src/message-window.c:292
 msgid "Next part in message"
 msgstr "Прикажите следећи део поруке"
 
-#: ../src/main-window.c:584 ../src/message-window.c:295
+#: ../src/main-window.c:582 ../src/message-window.c:293
 msgid "_Previous Part"
 msgstr "_Претходни део"
 
-#: ../src/main-window.c:585 ../src/message-window.c:296
+#: ../src/main-window.c:583 ../src/message-window.c:294
 msgid "Previous part in message"
 msgstr "Прикажите претходни део поруке"
 
-#: ../src/main-window.c:588
+#: ../src/main-window.c:586
 msgid "Copy message"
 msgstr "Умножите поруку"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:589
 msgid "Find in _Message"
 msgstr "_Нађи унутар поруке"
 
-#: ../src/main-window.c:592 ../src/message-window.c:256
+#: ../src/main-window.c:590 ../src/message-window.c:254
 msgid "Find a string in this message"
 msgstr "Пронађите задати текст унутар поруке"
 
-#: ../src/main-window.c:602 ../src/message-window.c:308
+#: ../src/main-window.c:600 ../src/message-window.c:306
 msgid "_Move to Trash"
 msgstr "Пре_мести у смеће"
 
-#: ../src/main-window.c:603 ../src/main-window.c:607
+#: ../src/main-window.c:601 ../src/main-window.c:605
 msgid "Move the current message to Trash mailbox"
 msgstr "Преместите поруку у смеће"
 
-#: ../src/main-window.c:606
+#: ../src/main-window.c:604
 msgid "_Delete to Trash"
 msgstr "_Обриши у смеће"
 
-#: ../src/main-window.c:610 ../src/main-window.c:619
+#: ../src/main-window.c:608 ../src/main-window.c:617
 msgid "Toggle New"
 msgstr "Измени нову"
 
-#: ../src/main-window.c:612
+#: ../src/main-window.c:610
 msgid "_Toggle Flag"
 msgstr "_Измени ознаку"
 
-#: ../src/main-window.c:615
+#: ../src/main-window.c:613
 msgid "Toggle flagged"
 msgstr "Измените да је означена"
 
 #. Hide messages menu items
-#: ../src/main-window.c:616 ../src/main-window.c:651
+#: ../src/main-window.c:614 ../src/main-window.c:649
 msgid "_Deleted"
 msgstr "_Обрисана"
 
-#: ../src/main-window.c:617
+#: ../src/main-window.c:615
 msgid "Toggle deleted flag"
 msgstr "Измените да је обрисана"
 
-#: ../src/main-window.c:620 ../src/main-window.c:663
+#: ../src/main-window.c:618 ../src/main-window.c:661
 msgid "_Answered"
 msgstr "_Одговорено"
 
-#: ../src/main-window.c:621
+#: ../src/main-window.c:619
 msgid "Toggle Answered"
 msgstr "Измените да је одговорено"
 
-#: ../src/main-window.c:628
+#: ../src/main-window.c:626
 msgid "_Show Mailbox Tree"
 msgstr "Прикажи _стабло сандучета"
 
-#: ../src/main-window.c:629
+#: ../src/main-window.c:627
 msgid "Toggle display of mailbox and folder tree"
 msgstr "Измените приказ стабла сандучића и фасцикли"
 
-#: ../src/main-window.c:631
+#: ../src/main-window.c:629
 msgid "Show Mailbox _Tabs"
 msgstr "Прикажи _листове сандучића"
 
-#: ../src/main-window.c:632
+#: ../src/main-window.c:630
 msgid "Toggle display of mailbox notebook tabs"
 msgstr "Измените приказ сандучића у виду језичака"
 
-#: ../src/main-window.c:634 ../src/message-window.c:315
+#: ../src/main-window.c:632 ../src/message-window.c:313
 msgid "Show Too_lbar"
 msgstr "Прикажи палету _алатки"
 
-#: ../src/main-window.c:636
+#: ../src/main-window.c:634
 msgid "Show St_atus Bar"
 msgstr "Прикажу траку _стања"
 
-#: ../src/main-window.c:638
+#: ../src/main-window.c:636
 msgid "Show _Index Filter"
 msgstr "Прикажи _пропусник претраге"
 
-#: ../src/main-window.c:641
+#: ../src/main-window.c:639
 msgid "_Descending"
 msgstr "_Опадајуће"
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:640
 msgid "Sort in a descending order"
 msgstr "Поређајте ставке у опадајућем редоследу"
 
-#: ../src/main-window.c:644
+#: ../src/main-window.c:642
 msgid "_View filter"
 msgstr "_Пропусник прегледа"
 
-#: ../src/main-window.c:645
+#: ../src/main-window.c:643
 msgid "Enable quick message index filter"
 msgstr "Укључите брзи пропусник пописа порука"
 
-#: ../src/main-window.c:648 ../src/message-window.c:317
+#: ../src/main-window.c:646 ../src/message-window.c:315
 msgid "_Wrap"
 msgstr "_Преломи"
 
-#: ../src/main-window.c:648 ../src/message-window.c:317
-#: ../src/sendmsg-window.c:365
+#: ../src/main-window.c:646 ../src/message-window.c:315
+#: ../src/sendmsg-window.c:367
 msgid "Wrap message lines"
 msgstr "Преломите редове порука"
 
-#: ../src/main-window.c:653
+#: ../src/main-window.c:651
 msgid "Un_Deleted"
 msgstr "Од_обрисана"
 
-#: ../src/main-window.c:655
+#: ../src/main-window.c:653
 msgid "_Read"
 msgstr "_Прочитана"
 
-#: ../src/main-window.c:657
+#: ../src/main-window.c:655
 msgid "Un_read"
 msgstr "_Непрочитана"
 
-#: ../src/main-window.c:661
+#: ../src/main-window.c:659
 msgid "Un_flagged"
 msgstr "_Неозначена"
 
-#: ../src/main-window.c:665
+#: ../src/main-window.c:663
 msgid "Un_answered"
 msgstr "_Одговорено"
 
 #. Toolbar items not on any menu
-#: ../src/main-window.c:668 ../src/toolbar-factory.c:161
+#: ../src/main-window.c:666 ../src/toolbar-factory.c:159
 msgid ""
 "All\n"
 "headers"
@@ -5114,107 +5014,107 @@ msgstr ""
 "Сва\n"
 "заглавља"
 
-#: ../src/main-window.c:669 ../src/message-window.c:320
+#: ../src/main-window.c:667 ../src/message-window.c:318
 msgid "Show all headers"
 msgstr "Прикажите сва заглавља"
 
-#: ../src/main-window.c:671 ../src/toolbar-factory.c:163
+#: ../src/main-window.c:669 ../src/toolbar-factory.c:161
 msgid "Msg Preview"
 msgstr "Преглед поруке"
 
-#: ../src/main-window.c:672
+#: ../src/main-window.c:670
 msgid "Show preview pane"
 msgstr "Покажите површ за преглед"
 
-#: ../src/main-window.c:678 ../src/message-window.c:326
+#: ../src/main-window.c:676 ../src/message-window.c:324
 msgid "_No Headers"
 msgstr "Без _заглавља"
 
-#: ../src/main-window.c:679 ../src/message-window.c:327
+#: ../src/main-window.c:677 ../src/message-window.c:325
 msgid "Display no headers"
 msgstr "Не приказујте заглавља порука"
 
-#: ../src/main-window.c:680
+#: ../src/main-window.c:678
 msgid "S_elected Headers"
 msgstr "_Изабрана заглавља"
 
-#: ../src/main-window.c:681 ../src/message-window.c:329
+#: ../src/main-window.c:679 ../src/message-window.c:327
 msgid "Display selected headers"
 msgstr "Прикажите само изабрана заглавља"
 
-#: ../src/main-window.c:682 ../src/message-window.c:330
+#: ../src/main-window.c:680 ../src/message-window.c:328
 msgid "All _Headers"
 msgstr "С_ва заглавља"
 
-#: ../src/main-window.c:683 ../src/message-window.c:331
+#: ../src/main-window.c:681 ../src/message-window.c:329
 msgid "Display all headers"
 msgstr "Прикажите сва заглавља"
 
-#: ../src/main-window.c:687
+#: ../src/main-window.c:685
 msgid "_Flat index"
 msgstr "_Без груписања расправа"
 
-#: ../src/main-window.c:688
+#: ../src/main-window.c:686
 msgid "No threading at all"
 msgstr "Не групишите поруке по расправама"
 
-#: ../src/main-window.c:689
+#: ../src/main-window.c:687
 msgid "Si_mple threading"
 msgstr "_Једноставно груписање"
 
-#: ../src/main-window.c:690
+#: ../src/main-window.c:688
 msgid "Simple threading algorithm"
 msgstr "Примените једноставан начи за приказ расправа"
 
-#: ../src/main-window.c:691
+#: ../src/main-window.c:689
 msgid "_JWZ threading"
 msgstr "_Напредно груписање"
 
-#: ../src/main-window.c:692
+#: ../src/main-window.c:690
 msgid "Elaborate JWZ threading"
 msgstr "Примените напредан начин за груписање расправа"
 
-#: ../src/main-window.c:697
+#: ../src/main-window.c:695
 msgid "By _Arrival"
 msgstr "Према датуму _приспећа"
 
-#: ../src/main-window.c:698
+#: ../src/main-window.c:696
 msgid "Arrival order"
 msgstr "Средите поруке према датуму приспећа"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:697
 msgid "By _Sender"
 msgstr "Према по_шиљаоцу"
 
-#: ../src/main-window.c:700
+#: ../src/main-window.c:698
 msgid "Sender order"
 msgstr "Средите поруке на основу тога ко их је послао"
 
-#: ../src/main-window.c:701
+#: ../src/main-window.c:699
 msgid "By S_ubject"
 msgstr "Према _теми"
 
-#: ../src/main-window.c:702
+#: ../src/main-window.c:700
 msgid "Subject order"
 msgstr "Средите поруке према називу теме"
 
-#: ../src/main-window.c:703
+#: ../src/main-window.c:701
 msgid "By Si_ze"
 msgstr "Према _величини"
 
-#: ../src/main-window.c:704
+#: ../src/main-window.c:702
 msgid "By message size"
 msgstr "Средите поруке према њиховој величини"
 
-#: ../src/main-window.c:705
+#: ../src/main-window.c:703
 msgid "_Threaded"
 msgstr "_Према расправи"
 
-#: ../src/main-window.c:706
+#: ../src/main-window.c:704
 msgid "Use message threading"
 msgstr "Средите поруке према расправи"
 
-#: ../src/main-window.c:1067
+#: ../src/main-window.c:1065
 msgid ""
 "Balsa is sending a mail now.\n"
 "Abort sending?"
@@ -5222,36 +5122,36 @@ msgstr ""
 "Балса тренутно шаље поруку.\n"
 "Да прекинем слање?"
 
-#: ../src/main-window.c:1237
+#: ../src/main-window.c:1235
 msgid "Subject or Sender Contains:"
 msgstr "Тема или пошиљалац садрже:"
 
-#: ../src/main-window.c:1238
+#: ../src/main-window.c:1236
 msgid "Subject or Recipient Contains:"
 msgstr "Тема или прималац садрже:"
 
-#: ../src/main-window.c:1239
+#: ../src/main-window.c:1237
 msgid "Subject Contains:"
 msgstr "Тема садржи:"
 
-#: ../src/main-window.c:1240
+#: ../src/main-window.c:1238
 msgid "Body Contains:"
 msgstr "Тело поруке садржи:"
 
-#: ../src/main-window.c:1241
+#: ../src/main-window.c:1239
 msgid "Older than (days):"
 msgstr "Старије од (у данима):"
 
-#: ../src/main-window.c:1242
+#: ../src/main-window.c:1240
 msgid "Old at most (days):"
 msgstr "Старо барем (у данима):"
 
-#: ../src/main-window.c:2371
+#: ../src/main-window.c:2369
 #, c-format
 msgid "Opening %s"
 msgstr "Отварам %s"
 
-#: ../src/main-window.c:2388
+#: ../src/main-window.c:2386
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -5260,7 +5160,7 @@ msgstr ""
 "Не могу да отворим сандуче!\n"
 "%s."
 
-#: ../src/main-window.c:2760
+#: ../src/main-window.c:2758
 msgid "translator-credits"
 msgstr ""
 "Данило Шеган <danilo prevod org>\n"
@@ -5269,35 +5169,35 @@ msgstr ""
 "\n"
 "Prevod.org — превод на српски језик."
 
-#: ../src/main-window.c:2771
+#: ../src/main-window.c:2769
 msgid "The Balsa email client is part of the GNOME desktop environment."
 msgstr "Програм за ел. пошту, Балса, је део Гномовог радног окружења."
 
-#: ../src/main-window.c:2873 ../src/main-window.c:2891
+#: ../src/main-window.c:2871 ../src/main-window.c:2889
 msgid "Checking Mail..."
 msgstr "Проверавам пошту..."
 
-#: ../src/main-window.c:3094
+#: ../src/main-window.c:3092
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "ИМАП сандуче: %s"
 
-#: ../src/main-window.c:3098
+#: ../src/main-window.c:3096
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Месно сандуче: %s"
 
-#: ../src/main-window.c:3254
+#: ../src/main-window.c:3252
 msgid "Finished Checking."
 msgstr "Провера је завршена."
 
-#: ../src/main-window.c:3319
+#: ../src/main-window.c:3317
 #, c-format
 msgid "Sending error: %s"
 msgstr "Грешка при слању: %s"
 
 # bug: plural-forms
-#: ../src/main-window.c:3384
+#: ../src/main-window.c:3382
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -5306,12 +5206,12 @@ msgstr[1] "Примили сте %d нове поруке."
 msgstr[2] "Примили сте %d нових порука."
 msgstr[3] "Примили сте једну нову поруку."
 
-#: ../src/main-window.c:3387
+#: ../src/main-window.c:3385
 msgid "You have new mail."
 msgstr "Имате нову пошту."
 
 # bug: plural-forms
-#: ../src/main-window.c:3428
+#: ../src/main-window.c:3426
 #, c-format
 msgid "Balsa: you have received %d new message."
 msgid_plural "Balsa: you have received %d new messages."
@@ -5320,73 +5220,71 @@ msgstr[1] "Балса: примили сте %d нове поруке."
 msgstr[2] "Балса: примили сте %d нових порука."
 msgstr[3] "Балса: примили сте једну нову поруку."
 
-#: ../src/main-window.c:3432
+#: ../src/main-window.c:3430
 msgid "Balsa: you have new mail."
 msgstr "Балса: имате нову пошту."
 
-#: ../src/main-window.c:3492
+#: ../src/main-window.c:3490
 msgid "Balsa: New mail"
 msgstr "Балса: Нова пошта"
 
-#: ../src/main-window.c:3781
+#: ../src/main-window.c:3779
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "Следећа непрочитана порука је у %s"
 
-#: ../src/main-window.c:3788
+#: ../src/main-window.c:3786
 #, c-format
-#| msgid "Do you want to correct the path?"
 msgid "Do you want to select %s?"
 msgstr "Да ли желите да изаберете „%s“?"
 
-#: ../src/main-window.c:4321
+#: ../src/main-window.c:4319
 msgid "Search mailbox"
 msgstr "Претражи сандуче"
 
-#: ../src/main-window.c:4341
+#: ../src/main-window.c:4339
 msgid "_Search for:"
 msgstr "_Претражи:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:4354
+#: ../src/main-window.c:4352
 msgid "In:"
 msgstr "У:"
 
-#: ../src/main-window.c:4365
+#: ../src/main-window.c:4363
 msgid "S_ubject"
 msgstr "Т_ема"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:4370
+#: ../src/main-window.c:4368
 msgid "Show only matching messages"
 msgstr "Прикажи само одговарајуће поруке"
 
 #. Frame with OK button
-#: ../src/main-window.c:4391
+#: ../src/main-window.c:4389
 msgid "Open next matching message"
 msgstr "Отвори следећу одговарајућу поруку"
 
-#: ../src/main-window.c:4402
+#: ../src/main-window.c:4400
 msgid "_Reverse search"
 msgstr "_Обрнута претрага"
 
-#: ../src/main-window.c:4407
+#: ../src/main-window.c:4405
 msgid "_Wrap around"
 msgstr "_Преламај унаоколо"
 
-#: ../src/main-window.c:4582
+#: ../src/main-window.c:4580
 msgid "You can apply filters only on mailbox\n"
 msgstr "Пропуснике можете применити само на сандуче\n"
 
-#: ../src/main-window.c:4597
+#: ../src/main-window.c:4595
 #, c-format
 msgid "Removing duplicates failed: %s"
 msgstr "Нисам успео да уклоним дупликате: %s"
 
-#: ../src/main-window.c:4603
+#: ../src/main-window.c:4601
 #, c-format
-#| msgid "_Remove Duplicates"
 msgid "Removed %d duplicate"
 msgid_plural "Removed %d duplicates"
 msgstr[0] "Уклонио сам %d дупликат"
@@ -5394,35 +5292,34 @@ msgstr[1] "Уклонио сам %d дупликата"
 msgstr[2] "Уклонио сам %d дупликата"
 msgstr[3] "Уклонио сам један дупликат"
 
-#: ../src/main-window.c:4608
+#: ../src/main-window.c:4606
 msgid "No duplicates found"
 msgstr "Нисам пронашао дупликате"
 
-#: ../src/main-window.c:4837
+#: ../src/main-window.c:4835
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Не могу да отворим смеће: %s"
 
-#: ../src/main-window.c:4985
+#: ../src/main-window.c:4983
 #, c-format
 msgid "Balsa: %s (readonly)"
 msgstr "Балса: %s (само за читање)"
 
-#: ../src/main-window.c:4987
+#: ../src/main-window.c:4985
 #, c-format
 msgid "Balsa: %s"
 msgstr "Балса: %s"
 
 #. xgettext: this is the first part of the message
 #. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:5568
+#: ../src/main-window.c:5566
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Прикажи сандуче: %s "
 
-#: ../src/main-window.c:5573
+#: ../src/main-window.c:5571
 #, c-format
-#| msgid "Print message"
 msgid "with %d message"
 msgid_plural "with %d messages"
 msgstr[0] "са %d поруком"
@@ -5430,7 +5327,7 @@ msgstr[1] "са %d поруке"
 msgstr[2] "са %d порука"
 msgstr[3] "са једном поруком"
 
-#: ../src/main-window.c:5580
+#: ../src/main-window.c:5578
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
@@ -5439,7 +5336,7 @@ msgstr[1] ", %d нове"
 msgstr[2] ", %d нових"
 msgstr[3] ", једна нова"
 
-#: ../src/main-window.c:5587
+#: ../src/main-window.c:5585
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
@@ -5448,223 +5345,207 @@ msgstr[1] ", %d скривене"
 msgstr[2] ", %d скривених"
 msgstr[3] ", једна скривена"
 
-#: ../src/message-window.c:242
+#: ../src/message-window.c:240
 msgid "M_ove"
 msgstr "Пре_мести"
 
-#: ../src/message-window.c:249
+#: ../src/message-window.c:247
 msgid "Close the message window"
 msgstr "Затворите прозор поруке"
 
-#: ../src/message-window.c:255
+#: ../src/message-window.c:253
 msgid "_Find in message"
 msgstr "_Нађи унутар поруке"
 
-#: ../src/message-window.c:309
+#: ../src/message-window.c:307
 msgid "Move the message to Trash mailbox"
 msgstr "Преместите поруку у смеће"
 
-#: ../src/message-window.c:316
-#| msgid "Customize toolbars"
+#: ../src/message-window.c:314
 msgid "Show toolbar"
 msgstr "Прикажи палету алата"
 
-#: ../src/message-window.c:328
+#: ../src/message-window.c:326
 msgid "_Selected Headers"
 msgstr "_Изабрана заглавља"
 
-#: ../src/message-window.c:1050
+#: ../src/message-window.c:1048
 #, c-format
 msgid "Message from %s: %s"
 msgstr "Поруку шаље %s: %s"
 
-#: ../src/pref-manager.c:402
-#| msgid "While Retrieving Messages"
+#: ../src/pref-manager.c:400
 msgid "While retrieving messages"
 msgstr "Приликом преузимања порука"
 
-#: ../src/pref-manager.c:403
-#| msgid "Until Closed"
+#: ../src/pref-manager.c:401
 msgid "Until closed"
 msgstr "Док се не затвори"
 
-#: ../src/pref-manager.c:409
+#: ../src/pref-manager.c:407
 msgid "Fast"
 msgstr "Брзо"
 
-#: ../src/pref-manager.c:410
+#: ../src/pref-manager.c:408
 msgid "Normal"
 msgstr "Обично"
 
-#: ../src/pref-manager.c:411
-#| msgid "Bad Spellers"
+#: ../src/pref-manager.c:409
 msgid "Bad spellers"
 msgstr "Лоше познају правопис"
 
-#: ../src/pref-manager.c:417
+#: ../src/pref-manager.c:415
 msgid "Message number"
 msgstr "Број поруке"
 
-#: ../src/pref-manager.c:421
+#: ../src/pref-manager.c:419
 msgid "Sender"
 msgstr "Пошиљалац"
 
-#: ../src/pref-manager.c:425
+#: ../src/pref-manager.c:423
 msgid "Flat"
 msgstr "Равно"
 
-#: ../src/pref-manager.c:427
+#: ../src/pref-manager.c:425
 msgid "JWZ"
 msgstr "Напредно"
 
 #. must NOT be modal
-#: ../src/pref-manager.c:523
+#: ../src/pref-manager.c:521
 msgid "Balsa Preferences"
 msgstr "Поставке Балсе"
 
-#: ../src/pref-manager.c:577
-#| msgid "Mail Options"
+#: ../src/pref-manager.c:575
 msgid "Mail options"
 msgstr "Избори поште"
 
-#: ../src/pref-manager.c:579
-#| msgid "Mail Options"
+#: ../src/pref-manager.c:577
 msgid "Display options"
 msgstr "Опције приказа"
 
-#: ../src/pref-manager.c:581 ../src/pref-manager.c:2909
-#| msgid "Address Books"
+#: ../src/pref-manager.c:579 ../src/pref-manager.c:2907
 msgid "Address books"
 msgstr "Адресари"
 
-#: ../src/pref-manager.c:585 ../src/toolbar-factory.c:157
+#: ../src/pref-manager.c:583 ../src/toolbar-factory.c:155
 msgid "Spelling"
 msgstr "Правопис"
 
-#: ../src/pref-manager.c:589
+#: ../src/pref-manager.c:587
 msgid "Startup"
 msgstr "Покретање"
 
-#: ../src/pref-manager.c:591 ../src/pref-manager.c:2697
+#: ../src/pref-manager.c:589 ../src/pref-manager.c:2695
 msgid "Miscellaneous"
 msgstr "Разно"
 
-#: ../src/pref-manager.c:1411
+#: ../src/pref-manager.c:1409
 #, c-format
 msgid "%s (default)"
 msgstr "%s (основно)"
 
-#: ../src/pref-manager.c:1671
-#| msgid "Remote Mailbox Servers"
+#: ../src/pref-manager.c:1669
 msgid "Remote mailbox servers"
 msgstr "Удаљени сервери за пошту"
 
-#: ../src/pref-manager.c:1692 ../src/pref-manager.c:2930
-#: ../src/sendmsg-window.c:3021
+#: ../src/pref-manager.c:1690 ../src/pref-manager.c:2928
+#: ../src/sendmsg-window.c:3030
 msgid "Type"
 msgstr "Врста"
 
-#: ../src/pref-manager.c:1700
-#| msgid "Mailbox Name"
+#: ../src/pref-manager.c:1698
 msgid "Mailbox name"
 msgstr "Назив сандучета"
 
-#: ../src/pref-manager.c:1714 ../src/pref-manager.c:1787
-#: ../src/pref-manager.c:2965
+#: ../src/pref-manager.c:1712 ../src/pref-manager.c:1785
+#: ../src/pref-manager.c:2963
 msgid "_Modify"
 msgstr "_Измени"
 
-#: ../src/pref-manager.c:1728
+#: ../src/pref-manager.c:1726
 msgid "Local mail directory"
 msgstr "Месни директоријум поште"
 
-#: ../src/pref-manager.c:1730
+#: ../src/pref-manager.c:1728
 msgid "Select your local mail directory"
 msgstr "Изаберите ваш месни директоријум поште"
 
-#: ../src/pref-manager.c:1751
+#: ../src/pref-manager.c:1749
 msgid "Outgoing mail servers"
 msgstr "Сервер одлазне поште"
 
-#: ../src/pref-manager.c:1773
+#: ../src/pref-manager.c:1771
 msgid "Server name"
 msgstr "Назив сервера"
 
-#: ../src/pref-manager.c:1813
-#| msgid "Mail Servers"
+#: ../src/pref-manager.c:1811
 msgid "Mail servers"
 msgstr "Сервери поште"
 
-#: ../src/pref-manager.c:1815
+#: ../src/pref-manager.c:1813
 msgid "Incoming"
 msgstr "Долазна"
 
-#: ../src/pref-manager.c:1817
+#: ../src/pref-manager.c:1815
 msgid "Outgoing"
 msgstr "Одлазна"
 
-#: ../src/pref-manager.c:1844
+#: ../src/pref-manager.c:1842
 msgid "Checking"
 msgstr "Проверавам"
 
-#: ../src/pref-manager.c:1850
-#| msgid "_Check mail automatically every:"
+#: ../src/pref-manager.c:1848
 msgid "_Check mail automatically every"
 msgstr "_Проверавај пошту сваких"
 
-#: ../src/pref-manager.c:1861 ../src/pref-manager.c:2720
-#: ../src/pref-manager.c:2780
+#: ../src/pref-manager.c:1859 ../src/pref-manager.c:2718
+#: ../src/pref-manager.c:2778
 msgid "minutes"
 msgstr "минута"
 
-#: ../src/pref-manager.c:1868
+#: ../src/pref-manager.c:1866
 msgid "Check _IMAP mailboxes"
 msgstr "Провери _ИМАП сандучиће"
 
-#: ../src/pref-manager.c:1874
+#: ../src/pref-manager.c:1872
 msgid "Check INBOX _only"
 msgstr "Провери _само сандуче „Долазна“"
 
-#: ../src/pref-manager.c:1881
+#: ../src/pref-manager.c:1879
 msgid "When mail arrives:"
 msgstr "Када пошта стигне:"
 
-#: ../src/pref-manager.c:1886
-#| msgid "Display Progress Dialog"
+#: ../src/pref-manager.c:1884
 msgid "Display message"
 msgstr "Прикажи поруку"
 
-#: ../src/pref-manager.c:1891
-#| msgid "Play sound:"
+#: ../src/pref-manager.c:1889
 msgid "Play sound"
 msgstr "Пусти звук"
 
-#: ../src/pref-manager.c:1896
-#| msgid "Show dialog"
+#: ../src/pref-manager.c:1894
 msgid "Show icon"
 msgstr "Прикажи иконицу"
 
-#: ../src/pref-manager.c:1905
+#: ../src/pref-manager.c:1903
 msgid "Do background check quietly (no messages in status bar)"
 msgstr "Тихо провери у позадини (без порука у траци стања)"
 
-#: ../src/pref-manager.c:1910
+#: ../src/pref-manager.c:1908
 msgid "_POP message size limit:"
 msgstr "Ограничење величине _ПОП поруке:"
 
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:1938
-#| msgid "Quoted and Flowed Text"
+#: ../src/pref-manager.c:1936
 msgid "Quoted and flowed text"
 msgstr "Цитирани и укључени текст"
 
-#: ../src/pref-manager.c:1943
+#: ../src/pref-manager.c:1941
 msgid "Mark quoted text"
 msgstr "Означи цитирани текст"
 
-#: ../src/pref-manager.c:1948
-#| msgid "Quoted Text Regular Expression"
+#: ../src/pref-manager.c:1946
 msgid ""
 "Quoted text\n"
 "regular expression:"
@@ -5672,49 +5553,42 @@ msgstr ""
 "Регуларни израз\n"
 "цитираног текста:"
 
-#: ../src/pref-manager.c:1957
-#| msgid "Wrap Outgoing Text at:"
+#: ../src/pref-manager.c:1955
 msgid "Wrap text at"
 msgstr "Преломи текст на"
 
-#: ../src/pref-manager.c:1968 ../src/pref-manager.c:2135
+#: ../src/pref-manager.c:1966 ../src/pref-manager.c:2133
 msgid "characters"
 msgstr "знакова"
 
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:1983
-#| msgid "Display of Multipart/Alternative Parts"
+#: ../src/pref-manager.c:1981
 msgid "Display of multipart/alternative parts"
 msgstr "Приказ делова вишеделних порука"
 
-#: ../src/pref-manager.c:1986
-#| msgid "prefer text/plain over html"
+#: ../src/pref-manager.c:1984
 msgid "Prefer text/plain over html"
 msgstr "Предност обичног текста над хтмл-ом"
 
-#: ../src/pref-manager.c:2002
+#: ../src/pref-manager.c:2000
 msgid "National (8-bit) characters in broken messages without codeset header"
-msgstr "Национални (8-битни) знакови у неисправним порукама без ознаке кодирања"
+msgstr ""
+"Национални (8-битни) знакови у неисправним порукама без ознаке кодирања"
 
-#: ../src/pref-manager.c:2009
+#: ../src/pref-manager.c:2007
 msgid "display as \"?\""
 msgstr "прикажи као „?“"
 
-#: ../src/pref-manager.c:2018
-#| msgid "display using codeset"
+#: ../src/pref-manager.c:2016
 msgid "display in codeset"
 msgstr "прикажи у кодном скупу"
 
 #. How to handle received MDN requests
-#: ../src/pref-manager.c:2048
-#| msgid "Message Disposition Notification Requests"
+#: ../src/pref-manager.c:2046
 msgid "Message disposition notification requests"
 msgstr "Захтеви за обавештење о приспећу поруке"
 
-#: ../src/pref-manager.c:2050
-#| msgid ""
-#| "When I receive a message and its sender requested to return a\n"
-#| "Message Disposition Notification (MDN), send it in the following cases:"
+#: ../src/pref-manager.c:2048
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
@@ -5722,11 +5596,7 @@ msgstr ""
 "Када примим поруку за коју пошиљалац захтева обавештење о доспећу поруке, "
 "пошаљи ако:"
 
-#: ../src/pref-manager.c:2062
-#| msgid ""
-#| "The message header looks clean\n"
-#| "(the notify-to address is equal to the return path,\n"
-#| "I am in the \"To:\" or \"Cc:\" list)."
+#: ../src/pref-manager.c:2060
 msgid ""
 "The message header looks clean\n"
 "(the notify-to address is the return path,\n"
@@ -5736,273 +5606,244 @@ msgstr ""
 "(адреса за обавештавање је повратна адреса,\n"
 "а ја сам на списку прималаца)."
 
-#: ../src/pref-manager.c:2079
+#: ../src/pref-manager.c:2077
 msgid "The message header looks suspicious."
 msgstr "Заглавље поруке изгледа сумњиво."
 
-#: ../src/pref-manager.c:2116
-#| msgid "Word Wrap"
+#: ../src/pref-manager.c:2114
 msgid "Word wrap"
 msgstr "Прелом речи"
 
-#: ../src/pref-manager.c:2121
-#| msgid "Wrap Outgoing Text at:"
+#: ../src/pref-manager.c:2119
 msgid "Wrap outgoing text at"
 msgstr "Преломи текст на"
 
-#: ../src/pref-manager.c:2149
-#| msgid "Other Options"
+#: ../src/pref-manager.c:2147
 msgid "Other options"
 msgstr "Остали избори"
 
-#: ../src/pref-manager.c:2154
-#| msgid "Reply Prefix:"
+#: ../src/pref-manager.c:2152
 msgid "Reply prefix:"
 msgstr "Префикс одговора:"
 
-#: ../src/pref-manager.c:2157
+#: ../src/pref-manager.c:2155
 msgid "Automatically quote original when replying"
 msgstr "Сам цитирај извор при одговарању"
 
-#: ../src/pref-manager.c:2160
+#: ../src/pref-manager.c:2158
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "Проследи поруку као прилог уместо да је цитираш"
 
-#: ../src/pref-manager.c:2163
+#: ../src/pref-manager.c:2161
 msgid "Copy outgoing messages to sentbox"
 msgstr "Умножи одлазеће поруке у „Послато“"
 
-#: ../src/pref-manager.c:2165
+#: ../src/pref-manager.c:2163
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "Дугме за слање увек смешта поруку у „Одлазно“"
 
-#: ../src/pref-manager.c:2168
+#: ../src/pref-manager.c:2166
 msgid "Edit headers in external editor"
 msgstr "Измени заглавља у спољашњем уређивачу"
 
-#: ../src/pref-manager.c:2170
-#| msgid "Don't include HTML parts as text when replying or forwarding mail"
+#: ../src/pref-manager.c:2168
 msgid "Include HTML parts as text when replying or forwarding"
 msgstr "Укључи ХТМЛ делове као текст при одговарању или прослеђивању"
 
-#: ../src/pref-manager.c:2187
-#| msgid "you"
+#: ../src/pref-manager.c:2185
 msgid "Layout"
 msgstr "Распоред"
 
-#: ../src/pref-manager.c:2189
+#: ../src/pref-manager.c:2187
 msgid "Sort and thread"
 msgstr "Поређај и утемачи"
 
-#: ../src/pref-manager.c:2191 ../src/print-gtk.c:501
+#: ../src/pref-manager.c:2189 ../src/print-gtk.c:499
 msgid "Message"
 msgstr "Порука"
 
-#: ../src/pref-manager.c:2193
+#: ../src/pref-manager.c:2191
 msgid "Colors"
 msgstr "Боје"
 
-#: ../src/pref-manager.c:2195 ../src/pref-manager.c:2286
-#| msgid "Normal"
+#: ../src/pref-manager.c:2193 ../src/pref-manager.c:2284
 msgid "Format"
 msgstr "Облик"
 
-#: ../src/pref-manager.c:2197
-#| msgid "Status Messages"
+#: ../src/pref-manager.c:2195
 msgid "Status messages"
 msgstr "Поруке о стању"
 
-#: ../src/pref-manager.c:2222 ../src/toolbar-prefs.c:168
+#: ../src/pref-manager.c:2220 ../src/toolbar-prefs.c:166
 msgid "Main window"
 msgstr "Главни прозор"
 
-#: ../src/pref-manager.c:2225
+#: ../src/pref-manager.c:2223
 msgid "Use preview pane"
 msgstr "Користи површ за преглед"
 
-#: ../src/pref-manager.c:2227
+#: ../src/pref-manager.c:2225
 msgid "Show mailbox statistics in left pane"
 msgstr "Прикажи статистику сандучета на левој површи"
 
-#: ../src/pref-manager.c:2231
+#: ../src/pref-manager.c:2229
 msgid "Automatically view message when mailbox opened"
 msgstr "Сам прикажи поруку чим се отвори сандуче"
 
-#: ../src/pref-manager.c:2234
+#: ../src/pref-manager.c:2232
 msgid "Ask me before selecting a different mailbox to show an unread message"
 msgstr "Питај ме пре него изабереш друго сандуче за приказ непрочитане поруке"
 
-#: ../src/pref-manager.c:2240
-#| msgid "PageUp/PageDown keys scroll message by:"
+#: ../src/pref-manager.c:2238
 msgid "PageUp/PageDown keys scroll text by"
 msgstr "Тастерима „Страница горе/Страница доле“ померај текст за"
 
-#: ../src/pref-manager.c:2251
+#: ../src/pref-manager.c:2249
 msgid "percent"
 msgstr "процента"
 
-#: ../src/pref-manager.c:2266
-#| msgid "Display Progress Dialog"
+#: ../src/pref-manager.c:2264
 msgid "Display progress dialog"
 msgstr "Прикажи прозорче напредовања"
 
-#: ../src/pref-manager.c:2291
+#: ../src/pref-manager.c:2289
 msgid "Date encoding (for strftime):"
 msgstr "Запис датума (за „strftime“):"
 
-#: ../src/pref-manager.c:2293
+#: ../src/pref-manager.c:2291
 msgid "Selected headers:"
 msgstr "Изабрана заглавља:"
 
-#: ../src/pref-manager.c:2315
-#| msgid "Information Messages"
+#: ../src/pref-manager.c:2313
 msgid "Information messages"
 msgstr "Поруке обавештења"
 
-#: ../src/pref-manager.c:2320
-#| msgid "Information Messages"
+#: ../src/pref-manager.c:2318
 msgid "Information messages:"
 msgstr "Поруке обавештења:"
 
-#: ../src/pref-manager.c:2324
-#| msgid "Warning Messages"
+#: ../src/pref-manager.c:2322
 msgid "Warning messages:"
 msgstr "Поруке упозорења:"
 
-#: ../src/pref-manager.c:2328
-#| msgid "Error Messages"
+#: ../src/pref-manager.c:2326
 msgid "Error messages:"
 msgstr "Поруке грешака:"
 
-#: ../src/pref-manager.c:2332
-#| msgid "Fatal Error Messages"
+#: ../src/pref-manager.c:2330
 msgid "Fatal error messages:"
 msgstr "Поруке кобних грешака:"
 
-#: ../src/pref-manager.c:2336
-#| msgid "Debug Messages"
+#: ../src/pref-manager.c:2334
 msgid "Debug messages:"
 msgstr "Поруке о поправљању:"
 
-#: ../src/pref-manager.c:2362
-#| msgid "Message Colors"
+#: ../src/pref-manager.c:2360
 msgid "Message colors"
 msgstr "Боје порука"
 
-#: ../src/pref-manager.c:2367
+#: ../src/pref-manager.c:2365
 #, c-format
 msgid "Quote level %d color"
 msgstr "Боја %d. нивоа цитирања"
 
-#: ../src/pref-manager.c:2380
-#| msgid "Link Color"
+#: ../src/pref-manager.c:2378
 msgid "Link color"
 msgstr "Боја везе"
 
-#: ../src/pref-manager.c:2382
+#: ../src/pref-manager.c:2380
 msgid "Hyperlink color"
 msgstr "Боја хипервезе"
 
-#: ../src/pref-manager.c:2393
-#| msgid "Composition Window"
+#: ../src/pref-manager.c:2391
 msgid "Composition window"
 msgstr "Прозор за писање"
 
-#: ../src/pref-manager.c:2397
+#: ../src/pref-manager.c:2395
 msgid "Invalid or incomplete address label color"
 msgstr "Неисправна или непотпуна боја натписа адреса"
 
-#: ../src/pref-manager.c:2483 ../src/print-gtk.c:510
+#: ../src/pref-manager.c:2481 ../src/print-gtk.c:508
 msgid "Fonts"
 msgstr "Слова"
 
-#: ../src/pref-manager.c:2487
-#| msgid "Message Font"
+#: ../src/pref-manager.c:2485
 msgid "Message font:"
 msgstr "Слова поруке:"
 
-#: ../src/pref-manager.c:2492
-#| msgid "Subject:"
+#: ../src/pref-manager.c:2490
 msgid "Subject font:"
 msgstr "Слова теме:"
 
-#: ../src/pref-manager.c:2498
+#: ../src/pref-manager.c:2496
 msgid "Use default font size"
 msgstr "Користи основну величину слова"
 
-#: ../src/pref-manager.c:2546
+#: ../src/pref-manager.c:2544
 msgid "Sorting and threading"
 msgstr "Ређање и темачење"
 
-#: ../src/pref-manager.c:2550
+#: ../src/pref-manager.c:2548
 msgid "Default sort column:"
 msgstr "Основна колона ређања:"
 
-#: ../src/pref-manager.c:2554
-#| msgid "Default threading style"
+#: ../src/pref-manager.c:2552
 msgid "Default threading style:"
 msgstr "Основни приказ нити:"
 
-#: ../src/pref-manager.c:2559
+#: ../src/pref-manager.c:2557
 msgid "Expand threads on open"
 msgstr "Рашири нити приликом отварања"
 
-#: ../src/pref-manager.c:2634
-#| msgid "Pspell Settings"
+#: ../src/pref-manager.c:2632
 msgid "Pspell settings"
 msgstr "Подешавања пспел-а"
 
-#: ../src/pref-manager.c:2640
-#| msgid "Spell Check Module"
+#: ../src/pref-manager.c:2638
 msgid "Spell check module"
 msgstr "Додатак за проверу правописа"
 
-#: ../src/pref-manager.c:2646
-#| msgid "Suggestion Level"
+#: ../src/pref-manager.c:2644
 msgid "Suggestion level"
 msgstr "Ниво предлога"
 
 #. do the ignore length
-#: ../src/pref-manager.c:2651
+#: ../src/pref-manager.c:2649
 msgid "Ignore words shorter than"
 msgstr "Занемари речи краће од"
 
-#: ../src/pref-manager.c:2669
-#| msgid "Miscellaneous Spelling Settings"
+#: ../src/pref-manager.c:2667
 msgid "Miscellaneous spelling settings"
 msgstr "Разна подешавања правописа"
 
-#: ../src/pref-manager.c:2671
+#: ../src/pref-manager.c:2669
 msgid "Check signature"
 msgstr "Провери потпис"
 
-#: ../src/pref-manager.c:2672
+#: ../src/pref-manager.c:2670
 msgid "Check quoted"
 msgstr "Провери цитирано"
 
-#: ../src/pref-manager.c:2699
+#: ../src/pref-manager.c:2697
 msgid "Debug"
 msgstr "Поправи"
 
-#: ../src/pref-manager.c:2700
-#| msgid "Empty Trash on exit"
+#: ../src/pref-manager.c:2698
 msgid "Empty trash on exit"
 msgstr "Испразни смеће при изласку"
 
-#: ../src/pref-manager.c:2707
-#| msgid "Automatically close mailbox if unused more than"
+#: ../src/pref-manager.c:2705
 msgid "Close mailbox if unused more than"
 msgstr "Сам затвори сандуче ако се не користи више од"
 
-#: ../src/pref-manager.c:2735
-#| msgid "Deleting Messages"
+#: ../src/pref-manager.c:2733
 msgid "Deleting messages"
 msgstr "Брисање порука"
 
 #. Translators: this used to be "using Mailbox -> Hide messages";
 #. * the UTF-8 string for the right-arrow symbol is broken out to
 #. * avoid msgconv problems.
-#: ../src/pref-manager.c:2740
+#: ../src/pref-manager.c:2738
 #, c-format
 msgid ""
 "The following setting is global, but may be overridden for the selected "
@@ -6012,55 +5853,51 @@ msgstr ""
 "употребом Мејлбокс %s скривање порука:"
 
 # bug: plural-forms
-#: ../src/pref-manager.c:2752
+#: ../src/pref-manager.c:2750
 msgid "Hide messages marked as deleted"
 msgstr "Скривене поруке означене као обрисане"
 
-#: ../src/pref-manager.c:2754
+#: ../src/pref-manager.c:2752
 msgid "The following settings are global:"
 msgstr "Следећа подешавања су општа:"
 
-#: ../src/pref-manager.c:2760
+#: ../src/pref-manager.c:2758
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Избаци обрисане поруке приликом затварања сандучета"
 
-#: ../src/pref-manager.c:2767
+#: ../src/pref-manager.c:2765
 msgid "...and if unused more than"
 msgstr "...и ако се не користи више од"
 
-#: ../src/pref-manager.c:2792 ../src/toolbar-prefs.c:182
+#: ../src/pref-manager.c:2790 ../src/toolbar-prefs.c:180
 msgid "Message window"
 msgstr "Прозор поруке"
 
-#: ../src/pref-manager.c:2797
+#: ../src/pref-manager.c:2795
 msgid "After moving a message:"
 msgstr "Након премештања поруке:"
 
-#: ../src/pref-manager.c:2826
-#| msgid "Toolbar options"
+#: ../src/pref-manager.c:2824
 msgid "Startup options"
 msgstr "Опције покретања"
 
-#: ../src/pref-manager.c:2829
+#: ../src/pref-manager.c:2827
 msgid "Open Inbox upon startup"
 msgstr "Отвори „Долазно“ при покретању"
 
-#: ../src/pref-manager.c:2831
+#: ../src/pref-manager.c:2829
 msgid "Check mail upon startup"
 msgstr "Провери пошту при покретању"
 
-#: ../src/pref-manager.c:2833
+#: ../src/pref-manager.c:2831
 msgid "Remember open mailboxes between sessions"
 msgstr "Запамти отворене сандучиће између две сесије"
 
-#: ../src/pref-manager.c:2847
+#: ../src/pref-manager.c:2845
 msgid "Folder scanning"
 msgstr "Прегледање фасцикле"
 
-#: ../src/pref-manager.c:2849
-#| msgid ""
-#| "Choose depth 1 for fast startup; this defers scanning some folders.\n"
-#| "To see more of the tree at startup, choose a greater depth."
+#: ../src/pref-manager.c:2847
 msgid ""
 "Choose depth 1 for fast startup; this defers scanning some folders.  To see "
 "more of the tree at startup, choose a greater depth."
@@ -6068,117 +5905,117 @@ msgstr ""
 "Изаберите дубину 1 за брже покретање; ово одлаже претрагу неких фасцикли. Да "
 "видите више при покретању, изаберите већу дубину."
 
-#: ../src/pref-manager.c:2860
+#: ../src/pref-manager.c:2858
 msgid "Scan local folders to depth"
 msgstr "Прегледај месне фасцикле до дубине"
 
-#: ../src/pref-manager.c:2873
+#: ../src/pref-manager.c:2871
 msgid "Scan IMAP folders to depth"
 msgstr "Прегледај ИМАП фасцикле до дубине"
 
-#: ../src/pref-manager.c:2938
-#| msgid "Address Book Name"
+#: ../src/pref-manager.c:2936
 msgid "Address book name"
 msgstr "Име адресара"
 
-#: ../src/pref-manager.c:2946
+#: ../src/pref-manager.c:2944
 msgid "Auto-complete"
 msgstr "Сам доврши"
 
-#: ../src/pref-manager.c:2971
+#: ../src/pref-manager.c:2969
 msgid "_Set as default"
 msgstr "_Постави као основно"
 
-#: ../src/pref-manager.c:3276
+#: ../src/pref-manager.c:3274
 msgid "Remote POP3 mailbox..."
 msgstr "Удаљено ПОП3 сандуче..."
 
-#: ../src/pref-manager.c:3412
+#: ../src/pref-manager.c:3410
 msgid "Show nothing"
 msgstr "не приказуј ништа"
 
-#: ../src/pref-manager.c:3414
+#: ../src/pref-manager.c:3412
 msgid "Show dialog"
 msgstr "прикажи прозорче"
 
-#: ../src/pref-manager.c:3416
+#: ../src/pref-manager.c:3414
 msgid "Show in list"
 msgstr "прикажи у списку"
 
-#: ../src/pref-manager.c:3418
+#: ../src/pref-manager.c:3416
 msgid "Show in status bar"
 msgstr "прикажи на траци стања"
 
-#: ../src/pref-manager.c:3420
+#: ../src/pref-manager.c:3418
 msgid "Print to console"
 msgstr "испиши у конзоли"
 
-#: ../src/pref-manager.c:3431
+#: ../src/pref-manager.c:3429
 msgid "Ask me"
 msgstr "питај ме"
 
-#: ../src/pref-manager.c:3547
-#| msgid "Default Client"
+#: ../src/pref-manager.c:3545
 msgid "Default layout"
 msgstr "Основни распоред"
 
-#: ../src/pref-manager.c:3548
+#: ../src/pref-manager.c:3546
 msgid "Wide message layout"
 msgstr "Широки приказ поруке"
 
-#: ../src/pref-manager.c:3549
+#: ../src/pref-manager.c:3547
 msgid "Wide screen layout"
 msgstr "Широки приказ екрана"
 
-#: ../src/pref-manager.c:3557
+#: ../src/pref-manager.c:3555
 msgid "Show next unread message"
 msgstr "Прикажи следећу непрочитану поруку"
 
-#: ../src/pref-manager.c:3558
+#: ../src/pref-manager.c:3556
 msgid "Show next message"
 msgstr "Прикажи следећу поруку"
 
-#: ../src/pref-manager.c:3559
+#: ../src/pref-manager.c:3557
 msgid "Close message window"
 msgstr "Затвори прозор поруке"
 
-#: ../src/pref-manager.c:3600
+#: ../src/pref-manager.c:3598
 #, c-format
 msgid "Error displaying link_id %s: %s\n"
 msgstr "Грешка приказивања иб_везе %s: %s\n"
 
-#: ../src/print-gtk.c:91 ../src/print-gtk.c:250
+#: ../src/print-gtk.c:89 ../src/print-gtk.c:248
 #, c-format
-#| msgid "Retrieving Message %d of %d"
 msgid "Page %d of %d"
 msgstr "Страница %d од %d"
 
-#: ../src/print-gtk.c:145 ../src/print-gtk.c:171
+#: ../src/print-gtk.c:143 ../src/print-gtk.c:169
 msgid "Signed and encrypted matter"
 msgstr "Потписана и шифрована садржина"
 
-#: ../src/print-gtk.c:149 ../src/print-gtk.c:175
+#: ../src/print-gtk.c:147 ../src/print-gtk.c:173
 msgid "Signed matter"
 msgstr "Потписана садржина"
 
-#: ../src/print-gtk.c:156
-#| msgid "encrypted parts"
+#: ../src/print-gtk.c:154
 msgid "Encrypted matter"
 msgstr "Шифрована садржина"
 
-#: ../src/print-gtk.c:199
+#: ../src/print-gtk.c:197
 #, c-format
 msgid "This is an inline %s signed %s message part:"
 msgstr "Ово је непосредно %s потписани %s део поруке:"
 
-#: ../src/print-gtk.c:354
+#: ../src/print-gtk.c:352
 #, c-format
 msgid "Cannot print page %d because the document has only %d page."
 msgid_plural "Cannot print page %d because the document has only %d pages."
-msgstr[0] "Не могу да штампам %d. страницу зато што документ има само %d страницу."
-msgstr[1] "Не могу да штампам %d. страницу зато што документ има само %d странице."
-msgstr[2] "Не могу да штампам %d. страницу зато што документ има само %d страница."
-msgstr[3] "Не могу да штампам %d. страницу зато што документ има само једну страницу."
+msgstr[0] ""
+"Не могу да штампам %d. страницу зато што документ има само %d страницу."
+msgstr[1] ""
+"Не могу да штампам %d. страницу зато што документ има само %d странице."
+msgstr[2] ""
+"Не могу да штампам %d. страницу зато што документ има само %d страница."
+msgstr[3] ""
+"Не могу да штампам %d. страницу зато што документ има само једну страницу."
 
 #. Translate to the default units to use for presenting
 #. * lengths to the user. Translate to default:inch if you
@@ -6186,81 +6023,72 @@ msgstr[3] "Не могу да штампам %d. страницу зато шт
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
-#: ../src/print-gtk.c:392
-#| msgid "Default"
+#: ../src/print-gtk.c:390
 msgid "default:mm"
 msgstr "default:mm"
 
-#: ../src/print-gtk.c:449
+#: ../src/print-gtk.c:447
 msgid "inch"
 msgstr "инч"
 
-#: ../src/print-gtk.c:456
+#: ../src/print-gtk.c:454
 msgid "mm"
 msgstr "mm"
 
-#: ../src/print-gtk.c:531
-#| msgid "Header font"
+#: ../src/print-gtk.c:529
 msgid "_Header Font:"
 msgstr "Слова _заглавља:"
 
-#: ../src/print-gtk.c:534
-#| msgid "Body font"
+#: ../src/print-gtk.c:532
 msgid "B_ody Font:"
 msgstr "Слова _садржаја:"
 
-#: ../src/print-gtk.c:537
-#| msgid "Footer font"
+#: ../src/print-gtk.c:535
 msgid "_Footer Font:"
 msgstr "Слова _подножја:"
 
-#: ../src/print-gtk.c:544
-#| msgid "Highlight cited text"
+#: ../src/print-gtk.c:542
 msgid "Highlighting"
 msgstr "Истицање"
 
-#: ../src/print-gtk.c:559
-#| msgid "Highlight cited text"
+#: ../src/print-gtk.c:557
 msgid "Highlight _cited text"
 msgstr "Истакни _цитирани текст"
 
-#: ../src/print-gtk.c:568
-#| msgid "Highlight cited text"
+#: ../src/print-gtk.c:566
 msgid "Highlight _structured phrases"
 msgstr "Истакни _сређене изразе"
 
-#: ../src/print-gtk.c:579
-#| msgid "marginal"
+#: ../src/print-gtk.c:577
 msgid "Margins"
 msgstr "Ивице"
 
-#: ../src/print-gtk.c:601
-#| msgid "_To"
+#: ../src/print-gtk.c:599
 msgid "_Top"
 msgstr "_Горе"
 
-#: ../src/print-gtk.c:607
+#: ../src/print-gtk.c:605
 msgid "_Bottom"
 msgstr "_Доле"
 
-#: ../src/print-gtk.c:619
+#: ../src/print-gtk.c:617
 msgid "_Left"
 msgstr "_Лево"
 
-#: ../src/print-gtk.c:625
+#: ../src/print-gtk.c:623
 msgid "_Right"
 msgstr "_Десно"
 
-#: ../src/print-gtk.c:751
+#: ../src/print-gtk.c:749
 #, c-format
 msgid "Error printing message: %s"
 msgstr "Грешка штампања поруке: %s"
 
-#: ../src/save-restore.c:610
+#: ../src/save-restore.c:608
 msgid "Error during filters loading: "
 msgstr "Грешка при учитавању пропусника: "
 
-#: ../src/save-restore.c:612
+#: ../src/save-restore.c:610
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -6269,14 +6097,11 @@ msgstr ""
 "Грешка при учитавању пропусника: %s\n"
 "Пропусници су можда неисправни."
 
-#: ../src/save-restore.c:736
+#: ../src/save-restore.c:734
 msgid "The option not to recognize \"format=flowed\" text has been removed."
 msgstr "Избор којим се занемарују поља „format=flowed“ је уклоњен."
 
-#: ../src/save-restore.c:1017
-#| msgid ""
-#| "The option not to send \"format=flowed\" is now on the Options menu of "
-#| "the compose window."
+#: ../src/save-restore.c:1015
 msgid ""
 "The option not to send \"format=flowed\" text is now on the Options menu of "
 "the compose window."
@@ -6284,14 +6109,14 @@ msgstr ""
 "Избор којим се не шаље „format=flowed“ текст се сада налази у изборнику "
 "Избори прозора за писање порука."
 
-#: ../src/save-restore.c:1049
+#: ../src/save-restore.c:1047
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 "Избор за захтевање обавештења се сада налази у изборнику Избори прозора за "
 "писање порука."
 
-#: ../src/save-restore.c:1131
+#: ../src/save-restore.c:1129
 msgid ""
 "This version of Balsa uses a new user interface; if you have changed Balsa's "
 "keyboard accelerators, you will need to set them again."
@@ -6299,11 +6124,11 @@ msgstr ""
 "Ово издање Балсе користи ново корисничко сучеље; ако сте изменили Балсине "
 "пречице тастатуре, мораћете поново да их подесите."
 
-#: ../src/save-restore.c:2170
+#: ../src/save-restore.c:2168
 msgid "Error opening GConf database\n"
 msgstr "Грешка отварања ГКонф базе података\n"
 
-#: ../src/save-restore.c:2178 ../src/save-restore.c:2189
+#: ../src/save-restore.c:2176 ../src/save-restore.c:2187
 #, c-format
 msgid "Error setting GConf field: %s\n"
 msgstr "Грешка постављању ГКонф поља: %s\n"
@@ -6311,302 +6136,291 @@ msgstr "Грешка постављању ГКонф поља: %s\n"
 #. Translators: please use the initial letter of each language as
 #. * its accelerator; this is a long list, and unique accelerators
 #. * cannot be found.
-#: ../src/sendmsg-window.c:258
-#| msgid "_Brazilian"
+#: ../src/sendmsg-window.c:260
 msgid "_Brazilian Portuguese"
 msgstr "_бразилски португалски"
 
-#: ../src/sendmsg-window.c:259
+#: ../src/sendmsg-window.c:261
 msgid "_Catalan"
 msgstr "_каталонски"
 
-#: ../src/sendmsg-window.c:260
+#: ../src/sendmsg-window.c:262
 msgid "_Chinese Simplified"
 msgstr "_поједностављени кинески"
 
-#: ../src/sendmsg-window.c:261
+#: ../src/sendmsg-window.c:263
 msgid "_Chinese Traditional"
 msgstr "_традиционални кинески"
 
-#: ../src/sendmsg-window.c:262
+#: ../src/sendmsg-window.c:264
 msgid "_Czech"
 msgstr "_чешки"
 
-#: ../src/sendmsg-window.c:263
+#: ../src/sendmsg-window.c:265
 msgid "_Danish"
 msgstr "_дански"
 
-#: ../src/sendmsg-window.c:264
+#: ../src/sendmsg-window.c:266
 msgid "_Dutch"
 msgstr "_холандски"
 
-#: ../src/sendmsg-window.c:265
+#: ../src/sendmsg-window.c:267
 msgid "_English (American)"
 msgstr "_енглески (амерички)"
 
-#: ../src/sendmsg-window.c:266
+#: ../src/sendmsg-window.c:268
 msgid "_English (British)"
 msgstr "_енглески (британски)"
 
-#: ../src/sendmsg-window.c:267
+#: ../src/sendmsg-window.c:269
 msgid "_Esperanto"
 msgstr "_есперанто"
 
-#: ../src/sendmsg-window.c:268
+#: ../src/sendmsg-window.c:270
 msgid "_Estonian"
 msgstr "_естонски"
 
-#: ../src/sendmsg-window.c:269
+#: ../src/sendmsg-window.c:271
 msgid "_Finnish"
 msgstr "_фински"
 
-#: ../src/sendmsg-window.c:270
+#: ../src/sendmsg-window.c:272
 msgid "_French"
 msgstr "_француски"
 
-#: ../src/sendmsg-window.c:271
+#: ../src/sendmsg-window.c:273
 msgid "_German"
 msgstr "_немачки"
 
-#: ../src/sendmsg-window.c:272
-#| msgid "_Serbian (Latin)"
+#: ../src/sendmsg-window.c:274
 msgid "_German (Austrian)"
 msgstr "_немачки (аустријски)"
 
-#: ../src/sendmsg-window.c:273
-#| msgid "_German"
+#: ../src/sendmsg-window.c:275
 msgid "_German (Swiss)"
 msgstr "_немачки (швајцарски)"
 
-#: ../src/sendmsg-window.c:274
+#: ../src/sendmsg-window.c:276
 msgid "_Greek"
 msgstr "_грчки"
 
-#: ../src/sendmsg-window.c:275
+#: ../src/sendmsg-window.c:277
 msgid "_Hebrew"
 msgstr "_хебрејски"
 
-#: ../src/sendmsg-window.c:276
+#: ../src/sendmsg-window.c:278
 msgid "_Hungarian"
 msgstr "_мађарски"
 
-#: ../src/sendmsg-window.c:277
+#: ../src/sendmsg-window.c:279
 msgid "_Italian"
 msgstr "_италијански"
 
-#: ../src/sendmsg-window.c:278
+#: ../src/sendmsg-window.c:280
 msgid "_Japanese (JIS)"
 msgstr "_јапански (ЈИС)"
 
-#: ../src/sendmsg-window.c:279
+#: ../src/sendmsg-window.c:281
 msgid "_Kazakh"
 msgstr "_казашки"
 
-#: ../src/sendmsg-window.c:280
+#: ../src/sendmsg-window.c:282
 msgid "_Korean"
 msgstr "_корејски"
 
-#: ../src/sendmsg-window.c:281
+#: ../src/sendmsg-window.c:283
 msgid "_Latvian"
 msgstr "_летонски"
 
-#: ../src/sendmsg-window.c:282
+#: ../src/sendmsg-window.c:284
 msgid "_Lithuanian"
 msgstr "_литвански"
 
-#: ../src/sendmsg-window.c:283
+#: ../src/sendmsg-window.c:285
 msgid "_Norwegian"
 msgstr "_норвешки"
 
-#: ../src/sendmsg-window.c:284
+#: ../src/sendmsg-window.c:286
 msgid "_Polish"
 msgstr "_пољски"
 
-#: ../src/sendmsg-window.c:285
+#: ../src/sendmsg-window.c:287
 msgid "_Portugese"
 msgstr "_португалски"
 
-#: ../src/sendmsg-window.c:286
+#: ../src/sendmsg-window.c:288
 msgid "_Romanian"
 msgstr "_румунски"
 
-#: ../src/sendmsg-window.c:287
+#: ../src/sendmsg-window.c:289
 msgid "_Russian"
 msgstr "_руски"
 
-#: ../src/sendmsg-window.c:288
+#: ../src/sendmsg-window.c:290
 msgid "_Serbian"
 msgstr "_српски"
 
-#: ../src/sendmsg-window.c:289
+#: ../src/sendmsg-window.c:291
 msgid "_Serbian (Latin)"
 msgstr "_српски (латиница)"
 
-#: ../src/sendmsg-window.c:290
+#: ../src/sendmsg-window.c:292
 msgid "_Slovak"
 msgstr "_словачки"
 
-#: ../src/sendmsg-window.c:291
+#: ../src/sendmsg-window.c:293
 msgid "_Spanish"
 msgstr "_шпански"
 
-#: ../src/sendmsg-window.c:292
+#: ../src/sendmsg-window.c:294
 msgid "_Swedish"
 msgstr "_шведски"
 
-#: ../src/sendmsg-window.c:293
+#: ../src/sendmsg-window.c:295
 msgid "_Tatar"
 msgstr "_татарски"
 
-#: ../src/sendmsg-window.c:294
+#: ../src/sendmsg-window.c:296
 msgid "_Turkish"
 msgstr "_турски"
 
-#: ../src/sendmsg-window.c:295
+#: ../src/sendmsg-window.c:297
 msgid "_Ukrainian"
 msgstr "_украјински"
 
-#: ../src/sendmsg-window.c:296
+#: ../src/sendmsg-window.c:298
 msgid "_Generic UTF-8"
 msgstr "_општи УТФ-8"
 
-#: ../src/sendmsg-window.c:322
+#: ../src/sendmsg-window.c:324
 msgid "_Show"
 msgstr "_Прикажи"
 
-#: ../src/sendmsg-window.c:323
+#: ../src/sendmsg-window.c:325
 msgid "_Language"
 msgstr "_Језик"
 
-#: ../src/sendmsg-window.c:324
+#: ../src/sendmsg-window.c:326
 msgid "_Options"
 msgstr "_Избори"
 
-#: ../src/sendmsg-window.c:334
+#: ../src/sendmsg-window.c:336
 msgid "_Include File..."
 msgstr "_Укључи датотеку..."
 
-#: ../src/sendmsg-window.c:335
-#| msgid "Include file"
+#: ../src/sendmsg-window.c:337
 msgid "Include a file"
 msgstr "Укључите датотеку"
 
-#: ../src/sendmsg-window.c:336
+#: ../src/sendmsg-window.c:338
 msgid "_Attach File..."
 msgstr "Приложи _датотеку..."
 
-#: ../src/sendmsg-window.c:337
-#| msgid "Attach file"
+#: ../src/sendmsg-window.c:339
 msgid "Attach a file"
 msgstr "Приложите датотеку"
 
-#: ../src/sendmsg-window.c:338
+#: ../src/sendmsg-window.c:340
 msgid "I_nclude Message(s)"
 msgstr "Ук_ључи поруке"
 
-#: ../src/sendmsg-window.c:339
-#| msgid "I_nclude Message(s)"
+#: ../src/sendmsg-window.c:341
 msgid "Include selected message(s)"
 msgstr "Укључите изабрану поруку"
 
-#: ../src/sendmsg-window.c:340
+#: ../src/sendmsg-window.c:342
 msgid "Attach _Message(s)"
 msgstr "Приложи по_руке"
 
-#: ../src/sendmsg-window.c:341
-#| msgid "Attach _Message(s)"
+#: ../src/sendmsg-window.c:343
 msgid "Attach selected message(s)"
 msgstr "Приложите изабрану поруку"
 
-#: ../src/sendmsg-window.c:342
+#: ../src/sendmsg-window.c:344
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ../src/sendmsg-window.c:343
+#: ../src/sendmsg-window.c:345
 msgid "Save this message"
 msgstr "Сачувајте ову поруку"
 
-#: ../src/sendmsg-window.c:349
+#: ../src/sendmsg-window.c:351
 msgid "Print the edited message"
 msgstr "Штампајте уређену поруку"
 
-#: ../src/sendmsg-window.c:352
-#| msgid "Undo"
+#: ../src/sendmsg-window.c:354
 msgid "_Undo"
 msgstr "_Опозови"
 
-#: ../src/sendmsg-window.c:353
+#: ../src/sendmsg-window.c:355
 msgid "Undo most recent change"
 msgstr "Опозовите последњу измену"
 
-#: ../src/sendmsg-window.c:354
-#| msgid "Redo"
+#: ../src/sendmsg-window.c:356
 msgid "_Redo"
 msgstr "_Понови"
 
-#: ../src/sendmsg-window.c:355
+#: ../src/sendmsg-window.c:357
 msgid "Redo most recent change"
 msgstr "Поновите последњу измену"
 
-#: ../src/sendmsg-window.c:356
+#: ../src/sendmsg-window.c:358
 msgid "Cu_t"
 msgstr "_Исеци"
 
-#: ../src/sendmsg-window.c:357
-#| msgid "Edit the selected mailbox"
+#: ../src/sendmsg-window.c:359
 msgid "Cut the selected text"
 msgstr "Исеците изабрани текст"
 
-#: ../src/sendmsg-window.c:359
+#: ../src/sendmsg-window.c:361
 msgid "Copy to the clipboard"
 msgstr "Умножите у оставу"
 
-#: ../src/sendmsg-window.c:360
-#| msgid "_Postpone"
+#: ../src/sendmsg-window.c:362
 msgid "_Paste"
 msgstr "_Убаци"
 
-#: ../src/sendmsg-window.c:361
+#: ../src/sendmsg-window.c:363
 msgid "Paste from the clipboard"
 msgstr "Убаците из оставе"
 
-#: ../src/sendmsg-window.c:364
+#: ../src/sendmsg-window.c:366
 msgid "_Wrap Body"
 msgstr "Преломи _редове у поруци"
 
-#: ../src/sendmsg-window.c:366
+#: ../src/sendmsg-window.c:368
 msgid "_Reflow Selected Text"
 msgstr "_Поправи преломе у избору"
 
-#: ../src/sendmsg-window.c:368
+#: ../src/sendmsg-window.c:370
 msgid "Insert Si_gnature"
 msgstr "Убаци по_тпис"
 
-#: ../src/sendmsg-window.c:370
+#: ../src/sendmsg-window.c:372
 msgid "_Quote Message(s)"
 msgstr "_Цитирај поруку"
 
-#: ../src/sendmsg-window.c:373 ../src/sendmsg-window.c:415
+#: ../src/sendmsg-window.c:375 ../src/sendmsg-window.c:417
 msgid "C_heck Spelling"
 msgstr "Про_вери правопис"
 
-#: ../src/sendmsg-window.c:374 ../src/sendmsg-window.c:416
+#: ../src/sendmsg-window.c:376 ../src/sendmsg-window.c:418
 msgid "Check the spelling of the message"
 msgstr "Проверите правопис поруке"
 
-#: ../src/sendmsg-window.c:377
+#: ../src/sendmsg-window.c:379
 msgid "Select _Identity..."
 msgstr "Изаберите л_ичност..."
 
-#: ../src/sendmsg-window.c:378
+#: ../src/sendmsg-window.c:380
 msgid "Select the Identity to use for the message"
 msgstr "Изаберите личност за ову поруку"
 
-#: ../src/sendmsg-window.c:381
+#: ../src/sendmsg-window.c:383
 msgid "_Edit with Gnome-Editor"
 msgstr "_Уреди помоћу Гномовог уређивача"
 
-#: ../src/sendmsg-window.c:382
+#: ../src/sendmsg-window.c:384
 msgid "Edit the current message with the default Gnome editor"
 msgstr "Уредите текућу поруку помоћу основног Гномовог уређивача"
 
@@ -6614,135 +6428,137 @@ msgstr "Уредите текућу поруку помоћу основног 
 #. * stock_id; the first in this list defines the action tied to the
 #. * toolbar's "Send" button, so "ToolbarSend" must come before
 #. * the others.
-#: ../src/sendmsg-window.c:393 ../src/sendmsg-window.c:395
+#: ../src/sendmsg-window.c:395 ../src/sendmsg-window.c:397
 msgid "Sen_d"
 msgstr "_Пошаљи"
 
-#: ../src/sendmsg-window.c:394 ../src/sendmsg-window.c:396
+#: ../src/sendmsg-window.c:396 ../src/sendmsg-window.c:398
 msgid "Send this message"
 msgstr "Пошаљите ову поруку"
 
-#: ../src/sendmsg-window.c:398
+#: ../src/sendmsg-window.c:400
 msgid "_Queue"
 msgstr "_Закажи"
 
-#: ../src/sendmsg-window.c:399 ../src/sendmsg-window.c:405
+#: ../src/sendmsg-window.c:401 ../src/sendmsg-window.c:407
 msgid "Queue this message in Outbox for sending"
 msgstr "Сместите ову поруку у „Одлазно“ ради слања"
 
-#: ../src/sendmsg-window.c:401
+#: ../src/sendmsg-window.c:403
 msgid "_Postpone"
 msgstr "Од_ложи"
 
-#: ../src/sendmsg-window.c:402
-#| msgid "Save this message"
+#: ../src/sendmsg-window.c:404
 msgid "Save this message and close"
 msgstr "Сачувајте ову поруку и затворите"
 
-#: ../src/sendmsg-window.c:404
+#: ../src/sendmsg-window.c:406
 msgid "Send _Later"
 msgstr "Пошаљи _касније"
 
-#: ../src/sendmsg-window.c:407
+#: ../src/sendmsg-window.c:409
 msgid "Sa_ve and Close"
 msgstr "Сачувај и _затвори"
 
-#: ../src/sendmsg-window.c:419
-#| msgid "_Toolbars..."
+#: ../src/sendmsg-window.c:421
 msgid "Too_lbar"
 msgstr "Трака _алата"
 
-#: ../src/sendmsg-window.c:421
-#| msgid "F_rom:"
+#: ../src/sendmsg-window.c:423
 msgid "F_rom"
 msgstr "_Шаље"
 
-#: ../src/sendmsg-window.c:423
+#: ../src/sendmsg-window.c:425
 msgid "Rec_ipients"
 msgstr "_Примаоци"
 
-#: ../src/sendmsg-window.c:426
-#| msgid "_Reply To"
+#: ../src/sendmsg-window.c:428
 msgid "R_eply To"
 msgstr "_Одговори"
 
-#: ../src/sendmsg-window.c:429
-#| msgid "F_cc:"
+#: ../src/sendmsg-window.c:431
 msgid "F_cc"
 msgstr "У _датотеку"
 
-#: ../src/sendmsg-window.c:432
+#: ../src/sendmsg-window.c:434
 msgid "_Request Disposition Notification"
 msgstr "_Захтевај обавештење о приспећу"
 
-#: ../src/sendmsg-window.c:433
-#| msgid "_Request Disposition Notification"
+#: ../src/sendmsg-window.c:435
 msgid "Request Message Disposition Notification"
 msgstr "Захтевај обавештење о приспећу поруке"
 
-#: ../src/sendmsg-window.c:435
+#: ../src/sendmsg-window.c:438
+#| msgid "_Request Disposition Notification"
+msgid "_Request Delivery Status Notification"
+msgstr "_Захтевај обавештење о стању испоруке"
+
+#: ../src/sendmsg-window.c:439
+msgid "Request positive (successful) Delivery Status Notification"
+msgstr "Захтевај обавештење стања о позитивној (успешној) испоруци"
+
+#: ../src/sendmsg-window.c:441
 msgid "_Format = Flowed"
 msgstr "_Запис = укључено"
 
 #. Send as message/alternative with text/plain and text/html parts
-#: ../src/sendmsg-window.c:438
+#: ../src/sendmsg-window.c:444
 msgid "Send as plain text and _HTML"
 msgstr "Пошаљи као обичан текст и _ХТМЛ"
 
-#: ../src/sendmsg-window.c:442 ../src/sendmsg-window.c:448
+#: ../src/sendmsg-window.c:448 ../src/sendmsg-window.c:454
 msgid "_Sign Message"
 msgstr "_Потпиши поруку"
 
-#: ../src/sendmsg-window.c:443
+#: ../src/sendmsg-window.c:449
 msgid "Sign message using GPG"
 msgstr "Потпишите поруку користећи ГПГ"
 
-#: ../src/sendmsg-window.c:444 ../src/sendmsg-window.c:451
+#: ../src/sendmsg-window.c:450 ../src/sendmsg-window.c:457
 msgid "_Encrypt Message"
 msgstr "_Шифруј поруку"
 
-#: ../src/sendmsg-window.c:445
+#: ../src/sendmsg-window.c:451
 msgid "Encrypt message using GPG"
 msgstr "Шифрујте поруку користећи ГПГ"
 
-#: ../src/sendmsg-window.c:449
+#: ../src/sendmsg-window.c:455
 msgid "signs the message using GnuPG"
 msgstr "потписује поруку користећи ГнуПГ"
 
-#: ../src/sendmsg-window.c:453
+#: ../src/sendmsg-window.c:459
 msgid "signs the message using GnuPG for all To: and CC: recipients"
 msgstr "потписује поруку користећи ГнуПГ за све видљиве примаоце"
 
-#: ../src/sendmsg-window.c:463
+#: ../src/sendmsg-window.c:469
 msgid "_GnuPG uses MIME mode"
 msgstr "_ГнуПГ користи МИМЕ режим"
 
-#: ../src/sendmsg-window.c:465
+#: ../src/sendmsg-window.c:471
 msgid "_GnuPG uses old OpenPGP mode"
 msgstr "_ГнуПГ користи стари ОпенПГП режим"
 
-#: ../src/sendmsg-window.c:468
+#: ../src/sendmsg-window.c:474
 msgid "_S/MIME mode (GpgSM)"
 msgstr "_С/МИМЕ режим (ГпгСМ)"
 
-#: ../src/sendmsg-window.c:680
+#: ../src/sendmsg-window.c:688
 msgid "Attachment"
 msgstr "Прилог"
 
-#: ../src/sendmsg-window.c:680
+#: ../src/sendmsg-window.c:688
 msgid "Inline"
 msgstr "Унутар"
 
-#: ../src/sendmsg-window.c:680
+#: ../src/sendmsg-window.c:688
 msgid "Reference"
 msgstr "Позива се на"
 
-#: ../src/sendmsg-window.c:921
-#| msgid "(No sender)"
+#: ../src/sendmsg-window.c:929
 msgid "(No name)"
 msgstr "(Без имена)"
 
-#: ../src/sendmsg-window.c:927
+#: ../src/sendmsg-window.c:935
 #, c-format
 msgid ""
 "The message to '%s' is modified.\n"
@@ -6751,15 +6567,15 @@ msgstr ""
 "Порука за „%s“ је измењена.\n"
 "Да сачувам поруку у „Скице“?"
 
-#: ../src/sendmsg-window.c:1225
+#: ../src/sendmsg-window.c:1233
 msgid "Gnome editor is not defined in your preferred applications."
 msgstr "Гномов уређивач текста није одређен у вашим жељеним програмима."
 
-#: ../src/sendmsg-window.c:1281
+#: ../src/sendmsg-window.c:1289
 msgid "Select Identity"
 msgstr "Изабери личност"
 
-#: ../src/sendmsg-window.c:1758
+#: ../src/sendmsg-window.c:1767
 #, c-format
 msgid ""
 "Saying yes will not send the file `%s' itself, but just a MIME message/"
@@ -6774,15 +6590,15 @@ msgstr ""
 "\n"
 "Да ли заиста желите да приложите ову датотеку као позивање?"
 
-#: ../src/sendmsg-window.c:1771
+#: ../src/sendmsg-window.c:1780
 msgid "Attach as Reference?"
 msgstr "Приложи као позивање?"
 
-#: ../src/sendmsg-window.c:1864
+#: ../src/sendmsg-window.c:1873
 msgid "Choose charset"
 msgstr "Изаберите скуп знакова"
 
-#: ../src/sendmsg-window.c:1871
+#: ../src/sendmsg-window.c:1880
 #, c-format
 msgid ""
 "File\n"
@@ -6795,56 +6611,55 @@ msgstr ""
 "није кодирана у УС-АСКРИ или УТФ-8.\n"
 "Молим изаберите скуп знакова којим је кодирана ова датотека."
 
-#: ../src/sendmsg-window.c:1891
+#: ../src/sendmsg-window.c:1900
 msgid "Attach as MIME type:"
 msgstr "Приложи као МИМЕ врсту:"
 
-#: ../src/sendmsg-window.c:1960
+#: ../src/sendmsg-window.c:1969
 #, c-format
 msgid "Character set for file %s changed from \"%s\" to \"%s\"."
 msgstr "Скуп знакова за датотеку „%s“ је измењен из „%s“ у „%s“."
 
-#: ../src/sendmsg-window.c:2003 ../src/sendmsg-window.c:5766
+#: ../src/sendmsg-window.c:2012 ../src/sendmsg-window.c:5780
 msgid "(no subject)"
 msgstr "(без наслова)"
 
-#: ../src/sendmsg-window.c:2041
+#: ../src/sendmsg-window.c:2050
 #, c-format
-#| msgid "Can't create filter"
 msgid "Cannot create file URI object for %s"
 msgstr "Не могу да направим предмет путање датотеке за %s"
 
-#: ../src/sendmsg-window.c:2049
+#: ../src/sendmsg-window.c:2058
 msgid "unknown error"
 msgstr "непозната грешка"
 
-#: ../src/sendmsg-window.c:2096
+#: ../src/sendmsg-window.c:2105
 msgid "forwarded message"
 msgstr "прослеђена порука"
 
-#: ../src/sendmsg-window.c:2101
+#: ../src/sendmsg-window.c:2110
 #, c-format
 msgid "Message from %s, subject: \"%s\""
 msgstr "Поруку шаље %s, тема: „%s“"
 
-#: ../src/sendmsg-window.c:2177 ../src/sendmsg-window.c:2250
+#: ../src/sendmsg-window.c:2186 ../src/sendmsg-window.c:2259
 msgid "Remove"
 msgstr "Уклони"
 
-#: ../src/sendmsg-window.c:2262
+#: ../src/sendmsg-window.c:2271
 msgid "Open..."
 msgstr "Отвори..."
 
-#: ../src/sendmsg-window.c:2274
+#: ../src/sendmsg-window.c:2283
 msgid "(URL)"
 msgstr "(Адреса)"
 
-#: ../src/sendmsg-window.c:2332
+#: ../src/sendmsg-window.c:2341
 msgid "Attach file"
 msgstr "Приложи датотеку"
 
-#: ../src/sendmsg-window.c:2433 ../src/sendmsg-window.c:2543
-#: ../src/sendmsg-window.c:5023
+#: ../src/sendmsg-window.c:2442 ../src/sendmsg-window.c:2552
+#: ../src/sendmsg-window.c:5033
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -6852,156 +6667,148 @@ msgstr ""
 "Неуспешно укључивање поруке.\n"
 "Могући разлог: недовољно простора за привремени смештај"
 
-#: ../src/sendmsg-window.c:2797
+#: ../src/sendmsg-window.c:2806
 msgid "F_rom:"
 msgstr "_Шаље:"
 
 #. Subject:
-#: ../src/sendmsg-window.c:2939
+#: ../src/sendmsg-window.c:2948
 msgid "S_ubject:"
 msgstr "_Тема:"
 
 #. fcc: mailbox folder where the message copy will be written to
-#: ../src/sendmsg-window.c:2950
+#: ../src/sendmsg-window.c:2959
 msgid "F_cc:"
 msgstr "У _датотеку:"
 
 #. Attachment list
-#: ../src/sendmsg-window.c:2979
+#: ../src/sendmsg-window.c:2988
 msgid "_Attachments:"
 msgstr "_Прилози:"
 
-#: ../src/sendmsg-window.c:3028
+#: ../src/sendmsg-window.c:3037
 msgid "Mode"
 msgstr "Начин"
 
-#: ../src/sendmsg-window.c:3375
+#: ../src/sendmsg-window.c:3384
 #, c-format
 msgid "Could not save attachment: %s"
 msgstr "Не могу да сачувам прилог: %s"
 
-#: ../src/sendmsg-window.c:3399
-#| msgid "(No subject)"
+#: ../src/sendmsg-window.c:3408
 msgid "No subject"
 msgstr "Без теме"
 
-#: ../src/sendmsg-window.c:3432
+#: ../src/sendmsg-window.c:3441
 #, c-format
-#| msgid "Invalid filter: %s"
 msgid "inlined file \"%s\" (%s)"
 msgstr "непосредна датотека „%s“ (%s)"
 
-#: ../src/sendmsg-window.c:3435
+#: ../src/sendmsg-window.c:3444
 #, c-format
 msgid "attached file \"%s\" (%s)"
 msgstr "приложена датотека „%s“ (%s)"
 
-#: ../src/sendmsg-window.c:3439
+#: ../src/sendmsg-window.c:3448
 #, c-format
-#| msgid "signed parts"
 msgid "inlined %s part"
 msgstr "непосредан %s део"
 
-#: ../src/sendmsg-window.c:3441
+#: ../src/sendmsg-window.c:3450
 #, c-format
-#| msgid "attach as file"
 msgid "attached %s part"
 msgstr "приложен %s део"
 
-#: ../src/sendmsg-window.c:3509
+#: ../src/sendmsg-window.c:3518
 #, c-format
 msgid "message from %s, subject \"%s\""
 msgstr "поруку шаље %s, тема „%s“"
 
-#: ../src/sendmsg-window.c:3636
-#| msgid "Quoted"
+#: ../src/sendmsg-window.c:3645
 msgid "quoted"
 msgstr "цитирано"
 
-#: ../src/sendmsg-window.c:3641 ../src/sendmsg-window.c:3644
+#: ../src/sendmsg-window.c:3650 ../src/sendmsg-window.c:3653
 msgid "quoted attachment"
 msgstr "цитирани прилог"
 
-#: ../src/sendmsg-window.c:3670
-#| msgid "Select parent folder"
+#: ../src/sendmsg-window.c:3679
 msgid "Select parts for quotation"
 msgstr "Изабери делове за цитирање"
 
-#: ../src/sendmsg-window.c:3679
+#: ../src/sendmsg-window.c:3688
 msgid "Select the parts of the message which shall be quoted in the reply"
 msgstr "Изаберите делове поруке који ће бити цитирани у одговору"
 
-#: ../src/sendmsg-window.c:3821
+#: ../src/sendmsg-window.c:3830
 msgid "you"
 msgstr "ви"
 
-#: ../src/sendmsg-window.c:3830
+#: ../src/sendmsg-window.c:3839
 #, c-format
 msgid "------forwarded message from %s------\n"
 msgstr "------прослеђена порука коју шаље %s------\n"
 
-#: ../src/sendmsg-window.c:3867
+#: ../src/sendmsg-window.c:3876
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "ИБ поруке: %s\n"
 
-#: ../src/sendmsg-window.c:3873
+#: ../src/sendmsg-window.c:3882
 msgid "References:"
 msgstr "Позивања:"
 
-#: ../src/sendmsg-window.c:3884
+#: ../src/sendmsg-window.c:3893
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Дана %s, %s је написао:\n"
 
-#: ../src/sendmsg-window.c:3886
+#: ../src/sendmsg-window.c:3895
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s је написао:\n"
 
-#: ../src/sendmsg-window.c:3996
+#: ../src/sendmsg-window.c:4005
 msgid "No signature found!"
 msgstr "Нисам пронашао потпис!"
 
-#: ../src/sendmsg-window.c:4184
+#: ../src/sendmsg-window.c:4193
 msgid "Could not save message."
 msgstr "Не могу да сачувам поруку."
 
-#: ../src/sendmsg-window.c:4191
+#: ../src/sendmsg-window.c:4200
 #, c-format
 msgid "Could not open draftbox: %s"
 msgstr "Не могу да отворим скице: %s"
 
-#: ../src/sendmsg-window.c:4216
+#: ../src/sendmsg-window.c:4225
 msgid "Message saved."
 msgstr "Порука је сачувана."
 
-#: ../src/sendmsg-window.c:5203 ../src/sendmsg-window.c:5211
-#: ../src/sendmsg-window.c:5218 ../src/sendmsg-window.c:5225
-#: ../src/sendmsg-window.c:5249
+#: ../src/sendmsg-window.c:5216 ../src/sendmsg-window.c:5224
+#: ../src/sendmsg-window.c:5231 ../src/sendmsg-window.c:5238
+#: ../src/sendmsg-window.c:5262
 #, c-format
-#| msgid "Could not open the file %s.\n"
 msgid "Could not attach the file %s: %s."
 msgstr "Не могу да приложим датотеку „%s“: %s."
 
-#: ../src/sendmsg-window.c:5204
+#: ../src/sendmsg-window.c:5217
 msgid "not an absolute path"
 msgstr "није апсолутна путања"
 
-#: ../src/sendmsg-window.c:5212
+#: ../src/sendmsg-window.c:5225
 msgid "not in your directory"
 msgstr "није у вашем директоријуму"
 
-#: ../src/sendmsg-window.c:5219
-#| msgid "Mailbox does not exist."
+#: ../src/sendmsg-window.c:5232
 msgid "does not exist"
 msgstr "не постоји"
 
-#: ../src/sendmsg-window.c:5250
+#: ../src/sendmsg-window.c:5263
 msgid "not in current directory"
 msgstr "није у текућем директоријуму"
 
-#: ../src/sendmsg-window.c:5300
+#: ../src/sendmsg-window.c:5313
 msgid ""
 "The link that you selected created\n"
 "a \"Blind copy\" (Bcc) address.\n"
@@ -7013,42 +6820,40 @@ msgstr ""
 "Молим проверите да ли је адреса\n"
 "одговарајућа."
 
-#: ../src/sendmsg-window.c:5384
+#: ../src/sendmsg-window.c:5397
 #, c-format
 msgid "Could not open the file %s.\n"
 msgstr "Не могу да отворим датотеку %s.\n"
 
-#: ../src/sendmsg-window.c:5432
+#: ../src/sendmsg-window.c:5445
 msgid "Include file"
 msgstr "Укључи датотеку"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:5618
+#: ../src/sendmsg-window.c:5632
 #, c-format
 msgid "Could not load Face header file %s: %s"
 msgstr "Не могу да учитам сличицу заглавља „%s“: %s"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:5621
+#: ../src/sendmsg-window.c:5635
 #, c-format
 msgid "Could not load X-Face header file %s: %s"
 msgstr "Не могу да учитам Х-сличицу заглавља „%s“: %s"
 
-#: ../src/sendmsg-window.c:5750
-#| msgid "Set identity to use for this message"
+#: ../src/sendmsg-window.c:5764
 msgid "You did not specify a subject for this message"
 msgstr "Нисте навели тему за ову поруку"
 
-#: ../src/sendmsg-window.c:5751
+#: ../src/sendmsg-window.c:5765
 msgid "If you would like to provide one, enter it below."
 msgstr "Ако желите, упишите је испод."
 
-#: ../src/sendmsg-window.c:5801
-#| msgid "Send"
+#: ../src/sendmsg-window.c:5815
 msgid "_Send"
 msgstr "_Пошаљи"
 
-#: ../src/sendmsg-window.c:5884
+#: ../src/sendmsg-window.c:5898
 #, c-format
 msgid ""
 "You did not select encryption for this message, although %s public keys are "
@@ -7056,40 +6861,35 @@ msgid ""
 "could be %s encrypted."
 msgstr ""
 "Нисте изабрали шифровање за ову поруку, иако „%s“ јавни кључ је доступан "
-"свим примаоцима. Да бисте заштитили вашу приватност, порука би могла бити „%"
-"s“ шифрована."
+"свим примаоцима. Да бисте заштитили вашу приватност, порука би могла бити "
+"„%s“ шифрована."
 
-#: ../src/sendmsg-window.c:5911
+#: ../src/sendmsg-window.c:5925
 msgid "Send _encrypted"
 msgstr "Пошаљи _шифровану"
 
-#: ../src/sendmsg-window.c:5929
+#: ../src/sendmsg-window.c:5943
 msgid "Send _unencrypted"
 msgstr "Пошаљи _нешифровану"
 
-#: ../src/sendmsg-window.c:5992
-#| msgid "Select the Identity to use for the message"
+#: ../src/sendmsg-window.c:6006
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Изабрали сте ОпенПГП безбедност за ову поруку.\n"
 
-#: ../src/sendmsg-window.c:5997
+#: ../src/sendmsg-window.c:6011
 msgid ""
 "The message text will be sent as plain text and as HTML, but only the plain "
 "part can be signed.\n"
-msgstr "Текст поруке ће бити послат и као обичан текст и ако ХТМЛ, сали само обичан "
+msgstr ""
+"Текст поруке ће бити послат и као обичан текст и ако ХТМЛ, сали само обичан "
 "текст може бити потписан.\n"
 
-#: ../src/sendmsg-window.c:6002
+#: ../src/sendmsg-window.c:6016
 msgid ""
 "The message contains attachments, which cannot be signed or encrypted.\n"
 msgstr "Порука садржи прилоге, који не могу бити потписани или шифровани.\n"
 
-#: ../src/sendmsg-window.c:6006
-#| msgid ""
-#| "You selected OpenPGP mode for a message with attachments. In this mode, "
-#| "only the first part will be signed and/or encrypted. You should select "
-#| "MIME mode if the complete message shall be protected. Do you really want "
-#| "to proceed?"
+#: ../src/sendmsg-window.c:6020
 msgid ""
 "You should select MIME mode if the complete message shall be protected. Do "
 "you really want to proceed?"
@@ -7097,36 +6897,36 @@ msgstr ""
 "Треба да изаберете МИМЕ режим ако читава порука треба да буде шифрована. Да "
 "ли заиста желите да наставите?"
 
-#: ../src/sendmsg-window.c:6031
+#: ../src/sendmsg-window.c:6045
 #, c-format
 msgid "sending message with gpg mode %d"
 msgstr "шаљем поруку у гпг режиму %d"
 
-#: ../src/sendmsg-window.c:6068
+#: ../src/sendmsg-window.c:6082
 msgid "Message could not be created"
 msgstr "Не могу да направим поруку"
 
-#: ../src/sendmsg-window.c:6070
+#: ../src/sendmsg-window.c:6084
 msgid "Message could not be queued in outbox"
 msgstr "Порука не може бити стављена у ред у одлазном"
 
-#: ../src/sendmsg-window.c:6072
+#: ../src/sendmsg-window.c:6086
 msgid "Message could not be saved in sentbox"
 msgstr "Порука не може бити сачувана у послатом"
 
-#: ../src/sendmsg-window.c:6074
+#: ../src/sendmsg-window.c:6088
 msgid "Message could not be sent"
 msgstr "Не могу да пошаљем поруку"
 
-#: ../src/sendmsg-window.c:6077
+#: ../src/sendmsg-window.c:6091
 msgid "Message could not be signed"
 msgstr "Не могу да потпишем поруку"
 
-#: ../src/sendmsg-window.c:6079
+#: ../src/sendmsg-window.c:6093
 msgid "Message could not be encrypted"
 msgstr "Не могу да шифрујем поруку"
 
-#: ../src/sendmsg-window.c:6085
+#: ../src/sendmsg-window.c:6099
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -7135,122 +6935,117 @@ msgstr ""
 "Нисам успео да пошаљем: %s\n"
 "%s"
 
-#: ../src/sendmsg-window.c:6090
+#: ../src/sendmsg-window.c:6104
 #, c-format
 msgid "Send failed: %s"
 msgstr "Нисам успео да пошаљем: %s"
 
-#: ../src/sendmsg-window.c:6181
+#: ../src/sendmsg-window.c:6197
 #, c-format
 msgid "Could not postpone message: %s"
 msgstr "Не могу да одложим поруку: %s"
 
-#: ../src/sendmsg-window.c:6198
+#: ../src/sendmsg-window.c:6214
 msgid "Message postponed."
 msgstr "Порука је одложена."
 
-#: ../src/sendmsg-window.c:6203
+#: ../src/sendmsg-window.c:6219
 msgid "Could not postpone message."
 msgstr "Не могу да одложим поруку."
 
-#: ../src/sendmsg-window.c:6356
+#: ../src/sendmsg-window.c:6372
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Грешка покретања провере правописа: %s"
 
-#: ../src/sendmsg-window.c:6523
+#: ../src/sendmsg-window.c:6539
 #, c-format
 msgid "Could not compile %s"
 msgstr "Не могу да преведем %s"
 
-#: ../src/sendmsg-window.c:6524
+#: ../src/sendmsg-window.c:6540
 msgid "Quoted Text Regular Expression"
 msgstr "Регуларни израз за цитирани текст"
 
-#: ../src/sendmsg-window.c:7031
+#: ../src/sendmsg-window.c:7054
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Одговор за %s: %s"
 
-#: ../src/sendmsg-window.c:7036
+#: ../src/sendmsg-window.c:7059
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "Проследи поруку за %s: %s"
 
-#: ../src/sendmsg-window.c:7040
+#: ../src/sendmsg-window.c:7063
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Нова порука за %s: %s"
 
-#: ../src/spell-check.c:509
-#| msgid "Change..."
+#: ../src/spell-check.c:507
 msgid "_Change"
 msgstr "_Измени"
 
-#: ../src/spell-check.c:511
+#: ../src/spell-check.c:509
 msgid "Replace the current word with the selected suggestion"
 msgstr "Замените текућу реч изабраним предлогом"
 
-#: ../src/spell-check.c:516
-#| msgid "Change..."
+#: ../src/spell-check.c:514
 msgid "Change _All"
 msgstr "Измени _све"
 
-#: ../src/spell-check.c:518
-#| msgid ""
-#| "Replace all occurences of the current word with the selected suggestion"
+#: ../src/spell-check.c:516
 msgid ""
 "Replace all occurrences of the current word with the selected suggestion"
 msgstr "Замените све појаве текуће речи изабраним предлогом"
 
-#: ../src/spell-check.c:527
+#: ../src/spell-check.c:525
 msgid "_Ignore"
 msgstr "_Занемари"
 
-#: ../src/spell-check.c:530
+#: ../src/spell-check.c:528
 msgid "Skip the current word"
 msgstr "Прескочите текућу реч"
 
-#: ../src/spell-check.c:534
+#: ../src/spell-check.c:532
 msgid "Ignore A_ll"
 msgstr "Занемари _све"
 
-#: ../src/spell-check.c:536
+#: ../src/spell-check.c:534
 msgid "Skip all occurrences of the current word"
 msgstr "Прескочите све појаве текуће речи"
 
-#: ../src/spell-check.c:542
-#| msgid "C_lear"
+#: ../src/spell-check.c:540
 msgid "_Learn"
 msgstr "_Научи"
 
-#: ../src/spell-check.c:544
+#: ../src/spell-check.c:542
 msgid "Add the current word to your personal dictionary"
 msgstr "Додајте текућу реч у лични речник"
 
-#: ../src/spell-check.c:549
-#| msgid "Down"
+#: ../src/spell-check.c:547
 msgid "_Done"
 msgstr "_Урађено"
 
-#: ../src/spell-check.c:550
+#: ../src/spell-check.c:548
 msgid "Finish spell checking"
 msgstr "Завршите проверу правописа"
 
-#: ../src/spell-check.c:555
+#: ../src/spell-check.c:553
 msgid "Revert all changes and finish spell checking"
 msgstr "Вратите све измене и завршите проверу правописа"
 
-#: ../src/spell-check.c:584
+#: ../src/spell-check.c:582
 msgid "Spell check"
 msgstr "Правопис"
 
-#: ../src/spell-check.c:862
+#: ../src/spell-check.c:860
 msgid "BalsaSpellCheck: Quoted text regular expression compilation failed\n"
-msgstr "Балсина провера писања: Нисам успео да саставим регуларни израз цитираног "
+msgstr ""
+"Балсина провера писања: Нисам успео да саставим регуларни израз цитираног "
 "текста\n"
 
-#: ../src/spell-check.c:986
+#: ../src/spell-check.c:984
 #, c-format
 msgid ""
 "BalsaSpellCheck: Learn operation failed;\n"
@@ -7259,86 +7054,85 @@ msgstr ""
 "Балсина провера писања: Нисам успео да научим;\n"
 "%s\n"
 
-#: ../src/spell-check.c:992
+#: ../src/spell-check.c:990
 msgid "BalsaSpellCheck: Learn operation failed.\n"
 msgstr "Балсина провера писања: Нисам успео да научим.\n"
 
-#: ../src/spell-check.c:1191
+#: ../src/spell-check.c:1189
 #, c-format
 msgid "BalsaSpellCheck: Suggest %s (%s)\n"
 msgstr "Балсина провера писања: Предлог „%s“ (%s)\n"
 
-#: ../src/spell-check.c:1293
+#: ../src/spell-check.c:1291
 #, c-format
 msgid "BalsaSpellCheck: Pspell Error: %s\n"
 msgstr "Балсина провера писања: Грешка пспела: %s\n"
 
-#: ../src/store-address.c:109
+#: ../src/store-address.c:107
 msgid "Store address: no addresses"
 msgstr "Складиштење адресе: нема адреса"
 
-#: ../src/store-address.c:204
+#: ../src/store-address.c:202
 msgid "Store Address"
 msgstr "Складишти адресу"
 
-#: ../src/store-address.c:225
+#: ../src/store-address.c:223
 msgid "Save this address and close the dialog?"
 msgstr "Да сачувам ову адресу и затворим прозорче?"
 
-#: ../src/store-address.c:243
+#: ../src/store-address.c:241
 msgid "No address book selected...."
 msgstr "Није изабран адресар..."
 
-#: ../src/store-address.c:256
+#: ../src/store-address.c:254
 msgid "Address could not be written to this address book."
 msgstr "Не могу да упишем адресу у овај адресар."
 
-#: ../src/store-address.c:259
+#: ../src/store-address.c:257
 msgid "Address book could not be accessed."
 msgstr "Не могу да приступим адресару."
 
-#: ../src/store-address.c:261
+#: ../src/store-address.c:259
 msgid "This mail address is already in this address book."
 msgstr "Ова адреса је већ наведена у адресару."
 
-#: ../src/store-address.c:264
+#: ../src/store-address.c:262
 msgid "Unexpected address book error. Report it."
 msgstr "Неочекивана грешка у адресару. Молим пријавите је."
 
-#: ../src/store-address.c:280
+#: ../src/store-address.c:278
 msgid "Choose Address Book"
 msgstr "Изаберите адресар"
 
-#: ../src/store-address.c:328
+#: ../src/store-address.c:326
 msgid "Choose Address"
 msgstr "Изаберите адресу"
 
-#: ../src/toolbar-factory.c:133
+#: ../src/toolbar-factory.c:131
 msgid "Separator"
 msgstr "Раздвајач"
 
-#: ../src/toolbar-factory.c:134
-#| msgid "Quoted"
+#: ../src/toolbar-factory.c:132
 msgid "Quit"
 msgstr "Изађи"
 
-#: ../src/toolbar-factory.c:135
+#: ../src/toolbar-factory.c:133
 msgid "Check"
 msgstr "Провери"
 
-#: ../src/toolbar-factory.c:136
+#: ../src/toolbar-factory.c:134
 msgid "Compose"
 msgstr "Нова"
 
-#: ../src/toolbar-factory.c:137
+#: ../src/toolbar-factory.c:135
 msgid "Continue"
 msgstr "Настави"
 
-#: ../src/toolbar-factory.c:138
+#: ../src/toolbar-factory.c:136
 msgid "Reply"
 msgstr "Одговори"
 
-#: ../src/toolbar-factory.c:139
+#: ../src/toolbar-factory.c:137
 msgid ""
 "Reply\n"
 "to all"
@@ -7346,7 +7140,7 @@ msgstr ""
 "Одгов.\n"
 "свима"
 
-#: ../src/toolbar-factory.c:140
+#: ../src/toolbar-factory.c:138
 msgid ""
 "Reply\n"
 "to group"
@@ -7354,11 +7148,11 @@ msgstr ""
 "Одгов.\n"
 "групи"
 
-#: ../src/toolbar-factory.c:141
+#: ../src/toolbar-factory.c:139
 msgid "Forward"
 msgstr "Проследи"
 
-#: ../src/toolbar-factory.c:144
+#: ../src/toolbar-factory.c:142
 msgid ""
 "Next\n"
 "unread"
@@ -7366,7 +7160,7 @@ msgstr ""
 "Следећа\n"
 "непроч."
 
-#: ../src/toolbar-factory.c:145
+#: ../src/toolbar-factory.c:143
 msgid ""
 "Next\n"
 "flagged"
@@ -7374,7 +7168,7 @@ msgstr ""
 "Следећа\n"
 "означена"
 
-#: ../src/toolbar-factory.c:146
+#: ../src/toolbar-factory.c:144
 msgid ""
 "Previous\n"
 "part"
@@ -7382,7 +7176,7 @@ msgstr ""
 "Претходни\n"
 "део"
 
-#: ../src/toolbar-factory.c:147
+#: ../src/toolbar-factory.c:145
 msgid ""
 "Next\n"
 "part"
@@ -7390,7 +7184,7 @@ msgstr ""
 "Следећи\n"
 "део"
 
-#: ../src/toolbar-factory.c:148
+#: ../src/toolbar-factory.c:146
 msgid ""
 "Trash /\n"
 "Delete"
@@ -7398,15 +7192,15 @@ msgstr ""
 "У смеће /\n"
 "Обриши"
 
-#: ../src/toolbar-factory.c:149
+#: ../src/toolbar-factory.c:147
 msgid "Postpone"
 msgstr "Одложи"
 
-#: ../src/toolbar-factory.c:150
+#: ../src/toolbar-factory.c:148
 msgid "Print"
 msgstr "Штампај"
 
-#: ../src/toolbar-factory.c:151
+#: ../src/toolbar-factory.c:149
 msgid ""
 "Request\n"
 "MDN"
@@ -7414,31 +7208,31 @@ msgstr ""
 "Затевај\n"
 "МДН"
 
-#: ../src/toolbar-factory.c:152
+#: ../src/toolbar-factory.c:150
 msgid "Send"
 msgstr "Пошаљи"
 
-#: ../src/toolbar-factory.c:153
+#: ../src/toolbar-factory.c:151
 msgid "Exchange"
 msgstr "Размени"
 
-#: ../src/toolbar-factory.c:154
+#: ../src/toolbar-factory.c:152
 msgid "Attach"
 msgstr "Приложи"
 
-#: ../src/toolbar-factory.c:155
+#: ../src/toolbar-factory.c:153
 msgid "Save"
 msgstr "Сачувај"
 
-#: ../src/toolbar-factory.c:156
+#: ../src/toolbar-factory.c:154
 msgid "Identity"
 msgstr "Личност"
 
-#: ../src/toolbar-factory.c:158
+#: ../src/toolbar-factory.c:156
 msgid "Close"
 msgstr "Затвори"
 
-#: ../src/toolbar-factory.c:159
+#: ../src/toolbar-factory.c:157
 msgid ""
 "Toggle\n"
 "new"
@@ -7446,11 +7240,11 @@ msgstr ""
 "Измени\n"
 "нову"
 
-#: ../src/toolbar-factory.c:160
+#: ../src/toolbar-factory.c:158
 msgid "Mark all"
 msgstr "Обележи све"
 
-#: ../src/toolbar-factory.c:162
+#: ../src/toolbar-factory.c:160
 msgid ""
 "Reset\n"
 "Filter"
@@ -7458,29 +7252,27 @@ msgstr ""
 "Очисти\n"
 "пропусник"
 
-#: ../src/toolbar-factory.c:165
+#: ../src/toolbar-factory.c:163
 msgid "Sign"
 msgstr "Потпиши"
 
-#: ../src/toolbar-factory.c:166
+#: ../src/toolbar-factory.c:164
 msgid "Encrypt"
 msgstr "Шифруј"
 
-#: ../src/toolbar-factory.c:168
+#: ../src/toolbar-factory.c:166
 msgid "Undo"
 msgstr "Опозови"
 
-#: ../src/toolbar-factory.c:169
+#: ../src/toolbar-factory.c:167
 msgid "Redo"
 msgstr "Понови"
 
-#: ../src/toolbar-factory.c:170
-#| msgid "Exchange"
+#: ../src/toolbar-factory.c:168
 msgid "Expunge"
 msgstr "Избаци"
 
-#: ../src/toolbar-factory.c:171
-#| msgid "Empty Trash"
+#: ../src/toolbar-factory.c:169
 msgid ""
 "Empty\n"
 "Trash"
@@ -7488,97 +7280,95 @@ msgstr ""
 "Испразни\n"
 "смеће"
 
-#: ../src/toolbar-factory.c:172
-#| msgid "_Edit"
+#: ../src/toolbar-factory.c:170
 msgid "Edit"
 msgstr "Измени"
 
-#: ../src/toolbar-factory.c:185
+#: ../src/toolbar-factory.c:183
 msgid "Queue"
 msgstr "Закажи"
 
-#: ../src/toolbar-factory.c:390
+#: ../src/toolbar-factory.c:388
 #, c-format
 msgid "Unknown toolbar icon \"%s\""
 msgstr "Непозната иконица за алатку „%s“"
 
-#: ../src/toolbar-factory.c:461
+#: ../src/toolbar-factory.c:459
 msgid "Queue this message for sending"
 msgstr "Смести ову поруку за слање"
 
-#: ../src/toolbar-factory.c:527
+#: ../src/toolbar-factory.c:525
 msgid "Text Be_low Icons"
 msgstr "Текст _испод иконица"
 
-#: ../src/toolbar-factory.c:528
+#: ../src/toolbar-factory.c:526
 msgid "Priority Text Be_side Icons"
 msgstr "Текст _поред икона према важности"
 
-#: ../src/toolbar-factory.c:530
+#: ../src/toolbar-factory.c:528
 msgid "_Icons Only"
 msgstr "_Само иконице"
 
-#: ../src/toolbar-factory.c:531
+#: ../src/toolbar-factory.c:529
 msgid "_Text Only"
 msgstr "Само _текст"
 
-#: ../src/toolbar-factory.c:754
+#: ../src/toolbar-factory.c:752
 #, c-format
 msgid "Use Desktop _Default (%s)"
 msgstr "Користи основно _окружења (%s)"
 
-#: ../src/toolbar-factory.c:784
-#| msgid "Customize Toolbars"
+#: ../src/toolbar-factory.c:782
 msgid "_Customize Toolbars..."
 msgstr "_Прилагоди основне алатке..."
 
-#: ../src/toolbar-prefs.c:138
+#: ../src/toolbar-prefs.c:136
 msgid "Customize Toolbars"
 msgstr "Прилагодите основне алатке"
 
-#: ../src/toolbar-prefs.c:175
+#: ../src/toolbar-prefs.c:173
 msgid "Compose window"
 msgstr "Прозор за писање"
 
-#: ../src/toolbar-prefs.c:184
+#: ../src/toolbar-prefs.c:182
 msgid "Toolbar options"
 msgstr "Избори алатки"
 
-#: ../src/toolbar-prefs.c:193
+#: ../src/toolbar-prefs.c:191
 msgid "_Wrap button labels"
 msgstr "_Преломи ознаке дугмића"
 
-#: ../src/toolbar-prefs.c:408
+#: ../src/toolbar-prefs.c:406
 #, c-format
 msgid "Error displaying toolbar help: %s\n"
 msgstr "Дошло је до грешке приликом приказивања помоћи за алатке: %s\n"
 
 #. Preview display
-#: ../src/toolbar-prefs.c:444
+#: ../src/toolbar-prefs.c:442
 msgid "Preview"
 msgstr "Преглед"
 
-#: ../src/toolbar-prefs.c:481
+#: ../src/toolbar-prefs.c:479
 msgid "_Restore toolbar to standard buttons"
 msgstr "_Врати подразумеване алатке на палету"
 
 #. Style button
-#: ../src/toolbar-prefs.c:485
+#: ../src/toolbar-prefs.c:483
 msgid "Toolbar _style..."
 msgstr "Изглед палете _алата..."
 
-#: ../src/toolbar-prefs.c:502
+#: ../src/toolbar-prefs.c:500
 msgid "Available buttons"
 msgstr "Доступни дугмићи"
 
-#: ../src/toolbar-prefs.c:518
+#: ../src/toolbar-prefs.c:516
 msgid "Current toolbar"
 msgstr "Текуће алатке"
 
-#: ../src/toolbar-prefs.c:535
+#: ../src/toolbar-prefs.c:533
 msgid "Up"
 msgstr "Горе"
 
-#: ../src/toolbar-prefs.c:551
+#: ../src/toolbar-prefs.c:549
 msgid "Down"
 msgstr "Доле"
diff --git a/po/sr latin po b/po/sr latin po
index ce3fd5c..58678cb 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the balsa package.
 # Maintainer: Danilo Šegan <dsegan gmx net>
 # Miloš Popović <gpopac gmail com>, 2012.
-# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2012.
+# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2012—2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=balsa&";
-"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-18 01:07+0000\n"
-"PO-Revision-Date: 2012-12-06 10:28+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=balsa&k";
+"eywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-03-01 20:55+0000\n"
+"PO-Revision-Date: 2015-12-28 11:05+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -37,266 +37,266 @@ msgstr "Program za el. poštu"
 msgid "Balsa Mail Client"
 msgstr "Sanduče el. pošte Balza"
 
-#: ../libbalsa/address-book.c:314 ../libbalsa/filter-error.c:47
+#: ../libbalsa/address-book.c:312 ../libbalsa/filter-error.c:45
 msgid "No error"
 msgstr "Nema greške"
 
-#: ../libbalsa/address-book.c:315
+#: ../libbalsa/address-book.c:313
 msgid "Cannot read from address book"
 msgstr "Ne mogu da čitam iz adresara"
 
-#: ../libbalsa/address-book.c:316
+#: ../libbalsa/address-book.c:314
 msgid "Cannot write to address book"
 msgstr "Ne mogu da pišem u adresar"
 
-#: ../libbalsa/address-book.c:317
+#: ../libbalsa/address-book.c:315
 msgid "Cannot connect to the server"
 msgstr "Ne mogu da se povežem sa serverom"
 
-#: ../libbalsa/address-book.c:318
+#: ../libbalsa/address-book.c:316
 msgid "Cannot search in the address book"
 msgstr "Ne mogu da pretražujem adresar"
 
-#: ../libbalsa/address-book.c:320
+#: ../libbalsa/address-book.c:318
 msgid "Cannot add duplicate entry"
 msgstr "Ne mogu da dodam isti unos dva puta"
 
-#: ../libbalsa/address-book.c:322
+#: ../libbalsa/address-book.c:320
 msgid "Cannot find address in address book"
 msgstr "Ne mogu da nađem adresu u adresaru"
 
-#: ../libbalsa/address-book.c:323 ../src/main-window.c:2389
-#: ../src/main-window.c:4839 ../src/sendmsg-window.c:4192
+#: ../libbalsa/address-book.c:321 ../src/main-window.c:2387
+#: ../src/main-window.c:4837 ../src/sendmsg-window.c:4201
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
 #. The externq database doesn't support Id's, sorry!
-#: ../libbalsa/address-book-extern.c:210 ../libbalsa/address-book-ldap.c:495
-#: ../libbalsa/address-book-ldif.c:332
+#: ../libbalsa/address-book-extern.c:208 ../libbalsa/address-book-ldap.c:493
+#: ../libbalsa/address-book-ldif.c:330
 msgid "No-Id"
 msgstr "Bez-IB"
 
-#: ../libbalsa/address-book-extern.c:215 ../libbalsa/address-book-extern.c:370
-#: ../libbalsa/address-book-ldap.c:501 ../libbalsa/address-book-ldif.c:311
-#: ../libbalsa/address-book-ldif.c:335 ../libbalsa/address-book-ldif.c:354
-#: ../libbalsa/address-book-ldif.c:358 ../libbalsa/address-book-vcard.c:160
-#: ../libbalsa/address-book-vcard.c:258 ../libbalsa/address.c:403
+#: ../libbalsa/address-book-extern.c:213 ../libbalsa/address-book-extern.c:368
+#: ../libbalsa/address-book-ldap.c:499 ../libbalsa/address-book-ldif.c:309
+#: ../libbalsa/address-book-ldif.c:333 ../libbalsa/address-book-ldif.c:352
+#: ../libbalsa/address-book-ldif.c:356 ../libbalsa/address-book-vcard.c:158
+#: ../libbalsa/address-book-vcard.c:256 ../libbalsa/address.c:401
 msgid "No-Name"
 msgstr "Bez-imena"
 
-#: ../libbalsa/address-book-ldap.c:283
+#: ../libbalsa/address-book-ldap.c:281
 msgid "SASL Interaction\n"
 msgstr "SASL međudejstvo\n"
 
-#: ../libbalsa/address-book-ldap.c:330
+#: ../libbalsa/address-book-ldap.c:328
 msgid "TLS requested but not compiled in"
 msgstr "Tražen je TLS ali nije ugrađen"
 
-#: ../libbalsa/address-book-ldap.c:610
+#: ../libbalsa/address-book-ldap.c:608
 msgid "Undefined location of user address book"
 msgstr "Nije određena putanja do vašeg adresara"
 
-#: ../libbalsa/address.c:955
+#: ../libbalsa/address.c:953
 msgid "D_isplayed Name:"
 msgstr "Prikazano _ime:"
 
-#: ../libbalsa/address.c:956
+#: ../libbalsa/address.c:954
 msgid "_First Name:"
 msgstr "_Ime:"
 
-#: ../libbalsa/address.c:957
+#: ../libbalsa/address.c:955
 msgid "_Last Name:"
 msgstr "_Prezime:"
 
-#: ../libbalsa/address.c:958
+#: ../libbalsa/address.c:956
 msgid "_Nickname:"
 msgstr "_Nadimak:"
 
-#: ../libbalsa/address.c:959
+#: ../libbalsa/address.c:957
 msgid "O_rganization:"
 msgstr "O_rganizacija:"
 
-#: ../libbalsa/address.c:960
+#: ../libbalsa/address.c:958
 msgid "_Email Address:"
 msgstr "Adresa _el. pošte:"
 
 #. Right/Add button
-#: ../libbalsa/address.c:979 ../src/filter-edit-callbacks.c:1088
-#: ../src/filter-run-dialog.c:329
+#: ../libbalsa/address.c:977 ../src/filter-edit-callbacks.c:1086
+#: ../src/filter-run-dialog.c:327
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: ../libbalsa/address-view.c:129 ../src/balsa-mime-widget-message.c:738
-#: ../src/balsa-print-object-header.c:170 ../src/sendmsg-window.c:1113
-#: ../src/sendmsg-window.c:3855 ../src/store-address.c:341
+#: ../libbalsa/address-view.c:127 ../src/balsa-mime-widget-message.c:747
+#: ../src/balsa-print-object-header.c:168 ../src/sendmsg-window.c:1121
+#: ../src/sendmsg-window.c:3864 ../src/store-address.c:339
 msgid "To:"
 msgstr "Prima:"
 
-#: ../libbalsa/address-view.c:130 ../src/balsa-mime-widget-message.c:739
-#: ../src/balsa-print-object-header.c:172 ../src/sendmsg-window.c:1113
-#: ../src/sendmsg-window.c:3863 ../src/store-address.c:342
+#: ../libbalsa/address-view.c:128 ../src/balsa-mime-widget-message.c:748
+#: ../src/balsa-print-object-header.c:170 ../src/sendmsg-window.c:1121
+#: ../src/sendmsg-window.c:3872 ../src/store-address.c:340
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: ../libbalsa/address-view.c:131 ../src/balsa-mime-widget-message.c:740
-#: ../src/balsa-print-object-header.c:174 ../src/sendmsg-window.c:1113
-#: ../src/store-address.c:343
+#: ../libbalsa/address-view.c:129 ../src/balsa-mime-widget-message.c:749
+#: ../src/balsa-print-object-header.c:172 ../src/sendmsg-window.c:1121
+#: ../src/store-address.c:341
 msgid "Bcc:"
 msgstr "Nevidljiva kopija:"
 
-#: ../libbalsa/address-view.c:133
+#: ../libbalsa/address-view.c:131
 msgid "Reply To:"
 msgstr "Odgovori:"
 
-#: ../libbalsa/body.c:123 ../libbalsa/mailbox_local.c:1762
-#: ../libbalsa/message.c:845
+#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1760
+#: ../libbalsa/message.c:843
 msgid "(No subject)"
 msgstr "(bez naslova)"
 
-#: ../libbalsa/body.c:352 ../libbalsa/body.c:399
+#: ../libbalsa/body.c:388 ../libbalsa/body.c:435
 #, c-format
 msgid "Failed to create output stream"
 msgstr "Ne mogu da izgradim izlazni tok"
 
-#: ../libbalsa/body.c:543
+#: ../libbalsa/body.c:579
 #, c-format
 msgid "Could not read embedded message"
 msgstr "Ne mogu da pročitam ugrađenu poruku"
 
-#: ../libbalsa/filter.c:129 ../libbalsa/mailbox_local.c:842
+#: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:840
 msgid "Unable to load message body to match filter"
 msgstr "Ne mogu da učitam telo poruke koje odgovara propusniku"
 
-#: ../libbalsa/filter.c:236
+#: ../libbalsa/filter.c:234
 #, c-format
 msgid "Invalid filter: %s"
 msgstr "Neispravan propusnik: %s"
 
-#: ../libbalsa/filter.c:284 ../libbalsa/filter.c:307
+#: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
 #, c-format
 msgid "Bad mailbox name for filter: %s"
 msgstr "Loš naziv sandučeta za propusnik: %s"
 
-#: ../libbalsa/filter.c:288
+#: ../libbalsa/filter.c:286
 #, c-format
 msgid "Error when copying messages: %s"
 msgstr "Greška pri umnožavanju poruka: %s"
 
-#: ../libbalsa/filter.c:298
+#: ../libbalsa/filter.c:296
 #, c-format
 msgid "Error when trashing messages: %s"
 msgstr "Greška pri premeštanju poruka u smeće: %s"
 
-#: ../libbalsa/filter.c:311
+#: ../libbalsa/filter.c:309
 #, c-format
 msgid "Error when moving messages: %s"
 msgstr "Greška pri premeštanju poruka: %s"
 
-#: ../libbalsa/filter-error.c:48
+#: ../libbalsa/filter-error.c:46
 msgid "Syntax error in the filter configuration file"
 msgstr "Greška sintakse u datoteci podešavanja propusnika"
 
-#: ../libbalsa/filter-error.c:49
+#: ../libbalsa/filter-error.c:47
 msgid "Unable to allocate memory"
 msgstr "Ne mogu da dodelim memoriju"
 
-#: ../libbalsa/filter-error.c:50
+#: ../libbalsa/filter-error.c:48
 msgid "Error in regular expression syntax"
 msgstr "Greška u sintaksi regularnog izraza"
 
-#: ../libbalsa/filter-error.c:51
+#: ../libbalsa/filter-error.c:49
 msgid "Attempt to apply an invalid filter"
 msgstr "Pokušavam da primenim neispravan propusnik"
 
-#: ../libbalsa/filter-file.c:141
+#: ../libbalsa/filter-file.c:137
 #, c-format
 msgid "Invalid filters %s for mailbox %s"
 msgstr "Neispravni propusniki %s za sanduče %s"
 
 #. FIXME: this is hack!
-#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:1055
+#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:1053
 msgid "To"
 msgstr "Prima"
 
-#: ../libbalsa/filter-funcs.c:384 ../src/balsa-index.c:359
+#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:357
 msgid "From"
 msgstr "Šalje"
 
-#: ../libbalsa/filter-funcs.c:385 ../src/balsa-index.c:375
-#: ../src/pref-manager.c:418
+#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:373
+#: ../src/pref-manager.c:416
 msgid "Subject"
 msgstr "Tema"
 
-#: ../libbalsa/filter-funcs.c:386
+#: ../libbalsa/filter-funcs.c:384
 msgid "Cc"
 msgstr "Kopija"
 
-#: ../libbalsa/filter-funcs.c:387
+#: ../libbalsa/filter-funcs.c:385
 msgid "Body"
 msgstr "Telo"
 
-#: ../libbalsa/filter-funcs.c:392
+#: ../libbalsa/filter-funcs.c:390
 #, c-format
 msgid "Header:%s"
 msgstr "Zaglavlje:%s"
 
-#: ../libbalsa/filter-funcs.c:398 ../libbalsa/filter-funcs.c:426
+#: ../libbalsa/filter-funcs.c:396 ../libbalsa/filter-funcs.c:424
 #, c-format
 msgid ",%s"
 msgstr ",%s"
 
-#: ../libbalsa/filter-funcs.c:414
+#: ../libbalsa/filter-funcs.c:412
 msgid "New"
 msgstr "Novo"
 
-#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:1011
+#: ../libbalsa/filter-funcs.c:413 ../src/filter-edit-callbacks.c:1009
 msgid "Deleted"
 msgstr "Obrisano"
 
-#: ../libbalsa/filter-funcs.c:416 ../src/filter-edit-callbacks.c:1011
+#: ../libbalsa/filter-funcs.c:414 ../src/filter-edit-callbacks.c:1009
 msgid "Replied"
 msgstr "Odgovoreno"
 
-#: ../libbalsa/filter-funcs.c:417 ../src/filter-edit-callbacks.c:1011
+#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:1009
 msgid "Flagged"
 msgstr "Označeno"
 
-#: ../libbalsa/filter-funcs.c:441
+#: ../libbalsa/filter-funcs.c:439
 msgid "Not "
 msgstr "Nije "
 
-#: ../libbalsa/filter-funcs.c:457
+#: ../libbalsa/filter-funcs.c:455
 msgid "From %Y-%m-%d"
 msgstr "Od %d.%m.%Y"
 
-#: ../libbalsa/filter-funcs.c:463
+#: ../libbalsa/filter-funcs.c:461
 msgid "To %Y-%m-%d"
 msgstr "Do %d.%m.%Y"
 
-#: ../libbalsa/filter-funcs.c:471
+#: ../libbalsa/filter-funcs.c:469
 msgid "And"
 msgstr "I"
 
-#: ../libbalsa/filter-funcs.c:474
+#: ../libbalsa/filter-funcs.c:472
 msgid "Or"
 msgstr "Ili"
 
-#: ../libbalsa/gmime-application-pkcs7.c:125
+#: ../libbalsa/gmime-application-pkcs7.c:123
 #, c-format
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Ne mogu da dešifrujem MIME deo: greška u obradi"
 
-#: ../libbalsa/gmime-multipart-crypt.c:225
+#: ../libbalsa/gmime-multipart-crypt.c:223
 msgid "Cannot verify multipart/signed part due to missing subparts."
 msgstr ""
 "Ne mogu da proverim višedelni/potpisani deo jer neki poddelovi nedostaju."
 
-#: ../libbalsa/gmime-multipart-crypt.c:251
+#: ../libbalsa/gmime-multipart-crypt.c:249
 #, c-format
 msgid "unsupported protocol '%s'"
 msgstr "nepodržan protokol „%s“"
 
-#: ../libbalsa/gmime-multipart-crypt.c:264
+#: ../libbalsa/gmime-multipart-crypt.c:262
 msgid ""
 "Cannot verify multipart/signed part: signature content-type does not match "
 "protocol."
@@ -304,7 +304,7 @@ msgstr ""
 "Ne mogu da proverim višedelni/potpisani deo: vrsta sadržaja potpisa se ne "
 "podudara sa protokolom."
 
-#: ../libbalsa/gmime-multipart-crypt.c:487
+#: ../libbalsa/gmime-multipart-crypt.c:485
 #, c-format
 msgid ""
 "Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
@@ -313,11 +313,11 @@ msgstr ""
 "Ne mogu da dešifrujem višedelni/šifrovani deo: nije podržano šifrovanje za "
 "protokol „%s“."
 
-#: ../libbalsa/gmime-multipart-crypt.c:488
+#: ../libbalsa/gmime-multipart-crypt.c:486
 msgid "(none)"
 msgstr "(ništa)"
 
-#: ../libbalsa/gmime-multipart-crypt.c:501
+#: ../libbalsa/gmime-multipart-crypt.c:499
 msgid ""
 "Cannot decrypt multipart/encrypted part: content-type does not match "
 "protocol."
@@ -325,24 +325,24 @@ msgstr ""
 "Ne mogu da dešifrujem višedelni/šifrovani deo: vrsta sadržaja ne odgovara "
 "protokolu."
 
-#: ../libbalsa/gmime-multipart-crypt.c:516
+#: ../libbalsa/gmime-multipart-crypt.c:514
 msgid "Cannot decrypt multipart/encrypted part: unexpected content type"
 msgstr ""
 "Ne mogu da dešifrujem višedelni/šifrovani deo: neočekivana vrsta sadržaja"
 
-#: ../libbalsa/gmime-multipart-crypt.c:558
+#: ../libbalsa/gmime-multipart-crypt.c:556
 msgid ""
 "Cannot decrypt multipart/encrypted part: failed to parse decrypted content"
 msgstr ""
 "Ne mogu da dešifrujem višedelni/šifrovani deo: ne mogu da obradim šifrovani "
 "sadržaj"
 
-#: ../libbalsa/html.c:68
+#: ../libbalsa/html.c:66
 #, c-format
 msgid "Could not get an HTML part: %s"
 msgstr "Ne mogu da preuzmem HTML deo: %s"
 
-#: ../libbalsa/html.c:340
+#: ../libbalsa/html.c:338
 msgid ""
 "This message part contains images from a remote server. To protect your "
 "privacy, Balsa has not downloaded them. You may choose to download them if "
@@ -352,153 +352,158 @@ msgstr ""
 "privatnost, Balza nije preuzela te delove. Možete ih preuzeti ukoliko ste "
 "sigurni da je poruka bezbedna."
 
-#: ../libbalsa/html.c:348
+#: ../libbalsa/html.c:346
 msgid "_Download images"
 msgstr "Preuzmi _slike"
 
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1881
-#: ../libbalsa/mailbox_local.c:1883 ../src/sendmsg-window.c:4089
-#: ../src/sendmsg-window.c:4091
+#: ../libbalsa/identity.c:101 ../libbalsa/mailbox_local.c:1879
+#: ../libbalsa/mailbox_local.c:1881 ../src/sendmsg-window.c:4098
+#: ../src/sendmsg-window.c:4100
 msgid "Re:"
 msgstr "Re:"
 
-#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:4029
-#: ../src/sendmsg-window.c:4030 ../src/sendmsg-window.c:4031
+#: ../libbalsa/identity.c:102 ../src/sendmsg-window.c:4038
+#: ../src/sendmsg-window.c:4039 ../src/sendmsg-window.c:4040
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: ../libbalsa/identity.c:165
+#: ../libbalsa/identity.c:164
 msgid "New Identity"
 msgstr "Novi identitet"
 
-#: ../libbalsa/identity.c:344
+#: ../libbalsa/identity.c:343
 #, c-format
 msgid "Error executing signature generator %s"
 msgstr "Greška izvršavanja tvorca potpisa %s"
 
-#: ../libbalsa/identity.c:354
+#: ../libbalsa/identity.c:353
 #, c-format
 msgid "Cannot open signature file '%s' for reading"
 msgstr "Ne mogu da otvorim datoteku potpisa „%s“ radi čitanja"
 
-#: ../libbalsa/identity.c:360
+#: ../libbalsa/identity.c:359
 #, c-format
 msgid "Error reading signature from %s"
 msgstr "Greška čitanja potpisa iz %s"
 
-#: ../libbalsa/identity.c:365
+#: ../libbalsa/identity.c:364
 #, c-format
 msgid "Signature in %s is not a UTF-8 text."
 msgstr "Potpis u „%s“ nije UTF-8 tekst."
 
-#: ../libbalsa/identity.c:496
+#: ../libbalsa/identity.c:495
 msgid "Current"
 msgstr "Trenutno"
 
-#: ../libbalsa/identity.c:750 ../libbalsa/smtp-server.c:266
+#: ../libbalsa/identity.c:749 ../libbalsa/smtp-server.c:264
 msgid "Default"
 msgstr "Osnovno"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:949
+#: ../libbalsa/identity.c:948
 msgid "_Face Path"
 msgstr "Putanja do _sličice"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:955
+#: ../libbalsa/identity.c:954
 msgid "_X-Face Path"
 msgstr "Putanja do _X-sličice"
 
 #. create the "General" tab
-#: ../libbalsa/identity.c:983
+#: ../libbalsa/identity.c:982
 msgid "General"
 msgstr "Opšte"
 
-#: ../libbalsa/identity.c:985
+#: ../libbalsa/identity.c:984
 msgid "_Identity name:"
 msgstr "_Ime identiteta:"
 
-#: ../libbalsa/identity.c:987
+#: ../libbalsa/identity.c:986
 msgid "_Full name:"
 msgstr "_Puno ime:"
 
-#: ../libbalsa/identity.c:989
+#: ../libbalsa/identity.c:988
 msgid "_Mailing address:"
 msgstr "_Poštanske adrese:"
 
-#: ../libbalsa/identity.c:991
+#: ../libbalsa/identity.c:990
 msgid "Reply _to:"
 msgstr "_Odgovori:"
 
-#: ../libbalsa/identity.c:993
+#: ../libbalsa/identity.c:992
 msgid "_Domain:"
 msgstr "_Domen:"
 
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:997
+#: ../libbalsa/identity.c:996
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../libbalsa/identity.c:999
+#: ../libbalsa/identity.c:998
 msgid "_Bcc:"
 msgstr "_Nevidljiva kopija:"
 
-#: ../libbalsa/identity.c:1001
+#: ../libbalsa/identity.c:1000
 msgid "Reply _string:"
 msgstr "Niska za _odgovore:"
 
-#: ../libbalsa/identity.c:1003
+#: ../libbalsa/identity.c:1002
 msgid "F_orward string:"
 msgstr "Niska za _prosleđivanje:"
 
-#: ../libbalsa/identity.c:1006
+#: ../libbalsa/identity.c:1005
 msgid "send messages in both plain text and _HTML format"
 msgstr "šalji poruke i kao čist tekst i kao _HTML"
 
-#: ../libbalsa/identity.c:1009
-#| msgid "Message Disposition Notification Requests"
+#: ../libbalsa/identity.c:1008
+#| msgid "request _Message Disposition Notification by default"
+msgid "request positive (successful) _Delivery Status Notification by default"
+msgstr ""
+"zahtevaj _obaveštenje o stanju pozitivne (uspešne) isporuke poruke po osnovi"
+
+#: ../libbalsa/identity.c:1011
 msgid "request _Message Disposition Notification by default"
 msgstr "zahtevaj _obaveštenje o prispeću poruke po osnovi"
 
-#: ../libbalsa/identity.c:1019
+#: ../libbalsa/identity.c:1021
 msgid "SMT_P server:"
 msgstr "SMT_P server:"
 
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:1024
+#: ../libbalsa/identity.c:1026
 msgid "Signature"
 msgstr "Potpis"
 
-#: ../libbalsa/identity.c:1027
+#: ../libbalsa/identity.c:1029
 msgid "Signature _path"
 msgstr "Putanja do _potpisa"
 
-#: ../libbalsa/identity.c:1030
+#: ../libbalsa/identity.c:1032
 msgid "_Execute signature"
 msgstr "_Izvrši potpis"
 
-#: ../libbalsa/identity.c:1033
+#: ../libbalsa/identity.c:1035
 msgid "Incl_ude signature"
 msgstr "_Uključi potpis"
 
-#: ../libbalsa/identity.c:1036
+#: ../libbalsa/identity.c:1038
 msgid "Include signature when for_warding"
 msgstr "Uključi potpis pri _prosleđivanju"
 
-#: ../libbalsa/identity.c:1039
+#: ../libbalsa/identity.c:1041
 msgid "Include signature when rep_lying"
 msgstr "Uključi potpis pri _odgovaranju"
 
-#: ../libbalsa/identity.c:1042
+#: ../libbalsa/identity.c:1044
 msgid "_Add signature separator"
 msgstr "_Dodaj razdvajač potpisa"
 
-#: ../libbalsa/identity.c:1045
+#: ../libbalsa/identity.c:1047
 msgid "Prepend si_gnature"
 msgstr "Postavi potpis _na početak"
 
-#: ../libbalsa/identity.c:1051
+#: ../libbalsa/identity.c:1053
 msgid ""
 "Signing and encrypting messages are possible\n"
 "only if Balsa is built with cryptographic support."
@@ -506,31 +511,31 @@ msgstr ""
 "Potpisivanje i šifrovanje poruka je moguće samo ako\n"
 "je Balsa izgrađena sa podrškom za šifrovanje."
 
-#: ../libbalsa/identity.c:1056
+#: ../libbalsa/identity.c:1058
 msgid "Security"
 msgstr "Sigurnost"
 
-#: ../libbalsa/identity.c:1059
+#: ../libbalsa/identity.c:1061
 msgid "sign messages by default"
 msgstr "potpiši poruke po osnovi"
 
-#: ../libbalsa/identity.c:1062
+#: ../libbalsa/identity.c:1064
 msgid "encrypt messages by default"
 msgstr "šifruj poruke po osnovi"
 
-#: ../libbalsa/identity.c:1065
+#: ../libbalsa/identity.c:1067
 msgid "default protocol"
 msgstr "osnovni protokol"
 
-#: ../libbalsa/identity.c:1068
+#: ../libbalsa/identity.c:1070
 msgid "always trust GnuPG keys when encrypting"
 msgstr "uvek veruj GnuPG ključevima prilikom šifrovanja"
 
-#: ../libbalsa/identity.c:1071
+#: ../libbalsa/identity.c:1073
 msgid "remind me if messages can be encrypted"
 msgstr "podseti me ukoliko je moguće potpisati poruku"
 
-#: ../libbalsa/identity.c:1074
+#: ../libbalsa/identity.c:1076
 msgid ""
 "use secret key with this id for signing\n"
 "(leave empty for automatic selection)"
@@ -538,64 +543,64 @@ msgstr ""
 "koristi tajni ključ uz ovaj ib za potpisivanje\n"
 "(ostavite prazno za samostalno biranje)"
 
-#: ../libbalsa/identity.c:1208
+#: ../libbalsa/identity.c:1210
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Greška čitanja datoteke „%s“: %s"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1218
+#: ../libbalsa/identity.c:1220
 #, c-format
 msgid "Face header file %s is too long (%lu bytes)."
 msgstr "Sličica zaglavlja „%s“ je prevelika (%lu bajta)."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1228
+#: ../libbalsa/identity.c:1230
 #, c-format
 msgid "Face header file %s contains binary data."
 msgstr "Sličica zaglavlja „%s“ sadrži binarne podatke."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1248 ../src/balsa-message.c:1573
+#: ../libbalsa/identity.c:1250 ../src/balsa-message.c:1571
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Ne mogu da učitam sličicu: %s"
 
-#: ../libbalsa/identity.c:1427
+#: ../libbalsa/identity.c:1429
 msgid "Error: The identity does not have a name"
 msgstr "Greška: Identitet nema ime"
 
-#: ../libbalsa/identity.c:1437
+#: ../libbalsa/identity.c:1439
 msgid "Error: An identity with that name already exists"
 msgstr "Greška: Identitet sa tim imenom već postoji"
 
-#: ../libbalsa/identity.c:1636
+#: ../libbalsa/identity.c:1639
 msgid "Do you really want to delete the selected identity?"
 msgstr "Da li zaista želite da obrišete izabrani identitet?"
 
-#: ../libbalsa/identity.c:1673
+#: ../libbalsa/identity.c:1676
 #, c-format
 msgid "Error displaying help for identities: %s\n"
 msgstr "Greška prikazivanja pomoći za ličnosti: %s\n"
 
-#: ../libbalsa/identity.c:1719
+#: ../libbalsa/identity.c:1722
 msgid "Manage Identities"
 msgstr "Upravljajte ličnostima"
 
-#: ../libbalsa/identity.c:2116
+#: ../libbalsa/identity.c:2123
 msgid "GnuPG MIME mode"
 msgstr "GnuPG MIME režim"
 
-#: ../libbalsa/identity.c:2118
+#: ../libbalsa/identity.c:2125
 msgid "GnuPG OpenPGP mode"
 msgstr "GnuPG OpenPGP režim"
 
-#: ../libbalsa/identity.c:2121
+#: ../libbalsa/identity.c:2128
 msgid "GpgSM S/MIME mode"
 msgstr "GpgSM S/MIME režim"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:319
+#: ../libbalsa/imap-server.c:317
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -605,33 +610,33 @@ msgstr ""
 "%s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:323
+#: ../libbalsa/imap-server.c:321
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr "Greška IMAP servera %s: %s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:329
+#: ../libbalsa/imap-server.c:327
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../libbalsa/imap-server.c:575 ../libbalsa/server.c:348
-#: ../libbalsa/server.c:392
+#: ../libbalsa/imap-server.c:573 ../libbalsa/server.c:346
+#: ../libbalsa/server.c:390
 msgid "Balsa passwords"
 msgstr "Balsine lozinke"
 
-#: ../libbalsa/imap-server.c:626
+#: ../libbalsa/imap-server.c:624
 #, c-format
 msgid "Cannot connect to %s"
 msgstr "Ne mogu da se povežem na %s"
 
-#: ../libbalsa/imap-server.c:631 ../libbalsa/imap-server.c:636
+#: ../libbalsa/imap-server.c:629 ../libbalsa/imap-server.c:634
 #, c-format
 msgid "Cannot connect to the server: %s"
 msgstr "Ne mogu da se povežem na server: %s"
 
-#: ../libbalsa/imap-server.c:784
+#: ../libbalsa/imap-server.c:782
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Prekoračen je broj veza sa serverom „%s“"
@@ -640,8 +645,8 @@ msgstr "Prekoračen je broj veza sa serverom „%s“"
 msgid "Invalid date"
 msgstr "Pogrešan datum"
 
-#: ../libbalsa/libbalsa.c:401 ../src/pref-manager.c:1408
-#: ../src/pref-manager.c:1504
+#: ../libbalsa/libbalsa.c:401 ../src/pref-manager.c:1406
+#: ../src/pref-manager.c:1502
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -719,69 +724,64 @@ msgstr "Unutrašnje prekoračenje ostave"
 msgid "Bad X-Face data"
 msgstr "Neispravna X-sličica"
 
-#: ../libbalsa/libbalsa-conf.c:143
+#: ../libbalsa/libbalsa-conf.c:141
 msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
 msgstr "Vaša podešavanja Balse su sada smeštena u „~/.balsa/config“."
 
-#: ../libbalsa/libbalsa-gpgme.c:245 ../libbalsa/libbalsa-gpgme.c:256
-#: ../libbalsa/libbalsa-gpgme.c:358 ../libbalsa/libbalsa-gpgme.c:481
-#: ../libbalsa/libbalsa-gpgme.c:574
-#| msgid "%s: could not get data from stream: %s"
+#: ../libbalsa/libbalsa-gpgme.c:243 ../libbalsa/libbalsa-gpgme.c:254
+#: ../libbalsa/libbalsa-gpgme.c:356 ../libbalsa/libbalsa-gpgme.c:479
+#: ../libbalsa/libbalsa-gpgme.c:572
 msgid "could not get data from stream"
 msgstr "ne mogu da dobavim podatke iz toka"
 
-#: ../libbalsa/libbalsa-gpgme.c:269 ../libbalsa/rfc3156.c:394
-#: ../libbalsa/rfc3156.c:399 ../libbalsa/rfc3156.c:571
-#: ../libbalsa/rfc3156.c:577
+#: ../libbalsa/libbalsa-gpgme.c:267 ../libbalsa/rfc3156.c:392
+#: ../libbalsa/rfc3156.c:397 ../libbalsa/rfc3156.c:569
+#: ../libbalsa/rfc3156.c:575
 msgid "signature verification failed"
 msgstr "provera potpisa nije uspela"
 
-#: ../libbalsa/libbalsa-gpgme.c:366 ../libbalsa/libbalsa-gpgme.c:490
-#: ../libbalsa/libbalsa-gpgme.c:582
-#| msgid "%s: could not create new data object: %s"
+#: ../libbalsa/libbalsa-gpgme.c:364 ../libbalsa/libbalsa-gpgme.c:488
+#: ../libbalsa/libbalsa-gpgme.c:580
 msgid "could not create new data object"
 msgstr "ne mogu da stvorim novi objekat podataka"
 
-#: ../libbalsa/libbalsa-gpgme.c:375
+#: ../libbalsa/libbalsa-gpgme.c:373
 msgid "signing failed"
 msgstr "potpisivanje nije uspelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:449
+#: ../libbalsa/libbalsa-gpgme.c:447
 #, c-format
-#| msgid "combined signing and encryption is only defined for RFC 2440"
 msgid "combined signing and encryption is defined only for RFC 2440"
 msgstr "mešanje potpisivanja i šifrovanja je određeno jedino za RFC 2440"
 
-#: ../libbalsa/libbalsa-gpgme.c:517
+#: ../libbalsa/libbalsa-gpgme.c:515
 msgid "signing and encryption failed"
 msgstr "potpisivanje i šifrovanje nije uspelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:519
+#: ../libbalsa/libbalsa-gpgme.c:517
 msgid "encryption failed"
 msgstr "šifrovanje nije uspelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:592 ../libbalsa/rfc3156.c:472
-#: ../libbalsa/rfc3156.c:477
+#: ../libbalsa/libbalsa-gpgme.c:590 ../libbalsa/rfc3156.c:470
+#: ../libbalsa/rfc3156.c:475
 msgid "decryption failed"
 msgstr "dešifrovanje nije uspelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:693
-#| msgid "%s: could not create context: %s"
+#: ../libbalsa/libbalsa-gpgme.c:691
 msgid "could not create context"
 msgstr "ne mogu da obrazujem kontekst"
 
-#: ../libbalsa/libbalsa-gpgme.c:697
+#: ../libbalsa/libbalsa-gpgme.c:695
 #, c-format
 msgid "could not set protocol '%s'"
 msgstr "ne mogu da podesim protokol „%s“"
 
-#: ../libbalsa/libbalsa-gpgme.c:736 ../libbalsa/libbalsa-gpgme.c:764
+#: ../libbalsa/libbalsa-gpgme.c:734 ../libbalsa/libbalsa-gpgme.c:762
 #, c-format
-#| msgid "%s: could not list keys for %s: %s"
 msgid "could not list keys for \"%s\""
 msgstr "ne mogu da pobrojim ključeve za „%s“"
 
-#: ../libbalsa/libbalsa-gpgme.c:782
+#: ../libbalsa/libbalsa-gpgme.c:780
 #, c-format
 msgid ""
 "%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
@@ -789,12 +789,12 @@ msgstr ""
 "%s: ključ za „%s“ je prisutan, ali je istekao, isključen, opozvan ili "
 "neispravan"
 
-#: ../libbalsa/libbalsa-gpgme.c:787
+#: ../libbalsa/libbalsa-gpgme.c:785
 #, c-format
 msgid "%s: could not find a key for %s"
 msgstr "%s: ne mogu da nađem ključ za %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:794
+#: ../libbalsa/libbalsa-gpgme.c:792
 #, c-format
 msgid ""
 "%s: a key with id %s is present, but it is expired, disabled, revoked or "
@@ -803,78 +803,73 @@ msgstr ""
 "%s: ključ sa ib-om %s je prisutan, ali je istekao, isključen, opozvan ili "
 "neispravan"
 
-#: ../libbalsa/libbalsa-gpgme.c:799
+#: ../libbalsa/libbalsa-gpgme.c:797
 #, c-format
-#| msgid "%s: could not find a key for %s"
 msgid "%s: could not find a key with id %s"
 msgstr "%s: ne mogu da nađem ključ sa ib-om %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:816
+#: ../libbalsa/libbalsa-gpgme.c:814
 #, c-format
 msgid "%s: multiple keys for %s"
 msgstr "%s: više ključeva za %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:862
+#: ../libbalsa/libbalsa-gpgme.c:860
 #, c-format
 msgid "%s: insufficient validity for uid %s"
 msgstr "%s: nedovoljno valjanosti za uib %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:144
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
 msgid "User ID"
 msgstr "IB korisnika"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:144
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
 msgid "Key ID"
 msgstr "IB ključa"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:144
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
 msgid "Length"
 msgstr "Dužina"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:144
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
 msgid "Validity"
 msgstr "Ispravnost"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:159
+#: ../libbalsa/libbalsa-gpgme-cb.c:158
 msgid "Select key"
 msgstr "Izaberite ključ"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:175
+#: ../libbalsa/libbalsa-gpgme-cb.c:174
 #, c-format
 msgid "Select the private key for the signer %s"
 msgstr "Izaberite privatni ključ za potpisnika %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:179
+#: ../libbalsa/libbalsa-gpgme-cb.c:178
 #, c-format
 msgid "Select the public key for the recipient %s"
 msgstr "Izaberite javni ključ za primaoca %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:302
+#: ../libbalsa/libbalsa-gpgme-cb.c:301
 #, c-format
 msgid "Insufficient trust for recipient %s"
 msgstr "Nedovoljno poverenja za primaoca %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:306
+#: ../libbalsa/libbalsa-gpgme-cb.c:305
 #, c-format
 msgid "The validity of the key with user ID \"%s\" is \"%s\"."
 msgstr "Ispravnost ključa sa korisničkim IB-om „%s“ je „%s“."
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:317
+#: ../libbalsa/libbalsa-gpgme-cb.c:316
 msgid "Use this key anyway?"
 msgstr "Da ipak koristim ovaj ključ?"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:343
+#: ../libbalsa/libbalsa-gpgme-cb.c:342
 msgid "Enter Passphrase"
 msgstr "Unesite lozinku"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:370
+#: ../libbalsa/libbalsa-gpgme-cb.c:369
 #, c-format
-#| msgid ""
-#| "The passphrase for this key was bad, please try again!\n"
-#| "\n"
-#| "Key: %s"
 msgid ""
 "%s\n"
 "The passphrase for this key was bad, please try again!\n"
@@ -886,12 +881,8 @@ msgstr ""
 "\n"
 "Ključ: %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:375
+#: ../libbalsa/libbalsa-gpgme-cb.c:374
 #, c-format
-#| msgid ""
-#| "Please enter the passphrase for the secret key!\n"
-#| "\n"
-#| "Key: %s"
 msgid ""
 "%s\n"
 "Please enter the passphrase for the secret key!\n"
@@ -903,93 +894,85 @@ msgstr ""
 "\n"
 "Ključ: %s"
 
-#: ../libbalsa/libbalsa-vfs.c:558 ../src/sendmsg-window.c:5226
+#: ../libbalsa/libbalsa-vfs.c:556 ../src/sendmsg-window.c:5239
 #, c-format
-#| msgid "%s isn't a regular file."
 msgid "not a regular file"
 msgstr "nije obična datoteka"
 
-#: ../libbalsa/libbalsa-vfs.c:610
+#: ../libbalsa/libbalsa-vfs.c:608
 #, c-format
 msgid "Cannot launch, missing application"
 msgstr "Ne mogu da pokrenem, nedostaje program"
 
-#: ../libbalsa/libbalsa-vfs.c:676
+#: ../libbalsa/libbalsa-vfs.c:674
 #, c-format
 msgid "Open with %s"
 msgstr "Otvori programom „%s“"
 
-#: ../libbalsa/libbalsa-vfs.c:729
+#: ../libbalsa/libbalsa-vfs.c:727
 #, c-format
 msgid "Open _part with %s"
 msgstr "Pregledaj _deo pomoću „%s“"
 
-#: ../libbalsa/mailbox.c:522
+#: ../libbalsa/mailbox.c:520
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "Ne mogu da učitam sanduče „%s“"
 
-#: ../libbalsa/mailbox.c:529
+#: ../libbalsa/mailbox.c:527
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "Ne postoji ova vrsta sandučeta: %s"
 
-#: ../libbalsa/mailbox.c:546
+#: ../libbalsa/mailbox.c:544
 #, c-format
 msgid "Bad local mailbox path \"%s\""
 msgstr "Loša putanja mesnog sandučeta „%s“"
 
-#: ../libbalsa/mailbox.c:551
+#: ../libbalsa/mailbox.c:549
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "Nisam mogao da stvorim sanduče vrste „%s“"
 
-#: ../libbalsa/mailbox.c:874
+#: ../libbalsa/mailbox.c:872
 #, c-format
-#| msgid "Error displaying filter help: %s\n"
 msgid "Applying filter rules to %s"
 msgstr "Primenjujem pravila propusnika na „%s“"
 
 # bug: plural-forms
-#: ../libbalsa/mailbox.c:1029
+#: ../libbalsa/mailbox.c:1027
 #, c-format
-#| msgid "Copying %d messages to %s..."
 msgid "Copying from %s to %s"
 msgstr "Umnožavam iz „%s“ u „%s“"
 
-#: ../libbalsa/mailbox.c:1936
+#: ../libbalsa/mailbox.c:1934
 #, c-format
 msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
 msgstr "biblbalsa_sanduče_dobavi_poruku: sanduče „%s“ je zatvoreno"
 
-#: ../libbalsa/mailbox.c:2146
+#: ../libbalsa/mailbox.c:2144
 #, c-format
-#| msgid "Remove duplicated messages from the selected mailbox"
 msgid "Removing messages from source mailbox failed"
 msgstr "Nisam uspeo da uklonim poruka iz sandučeta izvora"
 
-#: ../libbalsa/mailbox.c:3019
-#| msgid "unknown"
+#: ../libbalsa/mailbox.c:3017
 msgid "from unknown"
 msgstr "iz nepoznatog"
 
-#: ../libbalsa/mailbox.c:3021
-#| msgid "Logging in..."
+#: ../libbalsa/mailbox.c:3019
 msgid "Loading..."
 msgstr "Učitavam..."
 
-#: ../libbalsa/mailbox.c:3991
+#: ../libbalsa/mailbox.c:3989
 #, c-format
-#| msgid "Set identity to use for this message"
 msgid "Searching %s for partial messages"
 msgstr "Pretražujem „%s“ za delimičnim porukama"
 
-#: ../libbalsa/mailbox.c:4081
-#| msgid "Continue message"
+#: ../libbalsa/mailbox.c:4079
 msgid "Reconstructing message"
 msgstr "Rekonstruišem poruku"
 
-#: ../libbalsa/mailbox.c:4350
+#: ../libbalsa/mailbox.c:4348
 #, c-format
 msgid "Finding duplicate messages in source mailbox failed"
 msgstr "Nisam uspeo da uklonim dvostruke poruke iz sandučeta izvora"
@@ -997,37 +980,37 @@ msgstr "Nisam uspeo da uklonim dvostruke poruke iz sandučeta izvora"
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:619
+#: ../libbalsa/mailbox_imap.c:617
 msgid "IMAP connection has been severed. Reconnecting..."
 msgstr "IMAP veza je raskinuta. Ponovo se povezujem..."
 
-#: ../libbalsa/mailbox_imap.c:622
+#: ../libbalsa/mailbox_imap.c:620
 msgid "IMAP protocol error. Try enabling bug workarounds."
 msgstr "Greška IMAP protokola. Pokušavam da uključim sređivanje problema."
 
-#: ../libbalsa/mailbox_imap.c:625
+#: ../libbalsa/mailbox_imap.c:623
 #, c-format
 msgid "IMAP server has shut the connection: %s Reconnecting..."
 msgstr "IMAP server je ugasio vezu: %s Ponovo se povezujem..."
 
-#: ../libbalsa/mailbox_imap.c:637
+#: ../libbalsa/mailbox_imap.c:635
 #, c-format
 msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
 msgstr ""
 "Neusklađena IMAP naredba „%s“ ne može biti izvršena. Ponovo se povezujem..."
 
-#: ../libbalsa/mailbox_imap.c:1128 ../libbalsa/mailbox_maildir.c:511
-#: ../libbalsa/mailbox_mbox.c:750 ../libbalsa/mailbox_mh.c:547
+#: ../libbalsa/mailbox_imap.c:1126 ../libbalsa/mailbox_maildir.c:509
+#: ../libbalsa/mailbox_mbox.c:748 ../libbalsa/mailbox_mh.c:543
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: Otvaram %s Refbroj: %d\n"
 
-#: ../libbalsa/mailbox_imap.c:1215
+#: ../libbalsa/mailbox_imap.c:1213
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "Preuzimam %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:1614
+#: ../libbalsa/mailbox_imap.c:1612
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
@@ -1036,104 +1019,103 @@ msgstr ""
 "Naredba PRETRAŽI IMAP nije uspela za sanduče „%s“\n"
 "vraćam se na podrazumevani način pretrage"
 
-#: ../libbalsa/mailbox_imap.c:1674
+#: ../libbalsa/mailbox_imap.c:1672
 #, c-format
 msgid "No path found for mailbox \"%s\", using \"%s\""
 msgstr "Nisam pronašao putanju za sanduče „%s“, koristim „%s“"
 
-#: ../libbalsa/mailbox_imap.c:1802 ../libbalsa/mailbox_imap.c:1843
+#: ../libbalsa/mailbox_imap.c:1800 ../libbalsa/mailbox_imap.c:1841
 #, c-format
 msgid "Cannot get IMAP handle"
 msgstr "Ne mogu da dobavim IMAP upravljanje"
 
-#: ../libbalsa/mailbox_imap.c:2447 ../libbalsa/mailbox_imap.c:2513
+#: ../libbalsa/mailbox_imap.c:2445 ../libbalsa/mailbox_imap.c:2511
 #, c-format
 msgid "Error fetching message from IMAP server: %s"
 msgstr "Greška dovlačenja poruke sa IMAP servera: %s"
 
-#: ../libbalsa/mailbox_imap.c:2481
+#: ../libbalsa/mailbox_imap.c:2479
 #, c-format
 msgid "Downloading %u kB"
 msgstr "Preuzimam %u kB"
 
-#: ../libbalsa/mailbox_imap.c:2525
+#: ../libbalsa/mailbox_imap.c:2523
 #, c-format
 msgid "Cannot create temporary file"
 msgstr "Ne mogu da napravim privremenu datoteku"
 
-#: ../libbalsa/mailbox_imap.c:2545
+#: ../libbalsa/mailbox_imap.c:2543
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "Ne mogu da pišem u privremenu datoteku „%s“"
 
-#: ../libbalsa/mailbox_imap.c:2774 ../libbalsa/mailbox_imap.c:2893
+#: ../libbalsa/mailbox_imap.c:2772 ../libbalsa/mailbox_imap.c:2891
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "Šaljem %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:3196
+#: ../libbalsa/mailbox_imap.c:3194
 msgid "Server-side threading not supported."
 msgstr "Nije podržano temačenje sa strane servera."
 
-#: ../libbalsa/mailbox_local.c:540
+#: ../libbalsa/mailbox_local.c:538
 #, c-format
 msgid "Failed to save cache file \"%s\": %s."
 msgstr "Nisam uspeo da sačuvam datoteku ostave „%s“: %s."
 
-#: ../libbalsa/mailbox_local.c:572
+#: ../libbalsa/mailbox_local.c:570
 #, c-format
 msgid "Cache file for mailbox %s will be created"
 msgstr "Biće napravljena datoteka ostave za sanduče „%s“"
 
-#: ../libbalsa/mailbox_local.c:581
+#: ../libbalsa/mailbox_local.c:579
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Nisam uspeo da pročitam datoteku ostave „%s“: %s"
 
-#: ../libbalsa/mailbox_local.c:599 ../libbalsa/mailbox_local.c:616
-#: ../libbalsa/mailbox_local.c:640
+#: ../libbalsa/mailbox_local.c:597 ../libbalsa/mailbox_local.c:614
+#: ../libbalsa/mailbox_local.c:638
 #, c-format
 msgid "Cache file for mailbox %s will be repaired"
 msgstr "Biće popravljena datoteka ostave za sanduče „%s“"
 
-#: ../libbalsa/mailbox_local.c:1166
+#: ../libbalsa/mailbox_local.c:1164
 #, c-format
 msgid "Filtering %s"
 msgstr "Razvrstavam %s"
 
-#: ../libbalsa/mailbox_local.c:1254
+#: ../libbalsa/mailbox_local.c:1252
 #, c-format
-#| msgid "Reading %s..."
 msgid "Preparing %s"
 msgstr "Pripremam %s"
 
-#: ../libbalsa/mailbox_local.c:2050
+#: ../libbalsa/mailbox_local.c:2048
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "Nisam uspeo da otvorim „%s“. Greška broj %d, "
 
-#: ../libbalsa/mailbox_local.c:2072
+#: ../libbalsa/mailbox_local.c:2070
 #, c-format
 msgid "Failed to sync mailbox \"%s\""
 msgstr "Nisam uspeo da uskladim sanduče „%s“"
 
-#: ../libbalsa/mailbox_maildir.c:197
+#: ../libbalsa/mailbox_maildir.c:195
 #, c-format
 msgid "Mailbox %s does not appear to be a Maildir mailbox."
 msgstr "Sanduče %s ne izgleda kao sanduče vrste „Maildir“."
 
-#: ../libbalsa/mailbox_maildir.c:206
+#: ../libbalsa/mailbox_maildir.c:204
 #, c-format
 msgid "Could not create a MailDir directory at %s (%s)"
 msgstr "Ne mogu da stvorim „MailDir“ direktorijum u %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:214 ../libbalsa/mailbox_maildir.c:223
-#: ../libbalsa/mailbox_maildir.c:234
+#: ../libbalsa/mailbox_maildir.c:212 ../libbalsa/mailbox_maildir.c:221
+#: ../libbalsa/mailbox_maildir.c:232
 #, c-format
 msgid "Could not create a MailDir at %s (%s)"
 msgstr "Ne mogu da stvorim „MailDir“ u %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:341 ../libbalsa/mailbox_mh.c:294
+#: ../libbalsa/mailbox_maildir.c:339 ../libbalsa/mailbox_mh.c:292
 #, c-format
 msgid ""
 "Could not remove contents of %s:\n"
@@ -1142,8 +1124,8 @@ msgstr ""
 "Ne mogu da uklonim sadržaj %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:347 ../libbalsa/mailbox_mbox.c:326
-#: ../libbalsa/mailbox_mh.c:300
+#: ../libbalsa/mailbox_maildir.c:345 ../libbalsa/mailbox_mbox.c:324
+#: ../libbalsa/mailbox_mh.c:298
 #, c-format
 msgid ""
 "Could not remove %s:\n"
@@ -1152,138 +1134,132 @@ msgstr ""
 "Ne mogu da uklonim %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:490 ../libbalsa/mailbox_mbox.c:694
-#: ../libbalsa/mailbox_mh.c:528
+#: ../libbalsa/mailbox_maildir.c:488 ../libbalsa/mailbox_mbox.c:692
+#: ../libbalsa/mailbox_mh.c:524
 #, c-format
 msgid "Mailbox does not exist."
 msgstr "Sanduče ne postoji."
 
-#: ../libbalsa/mailbox_maildir.c:931 ../libbalsa/mailbox_mbox.c:2031
-#: ../libbalsa/mailbox_mh.c:1110
+#: ../libbalsa/mailbox_maildir.c:929 ../libbalsa/mailbox_mbox.c:2029
+#: ../libbalsa/mailbox_mh.c:1106
 #, c-format
 msgid "Data copy error"
 msgstr "Greška umnožavanja podataka"
 
-#: ../libbalsa/mailbox_mbox.c:211
+#: ../libbalsa/mailbox_mbox.c:209
 #, c-format
 msgid "Mailbox %s does not appear to be an Mbox mailbox."
 msgstr "Sanduče „%s“ ne izgleda kao sanduče vrste „Mbox“."
 
-#: ../libbalsa/mailbox_mbox.c:429
+#: ../libbalsa/mailbox_mbox.c:427
 #, c-format
-#| msgid ""
-#| "Could not remove %s:\n"
-#| "%s"
 msgid "Could not write file %s: %s"
 msgstr "Ne mogu da zapišem datoteku „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:441
+#: ../libbalsa/mailbox_mbox.c:439
 #, c-format
 msgid "Failed to create temporary file \"%s\": %s"
 msgstr "Nisam uspeo da napravim privremenu datoteku „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:453
+#: ../libbalsa/mailbox_mbox.c:451
 #, c-format
 msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
 msgstr ""
 "Nisam uspeo da sačuvam datoteku ostave „%s“: %s.  Novo izdanje je sačuvano "
 "kao „%s“"
 
-#: ../libbalsa/mailbox_mbox.c:461
+#: ../libbalsa/mailbox_mbox.c:459
 #, c-format
-#| msgid "Could not save %s: %s"
 msgid "Could not unlink file %s: %s"
 msgstr "Ne mogu da razvežem datoteku „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:702
+#: ../libbalsa/mailbox_mbox.c:700
 #, c-format
 msgid "Cannot open mailbox."
 msgstr "Ne mogu da otvorim sanduče."
 
-#: ../libbalsa/mailbox_mbox.c:714
+#: ../libbalsa/mailbox_mbox.c:712
 #, c-format
 msgid "Mailbox is not in mbox format."
 msgstr "Sanduče nije u „mbox“ zapisu."
 
-#: ../libbalsa/mailbox_mbox.c:722
+#: ../libbalsa/mailbox_mbox.c:720
 #, c-format
 msgid "Cannot lock mailbox."
 msgstr "Ne mogu da zaključam sanduče."
 
-#: ../libbalsa/mailbox_mbox.c:1988
+#: ../libbalsa/mailbox_mbox.c:1986
 #, c-format
 msgid "%s: could not open %s."
 msgstr "%s: ne mogu da otvorim %s."
 
-#: ../libbalsa/mailbox_mbox.c:1999
+#: ../libbalsa/mailbox_mbox.c:1997
 #, c-format
 msgid "%s: could not get new mime stream."
 msgstr "%s: ne mogu da dobavim novi mime tok."
 
-#: ../libbalsa/mailbox_mbox.c:2007
+#: ../libbalsa/mailbox_mbox.c:2005
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: „%s“ nije u „mbox“ zapisu."
 
-#: ../libbalsa/mailbox_mh.c:175
+#: ../libbalsa/mailbox_mh.c:173
 #, c-format
 msgid "Mailbox %s does not appear to be a Mh mailbox."
 msgstr "Sanduče „%s“ ne izgleda kao sanduče vrste „Mh“."
 
-#: ../libbalsa/mailbox_mh.c:185
+#: ../libbalsa/mailbox_mh.c:183
 #, c-format
 msgid "Could not create MH directory at %s (%s)"
 msgstr "Ne mogu da stvorim direktorijum vrste „MH“ u %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:197
+#: ../libbalsa/mailbox_mh.c:195
 #, c-format
 msgid "Could not create MH structure at %s (%s)"
 msgstr "Ne mogu da stvorim strukturu vrste „MH“ u %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:1091
+#: ../libbalsa/mailbox_mh.c:1087
 #, c-format
 msgid "Cannot create message"
 msgstr "Ne mogu da napravim poruku"
 
-#: ../libbalsa/mailbox_mh.c:1135
+#: ../libbalsa/mailbox_mh.c:1131
 #, c-format
 msgid "Message rename error"
 msgstr "Greška preimenovanja poruke"
 
-#: ../libbalsa/mailbox_pop3.c:192
+#: ../libbalsa/mailbox_pop3.c:190
 #, c-format
 msgid "Error appending message %d from %s to %s: %s"
 msgstr "Greška prilaganja poruke „%d“ iz „%s“ u „%s“: %s"
 
-#: ../libbalsa/mailbox_pop3.c:341
+#: ../libbalsa/mailbox_pop3.c:339
 #, c-format
-#| msgid "Saving POP message to %s failed."
 msgid "Saving POP message to %s failed"
 msgstr "Nisam uspeo da sačuvam POP poruku u „%s“"
 
-#: ../libbalsa/mailbox_pop3.c:348
+#: ../libbalsa/mailbox_pop3.c:346
 #, c-format
 msgid "Retrieving Message %d of %d"
 msgstr "Preuzimam poruku %d od %d"
 
 # bug: plural-forms
-#: ../libbalsa/mailbox_pop3.c:371
+#: ../libbalsa/mailbox_pop3.c:369
 #, c-format
 msgid "Received %ld kB of %ld"
 msgstr "Primljeno je %ld kB od %ld"
 
-#: ../libbalsa/mailbox_pop3.c:385
+#: ../libbalsa/mailbox_pop3.c:383
 #, c-format
 msgid "Saving POP message to %s failed."
 msgstr "Nisam uspeo da sačuvam POP poruku u „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:395
+#: ../libbalsa/mailbox_pop3.c:393
 #, c-format
-#| msgid "Transfering POP message to %s failed."
 msgid "Transferring POP message to %s failed."
 msgstr "Nisam uspeo da prenesem POP poruku u „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:477
+#: ../libbalsa/mailbox_pop3.c:475
 #, c-format
 msgid ""
 "POP3 mailbox %s temp file error:\n"
@@ -1292,32 +1268,32 @@ msgstr ""
 "Greška privremene datoteke POP3 sandučeta %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_pop3.c:502
+#: ../libbalsa/mailbox_pop3.c:500
 #, c-format
 msgid "POP3 mailbox %s error: %s\n"
 msgstr "Greška POP3 sandučeta %s: %s\n"
 
-#: ../libbalsa/mailbox_pop3.c:540
+#: ../libbalsa/mailbox_pop3.c:538
 #, c-format
 msgid "POP3 message %d oversized: %d kB - skipped."
 msgstr "Premašena je veličina POP3 poruke „%d“: %d kB — preskačem."
 
-#: ../libbalsa/mailbox_pop3.c:552
+#: ../libbalsa/mailbox_pop3.c:550
 #, c-format
 msgid "POP3 error: cannot open %s for writing."
 msgstr "POP3 greška: ne mogu da otvorim „%s“ radi upisa."
 
-#: ../libbalsa/mailbox_pop3.c:560
+#: ../libbalsa/mailbox_pop3.c:558
 #, c-format
 msgid "POP3 error: cannot close %s."
 msgstr "POP3 greška: ne mogu da zatvorim „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:595
+#: ../libbalsa/mailbox_pop3.c:593
 #, c-format
 msgid "POP3 error: %s."
 msgstr "POP3 greška: %s."
 
-#: ../libbalsa/message.c:617
+#: ../libbalsa/message.c:615
 #, c-format
 msgid "Mailbox (%s) is readonly: cannot change flags."
 msgstr "Sanduče (%s) je samo za čitanje: ne mogu da izmenim opcije."
@@ -1427,187 +1403,181 @@ msgstr "Čekam na pokušaj zaključavanja „flock“... %d"
 msgid "LDAP Directory for %s"
 msgstr "LDAP katalog za %s"
 
-#: ../libbalsa/rfc2445.c:90 ../libbalsa/rfc2445.c:683
-#: ../libbalsa/rfc2445.c:702 ../libbalsa/rfc3156.c:716
+#: ../libbalsa/rfc2445.c:88 ../libbalsa/rfc2445.c:681
+#: ../libbalsa/rfc2445.c:700 ../libbalsa/rfc3156.c:714
 msgid "unknown"
 msgstr "nepoznato"
 
-#: ../libbalsa/rfc2445.c:91
+#: ../libbalsa/rfc2445.c:89
 msgid "needs action"
 msgstr "zahteva radnju"
 
-#: ../libbalsa/rfc2445.c:92
-#| msgid "_Accept Once"
+#: ../libbalsa/rfc2445.c:90
 msgid "accepted"
 msgstr "prihvaćeno"
 
-#: ../libbalsa/rfc2445.c:93
-#| msgid "undefined"
+#: ../libbalsa/rfc2445.c:91
 msgid "declined"
 msgstr "odbijeno"
 
-#: ../libbalsa/rfc2445.c:94
+#: ../libbalsa/rfc2445.c:92
 msgid "tentatively accepted"
 msgstr "prihvaćeno s rezervom"
 
-#: ../libbalsa/rfc2445.c:95
-#| msgid "Deleted"
+#: ../libbalsa/rfc2445.c:93
 msgid "delegated"
 msgstr "izaslano"
 
-#: ../libbalsa/rfc2445.c:96
+#: ../libbalsa/rfc2445.c:94
 msgid "completed"
 msgstr "završeno"
 
-#: ../libbalsa/rfc2445.c:97
+#: ../libbalsa/rfc2445.c:95
 msgid "in process"
 msgstr "u toku"
 
-#: ../libbalsa/rfc2445.c:684
-#| msgid "Notification:"
+#: ../libbalsa/rfc2445.c:682
 msgid "Event Notification"
 msgstr "Obaveštenje događaja"
 
-#: ../libbalsa/rfc2445.c:685
+#: ../libbalsa/rfc2445.c:683
 msgid "Event Request"
 msgstr "Zahtev događaja"
 
-#: ../libbalsa/rfc2445.c:686
-#| msgid "Reply to mailing list"
+#: ../libbalsa/rfc2445.c:684
 msgid "Reply to Event Request"
 msgstr "Odgovori na zahtev događaja"
 
-#: ../libbalsa/rfc2445.c:687
+#: ../libbalsa/rfc2445.c:685
 msgid "Event Cancellation"
 msgstr "Brisanje događaja"
 
-#: ../libbalsa/rfc2445.c:703
-#| msgid "thai"
+#: ../libbalsa/rfc2445.c:701
 msgid "chair"
 msgstr "predsednik"
 
-#: ../libbalsa/rfc2445.c:704
+#: ../libbalsa/rfc2445.c:702
 msgid "required participant"
 msgstr "obavezan učesnik"
 
-#: ../libbalsa/rfc2445.c:705
+#: ../libbalsa/rfc2445.c:703
 msgid "optional participant"
 msgstr "mogući učesnik"
 
-#: ../libbalsa/rfc2445.c:706
+#: ../libbalsa/rfc2445.c:704
 msgid "non-participant, information only"
 msgstr "ne-učestvujući, samo podatak"
 
-#: ../libbalsa/rfc3156.c:626 ../libbalsa/rfc3156.c:633
+#: ../libbalsa/rfc3156.c:624 ../libbalsa/rfc3156.c:631
 msgid "decryption and signature verification failed"
 msgstr "nije uspelo dešifrovanje i provera potpisa"
 
-#: ../libbalsa/rfc3156.c:659
+#: ../libbalsa/rfc3156.c:657
 msgid "The signature is valid."
 msgstr "Potpis je ispravan."
 
-#: ../libbalsa/rfc3156.c:661
+#: ../libbalsa/rfc3156.c:659
 msgid "The signature is valid but expired."
 msgstr "Potpis je ispravan ali je istekao."
 
-#: ../libbalsa/rfc3156.c:664
+#: ../libbalsa/rfc3156.c:662
 msgid ""
 "The signature is valid but the key used to verify the signature has expired."
 msgstr "Potpis je ispravan ali je ključ za potvrdu potpisa istekao."
 
-#: ../libbalsa/rfc3156.c:667
+#: ../libbalsa/rfc3156.c:665
 msgid ""
 "The signature is valid but the key used to verify the signature has been "
 "revoked."
 msgstr "Potpis je ispravan ali je ključ za potvrdu potpisa povučen."
 
-#: ../libbalsa/rfc3156.c:670
+#: ../libbalsa/rfc3156.c:668
 msgid "The signature is invalid."
 msgstr "Potpis nije ispravan."
 
-#: ../libbalsa/rfc3156.c:673
+#: ../libbalsa/rfc3156.c:671
 msgid "The signature could not be verified due to a missing key."
 msgstr "Potpis nije mogao da bude proveren zbog nepostojanja ključa."
 
-#: ../libbalsa/rfc3156.c:675
+#: ../libbalsa/rfc3156.c:673
 msgid "This part is not a real PGP signature."
 msgstr "Ovaj deo nije pravi PGP potpis."
 
-#: ../libbalsa/rfc3156.c:678
+#: ../libbalsa/rfc3156.c:676
 msgid "The signature could not be verified due to an invalid crypto engine."
 msgstr ""
 "Potpis nije mogao da bude proveren zbog neispravnog mehanizma šifrovanja."
 
-#: ../libbalsa/rfc3156.c:681 ../libbalsa/rfc3156.c:1044
+#: ../libbalsa/rfc3156.c:679 ../libbalsa/rfc3156.c:1042
 msgid "GnuPG is rebuilding the trust database and is currently unavailable."
 msgstr "GnuPG ponovo izgrađuje bazu poverenika i trenutno je nedostupan."
 
-#: ../libbalsa/rfc3156.c:684
+#: ../libbalsa/rfc3156.c:682
 msgid "An error prevented the signature verification."
 msgstr "Greška je sprečila proveru potpisa."
 
-#: ../libbalsa/rfc3156.c:694
+#: ../libbalsa/rfc3156.c:692
 msgid "The user ID is of unknown validity."
 msgstr "Korisnički IB je nepoznate ispravnosti."
 
-#: ../libbalsa/rfc3156.c:696
+#: ../libbalsa/rfc3156.c:694
 msgid "The validity of the user ID is undefined."
 msgstr "Ispravnost korisničkog IB-a nije određena."
 
-#: ../libbalsa/rfc3156.c:698
+#: ../libbalsa/rfc3156.c:696
 msgid "The user ID is never valid."
 msgstr "Korisnički IB nikada nije ispravan."
 
-#: ../libbalsa/rfc3156.c:700
+#: ../libbalsa/rfc3156.c:698
 msgid "The user ID is marginally valid."
 msgstr "Korisnički IB je delom ispravan."
 
-#: ../libbalsa/rfc3156.c:702
+#: ../libbalsa/rfc3156.c:700
 msgid "The user ID is fully valid."
 msgstr "Korisnički IB je u potpunosti ispravan."
 
-#: ../libbalsa/rfc3156.c:704
+#: ../libbalsa/rfc3156.c:702
 msgid "The user ID is ultimately valid."
 msgstr "Korisnički IB je uvek ispravan."
 
-#: ../libbalsa/rfc3156.c:706 ../libbalsa/rfc3156.c:728
+#: ../libbalsa/rfc3156.c:704 ../libbalsa/rfc3156.c:726
 msgid "bad validity"
 msgstr "loša ispravnost"
 
-#: ../libbalsa/rfc3156.c:718
+#: ../libbalsa/rfc3156.c:716
 msgid "undefined"
 msgstr "neodređeno"
 
-#: ../libbalsa/rfc3156.c:720 ../libbalsa/rfc3156.c:755
-#: ../src/address-book-config.c:200
+#: ../libbalsa/rfc3156.c:718 ../libbalsa/rfc3156.c:753
+#: ../src/address-book-config.c:198
 msgid "never"
 msgstr "nikad"
 
-#: ../libbalsa/rfc3156.c:722
+#: ../libbalsa/rfc3156.c:720
 msgid "marginal"
 msgstr "delom"
 
-#: ../libbalsa/rfc3156.c:724
+#: ../libbalsa/rfc3156.c:722
 msgid "full"
 msgstr "potpuno"
 
-#: ../libbalsa/rfc3156.c:726
+#: ../libbalsa/rfc3156.c:724
 msgid "ultimate"
 msgstr "uvek"
 
-#: ../libbalsa/rfc3156.c:738
+#: ../libbalsa/rfc3156.c:736
 msgid "PGP signature: "
 msgstr "PGP potpis: "
 
-#: ../libbalsa/rfc3156.c:740
+#: ../libbalsa/rfc3156.c:738
 msgid "S/MIME signature: "
 msgstr "S/MIME potpis: "
 
-#: ../libbalsa/rfc3156.c:742
+#: ../libbalsa/rfc3156.c:740
 msgid "(unknown protocol) "
 msgstr "(nepoznat protokol) "
 
-#: ../libbalsa/rfc3156.c:772
+#: ../libbalsa/rfc3156.c:770
 #, c-format
 msgid ""
 "\n"
@@ -1616,7 +1586,7 @@ msgstr ""
 "\n"
 "Ispravnost potpisa: %s"
 
-#: ../libbalsa/rfc3156.c:775
+#: ../libbalsa/rfc3156.c:773
 #, c-format
 msgid ""
 "\n"
@@ -1625,7 +1595,7 @@ msgstr ""
 "\n"
 "Potpisan: %s"
 
-#: ../libbalsa/rfc3156.c:777
+#: ../libbalsa/rfc3156.c:775
 #, c-format
 msgid ""
 "\n"
@@ -1634,7 +1604,7 @@ msgstr ""
 "\n"
 "Verovanje ključu vlasnika: %s"
 
-#: ../libbalsa/rfc3156.c:781
+#: ../libbalsa/rfc3156.c:779
 #, c-format
 msgid ""
 "\n"
@@ -1643,10 +1613,7 @@ msgstr ""
 "\n"
 "Otisak ključa: %s"
 
-#: ../libbalsa/rfc3156.c:795
-#| msgid ""
-#| "\n"
-#| "User ID: %s"
+#: ../libbalsa/rfc3156.c:793
 msgid ""
 "\n"
 "User ID's:"
@@ -1654,8 +1621,7 @@ msgstr ""
 "\n"
 "IB korisnika:"
 
-#: ../libbalsa/rfc3156.c:798
-#| msgid "User ID"
+#: ../libbalsa/rfc3156.c:796
 msgid ""
 "\n"
 "User ID:"
@@ -1663,15 +1629,15 @@ msgstr ""
 "\n"
 "IB korisnika:"
 
-#: ../libbalsa/rfc3156.c:809
+#: ../libbalsa/rfc3156.c:807
 msgid " [Revoked]"
 msgstr " [Povučen]"
 
-#: ../libbalsa/rfc3156.c:811
+#: ../libbalsa/rfc3156.c:809
 msgid " [Invalid]"
 msgstr " [Neispravan]"
 
-#: ../libbalsa/rfc3156.c:838
+#: ../libbalsa/rfc3156.c:836
 #, c-format
 msgid ""
 "\n"
@@ -1680,7 +1646,7 @@ msgstr ""
 "\n"
 "Podključ je stvoren: %s"
 
-#: ../libbalsa/rfc3156.c:840
+#: ../libbalsa/rfc3156.c:838
 #, c-format
 msgid ""
 "\n"
@@ -1689,25 +1655,25 @@ msgstr ""
 "\n"
 "Podključ ističe: %s"
 
-#: ../libbalsa/rfc3156.c:849
+#: ../libbalsa/rfc3156.c:847
 msgid " revoked"
 msgstr " povučen"
 
-#: ../libbalsa/rfc3156.c:854
+#: ../libbalsa/rfc3156.c:852
 msgid " expired"
 msgstr " istekao"
 
-#: ../libbalsa/rfc3156.c:859
+#: ../libbalsa/rfc3156.c:857
 msgid " disabled"
 msgstr " isključen"
 
-#: ../libbalsa/rfc3156.c:864
+#: ../libbalsa/rfc3156.c:862
 msgid " invalid"
 msgstr " neispravan"
 
 #. ngettext: string begins with a single space, so no space
 #. * after the colon is correct punctuation (in English).
-#: ../libbalsa/rfc3156.c:868
+#: ../libbalsa/rfc3156.c:866
 #, c-format
 msgid ""
 "\n"
@@ -1728,7 +1694,7 @@ msgstr[3] ""
 "\n"
 "Osobina podključa:%s"
 
-#: ../libbalsa/rfc3156.c:880
+#: ../libbalsa/rfc3156.c:878
 #, c-format
 msgid ""
 "\n"
@@ -1737,7 +1703,7 @@ msgstr ""
 "\n"
 "Izdavač: %s"
 
-#: ../libbalsa/rfc3156.c:884
+#: ../libbalsa/rfc3156.c:882
 #, c-format
 msgid ""
 "\n"
@@ -1746,7 +1712,7 @@ msgstr ""
 "\n"
 "Serijski broj izdavača: %s"
 
-#: ../libbalsa/rfc3156.c:887
+#: ../libbalsa/rfc3156.c:885
 #, c-format
 msgid ""
 "\n"
@@ -1755,17 +1721,13 @@ msgstr ""
 "\n"
 "IB lanca: %s"
 
-#: ../libbalsa/rfc3156.c:946
+#: ../libbalsa/rfc3156.c:944
 #, c-format
-#| msgid "Could not launch %s to get the public key %s."
 msgid "Could not launch %s to query the public key %s."
 msgstr "Ne mogu da pokrenem „%s“ da bih propitao javni ključ „%s“."
 
-#: ../libbalsa/rfc3156.c:996
+#: ../libbalsa/rfc3156.c:994
 #, c-format
-#| msgid ""
-#| "Running gpg failed with return value %d:\n"
-#| "%s"
 msgid ""
 "Running %s failed with return value %d:\n"
 "%s"
@@ -1773,11 +1735,8 @@ msgstr ""
 "Pokretanje „%s“ nije uspelo sa povratnom vrednošću „%d:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1003
+#: ../libbalsa/rfc3156.c:1001
 #, c-format
-#| msgid ""
-#| "Running gpg successful:\n"
-#| "%s"
 msgid ""
 "Running %s successful:\n"
 "%s"
@@ -1785,19 +1744,19 @@ msgstr ""
 "Pokretanje „%s“ je uspelo:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1045
+#: ../libbalsa/rfc3156.c:1043
 msgid "Try again later."
 msgstr "Pokušajte kasnije."
 
-#: ../libbalsa/send.c:253 ../libbalsa/send.c:260
+#: ../libbalsa/send.c:251 ../libbalsa/send.c:258
 msgid "Sending Mail..."
 msgstr "Šaljem poštu..."
 
-#: ../libbalsa/send.c:256 ../src/main-window.c:2876
+#: ../libbalsa/send.c:254 ../src/main-window.c:2874
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../libbalsa/send.c:951
+#: ../libbalsa/send.c:964
 #, c-format
 msgid ""
 "Could not send the message to %s:\n"
@@ -1808,12 +1767,12 @@ msgstr ""
 "%d: %s\n"
 "Poruka je zadržana u sandučetu „Odlazna“.\n"
 
-#: ../libbalsa/send.c:997
+#: ../libbalsa/send.c:1010
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Nisam uspeo da sačuvam poslatu poruku u „%s“: %s"
 
-#: ../libbalsa/send.c:1027 ../libbalsa/send.c:1039
+#: ../libbalsa/send.c:1040 ../libbalsa/send.c:1052
 #, c-format
 msgid ""
 "Relaying refused:\n"
@@ -1824,7 +1783,7 @@ msgstr ""
 "%d: %s\n"
 "Poruka je ostala u odlaznoj pošti.\n"
 
-#: ../libbalsa/send.c:1046
+#: ../libbalsa/send.c:1059
 msgid ""
 "Message submission problem, placing it into your outbox.\n"
 "System will attempt to resubmit the message until you delete it."
@@ -1832,39 +1791,39 @@ msgstr ""
 "Problem sa slanjem poruke, smeštam je u „Odlaznu“.\n"
 "Sistem će pokušavati sa ponovnim slanjem poruke sve dok je ne obrišete."
 
-#: ../libbalsa/send.c:1076
+#: ../libbalsa/send.c:1089
 msgid "Connected to MTA"
 msgstr "Povezan sam na APP"
 
 #. status code, mailbox
-#: ../libbalsa/send.c:1085
+#: ../libbalsa/send.c:1098
 #, c-format
 msgid "From: %d <%s>"
 msgstr "Šalje: %d <%s>"
 
 #. mailbox, status code, status text
-#: ../libbalsa/send.c:1089
+#: ../libbalsa/send.c:1102
 #, c-format
 msgid "From %s: %d %s"
 msgstr "Šalje %s: %d %s"
 
 #. status code, mailbox
-#: ../libbalsa/send.c:1100
+#: ../libbalsa/send.c:1113
 #, c-format
 msgid "To: %d <%s>"
 msgstr "Prima: %d <%s>"
 
 #. mailbox, status code, status text
-#: ../libbalsa/send.c:1104
+#: ../libbalsa/send.c:1117
 #, c-format
 msgid "To %s: %d %s"
 msgstr "Prima %s: %d %s"
 
-#: ../libbalsa/send.c:1142
+#: ../libbalsa/send.c:1155
 msgid "Disconnected"
 msgstr "Nepovezan"
 
-#: ../libbalsa/send.c:1424
+#: ../libbalsa/send.c:1437
 msgid ""
 "SMTP server refused connection.\n"
 "Check your internet connection."
@@ -1872,7 +1831,7 @@ msgstr ""
 "SMTP server je odbio vezu.\n"
 "Proverite vašu internet vezu."
 
-#: ../libbalsa/send.c:1429
+#: ../libbalsa/send.c:1442
 msgid ""
 "SMTP server cannot be reached.\n"
 "Check your internet connection."
@@ -1880,11 +1839,11 @@ msgstr ""
 "SMTP server ne može biti pristupljen.\n"
 "Proverite vašu internet vezu."
 
-#: ../libbalsa/send.c:1438
+#: ../libbalsa/send.c:1451
 msgid "Message left in Outbox (try again later)"
 msgstr "Ostala je poruka u sandučetu (pokušajte kasnije"
 
-#: ../libbalsa/send.c:1442
+#: ../libbalsa/send.c:1455
 #, c-format
 msgid ""
 "SMTP server problem (%d): %s\n"
@@ -1893,24 +1852,24 @@ msgstr ""
 "Problem SMTP servera (%d): %s\n"
 "Poruka je ostala u odlaznom."
 
-#: ../libbalsa/send.c:1757 ../libbalsa/send.c:1826
+#: ../libbalsa/send.c:1770 ../libbalsa/send.c:1839
 #, c-format
 msgid "Cannot read %s: %s"
 msgstr "Ne mogu da pročitam %s: %s"
 
-#: ../libbalsa/send.c:1760 ../libbalsa/send.c:1829
+#: ../libbalsa/send.c:1773 ../libbalsa/send.c:1842
 #, c-format
 msgid "Cannot read %s"
 msgstr "Ne mogu da pročitam „%s“"
 
-#: ../libbalsa/send.c:1790
+#: ../libbalsa/send.c:1803
 #, c-format
 msgid "Cannot determine charset for text file `%s'; sending as mime type `%s'"
 msgstr ""
 "Ne mogu da odredim znakovni skup za tekstualnu datoteku „%s“; šaljem kao mime "
 "vrstu „%s“"
 
-#: ../libbalsa/send.c:2142
+#: ../libbalsa/send.c:2173
 msgid "This message will not be encrypted for the BCC: recipient."
 msgid_plural "This message will not be encrypted for the BCC: recipients."
 msgstr[0] "Ova poruka neće biti šifrovana za nevidljivu kopiju: primalac."
@@ -1918,154 +1877,154 @@ msgstr[1] "Ova poruka neće biti šifrovana za nevidljivu kopiju: primaoci."
 msgstr[2] "Ova poruka neće biti šifrovana za nevidljivu kopiju: primaoci."
 msgstr[3] "Ova poruka neće biti šifrovana za nevidljivu kopiju: primalac."
 
-#: ../libbalsa/send.c:2230
+#: ../libbalsa/send.c:2261
 msgid "This message will not be encrypted for the BCC: recipient(s)."
 msgstr "Ova poruka neće biti šifrovana za nevidljivu kopiju: primalac(oci)."
 
 #. host, authentication method
-#: ../libbalsa/server.c:431
+#: ../libbalsa/server.c:429
 #, c-format
 msgid "Logging in to %s using %s"
 msgstr "Prijavljujem se na „%s“ koristeći %s"
 
-#: ../libbalsa/smtp-server.c:386 ../libbalsa/smtp-server.c:394
-#: ../src/mailbox-conf.c:210 ../src/mailbox-conf.c:1510
-#: ../src/pref-manager.c:404 ../src/pref-manager.c:3430
+#: ../libbalsa/smtp-server.c:384 ../libbalsa/smtp-server.c:392
+#: ../src/mailbox-conf.c:208 ../src/mailbox-conf.c:1508
+#: ../src/pref-manager.c:402 ../src/pref-manager.c:3428
 msgid "Never"
 msgstr "Nikad"
 
-#: ../libbalsa/smtp-server.c:388 ../libbalsa/smtp-server.c:395
-#: ../src/mailbox-conf.c:211 ../src/mailbox-conf.c:1511
+#: ../libbalsa/smtp-server.c:386 ../libbalsa/smtp-server.c:393
+#: ../src/mailbox-conf.c:209 ../src/mailbox-conf.c:1509
 msgid "If Possible"
 msgstr "Ako je moguće"
 
-#: ../libbalsa/smtp-server.c:390 ../libbalsa/smtp-server.c:396
-#: ../src/mailbox-conf.c:212
+#: ../libbalsa/smtp-server.c:388 ../libbalsa/smtp-server.c:394
+#: ../src/mailbox-conf.c:210
 msgid "Required"
 msgstr "Uvek"
 
-#: ../libbalsa/smtp-server.c:430
+#: ../libbalsa/smtp-server.c:428
 #, c-format
 msgid "Error displaying server help: %s\n"
 msgstr "Greška prikazivanja pomoći servera: %s\n"
 
-#: ../libbalsa/smtp-server.c:545
+#: ../libbalsa/smtp-server.c:543
 msgid "SMTP Server"
 msgstr "SMTP server"
 
-#: ../libbalsa/smtp-server.c:572
+#: ../libbalsa/smtp-server.c:570
 msgid "_Descriptive Name:"
 msgstr "Opisni _naziv:"
 
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:579 ../src/folder-conf.c:377
-#: ../src/mailbox-conf.c:1234 ../src/mailbox-conf.c:1347
+#: ../libbalsa/smtp-server.c:577 ../src/folder-conf.c:375
+#: ../src/mailbox-conf.c:1232 ../src/mailbox-conf.c:1345
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libbalsa/smtp-server.c:586
+#: ../libbalsa/smtp-server.c:584
 msgid "_User Name:"
 msgstr "_Korisničko ime:"
 
-#: ../libbalsa/smtp-server.c:593
+#: ../libbalsa/smtp-server.c:591
 msgid "_Pass Phrase:"
 msgstr "_Lozinka:"
 
-#: ../libbalsa/smtp-server.c:602 ../src/mailbox-conf.c:242
+#: ../libbalsa/smtp-server.c:600 ../src/mailbox-conf.c:240
 msgid "Use _TLS:"
 msgstr "Koristi _TLS:"
 
-#: ../libbalsa/smtp-server.c:607
+#: ../libbalsa/smtp-server.c:605
 msgid "C_ertificate Pass Phrase:"
 msgstr "Lozinka _uverenja:"
 
-#: ../libbalsa/smtp-server.c:619
+#: ../libbalsa/smtp-server.c:617
 msgid "Sp_lit message larger than"
 msgstr "_Podeli poruke veće od"
 
-#: ../libbalsa/smtp-server.c:625 ../src/pref-manager.c:1918
+#: ../libbalsa/smtp-server.c:623 ../src/pref-manager.c:1916
 msgid "MB"
 msgstr "MB"
 
 #. Top level
 #. Menus
-#: ../libbalsa/source-viewer.c:46 ../src/ab-main.c:553
-#: ../src/main-window.c:346 ../src/message-window.c:239
-#: ../src/sendmsg-window.c:320
+#: ../libbalsa/source-viewer.c:44 ../src/ab-main.c:551
+#: ../src/main-window.c:344 ../src/message-window.c:237
+#: ../src/sendmsg-window.c:322
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../libbalsa/source-viewer.c:47 ../src/filter-edit-dialog.c:332
-#: ../src/main-window.c:347 ../src/message-window.c:240
-#: ../src/sendmsg-window.c:321
+#: ../libbalsa/source-viewer.c:45 ../src/filter-edit-dialog.c:330
+#: ../src/main-window.c:345 ../src/message-window.c:238
+#: ../src/sendmsg-window.c:323
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../libbalsa/source-viewer.c:48 ../src/main-window.c:348
-#: ../src/message-window.c:241
+#: ../libbalsa/source-viewer.c:46 ../src/main-window.c:346
+#: ../src/message-window.c:239
 msgid "_View"
 msgstr "_Pregled"
 
 #. Items
-#: ../libbalsa/source-viewer.c:50 ../src/mailbox-node.c:1096
-#: ../src/main-window.c:521 ../src/message-window.c:248
-#: ../src/sendmsg-window.c:350
+#: ../libbalsa/source-viewer.c:48 ../src/mailbox-node.c:1094
+#: ../src/main-window.c:519 ../src/message-window.c:246
+#: ../src/sendmsg-window.c:352
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../libbalsa/source-viewer.c:51
+#: ../libbalsa/source-viewer.c:49
 msgid "Close the window"
 msgstr "Zatvorite ovaj prozor"
 
 #. Edit menu items
-#: ../libbalsa/source-viewer.c:52 ../src/main-window.c:421
-#: ../src/main-window.c:587 ../src/message-window.c:251
-#: ../src/sendmsg-window.c:358
+#: ../libbalsa/source-viewer.c:50 ../src/main-window.c:419
+#: ../src/main-window.c:585 ../src/message-window.c:249
+#: ../src/sendmsg-window.c:360
 msgid "_Copy"
 msgstr "_Umnoži"
 
-#: ../libbalsa/source-viewer.c:53
+#: ../libbalsa/source-viewer.c:51
 msgid "Copy text"
 msgstr "Umnožite izabrani tekst"
 
-#: ../libbalsa/source-viewer.c:54 ../src/main-window.c:589
+#: ../libbalsa/source-viewer.c:52 ../src/main-window.c:587
 msgid "_Select Text"
 msgstr "_Izaberi tekst"
 
-#: ../libbalsa/source-viewer.c:55 ../src/main-window.c:590
+#: ../libbalsa/source-viewer.c:53 ../src/main-window.c:588
 msgid "Select entire mail"
 msgstr "Izaberite čitavu poruku"
 
-#: ../libbalsa/source-viewer.c:60
+#: ../libbalsa/source-viewer.c:58
 msgid "_Escape Special Characters"
 msgstr "Istakni _naročite znake"
 
-#: ../libbalsa/source-viewer.c:61
+#: ../libbalsa/source-viewer.c:59
 msgid "Escape special and non-ASCII characters"
 msgstr "Istaknite naročite i ne-engleske znake"
 
-#: ../libbalsa/source-viewer.c:159
+#: ../libbalsa/source-viewer.c:157
 msgid "Mailbox closed"
 msgstr "Sanduče je zatvoreno"
 
-#: ../libbalsa/source-viewer.c:280
+#: ../libbalsa/source-viewer.c:278
 msgid "Message Source"
 msgstr "Izvor poruke"
 
-#: ../libinit_balsa/assistant_helper.c:68
+#: ../libinit_balsa/assistant_helper.c:66
 #, c-format
 msgid "Error loading %s: %s\n"
 msgstr "Greška učitavanja „%s“: %s\n"
 
-#: ../libinit_balsa/assistant_helper.c:216
+#: ../libinit_balsa/assistant_helper.c:214
 #, c-format
 msgid "The path %s must be relative to the filesystem root (start with /)."
-msgstr "Putanja „%s“ mora da se odnosi na koren sistema datoteka (počnite sa /)."
+msgstr ""
+"Putanja „%s“ mora da se odnosi na koren sistema datoteka (počnite sa /)."
 
-#: ../libinit_balsa/assistant_helper.c:228
+#: ../libinit_balsa/assistant_helper.c:226
 #, c-format
-#| msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
 msgid ""
 "Couldn't create a directory: mkdir() failed on pathname \"%s\", with error "
 "\"%s\"."
@@ -2073,20 +2032,20 @@ msgstr ""
 "Ne mogu da stvorim direktorijum: nije uspela funkcija „mkdir()“ za naziv "
 "putanje „%s“, sa greškom „%s“."
 
-#: ../libinit_balsa/assistant_helper.c:240
-#: ../libinit_balsa/assistant_helper.c:263
+#: ../libinit_balsa/assistant_helper.c:238
+#: ../libinit_balsa/assistant_helper.c:261
 #, c-format
 msgid "The file with pathname \"%s\" is not a directory."
 msgstr "Datoteka sa nazivom putanje „%s“ nije direktorijum."
 
-#: ../libinit_balsa/assistant_helper.c:254
+#: ../libinit_balsa/assistant_helper.c:252
 #, c-format
 msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
 msgstr ""
 "Ne mogu da stvorim direktorijum: nije uspela funkcija „mkdir()“ za naziv "
 "putanje „%s“."
 
-#: ../libinit_balsa/assistant_init.c:51
+#: ../libinit_balsa/assistant_init.c:49
 msgid ""
 "This will exit Balsa.\n"
 "Do you really want to do this?"
@@ -2094,69 +2053,68 @@ msgstr ""
 "Ovim će se izaći iz Balse.\n"
 "Da li zaista želite to da uradite?"
 
-#: ../libinit_balsa/assistant_init.c:74
+#: ../libinit_balsa/assistant_init.c:72
 msgid "GnomeCard Address Book"
 msgstr "Adresar Gnomove kartice"
 
-#: ../libinit_balsa/assistant_init.c:81 ../libinit_balsa/assistant_init.c:89
-#: ../src/ab-window.c:236
+#: ../libinit_balsa/assistant_init.c:79 ../libinit_balsa/assistant_init.c:87
+#: ../src/ab-window.c:234
 msgid "Address Book"
 msgstr "Adresar"
 
-#: ../libinit_balsa/assistant_init.c:148
+#: ../libinit_balsa/assistant_init.c:146
 msgid "Configure Balsa"
 msgstr "Podesite Balsu"
 
-#: ../libinit_balsa/assistant_page_defclient.c:59
-#| msgid "Use balsa as default email client?"
+#: ../libinit_balsa/assistant_page_defclient.c:57
 msgid "Use Balsa as default email client?"
 msgstr "Da koristim Balsu kao osnovni program za poštu?"
 
-#: ../libinit_balsa/assistant_page_defclient.c:63
+#: ../libinit_balsa/assistant_page_defclient.c:61
 msgid "_Yes"
 msgstr "_Da"
 
-#: ../libinit_balsa/assistant_page_defclient.c:65
+#: ../libinit_balsa/assistant_page_defclient.c:63
 msgid "_No"
 msgstr "_Ne"
 
-#: ../libinit_balsa/assistant_page_defclient.c:102
+#: ../libinit_balsa/assistant_page_defclient.c:100
 msgid "Default Client"
 msgstr "Osnovni program"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:58
 msgid "_Inbox:"
 msgstr "_Dolazna:"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:58
 msgid "_Outbox:"
 msgstr "_Odlazna:"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:58
 msgid "_Sentbox:"
 msgstr "_Poslane:"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:58
 msgid "_Draftbox:"
 msgstr "_Skice:"
 
-#: ../libinit_balsa/assistant_page_directory.c:61
+#: ../libinit_balsa/assistant_page_directory.c:59
 msgid "_Trash:"
 msgstr "Sme_će:"
 
-#: ../libinit_balsa/assistant_page_directory.c:95
+#: ../libinit_balsa/assistant_page_directory.c:93
 #, c-format
 msgid ""
 "The pathname \"%s\" must be specified canonically -- it must start with a "
 "'/'."
 msgstr "Putanja „%s“ mora da bude zadana u potpunosti – mora da počinje sa „/“."
 
-#: ../libinit_balsa/assistant_page_directory.c:161
+#: ../libinit_balsa/assistant_page_directory.c:159
 #, c-format
 msgid "The mailbox \"%s\" does not appear to be valid."
 msgstr "Sanduče „%s“ ne izgleda ispravno."
 
-#: ../libinit_balsa/assistant_page_directory.c:204
+#: ../libinit_balsa/assistant_page_directory.c:202
 msgid ""
 "Please verify the locations of your default mail files.\n"
 "These will be created if necessary."
@@ -2164,12 +2122,12 @@ msgstr ""
 "Molim proverite mesta vaših osnovnih datoteka pošte.\n"
 "One će biti stvorene po potrebi."
 
-#: ../libinit_balsa/assistant_page_directory.c:266
+#: ../libinit_balsa/assistant_page_directory.c:264
 msgid "Mail Files"
 msgstr "Datoteke pošte"
 
-#: ../libinit_balsa/assistant_page_directory.c:362
-#: ../libinit_balsa/assistant_page_directory.c:396
+#: ../libinit_balsa/assistant_page_directory.c:360
+#: ../libinit_balsa/assistant_page_directory.c:394
 #, c-format
 msgid ""
 "Problem Creating Mailboxes\n"
@@ -2178,7 +2136,7 @@ msgstr ""
 "Problem prilikom stvaranja sandučića\n"
 "%s"
 
-#: ../libinit_balsa/assistant_page_finish.c:44
+#: ../libinit_balsa/assistant_page_finish.c:42
 msgid ""
 "You've successfully set up Balsa. Have fun!\n"
 "   -- The Balsa development team"
@@ -2186,11 +2144,11 @@ msgstr ""
 "Uspešno ste podesili Balsu. Zabavite se!\n"
 "   — Razvojna ekipa Balse"
 
-#: ../libinit_balsa/assistant_page_finish.c:49
+#: ../libinit_balsa/assistant_page_finish.c:47
 msgid "All Done!"
 msgstr "Sve je urađeno!"
 
-#: ../libinit_balsa/assistant_page_user.c:57
+#: ../libinit_balsa/assistant_page_user.c:55
 msgid ""
 "The following settings are also needed (and you can find them later, if need "
 "be, in the Email application in the 'Preferences' and 'Identities' commands "
@@ -2200,7 +2158,7 @@ msgstr ""
 "bilo potrebno, u programu el. pošte u naredbama „Postavke“ i „Ličnosti“ u "
 "izborniku „Alati“)"
 
-#: ../libinit_balsa/assistant_page_user.c:63
+#: ../libinit_balsa/assistant_page_user.c:61
 msgid ""
 " Whoever provides your email account should be able to give you the "
 "following information (if you have a Network Administrator, they may already "
@@ -2210,65 +2168,64 @@ msgstr ""
 "sledeće podatke (ako imate administratora mreže, možda je on ovo već "
 "podesio):"
 
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
 msgid "Yes, remember it"
 msgstr "Da, zapamti je"
 
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
 msgid "No, type it in every time"
 msgstr "Ne, upiši je svaki put"
 
-#: ../libinit_balsa/assistant_page_user.c:103
+#: ../libinit_balsa/assistant_page_user.c:101
 msgid "Name of mail server for incoming _mail:"
 msgstr "Naziv servera pošte za dolaznu _poštu:"
 
-#: ../libinit_balsa/assistant_page_user.c:108
+#: ../libinit_balsa/assistant_page_user.c:106
 msgid "_Type of mail server:"
 msgstr "_Vrsta servera pošte:"
 
-#: ../libinit_balsa/assistant_page_user.c:112
+#: ../libinit_balsa/assistant_page_user.c:110
 msgid "Connect using _SSL:"
 msgstr "Poveži se koristeći _SSL:"
 
-#: ../libinit_balsa/assistant_page_user.c:115
+#: ../libinit_balsa/assistant_page_user.c:113
 msgid "Your email _login name:"
 msgstr "Vaše ime za _prijavljivanje:"
 
-#: ../libinit_balsa/assistant_page_user.c:118
+#: ../libinit_balsa/assistant_page_user.c:116
 msgid "Your _password:"
 msgstr "Vaša _lozinka:"
 
-#: ../libinit_balsa/assistant_page_user.c:126
+#: ../libinit_balsa/assistant_page_user.c:124
 msgid "_SMTP Server:"
 msgstr "_SMTP server:"
 
 #. 2.1
-#: ../libinit_balsa/assistant_page_user.c:131
+#: ../libinit_balsa/assistant_page_user.c:129
 msgid "Your real _name:"
 msgstr "Vaše pravo _ime:"
 
-#: ../libinit_balsa/assistant_page_user.c:137
+#: ../libinit_balsa/assistant_page_user.c:135
 msgid "Your _Email Address, for this email account:"
 msgstr "Vaša adresa _el. pošte, za ovaj nalog:"
 
-#: ../libinit_balsa/assistant_page_user.c:142
+#: ../libinit_balsa/assistant_page_user.c:140
 msgid "_Remember your password:"
 msgstr "_Zapamtite vašu lozinku:"
 
-#: ../libinit_balsa/assistant_page_user.c:148
+#: ../libinit_balsa/assistant_page_user.c:146
 msgid "_Local mail directory:"
 msgstr "_Mesni direktorijum pošte:"
 
-#: ../libinit_balsa/assistant_page_user.c:167
+#: ../libinit_balsa/assistant_page_user.c:165
 msgid "User Settings"
 msgstr "Korisnička podešavanja"
 
-#: ../libinit_balsa/assistant_page_user.c:289
-#| msgid "Select Identity"
+#: ../libinit_balsa/assistant_page_user.c:287
 msgid "Default Identity"
 msgstr "Osnovna ličnost"
 
-#: ../libinit_balsa/assistant_page_user.c:334
+#: ../libinit_balsa/assistant_page_user.c:332
 #, c-format
 msgid ""
 "Local Mail Problem\n"
@@ -2277,11 +2234,11 @@ msgstr ""
 "Problem sa mesnom poštom\n"
 "%s"
 
-#: ../libinit_balsa/assistant_page_welcome.c:29
+#: ../libinit_balsa/assistant_page_welcome.c:27
 msgid "Welcome to Balsa!"
 msgstr "Dobrodošli u Balsu!"
 
-#: ../libinit_balsa/assistant_page_welcome.c:32
+#: ../libinit_balsa/assistant_page_welcome.c:30
 msgid ""
 "Before you can send or receive email:\n"
 "\n"
@@ -2313,161 +2270,158 @@ msgstr "Pokretanje programa"
 msgid "New mail notification"
 msgstr "Obaveštenje o novoj pošti"
 
-#: ../src/ab-main.c:228 ../src/ab-window.c:702
+#: ../src/ab-main.c:226 ../src/ab-window.c:700
 msgid " address book: "
 msgstr " adresar: "
 
-#: ../src/ab-main.c:554
+#: ../src/ab-main.c:552
 msgid "_Entry"
 msgstr "_Unos"
 
-#: ../src/ab-main.c:555 ../src/main-window.c:352
+#: ../src/ab-main.c:553 ../src/main-window.c:350
 msgid "_Help"
 msgstr "_Pomoć"
 
 #. new button
-#: ../src/ab-main.c:556 ../src/filter-edit-dialog.c:237
-#: ../src/mailbox-node.c:1061 ../src/main-window.c:354
-#: ../src/main-window.c:609 ../src/main-window.c:618
+#: ../src/ab-main.c:554 ../src/filter-edit-dialog.c:235
+#: ../src/mailbox-node.c:1059 ../src/main-window.c:352
+#: ../src/main-window.c:607 ../src/main-window.c:616
 msgid "_New"
 msgstr "_Nova"
 
-#: ../src/ab-main.c:557 ../src/address-book-config.c:868
+#: ../src/ab-main.c:555 ../src/address-book-config.c:866
 msgid "VCard Address Book (GnomeCard)"
 msgstr "Adresar Vkartice (Gnomova kartica)"
 
-#: ../src/ab-main.c:559 ../src/address-book-config.c:874
+#: ../src/ab-main.c:557 ../src/address-book-config.c:872
 msgid "External query (a program)"
 msgstr "Spoljašnji upit (program)"
 
-#: ../src/ab-main.c:561 ../src/address-book-config.c:879
+#: ../src/ab-main.c:559 ../src/address-book-config.c:877
 msgid "LDIF Address Book"
 msgstr "LDIF adresar"
 
-#: ../src/ab-main.c:564 ../src/address-book-config.c:885
+#: ../src/ab-main.c:562 ../src/address-book-config.c:883
 msgid "LDAP Address Book"
 msgstr "LDAP adresar"
 
-#: ../src/ab-main.c:568 ../src/address-book-config.c:507
-#: ../src/address-book-config.c:892
+#: ../src/ab-main.c:566 ../src/address-book-config.c:505
+#: ../src/address-book-config.c:890
 msgid "GPE Address Book"
 msgstr "GPE adresar"
 
-#: ../src/ab-main.c:572
-#| msgid "Address Book"
+#: ../src/ab-main.c:570
 msgid "Rubrica Address Book"
 msgstr "Adresar rubrike"
 
-#: ../src/ab-main.c:575
+#: ../src/ab-main.c:573
 msgid "_Properties"
 msgstr "_Svojstva"
 
-#: ../src/ab-main.c:576
+#: ../src/ab-main.c:574
 msgid "Edit address book properties"
 msgstr "Uredite svojstva adresara"
 
-#: ../src/ab-main.c:577 ../src/balsa-index.c:1911
-#: ../src/filter-edit-dialog.c:243 ../src/mailbox-node.c:1088
-#: ../src/mailbox-node.c:1104 ../src/pref-manager.c:1716
-#: ../src/pref-manager.c:1791 ../src/pref-manager.c:2968
+#: ../src/ab-main.c:575 ../src/balsa-index.c:1909
+#: ../src/filter-edit-dialog.c:241 ../src/mailbox-node.c:1086
+#: ../src/mailbox-node.c:1102 ../src/pref-manager.c:1714
+#: ../src/pref-manager.c:1789 ../src/pref-manager.c:2966
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: ../src/ab-main.c:578
-#| msgid "Open the address book"
+#: ../src/ab-main.c:576
 msgid "Delete address book"
 msgstr "Obrišite adresar"
 
-#: ../src/ab-main.c:579 ../src/main-window.c:389
+#: ../src/ab-main.c:577 ../src/main-window.c:387
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/ab-main.c:579
+#: ../src/ab-main.c:577
 msgid "Exit the program"
 msgstr "Napustite program"
 
-#: ../src/ab-main.c:581
+#: ../src/ab-main.c:579
 msgid "_New Entry"
 msgstr "_Novi unos"
 
-#: ../src/ab-main.c:582
+#: ../src/ab-main.c:580
 msgid "Add new entry"
 msgstr "Dodajte novi unos"
 
-#: ../src/ab-main.c:583
+#: ../src/ab-main.c:581
 msgid "_Delete Entry"
 msgstr "_Obriši unos"
 
-#: ../src/ab-main.c:584
+#: ../src/ab-main.c:582
 msgid "Delete entry"
 msgstr "Obrišite unos"
 
-#: ../src/ab-main.c:585 ../src/main-window.c:481
+#: ../src/ab-main.c:583 ../src/main-window.c:479
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/ab-main.c:817
+#: ../src/ab-main.c:815
 msgid "_Name"
 msgstr "_Naziv"
 
-#: ../src/ab-main.c:833
+#: ../src/ab-main.c:831
 msgid "_Address"
 msgstr "_Adresa"
 
-#: ../src/ab-main.c:959
+#: ../src/ab-main.c:957
 msgid "F_ilter:"
 msgstr "_Propusnik:"
 
-#: ../src/ab-window.c:172 ../src/filter-edit-dialog.c:220
-#: ../src/filter-export-dialog.c:92 ../src/filter-run-dialog.c:223
-#: ../src/filter-run-dialog.c:297
+#: ../src/ab-window.c:170 ../src/filter-edit-dialog.c:218
+#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:221
+#: ../src/filter-run-dialog.c:295
 msgid "Name"
 msgstr "Naziv"
 
-#: ../src/ab-window.c:180
+#: ../src/ab-window.c:178
 msgid "E-Mail Address"
 msgstr "Adresa el. pošte"
 
 #. -- table column 1 --
 #. Entry widget for finding an address
-#: ../src/ab-window.c:292
+#: ../src/ab-window.c:290
 msgid "_Search for Name:"
 msgstr "_Traži ime:"
 
-#: ../src/ab-window.c:327
+#: ../src/ab-window.c:325
 msgid "Run Editor"
 msgstr "Pokreni uređivača"
 
-#: ../src/ab-window.c:334
+#: ../src/ab-window.c:332
 msgid "_Re-Import"
 msgstr "_Ponovo uvezi"
 
 #. -- table column 3 --
 #. label for selected addresses in compose mode
-#: ../src/ab-window.c:366
+#: ../src/ab-window.c:364
 msgid "Send-To"
 msgstr "Pošalji"
 
 #. mode switching stuff
-#: ../src/ab-window.c:381
+#: ../src/ab-window.c:379
 msgid "Treat multiple addresses as:"
 msgstr "Smatraj više adresa kao:"
 
-#: ../src/ab-window.c:385
+#: ../src/ab-window.c:383
 msgid "alternative addresses for the same person"
 msgstr "alternativne adrese iste osobe"
 
-#: ../src/ab-window.c:390
+#: ../src/ab-window.c:388
 msgid "a distribution list"
 msgstr "spisak primalaca"
 
-#: ../src/ab-window.c:433
+#: ../src/ab-window.c:431
 #, c-format
-#| msgid "Could not save %s: %s"
 msgid "Could not launch %s: %s"
 msgstr "Ne mogu da pokrenem %s: %s"
 
-#: ../src/ab-window.c:730
+#: ../src/ab-window.c:728
 #, c-format
 msgid ""
 "Error opening address book '%s':\n"
@@ -2476,107 +2430,99 @@ msgstr ""
 "Greška otvaranja adresara „%s“\n"
 "%s"
 
-#: ../src/address-book-config.c:177
-#| msgid "Treat multiple addresses as:"
+#: ../src/address-book-config.c:175
 msgid "Suggest complete addresses:"
 msgstr "Predloži završene adrese:"
 
-#: ../src/address-book-config.c:183
+#: ../src/address-book-config.c:181
 msgid "as I type"
 msgstr "kada kucam"
 
-#: ../src/address-book-config.c:192
+#: ../src/address-book-config.c:190
 msgid "when I hit the Escape key"
 msgstr "kada pritisnem taster „Eskejp“"
 
-#: ../src/address-book-config.c:229 ../src/address-book-config.c:330
+#: ../src/address-book-config.c:227 ../src/address-book-config.c:328
 #, c-format
-#| msgid "Modify Address Book"
 msgid "Modify %s Address Book"
 msgstr "Izmeni adresar „%s“"
 
-#: ../src/address-book-config.c:233 ../src/address-book-config.c:333
+#: ../src/address-book-config.c:231 ../src/address-book-config.c:331
 #, c-format
-#| msgid "Add Address Book"
 msgid "Add %s Address Book"
 msgstr "Dodaj adresar „%s“"
 
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:253 ../src/address-book-config.c:372
-#: ../src/address-book-config.c:438 ../src/address-book-config.c:505
-#| msgid "A_ddress Book Name"
+#: ../src/address-book-config.c:251 ../src/address-book-config.c:370
+#: ../src/address-book-config.c:436 ../src/address-book-config.c:503
 msgid "A_ddress Book Name:"
 msgstr "Naziv _adresara:"
 
-#: ../src/address-book-config.c:377
-#| msgid "Load program location"
+#: ../src/address-book-config.c:375
 msgid "Load program location:"
 msgstr "Mesto programa za učitavanje:"
 
-#: ../src/address-book-config.c:383
+#: ../src/address-book-config.c:381
 msgid "Select load program for address book"
 msgstr "Izaberite program za učitavanje adresara"
 
-#: ../src/address-book-config.c:390
-#| msgid "Save program location"
+#: ../src/address-book-config.c:388
 msgid "Save program location:"
 msgstr "Mesto programa za čuvanje:"
 
-#: ../src/address-book-config.c:396
+#: ../src/address-book-config.c:394
 msgid "Select save program for address book"
 msgstr "Izaberite program za čuvanje adresara"
 
-#: ../src/address-book-config.c:443
+#: ../src/address-book-config.c:441
 msgid "_Host Name"
 msgstr "_Naziv domaćina"
 
-#: ../src/address-book-config.c:448
+#: ../src/address-book-config.c:446
 msgid "Base Domain _Name"
 msgstr "Osnovni naziv _domena"
 
-#: ../src/address-book-config.c:453
+#: ../src/address-book-config.c:451
 msgid "_User Name (Bind DN)"
 msgstr "_Korisničko ime (Bind DN)"
 
-#: ../src/address-book-config.c:458
+#: ../src/address-book-config.c:456
 msgid "_Password"
 msgstr "_Lozinka"
 
-#: ../src/address-book-config.c:464
+#: ../src/address-book-config.c:462
 msgid "_User Address Book DN"
 msgstr "DN _korisničkog adresara"
 
-#: ../src/address-book-config.c:470
+#: ../src/address-book-config.c:468
 msgid "Enable _TLS"
 msgstr "Uključi _TLS"
 
-#: ../src/address-book-config.c:538 ../src/main-window.c:2721
-#: ../src/main-window.c:4486
+#: ../src/address-book-config.c:536 ../src/main-window.c:2719
+#: ../src/main-window.c:4484
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Greška prikazivanja pomoći: %s\n"
 
-#: ../src/address-book-config.c:615
+#: ../src/address-book-config.c:613
 msgid "No path found.  Do you want to give one?"
 msgstr "Nisam pronašao putanju.  Da li želite da date neku?"
 
-#: ../src/address-book-config.c:899
-#| msgid "Address Book"
+#: ../src/address-book-config.c:897
 msgid "Rubrica2 Address Book"
 msgstr "Adresar Rubrike2"
 
-#: ../src/balsa-app.c:79 ../src/folder-conf.c:276 ../src/mailbox-conf.c:1328
-#| msgid "_Remember password"
+#: ../src/balsa-app.c:77 ../src/folder-conf.c:274 ../src/mailbox-conf.c:1326
 msgid "_Remember password in keyring"
 msgstr "_Zapamti lozinku u privesku ključeva"
 
-#: ../src/balsa-app.c:82 ../src/folder-conf.c:279 ../src/mailbox-conf.c:1331
+#: ../src/balsa-app.c:80 ../src/folder-conf.c:277 ../src/mailbox-conf.c:1329
 msgid "_Remember password"
 msgstr "_Zapamti lozinku"
 
-#: ../src/balsa-app.c:88
+#: ../src/balsa-app.c:86
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -2585,95 +2531,94 @@ msgstr ""
 "Otvaram udaljeno sanduče %s.\n"
 "_Lozinka za „%s %s“:"
 
-#: ../src/balsa-app.c:93
+#: ../src/balsa-app.c:91
 #, c-format
-#| msgid "Mailbox _password for %s %s:"
 msgid "_Password for %s %s (%s):"
 msgstr "_Lozinka za „%s %s“ (%s):"
 
-#: ../src/balsa-app.c:96
+#: ../src/balsa-app.c:94
 msgid "Password needed"
 msgstr "Neophodna je lozinka"
 
-#: ../src/balsa-app.c:551
+#: ../src/balsa-app.c:549
 #, c-format
 msgid "Couldn't open mailbox \"%s\""
 msgstr "Ne mogu da otvorim sanduče „%s“"
 
-#: ../src/balsa-index.c:392 ../src/pref-manager.c:419
+#: ../src/balsa-index.c:390 ../src/pref-manager.c:417
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/balsa-index.c:407 ../src/pref-manager.c:420
-#: ../src/sendmsg-window.c:3039
+#: ../src/balsa-index.c:405 ../src/pref-manager.c:418
+#: ../src/sendmsg-window.c:3048
 msgid "Size"
 msgstr "Veličina"
 
-#: ../src/balsa-index.c:1726
+#: ../src/balsa-index.c:1724
 #, c-format
 msgid "Move to Trash failed: %s"
 msgstr "Premeštanje u smeće nije uspelo: %s"
 
 #. Message menu items
-#: ../src/balsa-index.c:1884 ../src/main-window.c:537
-#: ../src/message-window.c:268
+#: ../src/balsa-index.c:1882 ../src/main-window.c:535
+#: ../src/message-window.c:266
 msgid "_Reply..."
 msgstr "_Odgovori..."
 
-#: ../src/balsa-index.c:1886
+#: ../src/balsa-index.c:1884
 msgid "Reply To _All..."
 msgstr "Odgovori _svima..."
 
-#: ../src/balsa-index.c:1888
+#: ../src/balsa-index.c:1886
 msgid "Reply To _Group..."
 msgstr "Odgovori _grupi..."
 
-#: ../src/balsa-index.c:1890
+#: ../src/balsa-index.c:1888
 msgid "_Forward Attached..."
 msgstr "_Prosledi kao prilog..."
 
-#: ../src/balsa-index.c:1892
+#: ../src/balsa-index.c:1890
 msgid "Forward _Inline..."
 msgstr "Prosledi u _telu poruke..."
 
-#: ../src/balsa-index.c:1894 ../src/main-window.c:564
+#: ../src/balsa-index.c:1892 ../src/main-window.c:562
 msgid "_Pipe through..."
 msgstr "_Prespoj..."
 
-#: ../src/balsa-index.c:1896 ../src/main-window.c:544
+#: ../src/balsa-index.c:1894 ../src/main-window.c:542
 msgid "_Store Address..."
 msgstr "_Uskladišti adresu..."
 
-#: ../src/balsa-index.c:1916
+#: ../src/balsa-index.c:1914
 msgid "_Undelete"
 msgstr "_Poništi brisanje"
 
-#: ../src/balsa-index.c:1921
+#: ../src/balsa-index.c:1919
 msgid "Move To _Trash"
 msgstr "Premesti u _smeće"
 
-#: ../src/balsa-index.c:1925
+#: ../src/balsa-index.c:1923
 msgid "T_oggle"
 msgstr "_Promeni"
 
 #. Message:toggle-flag submenu items
-#: ../src/balsa-index.c:1929 ../src/main-window.c:614 ../src/main-window.c:659
+#: ../src/balsa-index.c:1927 ../src/main-window.c:612 ../src/main-window.c:657
 msgid "_Flagged"
 msgstr "_Označeno"
 
-#: ../src/balsa-index.c:1932
+#: ../src/balsa-index.c:1930
 msgid "_Unread"
 msgstr "_Nepročitano"
 
-#: ../src/balsa-index.c:1940
+#: ../src/balsa-index.c:1938
 msgid "_Move to"
 msgstr "_Premesti"
 
-#: ../src/balsa-index.c:1948
+#: ../src/balsa-index.c:1946
 msgid "_View Source"
 msgstr "_Pogledaj izvor"
 
-#: ../src/balsa-index.c:2193
+#: ../src/balsa-index.c:2191
 #, c-format
 msgid "Failed to copy %d message to mailbox \"%s\": %s"
 msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
@@ -2682,224 +2627,216 @@ msgstr[1] "Nisam uspeo da umnožim %d poruke u sanduče „%s“: %s"
 msgstr[2] "Nisam uspeo da umnožim %d poruka u sanduče „%s“: %s"
 msgstr[3] "Nisam uspeo da umnožim %d poruku u sanduče „%s“: %s"
 
-#: ../src/balsa-index.c:2205
+#: ../src/balsa-index.c:2203
 #, c-format
 msgid "Copied to \"%s\"."
 msgstr "Umnoženo je u „%s“."
 
-#: ../src/balsa-index.c:2206
+#: ../src/balsa-index.c:2204
 #, c-format
 msgid "Moved to \"%s\"."
 msgstr "Premešteno je u „%s“."
 
-#: ../src/balsa-index.c:2308
+#: ../src/balsa-index.c:2306
 #, c-format
 msgid "Committing mailbox %s failed."
 msgstr "Nisam uspeo da pošaljem sanduče „%s“."
 
-#: ../src/balsa-index.c:2406
+#: ../src/balsa-index.c:2404
 #, c-format
-#| msgid "Cannot access the message's body\n"
 msgid "Cannot process the message: %s"
 msgstr "Ne mogu da obradim poruku: %s"
 
-#: ../src/balsa-index.c:2529
+#: ../src/balsa-index.c:2527
 #, c-format
-#| msgid "Cannot access the message's body\n"
 msgid "Cannot access message %u to pass to %s"
 msgstr "Ne mogu da pristupim poruci „%u“ da bih prošao u %s"
 
-#: ../src/balsa-index.c:2556
+#: ../src/balsa-index.c:2554
 #, c-format
 msgid "Cannot read message %u to pass to %s"
 msgstr "Ne mogu da pročitam poruku „%u“ da bih prošao u %s"
 
-#: ../src/balsa-index.c:2725
+#: ../src/balsa-index.c:2723
 msgid "Pipe message through a program"
 msgstr "Prosledi poruku kroz program"
 
-#: ../src/balsa-index.c:2728
+#: ../src/balsa-index.c:2726
 msgid "_Run"
 msgstr "_Pokreni"
 
-#: ../src/balsa-index.c:2740
+#: ../src/balsa-index.c:2738
 msgid "Specify the program to run:"
 msgstr "Navedite program za pokretanje:"
 
-#: ../src/balsa-mblist.c:364
+#: ../src/balsa-mblist.c:362
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: ../src/balsa-mblist.c:1144 ../src/balsa-mblist.c:1194
+#: ../src/balsa-mblist.c:1142 ../src/balsa-mblist.c:1192
 msgid "Failed to find mailbox"
 msgstr "Nisam uspeo da pronađem sanduče"
 
-#: ../src/balsa-mblist.c:1780
+#: ../src/balsa-mblist.c:1778
 msgid "_Other..."
 msgstr "_Drugo..."
 
-#: ../src/balsa-mblist.c:1848
+#: ../src/balsa-mblist.c:1846
 msgid "Choose destination folder"
 msgstr "Izaberite odredišnu fasciklu"
 
-#: ../src/balsa-mblist.c:2061
+#: ../src/balsa-mblist.c:2059
 msgid "Other..."
 msgstr "Drugo..."
 
-#: ../src/balsa-message.c:303
+#: ../src/balsa-message.c:301
 msgid "Check cryptographic signature"
 msgstr "Proveri kriptografski potpis"
 
-#: ../src/balsa-message.c:324
+#: ../src/balsa-message.c:322
 msgid "Select message part to display"
 msgstr "Izaberi deo poruke za prikazivanje"
 
-#: ../src/balsa-message.c:411
-#| msgid "_Wrap"
+#: ../src/balsa-message.c:409
 msgid "Wrapped"
 msgstr "Prelomljeno"
 
-#: ../src/balsa-message.c:415
-#| msgid "Host not found"
+#: ../src/balsa-message.c:413
 msgid "Not found"
 msgstr "Nisam pronašao"
 
-#: ../src/balsa-message.c:604
-#| msgid "Fwd:"
+#: ../src/balsa-message.c:602
 msgid "Find:"
 msgstr "Pronađi:"
 
-#: ../src/balsa-message.c:617 ../src/toolbar-factory.c:142
+#: ../src/balsa-message.c:615 ../src/toolbar-factory.c:140
 msgid "Previous"
 msgstr "Prethodnu"
 
-#: ../src/balsa-message.c:625 ../src/toolbar-factory.c:143
+#: ../src/balsa-message.c:623 ../src/toolbar-factory.c:141
 msgid "Next"
 msgstr "Sledeću"
 
-#: ../src/balsa-message.c:714
+#: ../src/balsa-message.c:712
 msgid "Content"
 msgstr "Sadržaj"
 
-#: ../src/balsa-message.c:807
+#: ../src/balsa-message.c:805
 msgid "Message parts"
 msgstr "Delovi poruke"
 
-#: ../src/balsa-message.c:983
+#: ../src/balsa-message.c:981
 msgid "Save selected as..."
 msgstr "Sačuvaj izabrano kao..."
 
-#: ../src/balsa-message.c:990
+#: ../src/balsa-message.c:988
 msgid "Save selected to folder..."
 msgstr "Sačuvaj izabrano u fasciklu..."
 
-#: ../src/balsa-message.c:1083
+#: ../src/balsa-message.c:1081
 msgid "(No sender)"
 msgstr "(nema pošiljaoca)"
 
-#: ../src/balsa-message.c:1137 ../src/balsa-message.c:1149
+#: ../src/balsa-message.c:1135 ../src/balsa-message.c:1147
 #, c-format
 msgid "Could not access message %u in mailbox \"%s\"."
 msgstr "Ne mogu da pristupim poruci „%u“ u sandučetu „%s“."
 
-#: ../src/balsa-message.c:1323
+#: ../src/balsa-message.c:1321
 msgid "mixed parts"
 msgstr "izmešani delovi"
 
-#: ../src/balsa-message.c:1325
+#: ../src/balsa-message.c:1323
 msgid "alternative parts"
 msgstr "dopunski delovi"
 
-#: ../src/balsa-message.c:1327
+#: ../src/balsa-message.c:1325
 msgid "signed parts"
 msgstr "potpisani delovi"
 
-#: ../src/balsa-message.c:1329
+#: ../src/balsa-message.c:1327
 msgid "encrypted parts"
 msgstr "šifrovani delovi"
 
-#: ../src/balsa-message.c:1331
+#: ../src/balsa-message.c:1329
 msgid "rfc822 message"
 msgstr "rfc822 poruka"
 
-#: ../src/balsa-message.c:1333
+#: ../src/balsa-message.c:1331
 #, c-format
 msgid "\"%s\" parts"
 msgstr "„%s“ delovi"
 
-#: ../src/balsa-message.c:1381
+#: ../src/balsa-message.c:1379
 msgid "force inline for all parts"
 msgstr "prisili unutrašnje za sve delove"
 
-#: ../src/balsa-message.c:1424
+#: ../src/balsa-message.c:1422
 #, c-format
 msgid "rfc822 message (from %s, subject \"%s\")"
 msgstr "rfc822 poruka (šalje %s, tema „%s“)"
 
-#: ../src/balsa-message.c:1436
+#: ../src/balsa-message.c:1434
 msgid "complete message"
 msgstr "celokupna poruka"
 
-#: ../src/balsa-message.c:1453
+#: ../src/balsa-message.c:1451
 #, c-format
 msgid "part %s: %s (file %s)"
 msgstr "deo %s: %s (datoteka %s)"
 
-#: ../src/balsa-message.c:1464
+#: ../src/balsa-message.c:1462
 #, c-format
 msgid "part %s: %s"
 msgstr "deo %s: %s"
 
-#: ../src/balsa-message.c:1479
+#: ../src/balsa-message.c:1477
 msgid "encrypted: "
 msgstr "šifrovano: "
 
-#: ../src/balsa-message.c:1616
+#: ../src/balsa-message.c:1614
 #, c-format
 msgid "Reading embedded message failed: %s"
 msgstr "Nisam uspeo da pročitam ugrađenu poruku: %s"
 
-#: ../src/balsa-message.c:1624
+#: ../src/balsa-message.c:1622
 #, c-format
 msgid "Appending message to %s failed: %s"
 msgstr "Nisam uspeo da prikačim poruku u „%s“: %s"
 
-#: ../src/balsa-message.c:1653
-#| msgid "Save..."
+#: ../src/balsa-message.c:1651
 msgid "_Save..."
 msgstr "_Sačuvaj..."
 
-#: ../src/balsa-message.c:1662 ../src/balsa-mime-widget-message.c:458
-#| msgid "Copy to folder:"
+#: ../src/balsa-message.c:1660 ../src/balsa-mime-widget-message.c:467
 msgid "_Copy to folder..."
 msgstr "_Umnoži u fasciklu..."
 
-#: ../src/balsa-message.c:1745
+#: ../src/balsa-message.c:1743
 msgid "Select folder for saving selected parts"
 msgstr "Izaberite fasciklu za čuvanje izabranih delova"
 
-#: ../src/balsa-message.c:1769
+#: ../src/balsa-message.c:1767
 #, c-format
 msgid "Could not create URI for %s"
 msgstr "Ne mogu da napravim putanju za „%s“"
 
-#: ../src/balsa-message.c:1794
+#: ../src/balsa-message.c:1792
 #, c-format
 msgid "%s message part"
 msgstr "%s dela poruke"
 
-#: ../src/balsa-message.c:1827 ../src/balsa-mime-widget-callbacks.c:165
+#: ../src/balsa-message.c:1825 ../src/balsa-mime-widget-callbacks.c:163
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "Ne mogu da sačuvam %s: %s"
 
-#: ../src/balsa-message.c:2486 ../src/balsa-message.c:2630
+#: ../src/balsa-message.c:2484 ../src/balsa-message.c:2628
 #, c-format
-#| msgid "Message Disposition Notification Requests"
 msgid "Sending the disposition notification failed: %s"
 msgstr "Nisam uspeo da pošaljem obaveštenje o prispeću: %s"
 
-#: ../src/balsa-message.c:2583
+#: ../src/balsa-message.c:2581
 #, c-format
 msgid ""
 "The sender of this mail, %s, requested \n"
@@ -2910,11 +2847,11 @@ msgstr ""
 "obaveštenje o prispeću poruke (OPP) bude vraćeno na „%s“.\n"
 "Da li želite da pošaljete ovo obaveštenje?"
 
-#: ../src/balsa-message.c:2593
+#: ../src/balsa-message.c:2591
 msgid "Reply to MDN?"
 msgstr "Da odgovorim na OPP?"
 
-#: ../src/balsa-message.c:2804
+#: ../src/balsa-message.c:2802
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once.\n"
@@ -2924,18 +2861,18 @@ msgstr ""
 "puta.\n"
 "Molim zatvorite ostale primerke ove poruke i pokušajte opet."
 
-#: ../src/balsa-message.c:2825 ../src/balsa-message.c:2910
-#: ../src/balsa-message.c:3032
+#: ../src/balsa-message.c:2823 ../src/balsa-message.c:2908
+#: ../src/balsa-message.c:3030
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Nisam uspeo da obradim deo poruke: %s"
 
-#: ../src/balsa-message.c:2826 ../src/balsa-message.c:2911
-#: ../src/balsa-message.c:3033
+#: ../src/balsa-message.c:2824 ../src/balsa-message.c:2909
+#: ../src/balsa-message.c:3031
 msgid "Possible disk space problem."
 msgstr "Moguće je da nedostaje prostor na disku."
 
-#: ../src/balsa-message.c:2840
+#: ../src/balsa-message.c:2838
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains an encrypted part, but "
@@ -2944,7 +2881,7 @@ msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži šifrovani deo, ali je njena "
 "struktura neispravna."
 
-#: ../src/balsa-message.c:2848
+#: ../src/balsa-message.c:2846
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
@@ -2953,7 +2890,7 @@ msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži PGP šifrovani deo, ali ovaj "
 "protokol šifrovanja nije dostupan."
 
-#: ../src/balsa-message.c:2861
+#: ../src/balsa-message.c:2859
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a S/MIME encrypted part, "
@@ -2962,7 +2899,7 @@ msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži S/MIME šifrovani deo, ali ovaj "
 "protokol šifrovanja nije dostupan."
 
-#: ../src/balsa-message.c:2928
+#: ../src/balsa-message.c:2926
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a signed part, but its "
@@ -2971,7 +2908,7 @@ msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži deo sa potpisom, ali je "
 "struktura neispravna. Potpis, ako uopšte postoji, se ne može proveriti."
 
-#: ../src/balsa-message.c:2941
+#: ../src/balsa-message.c:2939
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a %s signed part, but "
@@ -2980,28 +2917,28 @@ msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži „%s“ potpisani deo, ali ovaj "
 "protokol šifrovanja nije dostupan."
 
-#: ../src/balsa-message.c:2944
+#: ../src/balsa-message.c:2942
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/balsa-message.c:2944 ../src/balsa-mime-widget-crypto.c:78
-#: ../src/print-gtk.c:201
+#: ../src/balsa-message.c:2942 ../src/balsa-mime-widget-crypto.c:76
+#: ../src/print-gtk.c:199
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: ../src/balsa-message.c:2968 ../src/balsa-message.c:3095
+#: ../src/balsa-message.c:2966 ../src/balsa-message.c:3093
 msgid "Detected a good signature"
 msgstr "Otkrio sam dobar potpis"
 
-#: ../src/balsa-message.c:2974
+#: ../src/balsa-message.c:2972
 msgid "Detected a good signature with insufficient validity"
 msgstr "Prepoznao sam ispravan potpis sa nedovoljno ispravnosti"
 
-#: ../src/balsa-message.c:2979 ../src/balsa-message.c:3099
+#: ../src/balsa-message.c:2977 ../src/balsa-message.c:3097
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr "Prepoznao sam ispravan potpis sa nedovoljno ispravnosti/poverenja"
 
-#: ../src/balsa-message.c:2986 ../src/balsa-message.c:3105
+#: ../src/balsa-message.c:2984 ../src/balsa-message.c:3103
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" "
@@ -3011,7 +2948,7 @@ msgstr ""
 "Provera potpisa poruke koju je poslao %s sa temom „%s“ je vratilo:\n"
 "%s"
 
-#: ../src/balsa-message.c:2998
+#: ../src/balsa-message.c:2996
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" failed "
@@ -3020,15 +2957,14 @@ msgstr ""
 "Provera potpisa poruke koju je poslao %s sa temom „%s“ nije uspela i vratila "
 "je grešku!"
 
-#: ../src/balsa-message.c:3057
+#: ../src/balsa-message.c:3055
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once."
 msgstr ""
-"Dešifrovanje ne može biti obavljeno zato što je ova poruka prikazana više "
-"puta."
+"Dešifrovanje ne može biti obavljeno zato što je ova poruka prikazana više puta."
 
-#: ../src/balsa-message.c:3059
+#: ../src/balsa-message.c:3057
 msgid ""
 "The signature check and removal of the OpenPGP armor cannot be performed "
 "because this message is displayed more than once."
@@ -3036,67 +2972,64 @@ msgstr ""
 "Provera potpisa i uklanjanje OpenPGP oklopa ne može biti obavljeno zato što je "
 "ova poruka prikazana više puta."
 
-#: ../src/balsa-message.c:3062
+#: ../src/balsa-message.c:3060
 msgid "Please close the other instances of this message and try again."
 msgstr "Molim zatvorite ostale primerke ove poruke i pokušajte opet."
 
-#: ../src/balsa-mime-widget.c:237 ../src/balsa-mime-widget-message.c:163
-#: ../src/balsa-mime-widget-message.c:209
+#: ../src/balsa-mime-widget.c:236 ../src/balsa-mime-widget-message.c:172
+#: ../src/balsa-mime-widget-message.c:218
 #, c-format
 msgid "File name: %s"
 msgstr "Naziv datoteke: %s"
 
-#: ../src/balsa-mime-widget.c:256
+#: ../src/balsa-mime-widget.c:255
 #, c-format
 msgid "Error reading message part: %s"
 msgstr "Greška čitanja dela poruke: %s"
 
-#: ../src/balsa-mime-widget.c:280
+#: ../src/balsa-mime-widget.c:279
 #, c-format
 msgid "Type: %s (%s)"
 msgstr "Vrsta: %s (%s)"
 
-#: ../src/balsa-mime-widget.c:284
+#: ../src/balsa-mime-widget.c:283
 #, c-format
 msgid "Content Type: %s"
 msgstr "Vrsta sadržaja: %s"
 
-#: ../src/balsa-mime-widget.c:297
-#| msgid "No open or view action defined in GNOME MIME for this content type"
+#: ../src/balsa-mime-widget.c:296
 msgid "No open or view action defined for this content type"
 msgstr "Nije određena radnja za otvaranje ili pregled ove vrste sadržaja"
 
-#: ../src/balsa-mime-widget.c:302
+#: ../src/balsa-mime-widget.c:301
 msgid "S_ave part"
 msgstr "Sačuvaj _deo"
 
-#: ../src/balsa-mime-widget-callbacks.c:54 ../src/sendmsg-window.c:1804
+#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1813
 #, c-format
 msgid "Could not launch application: %s"
 msgstr "Ne mogu da pokrenem program: %s"
 
-#: ../src/balsa-mime-widget-callbacks.c:81
+#: ../src/balsa-mime-widget-callbacks.c:79
 #, c-format
 msgid "Save %s MIME Part"
 msgstr "Sačuvaj %s MIME deo"
 
-#: ../src/balsa-mime-widget-callbacks.c:123
+#: ../src/balsa-mime-widget-callbacks.c:121
 #, c-format
-#| msgid "Could not connect to %s (%s)."
 msgid "Could not construct URI from %s"
 msgstr "Ne mogu da napravim putanju iz „%s“"
 
-#: ../src/balsa-mime-widget-callbacks.c:142
+#: ../src/balsa-mime-widget-callbacks.c:140
 msgid "File already exists. Overwrite?"
 msgstr "Datoteka već postoji. Da prepišem preko?"
 
-#: ../src/balsa-mime-widget-callbacks.c:152
+#: ../src/balsa-mime-widget-callbacks.c:150
 #, c-format
-#| msgid "%s: %s"
 msgid "Unlink %s: %s"
 msgstr "Razveži %s: %s"
 
-#: ../src/balsa-mime-widget-crypto.c:76
+#: ../src/balsa-mime-widget-crypto.c:74
 #, c-format
 msgid ""
 "This is an inline %s signed %s message part:\n"
@@ -3105,218 +3038,212 @@ msgstr ""
 "Ovo je neposredno %s potpisani %s deo poruke:\n"
 "%s"
 
-#: ../src/balsa-mime-widget-crypto.c:78 ../src/print-gtk.c:201
+#: ../src/balsa-mime-widget-crypto.c:76 ../src/print-gtk.c:199
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: ../src/balsa-mime-widget-crypto.c:96
+#: ../src/balsa-mime-widget-crypto.c:94
 msgid "_Run GnuPG to import this key"
 msgstr "_Pokreni GnuPG za uvoz ovog ključa"
 
-#: ../src/balsa-mime-widget-crypto.c:100
+#: ../src/balsa-mime-widget-crypto.c:98
 msgid "_Run GnuPG to check for an update of this key"
 msgstr "_Pokreni GnuPG za proveru ažuriranja ovog ključa"
 
-#: ../src/balsa-mime-widget-image.c:54 ../src/balsa-mime-widget-image.c:178
+#: ../src/balsa-mime-widget-image.c:52 ../src/balsa-mime-widget-image.c:176
 #, c-format
 msgid "Error loading attached image: %s\n"
 msgstr "Greška učitavanja priložene slike: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:161
-#: ../src/balsa-mime-widget-message.c:173
-#: ../src/balsa-mime-widget-message.c:201
-#: ../src/balsa-mime-widget-message.c:254
+#: ../src/balsa-mime-widget-message.c:140
+#| msgid "Message parts"
+msgid "message headers"
+msgstr "zaglavlja poruke"
+
+#: ../src/balsa-mime-widget-message.c:170
+#: ../src/balsa-mime-widget-message.c:182
+#: ../src/balsa-mime-widget-message.c:210
+#: ../src/balsa-mime-widget-message.c:263
 msgid "Content Type: external-body\n"
 msgstr "Vrsta sadržaja: spoljašnje telo\n"
 
-#: ../src/balsa-mime-widget-message.c:162
+#: ../src/balsa-mime-widget-message.c:171
 #, c-format
 msgid "Access type: local-file\n"
 msgstr "Vrsta pristupa: lokalna datoteka\n"
 
-#: ../src/balsa-mime-widget-message.c:174
+#: ../src/balsa-mime-widget-message.c:183
 #, c-format
 msgid "Access type: URL\n"
 msgstr "Vrsta pristupa: adresa\n"
 
-#: ../src/balsa-mime-widget-message.c:175
+#: ../src/balsa-mime-widget-message.c:184
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../src/balsa-mime-widget-message.c:202
+#: ../src/balsa-mime-widget-message.c:211
 #, c-format
 msgid "Access type: %s\n"
 msgstr "Vrsta pristupa: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:206
+#: ../src/balsa-mime-widget-message.c:215
 #, c-format
 msgid "FTP site: %s\n"
 msgstr "FTP sajt: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:208
+#: ../src/balsa-mime-widget-message.c:217
 #, c-format
 msgid "Directory: %s\n"
 msgstr "Direktorijum: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:255
+#: ../src/balsa-mime-widget-message.c:264
 msgid "Access type: mail-server\n"
 msgstr "Vrsta pristupa: server pošte\n"
 
-#: ../src/balsa-mime-widget-message.c:256
+#: ../src/balsa-mime-widget-message.c:265
 #, c-format
 msgid "Mail server: %s\n"
 msgstr "Server pošte: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:258
+#: ../src/balsa-mime-widget-message.c:267
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:275
+#: ../src/balsa-mime-widget-message.c:284
 msgid "Se_nd message to obtain this part"
 msgstr "Pošalji _poruku da dobiješ ovaj deo"
 
-#: ../src/balsa-mime-widget-message.c:296 ../src/balsa-mime-widget-text.c:811
-#: ../src/sendmsg-window.c:1825
+#: ../src/balsa-mime-widget-message.c:305 ../src/balsa-mime-widget-text.c:809
+#: ../src/sendmsg-window.c:1834
 #, c-format
 msgid "Error showing %s: %s\n"
 msgstr "Greška prikazivanja „%s“: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:331
+#: ../src/balsa-mime-widget-message.c:340
 #, c-format
 msgid "Could not get a part: %s"
 msgstr "Ne mogu da preuzmem deo: %s"
 
-#: ../src/balsa-mime-widget-message.c:363
+#: ../src/balsa-mime-widget-message.c:372
 #, c-format
 msgid "Sending the external body request failed: %s"
 msgstr "Nisam uspeo da pošaljem zahtev spoljnog tela: %s"
 
-#: ../src/balsa-mime-widget-message.c:450
-#| msgid "_Reply..."
+#: ../src/balsa-mime-widget-message.c:459
 msgid "Reply..."
 msgstr "Odgovori..."
 
-#: ../src/balsa-mime-widget-message.c:555
+#: ../src/balsa-mime-widget-message.c:564
 msgid "... [truncated]"
 msgstr "... [skraćeno]"
 
 #. Gmail sometimes fails to do that.
-#: ../src/balsa-mime-widget-message.c:705
+#: ../src/balsa-mime-widget-message.c:714
 msgid "Error:"
 msgstr "Greška:"
 
-#: ../src/balsa-mime-widget-message.c:706
+#: ../src/balsa-mime-widget-message.c:715
 msgid "IMAP server did not report message structure"
 msgstr "IMAP server nije izvestio o strukturi poruke"
 
-#: ../src/balsa-mime-widget-message.c:718
-#: ../src/balsa-print-object-header.c:155 ../src/sendmsg-window.c:1144
-#: ../src/sendmsg-window.c:1146 ../src/sendmsg-window.c:1236
-#: ../src/sendmsg-window.c:3840 ../src/sendmsg-window.c:5762
+#: ../src/balsa-mime-widget-message.c:727
+#: ../src/balsa-print-object-header.c:153 ../src/sendmsg-window.c:1152
+#: ../src/sendmsg-window.c:1154 ../src/sendmsg-window.c:1244
+#: ../src/sendmsg-window.c:3849 ../src/sendmsg-window.c:5776
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../src/balsa-mime-widget-message.c:722
-#: ../src/balsa-print-object-header.c:163 ../src/sendmsg-window.c:3836
+#: ../src/balsa-mime-widget-message.c:731
+#: ../src/balsa-print-object-header.c:161 ../src/sendmsg-window.c:3845
 msgid "Date:"
 msgstr "Datum:"
 
 #. addresses
-#: ../src/balsa-mime-widget-message.c:728
-#: ../src/balsa-print-object-header.c:168 ../src/sendmsg-window.c:3847
-#: ../src/store-address.c:340
+#: ../src/balsa-mime-widget-message.c:737
+#: ../src/balsa-print-object-header.c:166 ../src/sendmsg-window.c:3856
+#: ../src/store-address.c:338
 msgid "From:"
 msgstr "Šalje:"
 
-#: ../src/balsa-mime-widget-message.c:735
+#: ../src/balsa-mime-widget-message.c:744
 msgid "Reply-To:"
 msgstr "Odgovori na:"
 
-#: ../src/balsa-mime-widget-message.c:744
-#: ../src/balsa-print-object-header.c:176
+#: ../src/balsa-mime-widget-message.c:753
+#: ../src/balsa-print-object-header.c:174
 msgid "Fcc:"
 msgstr "Umnožak datoteke:"
 
-#: ../src/balsa-mime-widget-message.c:751
-#: ../src/balsa-print-object-header.c:179
+#: ../src/balsa-mime-widget-message.c:760
+#: ../src/balsa-print-object-header.c:177
 msgid "Disposition-Notification-To:"
 msgstr "Poruka o prispeću:"
 
-#: ../src/balsa-mime-widget-text.c:174
+#: ../src/balsa-mime-widget-text.c:172
 #, c-format
 msgid "Could not save a text part: %s"
 msgstr "Ne mogu da sačuvam tekstualni deo: %s"
 
-#: ../src/balsa-mime-widget-text.c:518
+#: ../src/balsa-mime-widget-text.c:516
 msgid "Copy link"
 msgstr "Umnoži vezu"
 
-#: ../src/balsa-mime-widget-text.c:523
-#| msgid "Open next"
+#: ../src/balsa-mime-widget-text.c:521
 msgid "Open link"
 msgstr "Otvori vezu"
 
-#: ../src/balsa-mime-widget-text.c:528
-#| msgid "Sending Mail..."
+#: ../src/balsa-mime-widget-text.c:526
 msgid "Send link..."
 msgstr "Pošalji vezu..."
 
-#: ../src/balsa-mime-widget-text.c:561 ../src/balsa-mime-widget-text.c:1053
+#: ../src/balsa-mime-widget-text.c:559 ../src/balsa-mime-widget-text.c:1051
 msgid "Save..."
 msgstr "Sačuvaj..."
 
-#: ../src/balsa-mime-widget-text.c:571
-#| msgid "Highlight cited text"
+#: ../src/balsa-mime-widget-text.c:569
 msgid "Highlight structured phrases"
 msgstr "Istakni sređene izraze"
 
-#: ../src/balsa-mime-widget-text.c:798
+#: ../src/balsa-mime-widget-text.c:796
 #, c-format
 msgid "Calling URL %s..."
 msgstr "Pozivam adresu %s..."
 
-#: ../src/balsa-mime-widget-text.c:1167
-#| msgid "Address Book"
+#: ../src/balsa-mime-widget-text.c:1165
 msgid "Address"
 msgstr "Adresar"
 
-#: ../src/balsa-mime-widget-text.c:1170
+#: ../src/balsa-mime-widget-text.c:1168
 msgid "S_tore"
 msgstr "_Smesti"
 
-#: ../src/balsa-mime-widget-text.c:1178 ../src/balsa-print-object-text.c:508
-#| msgid "_Full Name:"
+#: ../src/balsa-mime-widget-text.c:1176 ../src/balsa-print-object-text.c:506
 msgid "Full Name"
 msgstr "Ime i prezime"
 
-#: ../src/balsa-mime-widget-text.c:1179 ../src/balsa-print-object-text.c:510
-#| msgid "_Nickname:"
+#: ../src/balsa-mime-widget-text.c:1177 ../src/balsa-print-object-text.c:508
 msgid "Nick Name"
 msgstr "Nadimak"
 
-#: ../src/balsa-mime-widget-text.c:1180 ../src/balsa-print-object-text.c:512
-#| msgid "_First Name:"
+#: ../src/balsa-mime-widget-text.c:1178 ../src/balsa-print-object-text.c:510
 msgid "First Name"
 msgstr "Ime"
 
-#: ../src/balsa-mime-widget-text.c:1181 ../src/balsa-print-object-text.c:514
-#| msgid "_Last Name:"
+#: ../src/balsa-mime-widget-text.c:1179 ../src/balsa-print-object-text.c:512
 msgid "Last Name"
 msgstr "Prezime"
 
-#: ../src/balsa-mime-widget-text.c:1182 ../src/balsa-print-object-text.c:516
-#| msgid "O_rganization:"
+#: ../src/balsa-mime-widget-text.c:1180 ../src/balsa-print-object-text.c:514
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../src/balsa-mime-widget-text.c:1184 ../src/balsa-print-object-text.c:519
-#| msgid "_Email Address:"
+#: ../src/balsa-mime-widget-text.c:1182 ../src/balsa-print-object-text.c:517
 msgid "Email Address"
 msgstr "Adresa el. pošte"
 
-#: ../src/balsa-mime-widget-text.c:1213
+#: ../src/balsa-mime-widget-text.c:1211
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains 8-bit characters, but no "
@@ -3325,408 +3252,404 @@ msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži 8-bitne znakove, ali ne i "
 "zaglavlje koje opisuje korišćeni skup kodova (prebačeno u %s)"
 
-#: ../src/balsa-mime-widget-vcalendar.c:67
+#: ../src/balsa-mime-widget-vcalendar.c:65
 #, c-format
 msgid "This is an iTIP calendar \"%s\" message."
 msgstr "Ovo je poruka iTIP kalendara „%s“."
 
-#: ../src/balsa-mime-widget-vcalendar.c:169
-#: ../src/balsa-print-object-text.c:665
+#: ../src/balsa-mime-widget-vcalendar.c:167
+#: ../src/balsa-print-object-text.c:663
 msgid "Summary"
 msgstr "Sažetak"
 
-#: ../src/balsa-mime-widget-vcalendar.c:170
-#: ../src/balsa-print-object-text.c:667
+#: ../src/balsa-mime-widget-vcalendar.c:168
+#: ../src/balsa-print-object-text.c:665
 msgid "Organizer"
 msgstr "Organizator"
 
-#: ../src/balsa-mime-widget-vcalendar.c:171
-#: ../src/balsa-print-object-text.c:669
+#: ../src/balsa-mime-widget-vcalendar.c:169
+#: ../src/balsa-print-object-text.c:667
 msgid "Start"
 msgstr "Početak"
 
-#: ../src/balsa-mime-widget-vcalendar.c:172
-#: ../src/balsa-print-object-text.c:671
+#: ../src/balsa-mime-widget-vcalendar.c:170
+#: ../src/balsa-print-object-text.c:669
 msgid "End"
 msgstr "Kraj"
 
-#: ../src/balsa-mime-widget-vcalendar.c:173
-#: ../src/balsa-print-object-text.c:673
+#: ../src/balsa-mime-widget-vcalendar.c:171
+#: ../src/balsa-print-object-text.c:671
 msgid "Location"
 msgstr "Mesto"
 
-#: ../src/balsa-mime-widget-vcalendar.c:205
-#: ../src/balsa-print-object-text.c:682
+#: ../src/balsa-mime-widget-vcalendar.c:203
+#: ../src/balsa-print-object-text.c:680
 msgid "Attendees"
 msgstr "Zvanice"
 
-#: ../src/balsa-mime-widget-vcalendar.c:205
-#: ../src/balsa-print-object-text.c:682
+#: ../src/balsa-mime-widget-vcalendar.c:203
+#: ../src/balsa-print-object-text.c:680
 msgid "Attendee"
 msgstr "Zvanica"
 
-#: ../src/balsa-mime-widget-vcalendar.c:208
-#: ../src/balsa-print-object-text.c:696 ../src/sendmsg-window.c:3051
+#: ../src/balsa-mime-widget-vcalendar.c:206
+#: ../src/balsa-print-object-text.c:694 ../src/sendmsg-window.c:3060
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/balsa-mime-widget-vcalendar.c:229
+#: ../src/balsa-mime-widget-vcalendar.c:227
 msgid "The sender asks you for a reply to this request:"
 msgstr "Pošiljalac je zatražio da odgovorite na ovaj zahtev:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:236
+#: ../src/balsa-mime-widget-vcalendar.c:234
 msgid "Accept"
 msgstr "Prihvati"
 
-#: ../src/balsa-mime-widget-vcalendar.c:245
-#| msgid "_Accept Once"
+#: ../src/balsa-mime-widget-vcalendar.c:243
 msgid "Accept tentatively"
 msgstr "Prihvati uz rezervu"
 
-#: ../src/balsa-mime-widget-vcalendar.c:253
+#: ../src/balsa-mime-widget-vcalendar.c:251
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../src/balsa-mime-widget-vcalendar.c:300
+#: ../src/balsa-mime-widget-vcalendar.c:298
 msgid "iTip Calendar Request"
 msgstr "Zahtev iTIP kalendara"
 
-#: ../src/balsa-mime-widget-vcalendar.c:334
+#: ../src/balsa-mime-widget-vcalendar.c:332
 #, c-format
 msgid "Sending the iTip calendar reply failed: %s"
 msgstr "Nisam uspeo da pošaljem odgovor iTIP kalendara: %s"
 
+#: ../src/balsa-print-object-default.c:151
 #: ../src/balsa-print-object-default.c:153
-#: ../src/balsa-print-object-default.c:155
-#: ../src/balsa-print-object-default.c:158
+#: ../src/balsa-print-object-default.c:156
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: ../src/balsa-print-object-default.c:163
-#: ../src/balsa-print-object-default.c:167
+#: ../src/balsa-print-object-default.c:161
+#: ../src/balsa-print-object-default.c:165
 msgid "File name:"
 msgstr "Naziv datoteke:"
 
-#: ../src/filter-edit-callbacks.c:337
+#: ../src/filter-edit-callbacks.c:335
 msgid "One of the specified fields contains:"
 msgstr "Jedno od zadatih polja sadrži:"
 
-#: ../src/filter-edit-callbacks.c:338
+#: ../src/filter-edit-callbacks.c:336
 msgid "None of the specified fields contains:"
 msgstr "Nijedno od zadatih polja ne sadrži:"
 
-#: ../src/filter-edit-callbacks.c:340
+#: ../src/filter-edit-callbacks.c:338
 msgid "One of the regular expressions matches"
 msgstr "Jedan od regularnih izraza odgovara"
 
-#: ../src/filter-edit-callbacks.c:341
+#: ../src/filter-edit-callbacks.c:339
 msgid "None of the regular expressions matches"
 msgstr "Nijedan od regularnih izraza ne odgovara"
 
-#: ../src/filter-edit-callbacks.c:343
+#: ../src/filter-edit-callbacks.c:341
 msgid "Match when date is in the interval:"
 msgstr "Odgovara kada je datum u intervalu:"
 
-#: ../src/filter-edit-callbacks.c:344
+#: ../src/filter-edit-callbacks.c:342
 msgid "Match when date is outside the interval:"
 msgstr "Odgovara kada datum nije u intervalu:"
 
-#: ../src/filter-edit-callbacks.c:346 ../src/filter-edit-callbacks.c:1155
+#: ../src/filter-edit-callbacks.c:344 ../src/filter-edit-callbacks.c:1153
 msgid "Match when one of these flags is set:"
 msgstr "Odgovara kada je neka od ovih oznaka postavljena:"
 
-#: ../src/filter-edit-callbacks.c:347
+#: ../src/filter-edit-callbacks.c:345
 msgid "Match when none of these flags is set:"
 msgstr "Odgovara kada nijedna od ovih oznaka nije postavljena:"
 
-#: ../src/filter-edit-callbacks.c:554
+#: ../src/filter-edit-callbacks.c:552
 msgid "You must specify the name of the user header to match on"
 msgstr "Morate da zadate naziv korisničkog zaglavlja koje se upoređuje"
 
-#: ../src/filter-edit-callbacks.c:565
+#: ../src/filter-edit-callbacks.c:563
 msgid "You must specify at least one field for matching"
 msgstr "Morate da zadate bar jedno polje za upoređivanje"
 
-#: ../src/filter-edit-callbacks.c:575
+#: ../src/filter-edit-callbacks.c:573
 msgid "You must provide a string"
 msgstr "Morate da obezbedite nisku"
 
-#: ../src/filter-edit-callbacks.c:583
+#: ../src/filter-edit-callbacks.c:581
 msgid "You must provide at least one regular expression"
 msgstr "Morate da obezbedite bar jedan regularni izraz"
 
-#: ../src/filter-edit-callbacks.c:596
+#: ../src/filter-edit-callbacks.c:594
 msgid "Low date is incorrect"
 msgstr "Početni datum je neispravan"
 
-#: ../src/filter-edit-callbacks.c:607
+#: ../src/filter-edit-callbacks.c:605
 msgid "High date is incorrect"
 msgstr "Završni datum je neispravan"
 
-#: ../src/filter-edit-callbacks.c:615
+#: ../src/filter-edit-callbacks.c:613
 msgid "Low date is greater than high date"
 msgstr "Početni datum je veći od završnog"
 
-#: ../src/filter-edit-callbacks.c:910
+#: ../src/filter-edit-callbacks.c:908
 #, c-format
 msgid "Error displaying condition help: %s\n"
 msgstr "Greška prikazivanja pomoći za uslove: %s\n"
 
-#: ../src/filter-edit-callbacks.c:951
+#: ../src/filter-edit-callbacks.c:949
 msgid "Match Fields"
 msgstr "Poklopi polja"
 
-#: ../src/filter-edit-callbacks.c:961
+#: ../src/filter-edit-callbacks.c:959
 msgid "_All"
 msgstr "_Sve"
 
-#: ../src/filter-edit-callbacks.c:962
+#: ../src/filter-edit-callbacks.c:960
 msgid "C_lear"
 msgstr "_Očisti"
 
-#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:4362
+#: ../src/filter-edit-callbacks.c:962 ../src/main-window.c:4360
 msgid "_Body"
 msgstr "_Telo"
 
-#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:4363
+#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:4361
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../src/filter-edit-callbacks.c:966 ../src/main-window.c:4364
+#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:4362
 msgid "_From:"
 msgstr "_Šalje:"
 
-#: ../src/filter-edit-callbacks.c:967
+#: ../src/filter-edit-callbacks.c:965
 msgid "_Subject"
 msgstr "_Tema"
 
-#: ../src/filter-edit-callbacks.c:968 ../src/main-window.c:4366
+#: ../src/filter-edit-callbacks.c:966 ../src/main-window.c:4364
 msgid "_Cc:"
 msgstr "_Kopija:"
 
-#: ../src/filter-edit-callbacks.c:970
+#: ../src/filter-edit-callbacks.c:968
 msgid "_User header:"
 msgstr "_Korisničko zaglavlje:"
 
-#: ../src/filter-edit-callbacks.c:1011
+#: ../src/filter-edit-callbacks.c:1009
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: ../src/filter-edit-callbacks.c:1026
+#: ../src/filter-edit-callbacks.c:1024
 msgid "One of the specified f_ields contains"
 msgstr "Jedno od zadatih polja _sadrži"
 
-#: ../src/filter-edit-callbacks.c:1041
+#: ../src/filter-edit-callbacks.c:1039
 msgid "Contain/Does _Not Contain"
 msgstr "Sadrži/_ne sadrži"
 
-#: ../src/filter-edit-callbacks.c:1061
+#: ../src/filter-edit-callbacks.c:1059
 msgid "_One of the regular expressions matches"
 msgstr "_Jedan od regularnih izraza odgovara"
 
 #. Left/Remove button
-#: ../src/filter-edit-callbacks.c:1092 ../src/filter-edit-dialog.c:341
-#: ../src/filter-run-dialog.c:334
+#: ../src/filter-edit-callbacks.c:1090 ../src/filter-edit-dialog.c:339
+#: ../src/filter-run-dialog.c:332
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../src/filter-edit-callbacks.c:1096
+#: ../src/filter-edit-callbacks.c:1094
 msgid "One _Matches/None Matches"
 msgstr "_Jedan odgovara/nijedan ne odgovara"
 
-#: ../src/filter-edit-callbacks.c:1107
-#| msgid "Error in regular expression syntax"
+#: ../src/filter-edit-callbacks.c:1105
 msgid "Filtering using regular expressions is not yet implemented."
 msgstr "Probiranje upotrebom regularnih izraza još nije primenjeno."
 
-#: ../src/filter-edit-callbacks.c:1117
+#: ../src/filter-edit-callbacks.c:1115
 msgid "Match when message date is in the interval:"
 msgstr "Odgovara kada je datum poruke u intervalu:"
 
-#: ../src/filter-edit-callbacks.c:1137
+#: ../src/filter-edit-callbacks.c:1135
 msgid "Inside/outside the date interval"
 msgstr "Unutar/van intervala datuma"
 
-#: ../src/filter-edit-callbacks.c:1184
+#: ../src/filter-edit-callbacks.c:1182
 msgid "Match when one flag is set/when no flag is set"
 msgstr ""
 "Odgovara kada je jedna oznaka postavljena/kada nijedna oznaka nije postavljena"
 
-#: ../src/filter-edit-callbacks.c:1203
+#: ../src/filter-edit-callbacks.c:1201
 msgid "Search T_ype:"
 msgstr "_Vrsta pretrage:"
 
-#: ../src/filter-edit-callbacks.c:1280
+#: ../src/filter-edit-callbacks.c:1278
 msgid "Edit condition for filter: "
 msgstr "Uredi uslov propusnika: "
 
-#: ../src/filter-edit-callbacks.c:1498 ../src/save-restore.c:1973
+#: ../src/filter-edit-callbacks.c:1496 ../src/save-restore.c:1971
 msgid "Filter with no condition was omitted"
 msgstr "Propusnik bez uslova je izostavljen"
 
-#: ../src/filter-edit-callbacks.c:1524
+#: ../src/filter-edit-callbacks.c:1522
 #, c-format
 msgid "Error displaying filter help: %s\n"
 msgstr "Greška prikazivanja pomoći propusnika: %s\n"
 
-#: ../src/filter-edit-callbacks.c:1723
+#: ../src/filter-edit-callbacks.c:1721
 msgid "New filter"
 msgstr "Novi propusnik"
 
-#: ../src/filter-edit-callbacks.c:1852
+#: ../src/filter-edit-callbacks.c:1850
 msgid "No filter name specified."
 msgstr "Nije naveden naziv propusnika."
 
-#: ../src/filter-edit-callbacks.c:1857
+#: ../src/filter-edit-callbacks.c:1855
 #, c-format
 msgid "Filter \"%s\" already exists."
 msgstr "Propusnik „%s“ već postoji."
 
-#: ../src/filter-edit-callbacks.c:1867
+#: ../src/filter-edit-callbacks.c:1865
 msgid "Filter must have conditions."
 msgstr "Propusnik mora da ima uslove."
 
-#: ../src/filter-edit-callbacks.c:1953
+#: ../src/filter-edit-callbacks.c:1951
 msgid "Filter has matched"
 msgstr "Propusnik se poklapa"
 
-#: ../src/filter-edit-callbacks.c:1973
+#: ../src/filter-edit-callbacks.c:1971
 msgid "You must provide a sound to play"
 msgstr "Morate da obezbedite zvuk za puštanje"
 
-#: ../src/filter-edit-callbacks.c:2155
+#: ../src/filter-edit-callbacks.c:2153
 #, c-format
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Primer: 31. decembar 2000. pišite kao %s)"
 
-#: ../src/filter-edit-dialog.c:97 ../src/pref-manager.c:426
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:424
 msgid "Simple"
 msgstr "Jednostavno"
 
-#: ../src/filter-edit-dialog.c:98
+#: ../src/filter-edit-dialog.c:96
 msgid "Regular Expression"
 msgstr "Regularni izrazi"
 
-#: ../src/filter-edit-dialog.c:99
+#: ../src/filter-edit-dialog.c:97
 msgid "Date interval"
 msgstr "Interval datuma"
 
-#: ../src/filter-edit-dialog.c:100
+#: ../src/filter-edit-dialog.c:98
 msgid "Flag condition"
 msgstr "Uslov oznake"
 
-#: ../src/filter-edit-dialog.c:104
+#: ../src/filter-edit-dialog.c:102
 msgid "Copy to folder:"
 msgstr "Umnoži u fasciklu:"
 
-#: ../src/filter-edit-dialog.c:105
+#: ../src/filter-edit-dialog.c:103
 msgid "Move to folder:"
 msgstr "Premesti u fasciklu:"
 
-#: ../src/filter-edit-dialog.c:106
-#| msgid "Colors"
+#: ../src/filter-edit-dialog.c:104
 msgid "Colorize"
 msgstr "Oboji"
 
-#: ../src/filter-edit-dialog.c:107
+#: ../src/filter-edit-dialog.c:105
 msgid "Print on printer:"
 msgstr "Štampaj na štampaču:"
 
-#: ../src/filter-edit-dialog.c:108
+#: ../src/filter-edit-dialog.c:106
 msgid "Run program:"
 msgstr "Pokreni program:"
 
-#: ../src/filter-edit-dialog.c:109
+#: ../src/filter-edit-dialog.c:107
 msgid "Send to Trash"
 msgstr "Pošalji u „smeće“"
 
-#: ../src/filter-edit-dialog.c:113
+#: ../src/filter-edit-dialog.c:111
 msgid "OR"
 msgstr "ILI"
 
-#: ../src/filter-edit-dialog.c:114
+#: ../src/filter-edit-dialog.c:112
 msgid "AND"
 msgstr "I"
 
 #. The name entry
-#: ../src/filter-edit-dialog.c:269
+#: ../src/filter-edit-dialog.c:267
 msgid "_Filter name:"
 msgstr "Naziv _propusnika:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:287
+#: ../src/filter-edit-dialog.c:285
 msgid "Operation between conditions"
 msgstr "Operacija nad uslovima"
 
-#: ../src/filter-edit-dialog.c:337
+#: ../src/filter-edit-dialog.c:335
 msgid "Ne_w"
 msgstr "No_vo"
 
-#: ../src/filter-edit-dialog.c:365
+#: ../src/filter-edit-dialog.c:363
 msgid "Foreground"
 msgstr "Pročelje"
 
-#: ../src/filter-edit-dialog.c:376
+#: ../src/filter-edit-dialog.c:374
 msgid "Background"
 msgstr "Pozadina"
 
 #. The notification area
-#: ../src/filter-edit-dialog.c:401
+#: ../src/filter-edit-dialog.c:399
 msgid "Notification:"
 msgstr "Obaveštenje:"
 
 #. Notification buttons
-#: ../src/filter-edit-dialog.c:411
+#: ../src/filter-edit-dialog.c:409
 msgid "Play sound:"
 msgstr "Pusti zvuk:"
 
-#: ../src/filter-edit-dialog.c:417
+#: ../src/filter-edit-dialog.c:415
 msgid "Use Sound..."
 msgstr "Koristi zvuk..."
 
-#: ../src/filter-edit-dialog.c:438
+#: ../src/filter-edit-dialog.c:436
 msgid "Popup text:"
 msgstr "Prikaži tekst:"
 
 #. The action area
-#: ../src/filter-edit-dialog.c:459
+#: ../src/filter-edit-dialog.c:457
 msgid "Action to perform:"
 msgstr "Radnja za obavljanje:"
 
-#: ../src/filter-edit-dialog.c:512
+#: ../src/filter-edit-dialog.c:510
 msgid "Match"
 msgstr "Poklapanje"
 
-#: ../src/filter-edit-dialog.c:515
+#: ../src/filter-edit-dialog.c:513
 msgid "Action"
 msgstr "Radnja"
 
-#: ../src/filter-edit-dialog.c:527
+#: ../src/filter-edit-dialog.c:525
 msgid "Revert"
 msgstr "Vrati"
 
-#: ../src/filter-edit-dialog.c:578
-#| msgid "A filter run dialog is open.Close it before you can modify filters."
+#: ../src/filter-edit-dialog.c:576
 msgid "A filter run dialog is open. Close it before you can modify filters."
 msgstr ""
 "Otvoreno je prozorče za pokretanje propusnika. Zatvorite ga da biste mogli da "
 "menjate propusnike."
 
-#: ../src/filter-edit-dialog.c:591
+#: ../src/filter-edit-dialog.c:589
 msgid "Balsa Filters"
 msgstr "Balsini propusnici"
 
-#: ../src/filter-edit-dialog.c:660
+#: ../src/filter-edit-dialog.c:658
 #, c-format
 msgid "Filter \"%s\" has no condition."
 msgstr "Propusnik „%s“ nema uslov."
 
-#: ../src/filter-export-callbacks.c:59
+#: ../src/filter-export-callbacks.c:57
 #, c-format
 msgid "Unable to export filter %s, an error occurred."
 msgstr "Ne mogu da izvezem propusnik %s, došlo je do greške."
 
-#: ../src/filter-export-dialog.c:65
+#: ../src/filter-export-dialog.c:63
 msgid ""
 "There are opened filter run dialogs, close them before you can modify "
 "filters."
@@ -3734,25 +3657,25 @@ msgstr ""
 "Otvoreni su prozorčići za pokretanje propusnika. Zatvorite ih da biste mogli "
 "da menjate propusnike."
 
-#: ../src/filter-export-dialog.c:77
+#: ../src/filter-export-dialog.c:75
 msgid "Balsa Filters Export"
 msgstr "Izvoz Balsinih propusnika"
 
-#: ../src/filter-run-callbacks.c:184
+#: ../src/filter-run-callbacks.c:182
 #, c-format
 msgid "Error displaying run filters help: %s\n"
 msgstr "Greška prikazivanja pomoći za pokretanje propusnika: %s\n"
 
-#: ../src/filter-run-callbacks.c:234 ../src/filter-run-callbacks.c:256
+#: ../src/filter-run-callbacks.c:232 ../src/filter-run-callbacks.c:254
 msgid "Error when applying filters"
 msgstr "Greška pri primeni propusnika"
 
-#: ../src/filter-run-callbacks.c:237 ../src/filter-run-callbacks.c:259
+#: ../src/filter-run-callbacks.c:235 ../src/filter-run-callbacks.c:257
 #, c-format
 msgid "Filter applied to \"%s\"."
 msgstr "Propusnik je primenjen na „%s“."
 
-#: ../src/filter-run-callbacks.c:298
+#: ../src/filter-run-callbacks.c:296
 #, c-format
 msgid ""
 "The destination mailbox of the filter \"%s\" is \"%s\".\n"
@@ -3761,7 +3684,7 @@ msgstr ""
 "Odredišno sanduče za propusnik „%s“ je „%s“.\n"
 "Ne možete ga pridružiti sa istim sandučetom (to izaziva dubačenje)."
 
-#: ../src/filter-run-callbacks.c:306
+#: ../src/filter-run-callbacks.c:304
 #, c-format
 msgid ""
 "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
@@ -3773,37 +3696,37 @@ msgstr ""
 "Ovo se događa kada npr. koristite regularne izraze sa IMAP sandučićima, onda "
 "se koristi veoma spor način; ako je moguće, koristite obične niske."
 
-#: ../src/filter-run-dialog.c:191
+#: ../src/filter-run-dialog.c:189
 msgid "Balsa Filters of Mailbox: "
 msgstr "Balsini propusnici sandučeta: "
 
-#: ../src/filter-run-dialog.c:232
+#: ../src/filter-run-dialog.c:230
 msgid "On reception"
 msgstr "Pri prijemu"
 
-#: ../src/filter-run-dialog.c:244
+#: ../src/filter-run-dialog.c:242
 msgid "On exit"
 msgstr "Pri izlazu"
 
-#: ../src/filter-run-dialog.c:318
+#: ../src/filter-run-dialog.c:316
 msgid "Apply Selected"
 msgstr "Primeni izabrano"
 
 #. up button
-#: ../src/filter-run-dialog.c:366
+#: ../src/filter-run-dialog.c:364
 msgid "_Up"
 msgstr "_Gore"
 
 #. down button
-#: ../src/filter-run-dialog.c:371
+#: ../src/filter-run-dialog.c:369
 msgid "Do_wn"
 msgstr "_Dole"
 
-#: ../src/filter-run-dialog.c:377
+#: ../src/filter-run-dialog.c:375
 msgid "A_pply Now!"
 msgstr "_Primeni sada!"
 
-#: ../src/filter-run-dialog.c:421
+#: ../src/filter-run-dialog.c:419
 msgid ""
 "The filters dialog is opened, close it before you can run filters on any "
 "mailbox"
@@ -3811,93 +3734,89 @@ msgstr ""
 "Otvoreno je prozorče propusnika, zatvorite ga da biste mogli da pokrenete "
 "propusnike nad bilo kom sandučetu"
 
-#: ../src/folder-conf.c:110
+#: ../src/folder-conf.c:108
 #, c-format
-#| msgid "Error displaying condition help: %s\n"
 msgid "Error displaying config help: %s\n"
 msgstr "Greška prikazivanja pomoći podešavanja: %s\n"
 
-#: ../src/folder-conf.c:298
+#: ../src/folder-conf.c:296
 msgid "Remote IMAP folder"
 msgstr "Udaljena fascikla IMAP-a"
 
 #. must NOT be modal
-#: ../src/folder-conf.c:301 ../src/folder-conf.c:789 ../src/mailbox-conf.c:573
+#: ../src/folder-conf.c:299 ../src/folder-conf.c:787 ../src/mailbox-conf.c:571
 msgid "_Update"
 msgstr "_Ažuriraj"
 
-#: ../src/folder-conf.c:301
+#: ../src/folder-conf.c:299
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: ../src/folder-conf.c:327 ../src/mailbox-conf.c:1226
-#: ../src/mailbox-conf.c:1338
+#: ../src/folder-conf.c:325 ../src/mailbox-conf.c:1224
+#: ../src/mailbox-conf.c:1336
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: ../src/folder-conf.c:332
-#| msgid "Exceeded the number of connections per server %s"
+#: ../src/folder-conf.c:330
 msgid "_Max number of connections:"
 msgstr "_Najveći broj povezivanja:"
 
-#: ../src/folder-conf.c:339 ../src/mailbox-conf.c:1401
+#: ../src/folder-conf.c:337 ../src/mailbox-conf.c:1399
 msgid "Enable _persistent cache"
 msgstr "Uključi _stalnu ostavu"
 
-#: ../src/folder-conf.c:347
+#: ../src/folder-conf.c:345
 msgid "Use IDLE command"
 msgstr "Koristi naredbu „MIRUJE“"
 
-#: ../src/folder-conf.c:354 ../src/mailbox-conf.c:1405
+#: ../src/folder-conf.c:352 ../src/mailbox-conf.c:1403
 msgid "Enable _bug workarounds"
 msgstr "Uključi zaobilaženje _greške"
 
-#: ../src/folder-conf.c:361
+#: ../src/folder-conf.c:359
 msgid "Use STATUS for mailbox checking"
 msgstr "Koristi „STANJE“ za proveru sandučeta"
 
-#: ../src/folder-conf.c:367 ../src/mailbox-conf.c:1280
-#: ../src/mailbox-conf.c:1407
+#: ../src/folder-conf.c:365 ../src/mailbox-conf.c:1278
+#: ../src/mailbox-conf.c:1405
 msgid "_Advanced"
 msgstr "_Napredno"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:370
-#| msgid "Descriptive _Name:"
+#: ../src/folder-conf.c:368
 msgid "Descriptive _name:"
 msgstr "Opisni _naziv:"
 
 #. username
-#: ../src/folder-conf.c:385 ../src/mailbox-conf.c:1242
+#: ../src/folder-conf.c:383 ../src/mailbox-conf.c:1240
 msgid "Use_r name:"
 msgstr "Korisničko _ime:"
 
-#: ../src/folder-conf.c:391
+#: ../src/folder-conf.c:389
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../src/folder-conf.c:396 ../src/mailbox-conf.c:1363
+#: ../src/folder-conf.c:394 ../src/mailbox-conf.c:1361
 msgid "_Anonymous access"
 msgstr "_Neprimetni pristup"
 
-#: ../src/folder-conf.c:405
+#: ../src/folder-conf.c:403
 msgid "Subscribed _folders only"
 msgstr "Samo _fascikle pretplate"
 
-#: ../src/folder-conf.c:407
+#: ../src/folder-conf.c:405
 msgid "Always show _INBOX"
 msgstr "_Uvek prikaži „DOLAZNO“"
 
-#: ../src/folder-conf.c:410
-#| msgid "Pr_efix"
+#: ../src/folder-conf.c:408
 msgid "Pr_efix:"
 msgstr "Pr_efiks:"
 
-#: ../src/folder-conf.c:556
+#: ../src/folder-conf.c:554
 msgid "Select parent folder"
 msgstr "Izaberi roditeljsku fasciklu"
 
-#: ../src/folder-conf.c:634
+#: ../src/folder-conf.c:632
 #, c-format
 msgid ""
 "Renaming INBOX is special!\n"
@@ -3912,29 +3831,29 @@ msgstr ""
 "„DOLAZNO“ i njene podfascikle će ostati.\n"
 "Šta želite da uradite?"
 
-#: ../src/folder-conf.c:640
+#: ../src/folder-conf.c:638
 msgid "Question"
 msgstr "Pitanje"
 
-#: ../src/folder-conf.c:645
+#: ../src/folder-conf.c:643
 msgid "Rename INBOX"
 msgstr "Preimenuj „DOLAZNO“"
 
-#: ../src/folder-conf.c:647
+#: ../src/folder-conf.c:645
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: ../src/folder-conf.c:672
+#: ../src/folder-conf.c:670
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Nisam uspeo da preimenujem fasciklu. Evo zašto: %s"
 
-#: ../src/folder-conf.c:724
+#: ../src/folder-conf.c:722
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Nisam uspeo da napravim fasciklu. Evo zašto: %s"
 
-#: ../src/folder-conf.c:771
+#: ../src/folder-conf.c:769
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -3942,72 +3861,68 @@ msgstr ""
 "Fascikla IMAP-a koja nije sanduče\n"
 "nema osobine koje se mogu menjati."
 
-#: ../src/folder-conf.c:786
+#: ../src/folder-conf.c:784
 msgid "Remote IMAP subfolder"
 msgstr "Udaljena podfascikla IMAP-a"
 
-#: ../src/folder-conf.c:789
+#: ../src/folder-conf.c:787
 msgid "_Create"
 msgstr "_Napravi"
 
-#: ../src/folder-conf.c:820
+#: ../src/folder-conf.c:818
 msgid "Create subfolder"
 msgstr "Napravi podfasciklu"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:828
+#: ../src/folder-conf.c:826
 msgid "_Folder name:"
 msgstr "Naziv _fascikle:"
 
-#: ../src/folder-conf.c:834
+#: ../src/folder-conf.c:832
 msgid "Host:"
 msgstr "Domaćin:"
 
-#: ../src/folder-conf.c:843
-#| msgid "_Subfolder of:"
+#: ../src/folder-conf.c:841
 msgid "Subfolder of:"
 msgstr "Podfascikla:"
 
-#: ../src/folder-conf.c:848
+#: ../src/folder-conf.c:846
 msgid "_Browse..."
 msgstr "_Razgledaj..."
 
-#: ../src/folder-conf.c:862
-#| msgid "Mailbox is read-only."
+#: ../src/folder-conf.c:860
 msgid "read-only"
 msgstr "samo za čitanje"
 
-#: ../src/folder-conf.c:863
+#: ../src/folder-conf.c:861
 msgid "read-write"
 msgstr "čitanje-pisanje"
 
-#: ../src/folder-conf.c:864
+#: ../src/folder-conf.c:862
 msgid "admin"
 msgstr "administrator"
 
-#: ../src/folder-conf.c:865
+#: ../src/folder-conf.c:863
 msgid "post"
 msgstr "upisivanje"
 
-#: ../src/folder-conf.c:866
-#| msgid "Send"
+#: ../src/folder-conf.c:864
 msgid "append"
 msgstr "prikačinjanje"
 
-#: ../src/folder-conf.c:867
-#| msgid "_Undelete"
+#: ../src/folder-conf.c:865
 msgid "delete"
 msgstr "brisanje"
 
-#: ../src/folder-conf.c:868
+#: ../src/folder-conf.c:866
 msgid "special"
 msgstr "posebno"
 
-#: ../src/folder-conf.c:874
+#: ../src/folder-conf.c:872
 msgid "Permissions:"
 msgstr "Ovlašćenja:"
 
-#: ../src/folder-conf.c:881
+#: ../src/folder-conf.c:879
 msgid ""
 "\n"
 "detailed permissions are available only for open folders"
@@ -4015,7 +3930,7 @@ msgstr ""
 "\n"
 "detaljnija ovlašćenja su dostupna samo za otvorene fascikle"
 
-#: ../src/folder-conf.c:888
+#: ../src/folder-conf.c:886
 msgid ""
 "\n"
 "the server does not support ACL's"
@@ -4023,34 +3938,32 @@ msgstr ""
 "\n"
 "server ne podržava ACL-e"
 
-#: ../src/folder-conf.c:897
-#| msgid "minutes"
+#: ../src/folder-conf.c:895
 msgid "mine: "
 msgstr "moje: "
 
-#: ../src/folder-conf.c:936
-#| msgid "Quoted"
+#: ../src/folder-conf.c:934
 msgid "Quota:"
 msgstr "Udeo:"
 
-#: ../src/folder-conf.c:940
+#: ../src/folder-conf.c:938
 msgid "quota information available only for open folders"
 msgstr "podatak o udelu je dostupan samo za otvorene fascikle"
 
-#: ../src/folder-conf.c:945
+#: ../src/folder-conf.c:943
 msgid "the server does not support quotas"
 msgstr "server ne podržava udele"
 
-#: ../src/folder-conf.c:947
+#: ../src/folder-conf.c:945
 msgid "no limits"
 msgstr "bez ograničenja"
 
-#: ../src/folder-conf.c:952
+#: ../src/folder-conf.c:950
 #, c-format
 msgid "%s of %s (%.1f%%) used"
 msgstr "%s od %s (%.1f%%) je iskorišćeno"
 
-#: ../src/folder-conf.c:989
+#: ../src/folder-conf.c:987
 msgid ""
 "This folder is not stored in configuration. I do not yet know how to remove "
 "it from remote server."
@@ -4058,7 +3971,7 @@ msgstr ""
 "Ova fascikla nije smeštena u podešavanjima. Ja još uvek ne znam kako da je "
 "uklonim sa udaljenog servera."
 
-#: ../src/folder-conf.c:998
+#: ../src/folder-conf.c:996
 #, c-format
 msgid ""
 "This will remove the folder \"%s\" from the list.\n"
@@ -4068,30 +3981,30 @@ msgstr ""
 "Kasnije možete koristiti stavku „Nova fascikla IMAP-a“ da ponovo dodate ovu "
 "fasciklu.\n"
 
-#: ../src/folder-conf.c:1006
+#: ../src/folder-conf.c:1004
 msgid "Confirm"
 msgstr "Potvrdi"
 
-#: ../src/information-dialog.c:232
+#: ../src/information-dialog.c:230
 msgid "Information - Balsa"
 msgstr "Informacija — Balsa"
 
-#: ../src/information-dialog.c:359
+#: ../src/information-dialog.c:357
 #, c-format
 msgid "WARNING: "
 msgstr "UPOZORENJE: "
 
-#: ../src/information-dialog.c:362
+#: ../src/information-dialog.c:360
 #, c-format
 msgid "ERROR: "
 msgstr "GREŠKA: "
 
-#: ../src/information-dialog.c:365
+#: ../src/information-dialog.c:363
 #, c-format
 msgid "FATAL: "
 msgstr "KOBNO: "
 
-#: ../src/mailbox-conf.c:223
+#: ../src/mailbox-conf.c:221
 msgid ""
 "Balsa was built without SSL support.\n"
 "Neither SSL nor TLS can be used."
@@ -4099,15 +4012,15 @@ msgstr ""
 "Balsa je izgrađena bez SSL podrške.\n"
 "Ne mogu biti korišćeni ni SSL ni TLS."
 
-#: ../src/mailbox-conf.c:235
+#: ../src/mailbox-conf.c:233
 msgid "Use _SSL"
 msgstr "Koristi _SSL"
 
-#: ../src/mailbox-conf.c:374
+#: ../src/mailbox-conf.c:372
 msgid "No mailbox selected."
 msgstr "Nijedno sanduče nije izabrano."
 
-#: ../src/mailbox-conf.c:404
+#: ../src/mailbox-conf.c:402
 #, c-format
 msgid ""
 "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
@@ -4118,7 +4031,7 @@ msgstr ""
 "Ako zaista želite da ga uklonim, dodelite njegovu funkciju\n"
 "nekom drugom sandučetu."
 
-#: ../src/mailbox-conf.c:414
+#: ../src/mailbox-conf.c:412
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
@@ -4133,15 +4046,15 @@ msgstr ""
 "biste ponovo pristupili sandučetu.\n"
 "Šta biste želeli da uradim?"
 
-#: ../src/mailbox-conf.c:426
+#: ../src/mailbox-conf.c:424
 msgid "Remove from _list"
 msgstr "Ukloni sa _spiska"
 
-#: ../src/mailbox-conf.c:427
+#: ../src/mailbox-conf.c:425
 msgid "Remove from list and _disk"
 msgstr "Ukloni sa spiska i sa _diska"
 
-#: ../src/mailbox-conf.c:435
+#: ../src/mailbox-conf.c:433
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" and all its messages from your IMAP "
@@ -4156,11 +4069,11 @@ msgstr ""
 "pod ovim imenom.\n"
 "Šta biste želeli da uradim?"
 
-#: ../src/mailbox-conf.c:448
+#: ../src/mailbox-conf.c:446
 msgid "_Remove from server"
 msgstr "_Ukloni sa servera"
 
-#: ../src/mailbox-conf.c:455
+#: ../src/mailbox-conf.c:453
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.\n"
@@ -4172,26 +4085,26 @@ msgstr ""
 "sandučetu.\n"
 "Šta biste želeli da uradim?"
 
-#: ../src/mailbox-conf.c:464
+#: ../src/mailbox-conf.c:462
 msgid "_Remove from list"
 msgstr "_Ukloni sa spiska"
 
-#: ../src/mailbox-conf.c:508
+#: ../src/mailbox-conf.c:506
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
 msgstr "Nisam uspeo da obrišem fasciklu. Evo zašto: %s"
 
-#: ../src/mailbox-conf.c:577 ../src/pref-manager.c:1712
-#: ../src/pref-manager.c:1784 ../src/pref-manager.c:2962
+#: ../src/mailbox-conf.c:575 ../src/pref-manager.c:1710
+#: ../src/pref-manager.c:1782 ../src/pref-manager.c:2960
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../src/mailbox-conf.c:800
+#: ../src/mailbox-conf.c:798
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: ../src/mailbox-conf.c:942
+#: ../src/mailbox-conf.c:940
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -4200,80 +4113,72 @@ msgstr ""
 "Nisam uspeo da preimenujem „%s“ u „%s“:\n"
 "%s"
 
-#: ../src/mailbox-conf.c:1152
-#| msgid "Mailbox _Name:"
+#: ../src/mailbox-conf.c:1150
 msgid "_Mailbox Name:"
 msgstr "_Naziv sandučeta:"
 
-#: ../src/mailbox-conf.c:1161
+#: ../src/mailbox-conf.c:1159
 #, c-format
-#| msgid ""
-#| "Local Mail Problem\n"
-#| "%s"
 msgid "Local %s Mailbox Properties"
 msgstr "Svojstva mesnog „%s“ sandučeta"
 
-#: ../src/mailbox-conf.c:1162
+#: ../src/mailbox-conf.c:1160
 #, c-format
-#| msgid "Local MH mailbox..."
 msgid "New Local %s Mailbox"
 msgstr "Novo mesno „%s“ sanduče"
 
-#: ../src/mailbox-conf.c:1204
+#: ../src/mailbox-conf.c:1202
 msgid "Remote Mailbox Configurator"
 msgstr "Podešavač udaljenog sandučeta"
 
 #. mailbox name
-#: ../src/mailbox-conf.c:1229 ../src/mailbox-conf.c:1341
-#| msgid "Mailbox _Name:"
+#: ../src/mailbox-conf.c:1227 ../src/mailbox-conf.c:1339
 msgid "Mailbox _name:"
 msgstr "Naziv _sandučeta:"
 
 #. password field
-#: ../src/mailbox-conf.c:1248 ../src/mailbox-conf.c:1375
+#: ../src/mailbox-conf.c:1246 ../src/mailbox-conf.c:1373
 msgid "Pass_word:"
 msgstr "Lo_zinka:"
 
-#: ../src/mailbox-conf.c:1256
+#: ../src/mailbox-conf.c:1254
 msgid "_Delete messages from server after download"
 msgstr "_Obriši poruke sa servera nakon preuzimanja"
 
-#: ../src/mailbox-conf.c:1261
+#: ../src/mailbox-conf.c:1259
 msgid "_Enable check for new mail"
 msgstr "_Uključi proveru za novom poštom"
 
-#: ../src/mailbox-conf.c:1266
+#: ../src/mailbox-conf.c:1264
 msgid "_Filter messages through procmail"
 msgstr "_Propusti poruke kroz „procmail“"
 
-#: ../src/mailbox-conf.c:1270
+#: ../src/mailbox-conf.c:1268
 msgid "Fi_lter Command:"
 msgstr "Naredba za _propuštanje:"
 
-#: ../src/mailbox-conf.c:1284
+#: ../src/mailbox-conf.c:1282
 msgid "Disable _APOP"
 msgstr "Isključi _APOP"
 
 #. username
-#: ../src/mailbox-conf.c:1355
+#: ../src/mailbox-conf.c:1353
 msgid "_Username:"
 msgstr "_Korisničko ime:"
 
-#: ../src/mailbox-conf.c:1380
-#| msgid "F_older Path:"
+#: ../src/mailbox-conf.c:1378
 msgid "F_older path:"
 msgstr "_Putanja fascikle:"
 
-#: ../src/mailbox-conf.c:1470
-#| msgid "Identity:"
+#: ../src/mailbox-conf.c:1468
 msgid "_Identity:"
 msgstr "_Ličnost:"
 
-#: ../src/mailbox-conf.c:1512 ../src/pref-manager.c:3432
+#: ../src/mailbox-conf.c:1510 ../src/pref-manager.c:3430
 msgid "Always"
 msgstr "Uvek"
 
-#: ../src/mailbox-conf.c:1516
+#: ../src/mailbox-conf.c:1514
 msgid ""
 "_Decrypt and check\n"
 "signatures automatically:"
@@ -4281,25 +4186,24 @@ msgstr ""
 "_Dešifruj i proveri\n"
 "potpise samostalno:"
 
-#: ../src/mailbox-conf.c:1547
+#: ../src/mailbox-conf.c:1545
 msgid "Show _Recipient column instead of Sender"
 msgstr "Prikaži kolonu _primaoca umesto pošiljaoca"
 
-#: ../src/mailbox-conf.c:1560
-#| msgid "_Enable check for new mail"
+#: ../src/mailbox-conf.c:1558
 msgid "_Subscribe for new mail check"
 msgstr "_Pretplati se za proveru nove pošte"
 
-#: ../src/mailbox-node.c:316
+#: ../src/mailbox-node.c:314
 msgid "The folder edition to be written."
 msgstr "Izdanje fascikle za upis."
 
-#: ../src/mailbox-node.c:491
+#: ../src/mailbox-node.c:489
 #, c-format
 msgid "Scanning %s. Please wait..."
 msgstr "Pregledam „%s“. Molim sačekajte..."
 
-#: ../src/mailbox-node.c:507
+#: ../src/mailbox-node.c:505
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
@@ -4308,205 +4212,202 @@ msgstr ""
 "Pregledanje „%s“ nije uspelo: %s\n"
 "Proverite povezanost na mrežu."
 
-#: ../src/mailbox-node.c:509
+#: ../src/mailbox-node.c:507
 #, c-format
 msgid "Scanning of %s failed: %s"
 msgstr "Pregledanje „%s“ nije uspelo: %s"
 
-#: ../src/mailbox-node.c:1046
+#: ../src/mailbox-node.c:1044
 msgid "Local _mbox mailbox..."
 msgstr "Mesno sanduče „_mbox“..."
 
-#: ../src/mailbox-node.c:1048
+#: ../src/mailbox-node.c:1046
 msgid "Local Mail_dir mailbox..."
 msgstr "Mesno sanduče „Mail_dir“..."
 
-#: ../src/mailbox-node.c:1050
+#: ../src/mailbox-node.c:1048
 msgid "Local M_H mailbox..."
 msgstr "Mesno sanduče „M_H“..."
 
-#: ../src/mailbox-node.c:1052
+#: ../src/mailbox-node.c:1050
 msgid "Remote _IMAP mailbox..."
 msgstr "Udaljeno sanduče _IMAP-a..."
 
-#: ../src/mailbox-node.c:1055
+#: ../src/mailbox-node.c:1053
 msgid "Remote IMAP _folder..."
 msgstr "Udaljena _fascikla IMAP-a..."
 
-#: ../src/mailbox-node.c:1057
+#: ../src/mailbox-node.c:1055
 msgid "Remote IMAP _subfolder..."
 msgstr "Udaljena podfa_scikla IMAP-a..."
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:1068 ../src/mailbox-node.c:1084
+#: ../src/mailbox-node.c:1066 ../src/mailbox-node.c:1082
 msgid "_Rescan"
 msgstr "Ponovo p_regledaj"
 
-#: ../src/mailbox-node.c:1078 ../src/main-window.c:508
+#: ../src/mailbox-node.c:1076 ../src/main-window.c:506
 msgid "_Properties..."
 msgstr "_Svojstva..."
 
-#: ../src/mailbox-node.c:1094
+#: ../src/mailbox-node.c:1092
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../src/mailbox-node.c:1108
+#: ../src/mailbox-node.c:1106
 msgid "_Subscribe"
 msgstr "Pre_tplati se"
 
-#: ../src/mailbox-node.c:1110
+#: ../src/mailbox-node.c:1108
 msgid "_Unsubscribe"
 msgstr "_Poništi pretplatu"
 
-#: ../src/mailbox-node.c:1116
+#: ../src/mailbox-node.c:1114
 msgid "Mark as _Inbox"
 msgstr "Označi kao „_dolazno“"
 
-#: ../src/mailbox-node.c:1118
+#: ../src/mailbox-node.c:1116
 msgid "_Mark as Sentbox"
 msgstr "Označi kao „_odlazno“"
 
-#: ../src/mailbox-node.c:1120
+#: ../src/mailbox-node.c:1118
 msgid "Mark as _Trash"
 msgstr "Označi kao „_smeće“"
 
-#: ../src/mailbox-node.c:1122
+#: ../src/mailbox-node.c:1120
 msgid "Mark as D_raftbox"
 msgstr "Označi kao „s_kice“"
 
-#: ../src/mailbox-node.c:1125
+#: ../src/mailbox-node.c:1123
 msgid "_Empty trash"
 msgstr "_Izbaci smeće"
 
-#: ../src/mailbox-node.c:1130
+#: ../src/mailbox-node.c:1128
 msgid "_Edit/Apply filters"
 msgstr "_Uredi/primeni propusnike"
 
-#: ../src/mailbox-node.c:1218
+#: ../src/mailbox-node.c:1216
 #, c-format
 msgid "The path \"%s\" does not lead to a mailbox."
 msgstr "Putanja „%s“ ne vodi ka sandučetu."
 
-#: ../src/mailbox-node.c:1231
+#: ../src/mailbox-node.c:1229
 #, c-format
 msgid "Local mailbox %s loaded as: %s\n"
 msgstr "Mesno sanduče „%s“ je učitano kao: %s\n"
 
-#: ../src/mailbox-node.c:1262
+#: ../src/mailbox-node.c:1260
 #, c-format
 msgid "Local folder %s\n"
 msgstr "Mesna fascikla „%s“\n"
 
-#: ../src/main.c:212
+#: ../src/main.c:210
 #, c-format
-#| msgid ""
-#| "Could not remove %s:\n"
-#| "%s"
 msgid "Could not write to %s: %s"
 msgstr "Ne mogu da upišem u „%s“: %s"
 
-#: ../src/main.c:462 ../src/main.c:511
+#: ../src/main.c:460 ../src/main.c:509
 msgid "Get new mail on startup"
 msgstr "Preuzima nove poruke pri pokretanju"
 
-#: ../src/main.c:464 ../src/main.c:513
+#: ../src/main.c:462 ../src/main.c:511
 msgid "Compose a new email to EMAIL ADDRESS"
 msgstr "Sastavlja novu poruku za „ADRESA EL POŠTE“"
 
-#: ../src/main.c:466
+#: ../src/main.c:464
 msgid "Attach file at PATH"
 msgstr "Prilaže datoteku iz putanje"
 
-#: ../src/main.c:468 ../src/main.c:518
+#: ../src/main.c:466 ../src/main.c:516
 msgid "Opens MAILBOXNAME"
 msgstr "Otvara NAZIVSANDUČETA"
 
-#: ../src/main.c:468 ../src/main.c:518
+#: ../src/main.c:466 ../src/main.c:516
 msgid "MAILBOXNAME"
 msgstr "NAZIVSANDUČETA"
 
-#: ../src/main.c:471 ../src/main.c:521
+#: ../src/main.c:469 ../src/main.c:519
 msgid "Opens first unread mailbox"
 msgstr "Otvara prvo nepročitano sanduče"
 
-#: ../src/main.c:474 ../src/main.c:524
+#: ../src/main.c:472 ../src/main.c:522
 msgid "Opens default Inbox on startup"
 msgstr "Otvara osnovno sanduče „dolazno“ pri pokretanju"
 
-#: ../src/main.c:477 ../src/main.c:527
+#: ../src/main.c:475 ../src/main.c:525
 msgid "Prints number unread and unsent messages"
 msgstr "Ispisuje broj nepročitanih i neposlatih poruka"
 
-#: ../src/main.c:479 ../src/main.c:529
+#: ../src/main.c:477 ../src/main.c:527
 msgid "Debug POP3 connection"
 msgstr "Popravlja POP3 vezu"
 
-#: ../src/main.c:481 ../src/main.c:531
+#: ../src/main.c:479 ../src/main.c:529
 msgid "Debug IMAP connection"
 msgstr "Popravlja IMAP vezu"
 
-#: ../src/main.c:503
+#: ../src/main.c:501
 msgid "The Balsa E-Mail Client"
 msgstr "Program za el. poštu Balsa"
 
-#: ../src/main.c:515
-#| msgid "Attach file at PATH"
+#: ../src/main.c:513
 msgid "Attach file at URI"
 msgstr "Prilaže datoteku iz putanje"
 
-#: ../src/main.c:556
+#: ../src/main.c:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Pokrenite „%s --help“ da vidite potpun spisak dostupnih parametara linije "
+msgstr ""
+"Pokrenite „%s --help“ da vidite potpun spisak dostupnih parametara linije "
 "naredbi.\n"
 
-#: ../src/main.c:603 ../src/main.c:608 ../src/main.c:614 ../src/main.c:620
-#: ../src/main.c:626
+#: ../src/main.c:601 ../src/main.c:606 ../src/main.c:612 ../src/main.c:618
+#: ../src/main.c:624
 #, c-format
 msgid "Balsa cannot open your \"%s\" mailbox."
 msgstr "Balsa ne može da otvori vaše sanduče „%s“."
 
-#: ../src/main.c:603
+#: ../src/main.c:601
 msgid "Inbox"
 msgstr "Primljene"
 
-#: ../src/main.c:609
+#: ../src/main.c:607
 msgid "Outbox"
 msgstr "Poslate"
 
-#: ../src/main.c:615
+#: ../src/main.c:613
 msgid "Sentbox"
 msgstr "Za slanje"
 
-#: ../src/main.c:621
+#: ../src/main.c:619
 msgid "Draftbox"
 msgstr "Nacrti"
 
-#: ../src/main.c:626
+#: ../src/main.c:624
 msgid "Trash"
 msgstr "Smeće"
 
-#: ../src/main.c:847
+#: ../src/main.c:843
 msgid "Compressing mail folders..."
 msgstr "Pakujem fascikle pošte..."
 
-#: ../src/main-window.c:324
+#: ../src/main-window.c:322
 msgid "Balsa closes files and connections. Please wait..."
 msgstr "Balsa je zatvorila datoteke i veze. Sačekajte..."
 
-#: ../src/main-window.c:349
+#: ../src/main-window.c:347
 msgid "Mail_box"
 msgstr "_Sanduče"
 
-#: ../src/main-window.c:350 ../src/message-window.c:243
+#: ../src/main-window.c:348 ../src/message-window.c:241
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../src/main-window.c:351
+#: ../src/main-window.c:349
 msgid "_Settings"
 msgstr "_Podešavanja"
 
-#: ../src/main-window.c:357
+#: ../src/main-window.c:355
 msgid "Mail_boxes"
 msgstr "_Sandučići"
 
@@ -4515,392 +4416,392 @@ msgstr "_Sandučići"
 #. Less frequently used entries of the 'File' menu
 #. Less frequently used entries of the 'Edit' menu
 #. Less frequently used entries of the 'Tools' menu
-#: ../src/main-window.c:359 ../src/main-window.c:364
-#: ../src/sendmsg-window.c:328 ../src/sendmsg-window.c:330
-#: ../src/sendmsg-window.c:332
+#: ../src/main-window.c:357 ../src/main-window.c:362
+#: ../src/sendmsg-window.c:330 ../src/sendmsg-window.c:332
+#: ../src/sendmsg-window.c:334
 msgid "_More"
 msgstr "_Još"
 
-#: ../src/main-window.c:360
+#: ../src/main-window.c:358
 msgid "_Headers"
 msgstr "_Zaglavlja"
 
-#: ../src/main-window.c:361
+#: ../src/main-window.c:359
 msgid "_Sort Mailbox"
 msgstr "Pore_đaj sanduče"
 
-#: ../src/main-window.c:362
+#: ../src/main-window.c:360
 msgid "H_ide messages"
 msgstr "_Sakrij poruke"
 
-#: ../src/main-window.c:365 ../src/sendmsg-window.c:326
+#: ../src/main-window.c:363 ../src/sendmsg-window.c:328
 msgid "_Tools"
 msgstr "_Alatke"
 
-#: ../src/main-window.c:366
+#: ../src/main-window.c:364
 msgid "_Filters"
 msgstr "_Propusnici"
 
-#: ../src/main-window.c:367
+#: ../src/main-window.c:365
 msgid "F_ilters"
 msgstr "Propisn_ici"
 
-#: ../src/main-window.c:368 ../src/main-window.c:424
+#: ../src/main-window.c:366 ../src/main-window.c:422
 msgid "Manage filters"
 msgstr "Upravljajte propusnicima"
 
 #. File menu items
 #. Not in the touchpad menu, but still available as a toolbar
 #. * button:
-#: ../src/main-window.c:373
+#: ../src/main-window.c:371
 msgid "_Continue"
 msgstr "_Nastavi"
 
-#: ../src/main-window.c:374
+#: ../src/main-window.c:372
 msgid "Continue editing current message"
 msgstr "Nastavite uređivanje trenutne poruke"
 
-#: ../src/main-window.c:376
+#: ../src/main-window.c:374
 msgid "_Get New Mail"
 msgstr "_Preuzmi novu poštu"
 
-#: ../src/main-window.c:377
+#: ../src/main-window.c:375
 msgid "Fetch new incoming mail"
 msgstr "Preuzmite novu poštu"
 
-#: ../src/main-window.c:378
+#: ../src/main-window.c:376
 msgid "_Send Queued Mail"
 msgstr "Pošalji poštu koja _čeka"
 
-#: ../src/main-window.c:379
+#: ../src/main-window.c:377
 msgid "Send messages from the outbox"
 msgstr "Pošaljite poruke iz odlaznog sandučeta"
 
-#: ../src/main-window.c:382
+#: ../src/main-window.c:380
 msgid "Send and _Receive Mail"
 msgstr "Pošalji i _primi poštu"
 
-#: ../src/main-window.c:383
+#: ../src/main-window.c:381
 msgid "Send and Receive messages"
 msgstr "Pošaljite i primite poruke"
 
-#: ../src/main-window.c:385 ../src/message-window.c:244
-#: ../src/sendmsg-window.c:345
+#: ../src/main-window.c:383 ../src/message-window.c:242
+#: ../src/sendmsg-window.c:347
 msgid "Page _Setup"
 msgstr "_Podesi stranicu"
 
-#: ../src/main-window.c:386 ../src/message-window.c:245
-#: ../src/sendmsg-window.c:346
+#: ../src/main-window.c:384 ../src/message-window.c:243
+#: ../src/sendmsg-window.c:348
 msgid "Set up page for printing"
 msgstr "Podesite osobine stranice za štampanje"
 
-#: ../src/main-window.c:387
+#: ../src/main-window.c:385
 msgid "_Address Book..."
 msgstr "_Adresar..."
 
-#: ../src/main-window.c:388
+#: ../src/main-window.c:386
 msgid "Open the address book"
 msgstr "Otvorite adresar"
 
-#: ../src/main-window.c:389
+#: ../src/main-window.c:387
 msgid "Quit Balsa"
 msgstr "Izađite iz Balse"
 
 #. File:New submenu items
-#: ../src/main-window.c:392
+#: ../src/main-window.c:390
 msgid "_Message..."
 msgstr "_Poruka..."
 
-#: ../src/main-window.c:393
+#: ../src/main-window.c:391
 msgid "Compose a new message"
 msgstr "Sastavite novu poruku"
 
-#: ../src/main-window.c:395
+#: ../src/main-window.c:393
 msgid "Local mbox mailbox..."
 msgstr "Mesno mboks sanduče..."
 
-#: ../src/main-window.c:396 ../src/main-window.c:405
+#: ../src/main-window.c:394 ../src/main-window.c:403
 msgid "Add a new mbox style mailbox"
 msgstr "Dodajte novo mboks sanduče"
 
-#: ../src/main-window.c:398
+#: ../src/main-window.c:396
 msgid "Local Maildir mailbox..."
 msgstr "Mesno Mejldir sanduče..."
 
-#: ../src/main-window.c:399 ../src/main-window.c:408
+#: ../src/main-window.c:397 ../src/main-window.c:406
 msgid "Add a new Maildir style mailbox"
 msgstr "Dodajte novo Mejldir sanduče"
 
-#: ../src/main-window.c:401
+#: ../src/main-window.c:399
 msgid "Local MH mailbox..."
 msgstr "Mesno MH sanduče..."
 
-#: ../src/main-window.c:402 ../src/main-window.c:411
+#: ../src/main-window.c:400 ../src/main-window.c:409
 msgid "Add a new MH style mailbox"
 msgstr "Dodajte novo MH sanduče"
 
-#: ../src/main-window.c:404
+#: ../src/main-window.c:402
 msgid "New mailbox..."
 msgstr "Novo sanduče..."
 
-#: ../src/main-window.c:407
+#: ../src/main-window.c:405
 msgid "New \"Maildir\" mailbox..."
 msgstr "Novo „Mejldir“ sanduče..."
 
-#: ../src/main-window.c:410
+#: ../src/main-window.c:408
 msgid "New \"MH\" mailbox..."
 msgstr "Novo „MH“ sanduče..."
 
-#: ../src/main-window.c:413 ../src/pref-manager.c:3281
+#: ../src/main-window.c:411 ../src/pref-manager.c:3279
 msgid "Remote IMAP mailbox..."
 msgstr "Udaljeno IMAP sanduče..."
 
-#: ../src/main-window.c:414
+#: ../src/main-window.c:412
 msgid "Add a new IMAP mailbox"
 msgstr "Dodajte novo IMAP sanduče"
 
-#: ../src/main-window.c:415 ../src/pref-manager.c:3286
+#: ../src/main-window.c:413 ../src/pref-manager.c:3284
 msgid "Remote IMAP folder..."
 msgstr "Udaljena IMAP fascikla..."
 
-#: ../src/main-window.c:416
+#: ../src/main-window.c:414
 msgid "Add a new IMAP folder"
 msgstr "Dodajte novu IMAP fasciklu"
 
-#: ../src/main-window.c:417
+#: ../src/main-window.c:415
 msgid "Remote IMAP subfolder..."
 msgstr "Udaljena IMAP podfascikla..."
 
-#: ../src/main-window.c:418
+#: ../src/main-window.c:416
 msgid "Add a new IMAP subfolder"
 msgstr "Dodajte novu IMAP podfasciklu"
 
-#: ../src/main-window.c:423
+#: ../src/main-window.c:421
 msgid "F_ilters..."
 msgstr "_Propusnici..."
 
 #. Export selected filters to a text file.
-#: ../src/main-window.c:426
+#: ../src/main-window.c:424
 msgid "_Export Filters..."
 msgstr "_Izvezi propusnike..."
 
-#: ../src/main-window.c:427
+#: ../src/main-window.c:425
 msgid "Export filters as Sieve scripts"
 msgstr "Izvezite propusnike kao Sjev skripte"
 
-#: ../src/main-window.c:428
+#: ../src/main-window.c:426
 msgid "Prefere_nces"
 msgstr "Pos_tavke"
 
 #. View menu items
-#: ../src/main-window.c:431
+#: ../src/main-window.c:429
 msgid "E_xpand All"
 msgstr "_Raširi sve"
 
-#: ../src/main-window.c:432
+#: ../src/main-window.c:430
 msgid "Expand all threads"
 msgstr "Raširite sve poruke"
 
-#: ../src/main-window.c:433
+#: ../src/main-window.c:431
 msgid "_Collapse All"
 msgstr "_Skupi sve"
 
-#: ../src/main-window.c:434
+#: ../src/main-window.c:432
 msgid "Collapse all expanded threads"
 msgstr "Skupite sve raširene poruke"
 
-#: ../src/main-window.c:436 ../src/message-window.c:259
+#: ../src/main-window.c:434 ../src/message-window.c:257
 msgid "Zoom _In"
 msgstr "U_većaj"
 
-#: ../src/main-window.c:437 ../src/message-window.c:260
+#: ../src/main-window.c:435 ../src/message-window.c:258
 msgid "Increase magnification"
 msgstr "Uvećajte prikaz"
 
-#: ../src/main-window.c:438 ../src/message-window.c:261
+#: ../src/main-window.c:436 ../src/message-window.c:259
 msgid "Zoom _Out"
 msgstr "U_manji"
 
-#: ../src/main-window.c:439 ../src/message-window.c:262
+#: ../src/main-window.c:437 ../src/message-window.c:260
 msgid "Decrease magnification"
 msgstr "Umanjite prikaz"
 
 #. To warn msgfmt that the % sign isn't a format specifier:
-#: ../src/main-window.c:442 ../src/message-window.c:265
+#: ../src/main-window.c:440 ../src/message-window.c:263
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Uvećaj na _100%"
 
-#: ../src/main-window.c:443 ../src/message-window.c:266
+#: ../src/main-window.c:441 ../src/message-window.c:264
 msgid "No magnification"
 msgstr "Bez uveličanja"
 
 #. Mailbox menu item that does not require a mailbox
-#: ../src/main-window.c:446 ../src/main-window.c:447
-#: ../src/message-window.c:300 ../src/message-window.c:301
+#: ../src/main-window.c:444 ../src/main-window.c:445
+#: ../src/message-window.c:298 ../src/message-window.c:299
 msgid "Next Unread Message"
 msgstr "Sledeća nepročitana poruka"
 
-#: ../src/main-window.c:449
+#: ../src/main-window.c:447
 msgid "Empty _Trash"
 msgstr "Isprazni _smeće"
 
-#: ../src/main-window.c:450
+#: ../src/main-window.c:448
 msgid "Delete messages from the Trash mailbox"
 msgstr "Obrišite sve poruke iz smeća"
 
 #. Settings menu items
-#: ../src/main-window.c:453
+#: ../src/main-window.c:451
 msgid "_Toolbars..."
 msgstr "_Palete alatki..."
 
-#: ../src/main-window.c:454
+#: ../src/main-window.c:452
 msgid "Customize toolbars"
 msgstr "Prilagodite palete alatki"
 
-#: ../src/main-window.c:455
+#: ../src/main-window.c:453
 msgid "_Identities..."
 msgstr "_Ličnosti..."
 
-#: ../src/main-window.c:456
+#: ../src/main-window.c:454
 msgid "Create and set current identities"
 msgstr "Napravite i postavite tekuću ličnost"
 
 #. Help menu items
-#: ../src/main-window.c:459
+#: ../src/main-window.c:457
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../src/main-window.c:460
+#: ../src/main-window.c:458
 msgid "Table of Contents"
 msgstr "Prikažite sadržaj pomoći"
 
 #. license ?
-#: ../src/main-window.c:481 ../src/main-window.c:2776
+#: ../src/main-window.c:479 ../src/main-window.c:2774
 msgid "About Balsa"
 msgstr "O Balsi"
 
 #. Edit menu items
-#: ../src/main-window.c:488 ../src/message-window.c:253
-#: ../src/sendmsg-window.c:362
+#: ../src/main-window.c:486 ../src/message-window.c:251
+#: ../src/sendmsg-window.c:364
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
-#: ../src/main-window.c:490
+#: ../src/main-window.c:488
 msgid "_Find"
 msgstr "_Nađi"
 
-#: ../src/main-window.c:492
+#: ../src/main-window.c:490
 msgid "Find Ne_xt"
 msgstr "Nađi _sledeće"
 
 #. Mailbox menu items
-#: ../src/main-window.c:495 ../src/main-window.c:496
-#: ../src/message-window.c:298 ../src/message-window.c:299
+#: ../src/main-window.c:493 ../src/main-window.c:494
+#: ../src/message-window.c:296 ../src/message-window.c:297
 msgid "Next Message"
 msgstr "Sledeća poruka"
 
-#: ../src/main-window.c:497 ../src/main-window.c:498
-#: ../src/message-window.c:303 ../src/message-window.c:304
+#: ../src/main-window.c:495 ../src/main-window.c:496
+#: ../src/message-window.c:301 ../src/message-window.c:302
 msgid "Previous Message"
 msgstr "Prethodna poruka"
 
-#: ../src/main-window.c:499 ../src/main-window.c:500
-#: ../src/message-window.c:305 ../src/message-window.c:306
+#: ../src/main-window.c:497 ../src/main-window.c:498
+#: ../src/message-window.c:303 ../src/message-window.c:304
 msgid "Next Flagged Message"
 msgstr "Sledeća označena poruka"
 
-#: ../src/main-window.c:502
+#: ../src/main-window.c:500
 msgid "_Hide Messages"
 msgstr "_Sakrij poruke"
 
-#: ../src/main-window.c:503
+#: ../src/main-window.c:501
 msgid "_Reset Filter"
 msgstr "_Očisti propusnik"
 
-#: ../src/main-window.c:504
+#: ../src/main-window.c:502
 msgid "Reset mailbox filter"
 msgstr "Očistite propusnik sandučeta"
 
-#: ../src/main-window.c:505
+#: ../src/main-window.c:503
 msgid "_Select All"
 msgstr "Izaberi _sve"
 
-#: ../src/main-window.c:506
+#: ../src/main-window.c:504
 msgid "Select all messages in current mailbox"
 msgstr "Izaberite sve poruke u trenutnom sandučetu"
 
-#: ../src/main-window.c:509
+#: ../src/main-window.c:507
 msgid "Edit the selected mailbox"
 msgstr "Uredite izabrano sanduče"
 
-#: ../src/main-window.c:510
+#: ../src/main-window.c:508
 msgid "_Delete..."
 msgstr "_Obriši..."
 
-#: ../src/main-window.c:511
+#: ../src/main-window.c:509
 msgid "Delete the selected mailbox"
 msgstr "Obrišite izabrano sanduče"
 
 # bug: plural-forms
-#: ../src/main-window.c:514 ../src/main-window.c:517
+#: ../src/main-window.c:512 ../src/main-window.c:515
 msgid "E_xpunge Deleted Messages"
 msgstr "_Izbaci obrisane poruke"
 
-#: ../src/main-window.c:515 ../src/main-window.c:518
+#: ../src/main-window.c:513 ../src/main-window.c:516
 msgid "Expunge messages marked as deleted in the current mailbox"
 msgstr "Izbacite poruke koje su obrisane iz trenutnog sandučeta"
 
-#: ../src/main-window.c:521
+#: ../src/main-window.c:519
 msgid "Close mailbox"
 msgstr "Zatvorite sanduče"
 
-#: ../src/main-window.c:523
+#: ../src/main-window.c:521
 msgid "Select _Filters"
 msgstr "Izaberi _propusnike"
 
-#: ../src/main-window.c:524
+#: ../src/main-window.c:522
 msgid "Select filters to be applied automatically to current mailbox"
 msgstr ""
 "Izaberite propusnike koji će biti primenjeni automatski za trenutno sanduče"
 
-#: ../src/main-window.c:527
+#: ../src/main-window.c:525
 msgid "_Remove Duplicates"
 msgstr "_Ukloni duplikate"
 
-#: ../src/main-window.c:528
+#: ../src/main-window.c:526
 msgid "Remove duplicated messages from the current mailbox"
 msgstr "Uklonite duplirane poruke iz trenutnog sandučeta"
 
-#: ../src/main-window.c:538 ../src/message-window.c:269
+#: ../src/main-window.c:536 ../src/message-window.c:267
 msgid "Reply to the current message"
 msgstr "Odgovorite na trenutnu poruku"
 
-#: ../src/main-window.c:539 ../src/message-window.c:270
+#: ../src/main-window.c:537 ../src/message-window.c:268
 msgid "Reply to _All..."
 msgstr "Odgovori _svima..."
 
-#: ../src/main-window.c:540 ../src/message-window.c:271
+#: ../src/main-window.c:538 ../src/message-window.c:269
 msgid "Reply to all recipients of the current message"
 msgstr "Odgovorite svim primaocima trenutne poruke"
 
-#: ../src/main-window.c:542 ../src/message-window.c:273
+#: ../src/main-window.c:540 ../src/message-window.c:271
 msgid "Reply to _Group..."
 msgstr "Odgovori _grupi..."
 
-#: ../src/main-window.c:543 ../src/message-window.c:274
+#: ../src/main-window.c:541 ../src/message-window.c:272
 msgid "Reply to mailing list"
 msgstr "Odgovorite na dopisnu listu"
 
-#: ../src/main-window.c:545
+#: ../src/main-window.c:543
 msgid "Store address of sender in addressbook"
 msgstr "Sačuvajte adresu pošiljaoca u adresar"
 
-#: ../src/main-window.c:547 ../src/message-window.c:278
+#: ../src/main-window.c:545 ../src/message-window.c:276
 msgid "_View Source..."
 msgstr "Prikaži _izvorno..."
 
-#: ../src/main-window.c:548 ../src/message-window.c:279
+#: ../src/main-window.c:546 ../src/message-window.c:277
 msgid "View source form of the message"
 msgstr "Prikažite izvorni kod poruke"
 
@@ -4908,205 +4809,204 @@ msgstr "Prikažite izvorni kod poruke"
 #. * stock_id; the first in this list defines the action tied to the
 #. * toolbar's Forward button, so "ForwardDefault" must come before
 #. * the others.
-#: ../src/main-window.c:554
+#: ../src/main-window.c:552
 msgid "_Forward..."
 msgstr "_Prosledi..."
 
-#: ../src/main-window.c:555 ../src/message-window.c:285
+#: ../src/main-window.c:553 ../src/message-window.c:283
 msgid "Forward the current message"
 msgstr "Prosledite trenutnu poruku"
 
-#: ../src/main-window.c:558 ../src/message-window.c:287
+#: ../src/main-window.c:556 ../src/message-window.c:285
 msgid "_Forward attached..."
 msgstr "Prosledi kao _prilog..."
 
-#: ../src/main-window.c:559 ../src/message-window.c:288
+#: ../src/main-window.c:557 ../src/message-window.c:286
 msgid "Forward the current message as attachment"
 msgstr "Prosledite trenutnu poruku kao prilog"
 
-#: ../src/main-window.c:561 ../src/message-window.c:290
+#: ../src/main-window.c:559 ../src/message-window.c:288
 msgid "Forward _inline..."
 msgstr "Prosledi u _telu..."
 
-#: ../src/main-window.c:562 ../src/message-window.c:291
+#: ../src/main-window.c:560 ../src/message-window.c:289
 msgid "Forward the current message inline"
 msgstr "Prosledite trenutnu poruku u telu poruke"
 
-#: ../src/main-window.c:565
+#: ../src/main-window.c:563
 msgid "Pipe the message through another program"
 msgstr "Prespojte poruku kroz drugi program"
 
-#: ../src/main-window.c:567
+#: ../src/main-window.c:565
 msgid "Select _Thread"
 msgstr "Izaberi _temu"
 
-#: ../src/main-window.c:568
-#| msgid "Select all messages in current mailbox"
+#: ../src/main-window.c:566
 msgid "Select all messages in current thread"
 msgstr "Izaberite sve poruke u trenutnoj temi"
 
 #. File menu item
-#: ../src/main-window.c:576 ../src/message-window.c:246
-#: ../src/sendmsg-window.c:348
+#: ../src/main-window.c:574 ../src/message-window.c:244
+#: ../src/sendmsg-window.c:350
 msgid "_Print..."
 msgstr "_Štampaj..."
 
-#: ../src/main-window.c:577 ../src/message-window.c:247
+#: ../src/main-window.c:575 ../src/message-window.c:245
 msgid "Print current message"
 msgstr "Štampajte trenutnu poruku"
 
-#: ../src/main-window.c:578 ../src/message-window.c:275
+#: ../src/main-window.c:576 ../src/message-window.c:273
 msgid "Save Current Part..."
 msgstr "Sačuvaj tekući deo..."
 
-#: ../src/main-window.c:579 ../src/message-window.c:276
+#: ../src/main-window.c:577 ../src/message-window.c:274
 msgid "Save currently displayed part of message"
 msgstr "Sačuvajte trenutno prikazani deo poruke"
 
-#: ../src/main-window.c:582 ../src/message-window.c:293
+#: ../src/main-window.c:580 ../src/message-window.c:291
 msgid "_Next Part"
 msgstr "_Sledeći deo"
 
-#: ../src/main-window.c:583 ../src/message-window.c:294
+#: ../src/main-window.c:581 ../src/message-window.c:292
 msgid "Next part in message"
 msgstr "Prikažite sledeći deo poruke"
 
-#: ../src/main-window.c:584 ../src/message-window.c:295
+#: ../src/main-window.c:582 ../src/message-window.c:293
 msgid "_Previous Part"
 msgstr "_Prethodni deo"
 
-#: ../src/main-window.c:585 ../src/message-window.c:296
+#: ../src/main-window.c:583 ../src/message-window.c:294
 msgid "Previous part in message"
 msgstr "Prikažite prethodni deo poruke"
 
-#: ../src/main-window.c:588
+#: ../src/main-window.c:586
 msgid "Copy message"
 msgstr "Umnožite poruku"
 
-#: ../src/main-window.c:591
+#: ../src/main-window.c:589
 msgid "Find in _Message"
 msgstr "_Nađi unutar poruke"
 
-#: ../src/main-window.c:592 ../src/message-window.c:256
+#: ../src/main-window.c:590 ../src/message-window.c:254
 msgid "Find a string in this message"
 msgstr "Pronađite zadati tekst unutar poruke"
 
-#: ../src/main-window.c:602 ../src/message-window.c:308
+#: ../src/main-window.c:600 ../src/message-window.c:306
 msgid "_Move to Trash"
 msgstr "Pre_mesti u smeće"
 
-#: ../src/main-window.c:603 ../src/main-window.c:607
+#: ../src/main-window.c:601 ../src/main-window.c:605
 msgid "Move the current message to Trash mailbox"
 msgstr "Premestite poruku u smeće"
 
-#: ../src/main-window.c:606
+#: ../src/main-window.c:604
 msgid "_Delete to Trash"
 msgstr "_Obriši u smeće"
 
-#: ../src/main-window.c:610 ../src/main-window.c:619
+#: ../src/main-window.c:608 ../src/main-window.c:617
 msgid "Toggle New"
 msgstr "Izmeni novu"
 
-#: ../src/main-window.c:612
+#: ../src/main-window.c:610
 msgid "_Toggle Flag"
 msgstr "_Izmeni oznaku"
 
-#: ../src/main-window.c:615
+#: ../src/main-window.c:613
 msgid "Toggle flagged"
 msgstr "Izmenite da je označena"
 
 #. Hide messages menu items
-#: ../src/main-window.c:616 ../src/main-window.c:651
+#: ../src/main-window.c:614 ../src/main-window.c:649
 msgid "_Deleted"
 msgstr "_Obrisana"
 
-#: ../src/main-window.c:617
+#: ../src/main-window.c:615
 msgid "Toggle deleted flag"
 msgstr "Izmenite da je obrisana"
 
-#: ../src/main-window.c:620 ../src/main-window.c:663
+#: ../src/main-window.c:618 ../src/main-window.c:661
 msgid "_Answered"
 msgstr "_Odgovoreno"
 
-#: ../src/main-window.c:621
+#: ../src/main-window.c:619
 msgid "Toggle Answered"
 msgstr "Izmenite da je odgovoreno"
 
-#: ../src/main-window.c:628
+#: ../src/main-window.c:626
 msgid "_Show Mailbox Tree"
 msgstr "Prikaži _stablo sandučeta"
 
-#: ../src/main-window.c:629
+#: ../src/main-window.c:627
 msgid "Toggle display of mailbox and folder tree"
 msgstr "Izmenite prikaz stabla sandučića i fascikli"
 
-#: ../src/main-window.c:631
+#: ../src/main-window.c:629
 msgid "Show Mailbox _Tabs"
 msgstr "Prikaži _listove sandučića"
 
-#: ../src/main-window.c:632
+#: ../src/main-window.c:630
 msgid "Toggle display of mailbox notebook tabs"
 msgstr "Izmenite prikaz sandučića u vidu jezičaka"
 
-#: ../src/main-window.c:634 ../src/message-window.c:315
+#: ../src/main-window.c:632 ../src/message-window.c:313
 msgid "Show Too_lbar"
 msgstr "Prikaži paletu _alatki"
 
-#: ../src/main-window.c:636
+#: ../src/main-window.c:634
 msgid "Show St_atus Bar"
 msgstr "Prikažu traku _stanja"
 
-#: ../src/main-window.c:638
+#: ../src/main-window.c:636
 msgid "Show _Index Filter"
 msgstr "Prikaži _propusnik pretrage"
 
-#: ../src/main-window.c:641
+#: ../src/main-window.c:639
 msgid "_Descending"
 msgstr "_Opadajuće"
 
-#: ../src/main-window.c:642
+#: ../src/main-window.c:640
 msgid "Sort in a descending order"
 msgstr "Poređajte stavke u opadajućem redosledu"
 
-#: ../src/main-window.c:644
+#: ../src/main-window.c:642
 msgid "_View filter"
 msgstr "_Propusnik pregleda"
 
-#: ../src/main-window.c:645
+#: ../src/main-window.c:643
 msgid "Enable quick message index filter"
 msgstr "Uključite brzi propusnik popisa poruka"
 
-#: ../src/main-window.c:648 ../src/message-window.c:317
+#: ../src/main-window.c:646 ../src/message-window.c:315
 msgid "_Wrap"
 msgstr "_Prelomi"
 
-#: ../src/main-window.c:648 ../src/message-window.c:317
-#: ../src/sendmsg-window.c:365
+#: ../src/main-window.c:646 ../src/message-window.c:315
+#: ../src/sendmsg-window.c:367
 msgid "Wrap message lines"
 msgstr "Prelomite redove poruka"
 
-#: ../src/main-window.c:653
+#: ../src/main-window.c:651
 msgid "Un_Deleted"
 msgstr "Od_obrisana"
 
-#: ../src/main-window.c:655
+#: ../src/main-window.c:653
 msgid "_Read"
 msgstr "_Pročitana"
 
-#: ../src/main-window.c:657
+#: ../src/main-window.c:655
 msgid "Un_read"
 msgstr "_Nepročitana"
 
-#: ../src/main-window.c:661
+#: ../src/main-window.c:659
 msgid "Un_flagged"
 msgstr "_Neoznačena"
 
-#: ../src/main-window.c:665
+#: ../src/main-window.c:663
 msgid "Un_answered"
 msgstr "_Odgovoreno"
 
 #. Toolbar items not on any menu
-#: ../src/main-window.c:668 ../src/toolbar-factory.c:161
+#: ../src/main-window.c:666 ../src/toolbar-factory.c:159
 msgid ""
 "All\n"
 "headers"
@@ -5114,107 +5014,107 @@ msgstr ""
 "Sva\n"
 "zaglavlja"
 
-#: ../src/main-window.c:669 ../src/message-window.c:320
+#: ../src/main-window.c:667 ../src/message-window.c:318
 msgid "Show all headers"
 msgstr "Prikažite sva zaglavlja"
 
-#: ../src/main-window.c:671 ../src/toolbar-factory.c:163
+#: ../src/main-window.c:669 ../src/toolbar-factory.c:161
 msgid "Msg Preview"
 msgstr "Pregled poruke"
 
-#: ../src/main-window.c:672
+#: ../src/main-window.c:670
 msgid "Show preview pane"
 msgstr "Pokažite površ za pregled"
 
-#: ../src/main-window.c:678 ../src/message-window.c:326
+#: ../src/main-window.c:676 ../src/message-window.c:324
 msgid "_No Headers"
 msgstr "Bez _zaglavlja"
 
-#: ../src/main-window.c:679 ../src/message-window.c:327
+#: ../src/main-window.c:677 ../src/message-window.c:325
 msgid "Display no headers"
 msgstr "Ne prikazujte zaglavlja poruka"
 
-#: ../src/main-window.c:680
+#: ../src/main-window.c:678
 msgid "S_elected Headers"
 msgstr "_Izabrana zaglavlja"
 
-#: ../src/main-window.c:681 ../src/message-window.c:329
+#: ../src/main-window.c:679 ../src/message-window.c:327
 msgid "Display selected headers"
 msgstr "Prikažite samo izabrana zaglavlja"
 
-#: ../src/main-window.c:682 ../src/message-window.c:330
+#: ../src/main-window.c:680 ../src/message-window.c:328
 msgid "All _Headers"
 msgstr "S_va zaglavlja"
 
-#: ../src/main-window.c:683 ../src/message-window.c:331
+#: ../src/main-window.c:681 ../src/message-window.c:329
 msgid "Display all headers"
 msgstr "Prikažite sva zaglavlja"
 
-#: ../src/main-window.c:687
+#: ../src/main-window.c:685
 msgid "_Flat index"
 msgstr "_Bez grupisanja rasprava"
 
-#: ../src/main-window.c:688
+#: ../src/main-window.c:686
 msgid "No threading at all"
 msgstr "Ne grupišite poruke po raspravama"
 
-#: ../src/main-window.c:689
+#: ../src/main-window.c:687
 msgid "Si_mple threading"
 msgstr "_Jednostavno grupisanje"
 
-#: ../src/main-window.c:690
+#: ../src/main-window.c:688
 msgid "Simple threading algorithm"
 msgstr "Primenite jednostavan nači za prikaz rasprava"
 
-#: ../src/main-window.c:691
+#: ../src/main-window.c:689
 msgid "_JWZ threading"
 msgstr "_Napredno grupisanje"
 
-#: ../src/main-window.c:692
+#: ../src/main-window.c:690
 msgid "Elaborate JWZ threading"
 msgstr "Primenite napredan način za grupisanje rasprava"
 
-#: ../src/main-window.c:697
+#: ../src/main-window.c:695
 msgid "By _Arrival"
 msgstr "Prema datumu _prispeća"
 
-#: ../src/main-window.c:698
+#: ../src/main-window.c:696
 msgid "Arrival order"
 msgstr "Sredite poruke prema datumu prispeća"
 
-#: ../src/main-window.c:699
+#: ../src/main-window.c:697
 msgid "By _Sender"
 msgstr "Prema po_šiljaocu"
 
-#: ../src/main-window.c:700
+#: ../src/main-window.c:698
 msgid "Sender order"
 msgstr "Sredite poruke na osnovu toga ko ih je poslao"
 
-#: ../src/main-window.c:701
+#: ../src/main-window.c:699
 msgid "By S_ubject"
 msgstr "Prema _temi"
 
-#: ../src/main-window.c:702
+#: ../src/main-window.c:700
 msgid "Subject order"
 msgstr "Sredite poruke prema nazivu teme"
 
-#: ../src/main-window.c:703
+#: ../src/main-window.c:701
 msgid "By Si_ze"
 msgstr "Prema _veličini"
 
-#: ../src/main-window.c:704
+#: ../src/main-window.c:702
 msgid "By message size"
 msgstr "Sredite poruke prema njihovoj veličini"
 
-#: ../src/main-window.c:705
+#: ../src/main-window.c:703
 msgid "_Threaded"
 msgstr "_Prema raspravi"
 
-#: ../src/main-window.c:706
+#: ../src/main-window.c:704
 msgid "Use message threading"
 msgstr "Sredite poruke prema raspravi"
 
-#: ../src/main-window.c:1067
+#: ../src/main-window.c:1065
 msgid ""
 "Balsa is sending a mail now.\n"
 "Abort sending?"
@@ -5222,36 +5122,36 @@ msgstr ""
 "Balsa trenutno šalje poruku.\n"
 "Da prekinem slanje?"
 
-#: ../src/main-window.c:1237
+#: ../src/main-window.c:1235
 msgid "Subject or Sender Contains:"
 msgstr "Tema ili pošiljalac sadrže:"
 
-#: ../src/main-window.c:1238
+#: ../src/main-window.c:1236
 msgid "Subject or Recipient Contains:"
 msgstr "Tema ili primalac sadrže:"
 
-#: ../src/main-window.c:1239
+#: ../src/main-window.c:1237
 msgid "Subject Contains:"
 msgstr "Tema sadrži:"
 
-#: ../src/main-window.c:1240
+#: ../src/main-window.c:1238
 msgid "Body Contains:"
 msgstr "Telo poruke sadrži:"
 
-#: ../src/main-window.c:1241
+#: ../src/main-window.c:1239
 msgid "Older than (days):"
 msgstr "Starije od (u danima):"
 
-#: ../src/main-window.c:1242
+#: ../src/main-window.c:1240
 msgid "Old at most (days):"
 msgstr "Staro barem (u danima):"
 
-#: ../src/main-window.c:2371
+#: ../src/main-window.c:2369
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: ../src/main-window.c:2388
+#: ../src/main-window.c:2386
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -5260,7 +5160,7 @@ msgstr ""
 "Ne mogu da otvorim sanduče!\n"
 "%s."
 
-#: ../src/main-window.c:2760
+#: ../src/main-window.c:2758
 msgid "translator-credits"
 msgstr ""
 "Danilo Šegan <danilo prevod org>\n"
@@ -5269,35 +5169,35 @@ msgstr ""
 "\n"
 "Prevod.org — prevod na srpski jezik."
 
-#: ../src/main-window.c:2771
+#: ../src/main-window.c:2769
 msgid "The Balsa email client is part of the GNOME desktop environment."
 msgstr "Program za el. poštu, Balsa, je deo Gnomovog radnog okruženja."
 
-#: ../src/main-window.c:2873 ../src/main-window.c:2891
+#: ../src/main-window.c:2871 ../src/main-window.c:2889
 msgid "Checking Mail..."
 msgstr "Proveravam poštu..."
 
-#: ../src/main-window.c:3094
+#: ../src/main-window.c:3092
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "IMAP sanduče: %s"
 
-#: ../src/main-window.c:3098
+#: ../src/main-window.c:3096
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Mesno sanduče: %s"
 
-#: ../src/main-window.c:3254
+#: ../src/main-window.c:3252
 msgid "Finished Checking."
 msgstr "Provera je završena."
 
-#: ../src/main-window.c:3319
+#: ../src/main-window.c:3317
 #, c-format
 msgid "Sending error: %s"
 msgstr "Greška pri slanju: %s"
 
 # bug: plural-forms
-#: ../src/main-window.c:3384
+#: ../src/main-window.c:3382
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -5306,12 +5206,12 @@ msgstr[1] "Primili ste %d nove poruke."
 msgstr[2] "Primili ste %d novih poruka."
 msgstr[3] "Primili ste jednu novu poruku."
 
-#: ../src/main-window.c:3387
+#: ../src/main-window.c:3385
 msgid "You have new mail."
 msgstr "Imate novu poštu."
 
 # bug: plural-forms
-#: ../src/main-window.c:3428
+#: ../src/main-window.c:3426
 #, c-format
 msgid "Balsa: you have received %d new message."
 msgid_plural "Balsa: you have received %d new messages."
@@ -5320,73 +5220,71 @@ msgstr[1] "Balsa: primili ste %d nove poruke."
 msgstr[2] "Balsa: primili ste %d novih poruka."
 msgstr[3] "Balsa: primili ste jednu novu poruku."
 
-#: ../src/main-window.c:3432
+#: ../src/main-window.c:3430
 msgid "Balsa: you have new mail."
 msgstr "Balsa: imate novu poštu."
 
-#: ../src/main-window.c:3492
+#: ../src/main-window.c:3490
 msgid "Balsa: New mail"
 msgstr "Balsa: Nova pošta"
 
-#: ../src/main-window.c:3781
+#: ../src/main-window.c:3779
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "Sledeća nepročitana poruka je u %s"
 
-#: ../src/main-window.c:3788
+#: ../src/main-window.c:3786
 #, c-format
-#| msgid "Do you want to correct the path?"
 msgid "Do you want to select %s?"
 msgstr "Da li želite da izaberete „%s“?"
 
-#: ../src/main-window.c:4321
+#: ../src/main-window.c:4319
 msgid "Search mailbox"
 msgstr "Pretraži sanduče"
 
-#: ../src/main-window.c:4341
+#: ../src/main-window.c:4339
 msgid "_Search for:"
 msgstr "_Pretraži:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:4354
+#: ../src/main-window.c:4352
 msgid "In:"
 msgstr "U:"
 
-#: ../src/main-window.c:4365
+#: ../src/main-window.c:4363
 msgid "S_ubject"
 msgstr "T_ema"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:4370
+#: ../src/main-window.c:4368
 msgid "Show only matching messages"
 msgstr "Prikaži samo odgovarajuće poruke"
 
 #. Frame with OK button
-#: ../src/main-window.c:4391
+#: ../src/main-window.c:4389
 msgid "Open next matching message"
 msgstr "Otvori sledeću odgovarajuću poruku"
 
-#: ../src/main-window.c:4402
+#: ../src/main-window.c:4400
 msgid "_Reverse search"
 msgstr "_Obrnuta pretraga"
 
-#: ../src/main-window.c:4407
+#: ../src/main-window.c:4405
 msgid "_Wrap around"
 msgstr "_Prelamaj unaokolo"
 
-#: ../src/main-window.c:4582
+#: ../src/main-window.c:4580
 msgid "You can apply filters only on mailbox\n"
 msgstr "Propusnike možete primeniti samo na sanduče\n"
 
-#: ../src/main-window.c:4597
+#: ../src/main-window.c:4595
 #, c-format
 msgid "Removing duplicates failed: %s"
 msgstr "Nisam uspeo da uklonim duplikate: %s"
 
-#: ../src/main-window.c:4603
+#: ../src/main-window.c:4601
 #, c-format
-#| msgid "_Remove Duplicates"
 msgid "Removed %d duplicate"
 msgid_plural "Removed %d duplicates"
 msgstr[0] "Uklonio sam %d duplikat"
@@ -5394,35 +5292,34 @@ msgstr[1] "Uklonio sam %d duplikata"
 msgstr[2] "Uklonio sam %d duplikata"
 msgstr[3] "Uklonio sam jedan duplikat"
 
-#: ../src/main-window.c:4608
+#: ../src/main-window.c:4606
 msgid "No duplicates found"
 msgstr "Nisam pronašao duplikate"
 
-#: ../src/main-window.c:4837
+#: ../src/main-window.c:4835
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Ne mogu da otvorim smeće: %s"
 
-#: ../src/main-window.c:4985
+#: ../src/main-window.c:4983
 #, c-format
 msgid "Balsa: %s (readonly)"
 msgstr "Balsa: %s (samo za čitanje)"
 
-#: ../src/main-window.c:4987
+#: ../src/main-window.c:4985
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
 
 #. xgettext: this is the first part of the message
 #. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:5568
+#: ../src/main-window.c:5566
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Prikaži sanduče: %s "
 
-#: ../src/main-window.c:5573
+#: ../src/main-window.c:5571
 #, c-format
-#| msgid "Print message"
 msgid "with %d message"
 msgid_plural "with %d messages"
 msgstr[0] "sa %d porukom"
@@ -5430,7 +5327,7 @@ msgstr[1] "sa %d poruke"
 msgstr[2] "sa %d poruka"
 msgstr[3] "sa jednom porukom"
 
-#: ../src/main-window.c:5580
+#: ../src/main-window.c:5578
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
@@ -5439,7 +5336,7 @@ msgstr[1] ", %d nove"
 msgstr[2] ", %d novih"
 msgstr[3] ", jedna nova"
 
-#: ../src/main-window.c:5587
+#: ../src/main-window.c:5585
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
@@ -5448,223 +5345,207 @@ msgstr[1] ", %d skrivene"
 msgstr[2] ", %d skrivenih"
 msgstr[3] ", jedna skrivena"
 
-#: ../src/message-window.c:242
+#: ../src/message-window.c:240
 msgid "M_ove"
 msgstr "Pre_mesti"
 
-#: ../src/message-window.c:249
+#: ../src/message-window.c:247
 msgid "Close the message window"
 msgstr "Zatvorite prozor poruke"
 
-#: ../src/message-window.c:255
+#: ../src/message-window.c:253
 msgid "_Find in message"
 msgstr "_Nađi unutar poruke"
 
-#: ../src/message-window.c:309
+#: ../src/message-window.c:307
 msgid "Move the message to Trash mailbox"
 msgstr "Premestite poruku u smeće"
 
-#: ../src/message-window.c:316
-#| msgid "Customize toolbars"
+#: ../src/message-window.c:314
 msgid "Show toolbar"
 msgstr "Prikaži paletu alata"
 
-#: ../src/message-window.c:328
+#: ../src/message-window.c:326
 msgid "_Selected Headers"
 msgstr "_Izabrana zaglavlja"
 
-#: ../src/message-window.c:1050
+#: ../src/message-window.c:1048
 #, c-format
 msgid "Message from %s: %s"
 msgstr "Poruku šalje %s: %s"
 
-#: ../src/pref-manager.c:402
-#| msgid "While Retrieving Messages"
+#: ../src/pref-manager.c:400
 msgid "While retrieving messages"
 msgstr "Prilikom preuzimanja poruka"
 
-#: ../src/pref-manager.c:403
-#| msgid "Until Closed"
+#: ../src/pref-manager.c:401
 msgid "Until closed"
 msgstr "Dok se ne zatvori"
 
-#: ../src/pref-manager.c:409
+#: ../src/pref-manager.c:407
 msgid "Fast"
 msgstr "Brzo"
 
-#: ../src/pref-manager.c:410
+#: ../src/pref-manager.c:408
 msgid "Normal"
 msgstr "Obično"
 
-#: ../src/pref-manager.c:411
-#| msgid "Bad Spellers"
+#: ../src/pref-manager.c:409
 msgid "Bad spellers"
 msgstr "Loše poznaju pravopis"
 
-#: ../src/pref-manager.c:417
+#: ../src/pref-manager.c:415
 msgid "Message number"
 msgstr "Broj poruke"
 
-#: ../src/pref-manager.c:421
+#: ../src/pref-manager.c:419
 msgid "Sender"
 msgstr "Pošiljalac"
 
-#: ../src/pref-manager.c:425
+#: ../src/pref-manager.c:423
 msgid "Flat"
 msgstr "Ravno"
 
-#: ../src/pref-manager.c:427
+#: ../src/pref-manager.c:425
 msgid "JWZ"
 msgstr "Napredno"
 
 #. must NOT be modal
-#: ../src/pref-manager.c:523
+#: ../src/pref-manager.c:521
 msgid "Balsa Preferences"
 msgstr "Postavke Balse"
 
-#: ../src/pref-manager.c:577
-#| msgid "Mail Options"
+#: ../src/pref-manager.c:575
 msgid "Mail options"
 msgstr "Izbori pošte"
 
-#: ../src/pref-manager.c:579
-#| msgid "Mail Options"
+#: ../src/pref-manager.c:577
 msgid "Display options"
 msgstr "Opcije prikaza"
 
-#: ../src/pref-manager.c:581 ../src/pref-manager.c:2909
-#| msgid "Address Books"
+#: ../src/pref-manager.c:579 ../src/pref-manager.c:2907
 msgid "Address books"
 msgstr "Adresari"
 
-#: ../src/pref-manager.c:585 ../src/toolbar-factory.c:157
+#: ../src/pref-manager.c:583 ../src/toolbar-factory.c:155
 msgid "Spelling"
 msgstr "Pravopis"
 
-#: ../src/pref-manager.c:589
+#: ../src/pref-manager.c:587
 msgid "Startup"
 msgstr "Pokretanje"
 
-#: ../src/pref-manager.c:591 ../src/pref-manager.c:2697
+#: ../src/pref-manager.c:589 ../src/pref-manager.c:2695
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: ../src/pref-manager.c:1411
+#: ../src/pref-manager.c:1409
 #, c-format
 msgid "%s (default)"
 msgstr "%s (osnovno)"
 
-#: ../src/pref-manager.c:1671
-#| msgid "Remote Mailbox Servers"
+#: ../src/pref-manager.c:1669
 msgid "Remote mailbox servers"
 msgstr "Udaljeni serveri za poštu"
 
-#: ../src/pref-manager.c:1692 ../src/pref-manager.c:2930
-#: ../src/sendmsg-window.c:3021
+#: ../src/pref-manager.c:1690 ../src/pref-manager.c:2928
+#: ../src/sendmsg-window.c:3030
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../src/pref-manager.c:1700
-#| msgid "Mailbox Name"
+#: ../src/pref-manager.c:1698
 msgid "Mailbox name"
 msgstr "Naziv sandučeta"
 
-#: ../src/pref-manager.c:1714 ../src/pref-manager.c:1787
-#: ../src/pref-manager.c:2965
+#: ../src/pref-manager.c:1712 ../src/pref-manager.c:1785
+#: ../src/pref-manager.c:2963
 msgid "_Modify"
 msgstr "_Izmeni"
 
-#: ../src/pref-manager.c:1728
+#: ../src/pref-manager.c:1726
 msgid "Local mail directory"
 msgstr "Mesni direktorijum pošte"
 
-#: ../src/pref-manager.c:1730
+#: ../src/pref-manager.c:1728
 msgid "Select your local mail directory"
 msgstr "Izaberite vaš mesni direktorijum pošte"
 
-#: ../src/pref-manager.c:1751
+#: ../src/pref-manager.c:1749
 msgid "Outgoing mail servers"
 msgstr "Server odlazne pošte"
 
-#: ../src/pref-manager.c:1773
+#: ../src/pref-manager.c:1771
 msgid "Server name"
 msgstr "Naziv servera"
 
-#: ../src/pref-manager.c:1813
-#| msgid "Mail Servers"
+#: ../src/pref-manager.c:1811
 msgid "Mail servers"
 msgstr "Serveri pošte"
 
-#: ../src/pref-manager.c:1815
+#: ../src/pref-manager.c:1813
 msgid "Incoming"
 msgstr "Dolazna"
 
-#: ../src/pref-manager.c:1817
+#: ../src/pref-manager.c:1815
 msgid "Outgoing"
 msgstr "Odlazna"
 
-#: ../src/pref-manager.c:1844
+#: ../src/pref-manager.c:1842
 msgid "Checking"
 msgstr "Proveravam"
 
-#: ../src/pref-manager.c:1850
-#| msgid "_Check mail automatically every:"
+#: ../src/pref-manager.c:1848
 msgid "_Check mail automatically every"
 msgstr "_Proveravaj poštu svakih"
 
-#: ../src/pref-manager.c:1861 ../src/pref-manager.c:2720
-#: ../src/pref-manager.c:2780
+#: ../src/pref-manager.c:1859 ../src/pref-manager.c:2718
+#: ../src/pref-manager.c:2778
 msgid "minutes"
 msgstr "minuta"
 
-#: ../src/pref-manager.c:1868
+#: ../src/pref-manager.c:1866
 msgid "Check _IMAP mailboxes"
 msgstr "Proveri _IMAP sandučiće"
 
-#: ../src/pref-manager.c:1874
+#: ../src/pref-manager.c:1872
 msgid "Check INBOX _only"
 msgstr "Proveri _samo sanduče „Dolazna“"
 
-#: ../src/pref-manager.c:1881
+#: ../src/pref-manager.c:1879
 msgid "When mail arrives:"
 msgstr "Kada pošta stigne:"
 
-#: ../src/pref-manager.c:1886
-#| msgid "Display Progress Dialog"
+#: ../src/pref-manager.c:1884
 msgid "Display message"
 msgstr "Prikaži poruku"
 
-#: ../src/pref-manager.c:1891
-#| msgid "Play sound:"
+#: ../src/pref-manager.c:1889
 msgid "Play sound"
 msgstr "Pusti zvuk"
 
-#: ../src/pref-manager.c:1896
-#| msgid "Show dialog"
+#: ../src/pref-manager.c:1894
 msgid "Show icon"
 msgstr "Prikaži ikonicu"
 
-#: ../src/pref-manager.c:1905
+#: ../src/pref-manager.c:1903
 msgid "Do background check quietly (no messages in status bar)"
 msgstr "Tiho proveri u pozadini (bez poruka u traci stanja)"
 
-#: ../src/pref-manager.c:1910
+#: ../src/pref-manager.c:1908
 msgid "_POP message size limit:"
 msgstr "Ograničenje veličine _POP poruke:"
 
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:1938
-#| msgid "Quoted and Flowed Text"
+#: ../src/pref-manager.c:1936
 msgid "Quoted and flowed text"
 msgstr "Citirani i uključeni tekst"
 
-#: ../src/pref-manager.c:1943
+#: ../src/pref-manager.c:1941
 msgid "Mark quoted text"
 msgstr "Označi citirani tekst"
 
-#: ../src/pref-manager.c:1948
-#| msgid "Quoted Text Regular Expression"
+#: ../src/pref-manager.c:1946
 msgid ""
 "Quoted text\n"
 "regular expression:"
@@ -5672,49 +5553,42 @@ msgstr ""
 "Regularni izraz\n"
 "citiranog teksta:"
 
-#: ../src/pref-manager.c:1957
-#| msgid "Wrap Outgoing Text at:"
+#: ../src/pref-manager.c:1955
 msgid "Wrap text at"
 msgstr "Prelomi tekst na"
 
-#: ../src/pref-manager.c:1968 ../src/pref-manager.c:2135
+#: ../src/pref-manager.c:1966 ../src/pref-manager.c:2133
 msgid "characters"
 msgstr "znakova"
 
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:1983
-#| msgid "Display of Multipart/Alternative Parts"
+#: ../src/pref-manager.c:1981
 msgid "Display of multipart/alternative parts"
 msgstr "Prikaz delova višedelnih poruka"
 
-#: ../src/pref-manager.c:1986
-#| msgid "prefer text/plain over html"
+#: ../src/pref-manager.c:1984
 msgid "Prefer text/plain over html"
 msgstr "Prednost običnog teksta nad html-om"
 
-#: ../src/pref-manager.c:2002
+#: ../src/pref-manager.c:2000
 msgid "National (8-bit) characters in broken messages without codeset header"
-msgstr "Nacionalni (8-bitni) znakovi u neispravnim porukama bez oznake kodiranja"
+msgstr ""
+"Nacionalni (8-bitni) znakovi u neispravnim porukama bez oznake kodiranja"
 
-#: ../src/pref-manager.c:2009
+#: ../src/pref-manager.c:2007
 msgid "display as \"?\""
 msgstr "prikaži kao „?“"
 
-#: ../src/pref-manager.c:2018
-#| msgid "display using codeset"
+#: ../src/pref-manager.c:2016
 msgid "display in codeset"
 msgstr "prikaži u kodnom skupu"
 
 #. How to handle received MDN requests
-#: ../src/pref-manager.c:2048
-#| msgid "Message Disposition Notification Requests"
+#: ../src/pref-manager.c:2046
 msgid "Message disposition notification requests"
 msgstr "Zahtevi za obaveštenje o prispeću poruke"
 
-#: ../src/pref-manager.c:2050
-#| msgid ""
-#| "When I receive a message and its sender requested to return a\n"
-#| "Message Disposition Notification (MDN), send it in the following cases:"
+#: ../src/pref-manager.c:2048
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
@@ -5722,11 +5596,7 @@ msgstr ""
 "Kada primim poruku za koju pošiljalac zahteva obaveštenje o dospeću poruke, "
 "pošalji ako:"
 
-#: ../src/pref-manager.c:2062
-#| msgid ""
-#| "The message header looks clean\n"
-#| "(the notify-to address is equal to the return path,\n"
-#| "I am in the \"To:\" or \"Cc:\" list)."
+#: ../src/pref-manager.c:2060
 msgid ""
 "The message header looks clean\n"
 "(the notify-to address is the return path,\n"
@@ -5736,273 +5606,244 @@ msgstr ""
 "(adresa za obaveštavanje je povratna adresa,\n"
 "a ja sam na spisku primalaca)."
 
-#: ../src/pref-manager.c:2079
+#: ../src/pref-manager.c:2077
 msgid "The message header looks suspicious."
 msgstr "Zaglavlje poruke izgleda sumnjivo."
 
-#: ../src/pref-manager.c:2116
-#| msgid "Word Wrap"
+#: ../src/pref-manager.c:2114
 msgid "Word wrap"
 msgstr "Prelom reči"
 
-#: ../src/pref-manager.c:2121
-#| msgid "Wrap Outgoing Text at:"
+#: ../src/pref-manager.c:2119
 msgid "Wrap outgoing text at"
 msgstr "Prelomi tekst na"
 
-#: ../src/pref-manager.c:2149
-#| msgid "Other Options"
+#: ../src/pref-manager.c:2147
 msgid "Other options"
 msgstr "Ostali izbori"
 
-#: ../src/pref-manager.c:2154
-#| msgid "Reply Prefix:"
+#: ../src/pref-manager.c:2152
 msgid "Reply prefix:"
 msgstr "Prefiks odgovora:"
 
-#: ../src/pref-manager.c:2157
+#: ../src/pref-manager.c:2155
 msgid "Automatically quote original when replying"
 msgstr "Sam citiraj izvor pri odgovaranju"
 
-#: ../src/pref-manager.c:2160
+#: ../src/pref-manager.c:2158
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "Prosledi poruku kao prilog umesto da je citiraš"
 
-#: ../src/pref-manager.c:2163
+#: ../src/pref-manager.c:2161
 msgid "Copy outgoing messages to sentbox"
 msgstr "Umnoži odlazeće poruke u „Poslato“"
 
-#: ../src/pref-manager.c:2165
+#: ../src/pref-manager.c:2163
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "Dugme za slanje uvek smešta poruku u „Odlazno“"
 
-#: ../src/pref-manager.c:2168
+#: ../src/pref-manager.c:2166
 msgid "Edit headers in external editor"
 msgstr "Izmeni zaglavlja u spoljašnjem uređivaču"
 
-#: ../src/pref-manager.c:2170
-#| msgid "Don't include HTML parts as text when replying or forwarding mail"
+#: ../src/pref-manager.c:2168
 msgid "Include HTML parts as text when replying or forwarding"
 msgstr "Uključi HTML delove kao tekst pri odgovaranju ili prosleđivanju"
 
-#: ../src/pref-manager.c:2187
-#| msgid "you"
+#: ../src/pref-manager.c:2185
 msgid "Layout"
 msgstr "Raspored"
 
-#: ../src/pref-manager.c:2189
+#: ../src/pref-manager.c:2187
 msgid "Sort and thread"
 msgstr "Poređaj i utemači"
 
-#: ../src/pref-manager.c:2191 ../src/print-gtk.c:501
+#: ../src/pref-manager.c:2189 ../src/print-gtk.c:499
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/pref-manager.c:2193
+#: ../src/pref-manager.c:2191
 msgid "Colors"
 msgstr "Boje"
 
-#: ../src/pref-manager.c:2195 ../src/pref-manager.c:2286
-#| msgid "Normal"
+#: ../src/pref-manager.c:2193 ../src/pref-manager.c:2284
 msgid "Format"
 msgstr "Oblik"
 
-#: ../src/pref-manager.c:2197
-#| msgid "Status Messages"
+#: ../src/pref-manager.c:2195
 msgid "Status messages"
 msgstr "Poruke o stanju"
 
-#: ../src/pref-manager.c:2222 ../src/toolbar-prefs.c:168
+#: ../src/pref-manager.c:2220 ../src/toolbar-prefs.c:166
 msgid "Main window"
 msgstr "Glavni prozor"
 
-#: ../src/pref-manager.c:2225
+#: ../src/pref-manager.c:2223
 msgid "Use preview pane"
 msgstr "Koristi površ za pregled"
 
-#: ../src/pref-manager.c:2227
+#: ../src/pref-manager.c:2225
 msgid "Show mailbox statistics in left pane"
 msgstr "Prikaži statistiku sandučeta na levoj površi"
 
-#: ../src/pref-manager.c:2231
+#: ../src/pref-manager.c:2229
 msgid "Automatically view message when mailbox opened"
 msgstr "Sam prikaži poruku čim se otvori sanduče"
 
-#: ../src/pref-manager.c:2234
+#: ../src/pref-manager.c:2232
 msgid "Ask me before selecting a different mailbox to show an unread message"
 msgstr "Pitaj me pre nego izabereš drugo sanduče za prikaz nepročitane poruke"
 
-#: ../src/pref-manager.c:2240
-#| msgid "PageUp/PageDown keys scroll message by:"
+#: ../src/pref-manager.c:2238
 msgid "PageUp/PageDown keys scroll text by"
 msgstr "Tasterima „Stranica gore/Stranica dole“ pomeraj tekst za"
 
-#: ../src/pref-manager.c:2251
+#: ../src/pref-manager.c:2249
 msgid "percent"
 msgstr "procenta"
 
-#: ../src/pref-manager.c:2266
-#| msgid "Display Progress Dialog"
+#: ../src/pref-manager.c:2264
 msgid "Display progress dialog"
 msgstr "Prikaži prozorče napredovanja"
 
-#: ../src/pref-manager.c:2291
+#: ../src/pref-manager.c:2289
 msgid "Date encoding (for strftime):"
 msgstr "Zapis datuma (za „strftime“):"
 
-#: ../src/pref-manager.c:2293
+#: ../src/pref-manager.c:2291
 msgid "Selected headers:"
 msgstr "Izabrana zaglavlja:"
 
-#: ../src/pref-manager.c:2315
-#| msgid "Information Messages"
+#: ../src/pref-manager.c:2313
 msgid "Information messages"
 msgstr "Poruke obaveštenja"
 
-#: ../src/pref-manager.c:2320
-#| msgid "Information Messages"
+#: ../src/pref-manager.c:2318
 msgid "Information messages:"
 msgstr "Poruke obaveštenja:"
 
-#: ../src/pref-manager.c:2324
-#| msgid "Warning Messages"
+#: ../src/pref-manager.c:2322
 msgid "Warning messages:"
 msgstr "Poruke upozorenja:"
 
-#: ../src/pref-manager.c:2328
-#| msgid "Error Messages"
+#: ../src/pref-manager.c:2326
 msgid "Error messages:"
 msgstr "Poruke grešaka:"
 
-#: ../src/pref-manager.c:2332
-#| msgid "Fatal Error Messages"
+#: ../src/pref-manager.c:2330
 msgid "Fatal error messages:"
 msgstr "Poruke kobnih grešaka:"
 
-#: ../src/pref-manager.c:2336
-#| msgid "Debug Messages"
+#: ../src/pref-manager.c:2334
 msgid "Debug messages:"
 msgstr "Poruke o popravljanju:"
 
-#: ../src/pref-manager.c:2362
-#| msgid "Message Colors"
+#: ../src/pref-manager.c:2360
 msgid "Message colors"
 msgstr "Boje poruka"
 
-#: ../src/pref-manager.c:2367
+#: ../src/pref-manager.c:2365
 #, c-format
 msgid "Quote level %d color"
 msgstr "Boja %d. nivoa citiranja"
 
-#: ../src/pref-manager.c:2380
-#| msgid "Link Color"
+#: ../src/pref-manager.c:2378
 msgid "Link color"
 msgstr "Boja veze"
 
-#: ../src/pref-manager.c:2382
+#: ../src/pref-manager.c:2380
 msgid "Hyperlink color"
 msgstr "Boja hiperveze"
 
-#: ../src/pref-manager.c:2393
-#| msgid "Composition Window"
+#: ../src/pref-manager.c:2391
 msgid "Composition window"
 msgstr "Prozor za pisanje"
 
-#: ../src/pref-manager.c:2397
+#: ../src/pref-manager.c:2395
 msgid "Invalid or incomplete address label color"
 msgstr "Neispravna ili nepotpuna boja natpisa adresa"
 
-#: ../src/pref-manager.c:2483 ../src/print-gtk.c:510
+#: ../src/pref-manager.c:2481 ../src/print-gtk.c:508
 msgid "Fonts"
 msgstr "Slova"
 
-#: ../src/pref-manager.c:2487
-#| msgid "Message Font"
+#: ../src/pref-manager.c:2485
 msgid "Message font:"
 msgstr "Slova poruke:"
 
-#: ../src/pref-manager.c:2492
-#| msgid "Subject:"
+#: ../src/pref-manager.c:2490
 msgid "Subject font:"
 msgstr "Slova teme:"
 
-#: ../src/pref-manager.c:2498
+#: ../src/pref-manager.c:2496
 msgid "Use default font size"
 msgstr "Koristi osnovnu veličinu slova"
 
-#: ../src/pref-manager.c:2546
+#: ../src/pref-manager.c:2544
 msgid "Sorting and threading"
 msgstr "Ređanje i temačenje"
 
-#: ../src/pref-manager.c:2550
+#: ../src/pref-manager.c:2548
 msgid "Default sort column:"
 msgstr "Osnovna kolona ređanja:"
 
-#: ../src/pref-manager.c:2554
-#| msgid "Default threading style"
+#: ../src/pref-manager.c:2552
 msgid "Default threading style:"
 msgstr "Osnovni prikaz niti:"
 
-#: ../src/pref-manager.c:2559
+#: ../src/pref-manager.c:2557
 msgid "Expand threads on open"
 msgstr "Raširi niti prilikom otvaranja"
 
-#: ../src/pref-manager.c:2634
-#| msgid "Pspell Settings"
+#: ../src/pref-manager.c:2632
 msgid "Pspell settings"
 msgstr "Podešavanja pspel-a"
 
-#: ../src/pref-manager.c:2640
-#| msgid "Spell Check Module"
+#: ../src/pref-manager.c:2638
 msgid "Spell check module"
 msgstr "Dodatak za proveru pravopisa"
 
-#: ../src/pref-manager.c:2646
-#| msgid "Suggestion Level"
+#: ../src/pref-manager.c:2644
 msgid "Suggestion level"
 msgstr "Nivo predloga"
 
 #. do the ignore length
-#: ../src/pref-manager.c:2651
+#: ../src/pref-manager.c:2649
 msgid "Ignore words shorter than"
 msgstr "Zanemari reči kraće od"
 
-#: ../src/pref-manager.c:2669
-#| msgid "Miscellaneous Spelling Settings"
+#: ../src/pref-manager.c:2667
 msgid "Miscellaneous spelling settings"
 msgstr "Razna podešavanja pravopisa"
 
-#: ../src/pref-manager.c:2671
+#: ../src/pref-manager.c:2669
 msgid "Check signature"
 msgstr "Proveri potpis"
 
-#: ../src/pref-manager.c:2672
+#: ../src/pref-manager.c:2670
 msgid "Check quoted"
 msgstr "Proveri citirano"
 
-#: ../src/pref-manager.c:2699
+#: ../src/pref-manager.c:2697
 msgid "Debug"
 msgstr "Popravi"
 
-#: ../src/pref-manager.c:2700
-#| msgid "Empty Trash on exit"
+#: ../src/pref-manager.c:2698
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlasku"
 
-#: ../src/pref-manager.c:2707
-#| msgid "Automatically close mailbox if unused more than"
+#: ../src/pref-manager.c:2705
 msgid "Close mailbox if unused more than"
 msgstr "Sam zatvori sanduče ako se ne koristi više od"
 
-#: ../src/pref-manager.c:2735
-#| msgid "Deleting Messages"
+#: ../src/pref-manager.c:2733
 msgid "Deleting messages"
 msgstr "Brisanje poruka"
 
 #. Translators: this used to be "using Mailbox -> Hide messages";
 #. * the UTF-8 string for the right-arrow symbol is broken out to
 #. * avoid msgconv problems.
-#: ../src/pref-manager.c:2740
+#: ../src/pref-manager.c:2738
 #, c-format
 msgid ""
 "The following setting is global, but may be overridden for the selected "
@@ -6012,55 +5853,51 @@ msgstr ""
 "upotrebom Mejlboks %s skrivanje poruka:"
 
 # bug: plural-forms
-#: ../src/pref-manager.c:2752
+#: ../src/pref-manager.c:2750
 msgid "Hide messages marked as deleted"
 msgstr "Skrivene poruke označene kao obrisane"
 
-#: ../src/pref-manager.c:2754
+#: ../src/pref-manager.c:2752
 msgid "The following settings are global:"
 msgstr "Sledeća podešavanja su opšta:"
 
-#: ../src/pref-manager.c:2760
+#: ../src/pref-manager.c:2758
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Izbaci obrisane poruke prilikom zatvaranja sandučeta"
 
-#: ../src/pref-manager.c:2767
+#: ../src/pref-manager.c:2765
 msgid "...and if unused more than"
 msgstr "...i ako se ne koristi više od"
 
-#: ../src/pref-manager.c:2792 ../src/toolbar-prefs.c:182
+#: ../src/pref-manager.c:2790 ../src/toolbar-prefs.c:180
 msgid "Message window"
 msgstr "Prozor poruke"
 
-#: ../src/pref-manager.c:2797
+#: ../src/pref-manager.c:2795
 msgid "After moving a message:"
 msgstr "Nakon premeštanja poruke:"
 
-#: ../src/pref-manager.c:2826
-#| msgid "Toolbar options"
+#: ../src/pref-manager.c:2824
 msgid "Startup options"
 msgstr "Opcije pokretanja"
 
-#: ../src/pref-manager.c:2829
+#: ../src/pref-manager.c:2827
 msgid "Open Inbox upon startup"
 msgstr "Otvori „Dolazno“ pri pokretanju"
 
-#: ../src/pref-manager.c:2831
+#: ../src/pref-manager.c:2829
 msgid "Check mail upon startup"
 msgstr "Proveri poštu pri pokretanju"
 
-#: ../src/pref-manager.c:2833
+#: ../src/pref-manager.c:2831
 msgid "Remember open mailboxes between sessions"
 msgstr "Zapamti otvorene sandučiće između dve sesije"
 
-#: ../src/pref-manager.c:2847
+#: ../src/pref-manager.c:2845
 msgid "Folder scanning"
 msgstr "Pregledanje fascikle"
 
-#: ../src/pref-manager.c:2849
-#| msgid ""
-#| "Choose depth 1 for fast startup; this defers scanning some folders.\n"
-#| "To see more of the tree at startup, choose a greater depth."
+#: ../src/pref-manager.c:2847
 msgid ""
 "Choose depth 1 for fast startup; this defers scanning some folders.  To see "
 "more of the tree at startup, choose a greater depth."
@@ -6068,117 +5905,117 @@ msgstr ""
 "Izaberite dubinu 1 za brže pokretanje; ovo odlaže pretragu nekih fascikli. Da "
 "vidite više pri pokretanju, izaberite veću dubinu."
 
-#: ../src/pref-manager.c:2860
+#: ../src/pref-manager.c:2858
 msgid "Scan local folders to depth"
 msgstr "Pregledaj mesne fascikle do dubine"
 
-#: ../src/pref-manager.c:2873
+#: ../src/pref-manager.c:2871
 msgid "Scan IMAP folders to depth"
 msgstr "Pregledaj IMAP fascikle do dubine"
 
-#: ../src/pref-manager.c:2938
-#| msgid "Address Book Name"
+#: ../src/pref-manager.c:2936
 msgid "Address book name"
 msgstr "Ime adresara"
 
-#: ../src/pref-manager.c:2946
+#: ../src/pref-manager.c:2944
 msgid "Auto-complete"
 msgstr "Sam dovrši"
 
-#: ../src/pref-manager.c:2971
+#: ../src/pref-manager.c:2969
 msgid "_Set as default"
 msgstr "_Postavi kao osnovno"
 
-#: ../src/pref-manager.c:3276
+#: ../src/pref-manager.c:3274
 msgid "Remote POP3 mailbox..."
 msgstr "Udaljeno POP3 sanduče..."
 
-#: ../src/pref-manager.c:3412
+#: ../src/pref-manager.c:3410
 msgid "Show nothing"
 msgstr "ne prikazuj ništa"
 
-#: ../src/pref-manager.c:3414
+#: ../src/pref-manager.c:3412
 msgid "Show dialog"
 msgstr "prikaži prozorče"
 
-#: ../src/pref-manager.c:3416
+#: ../src/pref-manager.c:3414
 msgid "Show in list"
 msgstr "prikaži u spisku"
 
-#: ../src/pref-manager.c:3418
+#: ../src/pref-manager.c:3416
 msgid "Show in status bar"
 msgstr "prikaži na traci stanja"
 
-#: ../src/pref-manager.c:3420
+#: ../src/pref-manager.c:3418
 msgid "Print to console"
 msgstr "ispiši u konzoli"
 
-#: ../src/pref-manager.c:3431
+#: ../src/pref-manager.c:3429
 msgid "Ask me"
 msgstr "pitaj me"
 
-#: ../src/pref-manager.c:3547
-#| msgid "Default Client"
+#: ../src/pref-manager.c:3545
 msgid "Default layout"
 msgstr "Osnovni raspored"
 
-#: ../src/pref-manager.c:3548
+#: ../src/pref-manager.c:3546
 msgid "Wide message layout"
 msgstr "Široki prikaz poruke"
 
-#: ../src/pref-manager.c:3549
+#: ../src/pref-manager.c:3547
 msgid "Wide screen layout"
 msgstr "Široki prikaz ekrana"
 
-#: ../src/pref-manager.c:3557
+#: ../src/pref-manager.c:3555
 msgid "Show next unread message"
 msgstr "Prikaži sledeću nepročitanu poruku"
 
-#: ../src/pref-manager.c:3558
+#: ../src/pref-manager.c:3556
 msgid "Show next message"
 msgstr "Prikaži sledeću poruku"
 
-#: ../src/pref-manager.c:3559
+#: ../src/pref-manager.c:3557
 msgid "Close message window"
 msgstr "Zatvori prozor poruke"
 
-#: ../src/pref-manager.c:3600
+#: ../src/pref-manager.c:3598
 #, c-format
 msgid "Error displaying link_id %s: %s\n"
 msgstr "Greška prikazivanja ib_veze %s: %s\n"
 
-#: ../src/print-gtk.c:91 ../src/print-gtk.c:250
+#: ../src/print-gtk.c:89 ../src/print-gtk.c:248
 #, c-format
-#| msgid "Retrieving Message %d of %d"
 msgid "Page %d of %d"
 msgstr "Stranica %d od %d"
 
-#: ../src/print-gtk.c:145 ../src/print-gtk.c:171
+#: ../src/print-gtk.c:143 ../src/print-gtk.c:169
 msgid "Signed and encrypted matter"
 msgstr "Potpisana i šifrovana sadržina"
 
-#: ../src/print-gtk.c:149 ../src/print-gtk.c:175
+#: ../src/print-gtk.c:147 ../src/print-gtk.c:173
 msgid "Signed matter"
 msgstr "Potpisana sadržina"
 
-#: ../src/print-gtk.c:156
-#| msgid "encrypted parts"
+#: ../src/print-gtk.c:154
 msgid "Encrypted matter"
 msgstr "Šifrovana sadržina"
 
-#: ../src/print-gtk.c:199
+#: ../src/print-gtk.c:197
 #, c-format
 msgid "This is an inline %s signed %s message part:"
 msgstr "Ovo je neposredno %s potpisani %s deo poruke:"
 
-#: ../src/print-gtk.c:354
+#: ../src/print-gtk.c:352
 #, c-format
 msgid "Cannot print page %d because the document has only %d page."
 msgid_plural "Cannot print page %d because the document has only %d pages."
-msgstr[0] "Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranicu."
-msgstr[1] "Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranice."
-msgstr[2] "Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranica."
-msgstr[3] "Ne mogu da štampam %d. stranicu zato što dokument ima samo jednu stranicu."
+msgstr[0] ""
+"Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranicu."
+msgstr[1] ""
+"Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranice."
+msgstr[2] ""
+"Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranica."
+msgstr[3] ""
+"Ne mogu da štampam %d. stranicu zato što dokument ima samo jednu stranicu."
 
 #. Translate to the default units to use for presenting
 #. * lengths to the user. Translate to default:inch if you
@@ -6186,81 +6023,72 @@ msgstr[3] "Ne mogu da štampam %d. stranicu zato što dokument ima samo jednu st
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
-#: ../src/print-gtk.c:392
-#| msgid "Default"
+#: ../src/print-gtk.c:390
 msgid "default:mm"
 msgstr "default:mm"
 
-#: ../src/print-gtk.c:449
+#: ../src/print-gtk.c:447
 msgid "inch"
 msgstr "inč"
 
-#: ../src/print-gtk.c:456
+#: ../src/print-gtk.c:454
 msgid "mm"
 msgstr "mm"
 
-#: ../src/print-gtk.c:531
-#| msgid "Header font"
+#: ../src/print-gtk.c:529
 msgid "_Header Font:"
 msgstr "Slova _zaglavlja:"
 
-#: ../src/print-gtk.c:534
-#| msgid "Body font"
+#: ../src/print-gtk.c:532
 msgid "B_ody Font:"
 msgstr "Slova _sadržaja:"
 
-#: ../src/print-gtk.c:537
-#| msgid "Footer font"
+#: ../src/print-gtk.c:535
 msgid "_Footer Font:"
 msgstr "Slova _podnožja:"
 
-#: ../src/print-gtk.c:544
-#| msgid "Highlight cited text"
+#: ../src/print-gtk.c:542
 msgid "Highlighting"
 msgstr "Isticanje"
 
-#: ../src/print-gtk.c:559
-#| msgid "Highlight cited text"
+#: ../src/print-gtk.c:557
 msgid "Highlight _cited text"
 msgstr "Istakni _citirani tekst"
 
-#: ../src/print-gtk.c:568
-#| msgid "Highlight cited text"
+#: ../src/print-gtk.c:566
 msgid "Highlight _structured phrases"
 msgstr "Istakni _sređene izraze"
 
-#: ../src/print-gtk.c:579
-#| msgid "marginal"
+#: ../src/print-gtk.c:577
 msgid "Margins"
 msgstr "Ivice"
 
-#: ../src/print-gtk.c:601
-#| msgid "_To"
+#: ../src/print-gtk.c:599
 msgid "_Top"
 msgstr "_Gore"
 
-#: ../src/print-gtk.c:607
+#: ../src/print-gtk.c:605
 msgid "_Bottom"
 msgstr "_Dole"
 
-#: ../src/print-gtk.c:619
+#: ../src/print-gtk.c:617
 msgid "_Left"
 msgstr "_Levo"
 
-#: ../src/print-gtk.c:625
+#: ../src/print-gtk.c:623
 msgid "_Right"
 msgstr "_Desno"
 
-#: ../src/print-gtk.c:751
+#: ../src/print-gtk.c:749
 #, c-format
 msgid "Error printing message: %s"
 msgstr "Greška štampanja poruke: %s"
 
-#: ../src/save-restore.c:610
+#: ../src/save-restore.c:608
 msgid "Error during filters loading: "
 msgstr "Greška pri učitavanju propusnika: "
 
-#: ../src/save-restore.c:612
+#: ../src/save-restore.c:610
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -6269,14 +6097,11 @@ msgstr ""
 "Greška pri učitavanju propusnika: %s\n"
 "Propusnici su možda neispravni."
 
-#: ../src/save-restore.c:736
+#: ../src/save-restore.c:734
 msgid "The option not to recognize \"format=flowed\" text has been removed."
 msgstr "Izbor kojim se zanemaruju polja „format=flowed“ je uklonjen."
 
-#: ../src/save-restore.c:1017
-#| msgid ""
-#| "The option not to send \"format=flowed\" is now on the Options menu of "
-#| "the compose window."
+#: ../src/save-restore.c:1015
 msgid ""
 "The option not to send \"format=flowed\" text is now on the Options menu of "
 "the compose window."
@@ -6284,14 +6109,14 @@ msgstr ""
 "Izbor kojim se ne šalje „format=flowed“ tekst se sada nalazi u izborniku "
 "Izbori prozora za pisanje poruka."
 
-#: ../src/save-restore.c:1049
+#: ../src/save-restore.c:1047
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 "Izbor za zahtevanje obaveštenja se sada nalazi u izborniku Izbori prozora za "
 "pisanje poruka."
 
-#: ../src/save-restore.c:1131
+#: ../src/save-restore.c:1129
 msgid ""
 "This version of Balsa uses a new user interface; if you have changed Balsa's "
 "keyboard accelerators, you will need to set them again."
@@ -6299,11 +6124,11 @@ msgstr ""
 "Ovo izdanje Balse koristi novo korisničko sučelje; ako ste izmenili Balsine "
 "prečice tastature, moraćete ponovo da ih podesite."
 
-#: ../src/save-restore.c:2170
+#: ../src/save-restore.c:2168
 msgid "Error opening GConf database\n"
 msgstr "Greška otvaranja GKonf baze podataka\n"
 
-#: ../src/save-restore.c:2178 ../src/save-restore.c:2189
+#: ../src/save-restore.c:2176 ../src/save-restore.c:2187
 #, c-format
 msgid "Error setting GConf field: %s\n"
 msgstr "Greška postavljanju GKonf polja: %s\n"
@@ -6311,302 +6136,291 @@ msgstr "Greška postavljanju GKonf polja: %s\n"
 #. Translators: please use the initial letter of each language as
 #. * its accelerator; this is a long list, and unique accelerators
 #. * cannot be found.
-#: ../src/sendmsg-window.c:258
-#| msgid "_Brazilian"
+#: ../src/sendmsg-window.c:260
 msgid "_Brazilian Portuguese"
 msgstr "_brazilski portugalski"
 
-#: ../src/sendmsg-window.c:259
+#: ../src/sendmsg-window.c:261
 msgid "_Catalan"
 msgstr "_katalonski"
 
-#: ../src/sendmsg-window.c:260
+#: ../src/sendmsg-window.c:262
 msgid "_Chinese Simplified"
 msgstr "_pojednostavljeni kineski"
 
-#: ../src/sendmsg-window.c:261
+#: ../src/sendmsg-window.c:263
 msgid "_Chinese Traditional"
 msgstr "_tradicionalni kineski"
 
-#: ../src/sendmsg-window.c:262
+#: ../src/sendmsg-window.c:264
 msgid "_Czech"
 msgstr "_češki"
 
-#: ../src/sendmsg-window.c:263
+#: ../src/sendmsg-window.c:265
 msgid "_Danish"
 msgstr "_danski"
 
-#: ../src/sendmsg-window.c:264
+#: ../src/sendmsg-window.c:266
 msgid "_Dutch"
 msgstr "_holandski"
 
-#: ../src/sendmsg-window.c:265
+#: ../src/sendmsg-window.c:267
 msgid "_English (American)"
 msgstr "_engleski (američki)"
 
-#: ../src/sendmsg-window.c:266
+#: ../src/sendmsg-window.c:268
 msgid "_English (British)"
 msgstr "_engleski (britanski)"
 
-#: ../src/sendmsg-window.c:267
+#: ../src/sendmsg-window.c:269
 msgid "_Esperanto"
 msgstr "_esperanto"
 
-#: ../src/sendmsg-window.c:268
+#: ../src/sendmsg-window.c:270
 msgid "_Estonian"
 msgstr "_estonski"
 
-#: ../src/sendmsg-window.c:269
+#: ../src/sendmsg-window.c:271
 msgid "_Finnish"
 msgstr "_finski"
 
-#: ../src/sendmsg-window.c:270
+#: ../src/sendmsg-window.c:272
 msgid "_French"
 msgstr "_francuski"
 
-#: ../src/sendmsg-window.c:271
+#: ../src/sendmsg-window.c:273
 msgid "_German"
 msgstr "_nemački"
 
-#: ../src/sendmsg-window.c:272
-#| msgid "_Serbian (Latin)"
+#: ../src/sendmsg-window.c:274
 msgid "_German (Austrian)"
 msgstr "_nemački (austrijski)"
 
-#: ../src/sendmsg-window.c:273
-#| msgid "_German"
+#: ../src/sendmsg-window.c:275
 msgid "_German (Swiss)"
 msgstr "_nemački (švajcarski)"
 
-#: ../src/sendmsg-window.c:274
+#: ../src/sendmsg-window.c:276
 msgid "_Greek"
 msgstr "_grčki"
 
-#: ../src/sendmsg-window.c:275
+#: ../src/sendmsg-window.c:277
 msgid "_Hebrew"
 msgstr "_hebrejski"
 
-#: ../src/sendmsg-window.c:276
+#: ../src/sendmsg-window.c:278
 msgid "_Hungarian"
 msgstr "_mađarski"
 
-#: ../src/sendmsg-window.c:277
+#: ../src/sendmsg-window.c:279
 msgid "_Italian"
 msgstr "_italijanski"
 
-#: ../src/sendmsg-window.c:278
+#: ../src/sendmsg-window.c:280
 msgid "_Japanese (JIS)"
 msgstr "_japanski (JIS)"
 
-#: ../src/sendmsg-window.c:279
+#: ../src/sendmsg-window.c:281
 msgid "_Kazakh"
 msgstr "_kazaški"
 
-#: ../src/sendmsg-window.c:280
+#: ../src/sendmsg-window.c:282
 msgid "_Korean"
 msgstr "_korejski"
 
-#: ../src/sendmsg-window.c:281
+#: ../src/sendmsg-window.c:283
 msgid "_Latvian"
 msgstr "_letonski"
 
-#: ../src/sendmsg-window.c:282
+#: ../src/sendmsg-window.c:284
 msgid "_Lithuanian"
 msgstr "_litvanski"
 
-#: ../src/sendmsg-window.c:283
+#: ../src/sendmsg-window.c:285
 msgid "_Norwegian"
 msgstr "_norveški"
 
-#: ../src/sendmsg-window.c:284
+#: ../src/sendmsg-window.c:286
 msgid "_Polish"
 msgstr "_poljski"
 
-#: ../src/sendmsg-window.c:285
+#: ../src/sendmsg-window.c:287
 msgid "_Portugese"
 msgstr "_portugalski"
 
-#: ../src/sendmsg-window.c:286
+#: ../src/sendmsg-window.c:288
 msgid "_Romanian"
 msgstr "_rumunski"
 
-#: ../src/sendmsg-window.c:287
+#: ../src/sendmsg-window.c:289
 msgid "_Russian"
 msgstr "_ruski"
 
-#: ../src/sendmsg-window.c:288
+#: ../src/sendmsg-window.c:290
 msgid "_Serbian"
 msgstr "_srpski"
 
-#: ../src/sendmsg-window.c:289
+#: ../src/sendmsg-window.c:291
 msgid "_Serbian (Latin)"
 msgstr "_srpski (latinica)"
 
-#: ../src/sendmsg-window.c:290
+#: ../src/sendmsg-window.c:292
 msgid "_Slovak"
 msgstr "_slovački"
 
-#: ../src/sendmsg-window.c:291
+#: ../src/sendmsg-window.c:293
 msgid "_Spanish"
 msgstr "_španski"
 
-#: ../src/sendmsg-window.c:292
+#: ../src/sendmsg-window.c:294
 msgid "_Swedish"
 msgstr "_švedski"
 
-#: ../src/sendmsg-window.c:293
+#: ../src/sendmsg-window.c:295
 msgid "_Tatar"
 msgstr "_tatarski"
 
-#: ../src/sendmsg-window.c:294
+#: ../src/sendmsg-window.c:296
 msgid "_Turkish"
 msgstr "_turski"
 
-#: ../src/sendmsg-window.c:295
+#: ../src/sendmsg-window.c:297
 msgid "_Ukrainian"
 msgstr "_ukrajinski"
 
-#: ../src/sendmsg-window.c:296
+#: ../src/sendmsg-window.c:298
 msgid "_Generic UTF-8"
 msgstr "_opšti UTF-8"
 
-#: ../src/sendmsg-window.c:322
+#: ../src/sendmsg-window.c:324
 msgid "_Show"
 msgstr "_Prikaži"
 
-#: ../src/sendmsg-window.c:323
+#: ../src/sendmsg-window.c:325
 msgid "_Language"
 msgstr "_Jezik"
 
-#: ../src/sendmsg-window.c:324
+#: ../src/sendmsg-window.c:326
 msgid "_Options"
 msgstr "_Izbori"
 
-#: ../src/sendmsg-window.c:334
+#: ../src/sendmsg-window.c:336
 msgid "_Include File..."
 msgstr "_Uključi datoteku..."
 
-#: ../src/sendmsg-window.c:335
-#| msgid "Include file"
+#: ../src/sendmsg-window.c:337
 msgid "Include a file"
 msgstr "Uključite datoteku"
 
-#: ../src/sendmsg-window.c:336
+#: ../src/sendmsg-window.c:338
 msgid "_Attach File..."
 msgstr "Priloži _datoteku..."
 
-#: ../src/sendmsg-window.c:337
-#| msgid "Attach file"
+#: ../src/sendmsg-window.c:339
 msgid "Attach a file"
 msgstr "Priložite datoteku"
 
-#: ../src/sendmsg-window.c:338
+#: ../src/sendmsg-window.c:340
 msgid "I_nclude Message(s)"
 msgstr "Uk_ljuči poruke"
 
-#: ../src/sendmsg-window.c:339
-#| msgid "I_nclude Message(s)"
+#: ../src/sendmsg-window.c:341
 msgid "Include selected message(s)"
 msgstr "Uključite izabranu poruku"
 
-#: ../src/sendmsg-window.c:340
+#: ../src/sendmsg-window.c:342
 msgid "Attach _Message(s)"
 msgstr "Priloži po_ruke"
 
-#: ../src/sendmsg-window.c:341
-#| msgid "Attach _Message(s)"
+#: ../src/sendmsg-window.c:343
 msgid "Attach selected message(s)"
 msgstr "Priložite izabranu poruku"
 
-#: ../src/sendmsg-window.c:342
+#: ../src/sendmsg-window.c:344
 msgid "_Save"
 msgstr "_Sačuvaj"
 
-#: ../src/sendmsg-window.c:343
+#: ../src/sendmsg-window.c:345
 msgid "Save this message"
 msgstr "Sačuvajte ovu poruku"
 
-#: ../src/sendmsg-window.c:349
+#: ../src/sendmsg-window.c:351
 msgid "Print the edited message"
 msgstr "Štampajte uređenu poruku"
 
-#: ../src/sendmsg-window.c:352
-#| msgid "Undo"
+#: ../src/sendmsg-window.c:354
 msgid "_Undo"
 msgstr "_Opozovi"
 
-#: ../src/sendmsg-window.c:353
+#: ../src/sendmsg-window.c:355
 msgid "Undo most recent change"
 msgstr "Opozovite poslednju izmenu"
 
-#: ../src/sendmsg-window.c:354
-#| msgid "Redo"
+#: ../src/sendmsg-window.c:356
 msgid "_Redo"
 msgstr "_Ponovi"
 
-#: ../src/sendmsg-window.c:355
+#: ../src/sendmsg-window.c:357
 msgid "Redo most recent change"
 msgstr "Ponovite poslednju izmenu"
 
-#: ../src/sendmsg-window.c:356
+#: ../src/sendmsg-window.c:358
 msgid "Cu_t"
 msgstr "_Iseci"
 
-#: ../src/sendmsg-window.c:357
-#| msgid "Edit the selected mailbox"
+#: ../src/sendmsg-window.c:359
 msgid "Cut the selected text"
 msgstr "Isecite izabrani tekst"
 
-#: ../src/sendmsg-window.c:359
+#: ../src/sendmsg-window.c:361
 msgid "Copy to the clipboard"
 msgstr "Umnožite u ostavu"
 
-#: ../src/sendmsg-window.c:360
-#| msgid "_Postpone"
+#: ../src/sendmsg-window.c:362
 msgid "_Paste"
 msgstr "_Ubaci"
 
-#: ../src/sendmsg-window.c:361
+#: ../src/sendmsg-window.c:363
 msgid "Paste from the clipboard"
 msgstr "Ubacite iz ostave"
 
-#: ../src/sendmsg-window.c:364
+#: ../src/sendmsg-window.c:366
 msgid "_Wrap Body"
 msgstr "Prelomi _redove u poruci"
 
-#: ../src/sendmsg-window.c:366
+#: ../src/sendmsg-window.c:368
 msgid "_Reflow Selected Text"
 msgstr "_Popravi prelome u izboru"
 
-#: ../src/sendmsg-window.c:368
+#: ../src/sendmsg-window.c:370
 msgid "Insert Si_gnature"
 msgstr "Ubaci po_tpis"
 
-#: ../src/sendmsg-window.c:370
+#: ../src/sendmsg-window.c:372
 msgid "_Quote Message(s)"
 msgstr "_Citiraj poruku"
 
-#: ../src/sendmsg-window.c:373 ../src/sendmsg-window.c:415
+#: ../src/sendmsg-window.c:375 ../src/sendmsg-window.c:417
 msgid "C_heck Spelling"
 msgstr "Pro_veri pravopis"
 
-#: ../src/sendmsg-window.c:374 ../src/sendmsg-window.c:416
+#: ../src/sendmsg-window.c:376 ../src/sendmsg-window.c:418
 msgid "Check the spelling of the message"
 msgstr "Proverite pravopis poruke"
 
-#: ../src/sendmsg-window.c:377
+#: ../src/sendmsg-window.c:379
 msgid "Select _Identity..."
 msgstr "Izaberite l_ičnost..."
 
-#: ../src/sendmsg-window.c:378
+#: ../src/sendmsg-window.c:380
 msgid "Select the Identity to use for the message"
 msgstr "Izaberite ličnost za ovu poruku"
 
-#: ../src/sendmsg-window.c:381
+#: ../src/sendmsg-window.c:383
 msgid "_Edit with Gnome-Editor"
 msgstr "_Uredi pomoću Gnomovog uređivača"
 
-#: ../src/sendmsg-window.c:382
+#: ../src/sendmsg-window.c:384
 msgid "Edit the current message with the default Gnome editor"
 msgstr "Uredite tekuću poruku pomoću osnovnog Gnomovog uređivača"
 
@@ -6614,135 +6428,137 @@ msgstr "Uredite tekuću poruku pomoću osnovnog Gnomovog uređivača"
 #. * stock_id; the first in this list defines the action tied to the
 #. * toolbar's "Send" button, so "ToolbarSend" must come before
 #. * the others.
-#: ../src/sendmsg-window.c:393 ../src/sendmsg-window.c:395
+#: ../src/sendmsg-window.c:395 ../src/sendmsg-window.c:397
 msgid "Sen_d"
 msgstr "_Pošalji"
 
-#: ../src/sendmsg-window.c:394 ../src/sendmsg-window.c:396
+#: ../src/sendmsg-window.c:396 ../src/sendmsg-window.c:398
 msgid "Send this message"
 msgstr "Pošaljite ovu poruku"
 
-#: ../src/sendmsg-window.c:398
+#: ../src/sendmsg-window.c:400
 msgid "_Queue"
 msgstr "_Zakaži"
 
-#: ../src/sendmsg-window.c:399 ../src/sendmsg-window.c:405
+#: ../src/sendmsg-window.c:401 ../src/sendmsg-window.c:407
 msgid "Queue this message in Outbox for sending"
 msgstr "Smestite ovu poruku u „Odlazno“ radi slanja"
 
-#: ../src/sendmsg-window.c:401
+#: ../src/sendmsg-window.c:403
 msgid "_Postpone"
 msgstr "Od_loži"
 
-#: ../src/sendmsg-window.c:402
-#| msgid "Save this message"
+#: ../src/sendmsg-window.c:404
 msgid "Save this message and close"
 msgstr "Sačuvajte ovu poruku i zatvorite"
 
-#: ../src/sendmsg-window.c:404
+#: ../src/sendmsg-window.c:406
 msgid "Send _Later"
 msgstr "Pošalji _kasnije"
 
-#: ../src/sendmsg-window.c:407
+#: ../src/sendmsg-window.c:409
 msgid "Sa_ve and Close"
 msgstr "Sačuvaj i _zatvori"
 
-#: ../src/sendmsg-window.c:419
-#| msgid "_Toolbars..."
+#: ../src/sendmsg-window.c:421
 msgid "Too_lbar"
 msgstr "Traka _alata"
 
-#: ../src/sendmsg-window.c:421
-#| msgid "F_rom:"
+#: ../src/sendmsg-window.c:423
 msgid "F_rom"
 msgstr "_Šalje"
 
-#: ../src/sendmsg-window.c:423
+#: ../src/sendmsg-window.c:425
 msgid "Rec_ipients"
 msgstr "_Primaoci"
 
-#: ../src/sendmsg-window.c:426
-#| msgid "_Reply To"
+#: ../src/sendmsg-window.c:428
 msgid "R_eply To"
 msgstr "_Odgovori"
 
-#: ../src/sendmsg-window.c:429
-#| msgid "F_cc:"
+#: ../src/sendmsg-window.c:431
 msgid "F_cc"
 msgstr "U _datoteku"
 
-#: ../src/sendmsg-window.c:432
+#: ../src/sendmsg-window.c:434
 msgid "_Request Disposition Notification"
 msgstr "_Zahtevaj obaveštenje o prispeću"
 
-#: ../src/sendmsg-window.c:433
-#| msgid "_Request Disposition Notification"
+#: ../src/sendmsg-window.c:435
 msgid "Request Message Disposition Notification"
 msgstr "Zahtevaj obaveštenje o prispeću poruke"
 
-#: ../src/sendmsg-window.c:435
+#: ../src/sendmsg-window.c:438
+#| msgid "_Request Disposition Notification"
+msgid "_Request Delivery Status Notification"
+msgstr "_Zahtevaj obaveštenje o stanju isporuke"
+
+#: ../src/sendmsg-window.c:439
+msgid "Request positive (successful) Delivery Status Notification"
+msgstr "Zahtevaj obaveštenje stanja o pozitivnoj (uspešnoj) isporuci"
+
+#: ../src/sendmsg-window.c:441
 msgid "_Format = Flowed"
 msgstr "_Zapis = uključeno"
 
 #. Send as message/alternative with text/plain and text/html parts
-#: ../src/sendmsg-window.c:438
+#: ../src/sendmsg-window.c:444
 msgid "Send as plain text and _HTML"
 msgstr "Pošalji kao običan tekst i _HTML"
 
-#: ../src/sendmsg-window.c:442 ../src/sendmsg-window.c:448
+#: ../src/sendmsg-window.c:448 ../src/sendmsg-window.c:454
 msgid "_Sign Message"
 msgstr "_Potpiši poruku"
 
-#: ../src/sendmsg-window.c:443
+#: ../src/sendmsg-window.c:449
 msgid "Sign message using GPG"
 msgstr "Potpišite poruku koristeći GPG"
 
-#: ../src/sendmsg-window.c:444 ../src/sendmsg-window.c:451
+#: ../src/sendmsg-window.c:450 ../src/sendmsg-window.c:457
 msgid "_Encrypt Message"
 msgstr "_Šifruj poruku"
 
-#: ../src/sendmsg-window.c:445
+#: ../src/sendmsg-window.c:451
 msgid "Encrypt message using GPG"
 msgstr "Šifrujte poruku koristeći GPG"
 
-#: ../src/sendmsg-window.c:449
+#: ../src/sendmsg-window.c:455
 msgid "signs the message using GnuPG"
 msgstr "potpisuje poruku koristeći GnuPG"
 
-#: ../src/sendmsg-window.c:453
+#: ../src/sendmsg-window.c:459
 msgid "signs the message using GnuPG for all To: and CC: recipients"
 msgstr "potpisuje poruku koristeći GnuPG za sve vidljive primaoce"
 
-#: ../src/sendmsg-window.c:463
+#: ../src/sendmsg-window.c:469
 msgid "_GnuPG uses MIME mode"
 msgstr "_GnuPG koristi MIME režim"
 
-#: ../src/sendmsg-window.c:465
+#: ../src/sendmsg-window.c:471
 msgid "_GnuPG uses old OpenPGP mode"
 msgstr "_GnuPG koristi stari OpenPGP režim"
 
-#: ../src/sendmsg-window.c:468
+#: ../src/sendmsg-window.c:474
 msgid "_S/MIME mode (GpgSM)"
 msgstr "_S/MIME režim (GpgSM)"
 
-#: ../src/sendmsg-window.c:680
+#: ../src/sendmsg-window.c:688
 msgid "Attachment"
 msgstr "Prilog"
 
-#: ../src/sendmsg-window.c:680
+#: ../src/sendmsg-window.c:688
 msgid "Inline"
 msgstr "Unutar"
 
-#: ../src/sendmsg-window.c:680
+#: ../src/sendmsg-window.c:688
 msgid "Reference"
 msgstr "Poziva se na"
 
-#: ../src/sendmsg-window.c:921
-#| msgid "(No sender)"
+#: ../src/sendmsg-window.c:929
 msgid "(No name)"
 msgstr "(Bez imena)"
 
-#: ../src/sendmsg-window.c:927
+#: ../src/sendmsg-window.c:935
 #, c-format
 msgid ""
 "The message to '%s' is modified.\n"
@@ -6751,15 +6567,15 @@ msgstr ""
 "Poruka za „%s“ je izmenjena.\n"
 "Da sačuvam poruku u „Skice“?"
 
-#: ../src/sendmsg-window.c:1225
+#: ../src/sendmsg-window.c:1233
 msgid "Gnome editor is not defined in your preferred applications."
 msgstr "Gnomov uređivač teksta nije određen u vašim željenim programima."
 
-#: ../src/sendmsg-window.c:1281
+#: ../src/sendmsg-window.c:1289
 msgid "Select Identity"
 msgstr "Izaberi ličnost"
 
-#: ../src/sendmsg-window.c:1758
+#: ../src/sendmsg-window.c:1767
 #, c-format
 msgid ""
 "Saying yes will not send the file `%s' itself, but just a MIME message/"
@@ -6774,15 +6590,15 @@ msgstr ""
 "\n"
 "Da li zaista želite da priložite ovu datoteku kao pozivanje?"
 
-#: ../src/sendmsg-window.c:1771
+#: ../src/sendmsg-window.c:1780
 msgid "Attach as Reference?"
 msgstr "Priloži kao pozivanje?"
 
-#: ../src/sendmsg-window.c:1864
+#: ../src/sendmsg-window.c:1873
 msgid "Choose charset"
 msgstr "Izaberite skup znakova"
 
-#: ../src/sendmsg-window.c:1871
+#: ../src/sendmsg-window.c:1880
 #, c-format
 msgid ""
 "File\n"
@@ -6795,56 +6611,55 @@ msgstr ""
 "nije kodirana u US-ASKRI ili UTF-8.\n"
 "Molim izaberite skup znakova kojim je kodirana ova datoteka."
 
-#: ../src/sendmsg-window.c:1891
+#: ../src/sendmsg-window.c:1900
 msgid "Attach as MIME type:"
 msgstr "Priloži kao MIME vrstu:"
 
-#: ../src/sendmsg-window.c:1960
+#: ../src/sendmsg-window.c:1969
 #, c-format
 msgid "Character set for file %s changed from \"%s\" to \"%s\"."
 msgstr "Skup znakova za datoteku „%s“ je izmenjen iz „%s“ u „%s“."
 
-#: ../src/sendmsg-window.c:2003 ../src/sendmsg-window.c:5766
+#: ../src/sendmsg-window.c:2012 ../src/sendmsg-window.c:5780
 msgid "(no subject)"
 msgstr "(bez naslova)"
 
-#: ../src/sendmsg-window.c:2041
+#: ../src/sendmsg-window.c:2050
 #, c-format
-#| msgid "Can't create filter"
 msgid "Cannot create file URI object for %s"
 msgstr "Ne mogu da napravim predmet putanje datoteke za %s"
 
-#: ../src/sendmsg-window.c:2049
+#: ../src/sendmsg-window.c:2058
 msgid "unknown error"
 msgstr "nepoznata greška"
 
-#: ../src/sendmsg-window.c:2096
+#: ../src/sendmsg-window.c:2105
 msgid "forwarded message"
 msgstr "prosleđena poruka"
 
-#: ../src/sendmsg-window.c:2101
+#: ../src/sendmsg-window.c:2110
 #, c-format
 msgid "Message from %s, subject: \"%s\""
 msgstr "Poruku šalje %s, tema: „%s“"
 
-#: ../src/sendmsg-window.c:2177 ../src/sendmsg-window.c:2250
+#: ../src/sendmsg-window.c:2186 ../src/sendmsg-window.c:2259
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../src/sendmsg-window.c:2262
+#: ../src/sendmsg-window.c:2271
 msgid "Open..."
 msgstr "Otvori..."
 
-#: ../src/sendmsg-window.c:2274
+#: ../src/sendmsg-window.c:2283
 msgid "(URL)"
 msgstr "(Adresa)"
 
-#: ../src/sendmsg-window.c:2332
+#: ../src/sendmsg-window.c:2341
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
-#: ../src/sendmsg-window.c:2433 ../src/sendmsg-window.c:2543
-#: ../src/sendmsg-window.c:5023
+#: ../src/sendmsg-window.c:2442 ../src/sendmsg-window.c:2552
+#: ../src/sendmsg-window.c:5033
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -6852,156 +6667,148 @@ msgstr ""
 "Neuspešno uključivanje poruke.\n"
 "Mogući razlog: nedovoljno prostora za privremeni smeštaj"
 
-#: ../src/sendmsg-window.c:2797
+#: ../src/sendmsg-window.c:2806
 msgid "F_rom:"
 msgstr "_Šalje:"
 
 #. Subject:
-#: ../src/sendmsg-window.c:2939
+#: ../src/sendmsg-window.c:2948
 msgid "S_ubject:"
 msgstr "_Tema:"
 
 #. fcc: mailbox folder where the message copy will be written to
-#: ../src/sendmsg-window.c:2950
+#: ../src/sendmsg-window.c:2959
 msgid "F_cc:"
 msgstr "U _datoteku:"
 
 #. Attachment list
-#: ../src/sendmsg-window.c:2979
+#: ../src/sendmsg-window.c:2988
 msgid "_Attachments:"
 msgstr "_Prilozi:"
 
-#: ../src/sendmsg-window.c:3028
+#: ../src/sendmsg-window.c:3037
 msgid "Mode"
 msgstr "Način"
 
-#: ../src/sendmsg-window.c:3375
+#: ../src/sendmsg-window.c:3384
 #, c-format
 msgid "Could not save attachment: %s"
 msgstr "Ne mogu da sačuvam prilog: %s"
 
-#: ../src/sendmsg-window.c:3399
-#| msgid "(No subject)"
+#: ../src/sendmsg-window.c:3408
 msgid "No subject"
 msgstr "Bez teme"
 
-#: ../src/sendmsg-window.c:3432
+#: ../src/sendmsg-window.c:3441
 #, c-format
-#| msgid "Invalid filter: %s"
 msgid "inlined file \"%s\" (%s)"
 msgstr "neposredna datoteka „%s“ (%s)"
 
-#: ../src/sendmsg-window.c:3435
+#: ../src/sendmsg-window.c:3444
 #, c-format
 msgid "attached file \"%s\" (%s)"
 msgstr "priložena datoteka „%s“ (%s)"
 
-#: ../src/sendmsg-window.c:3439
+#: ../src/sendmsg-window.c:3448
 #, c-format
-#| msgid "signed parts"
 msgid "inlined %s part"
 msgstr "neposredan %s deo"
 
-#: ../src/sendmsg-window.c:3441
+#: ../src/sendmsg-window.c:3450
 #, c-format
-#| msgid "attach as file"
 msgid "attached %s part"
 msgstr "priložen %s deo"
 
-#: ../src/sendmsg-window.c:3509
+#: ../src/sendmsg-window.c:3518
 #, c-format
 msgid "message from %s, subject \"%s\""
 msgstr "poruku šalje %s, tema „%s“"
 
-#: ../src/sendmsg-window.c:3636
-#| msgid "Quoted"
+#: ../src/sendmsg-window.c:3645
 msgid "quoted"
 msgstr "citirano"
 
-#: ../src/sendmsg-window.c:3641 ../src/sendmsg-window.c:3644
+#: ../src/sendmsg-window.c:3650 ../src/sendmsg-window.c:3653
 msgid "quoted attachment"
 msgstr "citirani prilog"
 
-#: ../src/sendmsg-window.c:3670
-#| msgid "Select parent folder"
+#: ../src/sendmsg-window.c:3679
 msgid "Select parts for quotation"
 msgstr "Izaberi delove za citiranje"
 
-#: ../src/sendmsg-window.c:3679
+#: ../src/sendmsg-window.c:3688
 msgid "Select the parts of the message which shall be quoted in the reply"
 msgstr "Izaberite delove poruke koji će biti citirani u odgovoru"
 
-#: ../src/sendmsg-window.c:3821
+#: ../src/sendmsg-window.c:3830
 msgid "you"
 msgstr "vi"
 
-#: ../src/sendmsg-window.c:3830
+#: ../src/sendmsg-window.c:3839
 #, c-format
 msgid "------forwarded message from %s------\n"
 msgstr "------prosleđena poruka koju šalje %s------\n"
 
-#: ../src/sendmsg-window.c:3867
+#: ../src/sendmsg-window.c:3876
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "IB poruke: %s\n"
 
-#: ../src/sendmsg-window.c:3873
+#: ../src/sendmsg-window.c:3882
 msgid "References:"
 msgstr "Pozivanja:"
 
-#: ../src/sendmsg-window.c:3884
+#: ../src/sendmsg-window.c:3893
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Dana %s, %s je napisao:\n"
 
-#: ../src/sendmsg-window.c:3886
+#: ../src/sendmsg-window.c:3895
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s je napisao:\n"
 
-#: ../src/sendmsg-window.c:3996
+#: ../src/sendmsg-window.c:4005
 msgid "No signature found!"
 msgstr "Nisam pronašao potpis!"
 
-#: ../src/sendmsg-window.c:4184
+#: ../src/sendmsg-window.c:4193
 msgid "Could not save message."
 msgstr "Ne mogu da sačuvam poruku."
 
-#: ../src/sendmsg-window.c:4191
+#: ../src/sendmsg-window.c:4200
 #, c-format
 msgid "Could not open draftbox: %s"
 msgstr "Ne mogu da otvorim skice: %s"
 
-#: ../src/sendmsg-window.c:4216
+#: ../src/sendmsg-window.c:4225
 msgid "Message saved."
 msgstr "Poruka je sačuvana."
 
-#: ../src/sendmsg-window.c:5203 ../src/sendmsg-window.c:5211
-#: ../src/sendmsg-window.c:5218 ../src/sendmsg-window.c:5225
-#: ../src/sendmsg-window.c:5249
+#: ../src/sendmsg-window.c:5216 ../src/sendmsg-window.c:5224
+#: ../src/sendmsg-window.c:5231 ../src/sendmsg-window.c:5238
+#: ../src/sendmsg-window.c:5262
 #, c-format
-#| msgid "Could not open the file %s.\n"
 msgid "Could not attach the file %s: %s."
 msgstr "Ne mogu da priložim datoteku „%s“: %s."
 
-#: ../src/sendmsg-window.c:5204
+#: ../src/sendmsg-window.c:5217
 msgid "not an absolute path"
 msgstr "nije apsolutna putanja"
 
-#: ../src/sendmsg-window.c:5212
+#: ../src/sendmsg-window.c:5225
 msgid "not in your directory"
 msgstr "nije u vašem direktorijumu"
 
-#: ../src/sendmsg-window.c:5219
-#| msgid "Mailbox does not exist."
+#: ../src/sendmsg-window.c:5232
 msgid "does not exist"
 msgstr "ne postoji"
 
-#: ../src/sendmsg-window.c:5250
+#: ../src/sendmsg-window.c:5263
 msgid "not in current directory"
 msgstr "nije u tekućem direktorijumu"
 
-#: ../src/sendmsg-window.c:5300
+#: ../src/sendmsg-window.c:5313
 msgid ""
 "The link that you selected created\n"
 "a \"Blind copy\" (Bcc) address.\n"
@@ -7013,42 +6820,40 @@ msgstr ""
 "Molim proverite da li je adresa\n"
 "odgovarajuća."
 
-#: ../src/sendmsg-window.c:5384
+#: ../src/sendmsg-window.c:5397
 #, c-format
 msgid "Could not open the file %s.\n"
 msgstr "Ne mogu da otvorim datoteku %s.\n"
 
-#: ../src/sendmsg-window.c:5432
+#: ../src/sendmsg-window.c:5445
 msgid "Include file"
 msgstr "Uključi datoteku"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:5618
+#: ../src/sendmsg-window.c:5632
 #, c-format
 msgid "Could not load Face header file %s: %s"
 msgstr "Ne mogu da učitam sličicu zaglavlja „%s“: %s"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:5621
+#: ../src/sendmsg-window.c:5635
 #, c-format
 msgid "Could not load X-Face header file %s: %s"
 msgstr "Ne mogu da učitam H-sličicu zaglavlja „%s“: %s"
 
-#: ../src/sendmsg-window.c:5750
-#| msgid "Set identity to use for this message"
+#: ../src/sendmsg-window.c:5764
 msgid "You did not specify a subject for this message"
 msgstr "Niste naveli temu za ovu poruku"
 
-#: ../src/sendmsg-window.c:5751
+#: ../src/sendmsg-window.c:5765
 msgid "If you would like to provide one, enter it below."
 msgstr "Ako želite, upišite je ispod."
 
-#: ../src/sendmsg-window.c:5801
-#| msgid "Send"
+#: ../src/sendmsg-window.c:5815
 msgid "_Send"
 msgstr "_Pošalji"
 
-#: ../src/sendmsg-window.c:5884
+#: ../src/sendmsg-window.c:5898
 #, c-format
 msgid ""
 "You did not select encryption for this message, although %s public keys are "
@@ -7056,40 +6861,35 @@ msgid ""
 "could be %s encrypted."
 msgstr ""
 "Niste izabrali šifrovanje za ovu poruku, iako „%s“ javni ključ je dostupan "
-"svim primaocima. Da biste zaštitili vašu privatnost, poruka bi mogla biti „%"
-"s“ šifrovana."
+"svim primaocima. Da biste zaštitili vašu privatnost, poruka bi mogla biti "
+"„%s“ šifrovana."
 
-#: ../src/sendmsg-window.c:5911
+#: ../src/sendmsg-window.c:5925
 msgid "Send _encrypted"
 msgstr "Pošalji _šifrovanu"
 
-#: ../src/sendmsg-window.c:5929
+#: ../src/sendmsg-window.c:5943
 msgid "Send _unencrypted"
 msgstr "Pošalji _nešifrovanu"
 
-#: ../src/sendmsg-window.c:5992
-#| msgid "Select the Identity to use for the message"
+#: ../src/sendmsg-window.c:6006
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Izabrali ste OpenPGP bezbednost za ovu poruku.\n"
 
-#: ../src/sendmsg-window.c:5997
+#: ../src/sendmsg-window.c:6011
 msgid ""
 "The message text will be sent as plain text and as HTML, but only the plain "
 "part can be signed.\n"
-msgstr "Tekst poruke će biti poslat i kao običan tekst i ako HTML, sali samo običan "
+msgstr ""
+"Tekst poruke će biti poslat i kao običan tekst i ako HTML, sali samo običan "
 "tekst može biti potpisan.\n"
 
-#: ../src/sendmsg-window.c:6002
+#: ../src/sendmsg-window.c:6016
 msgid ""
 "The message contains attachments, which cannot be signed or encrypted.\n"
 msgstr "Poruka sadrži priloge, koji ne mogu biti potpisani ili šifrovani.\n"
 
-#: ../src/sendmsg-window.c:6006
-#| msgid ""
-#| "You selected OpenPGP mode for a message with attachments. In this mode, "
-#| "only the first part will be signed and/or encrypted. You should select "
-#| "MIME mode if the complete message shall be protected. Do you really want "
-#| "to proceed?"
+#: ../src/sendmsg-window.c:6020
 msgid ""
 "You should select MIME mode if the complete message shall be protected. Do "
 "you really want to proceed?"
@@ -7097,36 +6897,36 @@ msgstr ""
 "Treba da izaberete MIME režim ako čitava poruka treba da bude šifrovana. Da "
 "li zaista želite da nastavite?"
 
-#: ../src/sendmsg-window.c:6031
+#: ../src/sendmsg-window.c:6045
 #, c-format
 msgid "sending message with gpg mode %d"
 msgstr "šaljem poruku u gpg režimu %d"
 
-#: ../src/sendmsg-window.c:6068
+#: ../src/sendmsg-window.c:6082
 msgid "Message could not be created"
 msgstr "Ne mogu da napravim poruku"
 
-#: ../src/sendmsg-window.c:6070
+#: ../src/sendmsg-window.c:6084
 msgid "Message could not be queued in outbox"
 msgstr "Poruka ne može biti stavljena u red u odlaznom"
 
-#: ../src/sendmsg-window.c:6072
+#: ../src/sendmsg-window.c:6086
 msgid "Message could not be saved in sentbox"
 msgstr "Poruka ne može biti sačuvana u poslatom"
 
-#: ../src/sendmsg-window.c:6074
+#: ../src/sendmsg-window.c:6088
 msgid "Message could not be sent"
 msgstr "Ne mogu da pošaljem poruku"
 
-#: ../src/sendmsg-window.c:6077
+#: ../src/sendmsg-window.c:6091
 msgid "Message could not be signed"
 msgstr "Ne mogu da potpišem poruku"
 
-#: ../src/sendmsg-window.c:6079
+#: ../src/sendmsg-window.c:6093
 msgid "Message could not be encrypted"
 msgstr "Ne mogu da šifrujem poruku"
 
-#: ../src/sendmsg-window.c:6085
+#: ../src/sendmsg-window.c:6099
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -7135,122 +6935,117 @@ msgstr ""
 "Nisam uspeo da pošaljem: %s\n"
 "%s"
 
-#: ../src/sendmsg-window.c:6090
+#: ../src/sendmsg-window.c:6104
 #, c-format
 msgid "Send failed: %s"
 msgstr "Nisam uspeo da pošaljem: %s"
 
-#: ../src/sendmsg-window.c:6181
+#: ../src/sendmsg-window.c:6197
 #, c-format
 msgid "Could not postpone message: %s"
 msgstr "Ne mogu da odložim poruku: %s"
 
-#: ../src/sendmsg-window.c:6198
+#: ../src/sendmsg-window.c:6214
 msgid "Message postponed."
 msgstr "Poruka je odložena."
 
-#: ../src/sendmsg-window.c:6203
+#: ../src/sendmsg-window.c:6219
 msgid "Could not postpone message."
 msgstr "Ne mogu da odložim poruku."
 
-#: ../src/sendmsg-window.c:6356
+#: ../src/sendmsg-window.c:6372
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Greška pokretanja provere pravopisa: %s"
 
-#: ../src/sendmsg-window.c:6523
+#: ../src/sendmsg-window.c:6539
 #, c-format
 msgid "Could not compile %s"
 msgstr "Ne mogu da prevedem %s"
 
-#: ../src/sendmsg-window.c:6524
+#: ../src/sendmsg-window.c:6540
 msgid "Quoted Text Regular Expression"
 msgstr "Regularni izraz za citirani tekst"
 
-#: ../src/sendmsg-window.c:7031
+#: ../src/sendmsg-window.c:7054
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Odgovor za %s: %s"
 
-#: ../src/sendmsg-window.c:7036
+#: ../src/sendmsg-window.c:7059
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "Prosledi poruku za %s: %s"
 
-#: ../src/sendmsg-window.c:7040
+#: ../src/sendmsg-window.c:7063
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Nova poruka za %s: %s"
 
-#: ../src/spell-check.c:509
-#| msgid "Change..."
+#: ../src/spell-check.c:507
 msgid "_Change"
 msgstr "_Izmeni"
 
-#: ../src/spell-check.c:511
+#: ../src/spell-check.c:509
 msgid "Replace the current word with the selected suggestion"
 msgstr "Zamenite tekuću reč izabranim predlogom"
 
-#: ../src/spell-check.c:516
-#| msgid "Change..."
+#: ../src/spell-check.c:514
 msgid "Change _All"
 msgstr "Izmeni _sve"
 
-#: ../src/spell-check.c:518
-#| msgid ""
-#| "Replace all occurences of the current word with the selected suggestion"
+#: ../src/spell-check.c:516
 msgid ""
 "Replace all occurrences of the current word with the selected suggestion"
 msgstr "Zamenite sve pojave tekuće reči izabranim predlogom"
 
-#: ../src/spell-check.c:527
+#: ../src/spell-check.c:525
 msgid "_Ignore"
 msgstr "_Zanemari"
 
-#: ../src/spell-check.c:530
+#: ../src/spell-check.c:528
 msgid "Skip the current word"
 msgstr "Preskočite tekuću reč"
 
-#: ../src/spell-check.c:534
+#: ../src/spell-check.c:532
 msgid "Ignore A_ll"
 msgstr "Zanemari _sve"
 
-#: ../src/spell-check.c:536
+#: ../src/spell-check.c:534
 msgid "Skip all occurrences of the current word"
 msgstr "Preskočite sve pojave tekuće reči"
 
-#: ../src/spell-check.c:542
-#| msgid "C_lear"
+#: ../src/spell-check.c:540
 msgid "_Learn"
 msgstr "_Nauči"
 
-#: ../src/spell-check.c:544
+#: ../src/spell-check.c:542
 msgid "Add the current word to your personal dictionary"
 msgstr "Dodajte tekuću reč u lični rečnik"
 
-#: ../src/spell-check.c:549
-#| msgid "Down"
+#: ../src/spell-check.c:547
 msgid "_Done"
 msgstr "_Urađeno"
 
-#: ../src/spell-check.c:550
+#: ../src/spell-check.c:548
 msgid "Finish spell checking"
 msgstr "Završite proveru pravopisa"
 
-#: ../src/spell-check.c:555
+#: ../src/spell-check.c:553
 msgid "Revert all changes and finish spell checking"
 msgstr "Vratite sve izmene i završite proveru pravopisa"
 
-#: ../src/spell-check.c:584
+#: ../src/spell-check.c:582
 msgid "Spell check"
 msgstr "Pravopis"
 
-#: ../src/spell-check.c:862
+#: ../src/spell-check.c:860
 msgid "BalsaSpellCheck: Quoted text regular expression compilation failed\n"
-msgstr "Balsina provera pisanja: Nisam uspeo da sastavim regularni izraz citiranog "
+msgstr ""
+"Balsina provera pisanja: Nisam uspeo da sastavim regularni izraz citiranog "
 "teksta\n"
 
-#: ../src/spell-check.c:986
+#: ../src/spell-check.c:984
 #, c-format
 msgid ""
 "BalsaSpellCheck: Learn operation failed;\n"
@@ -7259,86 +7054,85 @@ msgstr ""
 "Balsina provera pisanja: Nisam uspeo da naučim;\n"
 "%s\n"
 
-#: ../src/spell-check.c:992
+#: ../src/spell-check.c:990
 msgid "BalsaSpellCheck: Learn operation failed.\n"
 msgstr "Balsina provera pisanja: Nisam uspeo da naučim.\n"
 
-#: ../src/spell-check.c:1191
+#: ../src/spell-check.c:1189
 #, c-format
 msgid "BalsaSpellCheck: Suggest %s (%s)\n"
 msgstr "Balsina provera pisanja: Predlog „%s“ (%s)\n"
 
-#: ../src/spell-check.c:1293
+#: ../src/spell-check.c:1291
 #, c-format
 msgid "BalsaSpellCheck: Pspell Error: %s\n"
 msgstr "Balsina provera pisanja: Greška pspela: %s\n"
 
-#: ../src/store-address.c:109
+#: ../src/store-address.c:107
 msgid "Store address: no addresses"
 msgstr "Skladištenje adrese: nema adresa"
 
-#: ../src/store-address.c:204
+#: ../src/store-address.c:202
 msgid "Store Address"
 msgstr "Skladišti adresu"
 
-#: ../src/store-address.c:225
+#: ../src/store-address.c:223
 msgid "Save this address and close the dialog?"
 msgstr "Da sačuvam ovu adresu i zatvorim prozorče?"
 
-#: ../src/store-address.c:243
+#: ../src/store-address.c:241
 msgid "No address book selected...."
 msgstr "Nije izabran adresar..."
 
-#: ../src/store-address.c:256
+#: ../src/store-address.c:254
 msgid "Address could not be written to this address book."
 msgstr "Ne mogu da upišem adresu u ovaj adresar."
 
-#: ../src/store-address.c:259
+#: ../src/store-address.c:257
 msgid "Address book could not be accessed."
 msgstr "Ne mogu da pristupim adresaru."
 
-#: ../src/store-address.c:261
+#: ../src/store-address.c:259
 msgid "This mail address is already in this address book."
 msgstr "Ova adresa je već navedena u adresaru."
 
-#: ../src/store-address.c:264
+#: ../src/store-address.c:262
 msgid "Unexpected address book error. Report it."
 msgstr "Neočekivana greška u adresaru. Molim prijavite je."
 
-#: ../src/store-address.c:280
+#: ../src/store-address.c:278
 msgid "Choose Address Book"
 msgstr "Izaberite adresar"
 
-#: ../src/store-address.c:328
+#: ../src/store-address.c:326
 msgid "Choose Address"
 msgstr "Izaberite adresu"
 
-#: ../src/toolbar-factory.c:133
+#: ../src/toolbar-factory.c:131
 msgid "Separator"
 msgstr "Razdvajač"
 
-#: ../src/toolbar-factory.c:134
-#| msgid "Quoted"
+#: ../src/toolbar-factory.c:132
 msgid "Quit"
 msgstr "Izađi"
 
-#: ../src/toolbar-factory.c:135
+#: ../src/toolbar-factory.c:133
 msgid "Check"
 msgstr "Proveri"
 
-#: ../src/toolbar-factory.c:136
+#: ../src/toolbar-factory.c:134
 msgid "Compose"
 msgstr "Nova"
 
-#: ../src/toolbar-factory.c:137
+#: ../src/toolbar-factory.c:135
 msgid "Continue"
 msgstr "Nastavi"
 
-#: ../src/toolbar-factory.c:138
+#: ../src/toolbar-factory.c:136
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../src/toolbar-factory.c:139
+#: ../src/toolbar-factory.c:137
 msgid ""
 "Reply\n"
 "to all"
@@ -7346,7 +7140,7 @@ msgstr ""
 "Odgov.\n"
 "svima"
 
-#: ../src/toolbar-factory.c:140
+#: ../src/toolbar-factory.c:138
 msgid ""
 "Reply\n"
 "to group"
@@ -7354,11 +7148,11 @@ msgstr ""
 "Odgov.\n"
 "grupi"
 
-#: ../src/toolbar-factory.c:141
+#: ../src/toolbar-factory.c:139
 msgid "Forward"
 msgstr "Prosledi"
 
-#: ../src/toolbar-factory.c:144
+#: ../src/toolbar-factory.c:142
 msgid ""
 "Next\n"
 "unread"
@@ -7366,7 +7160,7 @@ msgstr ""
 "Sledeća\n"
 "neproč."
 
-#: ../src/toolbar-factory.c:145
+#: ../src/toolbar-factory.c:143
 msgid ""
 "Next\n"
 "flagged"
@@ -7374,7 +7168,7 @@ msgstr ""
 "Sledeća\n"
 "označena"
 
-#: ../src/toolbar-factory.c:146
+#: ../src/toolbar-factory.c:144
 msgid ""
 "Previous\n"
 "part"
@@ -7382,7 +7176,7 @@ msgstr ""
 "Prethodni\n"
 "deo"
 
-#: ../src/toolbar-factory.c:147
+#: ../src/toolbar-factory.c:145
 msgid ""
 "Next\n"
 "part"
@@ -7390,7 +7184,7 @@ msgstr ""
 "Sledeći\n"
 "deo"
 
-#: ../src/toolbar-factory.c:148
+#: ../src/toolbar-factory.c:146
 msgid ""
 "Trash /\n"
 "Delete"
@@ -7398,15 +7192,15 @@ msgstr ""
 "U smeće /\n"
 "Obriši"
 
-#: ../src/toolbar-factory.c:149
+#: ../src/toolbar-factory.c:147
 msgid "Postpone"
 msgstr "Odloži"
 
-#: ../src/toolbar-factory.c:150
+#: ../src/toolbar-factory.c:148
 msgid "Print"
 msgstr "Štampaj"
 
-#: ../src/toolbar-factory.c:151
+#: ../src/toolbar-factory.c:149
 msgid ""
 "Request\n"
 "MDN"
@@ -7414,31 +7208,31 @@ msgstr ""
 "Zatevaj\n"
 "MDN"
 
-#: ../src/toolbar-factory.c:152
+#: ../src/toolbar-factory.c:150
 msgid "Send"
 msgstr "Pošalji"
 
-#: ../src/toolbar-factory.c:153
+#: ../src/toolbar-factory.c:151
 msgid "Exchange"
 msgstr "Razmeni"
 
-#: ../src/toolbar-factory.c:154
+#: ../src/toolbar-factory.c:152
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../src/toolbar-factory.c:155
+#: ../src/toolbar-factory.c:153
 msgid "Save"
 msgstr "Sačuvaj"
 
-#: ../src/toolbar-factory.c:156
+#: ../src/toolbar-factory.c:154
 msgid "Identity"
 msgstr "Ličnost"
 
-#: ../src/toolbar-factory.c:158
+#: ../src/toolbar-factory.c:156
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../src/toolbar-factory.c:159
+#: ../src/toolbar-factory.c:157
 msgid ""
 "Toggle\n"
 "new"
@@ -7446,11 +7240,11 @@ msgstr ""
 "Izmeni\n"
 "novu"
 
-#: ../src/toolbar-factory.c:160
+#: ../src/toolbar-factory.c:158
 msgid "Mark all"
 msgstr "Obeleži sve"
 
-#: ../src/toolbar-factory.c:162
+#: ../src/toolbar-factory.c:160
 msgid ""
 "Reset\n"
 "Filter"
@@ -7458,29 +7252,27 @@ msgstr ""
 "Očisti\n"
 "propusnik"
 
-#: ../src/toolbar-factory.c:165
+#: ../src/toolbar-factory.c:163
 msgid "Sign"
 msgstr "Potpiši"
 
-#: ../src/toolbar-factory.c:166
+#: ../src/toolbar-factory.c:164
 msgid "Encrypt"
 msgstr "Šifruj"
 
-#: ../src/toolbar-factory.c:168
+#: ../src/toolbar-factory.c:166
 msgid "Undo"
 msgstr "Opozovi"
 
-#: ../src/toolbar-factory.c:169
+#: ../src/toolbar-factory.c:167
 msgid "Redo"
 msgstr "Ponovi"
 
-#: ../src/toolbar-factory.c:170
-#| msgid "Exchange"
+#: ../src/toolbar-factory.c:168
 msgid "Expunge"
 msgstr "Izbaci"
 
-#: ../src/toolbar-factory.c:171
-#| msgid "Empty Trash"
+#: ../src/toolbar-factory.c:169
 msgid ""
 "Empty\n"
 "Trash"
@@ -7488,97 +7280,95 @@ msgstr ""
 "Isprazni\n"
 "smeće"
 
-#: ../src/toolbar-factory.c:172
-#| msgid "_Edit"
+#: ../src/toolbar-factory.c:170
 msgid "Edit"
 msgstr "Izmeni"
 
-#: ../src/toolbar-factory.c:185
+#: ../src/toolbar-factory.c:183
 msgid "Queue"
 msgstr "Zakaži"
 
-#: ../src/toolbar-factory.c:390
+#: ../src/toolbar-factory.c:388
 #, c-format
 msgid "Unknown toolbar icon \"%s\""
 msgstr "Nepoznata ikonica za alatku „%s“"
 
-#: ../src/toolbar-factory.c:461
+#: ../src/toolbar-factory.c:459
 msgid "Queue this message for sending"
 msgstr "Smesti ovu poruku za slanje"
 
-#: ../src/toolbar-factory.c:527
+#: ../src/toolbar-factory.c:525
 msgid "Text Be_low Icons"
 msgstr "Tekst _ispod ikonica"
 
-#: ../src/toolbar-factory.c:528
+#: ../src/toolbar-factory.c:526
 msgid "Priority Text Be_side Icons"
 msgstr "Tekst _pored ikona prema važnosti"
 
-#: ../src/toolbar-factory.c:530
+#: ../src/toolbar-factory.c:528
 msgid "_Icons Only"
 msgstr "_Samo ikonice"
 
-#: ../src/toolbar-factory.c:531
+#: ../src/toolbar-factory.c:529
 msgid "_Text Only"
 msgstr "Samo _tekst"
 
-#: ../src/toolbar-factory.c:754
+#: ../src/toolbar-factory.c:752
 #, c-format
 msgid "Use Desktop _Default (%s)"
 msgstr "Koristi osnovno _okruženja (%s)"
 
-#: ../src/toolbar-factory.c:784
-#| msgid "Customize Toolbars"
+#: ../src/toolbar-factory.c:782
 msgid "_Customize Toolbars..."
 msgstr "_Prilagodi osnovne alatke..."
 
-#: ../src/toolbar-prefs.c:138
+#: ../src/toolbar-prefs.c:136
 msgid "Customize Toolbars"
 msgstr "Prilagodite osnovne alatke"
 
-#: ../src/toolbar-prefs.c:175
+#: ../src/toolbar-prefs.c:173
 msgid "Compose window"
 msgstr "Prozor za pisanje"
 
-#: ../src/toolbar-prefs.c:184
+#: ../src/toolbar-prefs.c:182
 msgid "Toolbar options"
 msgstr "Izbori alatki"
 
-#: ../src/toolbar-prefs.c:193
+#: ../src/toolbar-prefs.c:191
 msgid "_Wrap button labels"
 msgstr "_Prelomi oznake dugmića"
 
-#: ../src/toolbar-prefs.c:408
+#: ../src/toolbar-prefs.c:406
 #, c-format
 msgid "Error displaying toolbar help: %s\n"
 msgstr "Došlo je do greške prilikom prikazivanja pomoći za alatke: %s\n"
 
 #. Preview display
-#: ../src/toolbar-prefs.c:444
+#: ../src/toolbar-prefs.c:442
 msgid "Preview"
 msgstr "Pregled"
 
-#: ../src/toolbar-prefs.c:481
+#: ../src/toolbar-prefs.c:479
 msgid "_Restore toolbar to standard buttons"
 msgstr "_Vrati podrazumevane alatke na paletu"
 
 #. Style button
-#: ../src/toolbar-prefs.c:485
+#: ../src/toolbar-prefs.c:483
 msgid "Toolbar _style..."
 msgstr "Izgled palete _alata..."
 
-#: ../src/toolbar-prefs.c:502
+#: ../src/toolbar-prefs.c:500
 msgid "Available buttons"
 msgstr "Dostupni dugmići"
 
-#: ../src/toolbar-prefs.c:518
+#: ../src/toolbar-prefs.c:516
 msgid "Current toolbar"
 msgstr "Tekuće alatke"
 
-#: ../src/toolbar-prefs.c:535
+#: ../src/toolbar-prefs.c:533
 msgid "Up"
 msgstr "Gore"
 
-#: ../src/toolbar-prefs.c:551
+#: ../src/toolbar-prefs.c:549
 msgid "Down"
 msgstr "Dole"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]