- Update to 4.3.6

6 files changed, 368 insertions, 356 deletions

diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index a64e32bdb18c..fa1e4d38b869 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.3.5
+PORTVERSION=	4.3.6
 PORTEPOCH=	1
 CATEGORIES=	mail www
 DISTFILES=	${PORTNAME}-h3-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo
index 1f9d1dfbf340..8538f2124948 100644
--- a/mail/horde-imp/distinfo
+++ b/mail/horde-imp/distinfo
@@ -1,3 +1,3 @@
-MD5 (imp-h3-4.3.5.tar.gz) = 55f05e37fa86df2aaa21957ac0adc5ef
-SHA256 (imp-h3-4.3.5.tar.gz) = 0bf26c3815fca14d2aa315300be5e119b5df836136c1132be7abd705e703527d
-SIZE (imp-h3-4.3.5.tar.gz) = 5322208
+MD5 (imp-h3-4.3.6.tar.gz) = 75419ac6da795b121b24bc91e0af4aa1
+SHA256 (imp-h3-4.3.6.tar.gz) = ce5413e379c13be3c7554baf3da26c988d0aecc5504a0b12b0716b73ec9f074d
+SIZE (imp-h3-4.3.6.tar.gz) = 5476918
diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist
index bef670aaa7f7..b7d3e04272ba 100644
--- a/mail/horde-imp/pkg-plist
+++ b/mail/horde-imp/pkg-plist
@@ -78,14 +78,13 @@
 %%HORDIR%%/lib/Compose.php
 %%HORDIR%%/lib/Crypt/PGP.php
 %%HORDIR%%/lib/Crypt/SMIME.php
-%%HORDIR%%/lib/Fetchmail.php
 %%HORDIR%%/lib/Fetchmail/imap.php
+%%HORDIR%%/lib/Fetchmail.php
 %%HORDIR%%/lib/Filter.php
 %%HORDIR%%/lib/Folder.php
-%%HORDIR%%/lib/IMAP.php
-%%HORDIR%%/lib/IMAP/ACL.php
 %%HORDIR%%/lib/IMAP/ACL/rfc2086.php
 %%HORDIR%%/lib/IMAP/ACL/rfc4314.php
+%%HORDIR%%/lib/IMAP/ACL.php
 %%HORDIR%%/lib/IMAP/Cache.php
 %%HORDIR%%/lib/IMAP/Client.php
 %%HORDIR%%/lib/IMAP/MessageCache.php
@@ -93,11 +92,12 @@
 %%HORDIR%%/lib/IMAP/Sort.php
 %%HORDIR%%/lib/IMAP/Thread.php
 %%HORDIR%%/lib/IMAP/Tree.php
+%%HORDIR%%/lib/IMAP.php
 %%HORDIR%%/lib/IMP.php
 %%HORDIR%%/lib/Identity/imp.php
-%%HORDIR%%/lib/Imple.php
 %%HORDIR%%/lib/Imple/ContactAutoCompleter.php
 %%HORDIR%%/lib/Imple/SpellChecker.php
+%%HORDIR%%/lib/Imple.php
 %%HORDIR%%/lib/JSON.php
 %%HORDIR%%/lib/MIME/Contents.php
 %%HORDIR%%/lib/MIME/Headers.php
@@ -133,7 +133,6 @@
 %%HORDIR%%/lib/Maintenance/imp.php
 %%HORDIR%%/lib/Message.php
 %%HORDIR%%/lib/Notification/Listener/status.php
-%%HORDIR%%/lib/Quota.php
 %%HORDIR%%/lib/Quota/command.php
 %%HORDIR%%/lib/Quota/hook.php
 %%HORDIR%%/lib/Quota/imap.php
@@ -142,13 +141,14 @@
 %%HORDIR%%/lib/Quota/mdaemon.php
 %%HORDIR%%/lib/Quota/mercury32.php
 %%HORDIR%%/lib/Quota/sql.php
+%%HORDIR%%/lib/Quota.php
 %%HORDIR%%/lib/Search.php
-%%HORDIR%%/lib/Sentmail.php
 %%HORDIR%%/lib/Sentmail/sql.php
+%%HORDIR%%/lib/Sentmail.php
 %%HORDIR%%/lib/Session.php
 %%HORDIR%%/lib/Spam.php
-%%HORDIR%%/lib/SpellChecker.php
 %%HORDIR%%/lib/SpellChecker/aspell.php
+%%HORDIR%%/lib/SpellChecker.php
 %%HORDIR%%/lib/Template.php
 %%HORDIR%%/lib/UI/Compose.php
 %%HORDIR%%/lib/UI/Mailbox.php
@@ -190,6 +190,8 @@
 %%HORDIR%%/locale/fr_FR/help.xml
 %%HORDIR%%/locale/gl_ES/LC_MESSAGES/imp.mo
 %%HORDIR%%/locale/he_IL/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/hr_HR/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/hr_HR/help.xml
 %%HORDIR%%/locale/hu_HU/LC_MESSAGES/imp.mo
 %%HORDIR%%/locale/hu_HU/help.xml
 %%HORDIR%%/locale/id_ID/LC_MESSAGES/imp.mo
@@ -254,6 +256,7 @@
 %%HORDIR%%/po/fr_FR.po
 %%HORDIR%%/po/gl_ES.po
 %%HORDIR%%/po/he_IL.po
+%%HORDIR%%/po/hr_HR.po
 %%HORDIR%%/po/hu_HU.po
 %%HORDIR%%/po/id_ID.po
 %%HORDIR%%/po/imp.pot
@@ -288,6 +291,7 @@
 %%HORDIR%%/scripts/Imp.reg
 %%HORDIR%%/scripts/bounce_spam.php
 %%HORDIR%%/scripts/custom_login.php
+%%HORDIR%%/scripts/sql/imp.oci8.sql
 %%HORDIR%%/scripts/sql/imp.sql
 %%HORDIR%%/scripts/sql/imp.xml
 %%HORDIR%%/scripts/upgrades/convert_vfolders.php
@@ -554,176 +558,178 @@
 %%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/thread.php
 %%HORDIR%%/view.php
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/mime
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/folders
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/audio
-@dirrm %%HORDIR%%/themes/tango-blue/graphics
-@dirrm %%HORDIR%%/themes/tango-blue
-@dirrm %%HORDIR%%/themes/sun
-@dirrm %%HORDIR%%/themes/simplex
-@dirrm %%HORDIR%%/themes/silver/graphics/mime
-@dirrm %%HORDIR%%/themes/silver/graphics/folders
+@dirrmtry %%HORDIR%%/config
+@dirrm %%HORDIR%%/js/src
+@dirrm %%HORDIR%%/js
+@dirrm %%HORDIR%%/lib/Auth
+@dirrm %%HORDIR%%/lib/Block
+@dirrm %%HORDIR%%/lib/Crypt
+@dirrm %%HORDIR%%/lib/Fetchmail
+@dirrm %%HORDIR%%/lib/IMAP/ACL
+@dirrm %%HORDIR%%/lib/IMAP
+@dirrm %%HORDIR%%/lib/Identity
+@dirrm %%HORDIR%%/lib/Imple
+@dirrm %%HORDIR%%/lib/MIME/Viewer
+@dirrm %%HORDIR%%/lib/MIME
+@dirrm %%HORDIR%%/lib/Maintenance/Task
+@dirrm %%HORDIR%%/lib/Maintenance
+@dirrm %%HORDIR%%/lib/Notification/Listener
+@dirrm %%HORDIR%%/lib/Notification
+@dirrm %%HORDIR%%/lib/Quota
+@dirrm %%HORDIR%%/lib/Sentmail
+@dirrm %%HORDIR%%/lib/SpellChecker
+@dirrm %%HORDIR%%/lib/UI
+@dirrm %%HORDIR%%/lib/tests/fixtures
+@dirrm %%HORDIR%%/lib/tests
+@dirrm %%HORDIR%%/lib
+@dirrm %%HORDIR%%/locale/ar_OM/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ar_OM
+@dirrm %%HORDIR%%/locale/ar_SY/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ar_SY
+@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/bg_BG
+@dirrm %%HORDIR%%/locale/bs_BA/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/bs_BA
+@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ca_ES
+@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/cs_CZ
+@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/da_DK
+@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/de_DE
+@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/el_GR
+@dirrm %%HORDIR%%/locale/en_US
+@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/es_ES
+@dirrm %%HORDIR%%/locale/et_EE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/et_EE
+@dirrm %%HORDIR%%/locale/eu_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/eu_ES
+@dirrm %%HORDIR%%/locale/fa_IR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fa_IR
+@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fi_FI
+@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fr_FR
+@dirrm %%HORDIR%%/locale/gl_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/gl_ES
+@dirrm %%HORDIR%%/locale/he_IL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/he_IL
+@dirrm %%HORDIR%%/locale/hr_HR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hr_HR
+@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hu_HU
+@dirrm %%HORDIR%%/locale/id_ID/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/id_ID
+@dirrm %%HORDIR%%/locale/is_IS/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/is_IS
+@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/it_IT
+@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ja_JP
+@dirrm %%HORDIR%%/locale/km_KH/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/km_KH
+@dirrm %%HORDIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ko_KR
+@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lt_LT
+@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lv_LV
+@dirrm %%HORDIR%%/locale/mk_MK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/mk_MK
+@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nb_NO
+@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nl_NL
+@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nn_NO
+@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pl_PL
+@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_BR
+@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_PT
+@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ro_RO
+@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru_RU
+@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk_SK
+@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sl_SI
+@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sv_SE
+@dirrm %%HORDIR%%/locale/th_TH/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/th_TH
+@dirrm %%HORDIR%%/locale/tr_TR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/tr_TR
+@dirrm %%HORDIR%%/locale/uk_UA/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/uk_UA
+@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_CN
+@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_TW
+@dirrm %%HORDIR%%/locale
+@dirrm %%HORDIR%%/po
+@dirrm %%HORDIR%%/scripts/sql
+@dirrm %%HORDIR%%/scripts/upgrades
+@dirrm %%HORDIR%%/scripts
+@dirrm %%HORDIR%%/templates/acl
+@dirrm %%HORDIR%%/templates/compose
+@dirrm %%HORDIR%%/templates/contacts
+@dirrm %%HORDIR%%/templates/fetchmail
+@dirrm %%HORDIR%%/templates/filters
+@dirrm %%HORDIR%%/templates/folders
+@dirrm %%HORDIR%%/templates/javascript
+@dirrm %%HORDIR%%/templates/login
+@dirrm %%HORDIR%%/templates/mailbox
+@dirrm %%HORDIR%%/templates/message
+@dirrm %%HORDIR%%/templates/newmsg
+@dirrm %%HORDIR%%/templates/pgp
+@dirrm %%HORDIR%%/templates/prefs
+@dirrm %%HORDIR%%/templates/quota
+@dirrm %%HORDIR%%/templates/rss
+@dirrm %%HORDIR%%/templates/saveimage
+@dirrm %%HORDIR%%/templates/search
+@dirrm %%HORDIR%%/templates/smime
+@dirrm %%HORDIR%%/templates/stationery
+@dirrm %%HORDIR%%/templates/thread
+@dirrm %%HORDIR%%/templates
+@dirrm %%HORDIR%%/themes/azur
+@dirrm %%HORDIR%%/themes/bluemoon
+@dirrm %%HORDIR%%/themes/bluewhite
+@dirrm %%HORDIR%%/themes/brown
+@dirrm %%HORDIR%%/themes/burntorange
+@dirrm %%HORDIR%%/themes/cherry
+@dirrm %%HORDIR%%/themes/cornflower
+@dirrm %%HORDIR%%/themes/fadetogreen
+@dirrm %%HORDIR%%/themes/gennevilliers
+@dirrm %%HORDIR%%/themes/graphics/audio
+@dirrm %%HORDIR%%/themes/graphics/folders
+@dirrm %%HORDIR%%/themes/graphics/mime
+@dirrm %%HORDIR%%/themes/graphics
+@dirrm %%HORDIR%%/themes/green
+@dirrm %%HORDIR%%/themes/grey
+@dirrm %%HORDIR%%/themes/ideas
+@dirrm %%HORDIR%%/themes/lavander
+@dirrm %%HORDIR%%/themes/luc
+@dirrm %%HORDIR%%/themes/lucblue
+@dirrm %%HORDIR%%/themes/mozilla
+@dirrm %%HORDIR%%/themes/postnuke
 @dirrm %%HORDIR%%/themes/silver/graphics/audio
+@dirrm %%HORDIR%%/themes/silver/graphics/folders
+@dirrm %%HORDIR%%/themes/silver/graphics/mime
 @dirrm %%HORDIR%%/themes/silver/graphics
 @dirrm %%HORDIR%%/themes/silver
-@dirrm %%HORDIR%%/themes/postnuke
-@dirrm %%HORDIR%%/themes/mozilla
-@dirrm %%HORDIR%%/themes/lucblue
-@dirrm %%HORDIR%%/themes/luc
-@dirrm %%HORDIR%%/themes/lavander
-@dirrm %%HORDIR%%/themes/ideas
-@dirrm %%HORDIR%%/themes/grey
-@dirrm %%HORDIR%%/themes/green
-@dirrm %%HORDIR%%/themes/graphics/mime
-@dirrm %%HORDIR%%/themes/graphics/folders
-@dirrm %%HORDIR%%/themes/graphics/audio
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes/gennevilliers
-@dirrm %%HORDIR%%/themes/fadetogreen
-@dirrm %%HORDIR%%/themes/cornflower
-@dirrm %%HORDIR%%/themes/cherry
-@dirrm %%HORDIR%%/themes/burntorange
-@dirrm %%HORDIR%%/themes/brown
-@dirrm %%HORDIR%%/themes/bluewhite
-@dirrm %%HORDIR%%/themes/bluemoon
-@dirrm %%HORDIR%%/themes/azur
+@dirrm %%HORDIR%%/themes/simplex
+@dirrm %%HORDIR%%/themes/sun
+@dirrm %%HORDIR%%/themes/tango-blue/graphics/audio
+@dirrm %%HORDIR%%/themes/tango-blue/graphics/folders
+@dirrm %%HORDIR%%/themes/tango-blue/graphics/mime
+@dirrm %%HORDIR%%/themes/tango-blue/graphics
+@dirrm %%HORDIR%%/themes/tango-blue
 @dirrm %%HORDIR%%/themes
-@dirrm %%HORDIR%%/templates/thread
-@dirrm %%HORDIR%%/templates/stationery
-@dirrm %%HORDIR%%/templates/smime
-@dirrm %%HORDIR%%/templates/search
-@dirrm %%HORDIR%%/templates/saveimage
-@dirrm %%HORDIR%%/templates/rss
-@dirrm %%HORDIR%%/templates/quota
-@dirrm %%HORDIR%%/templates/prefs
-@dirrm %%HORDIR%%/templates/pgp
-@dirrm %%HORDIR%%/templates/newmsg
-@dirrm %%HORDIR%%/templates/message
-@dirrm %%HORDIR%%/templates/mailbox
-@dirrm %%HORDIR%%/templates/login
-@dirrm %%HORDIR%%/templates/javascript
-@dirrm %%HORDIR%%/templates/folders
-@dirrm %%HORDIR%%/templates/filters
-@dirrm %%HORDIR%%/templates/fetchmail
-@dirrm %%HORDIR%%/templates/contacts
-@dirrm %%HORDIR%%/templates/compose
-@dirrm %%HORDIR%%/templates/acl
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/scripts/upgrades
-@dirrm %%HORDIR%%/scripts/sql
-@dirrm %%HORDIR%%/scripts
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_TW
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
-@dirrm %%HORDIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/uk_UA
-@dirrm %%HORDIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/tr_TR
-@dirrm %%HORDIR%%/locale/th_TH/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/th_TH
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sl_SI
-@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sk_SK
-@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ru_RU
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_PT
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nn_NO
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/mk_MK
-@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lv_LV
-@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lt_LT
-@dirrm %%HORDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ko_KR
-@dirrm %%HORDIR%%/locale/km_KH/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/km_KH
-@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ja_JP
-@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/it_IT
-@dirrm %%HORDIR%%/locale/is_IS/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/is_IS
-@dirrm %%HORDIR%%/locale/id_ID/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/id_ID
-@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@dirrm %%HORDIR%%/locale/he_IL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/he_IL
-@dirrm %%HORDIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/gl_ES
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fa_IR
-@dirrm %%HORDIR%%/locale/eu_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/eu_ES
-@dirrm %%HORDIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/et_EE
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/el_GR
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ca_ES
-@dirrm %%HORDIR%%/locale/bs_BA/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bs_BA
-@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bg_BG
-@dirrm %%HORDIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ar_SY
-@dirrm %%HORDIR%%/locale/ar_OM/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ar_OM
-@dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/lib/tests/fixtures
-@dirrm %%HORDIR%%/lib/tests
-@dirrm %%HORDIR%%/lib/UI
-@dirrm %%HORDIR%%/lib/SpellChecker
-@dirrm %%HORDIR%%/lib/Sentmail
-@dirrm %%HORDIR%%/lib/Quota
-@dirrm %%HORDIR%%/lib/Notification/Listener
-@dirrm %%HORDIR%%/lib/Notification
-@dirrm %%HORDIR%%/lib/Maintenance/Task
-@dirrm %%HORDIR%%/lib/Maintenance
-@dirrm %%HORDIR%%/lib/MIME/Viewer
-@dirrm %%HORDIR%%/lib/MIME
-@dirrm %%HORDIR%%/lib/Imple
-@dirrm %%HORDIR%%/lib/Identity
-@dirrm %%HORDIR%%/lib/IMAP/ACL
-@dirrm %%HORDIR%%/lib/IMAP
-@dirrm %%HORDIR%%/lib/Fetchmail
-@dirrm %%HORDIR%%/lib/Crypt
-@dirrm %%HORDIR%%/lib/Block
-@dirrm %%HORDIR%%/lib/Auth
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/js/src
-@dirrm %%HORDIR%%/js
-@dirrmtry %%HORDIR%%/config
 @dirrmtry %%HORDIR%%
 @dirrmtry %%HORBAS%%
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index a64e32bdb18c..fa1e4d38b869 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.3.5
+PORTVERSION=	4.3.6
 PORTEPOCH=	1
 CATEGORIES=	mail www
 DISTFILES=	${PORTNAME}-h3-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo
index 1f9d1dfbf340..8538f2124948 100644
--- a/mail/horde4-imp/distinfo
+++ b/mail/horde4-imp/distinfo
@@ -1,3 +1,3 @@
-MD5 (imp-h3-4.3.5.tar.gz) = 55f05e37fa86df2aaa21957ac0adc5ef
-SHA256 (imp-h3-4.3.5.tar.gz) = 0bf26c3815fca14d2aa315300be5e119b5df836136c1132be7abd705e703527d
-SIZE (imp-h3-4.3.5.tar.gz) = 5322208
+MD5 (imp-h3-4.3.6.tar.gz) = 75419ac6da795b121b24bc91e0af4aa1
+SHA256 (imp-h3-4.3.6.tar.gz) = ce5413e379c13be3c7554baf3da26c988d0aecc5504a0b12b0716b73ec9f074d
+SIZE (imp-h3-4.3.6.tar.gz) = 5476918
diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist
index bef670aaa7f7..b7d3e04272ba 100644
--- a/mail/horde4-imp/pkg-plist
+++ b/mail/horde4-imp/pkg-plist
@@ -78,14 +78,13 @@
 %%HORDIR%%/lib/Compose.php
 %%HORDIR%%/lib/Crypt/PGP.php
 %%HORDIR%%/lib/Crypt/SMIME.php
-%%HORDIR%%/lib/Fetchmail.php
 %%HORDIR%%/lib/Fetchmail/imap.php
+%%HORDIR%%/lib/Fetchmail.php
 %%HORDIR%%/lib/Filter.php
 %%HORDIR%%/lib/Folder.php
-%%HORDIR%%/lib/IMAP.php
-%%HORDIR%%/lib/IMAP/ACL.php
 %%HORDIR%%/lib/IMAP/ACL/rfc2086.php
 %%HORDIR%%/lib/IMAP/ACL/rfc4314.php
+%%HORDIR%%/lib/IMAP/ACL.php
 %%HORDIR%%/lib/IMAP/Cache.php
 %%HORDIR%%/lib/IMAP/Client.php
 %%HORDIR%%/lib/IMAP/MessageCache.php
@@ -93,11 +92,12 @@
 %%HORDIR%%/lib/IMAP/Sort.php
 %%HORDIR%%/lib/IMAP/Thread.php
 %%HORDIR%%/lib/IMAP/Tree.php
+%%HORDIR%%/lib/IMAP.php
 %%HORDIR%%/lib/IMP.php
 %%HORDIR%%/lib/Identity/imp.php
-%%HORDIR%%/lib/Imple.php
 %%HORDIR%%/lib/Imple/ContactAutoCompleter.php
 %%HORDIR%%/lib/Imple/SpellChecker.php
+%%HORDIR%%/lib/Imple.php
 %%HORDIR%%/lib/JSON.php
 %%HORDIR%%/lib/MIME/Contents.php
 %%HORDIR%%/lib/MIME/Headers.php
@@ -133,7 +133,6 @@
 %%HORDIR%%/lib/Maintenance/imp.php
 %%HORDIR%%/lib/Message.php
 %%HORDIR%%/lib/Notification/Listener/status.php
-%%HORDIR%%/lib/Quota.php
 %%HORDIR%%/lib/Quota/command.php
 %%HORDIR%%/lib/Quota/hook.php
 %%HORDIR%%/lib/Quota/imap.php
@@ -142,13 +141,14 @@
 %%HORDIR%%/lib/Quota/mdaemon.php
 %%HORDIR%%/lib/Quota/mercury32.php
 %%HORDIR%%/lib/Quota/sql.php
+%%HORDIR%%/lib/Quota.php
 %%HORDIR%%/lib/Search.php
-%%HORDIR%%/lib/Sentmail.php
 %%HORDIR%%/lib/Sentmail/sql.php
+%%HORDIR%%/lib/Sentmail.php
 %%HORDIR%%/lib/Session.php
 %%HORDIR%%/lib/Spam.php
-%%HORDIR%%/lib/SpellChecker.php
 %%HORDIR%%/lib/SpellChecker/aspell.php
+%%HORDIR%%/lib/SpellChecker.php
 %%HORDIR%%/lib/Template.php
 %%HORDIR%%/lib/UI/Compose.php
 %%HORDIR%%/lib/UI/Mailbox.php
@@ -190,6 +190,8 @@
 %%HORDIR%%/locale/fr_FR/help.xml
 %%HORDIR%%/locale/gl_ES/LC_MESSAGES/imp.mo
 %%HORDIR%%/locale/he_IL/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/hr_HR/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/hr_HR/help.xml
 %%HORDIR%%/locale/hu_HU/LC_MESSAGES/imp.mo
 %%HORDIR%%/locale/hu_HU/help.xml
 %%HORDIR%%/locale/id_ID/LC_MESSAGES/imp.mo
@@ -254,6 +256,7 @@
 %%HORDIR%%/po/fr_FR.po
 %%HORDIR%%/po/gl_ES.po
 %%HORDIR%%/po/he_IL.po
+%%HORDIR%%/po/hr_HR.po
 %%HORDIR%%/po/hu_HU.po
 %%HORDIR%%/po/id_ID.po
 %%HORDIR%%/po/imp.pot
@@ -288,6 +291,7 @@
 %%HORDIR%%/scripts/Imp.reg
 %%HORDIR%%/scripts/bounce_spam.php
 %%HORDIR%%/scripts/custom_login.php
+%%HORDIR%%/scripts/sql/imp.oci8.sql
 %%HORDIR%%/scripts/sql/imp.sql
 %%HORDIR%%/scripts/sql/imp.xml
 %%HORDIR%%/scripts/upgrades/convert_vfolders.php
@@ -554,176 +558,178 @@
 %%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/thread.php
 %%HORDIR%%/view.php
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/mime
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/folders
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/audio
-@dirrm %%HORDIR%%/themes/tango-blue/graphics
-@dirrm %%HORDIR%%/themes/tango-blue
-@dirrm %%HORDIR%%/themes/sun
-@dirrm %%HORDIR%%/themes/simplex
-@dirrm %%HORDIR%%/themes/silver/graphics/mime
-@dirrm %%HORDIR%%/themes/silver/graphics/folders
+@dirrmtry %%HORDIR%%/config
+@dirrm %%HORDIR%%/js/src
+@dirrm %%HORDIR%%/js
+@dirrm %%HORDIR%%/lib/Auth
+@dirrm %%HORDIR%%/lib/Block
+@dirrm %%HORDIR%%/lib/Crypt
+@dirrm %%HORDIR%%/lib/Fetchmail
+@dirrm %%HORDIR%%/lib/IMAP/ACL
+@dirrm %%HORDIR%%/lib/IMAP
+@dirrm %%HORDIR%%/lib/Identity
+@dirrm %%HORDIR%%/lib/Imple
+@dirrm %%HORDIR%%/lib/MIME/Viewer
+@dirrm %%HORDIR%%/lib/MIME
+@dirrm %%HORDIR%%/lib/Maintenance/Task
+@dirrm %%HORDIR%%/lib/Maintenance
+@dirrm %%HORDIR%%/lib/Notification/Listener
+@dirrm %%HORDIR%%/lib/Notification
+@dirrm %%HORDIR%%/lib/Quota
+@dirrm %%HORDIR%%/lib/Sentmail
+@dirrm %%HORDIR%%/lib/SpellChecker
+@dirrm %%HORDIR%%/lib/UI
+@dirrm %%HORDIR%%/lib/tests/fixtures
+@dirrm %%HORDIR%%/lib/tests
+@dirrm %%HORDIR%%/lib
+@dirrm %%HORDIR%%/locale/ar_OM/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ar_OM
+@dirrm %%HORDIR%%/locale/ar_SY/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ar_SY
+@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/bg_BG
+@dirrm %%HORDIR%%/locale/bs_BA/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/bs_BA
+@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ca_ES
+@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/cs_CZ
+@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/da_DK
+@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/de_DE
+@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/el_GR
+@dirrm %%HORDIR%%/locale/en_US
+@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/es_ES
+@dirrm %%HORDIR%%/locale/et_EE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/et_EE
+@dirrm %%HORDIR%%/locale/eu_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/eu_ES
+@dirrm %%HORDIR%%/locale/fa_IR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fa_IR
+@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fi_FI
+@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fr_FR
+@dirrm %%HORDIR%%/locale/gl_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/gl_ES
+@dirrm %%HORDIR%%/locale/he_IL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/he_IL
+@dirrm %%HORDIR%%/locale/hr_HR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hr_HR
+@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hu_HU
+@dirrm %%HORDIR%%/locale/id_ID/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/id_ID
+@dirrm %%HORDIR%%/locale/is_IS/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/is_IS
+@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/it_IT
+@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ja_JP
+@dirrm %%HORDIR%%/locale/km_KH/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/km_KH
+@dirrm %%HORDIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ko_KR
+@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lt_LT
+@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lv_LV
+@dirrm %%HORDIR%%/locale/mk_MK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/mk_MK
+@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nb_NO
+@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nl_NL
+@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nn_NO
+@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pl_PL
+@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_BR
+@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_PT
+@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ro_RO
+@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru_RU
+@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk_SK
+@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sl_SI
+@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sv_SE
+@dirrm %%HORDIR%%/locale/th_TH/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/th_TH
+@dirrm %%HORDIR%%/locale/tr_TR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/tr_TR
+@dirrm %%HORDIR%%/locale/uk_UA/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/uk_UA
+@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_CN
+@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_TW
+@dirrm %%HORDIR%%/locale
+@dirrm %%HORDIR%%/po
+@dirrm %%HORDIR%%/scripts/sql
+@dirrm %%HORDIR%%/scripts/upgrades
+@dirrm %%HORDIR%%/scripts
+@dirrm %%HORDIR%%/templates/acl
+@dirrm %%HORDIR%%/templates/compose
+@dirrm %%HORDIR%%/templates/contacts
+@dirrm %%HORDIR%%/templates/fetchmail
+@dirrm %%HORDIR%%/templates/filters
+@dirrm %%HORDIR%%/templates/folders
+@dirrm %%HORDIR%%/templates/javascript
+@dirrm %%HORDIR%%/templates/login
+@dirrm %%HORDIR%%/templates/mailbox
+@dirrm %%HORDIR%%/templates/message
+@dirrm %%HORDIR%%/templates/newmsg
+@dirrm %%HORDIR%%/templates/pgp
+@dirrm %%HORDIR%%/templates/prefs
+@dirrm %%HORDIR%%/templates/quota
+@dirrm %%HORDIR%%/templates/rss
+@dirrm %%HORDIR%%/templates/saveimage
+@dirrm %%HORDIR%%/templates/search
+@dirrm %%HORDIR%%/templates/smime
+@dirrm %%HORDIR%%/templates/stationery
+@dirrm %%HORDIR%%/templates/thread
+@dirrm %%HORDIR%%/templates
+@dirrm %%HORDIR%%/themes/azur
+@dirrm %%HORDIR%%/themes/bluemoon
+@dirrm %%HORDIR%%/themes/bluewhite
+@dirrm %%HORDIR%%/themes/brown
+@dirrm %%HORDIR%%/themes/burntorange
+@dirrm %%HORDIR%%/themes/cherry
+@dirrm %%HORDIR%%/themes/cornflower
+@dirrm %%HORDIR%%/themes/fadetogreen
+@dirrm %%HORDIR%%/themes/gennevilliers
+@dirrm %%HORDIR%%/themes/graphics/audio
+@dirrm %%HORDIR%%/themes/graphics/folders
+@dirrm %%HORDIR%%/themes/graphics/mime
+@dirrm %%HORDIR%%/themes/graphics
+@dirrm %%HORDIR%%/themes/green
+@dirrm %%HORDIR%%/themes/grey
+@dirrm %%HORDIR%%/themes/ideas
+@dirrm %%HORDIR%%/themes/lavander
+@dirrm %%HORDIR%%/themes/luc
+@dirrm %%HORDIR%%/themes/lucblue
+@dirrm %%HORDIR%%/themes/mozilla
+@dirrm %%HORDIR%%/themes/postnuke
 @dirrm %%HORDIR%%/themes/silver/graphics/audio
+@dirrm %%HORDIR%%/themes/silver/graphics/folders
+@dirrm %%HORDIR%%/themes/silver/graphics/mime
 @dirrm %%HORDIR%%/themes/silver/graphics
 @dirrm %%HORDIR%%/themes/silver
-@dirrm %%HORDIR%%/themes/postnuke
-@dirrm %%HORDIR%%/themes/mozilla
-@dirrm %%HORDIR%%/themes/lucblue
-@dirrm %%HORDIR%%/themes/luc
-@dirrm %%HORDIR%%/themes/lavander
-@dirrm %%HORDIR%%/themes/ideas
-@dirrm %%HORDIR%%/themes/grey
-@dirrm %%HORDIR%%/themes/green
-@dirrm %%HORDIR%%/themes/graphics/mime
-@dirrm %%HORDIR%%/themes/graphics/folders
-@dirrm %%HORDIR%%/themes/graphics/audio
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes/gennevilliers
-@dirrm %%HORDIR%%/themes/fadetogreen
-@dirrm %%HORDIR%%/themes/cornflower
-@dirrm %%HORDIR%%/themes/cherry
-@dirrm %%HORDIR%%/themes/burntorange
-@dirrm %%HORDIR%%/themes/brown
-@dirrm %%HORDIR%%/themes/bluewhite
-@dirrm %%HORDIR%%/themes/bluemoon
-@dirrm %%HORDIR%%/themes/azur
+@dirrm %%HORDIR%%/themes/simplex
+@dirrm %%HORDIR%%/themes/sun
+@dirrm %%HORDIR%%/themes/tango-blue/graphics/audio
+@dirrm %%HORDIR%%/themes/tango-blue/graphics/folders
+@dirrm %%HORDIR%%/themes/tango-blue/graphics/mime
+@dirrm %%HORDIR%%/themes/tango-blue/graphics
+@dirrm %%HORDIR%%/themes/tango-blue
 @dirrm %%HORDIR%%/themes
-@dirrm %%HORDIR%%/templates/thread
-@dirrm %%HORDIR%%/templates/stationery
-@dirrm %%HORDIR%%/templates/smime
-@dirrm %%HORDIR%%/templates/search
-@dirrm %%HORDIR%%/templates/saveimage
-@dirrm %%HORDIR%%/templates/rss
-@dirrm %%HORDIR%%/templates/quota
-@dirrm %%HORDIR%%/templates/prefs
-@dirrm %%HORDIR%%/templates/pgp
-@dirrm %%HORDIR%%/templates/newmsg
-@dirrm %%HORDIR%%/templates/message
-@dirrm %%HORDIR%%/templates/mailbox
-@dirrm %%HORDIR%%/templates/login
-@dirrm %%HORDIR%%/templates/javascript
-@dirrm %%HORDIR%%/templates/folders
-@dirrm %%HORDIR%%/templates/filters
-@dirrm %%HORDIR%%/templates/fetchmail
-@dirrm %%HORDIR%%/templates/contacts
-@dirrm %%HORDIR%%/templates/compose
-@dirrm %%HORDIR%%/templates/acl
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/scripts/upgrades
-@dirrm %%HORDIR%%/scripts/sql
-@dirrm %%HORDIR%%/scripts
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_TW
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
-@dirrm %%HORDIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/uk_UA
-@dirrm %%HORDIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/tr_TR
-@dirrm %%HORDIR%%/locale/th_TH/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/th_TH
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sl_SI
-@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sk_SK
-@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ru_RU
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_PT
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nn_NO
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/mk_MK
-@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lv_LV
-@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lt_LT
-@dirrm %%HORDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ko_KR
-@dirrm %%HORDIR%%/locale/km_KH/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/km_KH
-@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ja_JP
-@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/it_IT
-@dirrm %%HORDIR%%/locale/is_IS/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/is_IS
-@dirrm %%HORDIR%%/locale/id_ID/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/id_ID
-@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@dirrm %%HORDIR%%/locale/he_IL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/he_IL
-@dirrm %%HORDIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/gl_ES
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fa_IR
-@dirrm %%HORDIR%%/locale/eu_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/eu_ES
-@dirrm %%HORDIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/et_EE
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/el_GR
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ca_ES
-@dirrm %%HORDIR%%/locale/bs_BA/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bs_BA
-@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bg_BG
-@dirrm %%HORDIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ar_SY
-@dirrm %%HORDIR%%/locale/ar_OM/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ar_OM
-@dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/lib/tests/fixtures
-@dirrm %%HORDIR%%/lib/tests
-@dirrm %%HORDIR%%/lib/UI
-@dirrm %%HORDIR%%/lib/SpellChecker
-@dirrm %%HORDIR%%/lib/Sentmail
-@dirrm %%HORDIR%%/lib/Quota
-@dirrm %%HORDIR%%/lib/Notification/Listener
-@dirrm %%HORDIR%%/lib/Notification
-@dirrm %%HORDIR%%/lib/Maintenance/Task
-@dirrm %%HORDIR%%/lib/Maintenance
-@dirrm %%HORDIR%%/lib/MIME/Viewer
-@dirrm %%HORDIR%%/lib/MIME
-@dirrm %%HORDIR%%/lib/Imple
-@dirrm %%HORDIR%%/lib/Identity
-@dirrm %%HORDIR%%/lib/IMAP/ACL
-@dirrm %%HORDIR%%/lib/IMAP
-@dirrm %%HORDIR%%/lib/Fetchmail
-@dirrm %%HORDIR%%/lib/Crypt
-@dirrm %%HORDIR%%/lib/Block
-@dirrm %%HORDIR%%/lib/Auth
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/js/src
-@dirrm %%HORDIR%%/js
-@dirrmtry %%HORDIR%%/config
 @dirrmtry %%HORDIR%%
 @dirrmtry %%HORBAS%%