From 6e2e171cbc69135e4a197ec5dd508ab56b0158f0 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 16 Apr 2013 13:37:22 +0000
Subject: [PATCH] Update to Roundcube 0.9.

Note that database access is now done via PDO, and that for users of
SQLite this requires a change to sqlite3 - see the package readme for
update instructions.
---
 mail/roundcubemail/Makefile                   |   8 +-
 mail/roundcubemail/distinfo                   |   4 +-
 .../patches/patch-config_main_inc_php_dist    |   8 +-
 ...ch-plugins_managesieve_config_inc_php_dist |  13 -
 mail/roundcubemail/pkg/PLIST                  | 488 +++++++++++++-----
 mail/roundcubemail/pkg/README                 |  27 +-
 6 files changed, 379 insertions(+), 169 deletions(-)
 delete mode 100644 mail/roundcubemail/patches/patch-plugins_managesieve_config_inc_php_dist

diff --git a/mail/roundcubemail/Makefile b/mail/roundcubemail/Makefile
index 44b6f042d3c..956cdf7c1e4 100644
--- a/mail/roundcubemail/Makefile
+++ b/mail/roundcubemail/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.63 2013/03/27 22:38:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.64 2013/04/16 13:37:22 sthen Exp $
 
 COMMENT=	imap4 webmail client
 
-DISTNAME=	roundcubemail-0.8.6
+DISTNAME=	roundcubemail-0.9.0
+PKGNAME=	${DISTNAME:S/-rc/rc/}
 CATEGORIES=	mail www
 HOMEPAGE=	http://www.roundcube.net/
 
@@ -26,8 +27,7 @@ SUBST_VARS=	INSTDIR TINSTDIR
 MODULES=	lang/php
 RUN_DEPENDS=	lang/php/${MODPHP_VERSION},-mcrypt \
 		lang/php/${MODPHP_VERSION},-pspell \
-		sysutils/pecl-fileinfo \
-		php-mysql-${MODPHP_VSPEC}|php-pgsql-${MODPHP_VSPEC}|php-sqlite-${MODPHP_VSPEC}:lang/php/${MODPHP_VERSION},-sqlite
+		sysutils/pecl-fileinfo
 
 do-configure:
 	perl -pi -e '$$. == 1 && s,^#!.*env.*php.*,#!${MODPHP_BIN},;' \
diff --git a/mail/roundcubemail/distinfo b/mail/roundcubemail/distinfo
index caa2c077791..2308c2a04f4 100644
--- a/mail/roundcubemail/distinfo
+++ b/mail/roundcubemail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (roundcubemail-0.8.6.tar.gz) = iBKNsNxXZR4IvrPEgRvJ4zrKHDmlDPye+10UsLqhdwQ=
-SIZE (roundcubemail-0.8.6.tar.gz) = 3724565
+SHA256 (roundcubemail-0.9.0.tar.gz) = ftq5V5zSpjU8MN4/z8htojHwpG961M5wcJCBMXP2YsI=
+SIZE (roundcubemail-0.9.0.tar.gz) = 3711615
diff --git a/mail/roundcubemail/patches/patch-config_main_inc_php_dist b/mail/roundcubemail/patches/patch-config_main_inc_php_dist
index 39b978cd47c..825e8e72245 100644
--- a/mail/roundcubemail/patches/patch-config_main_inc_php_dist
+++ b/mail/roundcubemail/patches/patch-config_main_inc_php_dist
@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_main_inc_php_dist,v 1.19 2013/01/26 14:36:16 sthen Exp $
---- config/main.inc.php.dist.orig	Fri Jan 25 17:00:48 2013
-+++ config/main.inc.php.dist	Sat Jan 26 14:27:03 2013
-@@ -458,7 +458,7 @@ $rcmail_config['spellcheck_dictionary'] = false;
+$OpenBSD: patch-config_main_inc_php_dist,v 1.20 2013/04/16 13:37:23 sthen Exp $
+--- config/main.inc.php.dist.orig	Wed Mar 27 20:31:58 2013
++++ config/main.inc.php.dist	Thu Apr 11 16:25:49 2013
+@@ -489,7 +489,7 @@ $rcmail_config['spellcheck_dictionary'] = false;
  
  // Set the spell checking engine. 'googie' is the default. 'pspell' is also available,
  // but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here.
diff --git a/mail/roundcubemail/patches/patch-plugins_managesieve_config_inc_php_dist b/mail/roundcubemail/patches/patch-plugins_managesieve_config_inc_php_dist
deleted file mode 100644
index 11354142980..00000000000
--- a/mail/roundcubemail/patches/patch-plugins_managesieve_config_inc_php_dist
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-plugins_managesieve_config_inc_php_dist,v 1.2 2013/01/26 14:36:16 sthen Exp $
---- plugins/managesieve/config.inc.php.dist.orig	Fri Jan 25 17:00:48 2013
-+++ plugins/managesieve/config.inc.php.dist	Sat Jan 26 14:27:03 2013
-@@ -1,7 +1,8 @@
- <?php
- 
- // managesieve server port
--$rcmail_config['managesieve_port'] = 2000;
-+// 4190: IETF standard. 2000: deprecated but in common use.
-+$rcmail_config['managesieve_port'] = 4190;
- 
- // managesieve server address, default is localhost.
- // Replacement variables supported in host name:
diff --git a/mail/roundcubemail/pkg/PLIST b/mail/roundcubemail/pkg/PLIST
index 0fcab3abb19..b4a5c7f0e58 100644
--- a/mail/roundcubemail/pkg/PLIST
+++ b/mail/roundcubemail/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.28 2012/11/12 20:20:12 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.29 2013/04/16 13:37:23 sthen Exp $
+@extraunexec rm -rf %D/roundcubemail/logs/*
 roundcubemail/
 roundcubemail/.htaccess.dist
 @sample roundcubemail/.htaccess
@@ -7,27 +8,77 @@ roundcubemail/INSTALL
 roundcubemail/LICENSE
 roundcubemail/README.md
 roundcubemail/SQL/
+roundcubemail/SQL/mssql/
 roundcubemail/SQL/mssql.initial.sql
-roundcubemail/SQL/mssql.upgrade.sql
+roundcubemail/SQL/mssql/2009103100.sql
+roundcubemail/SQL/mssql/2010100600.sql
+roundcubemail/SQL/mssql/2011011200.sql
+roundcubemail/SQL/mssql/2011092800.sql
+roundcubemail/SQL/mssql/2011111600.sql
+roundcubemail/SQL/mssql/2011121400.sql
+roundcubemail/SQL/mssql/2012051800.sql
+roundcubemail/SQL/mssql/2012080700.sql
+roundcubemail/SQL/mssql/2013011000.sql
+roundcubemail/SQL/mysql/
 roundcubemail/SQL/mysql.initial.sql
-roundcubemail/SQL/mysql.update.sql
+roundcubemail/SQL/mysql/2008030300.sql
+roundcubemail/SQL/mysql/2008040500.sql
+roundcubemail/SQL/mysql/2008060900.sql
+roundcubemail/SQL/mysql/2008092100.sql
+roundcubemail/SQL/mysql/2009090400.sql
+roundcubemail/SQL/mysql/2009103100.sql
+roundcubemail/SQL/mysql/2010042300.sql
+roundcubemail/SQL/mysql/2010100600.sql
+roundcubemail/SQL/mysql/2011011200.sql
+roundcubemail/SQL/mysql/2011092800.sql
+roundcubemail/SQL/mysql/2011111600.sql
+roundcubemail/SQL/mysql/2011121400.sql
+roundcubemail/SQL/mysql/2012080700.sql
+roundcubemail/SQL/mysql/2013011000.sql
+roundcubemail/SQL/postgres/
 roundcubemail/SQL/postgres.initial.sql
-roundcubemail/SQL/postgres.update.sql
+roundcubemail/SQL/postgres/2008030300.sql
+roundcubemail/SQL/postgres/2008060900.sql
+roundcubemail/SQL/postgres/2008092100.sql
+roundcubemail/SQL/postgres/2009090400.sql
+roundcubemail/SQL/postgres/2009103100.sql
+roundcubemail/SQL/postgres/2010042300.sql
+roundcubemail/SQL/postgres/2010100600.sql
+roundcubemail/SQL/postgres/2011011200.sql
+roundcubemail/SQL/postgres/2011092800.sql
+roundcubemail/SQL/postgres/2011111600.sql
+roundcubemail/SQL/postgres/2011121400.sql
+roundcubemail/SQL/postgres/2012080700.sql
+roundcubemail/SQL/postgres/2013011000.sql
+roundcubemail/SQL/sqlite/
 roundcubemail/SQL/sqlite.initial.sql
-roundcubemail/SQL/sqlite.update.sql
+roundcubemail/SQL/sqlite/2008030300.sql
+roundcubemail/SQL/sqlite/2008060900.sql
+roundcubemail/SQL/sqlite/2008092100.sql
+roundcubemail/SQL/sqlite/2009090400.sql
+roundcubemail/SQL/sqlite/2009103100.sql
+roundcubemail/SQL/sqlite/2010042300.sql
+roundcubemail/SQL/sqlite/2010100600.sql
+roundcubemail/SQL/sqlite/2011011200.sql
+roundcubemail/SQL/sqlite/2011092800.sql
+roundcubemail/SQL/sqlite/2011111600.sql
+roundcubemail/SQL/sqlite/2011121400.sql
+roundcubemail/SQL/sqlite/2012080700.sql
+roundcubemail/SQL/sqlite/2013011000.sql
+roundcubemail/SQL/sqlite/2013011700.sql
 roundcubemail/UPGRADING
 roundcubemail/bin/
 roundcubemail/bin/cleandb.sh
 roundcubemail/bin/decrypt.sh
-roundcubemail/bin/exportgettext.sh
-roundcubemail/bin/importgettext.sh
 roundcubemail/bin/indexcontacts.sh
 roundcubemail/bin/installto.sh
 roundcubemail/bin/jsshrink.sh
 roundcubemail/bin/jsunshrink.sh
+roundcubemail/bin/moduserprefs.sh
 roundcubemail/bin/msgexport.sh
 roundcubemail/bin/msgimport.sh
 roundcubemail/bin/update.sh
+roundcubemail/bin/updatedb.sh
 roundcubemail/config/
 roundcubemail/config/.htaccess
 roundcubemail/config/db.inc.php.dist
@@ -52,7 +103,6 @@ roundcubemail/installer/index.php
 roundcubemail/installer/rcube_install.php
 roundcubemail/installer/styles.css
 roundcubemail/installer/test.php
-roundcubemail/installer/utils.php
 @mode 770
 @owner root
 @group www
@@ -68,6 +118,7 @@ roundcubemail/plugins/acl/acl.php
 roundcubemail/plugins/acl/config.inc.php.dist
 @sample roundcubemail/plugins/acl/config.inc.php
 roundcubemail/plugins/acl/localization/
+roundcubemail/plugins/acl/localization/az_AZ.inc
 roundcubemail/plugins/acl/localization/bs_BA.inc
 roundcubemail/plugins/acl/localization/ca_ES.inc
 roundcubemail/plugins/acl/localization/cs_CZ.inc
@@ -83,20 +134,26 @@ roundcubemail/plugins/acl/localization/et_EE.inc
 roundcubemail/plugins/acl/localization/fa_IR.inc
 roundcubemail/plugins/acl/localization/fi_FI.inc
 roundcubemail/plugins/acl/localization/fr_FR.inc
+roundcubemail/plugins/acl/localization/gl_ES.inc
 roundcubemail/plugins/acl/localization/he_IL.inc
 roundcubemail/plugins/acl/localization/hu_HU.inc
 roundcubemail/plugins/acl/localization/hy_AM.inc
+roundcubemail/plugins/acl/localization/id_ID.inc
 roundcubemail/plugins/acl/localization/it_IT.inc
 roundcubemail/plugins/acl/localization/ja_JP.inc
 roundcubemail/plugins/acl/localization/ko_KR.inc
-roundcubemail/plugins/acl/localization/nb_NB.inc
+roundcubemail/plugins/acl/localization/lt_LT.inc
+roundcubemail/plugins/acl/localization/nb_NO.inc
 roundcubemail/plugins/acl/localization/nl_NL.inc
+roundcubemail/plugins/acl/localization/nn_NO.inc
 roundcubemail/plugins/acl/localization/pl_PL.inc
 roundcubemail/plugins/acl/localization/pt_BR.inc
 roundcubemail/plugins/acl/localization/pt_PT.inc
+roundcubemail/plugins/acl/localization/ro_RO.inc
 roundcubemail/plugins/acl/localization/ru_RU.inc
 roundcubemail/plugins/acl/localization/sk_SK.inc
 roundcubemail/plugins/acl/localization/sl_SI.inc
+roundcubemail/plugins/acl/localization/sr_CS.inc
 roundcubemail/plugins/acl/localization/sv_SE.inc
 roundcubemail/plugins/acl/localization/tr_TR.inc
 roundcubemail/plugins/acl/localization/vi_VN.inc
@@ -118,17 +175,24 @@ roundcubemail/plugins/acl/skins/larry/images/enabled.png
 roundcubemail/plugins/acl/skins/larry/images/partial.png
 roundcubemail/plugins/acl/skins/larry/templates/
 roundcubemail/plugins/acl/skins/larry/templates/table.html
+roundcubemail/plugins/acl/tests/
+roundcubemail/plugins/acl/tests/Acl.php
 roundcubemail/plugins/additional_message_headers/
 roundcubemail/plugins/additional_message_headers/additional_message_headers.php
 roundcubemail/plugins/additional_message_headers/config.inc.php.dist
 @sample roundcubemail/plugins/additional_message_headers/config.inc.php
 roundcubemail/plugins/additional_message_headers/package.xml
+roundcubemail/plugins/additional_message_headers/tests/
+roundcubemail/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
 roundcubemail/plugins/archive/
 roundcubemail/plugins/archive/archive.js
 roundcubemail/plugins/archive/archive.php
 roundcubemail/plugins/archive/localization/
 roundcubemail/plugins/archive/localization/ar_SA.inc
+roundcubemail/plugins/archive/localization/az_AZ.inc
 roundcubemail/plugins/archive/localization/be_BE.inc
+roundcubemail/plugins/archive/localization/bg_BG.inc
+roundcubemail/plugins/archive/localization/br.inc
 roundcubemail/plugins/archive/localization/bs_BA.inc
 roundcubemail/plugins/archive/localization/ca_ES.inc
 roundcubemail/plugins/archive/localization/cs_CZ.inc
@@ -154,15 +218,17 @@ roundcubemail/plugins/archive/localization/hy_AM.inc
 roundcubemail/plugins/archive/localization/id_ID.inc
 roundcubemail/plugins/archive/localization/it_IT.inc
 roundcubemail/plugins/archive/localization/ja_JP.inc
+roundcubemail/plugins/archive/localization/km_KH.inc
 roundcubemail/plugins/archive/localization/ko_KR.inc
 roundcubemail/plugins/archive/localization/ku.inc
 roundcubemail/plugins/archive/localization/lt_LT.inc
 roundcubemail/plugins/archive/localization/lv_LV.inc
 roundcubemail/plugins/archive/localization/ml_IN.inc
-roundcubemail/plugins/archive/localization/ml_ML.inc
 roundcubemail/plugins/archive/localization/mr_IN.inc
 roundcubemail/plugins/archive/localization/nb_NB.inc
+roundcubemail/plugins/archive/localization/nb_NO.inc
 roundcubemail/plugins/archive/localization/nl_NL.inc
+roundcubemail/plugins/archive/localization/nn_NO.inc
 roundcubemail/plugins/archive/localization/pl_PL.inc
 roundcubemail/plugins/archive/localization/pt_BR.inc
 roundcubemail/plugins/archive/localization/pt_PT.inc
@@ -187,19 +253,29 @@ roundcubemail/plugins/archive/skins/classic/archive_pas.png
 roundcubemail/plugins/archive/skins/classic/foldericon.png
 roundcubemail/plugins/archive/skins/larry/
 roundcubemail/plugins/archive/skins/larry/.gitignore
+roundcubemail/plugins/archive/tests/
+roundcubemail/plugins/archive/tests/Archive.php
 roundcubemail/plugins/autologon/
 roundcubemail/plugins/autologon/autologon.php
+roundcubemail/plugins/autologon/tests/
+roundcubemail/plugins/autologon/tests/Autologon.php
 roundcubemail/plugins/database_attachments/
 roundcubemail/plugins/database_attachments/database_attachments.php
 roundcubemail/plugins/database_attachments/package.xml
+roundcubemail/plugins/database_attachments/tests/
+roundcubemail/plugins/database_attachments/tests/DatabaseAttachments.php
 roundcubemail/plugins/debug_logger/
 roundcubemail/plugins/debug_logger/debug_logger.php
 roundcubemail/plugins/debug_logger/package.xml
 roundcubemail/plugins/debug_logger/runlog/
 roundcubemail/plugins/debug_logger/runlog/runlog.php
+roundcubemail/plugins/debug_logger/tests/
+roundcubemail/plugins/debug_logger/tests/DebugLogger.php
 roundcubemail/plugins/emoticons/
 roundcubemail/plugins/emoticons/emoticons.php
 roundcubemail/plugins/emoticons/package.xml
+roundcubemail/plugins/emoticons/tests/
+roundcubemail/plugins/emoticons/tests/Emoticons.php
 roundcubemail/plugins/enigma/
 roundcubemail/plugins/enigma/README
 roundcubemail/plugins/enigma/config.inc.php.dist
@@ -245,13 +321,19 @@ roundcubemail/plugins/enigma/skins/classic/templates/
 roundcubemail/plugins/enigma/skins/classic/templates/keyimport.html
 roundcubemail/plugins/enigma/skins/classic/templates/keyinfo.html
 roundcubemail/plugins/enigma/skins/classic/templates/keys.html
+roundcubemail/plugins/enigma/tests/
+roundcubemail/plugins/enigma/tests/Enigma.php
 roundcubemail/plugins/example_addressbook/
 roundcubemail/plugins/example_addressbook/example_addressbook.php
 roundcubemail/plugins/example_addressbook/example_addressbook_backend.php
 roundcubemail/plugins/example_addressbook/package.xml
+roundcubemail/plugins/example_addressbook/tests/
+roundcubemail/plugins/example_addressbook/tests/ExampleAddressbook.php
 roundcubemail/plugins/filesystem_attachments/
 roundcubemail/plugins/filesystem_attachments/filesystem_attachments.php
 roundcubemail/plugins/filesystem_attachments/package.xml
+roundcubemail/plugins/filesystem_attachments/tests/
+roundcubemail/plugins/filesystem_attachments/tests/FilesystemAttachments.php
 roundcubemail/plugins/help/
 roundcubemail/plugins/help/config.inc.php.dist
 @sample roundcubemail/plugins/help/config.inc.php
@@ -260,6 +342,10 @@ roundcubemail/plugins/help/content/about.html
 roundcubemail/plugins/help/content/license.html
 roundcubemail/plugins/help/help.php
 roundcubemail/plugins/help/localization/
+roundcubemail/plugins/help/localization/ar_SA.inc
+roundcubemail/plugins/help/localization/az_AZ.inc
+roundcubemail/plugins/help/localization/ber.inc
+roundcubemail/plugins/help/localization/br.inc
 roundcubemail/plugins/help/localization/bs_BA.inc
 roundcubemail/plugins/help/localization/ca_ES.inc
 roundcubemail/plugins/help/localization/cs_CZ.inc
@@ -279,12 +365,15 @@ roundcubemail/plugins/help/localization/gl_ES.inc
 roundcubemail/plugins/help/localization/he_IL.inc
 roundcubemail/plugins/help/localization/hu_HU.inc
 roundcubemail/plugins/help/localization/hy_AM.inc
+roundcubemail/plugins/help/localization/id_ID.inc
 roundcubemail/plugins/help/localization/it_IT.inc
 roundcubemail/plugins/help/localization/ja_JP.inc
+roundcubemail/plugins/help/localization/km_KH.inc
 roundcubemail/plugins/help/localization/ko_KR.inc
 roundcubemail/plugins/help/localization/lt_LT.inc
-roundcubemail/plugins/help/localization/nb_NB.inc
+roundcubemail/plugins/help/localization/nb_NO.inc
 roundcubemail/plugins/help/localization/nl_NL.inc
+roundcubemail/plugins/help/localization/nn_NO.inc
 roundcubemail/plugins/help/localization/pl_PL.inc
 roundcubemail/plugins/help/localization/pt_BR.inc
 roundcubemail/plugins/help/localization/pt_PT.inc
@@ -310,10 +399,13 @@ roundcubemail/plugins/help/skins/larry/help.png
 roundcubemail/plugins/help/skins/larry/icons.psd
 roundcubemail/plugins/help/skins/larry/templates/
 roundcubemail/plugins/help/skins/larry/templates/help.html
+roundcubemail/plugins/help/tests/
+roundcubemail/plugins/help/tests/Help.php
 roundcubemail/plugins/hide_blockquote/
 roundcubemail/plugins/hide_blockquote/hide_blockquote.js
 roundcubemail/plugins/hide_blockquote/hide_blockquote.php
 roundcubemail/plugins/hide_blockquote/localization/
+roundcubemail/plugins/hide_blockquote/localization/az_AZ.inc
 roundcubemail/plugins/hide_blockquote/localization/bs_BA.inc
 roundcubemail/plugins/hide_blockquote/localization/ca_ES.inc
 roundcubemail/plugins/hide_blockquote/localization/cs_CZ.inc
@@ -333,12 +425,14 @@ roundcubemail/plugins/hide_blockquote/localization/gl_ES.inc
 roundcubemail/plugins/hide_blockquote/localization/he_IL.inc
 roundcubemail/plugins/hide_blockquote/localization/hu_HU.inc
 roundcubemail/plugins/hide_blockquote/localization/hy_AM.inc
+roundcubemail/plugins/hide_blockquote/localization/id_ID.inc
 roundcubemail/plugins/hide_blockquote/localization/it_IT.inc
 roundcubemail/plugins/hide_blockquote/localization/ja_JP.inc
 roundcubemail/plugins/hide_blockquote/localization/ko_KR.inc
 roundcubemail/plugins/hide_blockquote/localization/lt_LT.inc
-roundcubemail/plugins/hide_blockquote/localization/nb_NB.inc
+roundcubemail/plugins/hide_blockquote/localization/nb_NO.inc
 roundcubemail/plugins/hide_blockquote/localization/nl_NL.inc
+roundcubemail/plugins/hide_blockquote/localization/nn_NO.inc
 roundcubemail/plugins/hide_blockquote/localization/pl_PL.inc
 roundcubemail/plugins/hide_blockquote/localization/pt_BR.inc
 roundcubemail/plugins/hide_blockquote/localization/pt_PT.inc
@@ -350,14 +444,20 @@ roundcubemail/plugins/hide_blockquote/localization/sv_SE.inc
 roundcubemail/plugins/hide_blockquote/localization/tr_TR.inc
 roundcubemail/plugins/hide_blockquote/localization/vi_VN.inc
 roundcubemail/plugins/hide_blockquote/localization/zh_CN.inc
+roundcubemail/plugins/hide_blockquote/localization/zh_TW.inc
 roundcubemail/plugins/hide_blockquote/package.xml
 roundcubemail/plugins/hide_blockquote/skins/
 roundcubemail/plugins/hide_blockquote/skins/larry/
 roundcubemail/plugins/hide_blockquote/skins/larry/style.css
+roundcubemail/plugins/hide_blockquote/tests/
+roundcubemail/plugins/hide_blockquote/tests/HideBlockquote.php
 roundcubemail/plugins/http_authentication/
+roundcubemail/plugins/http_authentication/config.inc.php.dist
 roundcubemail/plugins/http_authentication/http_authentication.php
 roundcubemail/plugins/http_authentication/logout.html
 roundcubemail/plugins/http_authentication/package.xml
+roundcubemail/plugins/http_authentication/tests/
+roundcubemail/plugins/http_authentication/tests/HttpAuthentication.php
 roundcubemail/plugins/jqueryui/
 roundcubemail/plugins/jqueryui/README
 roundcubemail/plugins/jqueryui/config.inc.php.dist
@@ -367,17 +467,21 @@ roundcubemail/plugins/jqueryui/js/
 roundcubemail/plugins/jqueryui/js/i18n/
 roundcubemail/plugins/jqueryui/js/i18n/jquery-ui-i18n.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-af.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ar-DZ.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ar.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-az.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-bg.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-bs.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ca.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-cs.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-cy-GB.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-da.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-de-CH.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-de.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-el.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-en-AU.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-en-GB.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-en-NZ.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-eo.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-es.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-et.js
@@ -389,6 +493,7 @@ roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-fr-CH.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-fr.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-gl.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-he.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-hi.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-hr.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-hu.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-hy.js
@@ -396,10 +501,16 @@ roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-id.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-is.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-it.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ja.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ka.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-kk.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-km.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ko.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-kz.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-lb.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-lt.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-lv.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-mk.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ml.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ms.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-nl-BE.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-nl.js
@@ -407,6 +518,7 @@ roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-no.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-pl.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-pt-BR.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-pt.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-rm.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ro.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ru.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-sk.js
@@ -417,14 +529,17 @@ roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-sr.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-sv.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-ta.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-th.js
+roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-tj.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-tr.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-uk.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-vi.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-zh-CN.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-zh-HK.js
 roundcubemail/plugins/jqueryui/js/i18n/jquery.ui.datepicker-zh-TW.js
-roundcubemail/plugins/jqueryui/js/jquery-ui-1.8.18.custom.min.js
+roundcubemail/plugins/jqueryui/js/jquery-ui-1.9.1.custom.min.js
 roundcubemail/plugins/jqueryui/package.xml
+roundcubemail/plugins/jqueryui/tests/
+roundcubemail/plugins/jqueryui/tests/Jqueryui.php
 roundcubemail/plugins/jqueryui/themes/
 roundcubemail/plugins/jqueryui/themes/classic/
 roundcubemail/plugins/jqueryui/themes/classic/images/
@@ -442,7 +557,7 @@ roundcubemail/plugins/jqueryui/themes/classic/images/ui-icons_333333_256x240.png
 roundcubemail/plugins/jqueryui/themes/classic/images/ui-icons_666666_256x240.png
 roundcubemail/plugins/jqueryui/themes/classic/images/ui-icons_cc3333_256x240.png
 roundcubemail/plugins/jqueryui/themes/classic/images/ui-icons_dddddd_256x240.png
-roundcubemail/plugins/jqueryui/themes/classic/jquery-ui-1.8.18.custom.css
+roundcubemail/plugins/jqueryui/themes/classic/jquery-ui-1.9.1.custom.css
 roundcubemail/plugins/jqueryui/themes/classic/roundcube-custom.diff
 roundcubemail/plugins/jqueryui/themes/larry/
 roundcubemail/plugins/jqueryui/themes/larry/images/
@@ -456,8 +571,7 @@ roundcubemail/plugins/jqueryui/themes/larry/images/ui-dialog-close.png
 roundcubemail/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png
 roundcubemail/plugins/jqueryui/themes/larry/images/ui-icons_004458_256x240.png
 roundcubemail/plugins/jqueryui/themes/larry/images/ui-icons_d7211e_256x240.png
-roundcubemail/plugins/jqueryui/themes/larry/images/ui-icons_ffffff_256x240.png
-roundcubemail/plugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css
+roundcubemail/plugins/jqueryui/themes/larry/jquery-ui-1.9.1.custom.css
 roundcubemail/plugins/jqueryui/themes/redmond/
 roundcubemail/plugins/jqueryui/themes/redmond/images/
 roundcubemail/plugins/jqueryui/themes/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
@@ -475,7 +589,7 @@ roundcubemail/plugins/jqueryui/themes/redmond/images/ui-icons_6da8d5_256x240.png
 roundcubemail/plugins/jqueryui/themes/redmond/images/ui-icons_cd0a0a_256x240.png
 roundcubemail/plugins/jqueryui/themes/redmond/images/ui-icons_d8e7f3_256x240.png
 roundcubemail/plugins/jqueryui/themes/redmond/images/ui-icons_f9bd01_256x240.png
-roundcubemail/plugins/jqueryui/themes/redmond/jquery-ui-1.8.18.custom.css
+roundcubemail/plugins/jqueryui/themes/redmond/jquery-ui-1.9.1.custom.css
 roundcubemail/plugins/managesieve/
 roundcubemail/plugins/managesieve/Changelog
 roundcubemail/plugins/managesieve/config.inc.php.dist
@@ -483,9 +597,11 @@ roundcubemail/plugins/managesieve/config.inc.php.dist
 roundcubemail/plugins/managesieve/lib/
 roundcubemail/plugins/managesieve/lib/Net/
 roundcubemail/plugins/managesieve/lib/Net/Sieve.php
-roundcubemail/plugins/managesieve/lib/rcube_sieve.php
-roundcubemail/plugins/managesieve/lib/rcube_sieve_script.php
+roundcubemail/plugins/managesieve/lib/Roundcube/
+roundcubemail/plugins/managesieve/lib/Roundcube/rcube_sieve.php
+roundcubemail/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
 roundcubemail/plugins/managesieve/localization/
+roundcubemail/plugins/managesieve/localization/az_AZ.inc
 roundcubemail/plugins/managesieve/localization/be_BE.inc
 roundcubemail/plugins/managesieve/localization/bg_BG.inc
 roundcubemail/plugins/managesieve/localization/bs_BA.inc
@@ -511,7 +627,6 @@ roundcubemail/plugins/managesieve/localization/hr_HR.inc
 roundcubemail/plugins/managesieve/localization/hu_HU.inc
 roundcubemail/plugins/managesieve/localization/hy_AM.inc
 roundcubemail/plugins/managesieve/localization/ia.inc
-roundcubemail/plugins/managesieve/localization/ia_IA.inc
 roundcubemail/plugins/managesieve/localization/id_ID.inc
 roundcubemail/plugins/managesieve/localization/it_IT.inc
 roundcubemail/plugins/managesieve/localization/ja_JP.inc
@@ -519,10 +634,10 @@ roundcubemail/plugins/managesieve/localization/ko_KR.inc
 roundcubemail/plugins/managesieve/localization/lt_LT.inc
 roundcubemail/plugins/managesieve/localization/lv_LV.inc
 roundcubemail/plugins/managesieve/localization/ml_IN.inc
-roundcubemail/plugins/managesieve/localization/ml_ML.inc
 roundcubemail/plugins/managesieve/localization/mr_IN.inc
 roundcubemail/plugins/managesieve/localization/nb_NO.inc
 roundcubemail/plugins/managesieve/localization/nl_NL.inc
+roundcubemail/plugins/managesieve/localization/nn_NO.inc
 roundcubemail/plugins/managesieve/localization/pl_PL.inc
 roundcubemail/plugins/managesieve/localization/pt_BR.inc
 roundcubemail/plugins/managesieve/localization/pt_PT.inc
@@ -567,21 +682,32 @@ roundcubemail/plugins/managesieve/skins/larry/templates/filteredit.html
 roundcubemail/plugins/managesieve/skins/larry/templates/managesieve.html
 roundcubemail/plugins/managesieve/skins/larry/templates/setedit.html
 roundcubemail/plugins/managesieve/tests/
-roundcubemail/plugins/managesieve/tests/Makefile
-roundcubemail/plugins/managesieve/tests/parser.phpt
-roundcubemail/plugins/managesieve/tests/parser_body.phpt
-roundcubemail/plugins/managesieve/tests/parser_imapflags.phpt
-roundcubemail/plugins/managesieve/tests/parser_include.phpt
-roundcubemail/plugins/managesieve/tests/parser_kep14.phpt
-roundcubemail/plugins/managesieve/tests/parser_prefix.phpt
-roundcubemail/plugins/managesieve/tests/parser_relational.phpt
-roundcubemail/plugins/managesieve/tests/parser_vacation.phpt
-roundcubemail/plugins/managesieve/tests/parser_variables.phpt
-roundcubemail/plugins/managesieve/tests/parset_subaddress.phpt
-roundcubemail/plugins/managesieve/tests/tokenize.phpt
+roundcubemail/plugins/managesieve/tests/Managesieve.php
+roundcubemail/plugins/managesieve/tests/Parser.php
+roundcubemail/plugins/managesieve/tests/Tokenizer.php
+roundcubemail/plugins/managesieve/tests/src/
+roundcubemail/plugins/managesieve/tests/src/parser
+roundcubemail/plugins/managesieve/tests/src/parser.out
+roundcubemail/plugins/managesieve/tests/src/parser_body
+roundcubemail/plugins/managesieve/tests/src/parser_enotify_a
+roundcubemail/plugins/managesieve/tests/src/parser_enotify_b
+roundcubemail/plugins/managesieve/tests/src/parser_imapflags
+roundcubemail/plugins/managesieve/tests/src/parser_include
+roundcubemail/plugins/managesieve/tests/src/parser_kep14
+roundcubemail/plugins/managesieve/tests/src/parser_kep14.out
+roundcubemail/plugins/managesieve/tests/src/parser_notify_a
+roundcubemail/plugins/managesieve/tests/src/parser_notify_b
+roundcubemail/plugins/managesieve/tests/src/parser_prefix
+roundcubemail/plugins/managesieve/tests/src/parser_relational
+roundcubemail/plugins/managesieve/tests/src/parser_subaddress
+roundcubemail/plugins/managesieve/tests/src/parser_vacation
+roundcubemail/plugins/managesieve/tests/src/parser_variables
 roundcubemail/plugins/markasjunk/
 roundcubemail/plugins/markasjunk/localization/
+roundcubemail/plugins/markasjunk/localization/az_AZ.inc
 roundcubemail/plugins/markasjunk/localization/be_BE.inc
+roundcubemail/plugins/markasjunk/localization/ber.inc
+roundcubemail/plugins/markasjunk/localization/br.inc
 roundcubemail/plugins/markasjunk/localization/bs_BA.inc
 roundcubemail/plugins/markasjunk/localization/ca_ES.inc
 roundcubemail/plugins/markasjunk/localization/cs_CZ.inc
@@ -607,15 +733,16 @@ roundcubemail/plugins/markasjunk/localization/hy_AM.inc
 roundcubemail/plugins/markasjunk/localization/id_ID.inc
 roundcubemail/plugins/markasjunk/localization/it_IT.inc
 roundcubemail/plugins/markasjunk/localization/ja_JP.inc
+roundcubemail/plugins/markasjunk/localization/km_KH.inc
 roundcubemail/plugins/markasjunk/localization/ko_KR.inc
 roundcubemail/plugins/markasjunk/localization/ku.inc
 roundcubemail/plugins/markasjunk/localization/lt_LT.inc
 roundcubemail/plugins/markasjunk/localization/lv_LV.inc
 roundcubemail/plugins/markasjunk/localization/ml_IN.inc
-roundcubemail/plugins/markasjunk/localization/ml_ML.inc
 roundcubemail/plugins/markasjunk/localization/mr_IN.inc
-roundcubemail/plugins/markasjunk/localization/nb_NB.inc
+roundcubemail/plugins/markasjunk/localization/nb_NO.inc
 roundcubemail/plugins/markasjunk/localization/nl_NL.inc
+roundcubemail/plugins/markasjunk/localization/nn_NO.inc
 roundcubemail/plugins/markasjunk/localization/pl_PL.inc
 roundcubemail/plugins/markasjunk/localization/pt_BR.inc
 roundcubemail/plugins/markasjunk/localization/pt_PT.inc
@@ -641,8 +768,11 @@ roundcubemail/plugins/markasjunk/skins/classic/junk_pas.png
 roundcubemail/plugins/markasjunk/skins/classic/markasjunk.css
 roundcubemail/plugins/markasjunk/skins/larry/
 roundcubemail/plugins/markasjunk/skins/larry/.gitignore
+roundcubemail/plugins/markasjunk/tests/
+roundcubemail/plugins/markasjunk/tests/Markasjunk.php
 roundcubemail/plugins/new_user_dialog/
 roundcubemail/plugins/new_user_dialog/localization/
+roundcubemail/plugins/new_user_dialog/localization/az_AZ.inc
 roundcubemail/plugins/new_user_dialog/localization/be_BE.inc
 roundcubemail/plugins/new_user_dialog/localization/bg_BG.inc
 roundcubemail/plugins/new_user_dialog/localization/bs_BA.inc
@@ -669,15 +799,16 @@ roundcubemail/plugins/new_user_dialog/localization/hy_AM.inc
 roundcubemail/plugins/new_user_dialog/localization/id_ID.inc
 roundcubemail/plugins/new_user_dialog/localization/it_IT.inc
 roundcubemail/plugins/new_user_dialog/localization/ja_JP.inc
+roundcubemail/plugins/new_user_dialog/localization/km_KH.inc
 roundcubemail/plugins/new_user_dialog/localization/ko_KR.inc
 roundcubemail/plugins/new_user_dialog/localization/ku.inc
 roundcubemail/plugins/new_user_dialog/localization/lt_LT.inc
 roundcubemail/plugins/new_user_dialog/localization/lv_LV.inc
 roundcubemail/plugins/new_user_dialog/localization/ml_IN.inc
-roundcubemail/plugins/new_user_dialog/localization/ml_ML.inc
 roundcubemail/plugins/new_user_dialog/localization/mr_IN.inc
-roundcubemail/plugins/new_user_dialog/localization/nb_NB.inc
+roundcubemail/plugins/new_user_dialog/localization/nb_NO.inc
 roundcubemail/plugins/new_user_dialog/localization/nl_NL.inc
+roundcubemail/plugins/new_user_dialog/localization/nn_NO.inc
 roundcubemail/plugins/new_user_dialog/localization/pl_PL.inc
 roundcubemail/plugins/new_user_dialog/localization/pt_BR.inc
 roundcubemail/plugins/new_user_dialog/localization/pt_PT.inc
@@ -695,15 +826,22 @@ roundcubemail/plugins/new_user_dialog/localization/zh_TW.inc
 roundcubemail/plugins/new_user_dialog/new_user_dialog.php
 roundcubemail/plugins/new_user_dialog/newuserdialog.css
 roundcubemail/plugins/new_user_dialog/package.xml
+roundcubemail/plugins/new_user_dialog/tests/
+roundcubemail/plugins/new_user_dialog/tests/NewUserDialog.php
 roundcubemail/plugins/new_user_identity/
 roundcubemail/plugins/new_user_identity/new_user_identity.php
 roundcubemail/plugins/new_user_identity/package.xml
+roundcubemail/plugins/new_user_identity/tests/
+roundcubemail/plugins/new_user_identity/tests/NewUserIdentity.php
 roundcubemail/plugins/newmail_notifier/
 roundcubemail/plugins/newmail_notifier/config.inc.php.dist
 @sample roundcubemail/plugins/newmail_notifier/config.inc.php
 roundcubemail/plugins/newmail_notifier/favicon.ico
 roundcubemail/plugins/newmail_notifier/localization/
+roundcubemail/plugins/newmail_notifier/localization/ar_SA.inc
+roundcubemail/plugins/newmail_notifier/localization/az_AZ.inc
 roundcubemail/plugins/newmail_notifier/localization/be_BE.inc
+roundcubemail/plugins/newmail_notifier/localization/br.inc
 roundcubemail/plugins/newmail_notifier/localization/bs_BA.inc
 roundcubemail/plugins/newmail_notifier/localization/ca_ES.inc
 roundcubemail/plugins/newmail_notifier/localization/cs_CZ.inc
@@ -725,18 +863,18 @@ roundcubemail/plugins/newmail_notifier/localization/hr_HR.inc
 roundcubemail/plugins/newmail_notifier/localization/hu_HU.inc
 roundcubemail/plugins/newmail_notifier/localization/hy_AM.inc
 roundcubemail/plugins/newmail_notifier/localization/ia.inc
-roundcubemail/plugins/newmail_notifier/localization/ia_IA.inc
 roundcubemail/plugins/newmail_notifier/localization/id_ID.inc
 roundcubemail/plugins/newmail_notifier/localization/it_IT.inc
 roundcubemail/plugins/newmail_notifier/localization/ja_JP.inc
+roundcubemail/plugins/newmail_notifier/localization/km_KH.inc
 roundcubemail/plugins/newmail_notifier/localization/ko_KR.inc
 roundcubemail/plugins/newmail_notifier/localization/lt_LT.inc
 roundcubemail/plugins/newmail_notifier/localization/lv_LV.inc
 roundcubemail/plugins/newmail_notifier/localization/ml_IN.inc
-roundcubemail/plugins/newmail_notifier/localization/ml_ML.inc
 roundcubemail/plugins/newmail_notifier/localization/mr_IN.inc
-roundcubemail/plugins/newmail_notifier/localization/nb_NB.inc
+roundcubemail/plugins/newmail_notifier/localization/nb_NO.inc
 roundcubemail/plugins/newmail_notifier/localization/nl_NL.inc
+roundcubemail/plugins/newmail_notifier/localization/nn_NO.inc
 roundcubemail/plugins/newmail_notifier/localization/pl_PL.inc
 roundcubemail/plugins/newmail_notifier/localization/pt_BR.inc
 roundcubemail/plugins/newmail_notifier/localization/pt_PT.inc
@@ -757,6 +895,8 @@ roundcubemail/plugins/newmail_notifier/newmail_notifier.js
 roundcubemail/plugins/newmail_notifier/newmail_notifier.php
 roundcubemail/plugins/newmail_notifier/package.xml
 roundcubemail/plugins/newmail_notifier/sound.wav
+roundcubemail/plugins/newmail_notifier/tests/
+roundcubemail/plugins/newmail_notifier/tests/NewmailNotifier.php
 roundcubemail/plugins/password/
 roundcubemail/plugins/password/README
 roundcubemail/plugins/password/config.inc.php.dist
@@ -789,7 +929,9 @@ roundcubemail/plugins/password/helpers/chpass-wrapper.py
 roundcubemail/plugins/password/helpers/passwd-expect
 roundcubemail/plugins/password/localization/
 roundcubemail/plugins/password/localization/az_AZ.inc
+roundcubemail/plugins/password/localization/ber.inc
 roundcubemail/plugins/password/localization/bg_BG.inc
+roundcubemail/plugins/password/localization/br.inc
 roundcubemail/plugins/password/localization/bs_BA.inc
 roundcubemail/plugins/password/localization/ca_ES.inc
 roundcubemail/plugins/password/localization/cs_CZ.inc
@@ -811,16 +953,20 @@ roundcubemail/plugins/password/localization/he_IL.inc
 roundcubemail/plugins/password/localization/hr_HR.inc
 roundcubemail/plugins/password/localization/hu_HU.inc
 roundcubemail/plugins/password/localization/hy_AM.inc
+roundcubemail/plugins/password/localization/id_ID.inc
 roundcubemail/plugins/password/localization/it_IT.inc
 roundcubemail/plugins/password/localization/ja_JP.inc
 roundcubemail/plugins/password/localization/ko_KR.inc
+roundcubemail/plugins/password/localization/ku.inc
 roundcubemail/plugins/password/localization/lt_LT.inc
 roundcubemail/plugins/password/localization/lv_LV.inc
-roundcubemail/plugins/password/localization/nb_NB.inc
+roundcubemail/plugins/password/localization/nb_NO.inc
 roundcubemail/plugins/password/localization/nl_NL.inc
+roundcubemail/plugins/password/localization/nn_NO.inc
 roundcubemail/plugins/password/localization/pl_PL.inc
 roundcubemail/plugins/password/localization/pt_BR.inc
 roundcubemail/plugins/password/localization/pt_PT.inc
+roundcubemail/plugins/password/localization/ro_RO.inc
 roundcubemail/plugins/password/localization/ru_RU.inc
 roundcubemail/plugins/password/localization/sk_SK.inc
 roundcubemail/plugins/password/localization/sl_SI.inc
@@ -833,18 +979,26 @@ roundcubemail/plugins/password/localization/zh_TW.inc
 roundcubemail/plugins/password/package.xml
 roundcubemail/plugins/password/password.js
 roundcubemail/plugins/password/password.php
+roundcubemail/plugins/password/tests/
+roundcubemail/plugins/password/tests/Password.php
 roundcubemail/plugins/redundant_attachments/
 roundcubemail/plugins/redundant_attachments/config.inc.php.dist
 @sample roundcubemail/plugins/redundant_attachments/config.inc.php
 roundcubemail/plugins/redundant_attachments/package.xml
 roundcubemail/plugins/redundant_attachments/redundant_attachments.php
+roundcubemail/plugins/redundant_attachments/tests/
+roundcubemail/plugins/redundant_attachments/tests/RedundantAttachments.php
 roundcubemail/plugins/show_additional_headers/
 roundcubemail/plugins/show_additional_headers/package.xml
 roundcubemail/plugins/show_additional_headers/show_additional_headers.php
+roundcubemail/plugins/show_additional_headers/tests/
+roundcubemail/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php
 roundcubemail/plugins/squirrelmail_usercopy/
 roundcubemail/plugins/squirrelmail_usercopy/config.inc.php.dist
 @sample roundcubemail/plugins/squirrelmail_usercopy/config.inc.php
 roundcubemail/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+roundcubemail/plugins/squirrelmail_usercopy/tests/
+roundcubemail/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php
 roundcubemail/plugins/subscriptions_option/
 roundcubemail/plugins/subscriptions_option/localization/
 roundcubemail/plugins/subscriptions_option/localization/bs_BA.inc
@@ -856,6 +1010,7 @@ roundcubemail/plugins/subscriptions_option/localization/de_CH.inc
 roundcubemail/plugins/subscriptions_option/localization/de_DE.inc
 roundcubemail/plugins/subscriptions_option/localization/en_GB.inc
 roundcubemail/plugins/subscriptions_option/localization/en_US.inc
+roundcubemail/plugins/subscriptions_option/localization/eo.inc
 roundcubemail/plugins/subscriptions_option/localization/es_ES.inc
 roundcubemail/plugins/subscriptions_option/localization/et_EE.inc
 roundcubemail/plugins/subscriptions_option/localization/fa_IR.inc
@@ -865,9 +1020,11 @@ roundcubemail/plugins/subscriptions_option/localization/gl_ES.inc
 roundcubemail/plugins/subscriptions_option/localization/he_IL.inc
 roundcubemail/plugins/subscriptions_option/localization/hu_HU.inc
 roundcubemail/plugins/subscriptions_option/localization/hy_AM.inc
+roundcubemail/plugins/subscriptions_option/localization/it_IT.inc
 roundcubemail/plugins/subscriptions_option/localization/ja_JP.inc
 roundcubemail/plugins/subscriptions_option/localization/ko_KR.inc
 roundcubemail/plugins/subscriptions_option/localization/lt_LT.inc
+roundcubemail/plugins/subscriptions_option/localization/nb_NO.inc
 roundcubemail/plugins/subscriptions_option/localization/nl_NL.inc
 roundcubemail/plugins/subscriptions_option/localization/pl_PL.inc
 roundcubemail/plugins/subscriptions_option/localization/pt_BR.inc
@@ -878,13 +1035,20 @@ roundcubemail/plugins/subscriptions_option/localization/sl_SI.inc
 roundcubemail/plugins/subscriptions_option/localization/sr_CS.inc
 roundcubemail/plugins/subscriptions_option/localization/sv_SE.inc
 roundcubemail/plugins/subscriptions_option/localization/tr_TR.inc
+roundcubemail/plugins/subscriptions_option/localization/vi_VN.inc
+roundcubemail/plugins/subscriptions_option/localization/zh_CN.inc
 roundcubemail/plugins/subscriptions_option/localization/zh_TW.inc
 roundcubemail/plugins/subscriptions_option/package.xml
 roundcubemail/plugins/subscriptions_option/subscriptions_option.php
+roundcubemail/plugins/subscriptions_option/tests/
+roundcubemail/plugins/subscriptions_option/tests/SubscriptionsOption.php
 roundcubemail/plugins/userinfo/
 roundcubemail/plugins/userinfo/localization/
 roundcubemail/plugins/userinfo/localization/ar_SA.inc
+roundcubemail/plugins/userinfo/localization/az_AZ.inc
 roundcubemail/plugins/userinfo/localization/be_BE.inc
+roundcubemail/plugins/userinfo/localization/ber.inc
+roundcubemail/plugins/userinfo/localization/br.inc
 roundcubemail/plugins/userinfo/localization/bs_BA.inc
 roundcubemail/plugins/userinfo/localization/ca_ES.inc
 roundcubemail/plugins/userinfo/localization/cs_CZ.inc
@@ -906,19 +1070,19 @@ roundcubemail/plugins/userinfo/localization/hr_HR.inc
 roundcubemail/plugins/userinfo/localization/hu_HU.inc
 roundcubemail/plugins/userinfo/localization/hy_AM.inc
 roundcubemail/plugins/userinfo/localization/ia.inc
-roundcubemail/plugins/userinfo/localization/ia_IA.inc
 roundcubemail/plugins/userinfo/localization/id_ID.inc
 roundcubemail/plugins/userinfo/localization/it_IT.inc
 roundcubemail/plugins/userinfo/localization/ja_JP.inc
+roundcubemail/plugins/userinfo/localization/km_KH.inc
 roundcubemail/plugins/userinfo/localization/ko_KR.inc
 roundcubemail/plugins/userinfo/localization/ku.inc
 roundcubemail/plugins/userinfo/localization/lt_LT.inc
 roundcubemail/plugins/userinfo/localization/lv_LV.inc
 roundcubemail/plugins/userinfo/localization/ml_IN.inc
-roundcubemail/plugins/userinfo/localization/ml_ML.inc
 roundcubemail/plugins/userinfo/localization/mr_IN.inc
-roundcubemail/plugins/userinfo/localization/nb_NB.inc
+roundcubemail/plugins/userinfo/localization/nb_NO.inc
 roundcubemail/plugins/userinfo/localization/nl_NL.inc
+roundcubemail/plugins/userinfo/localization/nn_NO.inc
 roundcubemail/plugins/userinfo/localization/pl_PL.inc
 roundcubemail/plugins/userinfo/localization/pt_BR.inc
 roundcubemail/plugins/userinfo/localization/pt_PT.inc
@@ -934,10 +1098,13 @@ roundcubemail/plugins/userinfo/localization/vi_VN.inc
 roundcubemail/plugins/userinfo/localization/zh_CN.inc
 roundcubemail/plugins/userinfo/localization/zh_TW.inc
 roundcubemail/plugins/userinfo/package.xml
+roundcubemail/plugins/userinfo/tests/
+roundcubemail/plugins/userinfo/tests/Userinfo.php
 roundcubemail/plugins/userinfo/userinfo.js
 roundcubemail/plugins/userinfo/userinfo.php
 roundcubemail/plugins/vcard_attachments/
 roundcubemail/plugins/vcard_attachments/localization/
+roundcubemail/plugins/vcard_attachments/localization/az_AZ.inc
 roundcubemail/plugins/vcard_attachments/localization/be_BE.inc
 roundcubemail/plugins/vcard_attachments/localization/bs_BA.inc
 roundcubemail/plugins/vcard_attachments/localization/ca_ES.inc
@@ -962,14 +1129,15 @@ roundcubemail/plugins/vcard_attachments/localization/hy_AM.inc
 roundcubemail/plugins/vcard_attachments/localization/id_ID.inc
 roundcubemail/plugins/vcard_attachments/localization/it_IT.inc
 roundcubemail/plugins/vcard_attachments/localization/ja_JP.inc
+roundcubemail/plugins/vcard_attachments/localization/km_KH.inc
 roundcubemail/plugins/vcard_attachments/localization/ko_KR.inc
 roundcubemail/plugins/vcard_attachments/localization/lt_LT.inc
 roundcubemail/plugins/vcard_attachments/localization/lv_LV.inc
 roundcubemail/plugins/vcard_attachments/localization/ml_IN.inc
-roundcubemail/plugins/vcard_attachments/localization/ml_ML.inc
 roundcubemail/plugins/vcard_attachments/localization/mr_IN.inc
-roundcubemail/plugins/vcard_attachments/localization/nb_NB.inc
+roundcubemail/plugins/vcard_attachments/localization/nb_NO.inc
 roundcubemail/plugins/vcard_attachments/localization/nl_NL.inc
+roundcubemail/plugins/vcard_attachments/localization/nn_NO.inc
 roundcubemail/plugins/vcard_attachments/localization/pl_PL.inc
 roundcubemail/plugins/vcard_attachments/localization/pt_BR.inc
 roundcubemail/plugins/vcard_attachments/localization/pt_PT.inc
@@ -995,62 +1163,92 @@ roundcubemail/plugins/vcard_attachments/skins/larry/
 roundcubemail/plugins/vcard_attachments/skins/larry/style.css
 roundcubemail/plugins/vcard_attachments/skins/larry/vcard.png
 roundcubemail/plugins/vcard_attachments/skins/larry/vcard_add_contact.png
+roundcubemail/plugins/vcard_attachments/tests/
+roundcubemail/plugins/vcard_attachments/tests/VcardAttachments.php
 roundcubemail/plugins/vcard_attachments/vcard_attachments.php
 roundcubemail/plugins/vcard_attachments/vcardattach.js
 roundcubemail/plugins/virtuser_file/
 roundcubemail/plugins/virtuser_file/package.xml
+roundcubemail/plugins/virtuser_file/tests/
+roundcubemail/plugins/virtuser_file/tests/VirtuserFile.php
 roundcubemail/plugins/virtuser_file/virtuser_file.php
 roundcubemail/plugins/virtuser_query/
 roundcubemail/plugins/virtuser_query/package.xml
+roundcubemail/plugins/virtuser_query/tests/
+roundcubemail/plugins/virtuser_query/tests/VirtuserQuery.php
 roundcubemail/plugins/virtuser_query/virtuser_query.php
+roundcubemail/plugins/zipdownload/
+roundcubemail/plugins/zipdownload/CHANGELOG
+roundcubemail/plugins/zipdownload/README
+roundcubemail/plugins/zipdownload/config.inc.php.dist
+roundcubemail/plugins/zipdownload/localization/
+roundcubemail/plugins/zipdownload/localization/az_AZ.inc
+roundcubemail/plugins/zipdownload/localization/br.inc
+roundcubemail/plugins/zipdownload/localization/bs_BA.inc
+roundcubemail/plugins/zipdownload/localization/ca_ES.inc
+roundcubemail/plugins/zipdownload/localization/cs_CZ.inc
+roundcubemail/plugins/zipdownload/localization/cy_GB.inc
+roundcubemail/plugins/zipdownload/localization/da_DK.inc
+roundcubemail/plugins/zipdownload/localization/de_CH.inc
+roundcubemail/plugins/zipdownload/localization/de_DE.inc
+roundcubemail/plugins/zipdownload/localization/en_GB.inc
+roundcubemail/plugins/zipdownload/localization/en_US.inc
+roundcubemail/plugins/zipdownload/localization/es_AR.inc
+roundcubemail/plugins/zipdownload/localization/es_ES.inc
+roundcubemail/plugins/zipdownload/localization/et_EE.inc
+roundcubemail/plugins/zipdownload/localization/fa_IR.inc
+roundcubemail/plugins/zipdownload/localization/fr_FR.inc
+roundcubemail/plugins/zipdownload/localization/gl_ES.inc
+roundcubemail/plugins/zipdownload/localization/he_IL.inc
+roundcubemail/plugins/zipdownload/localization/hu_HU.inc
+roundcubemail/plugins/zipdownload/localization/it_IT.inc
+roundcubemail/plugins/zipdownload/localization/ja_JP.inc
+roundcubemail/plugins/zipdownload/localization/km_KH.inc
+roundcubemail/plugins/zipdownload/localization/lt_LT.inc
+roundcubemail/plugins/zipdownload/localization/nb_NO.inc
+roundcubemail/plugins/zipdownload/localization/nl_NL.inc
+roundcubemail/plugins/zipdownload/localization/nn_NO.inc
+roundcubemail/plugins/zipdownload/localization/pl_PL.inc
+roundcubemail/plugins/zipdownload/localization/pt_BR.inc
+roundcubemail/plugins/zipdownload/localization/pt_PT.inc
+roundcubemail/plugins/zipdownload/localization/ro_RO.inc
+roundcubemail/plugins/zipdownload/localization/ru_RU.inc
+roundcubemail/plugins/zipdownload/localization/sk_SK.inc
+roundcubemail/plugins/zipdownload/localization/sr_CS.inc
+roundcubemail/plugins/zipdownload/localization/sv_SE.inc
+roundcubemail/plugins/zipdownload/localization/tr_TR.inc
+roundcubemail/plugins/zipdownload/localization/vi_VN.inc
+roundcubemail/plugins/zipdownload/localization/zh_TW.inc
+roundcubemail/plugins/zipdownload/package.xml
+roundcubemail/plugins/zipdownload/skins/
+roundcubemail/plugins/zipdownload/skins/classic/
+roundcubemail/plugins/zipdownload/skins/classic/zip.png
+roundcubemail/plugins/zipdownload/skins/classic/zipdownload.css
+roundcubemail/plugins/zipdownload/skins/larry/
+roundcubemail/plugins/zipdownload/skins/larry/zipdownload.css
+roundcubemail/plugins/zipdownload/tests/
+roundcubemail/plugins/zipdownload/tests/Zipdownload.php
+roundcubemail/plugins/zipdownload/zipdownload.js
+roundcubemail/plugins/zipdownload/zipdownload.php
 roundcubemail/program/
 roundcubemail/program/.htaccess
-roundcubemail/program/blank.gif
-roundcubemail/program/blocked.gif
 roundcubemail/program/include/
+roundcubemail/program/include/bc.php
 roundcubemail/program/include/clisetup.php
-roundcubemail/program/include/html.php
 roundcubemail/program/include/iniset.php
-roundcubemail/program/include/main.inc
 roundcubemail/program/include/rcmail.php
-roundcubemail/program/include/rcube_addressbook.php
-roundcubemail/program/include/rcube_browser.php
-roundcubemail/program/include/rcube_cache.php
-roundcubemail/program/include/rcube_charset.php
-roundcubemail/program/include/rcube_config.php
-roundcubemail/program/include/rcube_contacts.php
-roundcubemail/program/include/rcube_content_filter.php
-roundcubemail/program/include/rcube_html_page.php
-roundcubemail/program/include/rcube_image.php
-roundcubemail/program/include/rcube_imap.php
-roundcubemail/program/include/rcube_imap_cache.php
-roundcubemail/program/include/rcube_imap_generic.php
-roundcubemail/program/include/rcube_json_output.php
-roundcubemail/program/include/rcube_ldap.php
-roundcubemail/program/include/rcube_mdb2.php
-roundcubemail/program/include/rcube_message.php
-roundcubemail/program/include/rcube_mime.php
-roundcubemail/program/include/rcube_plugin.php
-roundcubemail/program/include/rcube_plugin_api.php
-roundcubemail/program/include/rcube_result_index.php
-roundcubemail/program/include/rcube_result_set.php
-roundcubemail/program/include/rcube_result_thread.php
-roundcubemail/program/include/rcube_session.php
-roundcubemail/program/include/rcube_shared.inc
-roundcubemail/program/include/rcube_smtp.php
-roundcubemail/program/include/rcube_spellchecker.php
-roundcubemail/program/include/rcube_sqlite.inc
-roundcubemail/program/include/rcube_storage.php
-roundcubemail/program/include/rcube_string_replacer.php
-roundcubemail/program/include/rcube_template.php
-roundcubemail/program/include/rcube_user.php
-roundcubemail/program/include/rcube_vcard.php
+roundcubemail/program/include/rcmail_html_page.php
+roundcubemail/program/include/rcmail_output.php
+roundcubemail/program/include/rcmail_output_html.php
+roundcubemail/program/include/rcmail_output_json.php
+roundcubemail/program/include/rcmail_string_replacer.php
 roundcubemail/program/js/
 roundcubemail/program/js/app.js
 roundcubemail/program/js/common.js
 roundcubemail/program/js/editor.js
 roundcubemail/program/js/googiespell.js
 roundcubemail/program/js/jquery.min.js
+roundcubemail/program/js/jstz.min.js
 roundcubemail/program/js/list.js
 roundcubemail/program/js/tiny_mce/
 roundcubemail/program/js/tiny_mce/langs/
@@ -2325,59 +2523,6 @@ roundcubemail/program/lib/Auth/SASL/External.php
 roundcubemail/program/lib/Auth/SASL/Login.php
 roundcubemail/program/lib/Auth/SASL/Plain.php
 roundcubemail/program/lib/Auth/SASL/SCRAM.php
-roundcubemail/program/lib/MDB2/
-roundcubemail/program/lib/MDB2.php
-roundcubemail/program/lib/MDB2/Date.php
-roundcubemail/program/lib/MDB2/Driver/
-roundcubemail/program/lib/MDB2/Driver/Datatype/
-roundcubemail/program/lib/MDB2/Driver/Datatype/Common.php
-roundcubemail/program/lib/MDB2/Driver/Datatype/mssql.php
-roundcubemail/program/lib/MDB2/Driver/Datatype/mysql.php
-roundcubemail/program/lib/MDB2/Driver/Datatype/mysqli.php
-roundcubemail/program/lib/MDB2/Driver/Datatype/pgsql.php
-roundcubemail/program/lib/MDB2/Driver/Datatype/sqlite.php
-roundcubemail/program/lib/MDB2/Driver/Datatype/sqlsrv.php
-roundcubemail/program/lib/MDB2/Driver/Function/
-roundcubemail/program/lib/MDB2/Driver/Function/Common.php
-roundcubemail/program/lib/MDB2/Driver/Function/mssql.php
-roundcubemail/program/lib/MDB2/Driver/Function/mysql.php
-roundcubemail/program/lib/MDB2/Driver/Function/mysqli.php
-roundcubemail/program/lib/MDB2/Driver/Function/pgsql.php
-roundcubemail/program/lib/MDB2/Driver/Function/sqlite.php
-roundcubemail/program/lib/MDB2/Driver/Function/sqlsrv.php
-roundcubemail/program/lib/MDB2/Driver/Manager/
-roundcubemail/program/lib/MDB2/Driver/Manager/Common.php
-roundcubemail/program/lib/MDB2/Driver/Manager/mssql.php
-roundcubemail/program/lib/MDB2/Driver/Manager/mysql.php
-roundcubemail/program/lib/MDB2/Driver/Manager/mysqli.php
-roundcubemail/program/lib/MDB2/Driver/Manager/pgsql.php
-roundcubemail/program/lib/MDB2/Driver/Manager/sqlite.php
-roundcubemail/program/lib/MDB2/Driver/Manager/sqlsrv.php
-roundcubemail/program/lib/MDB2/Driver/Native/
-roundcubemail/program/lib/MDB2/Driver/Native/Common.php
-roundcubemail/program/lib/MDB2/Driver/Native/mssql.php
-roundcubemail/program/lib/MDB2/Driver/Native/mysql.php
-roundcubemail/program/lib/MDB2/Driver/Native/mysqli.php
-roundcubemail/program/lib/MDB2/Driver/Native/pgsql.php
-roundcubemail/program/lib/MDB2/Driver/Native/sqlite.php
-roundcubemail/program/lib/MDB2/Driver/Native/sqlsrv.php
-roundcubemail/program/lib/MDB2/Driver/Reverse/
-roundcubemail/program/lib/MDB2/Driver/Reverse/Common.php
-roundcubemail/program/lib/MDB2/Driver/Reverse/mssql.php
-roundcubemail/program/lib/MDB2/Driver/Reverse/mysql.php
-roundcubemail/program/lib/MDB2/Driver/Reverse/mysqli.php
-roundcubemail/program/lib/MDB2/Driver/Reverse/pgsql.php
-roundcubemail/program/lib/MDB2/Driver/Reverse/sqlite.php
-roundcubemail/program/lib/MDB2/Driver/Reverse/sqlsrv.php
-roundcubemail/program/lib/MDB2/Driver/mssql.php
-roundcubemail/program/lib/MDB2/Driver/mysql.php
-roundcubemail/program/lib/MDB2/Driver/mysqli.php
-roundcubemail/program/lib/MDB2/Driver/pgsql.php
-roundcubemail/program/lib/MDB2/Driver/sqlite.php
-roundcubemail/program/lib/MDB2/Driver/sqlsrv.php
-roundcubemail/program/lib/MDB2/Extended.php
-roundcubemail/program/lib/MDB2/Iterator.php
-roundcubemail/program/lib/MDB2/LOB.php
 roundcubemail/program/lib/Mail/
 roundcubemail/program/lib/Mail/mime.php
 roundcubemail/program/lib/Mail/mimeDecode.php
@@ -2392,6 +2537,52 @@ roundcubemail/program/lib/Net/SMTP.php
 roundcubemail/program/lib/Net/Socket.php
 roundcubemail/program/lib/PEAR.php
 roundcubemail/program/lib/PEAR5.php
+roundcubemail/program/lib/Roundcube/
+roundcubemail/program/lib/Roundcube/README.md
+roundcubemail/program/lib/Roundcube/bootstrap.php
+roundcubemail/program/lib/Roundcube/html.php
+roundcubemail/program/lib/Roundcube/rcube.php
+roundcubemail/program/lib/Roundcube/rcube_addressbook.php
+roundcubemail/program/lib/Roundcube/rcube_base_replacer.php
+roundcubemail/program/lib/Roundcube/rcube_browser.php
+roundcubemail/program/lib/Roundcube/rcube_cache.php
+roundcubemail/program/lib/Roundcube/rcube_charset.php
+roundcubemail/program/lib/Roundcube/rcube_config.php
+roundcubemail/program/lib/Roundcube/rcube_contacts.php
+roundcubemail/program/lib/Roundcube/rcube_content_filter.php
+roundcubemail/program/lib/Roundcube/rcube_csv2vcard.php
+roundcubemail/program/lib/Roundcube/rcube_db.php
+roundcubemail/program/lib/Roundcube/rcube_db_mssql.php
+roundcubemail/program/lib/Roundcube/rcube_db_mysql.php
+roundcubemail/program/lib/Roundcube/rcube_db_pgsql.php
+roundcubemail/program/lib/Roundcube/rcube_db_sqlite.php
+roundcubemail/program/lib/Roundcube/rcube_db_sqlsrv.php
+roundcubemail/program/lib/Roundcube/rcube_enriched.php
+roundcubemail/program/lib/Roundcube/rcube_html2text.php
+roundcubemail/program/lib/Roundcube/rcube_image.php
+roundcubemail/program/lib/Roundcube/rcube_imap.php
+roundcubemail/program/lib/Roundcube/rcube_imap_cache.php
+roundcubemail/program/lib/Roundcube/rcube_imap_generic.php
+roundcubemail/program/lib/Roundcube/rcube_ldap.php
+roundcubemail/program/lib/Roundcube/rcube_message.php
+roundcubemail/program/lib/Roundcube/rcube_message_header.php
+roundcubemail/program/lib/Roundcube/rcube_message_part.php
+roundcubemail/program/lib/Roundcube/rcube_mime.php
+roundcubemail/program/lib/Roundcube/rcube_output.php
+roundcubemail/program/lib/Roundcube/rcube_plugin.php
+roundcubemail/program/lib/Roundcube/rcube_plugin_api.php
+roundcubemail/program/lib/Roundcube/rcube_result_index.php
+roundcubemail/program/lib/Roundcube/rcube_result_set.php
+roundcubemail/program/lib/Roundcube/rcube_result_thread.php
+roundcubemail/program/lib/Roundcube/rcube_session.php
+roundcubemail/program/lib/Roundcube/rcube_smtp.php
+roundcubemail/program/lib/Roundcube/rcube_spellchecker.php
+roundcubemail/program/lib/Roundcube/rcube_storage.php
+roundcubemail/program/lib/Roundcube/rcube_string_replacer.php
+roundcubemail/program/lib/Roundcube/rcube_user.php
+roundcubemail/program/lib/Roundcube/rcube_utils.php
+roundcubemail/program/lib/Roundcube/rcube_vcard.php
+roundcubemail/program/lib/Roundcube/rcube_washtml.php
 roundcubemail/program/lib/des.inc
 roundcubemail/program/lib/encoding/
 roundcubemail/program/lib/encoding/CP1250.map
@@ -2420,12 +2611,8 @@ roundcubemail/program/lib/encoding/ISO-8859-8.map
 roundcubemail/program/lib/encoding/ISO-8859-9.map
 roundcubemail/program/lib/encoding/KOI8R.map
 roundcubemail/program/lib/encoding/KSC5601.map
-roundcubemail/program/lib/enriched.inc
-roundcubemail/program/lib/html2text.php
-roundcubemail/program/lib/magic
 roundcubemail/program/lib/tnef_decoder.php
 roundcubemail/program/lib/utf8.class.php
-roundcubemail/program/lib/washtml.php
 roundcubemail/program/localization/
 roundcubemail/program/localization/ar_SA/
 roundcubemail/program/localization/ar_SA/labels.inc
@@ -2439,6 +2626,8 @@ roundcubemail/program/localization/az_AZ/messages.inc
 roundcubemail/program/localization/be_BE/
 roundcubemail/program/localization/be_BE/labels.inc
 roundcubemail/program/localization/be_BE/messages.inc
+roundcubemail/program/localization/ber/
+roundcubemail/program/localization/ber/labels.inc
 roundcubemail/program/localization/bg_BG/
 roundcubemail/program/localization/bg_BG/labels.inc
 roundcubemail/program/localization/bg_BG/messages.inc
@@ -2476,6 +2665,7 @@ roundcubemail/program/localization/en_GB/
 roundcubemail/program/localization/en_GB/labels.inc
 roundcubemail/program/localization/en_GB/messages.inc
 roundcubemail/program/localization/en_US/
+roundcubemail/program/localization/en_US/csv2vcard.inc
 roundcubemail/program/localization/en_US/labels.inc
 roundcubemail/program/localization/en_US/messages.inc
 roundcubemail/program/localization/eo/
@@ -2505,6 +2695,9 @@ roundcubemail/program/localization/fi_FI/messages.inc
 roundcubemail/program/localization/fr_FR/
 roundcubemail/program/localization/fr_FR/labels.inc
 roundcubemail/program/localization/fr_FR/messages.inc
+roundcubemail/program/localization/fy_NL/
+roundcubemail/program/localization/fy_NL/labels.inc
+roundcubemail/program/localization/fy_NL/messages.inc
 roundcubemail/program/localization/ga_IE/
 roundcubemail/program/localization/ga_IE/labels.inc
 roundcubemail/program/localization/ga_IE/messages.inc
@@ -2588,6 +2781,7 @@ roundcubemail/program/localization/nn_NO/
 roundcubemail/program/localization/nn_NO/labels.inc
 roundcubemail/program/localization/nn_NO/messages.inc
 roundcubemail/program/localization/pl_PL/
+roundcubemail/program/localization/pl_PL/csv2vcard.inc
 roundcubemail/program/localization/pl_PL/labels.inc
 roundcubemail/program/localization/pl_PL/messages.inc
 roundcubemail/program/localization/ps/
@@ -2642,8 +2836,13 @@ roundcubemail/program/localization/zh_CN/
 roundcubemail/program/localization/zh_CN/labels.inc
 roundcubemail/program/localization/zh_CN/messages.inc
 roundcubemail/program/localization/zh_TW/
+roundcubemail/program/localization/zh_TW/csv2vcard.inc
 roundcubemail/program/localization/zh_TW/labels.inc
 roundcubemail/program/localization/zh_TW/messages.inc
+roundcubemail/program/resources/
+roundcubemail/program/resources/blank.gif
+roundcubemail/program/resources/blank.tif
+roundcubemail/program/resources/blocked.gif
 roundcubemail/program/steps/
 roundcubemail/program/steps/addressbook/
 roundcubemail/program/steps/addressbook/copy.inc
@@ -2678,6 +2877,7 @@ roundcubemail/program/steps/mail/mark.inc
 roundcubemail/program/steps/mail/move_del.inc
 roundcubemail/program/steps/mail/pagenav.inc
 roundcubemail/program/steps/mail/search.inc
+roundcubemail/program/steps/mail/search_contacts.inc
 roundcubemail/program/steps/mail/sendmail.inc
 roundcubemail/program/steps/mail/sendmdn.inc
 roundcubemail/program/steps/mail/show.inc
@@ -2711,6 +2911,7 @@ roundcubemail/skins/classic/README
 roundcubemail/skins/classic/addressbook.css
 roundcubemail/skins/classic/common.css
 roundcubemail/skins/classic/editor_content.css
+roundcubemail/skins/classic/embed.css
 roundcubemail/skins/classic/functions.js
 roundcubemail/skins/classic/googiespell.css
 roundcubemail/skins/classic/ie6hacks.css
@@ -2718,7 +2919,6 @@ roundcubemail/skins/classic/iehacks.css
 roundcubemail/skins/classic/images/
 roundcubemail/skins/classic/images/abook_toolbar.gif
 roundcubemail/skins/classic/images/abook_toolbar.png
-roundcubemail/skins/classic/images/blank.gif
 roundcubemail/skins/classic/images/buttons/
 roundcubemail/skins/classic/images/buttons/add_act.png
 roundcubemail/skins/classic/images/buttons/add_pas.png
@@ -2801,6 +3001,7 @@ roundcubemail/skins/classic/includes/messagetoolbar.html
 roundcubemail/skins/classic/includes/settingstabs.html
 roundcubemail/skins/classic/includes/taskbar.html
 roundcubemail/skins/classic/mail.css
+roundcubemail/skins/classic/meta.json
 roundcubemail/skins/classic/pngbehavior.htc
 roundcubemail/skins/classic/print.css
 roundcubemail/skins/classic/safari.css
@@ -2830,11 +3031,13 @@ roundcubemail/skins/classic/templates/messageprint.html
 roundcubemail/skins/classic/templates/plugin.html
 roundcubemail/skins/classic/templates/settings.html
 roundcubemail/skins/classic/templates/settingsedit.html
+roundcubemail/skins/classic/thumbnail.png
 roundcubemail/skins/classic/watermark.html
 roundcubemail/skins/larry/
 roundcubemail/skins/larry/README
 roundcubemail/skins/larry/addressbook.css
 roundcubemail/skins/larry/editor_content.css
+roundcubemail/skins/larry/embed.css
 roundcubemail/skins/larry/googiespell.css
 roundcubemail/skins/larry/ie7hacks.css
 roundcubemail/skins/larry/iehacks.css
@@ -2844,7 +3047,10 @@ roundcubemail/skins/larry/images/ajaxloader.gif
 roundcubemail/skins/larry/images/buttons.gif
 roundcubemail/skins/larry/images/buttons.png
 roundcubemail/skins/larry/images/contactpic.png
+roundcubemail/skins/larry/images/contactpic_32px.png
+roundcubemail/skins/larry/images/contactpic_48px.png
 roundcubemail/skins/larry/images/favicon.ico
+roundcubemail/skins/larry/images/filedrop.png
 roundcubemail/skins/larry/images/filetypes.png
 roundcubemail/skins/larry/images/googiespell/
 roundcubemail/skins/larry/images/googiespell/change_lang.gif
@@ -2870,6 +3076,7 @@ roundcubemail/skins/larry/includes/links.html
 roundcubemail/skins/larry/includes/mailtoolbar.html
 roundcubemail/skins/larry/includes/settingstabs.html
 roundcubemail/skins/larry/mail.css
+roundcubemail/skins/larry/meta.json
 roundcubemail/skins/larry/print.css
 roundcubemail/skins/larry/settings.css
 roundcubemail/skins/larry/styles.css
@@ -2898,6 +3105,7 @@ roundcubemail/skins/larry/templates/messageprint.html
 roundcubemail/skins/larry/templates/plugin.html
 roundcubemail/skins/larry/templates/settings.html
 roundcubemail/skins/larry/templates/settingsedit.html
+roundcubemail/skins/larry/thumbnail.png
 roundcubemail/skins/larry/ui.js
 roundcubemail/skins/larry/watermark.html
 @mode 770
diff --git a/mail/roundcubemail/pkg/README b/mail/roundcubemail/pkg/README
index c49b960a8f7..9513ebf9c72 100644
--- a/mail/roundcubemail/pkg/README
+++ b/mail/roundcubemail/pkg/README
@@ -1,9 +1,28 @@
-$OpenBSD: README,v 1.1 2012/01/19 13:53:48 sthen Exp $
+$OpenBSD: README,v 1.2 2013/04/16 13:37:23 sthen Exp $
 
 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
 +-----------------------------------------------------------------------
 
+Standard Roundcube installation/upgrade
+=======================================
+See ${INSTDIR}/INSTALL and ${INSTDIR}/UPGRADING
+for more information.
+
+If upgrading from a version before 0.9, note that database access is now
+done via PDO.
+
+If you are using MySQL or PostgreSQL you will need to ensure that the
+relevant package (php-pdo_mysql or php-pdo_pgsql) is installed and
+enabled. If you are using SQLite, you will need to convert the
+database from sqlite2 to sqlite3, for example (adjusting filenames
+if necessary):
+
+# cd /var/www/roundcubemail/db
+# mv sqlite.db old_sqlite.db
+# sqlite old_sqlite.db .dump | sqlite3 sqlite.db
+
+
 Setup with httpd from OpenBSD base system
 =========================================
 With Apache, AllowOverride settings are required on the ${INSTDIR}
@@ -13,6 +32,7 @@ directory. You can configure this as follows:
         ${PREFIX}/conf/modules
 # /etc/rc.d/httpd restart
 
+
 Setup with other web servers
 ============================
 Review the .htaccess files as you may need to use them as a template to
@@ -28,8 +48,3 @@ call if you want to check.
 If this is not present it will need adding as a FastCGI parameter.
 For nginx, you can do this by setting 'fastcgi_param HTTPS on' in the
 appropriate location{} block for HTTPS.
-
-Standard Roundcube installation/upgrade
-=======================================
-See ${INSTDIR}/INSTALL and ${INSTDIR}/UPGRADING
-for more information.