8 files changed, 738 insertions, 698 deletions

diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index fb27fc6e1286..a9bd116a38f0 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.3.9
-PORTREVISION=	2
-PORTEPOCH=	1
+PORTVERSION=	5.0.3
+DISTVERSIONPREFIX=
+DISTVERSIONSUFFIX=
 CATEGORIES=	mail www
-DISTFILES=	${PORTNAME}-h3-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=		http://pear.horde.org/get/ \
+			LOCAL/beech
+PKGNAMEPREFIX=	horde4-
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	Webmail system for IMAP/POP3 mailboxes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-h3-${PORTVERSION}
-
 #-----------------------------------------------------------------------
 # You may define these options:
 #
@@ -39,6 +40,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-h3-${PORTVERSION}
 # - WITH_HTML		: enable HTML composition mode;
 #-----------------------------------------------------------------------
 
+LATEST_LINK=	horde4-imp
 RUN_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
 
 USE_PHP=	imap
@@ -51,7 +53,8 @@ USE_PHP+=	openssl
 .endif
 
 .if !defined(NOCRYPT)
-RUN_DEPENDS+=	${PEARDIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode \
+RUN_DEPENDS+=
+${PEARDIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode \
 		${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
 .endif
 
@@ -65,11 +68,11 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
 RUN_DEPENDS+=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
 .endif
 
-CONFLICTS=	imp-3.*
+CONFLICTS=	imp-4.*
 USE_HORDE=	base
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL	\
-		RELEASE_NOTES  TODO  UPGRADING
+		RELEASE_NOTES  UPGRADING
 
 pre-configure:
 .if !defined(WITHOUT_ASPELL)
@@ -87,22 +90,6 @@ pre-configure:
 .else
 	@${REINPLACE_CMD} -e "s:%%GPG%%::" ${WRKSRC}/config/conf.xml
 .endif
-	@${REINPLACE_CMD} -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':"	\
-		${WRKSRC}/lib/MIME/Headers.php
-	@${REINPLACE_CMD} -e "s:example.com:${HOSTNAME}:g"	\
-		${WRKSRC}/config/servers.php.dist
-.if defined(WITHOUT_SSL)
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:"	\
-		${WRKSRC}/config/servers.php.dist
-.else
-	@${REINPLACE_CMD} -e "s:%%IMAPPORT%%:993:" ${WRKSRC}/config/servers.php.dist
-. if defined(WITH_VALID_CERT)
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl:" ${WRKSRC}/config/servers.php.dist
-. else
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:"	\
-		${WRKSRC}/config/servers.php.dist
-. endif
-.endif
 
 pre-install:
 .if !defined(BATCH) && !defined(WITHOUT_SSL)
@@ -114,5 +101,5 @@ pre-install:
 	fi
 .endif
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde4-base/bsd.horde4.mk"
 .include <bsd.port.mk>
diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo
index ea4a57f5fbf1..9b7529a48909 100644
--- a/mail/horde4-imp/distinfo
+++ b/mail/horde4-imp/distinfo
@@ -1,3 +1,2 @@
-MD5 (imp-h3-4.3.9.tar.gz) = 2babca2c1715c499053c7721893eb953
-SHA256 (imp-h3-4.3.9.tar.gz) = d5bfcec1fe2f3298a799235f388e56e2a5a73b1b6d283f805dc9adb89ac37100
-SIZE (imp-h3-4.3.9.tar.gz) = 5504324
+SHA256 (imp-5.0.3.tgz) = aa9b93d5559da4bc3a4294743a8b610d174d15ff635c2d28dfece3fd68223435
+SIZE (imp-5.0.3.tgz) = 4962430
diff --git a/mail/horde4-imp/files/patch-ab b/mail/horde4-imp/files/patch-ab
deleted file mode 100644
index 70f53f65a58c..000000000000
--- a/mail/horde4-imp/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- config/servers.php.dist.orig	Tue Feb  7 08:50:24 2006
-+++ config/servers.php.dist	Wed Mar  8 22:01:53 2006
-@@ -204,14 +204,21 @@
- 
- /* Example configurations: */
- 
-+/* FreeBSD port note: see also
-+<http://wiki.horde.org/ImpUWIMAPNamespaces>
-+<http://wiki.horde.org/ImpImapConfig>
-+*/
-+
- $servers['imap'] = array(
-     'name' => 'IMAP Server',
--    'server' => 'imap.example.com',
-+//  'server' => 'imap.example.com',
-+    'server' => 'localhost',
-     'hordeauth' => false,
--    'protocol' => 'imap/notls',
--    'port' => 143,
-+    'protocol' => '%%PROTOCOL%%',
-+    'port' => %%IMAPPORT%%,
-     'maildomain' => 'example.com',
--    'smtphost' => 'smtp.example.com',
-+//  'smtphost' => 'smtp.example.com',
-+    'smtphost' => 'localhost',
-     'smtpport' => 25,
-     'realm' => '',
-     'preferred' => '',
diff --git a/mail/horde4-imp/files/patch-ac b/mail/horde4-imp/files/patch-ac
deleted file mode 100644
index 68730ef6fde4..000000000000
--- a/mail/horde4-imp/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/prefs.php.dist.orig	Fri Oct 29 19:04:12 2004
-+++ config/prefs.php.dist	Thu Nov 11 21:49:05 2004
-@@ -1071,7 +1071,7 @@
- // 'value' => "source_one\tsource_two"
- // refer to turba/config/sources.php for possible source values
- $_prefs['search_sources'] = array(
--    'value' => "",
-+    'value' => 'localsql',
-     'locked' => false,
-     'shared' => false,
-     'type' => 'implicit');
diff --git a/mail/horde4-imp/files/patch-config::conf.xml b/mail/horde4-imp/files/patch-config::conf.xml
deleted file mode 100644
index 09d8f92142cb..000000000000
--- a/mail/horde4-imp/files/patch-config::conf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
---- config/conf.xml.orig	2008-01-02 22:07:57.000000000 -0900
-+++ config/conf.xml	2008-03-03 10:49:08.000000000 -0900
-@@ -9,7 +9,7 @@
-     <case name="aspell" desc="aspell (command line)">
-      <configsection name="params">
-       <configstring name="path" required="false" desc="Enter the location of
--      the aspell binary" />
-+      the aspell binary">%%ASPELL%%</configstring>
-      </configsection>
-     </case>
-    </configswitch>
-@@ -19,7 +19,7 @@
-    <configstring name="gnupg" required="false" desc="If you want users to have
-    the option of using the GNU Privacy Guard program to decrypt/encrypt PGP
-    files, enter the location of the 'gpg' binary here.  If this is empty this
--   feature will be disabled."/>
-+   feature will be disabled.">%%GPG%%</configstring>
-    <configmultienum name="gnupg_keyserver" required="false" desc="The address
-    of the public PGP keyserver(s) to use.">pgp.mit.edu
-     <values>
-@@ -33,7 +33,7 @@
-    <configstring name="openssl_cafile" required="false" desc="The location of
-    the root certificates bundle, e.g. /etc/ssl/certs. See
-    http://www.php.net/manual/en/ref.openssl.php#openssl.cert.verification for
--   details."/>
-+   details.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring>
-    <configstring name="openssl_binary" required="false" desc="The location of
-    the OpenSSL binary on your system, e.g. /usr/bin/openssl. This program is
-    REQUIRED to import personal S/MIME certificate information, as there is no
diff --git a/mail/horde4-imp/files/patch-config_prefs.php b/mail/horde4-imp/files/patch-config_prefs.php
new file mode 100644
index 000000000000..de8a319f1870
--- /dev/null
+++ b/mail/horde4-imp/files/patch-config_prefs.php
@@ -0,0 +1,11 @@
+--- config/prefs.php.orig	2011-05-03 06:27:23.000000000 -0800
++++ config/prefs.php	2011-05-07 10:06:10.000000000 -0800
+@@ -1200,7 +1200,7 @@
+ // You can provide default values this way:
+ //   'value' => json_encode(array('source_one', 'source_two'))
+ $_prefs['search_sources'] = array(
+-    'value' => ''
++    'value' => 'localsql',
+ );
+ 
+ // Field(s) to use when expanding addresses
diff --git a/mail/horde4-imp/files/pkg-message.in b/mail/horde4-imp/files/pkg-message.in
index 9a3de8c83b0c..9f3ee59d08ee 100644
--- a/mail/horde4-imp/files/pkg-message.in
+++ b/mail/horde4-imp/files/pkg-message.in
@@ -6,14 +6,11 @@ Horde must be configured and the tables created; if not, see
 `pkg_info -Dx horde-base'.
 
 Then, you have to tune the configuration files located in
-%%HORCFG%%/, especially the file servers.php
+%%HORCFG%%/, especially the file backends.php
 to define your mailserver.
 
 Then, you must login to Horde as a Horde Administrator to finish the
-configuration. Please read %%DOCSDIR%%/INSTALL.
-
-Warning: if you are upgrading from IMP 4.0.x, please read
-%%DOCSDIR%%/UPGRADING.
+configuration.
 
 To secure your installation, it is at least recommended that you change
 the default database password used by horde and imp.
diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist
index a0899f9cd8c6..bfef03b2461f 100644
--- a/mail/horde4-imp/pkg-plist
+++ b/mail/horde4-imp/pkg-plist
@@ -1,471 +1,581 @@
-%%HORDIR%%/acl.php
 %%HORDIR%%/attachment.php
-%%HORDIR%%/cache.php
+%%HORDIR%%/bin/imp-bounce-spam
+%%HORDIR%%/bin/imp-query-imap-cache
+%%HORDIR%%/compose-dimp.php
+%%HORDIR%%/compose-mimp.php
 %%HORDIR%%/compose.php
 %%HORDIR%%/config/.htaccess
+%%HORDIR%%/config/backends.php
 %%HORDIR%%/config/conf.xml
 %%HORDIR%%/config/filter.txt.dist
-%%HORDIR%%/config/header.php.dist
 %%HORDIR%%/config/hooks.php.dist
 %%HORDIR%%/config/menu.php.dist
-%%HORDIR%%/config/mime_drivers.php.dist
-%%HORDIR%%/config/motd.php.dist
-%%HORDIR%%/config/prefs.php.dist
-%%HORDIR%%/config/servers.php.dist
-%%HORDIR%%/config/spelling.php.dist
-%%HORDIR%%/config/trailer.txt.dist
+%%HORDIR%%/config/mime_drivers.php
+%%HORDIR%%/config/prefs.php
 %%HORDIR%%/contacts.php
-%%HORDIR%%/fetchmail.php
-%%HORDIR%%/fetchmailprefs.php
-%%HORDIR%%/filterprefs.php
+%%HORDIR%%/folders-mimp.php
 %%HORDIR%%/folders.php
-%%HORDIR%%/imple.php
+%%HORDIR%%/index-dimp.php
 %%HORDIR%%/index.php
-%%HORDIR%%/js/KeyNavList.js
-%%HORDIR%%/js/SpellChecker.js
 %%HORDIR%%/js/acl.js
-%%HORDIR%%/js/autocomplete.js
-%%HORDIR%%/js/builder.js
+%%HORDIR%%/js/compose-base.js
+%%HORDIR%%/js/compose-dimp.js
 %%HORDIR%%/js/compose.js
 %%HORDIR%%/js/contacts.js
-%%HORDIR%%/js/controls.js
-%%HORDIR%%/js/dragdrop.js
-%%HORDIR%%/js/effects.js
-%%HORDIR%%/js/fetchmailprefs.js
+%%HORDIR%%/js/dialog.js
+%%HORDIR%%/js/dimpbase.js
+%%HORDIR%%/js/dimpcore.js
+%%HORDIR%%/js/flagprefs.js
+%%HORDIR%%/js/folderprefs.js
 %%HORDIR%%/js/folders.js
-%%HORDIR%%/js/ieEscGuard.js
+%%HORDIR%%/js/imp.js
 %%HORDIR%%/js/login.js
+%%HORDIR%%/js/mailbox-dimp.js
 %%HORDIR%%/js/mailbox.js
+%%HORDIR%%/js/message-dimp.js
 %%HORDIR%%/js/message.js
-%%HORDIR%%/js/popup.js
-%%HORDIR%%/js/prototype.js
-%%HORDIR%%/js/redbox.js
-%%HORDIR%%/js/scriptaculous.js
+%%HORDIR%%/js/mobile.js
 %%HORDIR%%/js/search.js
-%%HORDIR%%/js/slider.js
-%%HORDIR%%/js/src/KeyNavList.js
-%%HORDIR%%/js/src/SpellChecker.js
-%%HORDIR%%/js/src/acl.js
-%%HORDIR%%/js/src/autocomplete.js
-%%HORDIR%%/js/src/builder.js
-%%HORDIR%%/js/src/compose.js
-%%HORDIR%%/js/src/contacts.js
-%%HORDIR%%/js/src/controls.js
-%%HORDIR%%/js/src/dragdrop.js
-%%HORDIR%%/js/src/effects.js
-%%HORDIR%%/js/src/fetchmailprefs.js
-%%HORDIR%%/js/src/folders.js
-%%HORDIR%%/js/src/ieEscGuard.js
-%%HORDIR%%/js/src/login.js
-%%HORDIR%%/js/src/mailbox.js
-%%HORDIR%%/js/src/message.js
-%%HORDIR%%/js/src/popup.js
-%%HORDIR%%/js/src/prototype.js
-%%HORDIR%%/js/src/redbox.js
-%%HORDIR%%/js/src/scriptaculous.js
-%%HORDIR%%/js/src/search.js
-%%HORDIR%%/js/src/slider.js
-%%HORDIR%%/js/src/stripe.js
-%%HORDIR%%/js/src/tables.js
-%%HORDIR%%/js/src/unblockImages.js
-%%HORDIR%%/js/stripe.js
-%%HORDIR%%/js/tables.js
-%%HORDIR%%/js/unblockImages.js
+%%HORDIR%%/js/searchesprefs.js
+%%HORDIR%%/js/signaturehtml.js
+%%HORDIR%%/js/viewport.js
 %%HORDIR%%/lib/.htaccess
-%%HORDIR%%/lib/Auth/imp.php
-%%HORDIR%%/lib/Block/summary.php
-%%HORDIR%%/lib/Block/tree_folders.php
+%%HORDIR%%/lib/Ajax/Application.php
+%%HORDIR%%/lib/Ajax/Imple/ContactAutoCompleter.php
+%%HORDIR%%/lib/Ajax/Imple/PassphraseDialog.php
+%%HORDIR%%/lib/Ajax/Queue.php
+%%HORDIR%%/lib/Api.php
+%%HORDIR%%/lib/Application.php
+%%HORDIR%%/lib/Auth.php
+%%HORDIR%%/lib/Block/Newmail.php
+%%HORDIR%%/lib/Block/Summary.php
 %%HORDIR%%/lib/Compose.php
-%%HORDIR%%/lib/Crypt/PGP.php
-%%HORDIR%%/lib/Crypt/SMIME.php
-%%HORDIR%%/lib/Fetchmail/imap.php
-%%HORDIR%%/lib/Fetchmail.php
+%%HORDIR%%/lib/Compose/Exception.php
+%%HORDIR%%/lib/Compose/Stationery.php
+%%HORDIR%%/lib/Contents.php
+%%HORDIR%%/lib/Crypt/Pgp.php
+%%HORDIR%%/lib/Crypt/Smime.php
+%%HORDIR%%/lib/Dimp.php
+%%HORDIR%%/lib/Exception.php
+%%HORDIR%%/lib/Factory/AuthImap.php
+%%HORDIR%%/lib/Factory/Compose.php
+%%HORDIR%%/lib/Factory/Contents.php
+%%HORDIR%%/lib/Factory/Flags.php
+%%HORDIR%%/lib/Factory/Identity.php
+%%HORDIR%%/lib/Factory/Imap.php
+%%HORDIR%%/lib/Factory/Imaptree.php
+%%HORDIR%%/lib/Factory/Mail.php
+%%HORDIR%%/lib/Factory/Mailbox.php
+%%HORDIR%%/lib/Factory/MailboxList.php
+%%HORDIR%%/lib/Factory/MimeViewer.php
+%%HORDIR%%/lib/Factory/Pgp.php
+%%HORDIR%%/lib/Factory/Quota.php
+%%HORDIR%%/lib/Factory/Search.php
+%%HORDIR%%/lib/Factory/Sentmail.php
+%%HORDIR%%/lib/Factory/Smime.php
 %%HORDIR%%/lib/Filter.php
+%%HORDIR%%/lib/Flag/Base.php
+%%HORDIR%%/lib/Flag/Imap.php
+%%HORDIR%%/lib/Flag/Imap/Answered.php
+%%HORDIR%%/lib/Flag/Imap/Deleted.php
+%%HORDIR%%/lib/Flag/Imap/Draft.php
+%%HORDIR%%/lib/Flag/Imap/Flagged.php
+%%HORDIR%%/lib/Flag/Imap/Forwarded.php
+%%HORDIR%%/lib/Flag/Imap/Seen.php
+%%HORDIR%%/lib/Flag/System.php
+%%HORDIR%%/lib/Flag/System/Attachment.php
+%%HORDIR%%/lib/Flag/System/Encrypted.php
+%%HORDIR%%/lib/Flag/System/HighPriority.php
+%%HORDIR%%/lib/Flag/System/LowPriority.php
+%%HORDIR%%/lib/Flag/System/Personal.php
+%%HORDIR%%/lib/Flag/System/Signed.php
+%%HORDIR%%/lib/Flag/System/Unseen.php
+%%HORDIR%%/lib/Flag/User.php
+%%HORDIR%%/lib/Flags.php
 %%HORDIR%%/lib/Folder.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
-%%HORDIR%%/lib/IMAP/Search.php
-%%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/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
-%%HORDIR%%/lib/MIME/Viewer/alternative.php
-%%HORDIR%%/lib/MIME/Viewer/appledouble.php
-%%HORDIR%%/lib/MIME/Viewer/enriched.php
-%%HORDIR%%/lib/MIME/Viewer/html.php
-%%HORDIR%%/lib/MIME/Viewer/images.php
-%%HORDIR%%/lib/MIME/Viewer/itip.php
-%%HORDIR%%/lib/MIME/Viewer/multipart.php
-%%HORDIR%%/lib/MIME/Viewer/notification.php
-%%HORDIR%%/lib/MIME/Viewer/partial.php
-%%HORDIR%%/lib/MIME/Viewer/pdf.php
-%%HORDIR%%/lib/MIME/Viewer/pgp.php
-%%HORDIR%%/lib/MIME/Viewer/pkcs7.php
-%%HORDIR%%/lib/MIME/Viewer/plain.php
-%%HORDIR%%/lib/MIME/Viewer/related.php
-%%HORDIR%%/lib/MIME/Viewer/rfc822.php
-%%HORDIR%%/lib/MIME/Viewer/smil.php
-%%HORDIR%%/lib/MIME/Viewer/status.php
-%%HORDIR%%/lib/MIME/Viewer/tnef.php
-%%HORDIR%%/lib/MIME/Viewer/zip.php
+%%HORDIR%%/lib/Imap.php
+%%HORDIR%%/lib/Imap/Acl.php
+%%HORDIR%%/lib/Imap/Exception.php
+%%HORDIR%%/lib/Imap/Thread.php
+%%HORDIR%%/lib/Imap/Tree.php
+%%HORDIR%%/lib/Indices.php
+%%HORDIR%%/lib/LoginTasks/SystemTask/GarbageCollection.php
+%%HORDIR%%/lib/LoginTasks/SystemTask/Upgrade.php
+%%HORDIR%%/lib/LoginTasks/SystemTask/UpgradeAuth.php
+%%HORDIR%%/lib/LoginTasks/Task/DeleteAttachmentsMonthly.php
+%%HORDIR%%/lib/LoginTasks/Task/DeleteSentmailMonthly.php
+%%HORDIR%%/lib/LoginTasks/Task/FilterOnLogin.php
+%%HORDIR%%/lib/LoginTasks/Task/PurgeSentmail.php
+%%HORDIR%%/lib/LoginTasks/Task/PurgeSpam.php
+%%HORDIR%%/lib/LoginTasks/Task/PurgeTrash.php
+%%HORDIR%%/lib/LoginTasks/Task/RecoverDraft.php
+%%HORDIR%%/lib/LoginTasks/Task/RenameSentmailMonthly.php
 %%HORDIR%%/lib/Mailbox.php
+%%HORDIR%%/lib/Mailbox/List.php
+%%HORDIR%%/lib/Mailbox/List/Track.php
 %%HORDIR%%/lib/Maillog.php
-%%HORDIR%%/lib/Maintenance/Task/delete_attachments_monthly.php
-%%HORDIR%%/lib/Maintenance/Task/delete_sentmail_monthly.php
-%%HORDIR%%/lib/Maintenance/Task/fetchmail_login.php
-%%HORDIR%%/lib/Maintenance/Task/purge_sentmail.php
-%%HORDIR%%/lib/Maintenance/Task/purge_spam.php
-%%HORDIR%%/lib/Maintenance/Task/purge_trash.php
-%%HORDIR%%/lib/Maintenance/Task/rename_sentmail_monthly.php
-%%HORDIR%%/lib/Maintenance/Task/tos_agreement.php
-%%HORDIR%%/lib/Maintenance/imp.php
+%%HORDIR%%/lib/Menu/Dimp.php
 %%HORDIR%%/lib/Message.php
-%%HORDIR%%/lib/Notification/Listener/status.php
-%%HORDIR%%/lib/Quota/command.php
-%%HORDIR%%/lib/Quota/hook.php
-%%HORDIR%%/lib/Quota/imap.php
-%%HORDIR%%/lib/Quota/logfile.php
-%%HORDIR%%/lib/Quota/maildir.php
-%%HORDIR%%/lib/Quota/mdaemon.php
-%%HORDIR%%/lib/Quota/mercury32.php
-%%HORDIR%%/lib/Quota/sql.php
+%%HORDIR%%/lib/Mime/Viewer/Alternative.php
+%%HORDIR%%/lib/Mime/Viewer/Appledouble.php
+%%HORDIR%%/lib/Mime/Viewer/Enriched.php
+%%HORDIR%%/lib/Mime/Viewer/Externalbody.php
+%%HORDIR%%/lib/Mime/Viewer/Html.php
+%%HORDIR%%/lib/Mime/Viewer/Images.php
+%%HORDIR%%/lib/Mime/Viewer/Itip.php
+%%HORDIR%%/lib/Mime/Viewer/Mdn.php
+%%HORDIR%%/lib/Mime/Viewer/Partial.php
+%%HORDIR%%/lib/Mime/Viewer/Pdf.php
+%%HORDIR%%/lib/Mime/Viewer/Pgp.php
+%%HORDIR%%/lib/Mime/Viewer/Plain.php
+%%HORDIR%%/lib/Mime/Viewer/Related.php
+%%HORDIR%%/lib/Mime/Viewer/Rfc822.php
+%%HORDIR%%/lib/Mime/Viewer/Smil.php
+%%HORDIR%%/lib/Mime/Viewer/Smime.php
+%%HORDIR%%/lib/Mime/Viewer/Status.php
+%%HORDIR%%/lib/Mime/Viewer/Vcard.php
+%%HORDIR%%/lib/Mime/Viewer/Zip.php
+%%HORDIR%%/lib/Notification/Event/Status.php
+%%HORDIR%%/lib/Notification/Handler/Decorator/ImapAlerts.php
+%%HORDIR%%/lib/Notification/Handler/Decorator/NewmailNotify.php
+%%HORDIR%%/lib/Notification/Listener/AjaxStatus.php
+%%HORDIR%%/lib/Prefs/Identity.php
+%%HORDIR%%/lib/Prefs/Ui.php
 %%HORDIR%%/lib/Quota.php
+%%HORDIR%%/lib/Quota/Base.php
+%%HORDIR%%/lib/Quota/Command.php
+%%HORDIR%%/lib/Quota/Hook.php
+%%HORDIR%%/lib/Quota/Imap.php
+%%HORDIR%%/lib/Quota/Maildir.php
+%%HORDIR%%/lib/Quota/Mdaemon.php
+%%HORDIR%%/lib/Quota/Mercury32.php
+%%HORDIR%%/lib/Quota/Null.php
+%%HORDIR%%/lib/Quota/Sql.php
 %%HORDIR%%/lib/Search.php
-%%HORDIR%%/lib/Sentmail/sql.php
+%%HORDIR%%/lib/Search/Element.php
+%%HORDIR%%/lib/Search/Element/Attachment.php
+%%HORDIR%%/lib/Search/Element/Bulk.php
+%%HORDIR%%/lib/Search/Element/Date.php
+%%HORDIR%%/lib/Search/Element/Flag.php
+%%HORDIR%%/lib/Search/Element/Header.php
+%%HORDIR%%/lib/Search/Element/Mailinglist.php
+%%HORDIR%%/lib/Search/Element/Or.php
+%%HORDIR%%/lib/Search/Element/Personal.php
+%%HORDIR%%/lib/Search/Element/Recipient.php
+%%HORDIR%%/lib/Search/Element/Size.php
+%%HORDIR%%/lib/Search/Element/Text.php
+%%HORDIR%%/lib/Search/Element/Within.php
+%%HORDIR%%/lib/Search/Filter.php
+%%HORDIR%%/lib/Search/Filter/Attachment.php
+%%HORDIR%%/lib/Search/Filter/Builtin.php
+%%HORDIR%%/lib/Search/Filter/Bulk.php
+%%HORDIR%%/lib/Search/Filter/Mailinglist.php
+%%HORDIR%%/lib/Search/Filter/Personal.php
+%%HORDIR%%/lib/Search/Query.php
+%%HORDIR%%/lib/Search/Vfolder.php
+%%HORDIR%%/lib/Search/Vfolder/Builtin.php
+%%HORDIR%%/lib/Search/Vfolder/Vinbox.php
+%%HORDIR%%/lib/Search/Vfolder/Vtrash.php
 %%HORDIR%%/lib/Sentmail.php
-%%HORDIR%%/lib/Session.php
+%%HORDIR%%/lib/Sentmail/Base.php
+%%HORDIR%%/lib/Sentmail/Null.php
+%%HORDIR%%/lib/Sentmail/Sql.php
 %%HORDIR%%/lib/Spam.php
-%%HORDIR%%/lib/SpellChecker/aspell.php
-%%HORDIR%%/lib/SpellChecker.php
-%%HORDIR%%/lib/Template.php
-%%HORDIR%%/lib/UI/Compose.php
-%%HORDIR%%/lib/UI/Mailbox.php
-%%HORDIR%%/lib/UI/Message.php
-%%HORDIR%%/lib/api.php
-%%HORDIR%%/lib/base.php
-%%HORDIR%%/lib/prefs.php
-%%HORDIR%%/lib/tests/fixtures/maildirsize
-%%HORDIR%%/lib/tests/mime_viewer_html.phpt
-%%HORDIR%%/lib/tests/quota_maildir.phpt
-%%HORDIR%%/lib/version.php
+%%HORDIR%%/lib/Test.php
+%%HORDIR%%/lib/Tree/Flist.php
+%%HORDIR%%/lib/Ui/Compose.php
+%%HORDIR%%/lib/Ui/Editor.php
+%%HORDIR%%/lib/Ui/Folder.php
+%%HORDIR%%/lib/Ui/Headers.php
+%%HORDIR%%/lib/Ui/Imageview.php
+%%HORDIR%%/lib/Ui/Mailbox.php
+%%HORDIR%%/lib/Ui/Message.php
+%%HORDIR%%/lib/Ui/Mimp.php
+%%HORDIR%%/lib/Views/Compose.php
+%%HORDIR%%/lib/Views/ListMessages.php
+%%HORDIR%%/lib/Views/ShowMessage.php
 %%HORDIR%%/locale/.htaccess
+%%HORDIR%%/locale/ar/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/ar/LC_MESSAGES/imp.po
 %%HORDIR%%/locale/ar_OM/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ar_SY/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/bg_BG/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/bs_BA/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ca_ES/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ca_ES/help.xml
-%%HORDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/cs_CZ/help.xml
-%%HORDIR%%/locale/da_DK/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/da_DK/help.xml
-%%HORDIR%%/locale/de_DE/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/de_DE/help.xml
-%%HORDIR%%/locale/el_GR/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/el_GR/help.xml
-%%HORDIR%%/locale/en_US/help.xml
-%%HORDIR%%/locale/es_ES/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/es_ES/help.xml
-%%HORDIR%%/locale/et_EE/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/et_EE/help.xml
-%%HORDIR%%/locale/eu_ES/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/eu_ES/help.xml
-%%HORDIR%%/locale/fa_IR/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/fa_IR/help.xml
-%%HORDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/fi_FI/help.xml
-%%HORDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
-%%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
-%%HORDIR%%/locale/is_IS/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/it_IT/help.xml
-%%HORDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/km_KH/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ko_KR/help.xml
-%%HORDIR%%/locale/lt_LT/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/lv_LV/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/mk_MK/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/nb_NO/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/nb_NO/help.xml
-%%HORDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/nl_NL/help.xml
-%%HORDIR%%/locale/nn_NO/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/pl_PL/help.xml
+%%HORDIR%%/locale/ar_OM/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/bg/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/bg/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/bs/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/bs/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/ca/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/ca/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/ca/help.xml
+%%HORDIR%%/locale/cs/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/cs/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/cs/help.xml
+%%HORDIR%%/locale/da/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/da/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/da/help.xml
+%%HORDIR%%/locale/de/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/de/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/de/help.xml
+%%HORDIR%%/locale/el/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/el/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/el/help.xml
+%%HORDIR%%/locale/en/help.xml
+%%HORDIR%%/locale/es/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/es/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/es/help.xml
+%%HORDIR%%/locale/et/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/et/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/et/help.xml
+%%HORDIR%%/locale/eu/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/eu/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/eu/help.xml
+%%HORDIR%%/locale/fa/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/fa/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/fa/help.xml
+%%HORDIR%%/locale/fi/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/fi/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/fi/help.xml
+%%HORDIR%%/locale/fr/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/fr/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/fr/help.xml
+%%HORDIR%%/locale/gl/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/gl/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/he/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/he/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/hr/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/hr/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/hr/help.xml
+%%HORDIR%%/locale/hu/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/hu/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/hu/help.xml
+%%HORDIR%%/locale/id/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/id/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/imp.pot
+%%HORDIR%%/locale/is/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/is/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/it/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/it/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/it/help.xml
+%%HORDIR%%/locale/ja/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/ja/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/km/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/km/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/ko/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/ko/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/ko/help.xml
+%%HORDIR%%/locale/lt/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/lt/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/lv/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/lv/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/mk/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/mk/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/nb/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/nb/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/nb/help.xml
+%%HORDIR%%/locale/nl/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/nl/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/nl/help.xml
+%%HORDIR%%/locale/nn/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/nn/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/pl/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/pl/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/pl/help.xml
+%%HORDIR%%/locale/pt/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/pt/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/pt/help.xml
 %%HORDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/pt_BR/LC_MESSAGES/imp.po
 %%HORDIR%%/locale/pt_BR/help.xml
-%%HORDIR%%/locale/pt_PT/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/pt_PT/help.xml
-%%HORDIR%%/locale/ro_RO/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ru_RU/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ru_RU/help.xml
-%%HORDIR%%/locale/sk_SK/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/sk_SK/help.xml
-%%HORDIR%%/locale/sl_SI/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/sv_SE/help.xml
-%%HORDIR%%/locale/th_TH/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/tr_TR/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/tr_TR/help.xml
-%%HORDIR%%/locale/uk_UA/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/uk_UA/help.xml
+%%HORDIR%%/locale/ro/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/ro/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/ru/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/ru/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/ru/help.xml
+%%HORDIR%%/locale/sk/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/sk/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/sk/help.xml
+%%HORDIR%%/locale/sl/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/sl/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/sv/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/sv/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/sv/help.xml
+%%HORDIR%%/locale/th/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/th/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/tr/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/tr/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/tr/help.xml
+%%HORDIR%%/locale/uk/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/uk/LC_MESSAGES/imp.po
+%%HORDIR%%/locale/uk/help.xml
 %%HORDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/zh_CN/LC_MESSAGES/imp.po
 %%HORDIR%%/locale/zh_CN/help.xml
 %%HORDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo
+%%HORDIR%%/locale/zh_TW/LC_MESSAGES/imp.po
 %%HORDIR%%/locale/zh_TW/help.xml
-%%HORDIR%%/login.php
+%%HORDIR%%/mailbox-mimp.php
 %%HORDIR%%/mailbox.php
+%%HORDIR%%/message-dimp.php
+%%HORDIR%%/message-mimp.php
 %%HORDIR%%/message.php
+%%HORDIR%%/migration/1_imp_base_tables.php
+%%HORDIR%%/migration/2_imp_autoincrement_sentmail.php
+%%HORDIR%%/mobile.php
 %%HORDIR%%/pgp.php
-%%HORDIR%%/po/.htaccess
-%%HORDIR%%/po/README
-%%HORDIR%%/po/ar_OM.po
-%%HORDIR%%/po/ar_SY.po
-%%HORDIR%%/po/bg_BG.po
-%%HORDIR%%/po/bs_BA.po
-%%HORDIR%%/po/ca_ES.po
-%%HORDIR%%/po/cs_CZ.po
-%%HORDIR%%/po/da_DK.po
-%%HORDIR%%/po/de_DE.po
-%%HORDIR%%/po/el_GR.po
-%%HORDIR%%/po/es_ES.po
-%%HORDIR%%/po/et_EE.po
-%%HORDIR%%/po/eu_ES.po
-%%HORDIR%%/po/fa_IR.po
-%%HORDIR%%/po/fi_FI.po
-%%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
-%%HORDIR%%/po/is_IS.po
-%%HORDIR%%/po/it_IT.po
-%%HORDIR%%/po/ja_JP.po
-%%HORDIR%%/po/km_KH.po
-%%HORDIR%%/po/ko_KR.po
-%%HORDIR%%/po/lt_LT.po
-%%HORDIR%%/po/lv_LV.po
-%%HORDIR%%/po/mk_MK.po
-%%HORDIR%%/po/nb_NO.po
-%%HORDIR%%/po/nl_NL.po
-%%HORDIR%%/po/nn_NO.po
-%%HORDIR%%/po/pl_PL.po
-%%HORDIR%%/po/pt_BR.po
-%%HORDIR%%/po/pt_PT.po
-%%HORDIR%%/po/ro_RO.po
-%%HORDIR%%/po/ru_RU.po
-%%HORDIR%%/po/sk_SK.po
-%%HORDIR%%/po/sl_SI.po
-%%HORDIR%%/po/sv_SE.po
-%%HORDIR%%/po/th_TH.po
-%%HORDIR%%/po/tr_TR.po
-%%HORDIR%%/po/uk_UA.po
-%%HORDIR%%/po/zh_CN.po
-%%HORDIR%%/po/zh_TW.po
-%%HORDIR%%/redirect.php
 %%HORDIR%%/rss.php
 %%HORDIR%%/saveimage.php
-%%HORDIR%%/scripts/.htaccess
-%%HORDIR%%/scripts/Imp.reg
-%%HORDIR%%/scripts/bounce_spam.php
-%%HORDIR%%/scripts/custom_login.php
-%%HORDIR%%/scripts/fetch.php
-%%HORDIR%%/scripts/sql/imp.oci8.sql
-%%HORDIR%%/scripts/sql/imp.sql
-%%HORDIR%%/scripts/sql/imp.xml
-%%HORDIR%%/scripts/upgrades/convert_vfolders.php
+%%HORDIR%%/search-basic.php
 %%HORDIR%%/search.php
 %%HORDIR%%/smime.php
-%%HORDIR%%/stationery.php
 %%HORDIR%%/templates/.htaccess
-%%HORDIR%%/templates/acl/acl.html
 %%HORDIR%%/templates/common-header.inc
-%%HORDIR%%/templates/compose/compose.html
-%%HORDIR%%/templates/compose/redirect.html
-%%HORDIR%%/templates/compose/success.html
-%%HORDIR%%/templates/contacts/contacts.html
-%%HORDIR%%/templates/fetchmail/fetchmail.html
-%%HORDIR%%/templates/fetchmail/fetchmailprefs.html
-%%HORDIR%%/templates/filters/prefs.html
-%%HORDIR%%/templates/folders/actions.html
-%%HORDIR%%/templates/folders/folders.html
-%%HORDIR%%/templates/folders/folders_confirm.html
-%%HORDIR%%/templates/folders/folders_size.html
-%%HORDIR%%/templates/folders/head.html
-%%HORDIR%%/templates/folders/import.html
-%%HORDIR%%/templates/javascript/addressesBlocks.js
-%%HORDIR%%/templates/javascript/popup.js
-%%HORDIR%%/templates/javascript_defs.php
-%%HORDIR%%/templates/login/login.html
-%%HORDIR%%/templates/login/mobile.inc
-%%HORDIR%%/templates/login/recompose.html
-%%HORDIR%%/templates/mailbox/actions.html
-%%HORDIR%%/templates/mailbox/actions_deleted.html
-%%HORDIR%%/templates/mailbox/empty_mailbox.html
-%%HORDIR%%/templates/mailbox/header.html
-%%HORDIR%%/templates/mailbox/mailbox.html
-%%HORDIR%%/templates/mailbox/message_footers.html
-%%HORDIR%%/templates/mailbox/message_headers.html
-%%HORDIR%%/templates/mailbox/navbar.html
-%%HORDIR%%/templates/mailbox/searchfolder.html
-%%HORDIR%%/templates/menu.html
-%%HORDIR%%/templates/message/message.html
-%%HORDIR%%/templates/message/navbar_actions.html
-%%HORDIR%%/templates/message/navbar_navigate.html
-%%HORDIR%%/templates/message/navbar_top.html
-%%HORDIR%%/templates/newmsg/alert.html
+%%HORDIR%%/templates/dimp/compose/compose-base.html
+%%HORDIR%%/templates/dimp/compose/compose.html
+%%HORDIR%%/templates/dimp/index.inc
+%%HORDIR%%/templates/dimp/javascript_defs.php
+%%HORDIR%%/templates/dimp/message/message.html
+%%HORDIR%%/templates/imp/compose/compose.html
+%%HORDIR%%/templates/imp/compose/redirect.html
+%%HORDIR%%/templates/imp/compose/success.html
+%%HORDIR%%/templates/imp/contacts/contacts.html
+%%HORDIR%%/templates/imp/flist/flist.html
+%%HORDIR%%/templates/imp/folders/actions.html
+%%HORDIR%%/templates/imp/folders/folders_confirm.html
+%%HORDIR%%/templates/imp/folders/folders_size.html
+%%HORDIR%%/templates/imp/folders/head.html
+%%HORDIR%%/templates/imp/folders/import.html
+%%HORDIR%%/templates/imp/javascript_defs.php
+%%HORDIR%%/templates/imp/mailbox/actions.html
+%%HORDIR%%/templates/imp/mailbox/actions_deleted.html
+%%HORDIR%%/templates/imp/mailbox/empty_mailbox.html
+%%HORDIR%%/templates/imp/mailbox/form_start.html
+%%HORDIR%%/templates/imp/mailbox/header.html
+%%HORDIR%%/templates/imp/mailbox/mailbox.html
+%%HORDIR%%/templates/imp/mailbox/message_headers.html
+%%HORDIR%%/templates/imp/mailbox/navbar.html
+%%HORDIR%%/templates/imp/mailbox/searchfolder.html
+%%HORDIR%%/templates/imp/menu/menu.html
+%%HORDIR%%/templates/imp/message/message.html
+%%HORDIR%%/templates/imp/message/navbar_actions.html
+%%HORDIR%%/templates/imp/message/navbar_navigate.html
+%%HORDIR%%/templates/imp/message/navbar_top.html
+%%HORDIR%%/templates/imp/search/search-basic.html
+%%HORDIR%%/templates/imp/search/search.html
+%%HORDIR%%/templates/imp/thread/thread.html
+%%HORDIR%%/templates/mimp/compose/compose.html
+%%HORDIR%%/templates/mimp/folders/folders.html
+%%HORDIR%%/templates/mimp/mailbox/mailbox.html
+%%HORDIR%%/templates/mimp/mailbox/search.html
+%%HORDIR%%/templates/mimp/message/message.html
+%%HORDIR%%/templates/mimp/message/part.html
+%%HORDIR%%/templates/mobile/folders.html.php
+%%HORDIR%%/templates/mobile/head.html.php
+%%HORDIR%%/templates/mobile/javascript_defs.php
+%%HORDIR%%/templates/mobile/mailbox.html.php
+%%HORDIR%%/templates/mobile/message.html.php
+%%HORDIR%%/templates/mobile/notice.html.php
 %%HORDIR%%/templates/pgp/import_key.html
-%%HORDIR%%/templates/pgp/passphrase.html
-%%HORDIR%%/templates/pgp/pgp.html
-%%HORDIR%%/templates/prefs/encryptselect.inc
-%%HORDIR%%/templates/prefs/folderselect.inc
-%%HORDIR%%/templates/prefs/initialpageselect.inc
-%%HORDIR%%/templates/prefs/sentmailselect.inc
-%%HORDIR%%/templates/prefs/soundselect.inc
-%%HORDIR%%/templates/prefs/sourceselect.inc
-%%HORDIR%%/templates/prefs/spamselect.inc
-%%HORDIR%%/templates/prefs/trashselect.inc
+%%HORDIR%%/templates/prefs/acl.html
+%%HORDIR%%/templates/prefs/drafts.html
+%%HORDIR%%/templates/prefs/encrypt.html
+%%HORDIR%%/templates/prefs/flags.html
+%%HORDIR%%/templates/prefs/initialpage.html
+%%HORDIR%%/templates/prefs/mailto.html
+%%HORDIR%%/templates/prefs/newmailaudio.html
+%%HORDIR%%/templates/prefs/pgpprivatekey.html
+%%HORDIR%%/templates/prefs/pgppublickey.html
+%%HORDIR%%/templates/prefs/searches.html
+%%HORDIR%%/templates/prefs/sentmail.html
+%%HORDIR%%/templates/prefs/signaturehtml.html
+%%HORDIR%%/templates/prefs/smimeprivatekey.html
+%%HORDIR%%/templates/prefs/smimepublickey.html
+%%HORDIR%%/templates/prefs/spam.html
+%%HORDIR%%/templates/prefs/specialuse.html
+%%HORDIR%%/templates/prefs/stationery.html
+%%HORDIR%%/templates/prefs/trash.html
+%%HORDIR%%/templates/print/headers.html
 %%HORDIR%%/templates/quota/quota.html
 %%HORDIR%%/templates/rss/mailbox.rss
 %%HORDIR%%/templates/saveimage/saveimage.html
-%%HORDIR%%/templates/search/search.html
 %%HORDIR%%/templates/smime/import_key.html
-%%HORDIR%%/templates/smime/passphrase.html
-%%HORDIR%%/templates/smime/smime.html
-%%HORDIR%%/templates/stationery/stationery.html
-%%HORDIR%%/templates/thread/thread.html
-%%HORDIR%%/test.php
+%%HORDIR%%/templates/test/mailserver.inc
+%%HORDIR%%/test/Imp/AllTests.php
+%%HORDIR%%/test/Imp/Autoload.php
+%%HORDIR%%/test/Imp/Stub/HtmlViewer.php
+%%HORDIR%%/test/Imp/Unit/Mime/Viewer/HtmlTest.php
+%%HORDIR%%/test/Imp/Unit/Mime/Viewer/ItipTest.php
+%%HORDIR%%/test/Imp/Unit/QuotaTest.php
+%%HORDIR%%/test/Imp/fixtures/maildirsize
+%%HORDIR%%/test/Imp/phpunit.xml
 %%HORDIR%%/themes/azur/screen.css
 %%HORDIR%%/themes/bluemoon/screen.css
+%%HORDIR%%/themes/bluewhite/dimp/screen.css
 %%HORDIR%%/themes/bluewhite/screen.css
 %%HORDIR%%/themes/brown/screen.css
 %%HORDIR%%/themes/burntorange/screen.css
-%%HORDIR%%/themes/cherry/screen.css
 %%HORDIR%%/themes/cornflower/screen.css
+%%HORDIR%%/themes/default/dimp/ie7.css
+%%HORDIR%%/themes/default/dimp/screen.css
+%%HORDIR%%/themes/default/graphics/add_contact.png
+%%HORDIR%%/themes/default/graphics/addressbook_add.png
+%%HORDIR%%/themes/default/graphics/addressbook_browse.png
+%%HORDIR%%/themes/default/graphics/application_tile_horizontal.png
+%%HORDIR%%/themes/default/graphics/application_tile_vertical.png
+%%HORDIR%%/themes/default/graphics/arrow_collapsed.png
+%%HORDIR%%/themes/default/graphics/arrow_expanded.png
+%%HORDIR%%/themes/default/graphics/attachment.png
+%%HORDIR%%/themes/default/graphics/backhead_orderby.png
+%%HORDIR%%/themes/default/graphics/backhead_r.png
+%%HORDIR%%/themes/default/graphics/backhead_s2.png
+%%HORDIR%%/themes/default/graphics/backhead_shadow.png
+%%HORDIR%%/themes/default/graphics/blacklist.png
+%%HORDIR%%/themes/default/graphics/calendar.png
+%%HORDIR%%/themes/default/graphics/checkbox_off.png
+%%HORDIR%%/themes/default/graphics/checkbox_on.png
+%%HORDIR%%/themes/default/graphics/checkbox_over.png
+%%HORDIR%%/themes/default/graphics/checkmail.png
+%%HORDIR%%/themes/default/graphics/close.png
+%%HORDIR%%/themes/default/graphics/compose.png
+%%HORDIR%%/themes/default/graphics/delete.png
+%%HORDIR%%/themes/default/graphics/download.png
+%%HORDIR%%/themes/default/graphics/drafts.png
+%%HORDIR%%/themes/default/graphics/dragHandle.png
+%%HORDIR%%/themes/default/graphics/dragHandleVert.png
+%%HORDIR%%/themes/default/graphics/edit.png
+%%HORDIR%%/themes/default/graphics/empty_spam.png
+%%HORDIR%%/themes/default/graphics/empty_trash.png
+%%HORDIR%%/themes/default/graphics/encrypted.png
+%%HORDIR%%/themes/default/graphics/favicon.ico
+%%HORDIR%%/themes/default/graphics/fetchmail.png
+%%HORDIR%%/themes/default/graphics/filters.png
+%%HORDIR%%/themes/default/graphics/folders/create.png
+%%HORDIR%%/themes/default/graphics/folders/delete.png
+%%HORDIR%%/themes/default/graphics/folders/drafts.png
+%%HORDIR%%/themes/default/graphics/folders/edit.png
+%%HORDIR%%/themes/default/graphics/folders/folder.png
+%%HORDIR%%/themes/default/graphics/folders/inbox.png
+%%HORDIR%%/themes/default/graphics/folders/minus.png
+%%HORDIR%%/themes/default/graphics/folders/open.png
+%%HORDIR%%/themes/default/graphics/folders/plus.png
+%%HORDIR%%/themes/default/graphics/folders/sent.png
+%%HORDIR%%/themes/default/graphics/folders/spam.png
+%%HORDIR%%/themes/default/graphics/folders/trash.png
+%%HORDIR%%/themes/default/graphics/forward.png
+%%HORDIR%%/themes/default/graphics/gallery.png
+%%HORDIR%%/themes/default/graphics/ham.png
+%%HORDIR%%/themes/default/graphics/help.png
+%%HORDIR%%/themes/default/graphics/ico_message_off.png
+%%HORDIR%%/themes/default/graphics/imp.png
+%%HORDIR%%/themes/default/graphics/info_icon.png
+%%HORDIR%%/themes/default/graphics/key_down.png
+%%HORDIR%%/themes/default/graphics/key_up.png
+%%HORDIR%%/themes/default/graphics/loading.gif
+%%HORDIR%%/themes/default/graphics/logo.png
+%%HORDIR%%/themes/default/graphics/logout.png
+%%HORDIR%%/themes/default/graphics/mail_answered.png
+%%HORDIR%%/themes/default/graphics/mail_clearflag.png
+%%HORDIR%%/themes/default/graphics/mail_deleted.png
+%%HORDIR%%/themes/default/graphics/mail_draft.png
+%%HORDIR%%/themes/default/graphics/mail_flagged.png
+%%HORDIR%%/themes/default/graphics/mail_forwarded.png
+%%HORDIR%%/themes/default/graphics/mail_personal.png
+%%HORDIR%%/themes/default/graphics/mail_priority_high.png
+%%HORDIR%%/themes/default/graphics/mail_priority_low.png
+%%HORDIR%%/themes/default/graphics/mail_seen.png
+%%HORDIR%%/themes/default/graphics/mail_unseen.png
+%%HORDIR%%/themes/default/graphics/manage_attachments.png
+%%HORDIR%%/themes/default/graphics/message_source.png
+%%HORDIR%%/themes/default/graphics/mime/apple.png
+%%HORDIR%%/themes/default/graphics/mime/compressed.png
+%%HORDIR%%/themes/default/graphics/mime/itip.png
+%%HORDIR%%/themes/default/graphics/mini-error.png
+%%HORDIR%%/themes/default/graphics/newmail.png
+%%HORDIR%%/themes/default/graphics/newwin.png
+%%HORDIR%%/themes/default/graphics/plus.png
+%%HORDIR%%/themes/default/graphics/popdown.png
+%%HORDIR%%/themes/default/graphics/prefs.png
+%%HORDIR%%/themes/default/graphics/preview.png
+%%HORDIR%%/themes/default/graphics/print.png
+%%HORDIR%%/themes/default/graphics/quotaback.jpg
+%%HORDIR%%/themes/default/graphics/quotauncover.gif
+%%HORDIR%%/themes/default/graphics/reload.png
+%%HORDIR%%/themes/default/graphics/reply.png
+%%HORDIR%%/themes/default/graphics/replyall.png
+%%HORDIR%%/themes/default/graphics/sbcursor_bottom.png
+%%HORDIR%%/themes/default/graphics/sbcursor_top.png
+%%HORDIR%%/themes/default/graphics/scroller.png
+%%HORDIR%%/themes/default/graphics/scroller_back.png
+%%HORDIR%%/themes/default/graphics/select.png
+%%HORDIR%%/themes/default/graphics/shared.png
+%%HORDIR%%/themes/default/graphics/signed.png
+%%HORDIR%%/themes/default/graphics/sortdown.png
+%%HORDIR%%/themes/default/graphics/sortup.png
+%%HORDIR%%/themes/default/graphics/spacer_red.png
+%%HORDIR%%/themes/default/graphics/spam.png
+%%HORDIR%%/themes/default/graphics/spellcheck.png
+%%HORDIR%%/themes/default/graphics/undelete.png
+%%HORDIR%%/themes/default/graphics/warning.png
+%%HORDIR%%/themes/default/graphics/whitelist.png
+%%HORDIR%%/themes/default/ie6_or_less.css
+%%HORDIR%%/themes/default/ie7.css
+%%HORDIR%%/themes/default/mimp/screen.css
+%%HORDIR%%/themes/default/mobile.css
+%%HORDIR%%/themes/default/rtl.css
+%%HORDIR%%/themes/default/screen.css
 %%HORDIR%%/themes/fadetogreen/screen.css
-%%HORDIR%%/themes/feed-rss.xsl
 %%HORDIR%%/themes/gennevilliers/screen.css
-%%HORDIR%%/themes/graphics/addressbook_add.png
-%%HORDIR%%/themes/graphics/addressbook_browse.png
-%%HORDIR%%/themes/graphics/apple.png
-%%HORDIR%%/themes/graphics/attachment.png
-%%HORDIR%%/themes/graphics/audio/doorbell.wav
-%%HORDIR%%/themes/graphics/audio/gnid3.wav
-%%HORDIR%%/themes/graphics/audio/jetsndb.wav
-%%HORDIR%%/themes/graphics/audio/reminder.wav
-%%HORDIR%%/themes/graphics/audio/theetone.wav
-%%HORDIR%%/themes/graphics/compose.png
-%%HORDIR%%/themes/graphics/empty_spam.png
-%%HORDIR%%/themes/graphics/empty_trash.png
-%%HORDIR%%/themes/graphics/encrypted.png
-%%HORDIR%%/themes/graphics/expand.png
-%%HORDIR%%/themes/graphics/favicon.ico
-%%HORDIR%%/themes/graphics/fetchmail.png
-%%HORDIR%%/themes/graphics/filters.png
-%%HORDIR%%/themes/graphics/folders/drafts.png
-%%HORDIR%%/themes/graphics/folders/folder.png
-%%HORDIR%%/themes/graphics/folders/folder_create.png
-%%HORDIR%%/themes/graphics/folders/folder_delete.png
-%%HORDIR%%/themes/graphics/folders/folder_edit.png
-%%HORDIR%%/themes/graphics/folders/folder_open.png
-%%HORDIR%%/themes/graphics/folders/inbox.png
-%%HORDIR%%/themes/graphics/folders/sent.png
-%%HORDIR%%/themes/graphics/folders/spam.png
-%%HORDIR%%/themes/graphics/folders/trash.png
-%%HORDIR%%/themes/graphics/imp.png
-%%HORDIR%%/themes/graphics/loading.gif
-%%HORDIR%%/themes/graphics/mail_answered.png
-%%HORDIR%%/themes/graphics/mail_clearflag.png
-%%HORDIR%%/themes/graphics/mail_deleted.png
-%%HORDIR%%/themes/graphics/mail_draft.png
-%%HORDIR%%/themes/graphics/mail_flagged.png
-%%HORDIR%%/themes/graphics/mail_forwarded.png
-%%HORDIR%%/themes/graphics/mail_personal.png
-%%HORDIR%%/themes/graphics/mail_priority_high.png
-%%HORDIR%%/themes/graphics/mail_priority_low.png
-%%HORDIR%%/themes/graphics/mail_seen.png
-%%HORDIR%%/themes/graphics/mail_unseen.png
-%%HORDIR%%/themes/graphics/manage_attachments.png
-%%HORDIR%%/themes/graphics/mime/binary.png
-%%HORDIR%%/themes/graphics/mime/compressed.png
-%%HORDIR%%/themes/graphics/mime/encryption.png
-%%HORDIR%%/themes/graphics/mime/html.png
-%%HORDIR%%/themes/graphics/mime/image.png
-%%HORDIR%%/themes/graphics/mime/itip.png
-%%HORDIR%%/themes/graphics/mime/mail.png
-%%HORDIR%%/themes/graphics/mime/pdf.png
-%%HORDIR%%/themes/graphics/mime/text.png
-%%HORDIR%%/themes/graphics/mini-error.png
-%%HORDIR%%/themes/graphics/newmail.png
-%%HORDIR%%/themes/graphics/popdown.png
-%%HORDIR%%/themes/graphics/redbox_spinner.gif
-%%HORDIR%%/themes/graphics/shared.png
-%%HORDIR%%/themes/graphics/signed.png
-%%HORDIR%%/themes/graphics/spacer_red.png
-%%HORDIR%%/themes/graphics/spellcheck.png
 %%HORDIR%%/themes/green/screen.css
 %%HORDIR%%/themes/grey/screen.css
 %%HORDIR%%/themes/ideas/screen.css
-%%HORDIR%%/themes/ie6_or_less.css
-%%HORDIR%%/themes/ie7.css
 %%HORDIR%%/themes/lavander/screen.css
 %%HORDIR%%/themes/luc/screen.css
 %%HORDIR%%/themes/lucblue/screen.css
 %%HORDIR%%/themes/mozilla/screen.css
 %%HORDIR%%/themes/postnuke/screen.css
-%%HORDIR%%/themes/rtl.css
-%%HORDIR%%/themes/screen.css
+%%HORDIR%%/themes/purple/dimp/screen.css
+%%HORDIR%%/themes/purple/screen.css
+%%HORDIR%%/themes/silver/dimp/screen.css
+%%HORDIR%%/themes/silver/graphics/add_contact.png
 %%HORDIR%%/themes/silver/graphics/addressbook_add.png
 %%HORDIR%%/themes/silver/graphics/addressbook_browse.png
-%%HORDIR%%/themes/silver/graphics/apple.png
+%%HORDIR%%/themes/silver/graphics/application_tile_horizontal.png
+%%HORDIR%%/themes/silver/graphics/application_tile_vertical.png
+%%HORDIR%%/themes/silver/graphics/arrow_collapsed.png
+%%HORDIR%%/themes/silver/graphics/arrow_expanded.png
 %%HORDIR%%/themes/silver/graphics/attachment.png
-%%HORDIR%%/themes/silver/graphics/audio/doorbell.wav
-%%HORDIR%%/themes/silver/graphics/audio/gnid3.wav
-%%HORDIR%%/themes/silver/graphics/audio/jetsndb.wav
-%%HORDIR%%/themes/silver/graphics/audio/reminder.wav
-%%HORDIR%%/themes/silver/graphics/audio/theetone.wav
+%%HORDIR%%/themes/silver/graphics/blacklist.png
+%%HORDIR%%/themes/silver/graphics/calendar.png
+%%HORDIR%%/themes/silver/graphics/checkmail.png
+%%HORDIR%%/themes/silver/graphics/close.png
 %%HORDIR%%/themes/silver/graphics/compose.png
+%%HORDIR%%/themes/silver/graphics/delete.png
+%%HORDIR%%/themes/silver/graphics/drafts.png
+%%HORDIR%%/themes/silver/graphics/edit.png
 %%HORDIR%%/themes/silver/graphics/empty_spam.png
 %%HORDIR%%/themes/silver/graphics/empty_trash.png
 %%HORDIR%%/themes/silver/graphics/encrypted.png
-%%HORDIR%%/themes/silver/graphics/expand.png
-%%HORDIR%%/themes/silver/graphics/favicon.ico
 %%HORDIR%%/themes/silver/graphics/fetchmail.png
 %%HORDIR%%/themes/silver/graphics/filters.png
+%%HORDIR%%/themes/silver/graphics/folders/create.png
+%%HORDIR%%/themes/silver/graphics/folders/delete.png
 %%HORDIR%%/themes/silver/graphics/folders/drafts.png
+%%HORDIR%%/themes/silver/graphics/folders/edit.png
+%%HORDIR%%/themes/silver/graphics/folders/explore.png
 %%HORDIR%%/themes/silver/graphics/folders/folder.png
-%%HORDIR%%/themes/silver/graphics/folders/folder_create.png
-%%HORDIR%%/themes/silver/graphics/folders/folder_delete.png
-%%HORDIR%%/themes/silver/graphics/folders/folder_edit.png
-%%HORDIR%%/themes/silver/graphics/folders/folder_open.png
 %%HORDIR%%/themes/silver/graphics/folders/inbox.png
+%%HORDIR%%/themes/silver/graphics/folders/minus.png
+%%HORDIR%%/themes/silver/graphics/folders/open.png
+%%HORDIR%%/themes/silver/graphics/folders/plus.png
 %%HORDIR%%/themes/silver/graphics/folders/sent.png
 %%HORDIR%%/themes/silver/graphics/folders/spam.png
 %%HORDIR%%/themes/silver/graphics/folders/trash.png
+%%HORDIR%%/themes/silver/graphics/forward.png
+%%HORDIR%%/themes/silver/graphics/ham.png
+%%HORDIR%%/themes/silver/graphics/help.png
 %%HORDIR%%/themes/silver/graphics/imp.png
-%%HORDIR%%/themes/silver/graphics/loading.gif
+%%HORDIR%%/themes/silver/graphics/info_icon.png
+%%HORDIR%%/themes/silver/graphics/locked.png
+%%HORDIR%%/themes/silver/graphics/logout.png
 %%HORDIR%%/themes/silver/graphics/mail_answered.png
 %%HORDIR%%/themes/silver/graphics/mail_clearflag.png
 %%HORDIR%%/themes/silver/graphics/mail_deleted.png
@@ -478,259 +588,263 @@
 %%HORDIR%%/themes/silver/graphics/mail_seen.png
 %%HORDIR%%/themes/silver/graphics/mail_unseen.png
 %%HORDIR%%/themes/silver/graphics/manage_attachments.png
-%%HORDIR%%/themes/silver/graphics/mime/binary.png
-%%HORDIR%%/themes/silver/graphics/mime/compressed.png
-%%HORDIR%%/themes/silver/graphics/mime/encryption.png
-%%HORDIR%%/themes/silver/graphics/mime/html.png
-%%HORDIR%%/themes/silver/graphics/mime/image.png
-%%HORDIR%%/themes/silver/graphics/mime/itip.png
-%%HORDIR%%/themes/silver/graphics/mime/mail.png
-%%HORDIR%%/themes/silver/graphics/mime/pdf.png
-%%HORDIR%%/themes/silver/graphics/mime/text.png
-%%HORDIR%%/themes/silver/graphics/mini-error.png
+%%HORDIR%%/themes/silver/graphics/message_source.png
 %%HORDIR%%/themes/silver/graphics/newmail.png
+%%HORDIR%%/themes/silver/graphics/newwin.png
+%%HORDIR%%/themes/silver/graphics/plus.png
 %%HORDIR%%/themes/silver/graphics/popdown.png
-%%HORDIR%%/themes/silver/graphics/redbox_spinner.gif
+%%HORDIR%%/themes/silver/graphics/prefs.png
+%%HORDIR%%/themes/silver/graphics/preview.png
+%%HORDIR%%/themes/silver/graphics/print.png
+%%HORDIR%%/themes/silver/graphics/reload.png
+%%HORDIR%%/themes/silver/graphics/reply.png
+%%HORDIR%%/themes/silver/graphics/replyall.png
+%%HORDIR%%/themes/silver/graphics/search.png
 %%HORDIR%%/themes/silver/graphics/shared.png
 %%HORDIR%%/themes/silver/graphics/signed.png
-%%HORDIR%%/themes/silver/graphics/spacer_red.png
+%%HORDIR%%/themes/silver/graphics/sortdown.png
+%%HORDIR%%/themes/silver/graphics/sortup.png
+%%HORDIR%%/themes/silver/graphics/spam.png
 %%HORDIR%%/themes/silver/graphics/spellcheck.png
+%%HORDIR%%/themes/silver/graphics/undelete.png
+%%HORDIR%%/themes/silver/graphics/warning.png
+%%HORDIR%%/themes/silver/graphics/whitelist.png
 %%HORDIR%%/themes/silver/screen.css
-%%HORDIR%%/themes/silver/themed_graphics
 %%HORDIR%%/themes/simplex/screen.css
-%%HORDIR%%/themes/sun/screen.css
-%%HORDIR%%/themes/tango-blue/graphics/addressbook_add.png
+%%HORDIR%%/themes/tango-blue/dimp/screen.css
 %%HORDIR%%/themes/tango-blue/graphics/addressbook_browse.png
-%%HORDIR%%/themes/tango-blue/graphics/apple.png
 %%HORDIR%%/themes/tango-blue/graphics/attachment.png
-%%HORDIR%%/themes/tango-blue/graphics/audio/doorbell.wav
-%%HORDIR%%/themes/tango-blue/graphics/audio/gnid3.wav
-%%HORDIR%%/themes/tango-blue/graphics/audio/jetsndb.wav
-%%HORDIR%%/themes/tango-blue/graphics/audio/reminder.wav
-%%HORDIR%%/themes/tango-blue/graphics/audio/theetone.wav
+%%HORDIR%%/themes/tango-blue/graphics/calendar.png
+%%HORDIR%%/themes/tango-blue/graphics/close.png
 %%HORDIR%%/themes/tango-blue/graphics/compose.png
-%%HORDIR%%/themes/tango-blue/graphics/empty_spam.png
 %%HORDIR%%/themes/tango-blue/graphics/empty_trash.png
 %%HORDIR%%/themes/tango-blue/graphics/encrypted.png
-%%HORDIR%%/themes/tango-blue/graphics/expand.png
 %%HORDIR%%/themes/tango-blue/graphics/favicon.ico
 %%HORDIR%%/themes/tango-blue/graphics/fetchmail.png
 %%HORDIR%%/themes/tango-blue/graphics/filters.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/drafts.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/folder.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/folder_create.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/folder_delete.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/folder_edit.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/folder_open.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/inbox.png
+%%HORDIR%%/themes/tango-blue/graphics/folders/open.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/sent.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/spam.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/trash.png
 %%HORDIR%%/themes/tango-blue/graphics/imp.png
-%%HORDIR%%/themes/tango-blue/graphics/loading.gif
 %%HORDIR%%/themes/tango-blue/graphics/mail_answered.png
-%%HORDIR%%/themes/tango-blue/graphics/mail_clearflag.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_deleted.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_draft.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_flagged.png
-%%HORDIR%%/themes/tango-blue/graphics/mail_forwarded.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_personal.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_priority_high.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_priority_low.png
-%%HORDIR%%/themes/tango-blue/graphics/mail_seen.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_unseen.png
 %%HORDIR%%/themes/tango-blue/graphics/manage_attachments.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/binary.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/compressed.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/encryption.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/html.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/image.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/itip.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/mail.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/pdf.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/text.png
-%%HORDIR%%/themes/tango-blue/graphics/mini-error.png
 %%HORDIR%%/themes/tango-blue/graphics/newmail.png
+%%HORDIR%%/themes/tango-blue/graphics/reload.png
 %%HORDIR%%/themes/tango-blue/graphics/shared.png
 %%HORDIR%%/themes/tango-blue/graphics/signed.png
-%%HORDIR%%/themes/tango-blue/graphics/spacer_red.png
 %%HORDIR%%/themes/tango-blue/graphics/spellcheck.png
 %%HORDIR%%/themes/tango-blue/screen.css
-%%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/thread.php
 %%HORDIR%%/view.php
-@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/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/dimp
 @dirrm %%HORDIR%%/themes/tango-blue
+@dirrm %%HORDIR%%/themes/simplex
+@dirrm %%HORDIR%%/themes/silver/graphics/folders
+@dirrm %%HORDIR%%/themes/silver/graphics
+@dirrm %%HORDIR%%/themes/silver/dimp
+@dirrm %%HORDIR%%/themes/silver
+@dirrm %%HORDIR%%/themes/purple/dimp
+@dirrm %%HORDIR%%/themes/purple
+@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/gennevilliers
+@dirrm %%HORDIR%%/themes/fadetogreen
+@dirrm %%HORDIR%%/themes/default/mimp
+@dirrm %%HORDIR%%/themes/default/graphics/mime
+@dirrm %%HORDIR%%/themes/default/graphics/folders
+@dirrm %%HORDIR%%/themes/default/graphics
+@dirrm %%HORDIR%%/themes/default/dimp
+@dirrm %%HORDIR%%/themes/default
+@dirrm %%HORDIR%%/themes/cornflower
+@dirrm %%HORDIR%%/themes/burntorange
+@dirrm %%HORDIR%%/themes/brown
+@dirrm %%HORDIR%%/themes/bluewhite/dimp
+@dirrm %%HORDIR%%/themes/bluewhite
+@dirrm %%HORDIR%%/themes/bluemoon
+@dirrm %%HORDIR%%/themes/azur
 @dirrm %%HORDIR%%/themes
+@dirrm %%HORDIR%%/test/Imp/fixtures
+@dirrm %%HORDIR%%/test/Imp/Unit/Mime/Viewer
+@dirrm %%HORDIR%%/test/Imp/Unit/Mime
+@dirrm %%HORDIR%%/test/Imp/Unit
+@dirrm %%HORDIR%%/test/Imp/Stub
+@dirrm %%HORDIR%%/test/Imp
+@dirrm %%HORDIR%%/test
+@dirrm %%HORDIR%%/templates/test
+@dirrm %%HORDIR%%/templates/smime
+@dirrm %%HORDIR%%/templates/saveimage
+@dirrm %%HORDIR%%/templates/rss
+@dirrm %%HORDIR%%/templates/quota
+@dirrm %%HORDIR%%/templates/print
+@dirrm %%HORDIR%%/templates/prefs
+@dirrm %%HORDIR%%/templates/pgp
+@dirrm %%HORDIR%%/templates/mobile
+@dirrm %%HORDIR%%/templates/mimp/message
+@dirrm %%HORDIR%%/templates/mimp/mailbox
+@dirrm %%HORDIR%%/templates/mimp/folders
+@dirrm %%HORDIR%%/templates/mimp/compose
+@dirrm %%HORDIR%%/templates/mimp
+@dirrm %%HORDIR%%/templates/imp/thread
+@dirrm %%HORDIR%%/templates/imp/search
+@dirrm %%HORDIR%%/templates/imp/message
+@dirrm %%HORDIR%%/templates/imp/menu
+@dirrm %%HORDIR%%/templates/imp/mailbox
+@dirrm %%HORDIR%%/templates/imp/folders
+@dirrm %%HORDIR%%/templates/imp/flist
+@dirrm %%HORDIR%%/templates/imp/contacts
+@dirrm %%HORDIR%%/templates/imp/compose
+@dirrm %%HORDIR%%/templates/imp
+@dirrm %%HORDIR%%/templates/dimp/message
+@dirrm %%HORDIR%%/templates/dimp/compose
+@dirrm %%HORDIR%%/templates/dimp
+@dirrm %%HORDIR%%/templates
+@dirrm %%HORDIR%%/migration
+@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/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/uk
+@dirrm %%HORDIR%%/locale/tr/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/tr
+@dirrm %%HORDIR%%/locale/th/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/th
+@dirrm %%HORDIR%%/locale/sv/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sv
+@dirrm %%HORDIR%%/locale/sl/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sl
+@dirrm %%HORDIR%%/locale/sk/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk
+@dirrm %%HORDIR%%/locale/ru/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru
+@dirrm %%HORDIR%%/locale/ro/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ro
+@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_BR
+@dirrm %%HORDIR%%/locale/pt/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt
+@dirrm %%HORDIR%%/locale/pl/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pl
+@dirrm %%HORDIR%%/locale/nn/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nn
+@dirrm %%HORDIR%%/locale/nl/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nl
+@dirrm %%HORDIR%%/locale/nb/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nb
+@dirrm %%HORDIR%%/locale/mk/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/mk
+@dirrm %%HORDIR%%/locale/lv/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lv
+@dirrm %%HORDIR%%/locale/lt/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lt
+@dirrm %%HORDIR%%/locale/ko/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ko
+@dirrm %%HORDIR%%/locale/km/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/km
+@dirrm %%HORDIR%%/locale/ja/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ja
+@dirrm %%HORDIR%%/locale/it/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/it
+@dirrm %%HORDIR%%/locale/is/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/is
+@dirrm %%HORDIR%%/locale/id/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/id
+@dirrm %%HORDIR%%/locale/hu/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hu
+@dirrm %%HORDIR%%/locale/hr/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hr
+@dirrm %%HORDIR%%/locale/he/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/he
+@dirrm %%HORDIR%%/locale/gl/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/gl
+@dirrm %%HORDIR%%/locale/fr/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fr
+@dirrm %%HORDIR%%/locale/fi/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fi
+@dirrm %%HORDIR%%/locale/fa/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fa
+@dirrm %%HORDIR%%/locale/eu/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/eu
+@dirrm %%HORDIR%%/locale/et/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/et
+@dirrm %%HORDIR%%/locale/es/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/es
+@dirrm %%HORDIR%%/locale/en
+@dirrm %%HORDIR%%/locale/el/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/el
+@dirrm %%HORDIR%%/locale/de/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/de
+@dirrm %%HORDIR%%/locale/da/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/da
+@dirrm %%HORDIR%%/locale/cs/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/cs
+@dirrm %%HORDIR%%/locale/ca/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ca
+@dirrm %%HORDIR%%/locale/bs/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/bs
+@dirrm %%HORDIR%%/locale/bg/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/bg
+@dirrm %%HORDIR%%/locale/ar_OM/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ar_OM
+@dirrm %%HORDIR%%/locale/ar/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ar
+@dirrm %%HORDIR%%/locale
+@dirrm %%HORDIR%%/lib/Views
+@dirrm %%HORDIR%%/lib/Ui
+@dirrm %%HORDIR%%/lib/Tree
+@dirrm %%HORDIR%%/lib/Sentmail
+@dirrm %%HORDIR%%/lib/Search/Vfolder
+@dirrm %%HORDIR%%/lib/Search/Filter
+@dirrm %%HORDIR%%/lib/Search/Element
+@dirrm %%HORDIR%%/lib/Search
+@dirrm %%HORDIR%%/lib/Quota
+@dirrm %%HORDIR%%/lib/Prefs
+@dirrm %%HORDIR%%/lib/Notification/Listener
+@dirrm %%HORDIR%%/lib/Notification/Handler/Decorator
+@dirrm %%HORDIR%%/lib/Notification/Handler
+@dirrm %%HORDIR%%/lib/Notification/Event
+@dirrm %%HORDIR%%/lib/Notification
+@dirrm %%HORDIR%%/lib/Mime/Viewer
+@dirrm %%HORDIR%%/lib/Mime
+@dirrm %%HORDIR%%/lib/Menu
+@dirrm %%HORDIR%%/lib/Mailbox/List
+@dirrm %%HORDIR%%/lib/Mailbox
+@dirrm %%HORDIR%%/lib/LoginTasks/Task
+@dirrm %%HORDIR%%/lib/LoginTasks/SystemTask
+@dirrm %%HORDIR%%/lib/LoginTasks
+@dirrm %%HORDIR%%/lib/Imap
+@dirrm %%HORDIR%%/lib/Flag/System
+@dirrm %%HORDIR%%/lib/Flag/Imap
+@dirrm %%HORDIR%%/lib/Flag
+@dirrm %%HORDIR%%/lib/Factory
+@dirrm %%HORDIR%%/lib/Crypt
+@dirrm %%HORDIR%%/lib/Compose
+@dirrm %%HORDIR%%/lib/Block
+@dirrm %%HORDIR%%/lib/Ajax/Imple
+@dirrm %%HORDIR%%/lib/Ajax
+@dirrm %%HORDIR%%/lib
+@dirrm %%HORDIR%%/js
+@dirrmtry %%HORDIR%%/config
+@dirrm %%HORDIR%%/bin
 @dirrmtry %%HORDIR%%
 @dirrmtry %%HORBAS%%
+