diff --git a/composer.json b/composer.json
index 755663bde..0693e461d 100644
--- a/composer.json
+++ b/composer.json
@@ -24,67 +24,61 @@
     "version": "7.0.0",
     "time": "2017-11-11",
     "repositories": [
-        {
-            "type": "pear",
-            "url": "https://pear.horde.org"
-        }
     ],
     "require": {
         "php": "^5.3 || ^7",
-        "pear-pear.horde.org/horde": "^5",
-        "pear-pear.horde.org/Horde_Auth": "^2",
-        "pear-pear.horde.org/Horde_Browser": "^2",
-        "pear-pear.horde.org/Horde_Cache": "^2",
-        "pear-pear.horde.org/Horde_Compress": "^2",
-        "pear-pear.horde.org/Horde_Core": "^2.17",
-        "pear-pear.horde.org/Horde_Crypt": "^2.7",
-        "pear-pear.horde.org/Horde_Crypt_Blowfish": "^1",
-        "pear-pear.horde.org/Horde_Css_Parser": "^1",
-        "pear-pear.horde.org/Horde_Date": "^2",
-        "pear-pear.horde.org/Horde_Editor": "^2.0.4",
-        "pear-pear.horde.org/Horde_Exception": "^2",
-        "pear-pear.horde.org/Horde_Icalendar": "^2.1",
-        "pear-pear.horde.org/Horde_Image": "^2",
-        "pear-pear.horde.org/Horde_Imap_Client": "^2.27",
-        "pear-pear.horde.org/Horde_Itip": "^2.1",
-        "pear-pear.horde.org/Horde_ListHeaders": "^1.1",
-        "pear-pear.horde.org/Horde_LoginTasks": "^2",
-        "pear-pear.horde.org/Horde_Mail": "^2.5",
-        "pear-pear.horde.org/Horde_Mail_Autoconfig": "^1",
-        "pear-pear.horde.org/Horde_Mime": "^2.10",
-        "pear-pear.horde.org/Horde_Mime_Viewer": "^2",
-        "pear-pear.horde.org/Horde_Nls": "^2",
-        "pear-pear.horde.org/Horde_Notification": "^2",
-        "pear-pear.horde.org/Horde_Pack": "^1",
-        "pear-pear.horde.org/Horde_Perms": "^2",
-        "pear-pear.horde.org/Horde_SpellChecker": "^2",
-        "pear-pear.horde.org/Horde_Stream": "^1.4",
-        "pear-pear.horde.org/Horde_Stream_Filter": "^2",
-        "pear-pear.horde.org/Horde_Stream_Wrapper": "^2.1",
-        "pear-pear.horde.org/Horde_Support": "^2.0.5",
-        "pear-pear.horde.org/Horde_Text_Filter": "^2.1",
-        "pear-pear.horde.org/Horde_Text_Flowed": "^2",
-        "pear-pear.horde.org/Horde_Tree": "^2",
-        "pear-pear.horde.org/Horde_Url": "^2.2",
-        "pear-pear.horde.org/Horde_Util": "^2.4",
-        "pear-pear.horde.org/Horde_Vfs": "^2",
-        "pear-pear.horde.org/Horde_View": "^2",
+        "horde/horde": "^5",
+        "horde/auth": "^2",
+        "horde/browser": "^2",
+        "horde/cache": "^2",
+        "horde/compress": "^2",
+        "horde/core": "^2.17",
+        "horde/crypt": "^2.7",
+        "horde/crypt_blowfish": "^1",
+        "horde/css_parser": "^1",
+        "horde/date": "^2",
+        "horde/editor": "^2.0.4",
+        "horde/exception": "^2",
+        "horde/icalendar": "^2.1",
+        "horde/image": "^2",
+        "horde/imap_client": "^2.27",
+        "horde/itip": "^2.1",
+        "horde/listheaders": "^1.1",
+        "horde/logintasks": "^2",
+        "horde/mail": "^2.5",
+        "horde/mail_autoconfig": "^1",
+        "horde/mime": "^2.10",
+        "horde/mime_viewer": "^2",
+        "horde/nls": "^2",
+        "horde/notification": "^2",
+        "horde/pack": "^1",
+        "horde/perms": "^2",
+        "horde/spellchecker": "^2",
+        "horde/stream": "^1.4",
+        "horde/stream_filter": "^2",
+        "horde/stream_wrapper": "^2.1",
+        "horde/support": "^2.0.5",
+        "horde/text_filter": "^2.1",
+        "horde/text_flowed": "^2",
+        "horde/tree": "^2",
+        "horde/url": "^2.2",
+        "horde/util": "^2.4",
+        "horde/vfs": "^2",
+        "horde/view": "^2",
         "ext-dom": "*",
         "ext-gettext": "*",
         "ext-hash": "*",
         "ext-json": "*"
     },
     "suggest": {
-        "pear-pear.horde.org/Horde_History": "^2",
-        "pear-pear.horde.org/Horde_Http": "^2",
-        "pear-pear.horde.org/Horde_Mongo": "^1",
-        "pear-pear.horde.org/Horde_Service_Gravatar": "^1",
-        "pear-phpseclib.sourceforge.net/File_ASN1": "*",
+        "horde/history": "^2",
+        "horde/http": "^2",
+        "horde/mongo": "^1",
+        "horde/service_gravatar": "^1",
+        "pear/file_asn1": "*",
         "ext-openssl": "*"
     },
     "replace": {
-        "pear-pear.horde.org/imp": "7.*",
-        "pear-horde/imp": "7.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/lib/Ajax/Queue.php b/lib/Ajax/Queue.php
index 5762c28f8..d2df32f02 100644
--- a/lib/Ajax/Queue.php
+++ b/lib/Ajax/Queue.php
@@ -290,7 +290,7 @@ public function add(IMP_Ajax_Application $ajax)
             ($quotadata = $injector->getInstance('IMP_Quota_Ui')->quota($this->_quota[0], $this->_quota[1]))) {
             $ajax->addTask('quota', array(
                 'm' => $quotadata['message'],
-                'p' => round($quotadata['percent']),
+                'p' => round(floatval($quotadata['percent'])),
                 'l' => $quotadata['percent'] >= 90
                     ? 'alert'
                     : ($quotadata['percent'] >= 75 ? 'warn' : '')
diff --git a/lib/Mime/Viewer/Appledouble.php b/lib/Mime/Viewer/Appledouble.php
index 2426b176d..1222c13ee 100644
--- a/lib/Mime/Viewer/Appledouble.php
+++ b/lib/Mime/Viewer/Appledouble.php
@@ -96,7 +96,7 @@ protected function _IMPrender($inline)
         $data_name = $this->getConfigParam('imp_contents')->getPartName($data_part);
 
         $status = new IMP_Mime_Status($this->_mimepart, array(
-            sprintf(_("This message contains a Macintosh file (named \"%s\")."), $data_name),
+            sprintf(_("This message contains a Macintosh file (named \"%s\")."), htmlspecialchars($data_name, ENT_QUOTES, $this->getConfigParam('charset'))),
             $this->getConfigParam('imp_contents')->linkViewJS(
                 $applefile_part,
                 'download_attach',