IMP version H3 (4.2) is a major upgrade in the 4.x release series, including

these enhancements:
* Message and mailbox caching on the server side, resulting in much
  increased performance and much less web server and IMAP server load.
* Rewrite of much of IMP's core libraries, resulting in more efficient
  memory usage, more efficient IMAP queries, smaller session sizes, and
  increased performance.
* WCAG 1.0 Priority 2/Section 508 accessibility guidelines compliance.
* Javascript auto-complete contact list searching.
* Can now have multiple browser windows open without destroying the
  open session.
* Logging of sent messages.
* Add protection against CSRF attacks.
* Improve WYSIWYG editors to support more browsers and offer more choices.
* Server configuration to limit maximum number of recipients per message
  and maximum number of sent messages over a certain period of time.
* Improved templating of output code to ease local customization.
* Additional maintenance tasks to clean old messages from mailboxes.
* Sorting is now saved per mailbox rather than across all mailboxes.
* On IE and Firefox, warn users before closing popup compose window.
* Add support for symmetric PGP encryption.
* Preference added to dictate default cursor location in compose textarea.
* Preference added to only verify PGP & S/MIME signed messages on
  user request.
* Forward messages as RFC 822 parts by default; provide more options for
  forwarding messages; and be smarter about what part to use as body
  text depending on current editor (text vs. html).
* Javascript code now uses the prototype js library, resulting in more
  robust code and more available functionality - for example, non-modal
  newmail popups.
* Add server configuration to limit the maximum size of MIME message
  data that can be displayed inline.
* Use tidy extension (if available) to clean up display of HTML messages
  and clean up HTML composed messages.
* Add RSS/Atom feed for mailboxes.
* More/improved display options for the folder lists and better handling
  of non-private namespaces.
* Improvements/cleanups to the imap quota drivers.
* Add additional hooks after certain actions (i.e. post-login,
  post-compose).
* Add support for sending e-mails with Internationalized Domain Names
  (IDN).
* Fetch public PGP keys from keyserver if not available in address book.
* Add configuration for folders that may not be modified.
* and much, much, much more.

3 files changed, 257 insertions, 83 deletions

diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 63b4786fbaf..e1bac97fdf1 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2008/05/26 02:13:22 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2008/05/26 12:55:02 adrianp Exp $
 
 DISTNAME=	imp-h3-${IMPVER}
 PKGNAME=	imp-${IMPVER}
@@ -10,9 +10,9 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://www.horde.org/imp/
 COMMENT=	Internet Messaging Program
 
-CONFLICTS+=	imp-3.*
+CONFLICTS+=	imp-3.*{,nb*}
 
-DEPENDS+=	horde>=3.0.2:../../www/horde
+DEPENDS+=	horde>=3.2:../../www/horde
 DEPENDS+=	${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail-[0-9]*:../../mail/pear-Mail
 
@@ -26,7 +26,7 @@ DOCDIR=		${PREFIX}/share/doc/imp
 EGDIR=		${PREFIX}/share/examples/imp
 HORDEDIR=	${PREFIX}/share/horde
 IMPDIR=		${HORDEDIR}/imp
-IMPVER=		4.1.6
+IMPVER=		4.2
 PAXDIRS=	lib locale po scripts templates themes
 
 PKG_USERS_VARS+=	APACHE_USER
@@ -71,6 +71,12 @@ SUBST_FILES.files=	imp.conf.dist
 SUBST_SED.files=	-e "s|@IMPDIR@|${IMPDIR}|g"
 SUBST_MESSAGE.files=	Fixing configuration files.
 
+REPLACE_INTERPRETER+=	php
+REPLACE.php.old=	.*/bin/php
+REPLACE.php.new=	${PREFIX}/bin/php
+REPLACE_FILES.php=	scripts/bounce_spam.php \
+			scripts/upgrades/convert_vfolders.php
+
 .include "options.mk"
 
 do-build:
diff --git a/mail/imp/PLIST b/mail/imp/PLIST
index 7b686b306a3..badf1d82971 100644
--- a/mail/imp/PLIST
+++ b/mail/imp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/06/16 09:24:36 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/05/26 12:55:02 adrianp Exp $
 share/doc/imp/CHANGES
 share/doc/imp/COPYING
 share/doc/imp/CREDITS
@@ -10,22 +10,25 @@ share/doc/imp/UPGRADING
 share/examples/imp/imp.conf
 share/horde/imp/acl.php
 share/horde/imp/attachment.php
+share/horde/imp/cache.php
 share/horde/imp/compose.php
 share/horde/imp/config/conf.xml.dist
 share/horde/imp/config/filter.txt.dist
 share/horde/imp/config/header.php.dist
+share/horde/imp/config/hooks.php.dist
 share/horde/imp/config/menu.php.dist
 share/horde/imp/config/mime_drivers.php.dist
 share/horde/imp/config/motd.php.dist
 share/horde/imp/config/prefs.php.dist
 share/horde/imp/config/servers.php.dist
+share/horde/imp/config/spelling.php.dist
 share/horde/imp/config/trailer.txt.dist
 share/horde/imp/contacts.php
-share/horde/imp/expand.php
 share/horde/imp/fetchmail.php
 share/horde/imp/fetchmailprefs.php
 share/horde/imp/filterprefs.php
 share/horde/imp/folders.php
+share/horde/imp/imple.php
 share/horde/imp/index.php
 share/horde/imp/lib/Auth/imp.php
 share/horde/imp/lib/Block/summary.php
@@ -38,13 +41,22 @@ share/horde/imp/lib/Fetchmail/imap.php
 share/horde/imp/lib/Filter.php
 share/horde/imp/lib/Folder.php
 share/horde/imp/lib/IMAP.php
+share/horde/imp/lib/IMAP/ACL.php
+share/horde/imp/lib/IMAP/ACL/rfc2086.php
+share/horde/imp/lib/IMAP/ACL/rfc4314.php
+share/horde/imp/lib/IMAP/Cache.php
 share/horde/imp/lib/IMAP/Client.php
+share/horde/imp/lib/IMAP/MessageCache.php
 share/horde/imp/lib/IMAP/Search.php
 share/horde/imp/lib/IMAP/Sort.php
 share/horde/imp/lib/IMAP/Thread.php
 share/horde/imp/lib/IMAP/Tree.php
 share/horde/imp/lib/IMP.php
 share/horde/imp/lib/Identity/imp.php
+share/horde/imp/lib/Imple.php
+share/horde/imp/lib/Imple/ContactAutoCompleter.php
+share/horde/imp/lib/Imple/SpellChecker.php
+share/horde/imp/lib/JSON.php
 share/horde/imp/lib/MIME/Contents.php
 share/horde/imp/lib/MIME/Headers.php
 share/horde/imp/lib/MIME/Viewer/alternative.php
@@ -61,6 +73,7 @@ share/horde/imp/lib/MIME/Viewer/pkcs7.php
 share/horde/imp/lib/MIME/Viewer/plain.php
 share/horde/imp/lib/MIME/Viewer/related.php
 share/horde/imp/lib/MIME/Viewer/rfc822.php
+share/horde/imp/lib/MIME/Viewer/smil.php
 share/horde/imp/lib/MIME/Viewer/status.php
 share/horde/imp/lib/MIME/Viewer/tnef.php
 share/horde/imp/lib/MIME/Viewer/zip.php
@@ -69,6 +82,8 @@ share/horde/imp/lib/Maillog.php
 share/horde/imp/lib/Maintenance/Task/delete_attachments_monthly.php
 share/horde/imp/lib/Maintenance/Task/delete_sentmail_monthly.php
 share/horde/imp/lib/Maintenance/Task/fetchmail_login.php
+share/horde/imp/lib/Maintenance/Task/purge_sentmail.php
+share/horde/imp/lib/Maintenance/Task/purge_spam.php
 share/horde/imp/lib/Maintenance/Task/purge_trash.php
 share/horde/imp/lib/Maintenance/Task/rename_sentmail_monthly.php
 share/horde/imp/lib/Maintenance/Task/tos_agreement.php
@@ -77,17 +92,28 @@ share/horde/imp/lib/Message.php
 share/horde/imp/lib/Notification/Listener/status.php
 share/horde/imp/lib/Quota.php
 share/horde/imp/lib/Quota/command.php
-share/horde/imp/lib/Quota/courier.php
-share/horde/imp/lib/Quota/cyrus.php
+share/horde/imp/lib/Quota/hook.php
+share/horde/imp/lib/Quota/imap.php
 share/horde/imp/lib/Quota/logfile.php
+share/horde/imp/lib/Quota/maildir.php
 share/horde/imp/lib/Quota/mdaemon.php
 share/horde/imp/lib/Quota/mercury32.php
+share/horde/imp/lib/Quota/sql.php
 share/horde/imp/lib/Search.php
+share/horde/imp/lib/Sentmail.php
+share/horde/imp/lib/Sentmail/sql.php
 share/horde/imp/lib/Session.php
 share/horde/imp/lib/Spam.php
+share/horde/imp/lib/SpellChecker.php
+share/horde/imp/lib/SpellChecker/aspell.php
+share/horde/imp/lib/Template.php
+share/horde/imp/lib/UI/Compose.php
+share/horde/imp/lib/UI/Mailbox.php
+share/horde/imp/lib/UI/Message.php
 share/horde/imp/lib/api.php
 share/horde/imp/lib/base.php
 share/horde/imp/lib/prefs.php
+share/horde/imp/lib/tests/mime_viewer_html.phpt
 share/horde/imp/lib/version.php
 share/horde/imp/locale/ar_OM/LC_MESSAGES/imp.mo
 share/horde/imp/locale/ar_SY/LC_MESSAGES/imp.mo
@@ -205,90 +231,73 @@ share/horde/imp/po/tr_TR.po
 share/horde/imp/po/uk_UA.po
 share/horde/imp/po/zh_CN.po
 share/horde/imp/po/zh_TW.po
-share/horde/imp/recompose.php
 share/horde/imp/redirect.php
+share/horde/imp/rss.php
 share/horde/imp/saveimage.php
 share/horde/imp/scripts/Imp.reg
+share/horde/imp/scripts/bounce_spam.php
 share/horde/imp/scripts/custom_login.php
+share/horde/imp/scripts/sql/imp.sql
+share/horde/imp/scripts/sql/imp.xml
+share/horde/imp/scripts/upgrades/convert_vfolders.php
 share/horde/imp/search.php
 share/horde/imp/smime.php
-share/horde/imp/spelling.php
 share/horde/imp/stationery.php
-share/horde/imp/templates/acl/acl.inc
+share/horde/imp/templates/acl/acl.html
 share/horde/imp/templates/common-header.inc
-share/horde/imp/templates/compose/attachments.inc
-share/horde/imp/templates/compose/attachments.js
-share/horde/imp/templates/compose/compose.inc
-share/horde/imp/templates/compose/compose.js
-share/horde/imp/templates/compose/compose_expand.js
-share/horde/imp/templates/compose/encrypt_list.inc
-share/horde/imp/templates/compose/expand.inc
-share/horde/imp/templates/compose/recompose.inc
-share/horde/imp/templates/compose/redirect.inc
-share/horde/imp/templates/compose/spelling.inc
-share/horde/imp/templates/compose/spelling.js
-share/horde/imp/templates/compose/success.inc
-share/horde/imp/templates/contacts/contacts.inc
-share/horde/imp/templates/fetchmail/account_select.inc
-share/horde/imp/templates/fetchmail/driver_select.inc
-share/horde/imp/templates/fetchmail/fetchmail.inc
-share/horde/imp/templates/fetchmail/manage.inc
-share/horde/imp/templates/fetchmail/top.inc
-share/horde/imp/templates/filters/notactive.inc
-share/horde/imp/templates/filters/prefs.inc
-share/horde/imp/templates/folders/actions.inc
+share/horde/imp/templates/compose/compose.html
+share/horde/imp/templates/compose/redirect.html
+share/horde/imp/templates/compose/success.html
+share/horde/imp/templates/contacts/contacts.html
+share/horde/imp/templates/fetchmail/fetchmail.html
+share/horde/imp/templates/fetchmail/fetchmailprefs.html
+share/horde/imp/templates/filters/prefs.html
+share/horde/imp/templates/folders/actions.html
 share/horde/imp/templates/folders/folders.html
 share/horde/imp/templates/folders/folders_confirm.html
-share/horde/imp/templates/folders/foot.inc
-share/horde/imp/templates/folders/head.inc
-share/horde/imp/templates/folders/import.inc
+share/horde/imp/templates/folders/folders_size.html
+share/horde/imp/templates/folders/head.html
+share/horde/imp/templates/folders/import.html
 share/horde/imp/templates/javascript/addressesBlocks.js
-share/horde/imp/templates/javascript/folders.js
 share/horde/imp/templates/javascript/popup.js
-share/horde/imp/templates/login/login.inc
-share/horde/imp/templates/mailbox/actions.inc
-share/horde/imp/templates/mailbox/actions_deleted.inc
-share/horde/imp/templates/mailbox/alert.inc
-share/horde/imp/templates/mailbox/empty_mailbox.inc
-share/horde/imp/templates/mailbox/footer.inc
-share/horde/imp/templates/mailbox/header.inc
-share/horde/imp/templates/mailbox/javascript.inc
-share/horde/imp/templates/mailbox/legend.inc
+share/horde/imp/templates/javascript_defs.php
+share/horde/imp/templates/login/login.html
+share/horde/imp/templates/login/mobile.inc
+share/horde/imp/templates/login/recompose.html
+share/horde/imp/templates/mailbox/actions.html
+share/horde/imp/templates/mailbox/actions_deleted.html
+share/horde/imp/templates/mailbox/empty_mailbox.html
+share/horde/imp/templates/mailbox/header.html
 share/horde/imp/templates/mailbox/mailbox.html
-share/horde/imp/templates/mailbox/message_footers.inc
-share/horde/imp/templates/mailbox/message_headers.inc
-share/horde/imp/templates/mailbox/navbar.inc
-share/horde/imp/templates/mailbox/searchfolder.inc
-share/horde/imp/templates/menu.inc
-share/horde/imp/templates/message/headers.inc
-share/horde/imp/templates/message/javascript.inc
-share/horde/imp/templates/message/message.inc
-share/horde/imp/templates/message/navbar_actions.inc
-share/horde/imp/templates/message/navbar_navigate.inc
-share/horde/imp/templates/message/navbar_top.inc
-share/horde/imp/templates/pgp/import_key.inc
-share/horde/imp/templates/pgp/notactive.inc
-share/horde/imp/templates/pgp/passphrase.inc
-share/horde/imp/templates/pgp/pgp.inc
-share/horde/imp/templates/prefs/defaultsearchselect.inc
+share/horde/imp/templates/mailbox/message_footers.html
+share/horde/imp/templates/mailbox/message_headers.html
+share/horde/imp/templates/mailbox/navbar.html
+share/horde/imp/templates/mailbox/searchfolder.html
+share/horde/imp/templates/menu.html
+share/horde/imp/templates/message/message.html
+share/horde/imp/templates/message/navbar_actions.html
+share/horde/imp/templates/message/navbar_navigate.html
+share/horde/imp/templates/message/navbar_top.html
+share/horde/imp/templates/newmsg/alert.html
+share/horde/imp/templates/pgp/import_key.html
+share/horde/imp/templates/pgp/passphrase.html
+share/horde/imp/templates/pgp/pgp.html
 share/horde/imp/templates/prefs/encryptselect.inc
 share/horde/imp/templates/prefs/folderselect.inc
 share/horde/imp/templates/prefs/initialpageselect.inc
 share/horde/imp/templates/prefs/sentmailselect.inc
+share/horde/imp/templates/prefs/soundselect.inc
 share/horde/imp/templates/prefs/sourceselect.inc
 share/horde/imp/templates/prefs/spamselect.inc
 share/horde/imp/templates/prefs/trashselect.inc
-share/horde/imp/templates/quota/quota.inc
-share/horde/imp/templates/saveimage/saveimage.inc
-share/horde/imp/templates/search/fields.inc
-share/horde/imp/templates/search/header.inc
-share/horde/imp/templates/search/javascript.inc
-share/horde/imp/templates/search/main.inc
-share/horde/imp/templates/smime/import_key.inc
-share/horde/imp/templates/smime/notactive.inc
-share/horde/imp/templates/smime/passphrase.inc
-share/horde/imp/templates/smime/smime.inc
-share/horde/imp/templates/stationery/prefs.inc
+share/horde/imp/templates/quota/quota.html
+share/horde/imp/templates/rss/mailbox.rss
+share/horde/imp/templates/saveimage/saveimage.html
+share/horde/imp/templates/search/search.html
+share/horde/imp/templates/smime/import_key.html
+share/horde/imp/templates/smime/passphrase.html
+share/horde/imp/templates/smime/smime.html
+share/horde/imp/templates/stationery/stationery.html
 share/horde/imp/templates/thread/thread.html
 share/horde/imp/test.php
 share/horde/imp/themes/azur/screen.css
@@ -298,11 +307,17 @@ share/horde/imp/themes/brown/screen.css
 share/horde/imp/themes/burntorange/screen.css
 share/horde/imp/themes/cherry/screen.css
 share/horde/imp/themes/cornflower/screen.css
+share/horde/imp/themes/fadetogreen/screen.css
+share/horde/imp/themes/feed-rss.xsl
 share/horde/imp/themes/gennevilliers/screen.css
 share/horde/imp/themes/graphics/addressbook_add.png
 share/horde/imp/themes/graphics/addressbook_browse.png
 share/horde/imp/themes/graphics/apple.png
 share/horde/imp/themes/graphics/attachment.png
+share/horde/imp/themes/graphics/audio/doorbell.wav
+share/horde/imp/themes/graphics/audio/gnid3.wav
+share/horde/imp/themes/graphics/audio/jetsndb.wav
+share/horde/imp/themes/graphics/audio/reminder.wav
 share/horde/imp/themes/graphics/audio/theetone.wav
 share/horde/imp/themes/graphics/compose.png
 share/horde/imp/themes/graphics/empty_spam.png
@@ -314,12 +329,18 @@ share/horde/imp/themes/graphics/fetchmail.png
 share/horde/imp/themes/graphics/filters.png
 share/horde/imp/themes/graphics/folders/drafts.png
 share/horde/imp/themes/graphics/folders/folder.png
+share/horde/imp/themes/graphics/folders/folder_create.png
+share/horde/imp/themes/graphics/folders/folder_delete.png
+share/horde/imp/themes/graphics/folders/folder_edit.png
 share/horde/imp/themes/graphics/folders/folder_open.png
 share/horde/imp/themes/graphics/folders/inbox.png
 share/horde/imp/themes/graphics/folders/sent.png
+share/horde/imp/themes/graphics/folders/spam.png
 share/horde/imp/themes/graphics/folders/trash.png
 share/horde/imp/themes/graphics/imp.png
+share/horde/imp/themes/graphics/loading.gif
 share/horde/imp/themes/graphics/mail_answered.png
+share/horde/imp/themes/graphics/mail_clearflag.png
 share/horde/imp/themes/graphics/mail_deleted.png
 share/horde/imp/themes/graphics/mail_draft.png
 share/horde/imp/themes/graphics/mail_flagged.png
@@ -327,6 +348,7 @@ share/horde/imp/themes/graphics/mail_forwarded.png
 share/horde/imp/themes/graphics/mail_personal.png
 share/horde/imp/themes/graphics/mail_priority_high.png
 share/horde/imp/themes/graphics/mail_priority_low.png
+share/horde/imp/themes/graphics/mail_seen.png
 share/horde/imp/themes/graphics/mail_unseen.png
 share/horde/imp/themes/graphics/manage_attachments.png
 share/horde/imp/themes/graphics/mime/binary.png
@@ -337,36 +359,172 @@ share/horde/imp/themes/graphics/mime/image.png
 share/horde/imp/themes/graphics/mime/itip.png
 share/horde/imp/themes/graphics/mime/mail.png
 share/horde/imp/themes/graphics/mime/text.png
+share/horde/imp/themes/graphics/mini-error.png
 share/horde/imp/themes/graphics/newmail.png
+share/horde/imp/themes/graphics/popdown.png
+share/horde/imp/themes/graphics/redbox_spinner.gif
 share/horde/imp/themes/graphics/shared.png
 share/horde/imp/themes/graphics/signed.png
 share/horde/imp/themes/graphics/spacer_red.png
 share/horde/imp/themes/graphics/spellcheck.png
 share/horde/imp/themes/green/screen.css
 share/horde/imp/themes/grey/screen.css
+share/horde/imp/themes/ideas/screen.css
+share/horde/imp/themes/ie6_or_less.css
+share/horde/imp/themes/ie7.css
 share/horde/imp/themes/lavander/screen.css
 share/horde/imp/themes/luc/screen.css
 share/horde/imp/themes/lucblue/screen.css
+share/horde/imp/themes/mozilla/screen.css
 share/horde/imp/themes/postnuke/screen.css
 share/horde/imp/themes/rtl.css
 share/horde/imp/themes/screen.css
+share/horde/imp/themes/silver/graphics/addressbook_add.png
+share/horde/imp/themes/silver/graphics/addressbook_browse.png
+share/horde/imp/themes/silver/graphics/apple.png
+share/horde/imp/themes/silver/graphics/attachment.png
+share/horde/imp/themes/silver/graphics/audio/doorbell.wav
+share/horde/imp/themes/silver/graphics/audio/gnid3.wav
+share/horde/imp/themes/silver/graphics/audio/jetsndb.wav
+share/horde/imp/themes/silver/graphics/audio/reminder.wav
+share/horde/imp/themes/silver/graphics/audio/theetone.wav
+share/horde/imp/themes/silver/graphics/compose.png
+share/horde/imp/themes/silver/graphics/empty_spam.png
+share/horde/imp/themes/silver/graphics/empty_trash.png
+share/horde/imp/themes/silver/graphics/encrypted.png
+share/horde/imp/themes/silver/graphics/expand.png
+share/horde/imp/themes/silver/graphics/favicon.ico
+share/horde/imp/themes/silver/graphics/fetchmail.png
+share/horde/imp/themes/silver/graphics/filters.png
+share/horde/imp/themes/silver/graphics/folders/drafts.png
+share/horde/imp/themes/silver/graphics/folders/folder.png
+share/horde/imp/themes/silver/graphics/folders/folder_create.png
+share/horde/imp/themes/silver/graphics/folders/folder_delete.png
+share/horde/imp/themes/silver/graphics/folders/folder_edit.png
+share/horde/imp/themes/silver/graphics/folders/folder_open.png
+share/horde/imp/themes/silver/graphics/folders/inbox.png
+share/horde/imp/themes/silver/graphics/folders/sent.png
+share/horde/imp/themes/silver/graphics/folders/spam.png
+share/horde/imp/themes/silver/graphics/folders/trash.png
+share/horde/imp/themes/silver/graphics/imp.png
+share/horde/imp/themes/silver/graphics/loading.gif
+share/horde/imp/themes/silver/graphics/mail_answered.png
+share/horde/imp/themes/silver/graphics/mail_clearflag.png
+share/horde/imp/themes/silver/graphics/mail_deleted.png
+share/horde/imp/themes/silver/graphics/mail_draft.png
+share/horde/imp/themes/silver/graphics/mail_flagged.png
+share/horde/imp/themes/silver/graphics/mail_forwarded.png
+share/horde/imp/themes/silver/graphics/mail_personal.png
+share/horde/imp/themes/silver/graphics/mail_priority_high.png
+share/horde/imp/themes/silver/graphics/mail_priority_low.png
+share/horde/imp/themes/silver/graphics/mail_seen.png
+share/horde/imp/themes/silver/graphics/mail_unseen.png
+share/horde/imp/themes/silver/graphics/manage_attachments.png
+share/horde/imp/themes/silver/graphics/mime/binary.png
+share/horde/imp/themes/silver/graphics/mime/compressed.png
+share/horde/imp/themes/silver/graphics/mime/encryption.png
+share/horde/imp/themes/silver/graphics/mime/html.png
+share/horde/imp/themes/silver/graphics/mime/image.png
+share/horde/imp/themes/silver/graphics/mime/itip.png
+share/horde/imp/themes/silver/graphics/mime/mail.png
+share/horde/imp/themes/silver/graphics/mime/text.png
+share/horde/imp/themes/silver/graphics/mini-error.png
+share/horde/imp/themes/silver/graphics/newmail.png
+share/horde/imp/themes/silver/graphics/popdown.png
+share/horde/imp/themes/silver/graphics/redbox_spinner.gif
+share/horde/imp/themes/silver/graphics/shared.png
+share/horde/imp/themes/silver/graphics/signed.png
+share/horde/imp/themes/silver/graphics/spacer_red.png
+share/horde/imp/themes/silver/graphics/spellcheck.png
+share/horde/imp/themes/silver/screen.css
+share/horde/imp/themes/silver/themed_graphics
 share/horde/imp/themes/simplex/screen.css
 share/horde/imp/themes/sun/screen.css
+share/horde/imp/themes/tango-blue/graphics/addressbook_add.png
+share/horde/imp/themes/tango-blue/graphics/addressbook_browse.png
+share/horde/imp/themes/tango-blue/graphics/apple.png
+share/horde/imp/themes/tango-blue/graphics/attachment.png
+share/horde/imp/themes/tango-blue/graphics/audio/doorbell.wav
+share/horde/imp/themes/tango-blue/graphics/audio/gnid3.wav
+share/horde/imp/themes/tango-blue/graphics/audio/jetsndb.wav
+share/horde/imp/themes/tango-blue/graphics/audio/reminder.wav
+share/horde/imp/themes/tango-blue/graphics/audio/theetone.wav
+share/horde/imp/themes/tango-blue/graphics/compose.png
+share/horde/imp/themes/tango-blue/graphics/empty_spam.png
+share/horde/imp/themes/tango-blue/graphics/empty_trash.png
+share/horde/imp/themes/tango-blue/graphics/encrypted.png
+share/horde/imp/themes/tango-blue/graphics/expand.png
+share/horde/imp/themes/tango-blue/graphics/favicon.ico
+share/horde/imp/themes/tango-blue/graphics/fetchmail.png
+share/horde/imp/themes/tango-blue/graphics/filters.png
+share/horde/imp/themes/tango-blue/graphics/folders/drafts.png
+share/horde/imp/themes/tango-blue/graphics/folders/folder.png
+share/horde/imp/themes/tango-blue/graphics/folders/folder_create.png
+share/horde/imp/themes/tango-blue/graphics/folders/folder_delete.png
+share/horde/imp/themes/tango-blue/graphics/folders/folder_edit.png
+share/horde/imp/themes/tango-blue/graphics/folders/folder_open.png
+share/horde/imp/themes/tango-blue/graphics/folders/inbox.png
+share/horde/imp/themes/tango-blue/graphics/folders/sent.png
+share/horde/imp/themes/tango-blue/graphics/folders/spam.png
+share/horde/imp/themes/tango-blue/graphics/folders/trash.png
+share/horde/imp/themes/tango-blue/graphics/imp.png
+share/horde/imp/themes/tango-blue/graphics/loading.gif
+share/horde/imp/themes/tango-blue/graphics/mail_answered.png
+share/horde/imp/themes/tango-blue/graphics/mail_clearflag.png
+share/horde/imp/themes/tango-blue/graphics/mail_deleted.png
+share/horde/imp/themes/tango-blue/graphics/mail_draft.png
+share/horde/imp/themes/tango-blue/graphics/mail_flagged.png
+share/horde/imp/themes/tango-blue/graphics/mail_forwarded.png
+share/horde/imp/themes/tango-blue/graphics/mail_personal.png
+share/horde/imp/themes/tango-blue/graphics/mail_priority_high.png
+share/horde/imp/themes/tango-blue/graphics/mail_priority_low.png
+share/horde/imp/themes/tango-blue/graphics/mail_seen.png
+share/horde/imp/themes/tango-blue/graphics/mail_unseen.png
+share/horde/imp/themes/tango-blue/graphics/manage_attachments.png
+share/horde/imp/themes/tango-blue/graphics/mime/binary.png
+share/horde/imp/themes/tango-blue/graphics/mime/compressed.png
+share/horde/imp/themes/tango-blue/graphics/mime/encryption.png
+share/horde/imp/themes/tango-blue/graphics/mime/html.png
+share/horde/imp/themes/tango-blue/graphics/mime/image.png
+share/horde/imp/themes/tango-blue/graphics/mime/itip.png
+share/horde/imp/themes/tango-blue/graphics/mime/mail.png
+share/horde/imp/themes/tango-blue/graphics/mime/text.png
+share/horde/imp/themes/tango-blue/graphics/mini-error.png
+share/horde/imp/themes/tango-blue/graphics/newmail.png
+share/horde/imp/themes/tango-blue/graphics/shared.png
+share/horde/imp/themes/tango-blue/graphics/signed.png
+share/horde/imp/themes/tango-blue/graphics/spacer_red.png
+share/horde/imp/themes/tango-blue/graphics/spellcheck.png
+share/horde/imp/themes/tango-blue/screen.css
+share/horde/imp/themes/tango-blue/themed_graphics
 share/horde/imp/thread.php
 share/horde/imp/view.php
+@dirrm share/horde/imp/themes/tango-blue/graphics/mime
+@dirrm share/horde/imp/themes/tango-blue/graphics/folders
+@dirrm share/horde/imp/themes/tango-blue/graphics/audio
+@dirrm share/horde/imp/themes/tango-blue/graphics
+@dirrm share/horde/imp/themes/tango-blue
 @dirrm share/horde/imp/themes/sun
 @dirrm share/horde/imp/themes/simplex
+@dirrm share/horde/imp/themes/silver/graphics/mime
+@dirrm share/horde/imp/themes/silver/graphics/folders
+@dirrm share/horde/imp/themes/silver/graphics/audio
+@dirrm share/horde/imp/themes/silver/graphics
+@dirrm share/horde/imp/themes/silver
 @dirrm share/horde/imp/themes/postnuke
+@dirrm share/horde/imp/themes/mozilla
 @dirrm share/horde/imp/themes/lucblue
 @dirrm share/horde/imp/themes/luc
 @dirrm share/horde/imp/themes/lavander
+@dirrm share/horde/imp/themes/ideas
 @dirrm share/horde/imp/themes/grey
 @dirrm share/horde/imp/themes/green
-@dirrm share/horde/imp/themes/graphics/audio
 @dirrm share/horde/imp/themes/graphics/mime
 @dirrm share/horde/imp/themes/graphics/folders
+@dirrm share/horde/imp/themes/graphics/audio
 @dirrm share/horde/imp/themes/graphics
 @dirrm share/horde/imp/themes/gennevilliers
+@dirrm share/horde/imp/themes/fadetogreen
 @dirrm share/horde/imp/themes/cornflower
 @dirrm share/horde/imp/themes/cherry
 @dirrm share/horde/imp/themes/burntorange
@@ -375,14 +533,16 @@ share/horde/imp/view.php
 @dirrm share/horde/imp/themes/bluemoon
 @dirrm share/horde/imp/themes/azur
 @dirrm share/horde/imp/themes
-@dirrm share/horde/imp/templates/stationery
-@dirrm share/horde/imp/templates/saveimage
 @dirrm share/horde/imp/templates/thread
+@dirrm share/horde/imp/templates/stationery
 @dirrm share/horde/imp/templates/smime
 @dirrm share/horde/imp/templates/search
+@dirrm share/horde/imp/templates/saveimage
+@dirrm share/horde/imp/templates/rss
 @dirrm share/horde/imp/templates/quota
 @dirrm share/horde/imp/templates/prefs
 @dirrm share/horde/imp/templates/pgp
+@dirrm share/horde/imp/templates/newmsg
 @dirrm share/horde/imp/templates/message
 @dirrm share/horde/imp/templates/mailbox
 @dirrm share/horde/imp/templates/login
@@ -394,6 +554,8 @@ share/horde/imp/view.php
 @dirrm share/horde/imp/templates/compose
 @dirrm share/horde/imp/templates/acl
 @dirrm share/horde/imp/templates
+@dirrm share/horde/imp/scripts/upgrades
+@dirrm share/horde/imp/scripts/sql
 @dirrm share/horde/imp/scripts
 @dirrm share/horde/imp/po
 @dirrm share/horde/imp/locale/zh_TW/LC_MESSAGES
@@ -436,6 +598,8 @@ share/horde/imp/view.php
 @dirrm share/horde/imp/locale/lt_LT
 @dirrm share/horde/imp/locale/ko_KR/LC_MESSAGES
 @dirrm share/horde/imp/locale/ko_KR
+@dirrm share/horde/imp/locale/km_KH/LC_MESSAGES
+@dirrm share/horde/imp/locale/km_KH
 @dirrm share/horde/imp/locale/ja_JP/LC_MESSAGES
 @dirrm share/horde/imp/locale/ja_JP
 @dirrm share/horde/imp/locale/it_IT/LC_MESSAGES
@@ -446,6 +610,8 @@ share/horde/imp/view.php
 @dirrm share/horde/imp/locale/id_ID
 @dirrm share/horde/imp/locale/hu_HU/LC_MESSAGES
 @dirrm share/horde/imp/locale/hu_HU
+@dirrm share/horde/imp/locale/he_IL/LC_MESSAGES
+@dirrm share/horde/imp/locale/he_IL
 @dirrm share/horde/imp/locale/gl_ES/LC_MESSAGES
 @dirrm share/horde/imp/locale/gl_ES
 @dirrm share/horde/imp/locale/fr_FR/LC_MESSAGES
@@ -477,11 +643,11 @@ share/horde/imp/view.php
 @dirrm share/horde/imp/locale/ar_SY
 @dirrm share/horde/imp/locale/ar_OM/LC_MESSAGES
 @dirrm share/horde/imp/locale/ar_OM
-@dirrm share/horde/imp/locale/km_KH/LC_MESSAGES
-@dirrm share/horde/imp/locale/km_KH
-@dirrm share/horde/imp/locale/he_IL/LC_MESSAGES
-@dirrm share/horde/imp/locale/he_IL
 @dirrm share/horde/imp/locale
+@dirrm share/horde/imp/lib/tests
+@dirrm share/horde/imp/lib/UI
+@dirrm share/horde/imp/lib/SpellChecker
+@dirrm share/horde/imp/lib/Sentmail
 @dirrm share/horde/imp/lib/Quota
 @dirrm share/horde/imp/lib/Notification/Listener
 @dirrm share/horde/imp/lib/Notification
@@ -489,7 +655,9 @@ share/horde/imp/view.php
 @dirrm share/horde/imp/lib/Maintenance
 @dirrm share/horde/imp/lib/MIME/Viewer
 @dirrm share/horde/imp/lib/MIME
+@dirrm share/horde/imp/lib/Imple
 @dirrm share/horde/imp/lib/Identity
+@dirrm share/horde/imp/lib/IMAP/ACL
 @dirrm share/horde/imp/lib/IMAP
 @dirrm share/horde/imp/lib/Fetchmail
 @dirrm share/horde/imp/lib/Crypt
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index 29c540be00d..046cbd697e7 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2008/01/09 21:49:48 adrianp Exp $
+$NetBSD: distinfo,v 1.20 2008/05/26 12:55:02 adrianp Exp $
 
-SHA1 (imp-h3-4.1.6.tar.gz) = 5d2168bcf7ceb364e938ee47c4125751fe5412a6
-RMD160 (imp-h3-4.1.6.tar.gz) = 37d507ea1478afa789d9a24afe15421d99498087
-Size (imp-h3-4.1.6.tar.gz) = 4307131 bytes
+SHA1 (imp-h3-4.2.tar.gz) = 7bb149100600e3638a96d4d1992149d39b9c8ab2
+RMD160 (imp-h3-4.2.tar.gz) = c3bb05f5780b6fda1db171ddb3da3e461e546cb8
+Size (imp-h3-4.2.tar.gz) = 5042955 bytes