diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 9c67fcd95e68..c79961581f9e 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -7,7 +7,8 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.2
-DISTVERSIONSUFFIX=	-rc1
+DISTVERSIONSUFFIX=	-rc2
+PORTREVISION=	1
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@FreeBSD.org
diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo
index 40d200a1f43a..27749cf28794 100644
--- a/mail/horde-imp/distinfo
+++ b/mail/horde-imp/distinfo
@@ -1,3 +1,3 @@
-MD5 (imp-h3-4.2-rc1.tar.gz) = 84387c5dc737f1390afe4ebb4c5c1441
-SHA256 (imp-h3-4.2-rc1.tar.gz) = d040a3428219df082826f829dda3058c3b52f133f44201f5d11375c7f0e9dae7
-SIZE (imp-h3-4.2-rc1.tar.gz) = 4854043
+MD5 (imp-h3-4.2-rc2.tar.gz) = f71b54aa1a0fd6b7bb10b26f22d0d5f0
+SHA256 (imp-h3-4.2-rc2.tar.gz) = befced47bb51893dce967fc7a46d5cc9e3d6ad951426f86678322c59b559f3ac
+SIZE (imp-h3-4.2-rc2.tar.gz) = 4934340
diff --git a/mail/horde-imp/files/patch-config::conf.xml b/mail/horde-imp/files/patch-config::conf.xml
index b91880e6102a..49739f94b619 100644
--- a/mail/horde-imp/files/patch-config::conf.xml
+++ b/mail/horde-imp/files/patch-config::conf.xml
@@ -1,16 +1,15 @@
---- config/conf.xml.orig	2007-11-07 19:50:59.000000000 -0900
-+++ config/conf.xml	2007-12-03 20:54:11.000000000 -0900
-@@ -7,7 +7,8 @@
-    <configswitch name="driver" required="false" desc="Choose a Spell Checking backend">
-     <case name="" desc="None" />
+--- 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)">
--     <configstring name="path" desc="Enter the location of the aspell or ispell binary" />
-+     <configstring name="path" desc="Enter the location of the aspell or ispell 
-+     binary">%%ASPELL%%</configstring>
+      <configsection name="params">
+       <configstring name="path" required="false" desc="Enter the location of
+-      the aspell binary" />
++      the aspell binary">%%ASPELL%%</confstring>
+      </configsection>
      </case>
     </configswitch>
-   </configsection>
-@@ -16,7 +17,7 @@
+@@ -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
@@ -19,7 +18,7 @@
     <configmultienum name="gnupg_keyserver" required="false" desc="The address
     of the public PGP keyserver(s) to use.">pgp.mit.edu
      <values>
-@@ -30,7 +31,7 @@
+@@ -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
diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist
index 0dad1d1eb8b5..dda5cd3f903a 100644
--- a/mail/horde-imp/pkg-plist
+++ b/mail/horde-imp/pkg-plist
@@ -6,11 +6,13 @@
 %%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%%/contacts.php
 %%HORDIR%%/fetchmail.php
@@ -19,7 +21,6 @@
 %%HORDIR%%/folders.php
 %%HORDIR%%/imple.php
 %%HORDIR%%/index.php
-%%HORDIR%%/js/ContactAutoComplete.js
 %%HORDIR%%/js/KeyNavList.js
 %%HORDIR%%/js/SpellChecker.js
 %%HORDIR%%/js/acl.js
@@ -42,7 +43,6 @@
 %%HORDIR%%/js/scriptaculous.js
 %%HORDIR%%/js/search.js
 %%HORDIR%%/js/slider.js
-%%HORDIR%%/js/src/ContactAutoComplete.js
 %%HORDIR%%/js/src/KeyNavList.js
 %%HORDIR%%/js/src/SpellChecker.js
 %%HORDIR%%/js/src/acl.js
@@ -73,7 +73,6 @@
 %%HORDIR%%/js/unblockImages.js
 %%HORDIR%%/lib/.htaccess
 %%HORDIR%%/lib/Auth/imp.php
-%%HORDIR%%/lib/Block/mailbox.php
 %%HORDIR%%/lib/Block/summary.php
 %%HORDIR%%/lib/Block/tree_folders.php
 %%HORDIR%%/lib/Compose.php
@@ -283,6 +282,7 @@
 %%HORDIR%%/scripts/bounce_spam.php
 %%HORDIR%%/scripts/custom_login.php
 %%HORDIR%%/scripts/sql/imp.sql
+%%HORDIR%%/scripts/sql/imp.xml
 %%HORDIR%%/scripts/upgrades/convert_vfolders.php
 %%HORDIR%%/search.php
 %%HORDIR%%/smime.php
@@ -303,6 +303,8 @@
 %%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
@@ -478,6 +480,7 @@
 %%HORDIR%%/themes/silver/graphics/spacer_red.png
 %%HORDIR%%/themes/silver/graphics/spellcheck.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-blue.png
@@ -558,6 +561,7 @@
 %%HORDIR%%/themes/tango-blue/graphics/spellcheck.png
 %%HORDIR%%/themes/tango-blue/graphics/za.png
 %%HORDIR%%/themes/tango-blue/screen.css
+%%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/thread.php
 %%HORDIR%%/view.php
 @dirrm %%HORDIR%%/themes/tango-blue/graphics/mime
@@ -607,6 +611,7 @@
 @dirrm %%HORDIR%%/templates/message
 @dirrm %%HORDIR%%/templates/mailbox
 @dirrm %%HORDIR%%/templates/login
+@dirrm %%HORDIR%%/templates/javascript
 @dirrm %%HORDIR%%/templates/folders
 @dirrm %%HORDIR%%/templates/filters
 @dirrm %%HORDIR%%/templates/fetchmail
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index 9c67fcd95e68..c79961581f9e 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -7,7 +7,8 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.2
-DISTVERSIONSUFFIX=	-rc1
+DISTVERSIONSUFFIX=	-rc2
+PORTREVISION=	1
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@FreeBSD.org
diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo
index 40d200a1f43a..27749cf28794 100644
--- a/mail/horde4-imp/distinfo
+++ b/mail/horde4-imp/distinfo
@@ -1,3 +1,3 @@
-MD5 (imp-h3-4.2-rc1.tar.gz) = 84387c5dc737f1390afe4ebb4c5c1441
-SHA256 (imp-h3-4.2-rc1.tar.gz) = d040a3428219df082826f829dda3058c3b52f133f44201f5d11375c7f0e9dae7
-SIZE (imp-h3-4.2-rc1.tar.gz) = 4854043
+MD5 (imp-h3-4.2-rc2.tar.gz) = f71b54aa1a0fd6b7bb10b26f22d0d5f0
+SHA256 (imp-h3-4.2-rc2.tar.gz) = befced47bb51893dce967fc7a46d5cc9e3d6ad951426f86678322c59b559f3ac
+SIZE (imp-h3-4.2-rc2.tar.gz) = 4934340
diff --git a/mail/horde4-imp/files/patch-config::conf.xml b/mail/horde4-imp/files/patch-config::conf.xml
index b91880e6102a..49739f94b619 100644
--- a/mail/horde4-imp/files/patch-config::conf.xml
+++ b/mail/horde4-imp/files/patch-config::conf.xml
@@ -1,16 +1,15 @@
---- config/conf.xml.orig	2007-11-07 19:50:59.000000000 -0900
-+++ config/conf.xml	2007-12-03 20:54:11.000000000 -0900
-@@ -7,7 +7,8 @@
-    <configswitch name="driver" required="false" desc="Choose a Spell Checking backend">
-     <case name="" desc="None" />
+--- 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)">
--     <configstring name="path" desc="Enter the location of the aspell or ispell binary" />
-+     <configstring name="path" desc="Enter the location of the aspell or ispell 
-+     binary">%%ASPELL%%</configstring>
+      <configsection name="params">
+       <configstring name="path" required="false" desc="Enter the location of
+-      the aspell binary" />
++      the aspell binary">%%ASPELL%%</confstring>
+      </configsection>
      </case>
     </configswitch>
-   </configsection>
-@@ -16,7 +17,7 @@
+@@ -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
@@ -19,7 +18,7 @@
     <configmultienum name="gnupg_keyserver" required="false" desc="The address
     of the public PGP keyserver(s) to use.">pgp.mit.edu
      <values>
-@@ -30,7 +31,7 @@
+@@ -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
diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist
index 0dad1d1eb8b5..dda5cd3f903a 100644
--- a/mail/horde4-imp/pkg-plist
+++ b/mail/horde4-imp/pkg-plist
@@ -6,11 +6,13 @@
 %%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%%/contacts.php
 %%HORDIR%%/fetchmail.php
@@ -19,7 +21,6 @@
 %%HORDIR%%/folders.php
 %%HORDIR%%/imple.php
 %%HORDIR%%/index.php
-%%HORDIR%%/js/ContactAutoComplete.js
 %%HORDIR%%/js/KeyNavList.js
 %%HORDIR%%/js/SpellChecker.js
 %%HORDIR%%/js/acl.js
@@ -42,7 +43,6 @@
 %%HORDIR%%/js/scriptaculous.js
 %%HORDIR%%/js/search.js
 %%HORDIR%%/js/slider.js
-%%HORDIR%%/js/src/ContactAutoComplete.js
 %%HORDIR%%/js/src/KeyNavList.js
 %%HORDIR%%/js/src/SpellChecker.js
 %%HORDIR%%/js/src/acl.js
@@ -73,7 +73,6 @@
 %%HORDIR%%/js/unblockImages.js
 %%HORDIR%%/lib/.htaccess
 %%HORDIR%%/lib/Auth/imp.php
-%%HORDIR%%/lib/Block/mailbox.php
 %%HORDIR%%/lib/Block/summary.php
 %%HORDIR%%/lib/Block/tree_folders.php
 %%HORDIR%%/lib/Compose.php
@@ -283,6 +282,7 @@
 %%HORDIR%%/scripts/bounce_spam.php
 %%HORDIR%%/scripts/custom_login.php
 %%HORDIR%%/scripts/sql/imp.sql
+%%HORDIR%%/scripts/sql/imp.xml
 %%HORDIR%%/scripts/upgrades/convert_vfolders.php
 %%HORDIR%%/search.php
 %%HORDIR%%/smime.php
@@ -303,6 +303,8 @@
 %%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
@@ -478,6 +480,7 @@
 %%HORDIR%%/themes/silver/graphics/spacer_red.png
 %%HORDIR%%/themes/silver/graphics/spellcheck.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-blue.png
@@ -558,6 +561,7 @@
 %%HORDIR%%/themes/tango-blue/graphics/spellcheck.png
 %%HORDIR%%/themes/tango-blue/graphics/za.png
 %%HORDIR%%/themes/tango-blue/screen.css
+%%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/thread.php
 %%HORDIR%%/view.php
 @dirrm %%HORDIR%%/themes/tango-blue/graphics/mime
@@ -607,6 +611,7 @@
 @dirrm %%HORDIR%%/templates/message
 @dirrm %%HORDIR%%/templates/mailbox
 @dirrm %%HORDIR%%/templates/login
+@dirrm %%HORDIR%%/templates/javascript
 @dirrm %%HORDIR%%/templates/folders
 @dirrm %%HORDIR%%/templates/filters
 @dirrm %%HORDIR%%/templates/fetchmail