Use consistent license identifiers, remove redundant package.xml files

48 files changed, 28 insertions, 1745 deletions

diff --git a/plugins/acl/composer.json b/plugins/acl/composer.json
index 20859eabf..a08d211dd 100644
--- a/plugins/acl/composer.json
+++ b/plugins/acl/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/acl",
     "type": "roundcube-plugin",
     "description": "IMAP Folders Access Control Lists Management (RFC4314, RFC2086).",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.5",
     "authors": [
         {
diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml
deleted file mode 100644
index feec9cebe..000000000
--- a/plugins/acl/package.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>acl</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Folders Access Control Lists</summary>
-	<description>IMAP Folders Access Control Lists Management (RFC4314, RFC2086).</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2014-08-11</date>
-	<version>
-		<release>1.5</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="acl.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="acl.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="config.inc.php.dist" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="skins/classic/acl.css" role="data"></file>
-			<file name="skins/classic/images/enabled.png" role="data"></file>
-			<file name="skins/classic/images/partial.png" role="data"></file>
-			<file name="skins/classic/templates/table.html" role="data"></file>
-			<file name="skins/larry/acl.css" role="data"></file>
-			<file name="skins/larry/images/enabled.png" role="data"></file>
-			<file name="skins/larry/images/partial.png" role="data"></file>
-			<file name="skins/larry/templates/table.html" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/archive/composer.json b/plugins/archive/composer.json
index 1e3331b2c..0fa3802ea 100644
--- a/plugins/archive/composer.json
+++ b/plugins/archive/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/archive",
     "type": "roundcube-plugin",
     "description": "This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "2.3",
     "authors": [
         {
diff --git a/plugins/archive/package.xml b/plugins/archive/package.xml
deleted file mode 100644
index 4f5a87c7b..000000000
--- a/plugins/archive/package.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>archive</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Archive feature for Roundcube</summary>
-	<description>This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2014-04-07</date>
-	<version>
-		<release>2.3</release>
-		<api>2.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="archive.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="archive.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="localization/ar_SA.inc" role="data"></file>
-			<file name="localization/az_AZ.inc" role="data"></file>
-			<file name="localization/be_BE.inc" role="data"></file>
-			<file name="localization/bg_BG.inc" role="data"></file>
-			<file name="localization/bs_BA.inc" role="data"></file>
-			<file name="localization/ca_ES.inc" role="data"></file>
-			<file name="localization/cs_CZ.inc" role="data"></file>
-			<file name="localization/cy_GB.inc" role="data"></file>
-			<file name="localization/da_DK.inc" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/el_GR.inc" role="data"></file>
-			<file name="localization/eb_GB.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/es_AR.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/et_EE.inc" role="data"></file>
-			<file name="localization/fa_IR.inc" role="data"></file>
-			<file name="localization/fi_FI.inc" role="data"></file>
-			<file name="localization/fr_FR.inc" role="data"></file>
-			<file name="localization/gl_ES.inc" role="data"></file>
-			<file name="localization/he_IL.inc" role="data"></file>
-			<file name="localization/hr_HR.inc" role="data"></file>
-			<file name="localization/hu_HU.inc" role="data"></file>
-			<file name="localization/hy_AM.inc" role="data"></file>
-			<file name="localization/id_ID.inc" role="data"></file>
-			<file name="localization/it_IT.inc" role="data"></file>
-			<file name="localization/ja_JP.inc" role="data"></file>
-			<file name="localization/km_KH.inc" role="data"></file>
-			<file name="localization/ko_KR.inc" role="data"></file>
-			<file name="localization/lt_LT.inc" role="data"></file>
-			<file name="localization/lv_LV.inc" role="data"></file>
-			<file name="localization/ml_IN.inc" role="data"></file>
-			<file name="localization/nb_NO.inc" role="data"></file>
-			<file name="localization/nl_NL.inc" role="data"></file>
-			<file name="localization/nn_NO.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/pt_BR.inc" role="data"></file>
-			<file name="localization/pt_PT.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-			<file name="localization/si_LK.inc" role="data"></file>
-			<file name="localization/sk_SK.inc" role="data"></file>
-			<file name="localization/sl_SI.inc" role="data"></file>
-			<file name="localization/sr_CS.inc" role="data"></file>
-			<file name="localization/sv_SE.inc" role="data"></file>
-			<file name="localization/tr_TR.inc" role="data"></file>
-			<file name="localization/uk_UA.inc" role="data"></file>
-			<file name="localization/vi_VN.inc" role="data"></file>
-			<file name="localization/zh_CN.inc" role="data"></file>
-			<file name="localization/zh_TW.inc" role="data"></file>
-			<file name="skins/classic/archive_act.png" role="data"></file>
-			<file name="skins/classic/archive_pas.png" role="data"></file>
-			<file name="skins/classic/foldericon.png" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/attachment_reminder/composer.json b/plugins/attachment_reminder/composer.json
index a9601458d..7690a31a2 100644
--- a/plugins/attachment_reminder/composer.json
+++ b/plugins/attachment_reminder/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/Attachment Reminder",
     "type": "roundcube-plugin",
     "description": "This Roundcube plugin reminds the user to attach a file if the composed message text indicates that there should be any.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.1",
     "authors": [
         {
diff --git a/plugins/attachment_reminder/package.xml b/plugins/attachment_reminder/package.xml
deleted file mode 100644
index 78768d534..000000000
--- a/plugins/attachment_reminder/package.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>Attachment Reminder</name>
-	<summary>Roundcube plugin that prompts you if it looks like you wanted to attach a file but you didn't.</summary>
-	<description>
-		This Roundcube plugin reminds the user to attach a file if the composed message text indicates that there should be any.
-	</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<lead>
-		<name>Thomas Yu - Sian, Liu</name>
-		<active>yes</active>
-	</lead>
-    <date>2013-05-20</date>
-	<version>
-		<release>1.1</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="attachment_reminder.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="attachment_reminder.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/fr_FR.inc" role="data"></file>
-			<file name="localization/it_IT.inc" role="data"></file>
-			<file name="localization/nl_NL.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/zh_CN.inc" role="data"></file>
-			<file name="localization/zh_TW.inc" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/database_attachments/composer.json b/plugins/database_attachments/composer.json
index 86eced62c..d0df987eb 100644
--- a/plugins/database_attachments/composer.json
+++ b/plugins/database_attachments/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/database_attachments",
     "type": "roundcube-plugin",
     "description": "This plugin which provides database backed storage for temporary attachment file handling. The primary advantage of this plugin is its compatibility with round-robin dns multi-server Roundcube installations.",
-    "license": "GNU GPLv2",
+    "license": "GPLv2",
     "version": "1.1",
     "authors": [
         {
@@ -24,6 +24,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "roundcube/plugin-installer": ">=0.1.3"
+        "roundcube/plugin-installer": ">=0.1.3",
+        "roundcube/filesystem_attachments": ">=1.0.0"
     }
 }
diff --git a/plugins/database_attachments/package.xml b/plugins/database_attachments/package.xml
deleted file mode 100644
index 44adc219e..000000000
--- a/plugins/database_attachments/package.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>database_attachments</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Database storage for uploaded attachments</summary>
-	<description>
-	    This plugin which provides database backed storage for temporary
-        attachment file handling. The primary advantage of this plugin
-        is its compatibility with round-robin dns multi-server Roundcube
-        installations.
-	</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<developer>
-		<name>Ziba Scott</name>
-		<user>ziba</user>
-		<email>ziba@umich.edu</email>
-		<active>yes</active>
-	</developer>
-	<date>2013-06-13</date>
-	<version>
-		<release>1.1</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="database_attachments.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-			<package>
-	            <name>filesystem_attachments</name>
-	            <channel>pear.roundcube.net</channel>
-			</package>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/debug_logger/composer.json b/plugins/debug_logger/composer.json
index 8ae445247..af7e1c1f8 100644
--- a/plugins/debug_logger/composer.json
+++ b/plugins/debug_logger/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/debug_logger",
     "type": "roundcube-plugin",
     "description": "Enhanced logging for debugging purposes. It is not recommened to be enabled on production systems without testing because of the somewhat increased memory, cpu and disk i/o overhead.",
-    "license": "GNU GPLv2",
+    "license": "GPLv2",
     "version": "1.0",
     "authors": [
         {
diff --git a/plugins/debug_logger/package.xml b/plugins/debug_logger/package.xml
deleted file mode 100644
index f416238ef..000000000
--- a/plugins/debug_logger/package.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>debug_logger</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Additional debugging logs</summary>
-	<description>
-	    Enhanced logging for debugging purposes. It is not recommened
-        to be enabled on production systems without testing because of
-        the somewhat increased memory, cpu and disk i/o overhead.
-	</description>
-	<lead>
-		<name>Ziba Scott</name>
-		<user>ziba</user>
-		<email>ziba@umich.edu</email>
-		<active>yes</active>
-	</lead>
-	<date>2011-11-21</date>
-	<version>
-		<release>1.0</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="debug_logger.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="runlog/runlog.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/emoticons/composer.json b/plugins/emoticons/composer.json
index c2ada7846..8e7b90ae9 100644
--- a/plugins/emoticons/composer.json
+++ b/plugins/emoticons/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/emoticons",
     "type": "roundcube-plugin",
     "description": "Sample plugin to replace emoticons in plain text message body with real icons.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.3",
     "authors": [
         {
diff --git a/plugins/emoticons/package.xml b/plugins/emoticons/package.xml
deleted file mode 100644
index b4218103c..000000000
--- a/plugins/emoticons/package.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>emoticons</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Display emoticons in text messages</summary>
-	<description>Sample plugin to replace emoticons in plain text message body with real icons.</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<developer>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</developer>
-	<date>2011-11-21</date>
-	<version>
-		<release>1.3</release>
-		<api>1.3</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="emoticons.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/filesystem_attachments/composer.json b/plugins/filesystem_attachments/composer.json
index 292360144..f13901275 100644
--- a/plugins/filesystem_attachments/composer.json
+++ b/plugins/filesystem_attachments/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/filesystem_attachments",
     "type": "roundcube-plugin",
     "description": "This is a core plugin which provides basic, filesystem based attachment temporary file handling. This includes storing attachments of messages currently being composed, writing attachments to disk when drafts with attachments are re-opened and writing attachments to disk for inline display in current html compositions.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.0",
     "authors": [
         {
diff --git a/plugins/filesystem_attachments/package.xml b/plugins/filesystem_attachments/package.xml
deleted file mode 100644
index 49ec51934..000000000
--- a/plugins/filesystem_attachments/package.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>filesystem_attachments</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Default database storage for uploaded attachments</summary>
-	<description>
-	    This is a core plugin which provides basic, filesystem based
-        attachment temporary file handling. This includes storing
-        attachments of messages currently being composed, writing attachments
-        to disk when drafts with attachments are re-opened and writing
-        attachments to disk for inline display in current html compositions.
-	</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<developer>
-		<name>Ziba Scott</name>
-		<user>ziba</user>
-		<email>ziba@umich.edu</email>
-		<active>yes</active>
-	</developer>
-	<date>2011-11-21</date>
-	<version>
-		<release>1.0</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="filesystem_attachments.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/help/composer.json b/plugins/help/composer.json
index ee99de56d..53d413648 100644
--- a/plugins/help/composer.json
+++ b/plugins/help/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/help",
     "type": "roundcube-plugin",
     "description": "Plugin adds a new item (Help) in taskbar.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.4",
     "authors": [
         {
diff --git a/plugins/help/package.xml b/plugins/help/package.xml
deleted file mode 100644
index d39143ba1..000000000
--- a/plugins/help/package.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>help</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Online Help for Roundcube</summary>
-	<description>Plugin adds a new item (Help) in taskbar.</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2013-07-03</date>
-	<version>
-		<release>1.4</release>
-		<api>1.4</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="help.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="config.inc.php.dist" role="data"></file>
-			<file name="content/license.html" role="data"></file>
-			<file name="localization/bs_BA.inc" role="data"></file>
-			<file name="localization/ca_ES.inc" role="data"></file>
-			<file name="localization/cs_CZ.inc" role="data"></file>
-			<file name="localization/cy_GB.inc" role="data"></file>
-			<file name="localization/da_DK.inc" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_GB.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/eo.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/et_EE.inc" role="data"></file>
-			<file name="localization/fa_IR.inc" role="data"></file>
-			<file name="localization/fi_FI.inc" role="data"></file>
-			<file name="localization/fr_FR.inc" role="data"></file>
-			<file name="localization/gl_ES.inc" role="data"></file>
-			<file name="localization/he_IL.inc" role="data"></file>
-			<file name="localization/hu_HU.inc" role="data"></file>
-			<file name="localization/hy_AM.inc" role="data"></file>
-			<file name="localization/it_IT.inc" role="data"></file>
-			<file name="localization/ja_JP.inc" role="data"></file>
-			<file name="localization/ko_KR.inc" role="data"></file>
-			<file name="localization/lt_LT.inc" role="data"></file>
-			<file name="localization/nb_NB.inc" role="data"></file>
-			<file name="localization/nl_NL.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/pt_BR.inc" role="data"></file>
-			<file name="localization/pt_PT.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-			<file name="localization/sk_SK.inc" role="data"></file>
-			<file name="localization/sl_SI.inc" role="data"></file>
-			<file name="localization/sr_CS.inc" role="data"></file>
-			<file name="localization/sv_SE.inc" role="data"></file>
-			<file name="localization/tr_TR.inc" role="data"></file>
-			<file name="localization/vi_VN.inc" role="data"></file>
-			<file name="localization/zh_CN.inc" role="data"></file>
-			<file name="localization/zh_TW.inc" role="data"></file>
-			<file name="skins/classic/help.css" role="data"></file>
-			<file name="skins/classic/help.gif" role="data"></file>
-			<file name="skins/classic/templates/help.html" role="data"></file>
-			<file name="skins/larry/help.css" role="data"></file>
-			<file name="skins/larry/help.png" role="data"></file>
-			<file name="skins/larry/templates/help.html" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/hide_blockquote/composer.json b/plugins/hide_blockquote/composer.json
index 986477a83..5af75fe7e 100644
--- a/plugins/hide_blockquote/composer.json
+++ b/plugins/hide_blockquote/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/hide_blockquote",
     "type": "roundcube-plugin",
     "description": "This allows to hide long blocks of cited text in messages.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.0",
     "authors": [
         {
diff --git a/plugins/hide_blockquote/package.xml b/plugins/hide_blockquote/package.xml
deleted file mode 100644
index 0d895c1d9..000000000
--- a/plugins/hide_blockquote/package.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>hide_blockquote</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Citation blocks hiding for Roundcube</summary>
-	<description>This allows to hide long blocks of cited text in messages.</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2012-05-23</date>
-	<version>
-		<release>1.0</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="hide_blockquote.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="hide_blockquote.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="skins/classic/style.css" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/identity_select/composer.json b/plugins/identity_select/composer.json
index 61a4b0d00..c31239360 100644
--- a/plugins/identity_select/composer.json
+++ b/plugins/identity_select/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/identity_select",
     "type": "roundcube-plugin",
     "description": "On reply to a message user identity selection is based on\n\t\tcontent of standard headers like From, To, Cc and Return-Path.\n\t\tHere you can add header(s) set by your SMTP server (e.g.\n\t\tDelivered-To, Envelope-To, X-Envelope-To, X-RCPT-TO) to make\n\t\tidentity selection more accurate.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.0",
     "authors": [
         {
diff --git a/plugins/identity_select/package.xml b/plugins/identity_select/package.xml
deleted file mode 100644
index 425c28830..000000000
--- a/plugins/identity_select/package.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>identity_select</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Extended identity selection</summary>
-	<description>
-		On reply to a message user identity selection is based on
-		content of standard headers like From, To, Cc and Return-Path.
-		Here you can add header(s) set by your SMTP server (e.g.
-		Delivered-To, Envelope-To, X-Envelope-To, X-RCPT-TO) to make
-		identity selection more accurate.
-	</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2013-08-04</date>
-	<version>
-		<release>1.0</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="identity_select.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/jqueryui/composer.json b/plugins/jqueryui/composer.json
index d52e57c67..13ed9a16f 100644
--- a/plugins/jqueryui/composer.json
+++ b/plugins/jqueryui/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/jqueryui",
     "type": "roundcube-plugin",
     "description": "Plugin adds the complete jQuery-UI library including the smoothness theme to Roundcube. This allows other plugins to use jQuery-UI without having to load their own version. The benefit of using one central jQuery-UI is that we wont run into problems of conflicting jQuery libraries being loaded. All plugins that want to use jQuery-UI should use this plugin as a requirement.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.10.4",
     "authors": [
         {
diff --git a/plugins/legacy_browser/package.xml b/plugins/legacy_browser/package.xml
deleted file mode 100644
index 06e5fa2ba..000000000
--- a/plugins/legacy_browser/package.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>legacy_browser</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Legacy browser (IE 7/8, Firefox &lt; 4) support</summary>
-	<description>This adds support for legacy browsers (IE 7/8, Firefox &lt; 4).</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2014-06-19</date>
-	<version>
-		<release>1.1</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="legacy_browser.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="js/jquery.min.js" role="data"></file>
-			<file name="skins/classic/iehacks.css" role="data"></file>
-			<file name="skins/classic/images/abook_toolbar.gif" role="data"></file>
-			<file name="skins/classic/images/mail_toolbar.gif" role="data"></file>
-			<file name="skins/larry/ie7hacks.css" role="data"></file>
-			<file name="skins/larry/iehacks.css" role="data"></file>
-			<file name="skins/larry/images/buttons.gif" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/markasjunk/composer.json b/plugins/markasjunk/composer.json
index edf1ad699..8ec5f3de8 100644
--- a/plugins/markasjunk/composer.json
+++ b/plugins/markasjunk/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/markasjunk",
     "type": "roundcube-plugin",
     "description": "Adds a new button to the mailbox toolbar to mark the selected messages as Junk and move them to the configured Junk folder.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.2",
     "authors": [
         {
diff --git a/plugins/markasjunk/package.xml b/plugins/markasjunk/package.xml
deleted file mode 100644
index 95597481a..000000000
--- a/plugins/markasjunk/package.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>markasjunk</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Mark messages as Junk</summary>
-	<description>Adds a new button to the mailbox toolbar to mark the selected messages as Junk and move them to the configured Junk folder.</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<date>2013-08-29</date>
-	<version>
-		<release>1.2</release>
-		<api>1.2</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="markasjunk.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="markasjunk.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="localization/cs_CZ.inc" role="data"></file>
-			<file name="localization/da_DK.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/es_AR.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/et_EE.inc" role="data"></file>
-			<file name="localization/gl_ES.inc" role="data"></file>
-			<file name="localization/it_IT.inc" role="data"></file>
-			<file name="localization/ja_JP.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-			<file name="localization/sk_SK.inc" role="data"></file>
-			<file name="localization/sv_SE.inc" role="data"></file>
-			<file name="localization/zh_TW.inc" role="data"></file>
-			<file name="skins/classic/junk_act.png" role="data"></file>
-			<file name="skins/classic/junk_pas.png" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/new_user_dialog/composer.json b/plugins/new_user_dialog/composer.json
index cf3a37291..78ea0645c 100644
--- a/plugins/new_user_dialog/composer.json
+++ b/plugins/new_user_dialog/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/new_user_dialog",
     "type": "roundcube-plugin",
     "description": "When a new user is created, this plugin checks the default identity and sets a session flag in case it is incomplete. An overlay box will appear on the screen until the user has reviewed/completed his identity.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "2.1",
     "authors": [
         {
diff --git a/plugins/new_user_dialog/package.xml b/plugins/new_user_dialog/package.xml
deleted file mode 100644
index 90ca4bed0..000000000
--- a/plugins/new_user_dialog/package.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>new_user_dialog</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Present identities settings dialog to new users</summary>
-	<description>When a new user is created, this plugin checks the default identity and sets a session flag in case it is incomplete. An overlay box will appear on the screen until the user has reviewed/completed his identity.</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<date>2014-04-28</date>
-	<version>
-		<release>2.1</release>
-		<api>2.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="new_user_dialog.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="newuserdialog.css" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<dir name="localization">
-				<file name="en_US.inc" role="data" />
-				<file name="cs_CZ.inc" role="data" />
-				<file name="de_CH.inc" role="data" />
-				<file name="de_DE.inc" role="data" />
-				<file name="es_ES.inc" role="data" />
-				<file name="et_EE.inc" role="data" />
-				<file name="gl_ES.inc" role="data" />
-				<file name="it_IT.inc" role="data" />
-				<file name="ja_JP.inc" role="data" />
-				<file name="nl_NL.inc" role="data" />
-				<file name="pl_PL.inc" role="data" />
-				<file name="pt_BR.inc" role="data" />
-				<file name="pt_PT.inc" role="data" />
-				<file name="ru_RU.inc" role="data" />
-				<file name="sl_SI.inc" role="data" />
-				<file name="sv_DE.inc" role="data" />
-				<file name="zh_TW.inc" role="data" />
-			</dir>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/new_user_identity/composer.json b/plugins/new_user_identity/composer.json
index a2e9e95dc..8378ae50c 100644
--- a/plugins/new_user_identity/composer.json
+++ b/plugins/new_user_identity/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/new_user_identity",
     "type": "roundcube-plugin",
     "description": "Populates a new user's default identity from LDAP on their first visit.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.1",
     "authors": [
         {
diff --git a/plugins/new_user_identity/package.xml b/plugins/new_user_identity/package.xml
deleted file mode 100644
index 12409392b..000000000
--- a/plugins/new_user_identity/package.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>new_user_identity</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Populates a new user's default identity from LDAP on their first visit.</summary>
-	<description>
-	    Populates a new user's default identity from LDAP on their first visit.
-	</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2014-10-30</date>
-	<version>
-		<release>1.1</release>
-		<api>1.1</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="new_user_identity.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/newmail_notifier/composer.json b/plugins/newmail_notifier/composer.json
index 2ca5db709..1bca39c1f 100644
--- a/plugins/newmail_notifier/composer.json
+++ b/plugins/newmail_notifier/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/newmail_notifier",
     "type": "roundcube-plugin",
     "description": "Supports three methods of notification: 1. Basic - focus browser window and change favicon 2. Sound - play wav file 3. Desktop - display desktop notification (using webkitNotifications feature, supported by Chrome and Firefox with 'HTML5 Notifications' plugin).",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "0.7",
     "authors": [
         {
diff --git a/plugins/newmail_notifier/package.xml b/plugins/newmail_notifier/package.xml
deleted file mode 100644
index 3d7277bb4..000000000
--- a/plugins/newmail_notifier/package.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>newmail_notifier</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Displays notification about a new mail</summary>
-	<description>
-	    Supports three methods of notification:
-            1. Basic - focus browser window and change favicon
-            2. Sound - play wav file
-            3. Desktop - display desktop notification (using webkitNotifications feature,
-               supported by Chrome and Firefox with 'HTML5 Notifications' plugin).
-	</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2013-10-04</date>
-	<version>
-		<release>0.7</release>
-		<api>0.5</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="newmail_notifier.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="newmail_notifier.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="config.inc.php.dist" role="data"></file>
-			<file name="favicon.ico" role="data"></file>
-			<file name="mail.png" role="data"></file>
-			<file name="sound.wav" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/ja_JP.inc" role="data"></file>
-			<file name="localization/lv_LV.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/pt_BR.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-			<file name="localization/sv_SE.inc" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/password/package.xml b/plugins/password/package.xml
deleted file mode 100644
index 4fa023c77..000000000
--- a/plugins/password/package.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>password</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Password Change for Roundcube</summary>
-	<description>Plugin that adds a possibility to change user password using many
-        methods (drivers) via Settings/Password tab.
-    </description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2014-06-10</date>
-	<version>
-		<release>3.5</release>
-		<api>2.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="password.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="password.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-            <file name="README" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-            </file>
-			<file name="localization/az_AZ.inc" role="data"></file>
-			<file name="localization/bg_BG.inc" role="data"></file>
-			<file name="localization/ca_ES.inc" role="data"></file>
-			<file name="localization/cs_CZ.inc" role="data"></file>
-			<file name="localization/da_DK.inc" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/es_AR.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/et_EE.inc" role="data"></file>
-			<file name="localization/fi_FI.inc" role="data"></file>
-			<file name="localization/fr_FR.inc" role="data"></file>
-			<file name="localization/gl_ES.inc" role="data"></file>
-			<file name="localization/hr_HR.inc" role="data"></file>
-			<file name="localization/hu_HU.inc" role="data"></file>
-			<file name="localization/it_IT.inc" role="data"></file>
-			<file name="localization/ja_JA.inc" role="data"></file>
-			<file name="localization/lt_LT.inc" role="data"></file>
-			<file name="localization/lv_LV.inc" role="data"></file>
-			<file name="localization/nl_NL.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/pt_BR.inc" role="data"></file>
-			<file name="localization/pt_PT.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-			<file name="localization/sk_SK.inc" role="data"></file>
-			<file name="localization/sl_SI.inc" role="data"></file>
-			<file name="localization/sv_SE.inc" role="data"></file>
-			<file name="localization/tr_TR.inc" role="data"></file>
-			<file name="localization/zh_TW.inc" role="data"></file>
-
-            <file name="drivers/chpasswd.php" role="php"></file>
-            <file name="drivers/dbmail.php" role="php"></file>
-            <file name="drivers/directadmin.php" role="php"></file>
-            <file name="drivers/domainfactory.php" role="php"></file>
-            <file name="drivers/expect.php" role="php"></file>
-            <file name="drivers/ldap.php" role="php"></file>
-            <file name="drivers/ldap_simple.php" role="php"></file>
-            <file name="drivers/poppassd.php" role="php"></file>
-            <file name="drivers/sql.php" role="php"></file>
-            <file name="drivers/vpopmaild.php" role="php"></file>
-            <file name="drivers/cpanel.php" role="php"></file>
-            <file name="drivers/hmail.php" role="php"></file>
-            <file name="drivers/pam.php" role="php"></file>
-            <file name="drivers/pw_usermod.php" role="php"></file>
-            <file name="drivers/sasl.php" role="php"></file>
-            <file name="drivers/smb.php" role="php"></file>
-            <file name="drivers/virtualmin.php" role="php"></file>
-            <file name="drivers/ximss.php" role="php"></file>
-            <file name="drivers/xmail.php" role="php"></file>
-
-			<file name="helpers/chgdbmailusers.c" role="data"></file>
-			<file name="helpers/chgsaslpasswd.c" role="data"></file>
-            <file name="helpers/chgvirtualminpasswd.c" role="data"></file>
-            <file name="helpers/chpass-wrapper.py" role="data"></file>
-            <file name="helpers/passwd-expect" role="data"></file>
-
-            <file name="config.inc.php.disc" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/redundant_attachments/composer.json b/plugins/redundant_attachments/composer.json
index 3c98b6885..56f3ab832 100644
--- a/plugins/redundant_attachments/composer.json
+++ b/plugins/redundant_attachments/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/redundant_attachments",
     "type": "roundcube-plugin",
     "description": "This plugin provides a redundant storage for temporary uploaded attachment files. They are stored in both the database backend as well as on the local file system. It provides also memcache store as a fallback.",
-    "license": "GNU GPLv2",
+    "license": "GPLv2",
     "version": "1.0",
     "authors": [
         {
@@ -24,6 +24,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "roundcube/plugin-installer": ">=0.1.3"
+        "roundcube/plugin-installer": ">=0.1.3",
+        "roundcube/filesystem_attachments": ">=1.0.0"
     }
 }
diff --git a/plugins/redundant_attachments/package.xml b/plugins/redundant_attachments/package.xml
deleted file mode 100644
index 939cf12bd..000000000
--- a/plugins/redundant_attachments/package.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>redundant_attachments</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Redundant storage for uploaded attachments</summary>
-	<description>
-	    This plugin provides a redundant storage for temporary uploaded
-        attachment files. They are stored in both the database backend
-        as well as on the local file system.
-        It provides also memcache store as a fallback.
-	</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<date>2011-11-21</date>
-	<version>
-		<release>1.0</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="redundant_attachments.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="config.inc.php.dist" role="data"/>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-			<package>
-	            <name>filesystem_attachments</name>
-	            <channel>pear.roundcube.net</channel>
-			</package>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/show_additional_headers/composer.json b/plugins/show_additional_headers/composer.json
index 53cd5a885..d1007547f 100644
--- a/plugins/show_additional_headers/composer.json
+++ b/plugins/show_additional_headers/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/show_additional_headers",
     "type": "roundcube-plugin",
     "description": "Proof-of-concept plugin which will fetch additional headers and display them in the message view.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "2.0",
     "authors": [
         {
diff --git a/plugins/show_additional_headers/package.xml b/plugins/show_additional_headers/package.xml
deleted file mode 100644
index 9ca60baa9..000000000
--- a/plugins/show_additional_headers/package.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>show_additional_headers</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Displays additional message headers</summary>
-	<description>
-	    Proof-of-concept plugin which will fetch additional headers and display them in the message view.
-	</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<date>2012-04-23</date>
-	<version>
-		<release>2.0</release>
-		<api>2.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="show_additional_headers.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/subscriptions_option/composer.json b/plugins/subscriptions_option/composer.json
index a3ba7b684..57b95d2c8 100644
--- a/plugins/subscriptions_option/composer.json
+++ b/plugins/subscriptions_option/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/subscriptions_option",
     "type": "roundcube-plugin",
     "description": "A plugin which can enable or disable the use of imap subscriptions. It includes a toggle on the settings page under \"Server Settings\". The preference can also be locked.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.3",
     "authors": [
         {
diff --git a/plugins/subscriptions_option/package.xml b/plugins/subscriptions_option/package.xml
deleted file mode 100644
index 04f2c1b3c..000000000
--- a/plugins/subscriptions_option/package.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>subscriptions_option</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Option to disable IMAP subscriptions</summary>
-	<description>
-	    A plugin which can enable or disable the use of imap subscriptions.
-        It includes a toggle on the settings page under "Server Settings".
-        The preference can also be locked.
-	</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<developer>
-	    <name>Ziba Scott</name>
-	    <user>ziba</user>
-	    <email>ziba@umich.edu</email>
-	    <active>yes</active>
-	</developer>
-	<date>2012-05-21</date>
-	<version>
-		<release>1.3</release>
-		<api>1.1</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="subscriptions_option.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="localization/cs_CZ.inc" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/et_EE.inc" role="data"></file>
-			<file name="localization/gl_ES.inc" role="data"></file>
-			<file name="localization/ja_JP.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-			<file name="localization/sv_SE.inc" role="data"></file>
-			<file name="localization/zh_TW.inc" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/userinfo/composer.json b/plugins/userinfo/composer.json
index 0ae6f6db8..af5f6d7fa 100644
--- a/plugins/userinfo/composer.json
+++ b/plugins/userinfo/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/userinfo",
     "type": "roundcube-plugin",
     "description": "Sample plugin that adds a new tab to the settings section to display some information about the current user.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.0",
     "authors": [
         {
diff --git a/plugins/userinfo/package.xml b/plugins/userinfo/package.xml
deleted file mode 100644
index dd25d443b..000000000
--- a/plugins/userinfo/package.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>userinfo</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Information about logged in user</summary>
-	<description>
-	    Sample plugin that adds a new tab to the settings section
-        to display some information about the current user.
-	</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<date>2011-11-21</date>
-	<version>
-		<release>1.0</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="userinfo.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="userinfo.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="localization/cs_CZ.inc" role="data"></file>
-			<file name="localization/da_DK.inc" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/et_EE.inc" role="data"></file>
-			<file name="localization/fr_FR.inc" role="data"></file>
-			<file name="localization/gl_ES.inc" role="data"></file>
-			<file name="localization/ja_JP.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/pt_BR.inc" role="data"></file>
-			<file name="localization/pt_PT.inc" role="data"></file>
-			<file name="localization/ro_RO.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-			<file name="localization/sv_SE.inc" role="data"></file>
-			<file name="localization/zh_TW.inc" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/vcard_attachments/composer.json b/plugins/vcard_attachments/composer.json
index 5e451adf4..07105bdf6 100644
--- a/plugins/vcard_attachments/composer.json
+++ b/plugins/vcard_attachments/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/vcard_attachments",
     "type": "roundcube-plugin",
     "description": "This plugin detects vCard attachments/bodies and shows a button(s) to add them to address book",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "3.2",
     "authors": [
         {
diff --git a/plugins/vcard_attachments/package.xml b/plugins/vcard_attachments/package.xml
deleted file mode 100644
index 9fdf0acf2..000000000
--- a/plugins/vcard_attachments/package.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>vcard_attachments</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>vCard handler for Roundcube</summary>
-	<description>This plugin detects vCard attachments/bodies and shows a button(s) to add them to address book</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2012-11-18</date>
-	<version>
-		<release>3.2</release>
-		<api>3.2</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>
-- Skip invalid vcards (#1488788)
-	</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="vcard_attachments.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="vcardattach.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="localization/be_BE.inc" role="data"></file>
-			<file name="localization/bs_BA.inc" role="data"></file>
-			<file name="localization/ca_ES.inc" role="data"></file>
-			<file name="localization/cs_CZ.inc" role="data"></file>
-			<file name="localization/cy_GB.inc" role="data"></file>
-			<file name="localization/da_DK.inc" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_GB.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/eo.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/et_EE.inc" role="data"></file>
-			<file name="localization/fa_IR.inc" role="data"></file>
-			<file name="localization/fi_FI.inc" role="data"></file>
-			<file name="localization/fr_FR.inc" role="data"></file>
-			<file name="localization/gl_ES.inc" role="data"></file>
-			<file name="localization/he_IL.inc" role="data"></file>
-			<file name="localization/hr_HR.inc" role="data"></file>
-			<file name="localization/hu_HU.inc" role="data"></file>
-			<file name="localization/hy_AM.inc" role="data"></file>
-			<file name="localization/id_ID.inc" role="data"></file>
-			<file name="localization/it_IT.inc" role="data"></file>
-			<file name="localization/ja_JP.inc" role="data"></file>
-			<file name="localization/ko_KR.inc" role="data"></file>
-			<file name="localization/lt_LT.inc" role="data"></file>
-			<file name="localization/lv_LV.inc" role="data"></file>
-			<file name="localization/ml_IN.inc" role="data"></file>
-			<file name="localization/mr_IN.inc" role="data"></file>
-			<file name="localization/nb_NB.inc" role="data"></file>
-			<file name="localization/nl_NL.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/pt_BR.inc" role="data"></file>
-			<file name="localization/pt_PT.inc" role="data"></file>
-			<file name="localization/ro_RO.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-			<file name="localization/si_LK.inc" role="data"></file>
-			<file name="localization/sk_SK.inc" role="data"></file>
-			<file name="localization/sl_SI.inc" role="data"></file>
-			<file name="localization/sr_CS.inc" role="data"></file>
-			<file name="localization/sv_SE.inc" role="data"></file>
-			<file name="localization/tr_TR.inc" role="data"></file>
-			<file name="localization/uk_UA.inc" role="data"></file>
-			<file name="localization/vi_VN.inc" role="data"></file>
-			<file name="localization/zh_CN.inc" role="data"></file>
-			<file name="localization/zh_TW.inc" role="data"></file>
-			<file name="skins/classic/style.css" role="data"></file>
-			<file name="skins/classic/vcard_add_contact.png" role="data"></file>
-			<file name="skins/classic/vcard.png" role="data"></file>
-			<file name="skins/larry/style.css" role="data"></file>
-			<file name="skins/larry/vcard_add_contact.png" role="data"></file>
-			<file name="skins/larry/vcard.png" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-	<changelog>
-		<release>
-			<date>2010-04-28</date>
-			<time>12:00:00</time>
-			<version>
-				<release>2.0</release>
-				<api>2.0</api>
-			</version>
-			<stability>
-				<release>stable</release>
-				<api>stable</api>
-			</stability>
-			<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-			<notes>
-- Added support for Content-Type: text/directory; profile=vCard
-- Added handler for message bodies of type vCard (#1486683)
-- Added support for more than one vCard attachment/body
-- Added support for more than one contact in one vCard file
-- Created package.xml
-			</notes>
-		</release>
-		<release>
-			<date>2012-03-11</date>
-			<time>19:00:00</time>
-			<version>
-				<release>3.1</release>
-				<api>3.1</api>
-			</version>
-			<stability>
-				<release>stable</release>
-				<api>stable</api>
-			</stability>
-			<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-			<notes>
-				- Add styles for new skin "Larry"
-			</notes>
-		</release>
-        <release>
-        	<date>2012-03-11</date>
-        	<time>19:00</time>
-	        <version>
-        		<release>3.1-beta</release>
-		        <api>3.1-beta</api>
-        	</version>
-	        <stability>
-        		<release>stable</release>
-        		<api>stable</api>
-        	</stability>
-        	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-        	<notes>
-- Add styles for new skin "Larry"
-- Exec contact_create hook when adding contact (#1486964)
-- Make icons skinable
-- Display vcard icon on messages list when message is of type vcard
-            </notes>
-        </release>
-        <release>
-            <date>2012-04-13</date>
-            <version>
-                <release>3.1</release>
-                <api>3.1</api>
-            </version>
-            <stability>
-                <release>stable</release>
-                <api>stable</api>
-            </stability>
-            <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-            <notes>
-- Fixed doble urlencoding of vcard identifier
-- Fixed encoding when default charset is different than vcard charset
-- Improved vcards import to work as addressbook::import procedure (with validation and autofix)
-- Support IDNA
-- Import contacts to default addressbook
-            </notes>
-        </release>
-    </changelog>
-</package>
diff --git a/plugins/virtuser_file/composer.json b/plugins/virtuser_file/composer.json
index 1bf6ec043..27beab830 100644
--- a/plugins/virtuser_file/composer.json
+++ b/plugins/virtuser_file/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/virtuser_file",
     "type": "roundcube-plugin",
     "description": "Plugin adds possibility to resolve user email/login according to lookup tables in files.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "1.0",
     "authors": [
         {
diff --git a/plugins/virtuser_file/package.xml b/plugins/virtuser_file/package.xml
deleted file mode 100644
index 9b55ce427..000000000
--- a/plugins/virtuser_file/package.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>virtuser_file</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>File based User-to-Email and Email-to-User lookup</summary>
-	<description>Plugin adds possibility to resolve user email/login according to lookup tables in files.</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2011-11-21</date>
-	<version>
-		<release>1.0</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="virtuser_file.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/virtuser_query/composer.json b/plugins/virtuser_query/composer.json
index 6585a4117..7459ca9bd 100644
--- a/plugins/virtuser_query/composer.json
+++ b/plugins/virtuser_query/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/virtuser_query",
     "type": "roundcube-plugin",
     "description": "Plugin adds possibility to resolve user email/login according to lookup tables in SQL database.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "2.0",
     "authors": [
         {
diff --git a/plugins/virtuser_query/package.xml b/plugins/virtuser_query/package.xml
deleted file mode 100644
index 9430bf69d..000000000
--- a/plugins/virtuser_query/package.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>virtuser_query</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>SQL based User-to-Email and Email-to-User lookup</summary>
-	<description>Plugin adds possibility to resolve user email/login according to lookup tables in SQL database.</description>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2012-02-17</date>
-	<version>
-		<release>2.0</release>
-		<api>2.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="virtuser_query.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/zipdownload/composer.json b/plugins/zipdownload/composer.json
index cdfbf9923..bc171d82a 100644
--- a/plugins/zipdownload/composer.json
+++ b/plugins/zipdownload/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/zipdownload",
     "type": "roundcube-plugin",
     "description": "Adds an option to download all attachments to a message in one zip file, when a message has multiple attachments. Also allows the download of a selection of messages in one zip file. Supports mbox and maildir format.",
-    "license": "GNU GPLv3+",
+    "license": "GPLv3+",
     "version": "3.0",
     "authors": [
         {
diff --git a/plugins/zipdownload/package.xml b/plugins/zipdownload/package.xml
deleted file mode 100644
index 7485c5870..000000000
--- a/plugins/zipdownload/package.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-		http://pear.php.net/dtd/tasks-1.0.xsd
-		http://pear.php.net/dtd/package-2.0
-		http://pear.php.net/dtd/package-2.0.xsd">
-	<name>zipdownload</name>
-	<channel>pear.roundcube.net</channel>
-	<summary>Download multiple attachments or messages in one zip file</summary>
-	<description>Adds an option to download all attachments to a message in one zip file, when a message has multiple attachments.
-	Also allows the download of a selection of messages in one zip file. Supports mbox and maildir formats.</description>
-	<lead>
-		<name>Philip Weir</name>
-		<user>JohnDoh</user>
-		<email>roundcube@tehinterweb.co.uk</email>
-		<active>no</active>
-	</lead>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>bruederli</user>
-		<email>roundcube@gmail.com</email>
-		<active>yes</active>
-	</lead>
-	<lead>
-		<name>Aleksander Machniak</name>
-		<user>alec</user>
-		<email>alec@alec.pl</email>
-		<active>yes</active>
-	</lead>
-	<date>2014-04-18</date>
-	<time>09:00:00</time>
-	<version>
-		<release>3.0</release>
-		<api>3.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>Repo only</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="zipdownload.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="zipdownload.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="config.inc.php.dist" role="data"/>
-			<file name="CHANGELOG" role="data"/>
-			<file name="README" role="data"/>
-			<file name="localization/ca_ES.inc" role="data"/>
-			<file name="localization/cs_CZ.inc" role="data"/>
-			<file name="localization/da_DK.inc" role="data"/>
-			<file name="localization/de_CH.inc" role="data"/>
-			<file name="localization/de_DE.inc" role="data"/>
-			<file name="localization/en_GB.inc" role="data"/>
-			<file name="localization/en_US.inc" role="data"/>
-			<file name="localization/es_AR.inc" role="data"/>
-			<file name="localization/es_ES.inc" role="data"/>
-			<file name="localization/et_EE.inc" role="data"/>
-			<file name="localization/fr_FR.inc" role="data"/>
-			<file name="localization/gl_ES.inc" role="data"/>
-			<file name="localization/hu_HU.inc" role="data"/>
-			<file name="localization/it_IT.inc" role="data"/>
-			<file name="localization/nl_NL.inc" role="data"/>
-			<file name="localization/pl_PL.inc" role="data"/>
-			<file name="localization/pt_BR.inc" role="data"/>
-			<file name="localization/ro_RO.inc" role="data"/>
-			<file name="localization/ru_RU.inc" role="data"/>
-			<file name="localization/tr_TR.inc" role="data"/>
-			<file name="skins/classic/zip.png" role="data"/>
-			<file name="skins/classic/zipdownload.css" role="data"/>
-			<file name="skins/larry/zipdownload.css" role="data"/>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-			<extension>
-				<name>zip</name>
-				<channel>pecl.php.net</channel>
-				<providesextension>zip</providesextension>
-			</extension>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
index 92a56363a..c74162619 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -252,6 +252,7 @@ class rcube_plugin_api
         'GPLv2'      => 'http://www.gnu.org/licenses/gpl-2.0.html',
         'GPL-2.0'    => 'http://www.gnu.org/licenses/gpl-2.0.html',
         'GPLv3'      => 'http://www.gnu.org/licenses/gpl-3.0.html',
+        'GPLv3+'     => 'http://www.gnu.org/licenses/gpl-3.0.html',
         'GPL-3.0'    => 'http://www.gnu.org/licenses/gpl-3.0.html',
         'GPL-3.0+'   => 'http://www.gnu.org/licenses/gpl.html',
         'GPL-2.0+'   => 'http://www.gnu.org/licenses/gpl.html',