moved plugins

34 files changed, 0 insertions, 5482 deletions

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
deleted file mode 100644
index c84a49512..000000000
--- a/plugins/managesieve/Changelog
+++ /dev/null
@@ -1,118 +0,0 @@
-* version 2.3 [2010-03-18]
------------------------------------------------------------
-- Added import from Horde-INGO
-- Support for more than one match using if+stop instead of if+elsif structures (#1486078)
-- Support for selectively disabling rules within a single sieve script (#1485882)
-- Added vertical splitter
-
-* version 2.2 [2010-02-06]
------------------------------------------------------------
-- Fix handling of "<>" characters in filter names (#1486477)
-
-* version 2.1 [2010-01-12]
------------------------------------------------------------
-- Fix "require" structure generation when many modules are used
-- Fix problem with '<' and '>' characters in header tests
-
-* version 2.0 [2009-11-02]
------------------------------------------------------------
-- Added 'managesieve_debug' option
-- Added multi-script support
-- Small css improvements + sprite image buttons
-- PEAR::NetSieve 1.2.0b1
-
-* version 1.7 [2009-09-20]
------------------------------------------------------------
-- Support multiple managesieve hosts using %h variable
-  in managesieve_host option
-- Fix first rule deleting (#1486140) 
-
-* version 1.6 [2009-09-08]
------------------------------------------------------------
-- Fix warning when importing squirrelmail rules
-- Fix handling of "true" as "anyof (true)" test
-
-* version 1.5 [2009-09-04]
------------------------------------------------------------
-- Added es_ES, ua_UA localizations
-- Added 'managesieve_mbox_encoding' option
-
-* version 1.4 [2009-07-29]
------------------------------------------------------------
-- Updated PEAR::Net_Sieve to 1.1.7
-
-* version 1.3 [2009-07-24]
------------------------------------------------------------
-- support more languages
-- support config.inc.php file
-
-* version 1.2 [2009-06-28]
------------------------------------------------------------
-- Support IMAP namespaces in fileinto (#1485943)
-- Added it_IT localization
-
-* version 1.1 [2009-05-27]
------------------------------------------------------------    
-- Added new icons
-- Added support for headers lists (coma-separated) in rules
-- Added de_CH localization
-
-* version 1.0 [2009-05-21]
------------------------------------------------------------    
-- Rewritten using plugin API
-- Added hu_HU localization (Tamas Tevesz)
-
-* version beta7 (svn-r2300) [2009-03-01]
------------------------------------------------------------    
-- Added SquirrelMail script auto-import (Jonathan Ernst)
-- Added 'vacation' support (Jonathan Ernst & alec)
-- Added 'stop' support (Jonathan Ernst)
-- Added option for extensions disabling (Jonathan Ernst & alec)
-- Added fi_FI, nl_NL, bg_BG localization
-- Small style fixes
-
-* version 0.2-stable1 (svn-r2205) [2009-01-03]
------------------------------------------------------------    
-- Fix moving down filter row
-- Fixes for compressed js files in stable release package
-- Created patch for svn version r2205
-
-* version 0.2-stable [2008-12-31]
------------------------------------------------------------    
-- Added ru_RU, fr_FR, zh_CN translation
-- Fixes for Roundcube 0.2-stable
-
-* version rc0.2beta [2008-09-21]
------------------------------------------------------------    
-- Small css fixes for IE
-- Fixes for Roundcube 0.2-beta
-
-* version beta6 [2008-08-08]
------------------------------------------------------------    
-- Added de_DE translation
-- Fix for Roundcube r1634
-
-* version beta5 [2008-06-10]
------------------------------------------------------------    
-- Fixed 'exists' operators
-- Fixed 'not*' operators for custom headers
-- Fixed filters deleting
-
-* version beta4 [2008-06-09]
------------------------------------------------------------    
-- Fix for Roundcube r1490
-
-* version beta3 [2008-05-22]
------------------------------------------------------------    
-- Fixed textarea error class setting
-- Added pagetitle setting
-- Added option 'managesieve_replace_delimiter'
-- Fixed errors on IE (still need some css fixes)
-    
-* version beta2 [2008-05-20]
------------------------------------------------------------    
-- Use 'if' only for first filter and 'elsif' for the rest
-
-* version beta1 [2008-05-15]
------------------------------------------------------------    
-- Initial version for Roundcube r1388.
diff --git a/plugins/managesieve/config.inc.php.dist b/plugins/managesieve/config.inc.php.dist
deleted file mode 100644
index bac68c77c..000000000
--- a/plugins/managesieve/config.inc.php.dist
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-// managesieve server port
-$rcmail_config['managesieve_port'] = 2000;
-
-// managesieve server address, default is localhost.
-// Use %h variable as replacement for user's IMAP hostname
-$rcmail_config['managesieve_host'] = 'localhost';
-
-// use or not TLS for managesieve server connection
-// it's because I've problems with TLS and dovecot's managesieve plugin
-// and it's not needed on localhost
-$rcmail_config['managesieve_usetls'] = false;
-
-// default contents of filters script (eg. default spam filter)
-$rcmail_config['managesieve_default'] = '/etc/dovecot/sieve/global';
-
-// Sieve RFC says that we should use UTF-8 endcoding for mailbox names,
-// but some implementations does not covert UTF-8 to modified UTF-7.
-// Defaults to UTF7-IMAP
-$rcmail_config['managesieve_mbox_encoding'] = 'UTF-8';
-
-// I need this because my dovecot (with listescape plugin) uses
-// ':' delimiter, but creates folders with dot delimiter
-$rcmail_config['managesieve_replace_delimiter'] = '';
-
-// disabled sieve extensions (body, copy, date, editheader, encoded-character,
-// envelope, environment, ereject, fileinto, ihave, imap4flags, index,
-// mailbox, mboxmetadata, regex, reject, relational, servermetadata,
-// spamtest, spamtestplus, subaddress, vacation, variables, virustest, etc.
-// Note: not all extensions are implemented
-$rcmail_config['managesieve_disabled_extensions'] = array();
-
-// Enables debugging of conversation with sieve server. Logs it into <log_dir>/sieve
-$rcmail_config['managesieve_debug'] = false;
-
-?>
diff --git a/plugins/managesieve/lib/Net/Sieve.php b/plugins/managesieve/lib/Net/Sieve.php
deleted file mode 100644
index b2549eed9..000000000
--- a/plugins/managesieve/lib/Net/Sieve.php
+++ /dev/null
@@ -1,1212 +0,0 @@
-<?php
-/**
- * This file contains the Net_Sieve class.
- *
- * PHP version 4
- *
- * +-----------------------------------------------------------------------+
- * | All rights reserved.                                                  |
- * |                                                                       |
- * | Redistribution and use in source and binary forms, with or without    |
- * | modification, are permitted provided that the following conditions    |
- * | are met:                                                              |
- * |                                                                       |
- * | o Redistributions of source code must retain the above copyright      |
- * |   notice, this list of conditions and the following disclaimer.       |
- * | o Redistributions in binary form must reproduce the above copyright   |
- * |   notice, this list of conditions and the following disclaimer in the |
- * |   documentation and/or other materials provided with the distribution.|
- * |                                                                       |
- * | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
- * | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
- * | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
- * | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
- * | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
- * | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
- * | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
- * | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
- * | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
- * | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
- * | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
- * +-----------------------------------------------------------------------+
- *
- * @category  Networking
- * @package   Net_Sieve
- * @author    Richard Heyes <richard@phpguru.org>
- * @author    Damian Fernandez Sosa <damlists@cnba.uba.ar>
- * @author    Anish Mistry <amistry@am-productions.biz>
- * @author    Jan Schneider <jan@horde.org>
- * @copyright 2002-2003 Richard Heyes
- * @copyright 2006-2008 Anish Mistry
- * @license   http://www.opensource.org/licenses/bsd-license.php BSD
- * @version   SVN: $Id: Sieve.php 289313 2009-10-07 22:26:33Z yunosh $
- * @link      http://pear.php.net/package/Net_Sieve
- */
-
-require_once 'PEAR.php';
-require_once 'Net/Socket.php';
-
-/**
- * TODO
- *
- * o supportsAuthMech()
- */
-
-/**
- * Disconnected state
- * @const NET_SIEVE_STATE_DISCONNECTED
- */
-define('NET_SIEVE_STATE_DISCONNECTED', 1, true);
-
-/**
- * Authorisation state
- * @const NET_SIEVE_STATE_AUTHORISATION
- */
-define('NET_SIEVE_STATE_AUTHORISATION', 2, true);
-
-/**
- * Transaction state
- * @const NET_SIEVE_STATE_TRANSACTION
- */
-define('NET_SIEVE_STATE_TRANSACTION', 3, true);
-
-
-/**
- * A class for talking to the timsieved server which comes with Cyrus IMAP.
- *
- * @category  Networking
- * @package   Net_Sieve
- * @author    Richard Heyes <richard@phpguru.org>
- * @author    Damian Fernandez Sosa <damlists@cnba.uba.ar>
- * @author    Anish Mistry <amistry@am-productions.biz>
- * @author    Jan Schneider <jan@horde.org>
- * @copyright 2002-2003 Richard Heyes
- * @copyright 2006-2008 Anish Mistry
- * @license   http://www.opensource.org/licenses/bsd-license.php BSD
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/Net_Sieve
- * @link      http://www.ietf.org/rfc/rfc3028.txt RFC 3028 (Sieve: A Mail
- *            Filtering Language)
- * @link      http://tools.ietf.org/html/draft-ietf-sieve-managesieve A
- *            Protocol for Remotely Managing Sieve Scripts
- */
-class Net_Sieve
-{
-    /**
-     * The authentication methods this class supports.
-     *
-     * Can be overwritten if having problems with certain methods.
-     *
-     * @var array
-     */
-    var $supportedAuthMethods = array('DIGEST-MD5', 'CRAM-MD5', 'EXTERNAL',
-                                      'PLAIN' , 'LOGIN');
-
-    /**
-     * SASL authentication methods that require Auth_SASL.
-     *
-     * @var array
-     */
-    var $_supportedSASLAuthMethods = array('DIGEST-MD5', 'CRAM-MD5');
-
-    /**
-     * The socket handle.
-     *
-     * @var resource
-     */
-    var $_sock;
-
-    /**
-     * Parameters and connection information.
-     *
-     * @var array
-     */
-    var $_data;
-
-    /**
-     * Current state of the connection.
-     *
-     * One of the NET_SIEVE_STATE_* constants.
-     *
-     * @var integer
-     */
-    var $_state;
-
-    /**
-     * Constructor error.
-     *
-     * @var PEAR_Error
-     */
-    var $_error;
-
-    /**
-     * Whether to enable debugging.
-     *
-     * @var boolean
-     */
-    var $_debug = false;
-
-    /**
-     * Debug output handler.
-     *
-     * This has to be a valid callback.
-     *
-     * @var string|array
-     */
-    var $_debug_handler = null;
-
-    /**
-     * Whether to pick up an already established connection.
-     *
-     * @var boolean
-     */
-    var $_bypassAuth = false;
-
-    /**
-     * Whether to use TLS if available.
-     *
-     * @var boolean
-     */
-    var $_useTLS = true;
-
-    /**
-     * Additional options for stream_context_create().
-     *
-     * @var array
-     */
-    var $_options = null;
-
-    /**
-     * Maximum number of referral loops
-     *
-     * @var array
-     */
-    var $_maxReferralCount = 15;
-
-    /**
-     * Constructor.
-     *
-     * Sets up the object, connects to the server and logs in. Stores any
-     * generated error in $this->_error, which can be retrieved using the
-     * getError() method.
-     *
-     * @param string  $user       Login username.
-     * @param string  $pass       Login password.
-     * @param string  $host       Hostname of server.
-     * @param string  $port       Port of server.
-     * @param string  $logintype  Type of login to perform (see
-     *                            $supportedAuthMethods).
-     * @param string  $euser      Effective user. If authenticating as an
-     *                            administrator, login as this user.
-     * @param boolean $debug      Whether to enable debugging (@see setDebug()).
-     * @param string  $bypassAuth Skip the authentication phase. Useful if the
-     *                            socket is already open.
-     * @param boolean $useTLS     Use TLS if available.
-     * @param array   $options    Additional options for
-     *                            stream_context_create().
-     */
-    function Net_Sieve($user = null, $pass  = null, $host = 'localhost',
-        $port = 2000, $logintype = '', $euser = '', $debug = false,
-        $bypassAuth = false, $useTLS = true, $options = null
-    ) {
-        $this->_state             = NET_SIEVE_STATE_DISCONNECTED;
-        $this->_data['user']      = $user;
-        $this->_data['pass']      = $pass;
-        $this->_data['host']      = $host;
-        $this->_data['port']      = $port;
-        $this->_data['logintype'] = $logintype;
-        $this->_data['euser']     = $euser;
-        $this->_sock              = new Net_Socket();
-        $this->_debug             = $debug;
-        $this->_bypassAuth        = $bypassAuth;
-        $this->_useTLS            = $useTLS;
-        $this->_options           = $options;
-
-        /* Try to include the Auth_SASL package.  If the package is not
-         * available, we disable the authentication methods that depend upon
-         * it. */
-        if ((@include_once 'Auth/SASL.php') === false) {
-            $this->_debug('Auth_SASL not present');
-            foreach ($this->supportedSASLAuthMethods as $SASLMethod) {
-                $pos = array_search($SASLMethod, $this->supportedAuthMethods);
-                $this->_debug('Disabling method ' . $SASLMethod);
-                unset($this->supportedAuthMethods[$pos]);
-            }
-        }
-
-        if (strlen($user) && strlen($pass)) {
-            $this->_error = $this->_handleConnectAndLogin();
-        }
-    }
-
-    /**
-     * Returns any error that may have been generated in the constructor.
-     *
-     * @return boolean|PEAR_Error  False if no error, PEAR_Error otherwise.
-     */
-    function getError()
-    {
-        return PEAR::isError($this->_error) ? $this->_error : false;
-    }
-
-    /**
-     * Sets the debug state and handler function.
-     *
-     * @param boolean $debug   Whether to enable debugging.
-     * @param string  $handler A custom debug handler. Must be a valid callback.
-     *
-     * @return void
-     */
-    function setDebug($debug = true, $handler = null)
-    {
-        $this->_debug = $debug;
-        $this->_debug_handler = $handler;
-    }
-
-    /**
-     * Connects to the server and logs in.
-     *
-     * @return boolean  True on success, PEAR_Error on failure.
-     */
-    function _handleConnectAndLogin()
-    {
-        if (PEAR::isError($res = $this->connect($this->_data['host'], $this->_data['port'], $this->_options, $this->_useTLS))) {
-            return $res;
-        }
-        if ($this->_bypassAuth === false) {
-            if (PEAR::isError($res = $this->login($this->_data['user'], $this->_data['pass'], $this->_data['logintype'], $this->_data['euser'], $this->_bypassAuth))) {
-                return $res;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Handles connecting to the server and checks the response validity.
-     *
-     * @param string  $host    Hostname of server.
-     * @param string  $port    Port of server.
-     * @param array   $options List of options to pass to
-     *                         stream_context_create().
-     * @param boolean $useTLS  Use TLS if available.
-     *
-     * @return boolean  True on success, PEAR_Error otherwise.
-     */
-    function connect($host, $port, $options = null, $useTLS = true)
-    {
-        if (NET_SIEVE_STATE_DISCONNECTED != $this->_state) {
-            return PEAR::raiseError('Not currently in DISCONNECTED state', 1);
-        }
-
-        if (PEAR::isError($res = $this->_sock->connect($host, $port, false, 5, $options))) {
-            return $res;
-        }
-
-        if ($this->_bypassAuth) {
-            $this->_state = NET_SIEVE_STATE_TRANSACTION;
-        } else {
-            $this->_state = NET_SIEVE_STATE_AUTHORISATION;
-            if (PEAR::isError($res = $this->_doCmd())) {
-                return $res;
-            }
-        }
-
-        // Explicitly ask for the capabilities in case the connection is
-        // picked up from an existing connection.
-        if (PEAR::isError($res = $this->_cmdCapability())) {
-            return PEAR::raiseError(
-                'Failed to connect, server said: ' . $res->getMessage(), 2
-            );
-        }
-
-        // Check if we can enable TLS via STARTTLS.
-        if ($useTLS && !empty($this->_capability['starttls'])
-            && function_exists('stream_socket_enable_crypto')
-        ) {
-            if (PEAR::isError($res = $this->_startTLS())) {
-                return $res;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Disconnect from the Sieve server.
-     *
-     * @param boolean $sendLogoutCMD Whether to send LOGOUT command before
-     *                               disconnecting.
-     *
-     * @return boolean  True on success, PEAR_Error otherwise.
-     */
-    function disconnect($sendLogoutCMD = true)
-    {
-        return $this->_cmdLogout($sendLogoutCMD);
-    }
-
-    /**
-     * Logs into server.
-     *
-     * @param string  $user       Login username.
-     * @param string  $pass       Login password.
-     * @param string  $logintype  Type of login method to use.
-     * @param string  $euser      Effective UID (perform on behalf of $euser).
-     * @param boolean $bypassAuth Do not perform authentication.
-     *
-     * @return boolean  True on success, PEAR_Error otherwise.
-     */
-    function login($user, $pass, $logintype = null, $euser = '', $bypassAuth = false)
-    {
-        if (NET_SIEVE_STATE_AUTHORISATION != $this->_state) {
-            return PEAR::raiseError('Not currently in AUTHORISATION state', 1);
-        }
-
-        if (!$bypassAuth ) {
-            if (PEAR::isError($res = $this->_cmdAuthenticate($user, $pass, $logintype, $euser))) {
-                return $res;
-            }
-        }
-        $this->_state = NET_SIEVE_STATE_TRANSACTION;
-
-        return true;
-    }
-
-    /**
-     * Returns an indexed array of scripts currently on the server.
-     *
-     * @return array  Indexed array of scriptnames.
-     */
-    function listScripts()
-    {
-        if (is_array($scripts = $this->_cmdListScripts())) {
-            $this->_active = $scripts[1];
-            return $scripts[0];
-        } else {
-            return $scripts;
-        }
-    }
-
-    /**
-     * Returns the active script.
-     *
-     * @return string  The active scriptname.
-     */
-    function getActive()
-    {
-        if (!empty($this->_active)) {
-            return $this->_active;
-        }
-        if (is_array($scripts = $this->_cmdListScripts())) {
-            $this->_active = $scripts[1];
-            return $scripts[1];
-        }
-    }
-
-    /**
-     * Sets the active script.
-     *
-     * @param string $scriptname The name of the script to be set as active.
-     *
-     * @return boolean  True on success, PEAR_Error on failure.
-     */
-    function setActive($scriptname)
-    {
-        return $this->_cmdSetActive($scriptname);
-    }
-
-    /**
-     * Retrieves a script.
-     *
-     * @param string $scriptname The name of the script to be retrieved.
-     *
-     * @return string  The script on success, PEAR_Error on failure.
-    */
-    function getScript($scriptname)
-    {
-        return $this->_cmdGetScript($scriptname);
-    }
-
-    /**
-     * Adds a script to the server.
-     *
-     * @param string  $scriptname Name of the script.
-     * @param string  $script     The script content.
-     * @param boolean $makeactive Whether to make this the active script.
-     *
-     * @return boolean  True on success, PEAR_Error on failure.
-     */
-    function installScript($scriptname, $script, $makeactive = false)
-    {
-        if (PEAR::isError($res = $this->_cmdPutScript($scriptname, $script))) {
-            return $res;
-        }
-        if ($makeactive) {
-            return $this->_cmdSetActive($scriptname);
-        }
-        return true;
-    }
-
-    /**
-     * Removes a script from the server.
-     *
-     * @param string $scriptname Name of the script.
-     *
-     * @return boolean  True on success, PEAR_Error on failure.
-     */
-    function removeScript($scriptname)
-    {
-        return $this->_cmdDeleteScript($scriptname);
-    }
-
-    /**
-     * Checks if the server has space to store the script by the server.
-     *
-     * @param string  $scriptname The name of the script to mark as active.
-     * @param integer $size       The size of the script.
-     *
-     * @return boolean|PEAR_Error  True if there is space, PEAR_Error otherwise.
-     *
-     * @todo Rename to hasSpace()
-     */
-    function haveSpace($scriptname, $size)
-    {
-        if (NET_SIEVE_STATE_TRANSACTION != $this->_state) {
-            return PEAR::raiseError('Not currently in TRANSACTION state', 1);
-        }
-        if (PEAR::isError($res = $this->_doCmd(sprintf('HAVESPACE "%s" %d', $scriptname, $size)))) {
-            return $res;
-        }
-        return true;
-    }
-
-    /**
-     * Returns the list of extensions the server supports.
-     *
-     * @return array  List of extensions or PEAR_Error on failure.
-     */
-    function getExtensions()
-    {
-        if (NET_SIEVE_STATE_DISCONNECTED == $this->_state) {
-            return PEAR::raiseError('Not currently connected', 7);
-        }
-        return $this->_capability['extensions'];
-    }
-
-    /**
-     * Returns whether the server supports an extension.
-     *
-     * @param string $extension The extension to check.
-     *
-     * @return boolean  Whether the extension is supported or PEAR_Error on
-     *                  failure.
-     */
-    function hasExtension($extension)
-    {
-        if (NET_SIEVE_STATE_DISCONNECTED == $this->_state) {
-            return PEAR::raiseError('Not currently connected', 7);
-        }
-
-        $extension = trim($this->_toUpper($extension));
-        if (is_array($this->_capability['extensions'])) {
-            foreach ($this->_capability['extensions'] as $ext) {
-                if ($ext == $extension) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the list of authentication methods the server supports.
-     *
-     * @return array  List of authentication methods or PEAR_Error on failure.
-     */
-    function getAuthMechs()
-    {
-        if (NET_SIEVE_STATE_DISCONNECTED == $this->_state) {
-            return PEAR::raiseError('Not currently connected', 7);
-        }
-        return $this->_capability['sasl'];
-    }
-
-    /**
-     * Returns whether the server supports an authentication method.
-     *
-     * @param string $method The method to check.
-     *
-     * @return boolean  Whether the method is supported or PEAR_Error on
-     *                  failure.
-     */
-    function hasAuthMech($method)
-    {
-        if (NET_SIEVE_STATE_DISCONNECTED == $this->_state) {
-            return PEAR::raiseError('Not currently connected', 7);
-        }
-
-        $method = trim($this->_toUpper($method));
-        if (is_array($this->_capability['sasl'])) {
-            foreach ($this->_capability['sasl'] as $sasl) {
-                if ($sasl == $method) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Handles the authentication using any known method.
-     *
-     * @param string $uid        The userid to authenticate as.
-     * @param string $pwd        The password to authenticate with.
-     * @param string $userMethod The method to use. If empty, the class chooses
-     *                           the best (strongest) available method.
-     * @param string $euser      The effective uid to authenticate as.
-     *
-     * @return void
-     */
-    function _cmdAuthenticate($uid, $pwd, $userMethod = null, $euser = '')
-    {
-        if (PEAR::isError($method = $this->_getBestAuthMethod($userMethod))) {
-            return $method;
-        }
-        switch ($method) {
-        case 'DIGEST-MD5':
-            return $this->_authDigestMD5($uid, $pwd, $euser);
-        case 'CRAM-MD5':
-            $result = $this->_authCRAMMD5($uid, $pwd, $euser);
-            break;
-        case 'LOGIN':
-            $result = $this->_authLOGIN($uid, $pwd, $euser);
-            break;
-        case 'PLAIN':
-            $result = $this->_authPLAIN($uid, $pwd, $euser);
-            break;
-        case 'EXTERNAL':
-            $result = $this->_authEXTERNAL($uid, $pwd, $euser);
-            break;
-        default :
-            $result = PEAR::raiseError(
-                $method . ' is not a supported authentication method'
-            );
-            break;
-        }
-
-        if (PEAR::isError($res = $this->_doCmd())) {
-            return $res;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Authenticates the user using the PLAIN method.
-     *
-     * @param string $user  The userid to authenticate as.
-     * @param string $pass  The password to authenticate with.
-     * @param string $euser The effective uid to authenticate as.
-     *
-     * @return void
-     */
-    function _authPLAIN($user, $pass, $euser)
-    {
-        return $this->_sendCmd(
-            sprintf(
-                'AUTHENTICATE "PLAIN" "%s"',
-                base64_encode($euser . chr(0) . $user . chr(0) . $pass)
-            )
-        );
-    }
-
-    /**
-     * Authenticates the user using the LOGIN method.
-     *
-     * @param string $user  The userid to authenticate as.
-     * @param string $pass  The password to authenticate with.
-     * @param string $euser The effective uid to authenticate as.
-     *
-     * @return void
-     */
-    function _authLOGIN($user, $pass, $euser)
-    {
-        if (PEAR::isError($result = $this->_sendCmd('AUTHENTICATE "LOGIN"'))) {
-            return $result;
-        }
-        if (PEAR::isError($result = $this->_doCmd('"' . base64_encode($user) . '"'))) {
-            return $result;
-        }
-        return $this->_doCmd('"' . base64_encode($pass) . '"');
-    }
-
-    /**
-     * Authenticates the user using the CRAM-MD5 method.
-     *
-     * @param string $user  The userid to authenticate as.
-     * @param string $pass  The password to authenticate with.
-     * @param string $euser The effective uid to authenticate as.
-     *
-     * @return void
-     */
-    function _authCRAMMD5($user, $pass, $euser)
-    {
-        if (PEAR::isError($challenge = $this->_doCmd('AUTHENTICATE "CRAM-MD5"', true))) {
-            return $challenge;
-        }
-
-        $challenge = base64_decode(trim($challenge));
-        $cram = Auth_SASL::factory('crammd5');
-        if (PEAR::isError($response = $cram->getResponse($user, $pass, $challenge))) {
-            return $response;
-        }
-
-        return $this->_sendStringResponse(base64_encode($response));
-    }
-
-    /**
-     * Authenticates the user using the DIGEST-MD5 method.
-     *
-     * @param string $user  The userid to authenticate as.
-     * @param string $pass  The password to authenticate with.
-     * @param string $euser The effective uid to authenticate as.
-     *
-     * @return void
-     */
-    function _authDigestMD5($user, $pass, $euser)
-    {
-        if (PEAR::isError($challenge = $this->_doCmd('AUTHENTICATE "DIGEST-MD5"', true))) {
-            return $challenge;
-        }
-
-        $challenge = base64_decode(trim($challenge));
-        $digest = Auth_SASL::factory('digestmd5');
-        // @todo Really 'localhost'?
-        if (PEAR::isError($response = $digest->getResponse($user, $pass, $challenge, 'localhost', 'sieve', $euser))) {
-            return $response;
-        }
-
-        if (PEAR::isError($result = $this->_sendStringResponse(base64_encode($param)))) {
-            return $result;
-        }
-        if (PEAR::isError($result = $this->_doCmd())) {
-            return $result;
-        }
-        if ($this->_toUpper(substr($result, 0, 2)) == 'OK') {
-            return;
-        }
-
-        /* We don't use the protocol's third step because SIEVE doesn't allow
-         * subsequent authentication, so we just silently ignore it. */
-        if (PEAR::isError($result = $this->_sendStringResponse(''))) {
-            return $result;
-        }
-
-        return $this->_doCmd();
-    }
-
-    /**
-     * Authenticates the user using the EXTERNAL method.
-     *
-     * @param string $user  The userid to authenticate as.
-     * @param string $pass  The password to authenticate with.
-     * @param string $euser The effective uid to authenticate as.
-     *
-     * @return void
-     *
-     * @since  1.1.7
-     */
-    function _authEXTERNAL($user, $pass, $euser)
-    {
-        $cmd = sprintf(
-            'AUTHENTICATE "EXTERNAL" "%s"',
-            base64_encode(strlen($euser) ? $euser : $user)
-        );
-        return $this->_sendCmd($cmd);
-    }
-
-    /**
-     * Removes a script from the server.
-     *
-     * @param string $scriptname Name of the script to delete.
-     *
-     * @return boolean  True on success, PEAR_Error otherwise.
-     */
-    function _cmdDeleteScript($scriptname)
-    {
-        if (NET_SIEVE_STATE_TRANSACTION != $this->_state) {
-            return PEAR::raiseError('Not currently in AUTHORISATION state', 1);
-        }
-        if (PEAR::isError($res = $this->_doCmd(sprintf('DELETESCRIPT "%s"', $scriptname)))) {
-            return $res;
-        }
-        return true;
-    }
-
-    /**
-     * Retrieves the contents of the named script.
-     *
-     * @param string $scriptname Name of the script to retrieve.
-     *
-     * @return string  The script if successful, PEAR_Error otherwise.
-     */
-    function _cmdGetScript($scriptname)
-    {
-        if (NET_SIEVE_STATE_TRANSACTION != $this->_state) {
-            return PEAR::raiseError('Not currently in AUTHORISATION state', 1);
-        }
-
-        if (PEAR::isError($res = $this->_doCmd(sprintf('GETSCRIPT "%s"', $scriptname)))) {
-            return $res;
-        }
-
-        return preg_replace('/{[0-9]+}\r\n/', '', $res);
-    }
-
-    /**
-     * Sets the active script, i.e. the one that gets run on new mail by the
-     * server.
-     *
-     * @param string $scriptname The name of the script to mark as active.
-     *
-     * @return boolean  True on success, PEAR_Error otherwise.
-    */
-    function _cmdSetActive($scriptname)
-    {
-        if (NET_SIEVE_STATE_TRANSACTION != $this->_state) {
-            return PEAR::raiseError('Not currently in AUTHORISATION state', 1);
-        }
-        if (PEAR::isError($res = $this->_doCmd(sprintf('SETACTIVE "%s"', $scriptname)))) {
-            return $res;
-        }
-        $this->_activeScript = $scriptname;
-        return true;
-    }
-
-    /**
-     * Returns the list of scripts on the server.
-     *
-     * @return array  An array with the list of scripts in the first element
-     *                and the active script in the second element on success,
-     *                PEAR_Error otherwise.
-     */
-    function _cmdListScripts()
-    {
-        if (NET_SIEVE_STATE_TRANSACTION != $this->_state) {
-            return PEAR::raiseError('Not currently in AUTHORISATION state', 1);
-        }
-
-        if (PEAR::isError($res = $this->_doCmd('LISTSCRIPTS'))) {
-            return $res;
-        }
-
-        $scripts = array();
-        $activescript = null;
-        $res = explode("\r\n", $res);
-        foreach ($res as $value) {
-            if (preg_match('/^"(.*)"( ACTIVE)?$/i', $value, $matches)) {
-                $scripts[] = $matches[1];
-                if (!empty($matches[2])) {
-                    $activescript = $matches[1];
-                }
-            }
-        }
-
-        return array($scripts, $activescript);
-    }
-
-    /**
-     * Adds a script to the server.
-     *
-     * @param string $scriptname Name of the new script.
-     * @param string $scriptdata The new script.
-     *
-     * @return boolean  True on success, PEAR_Error otherwise.
-     */
-    function _cmdPutScript($scriptname, $scriptdata)
-    {
-        if (NET_SIEVE_STATE_TRANSACTION != $this->_state) {
-            return PEAR::raiseError('Not currently in AUTHORISATION state', 1);
-        }
-
-        $stringLength = $this->_getLineLength($scriptdata);
-
-        if (PEAR::isError($res = $this->_doCmd(sprintf("PUTSCRIPT \"%s\" {%d+}\r\n%s", $scriptname, $stringLength, $scriptdata)))) {
-            return $res;
-        }
-
-        return true;
-    }
-
-    /**
-     * Logs out of the server and terminates the connection.
-     *
-     * @param boolean $sendLogoutCMD Whether to send LOGOUT command before
-     *                               disconnecting.
-     *
-     * @return boolean  True on success, PEAR_Error otherwise.
-     */
-    function _cmdLogout($sendLogoutCMD = true)
-    {
-        if (NET_SIEVE_STATE_DISCONNECTED == $this->_state) {
-            return PEAR::raiseError('Not currently connected', 1);
-        }
-
-        if ($sendLogoutCMD) {
-            if (PEAR::isError($res = $this->_doCmd('LOGOUT'))) {
-                return $res;
-            }
-        }
-
-        $this->_sock->disconnect();
-        $this->_state = NET_SIEVE_STATE_DISCONNECTED;
-
-        return true;
-    }
-
-    /**
-     * Sends the CAPABILITY command
-     *
-     * @return boolean  True on success, PEAR_Error otherwise.
-     */
-    function _cmdCapability()
-    {
-        if (NET_SIEVE_STATE_DISCONNECTED == $this->_state) {
-            return PEAR::raiseError('Not currently connected', 1);
-        }
-        if (PEAR::isError($res = $this->_doCmd('CAPABILITY'))) {
-            return $res;
-        }
-        $this->_parseCapability($res);
-        return true;
-    }
-
-    /**
-     * Parses the response from the CAPABILITY command and stores the result
-     * in $_capability.
-     *
-     * @param string $data The response from the capability command.
-     *
-     * @return void
-     */
-    function _parseCapability($data)
-    {
-        // Clear the cached capabilities.
-        $this->_capability = array('sasl' => array(),
-                                   'extensions' => array());
-
-        $data = preg_split('/\r?\n/', $this->_toUpper($data), -1, PREG_SPLIT_NO_EMPTY);
-
-        for ($i = 0; $i < count($data); $i++) {
-            if (!preg_match('/^"([A-Z]+)"( "(.*)")?$/', $data[$i], $matches)) {
-                continue;
-            }
-            switch ($matches[1]) {
-            case 'IMPLEMENTATION':
-                $this->_capability['implementation'] = $matches[3];
-                break;
-
-            case 'SASL':
-                $this->_capability['sasl'] = preg_split('/\s+/', $matches[3]);
-                break;
-
-            case 'SIEVE':
-                $this->_capability['extensions'] = preg_split('/\s+/', $matches[3]);
-                break;
-
-            case 'STARTTLS':
-                $this->_capability['starttls'] = true;
-                break;
-            }
-        }
-    }
-
-    /**
-     * Sends a command to the server
-     *
-     * @param string $cmd The command to send.
-     *
-     * @return void
-     */
-    function _sendCmd($cmd)
-    {
-        $status = $this->_sock->getStatus();
-        if (PEAR::isError($status) || $status['eof']) {
-            return PEAR::raiseError('Failed to write to socket: connection lost');
-        }
-        if (PEAR::isError($error = $this->_sock->write($cmd . "\r\n"))) {
-            return PEAR::raiseError(
-                'Failed to write to socket: ' . $error->getMessage()
-            );
-        }
-        $this->_debug("C: $cmd");
-    }
-
-    /**
-     * Sends a string response to the server.
-     *
-     * @param string $str The string to send.
-     *
-     * @return void
-     */
-    function _sendStringResponse($str)
-    {
-        return $this->_sendCmd('{' . $this->_getLineLength($str) . "+}\r\n" . $str);
-    }
-
-    /**
-     * Receives a single line from the server.
-     *
-     * @return string  The server response line.
-     */
-    function _recvLn()
-    {
-        if (PEAR::isError($lastline = $this->_sock->gets(8192))) {
-            return PEAR::raiseError(
-                'Failed to read from socket: ' . $lastline->getMessage()
-            );
-        }
-
-        $lastline = rtrim($lastline);
-        $this->_debug("S: $lastline");
-
-        if ($lastline === '') {
-            return PEAR::raiseError('Failed to read from socket');
-        }
-
-        return $lastline;
-    }
-
-    /**
-     * Send a command and retrieves a response from the server.
-     *
-     * @param string $cmd   The command to send.
-     * @param boolean $auth Whether this is an authentication command.
-     *
-     * @return string|PEAR_Error  Reponse string if an OK response, PEAR_Error
-     *                            if a NO response.
-     */
-    function _doCmd($cmd = '', $auth = false)
-    {
-        $referralCount = 0;
-        while ($referralCount < $this->_maxReferralCount) {
-            if (strlen($cmd)) {
-                if (PEAR::isError($error = $this->_sendCmd($cmd))) {
-                    return $error;
-                }
-            }
-
-            $response = '';
-            while (true) {
-                if (PEAR::isError($line = $this->_recvLn())) {
-                    return $line;
-                }
-                $uc_line = $this->_toUpper($line);
-
-                if ('OK' == substr($uc_line, 0, 2)) {
-                    $response .= $line;
-                    return rtrim($response);
-                }
-
-                if ('NO' == substr($uc_line, 0, 2)) {
-                    // Check for string literal error message.
-                    if (preg_match('/^no {([0-9]+)\+?}/i', $line, $matches)) {
-                        $line .= str_replace(
-                            "\r\n", ' ', $this->_sock->read($matches[1] + 2)
-                        );
-                        $this->_debug("S: $line");
-                    }
-                    return PEAR::raiseError(trim($response . substr($line, 2)), 3);
-                }
-
-                if ('BYE' == substr($uc_line, 0, 3)) {
-                    if (PEAR::isError($error = $this->disconnect(false))) {
-                        return PEAR::raiseError(
-                            'Cannot handle BYE, the error was: '
-                            . $error->getMessage(),
-                            4
-                        );
-                    }
-                    // Check for referral, then follow it.  Otherwise, carp an
-                    // error.
-                    if (preg_match('/^bye \(referral "(sieve:\/\/)?([^"]+)/i', $line, $matches)) {
-                        // Replace the old host with the referral host
-                        // preserving any protocol prefix.
-                        $this->_data['host'] = preg_replace(
-                            '/\w+(?!(\w|\:\/\/)).*/', $matches[2],
-                            $this->_data['host']
-                        );
-                        if (PEAR::isError($error = $this->_handleConnectAndLogin())) {
-                            return PEAR::raiseError(
-                                'Cannot follow referral to '
-                                . $this->_data['host'] . ', the error was: '
-                                . $error->getMessage(),
-                                5
-                            );
-                        }
-                        break;
-                    }
-                    return PEAR::raiseError(trim($response . $line), 6);
-                }
-
-                if (preg_match('/^{([0-9]+)\+?}/i', $line, $matches)) {
-                    // Matches String Responses.
-                    $str_size = $matches[1] + 2;
-                    $line = '';
-                    $line_length = 0;
-                    while ($line_length < $str_size) {
-                        $line .= $this->_sock->read($str_size - $line_length);
-                        $line_length = $this->_getLineLength($line);
-                    }
-                    $this->_debug("S: $line");
-
-                    if (!$auth) {
-                        // Receive the pending OK only if we aren't
-                        // authenticating since string responses during
-                        // authentication don't need an OK.
-                        $this->_recvLn();
-                    }
-                    return $line;
-                }
-
-                if ($auth) {
-                    // String responses during authentication don't need an
-                    // OK.
-                    $response .= $line;
-                    return rtrim($response);
-                }
-
-                $response .= $line . "\r\n";
-                $referralCount++;
-            }
-        }
-
-        return PEAR::raiseError('Max referral count (' . $referralCount . ') reached. Cyrus murder loop error?', 7);
-    }
-
-    /**
-     * Returns the name of the best authentication method that the server
-     * has advertised.
-     *
-     * @param string $userMethod Only consider this method as available.
-     *
-     * @return string  The name of the best supported authentication method or
-     *                 a PEAR_Error object on failure.
-     */
-    function _getBestAuthMethod($userMethod = null)
-    {
-        if (!isset($this->_capability['sasl'])) {
-            return PEAR::raiseError('This server doesn\'t support any authentication methods. SASL problem?');
-        }
-
-        $serverMethods = $this->_capability['sasl'];
-
-        if ($userMethod) {
-            $methods = array($userMethod);
-        } else {
-            $methods = $this->supportedAuthMethods;
-        }
-
-        if (!$methods || !$serverMethods) {
-            return PEAR::raiseError(
-                'This server doesn\'t support any authentication methods.'
-            );
-        }
-
-        foreach ($methods as $method) {
-            if (in_array($method, $serverMethods)) {
-                return $method;
-            }
-        }
-
-        return PEAR::raiseError(
-            'No supported authentication method found. The server supports these methods: '
-            . implode(',', $serverMethods)
-            . ', but we only support: '
-            . implode(',', $this->supportedAuthMethods)
-        );
-    }
-
-    /**
-     * Starts a TLS connection.
-     *
-     * @return boolean  True on success, PEAR_Error on failure.
-     */
-    function _startTLS()
-    {
-        if (PEAR::isError($res = $this->_doCmd('STARTTLS'))) {
-            return $res;
-        }
-
-        if (!stream_socket_enable_crypto($this->_sock->fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
-            return PEAR::raiseError('Failed to establish TLS connection', 2);
-        }
-
-        $this->_debug('STARTTLS negotiation successful');
-
-        // The server should be sending a CAPABILITY response after
-        // negotiating TLS. Read it, and ignore if it doesn't.
-        $this->_doCmd();
-
-        // RFC says we need to query the server capabilities again now that we
-        // are under encryption.
-        if (PEAR::isError($res = $this->_cmdCapability())) {
-            return PEAR::raiseError(
-                'Failed to connect, server said: ' . $res->getMessage(), 2
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the length of a string.
-     *
-     * @param string $string A string.
-     *
-     * @return integer  The length of the string.
-     */
-    function _getLineLength($string)
-    {
-        if (extension_loaded('mbstring')) {
-            return mb_strlen($string, 'latin1');
-        } else {
-            return strlen($string);
-        }
-    }
-
-    /**
-     * Locale independant strtoupper() implementation.
-     *
-     * @param string $string The string to convert to lowercase.
-     *
-     * @return string  The lowercased string, based on ASCII encoding.
-     */
-    function _toUpper($string)
-    {
-        $language = setlocale(LC_CTYPE, 0);
-        setlocale(LC_CTYPE, 'C');
-        $string = strtoupper($string);
-        setlocale(LC_CTYPE, $language);
-        return $string;
-    }
-
-    /**
-     * Write debug text to the current debug output handler.
-     *
-     * @param string $message Debug message text.
-     *
-     * @return void
-     */
-    function _debug($message)
-    {
-        if ($this->_debug) {
-            if ($this->_debug_handler) {
-                call_user_func_array($this->_debug_handler, array(&$this, $message));
-            } else {
-                echo "$message\n";
-            }
-        }
-    }
-}
diff --git a/plugins/managesieve/lib/rcube_sieve.php b/plugins/managesieve/lib/rcube_sieve.php
deleted file mode 100644
index 649967f57..000000000
--- a/plugins/managesieve/lib/rcube_sieve.php
+++ /dev/null
@@ -1,875 +0,0 @@
-<?php
-
-/*
-  Classes for managesieve operations (using PEAR::Net_Sieve)
-
-  Author: Aleksander Machniak <alec@alec.pl>
-
-  $Id$
-
-*/
-
-//  Sieve Language Basics: http://www.ietf.org/rfc/rfc5228.txt
-
-define('SIEVE_ERROR_CONNECTION', 1);
-define('SIEVE_ERROR_LOGIN', 2);
-define('SIEVE_ERROR_NOT_EXISTS', 3);	// script not exists
-define('SIEVE_ERROR_INSTALL', 4);	// script installation
-define('SIEVE_ERROR_ACTIVATE', 5);	// script activation
-define('SIEVE_ERROR_DELETE', 6);	// script deletion
-define('SIEVE_ERROR_INTERNAL', 7);	// internal error
-define('SIEVE_ERROR_OTHER', 255);	// other/unknown error
-
-
-class rcube_sieve
-{
-    private $sieve;			// Net_Sieve object
-    private $error = false; 		// error flag 
-    private $list = array(); 		// scripts list 
-
-    public $script;			// rcube_sieve_script object
-    public $current;			// name of currently loaded script
-    private $disabled;			// array of disabled extensions
-
-    /**
-    * Object constructor
-    *
-    * @param  string  Username (to managesieve login)
-    * @param  string  Password (to managesieve login)
-    * @param  string  Managesieve server hostname/address
-    * @param  string  Managesieve server port number
-    * @param  string  Enable/disable TLS use
-    * @param  array   Disabled extensions
-    */
-    public function __construct($username, $password='', $host='localhost', $port=2000,
-			    $usetls=true, $disabled=array(), $debug=false)
-    {
-	$this->sieve = new Net_Sieve();
-      
-        if ($debug)
-    	    $this->sieve->setDebug(true, array($this, 'debug_handler'));
-      
-        if (PEAR::isError($this->sieve->connect($host, $port, NULL, $usetls)))
-    	    return $this->_set_error(SIEVE_ERROR_CONNECTION);
-
-        if (PEAR::isError($this->sieve->login($username, $password)))
-    	    return $this->_set_error(SIEVE_ERROR_LOGIN);
-
-        $this->disabled = $disabled;
-    }
-
-    public function __destruct() {
-        $this->sieve->disconnect();
-    }
-
-    /**
-    * Getter for error code
-    */
-    public function error()
-    {
-	return $this->error ? $this->error : false;
-    }
-			    
-    /**
-    * Saves current script into server
-    */
-    public function save($name = null)
-    {
-        if (!$this->sieve)
-    	    return $this->_set_error(SIEVE_ERROR_INTERNAL);
-	
-	if (!$this->script)
-	    return $this->_set_error(SIEVE_ERROR_INTERNAL);
-	
-	if (!$name)
-	    $name = $this->current;
-
-        $script = $this->script->as_text();
-
-        if (!$script)
-	    $script = '/* empty script */';
-
-        if (PEAR::isError($this->sieve->installScript($name, $script)))
-    	    return $this->_set_error(SIEVE_ERROR_INSTALL);
-
-        return true;
-    }
-
-    /**
-    * Saves text script into server
-    */
-    public function save_script($name, $content = null)
-    {
-        if (!$this->sieve)
-    	    return $this->_set_error(SIEVE_ERROR_INTERNAL);
-	
-        if (!$content)
-	    $content = '/* empty script */';
-
-        if (PEAR::isError($this->sieve->installScript($name, $content)))
-    	    return $this->_set_error(SIEVE_ERROR_INSTALL);
-
-        return true;
-    }
-
-    /**
-    * Activates specified script
-    */
-    public function activate($name = null)
-    {
-	if (!$this->sieve)
-    	    return $this->_set_error(SIEVE_ERROR_INTERNAL);
-
-	if (!$name)
-	    $name = $this->current;
-
-        if (PEAR::isError($this->sieve->setActive($name)))
-    	    return $this->_set_error(SIEVE_ERROR_ACTIVATE);
-
-        return true;
-    }
-
-    /**
-    * Removes specified script
-    */
-    public function remove($name = null)
-    {
-	if (!$this->sieve)
-    	    return $this->_set_error(SIEVE_ERROR_INTERNAL);
-
-	if (!$name)
-	    $name = $this->current;
-
-	// script must be deactivated first
-	if ($name == $this->sieve->getActive())
-            if (PEAR::isError($this->sieve->setActive('')))
-    		return $this->_set_error(SIEVE_ERROR_DELETE);
-
-        if (PEAR::isError($this->sieve->removeScript($name)))
-    	    return $this->_set_error(SIEVE_ERROR_DELETE);
-
-	if ($name == $this->current)
-	    $this->current = null;
-
-        return true;
-    }
-
-    /**
-    * Gets list of supported by server Sieve extensions
-    */
-    public function get_extensions()
-    {
-        if (!$this->sieve)
-	    return $this->_set_error(SIEVE_ERROR_INTERNAL);
-	
-	$ext = $this->sieve->getExtensions();
-	// we're working on lower-cased names
-	$ext = array_map('strtolower', (array) $ext); 
-
-	if ($this->script) {
-	    $supported = $this->script->get_extensions();
-	    foreach ($ext as $idx => $ext_name)
-	        if (!in_array($ext_name, $supported))
-		    unset($ext[$idx]);
-	}
-
-    	return array_values($ext);
-    }
-
-    /**
-    * Gets list of scripts from server
-    */
-    public function get_scripts()
-    {
-        if (!$this->list) {
-
-    	    if (!$this->sieve)
-        	return $this->_set_error(SIEVE_ERROR_INTERNAL);
-    
-    	    $this->list = $this->sieve->listScripts();
-
-    	    if (PEAR::isError($this->list))
-    		return $this->_set_error(SIEVE_ERROR_OTHER);
-	}
-
-        return $this->list;
-    }
-
-    /**
-    * Returns active script name
-    */
-    public function get_active()
-    {
-	if (!$this->sieve)
-    	    return $this->_set_error(SIEVE_ERROR_INTERNAL);
-
-	return $this->sieve->getActive();
-    }
-    
-    /**
-    * Loads script by name
-    */
-    public function load($name)
-    {
-        if (!$this->sieve)
-    	    return $this->_set_error(SIEVE_ERROR_INTERNAL);
-
-        if ($this->current == $name)
-    	    return true;
-    
-    	$script = $this->sieve->getScript($name);
-    
-        if (PEAR::isError($script))
-    	    return $this->_set_error(SIEVE_ERROR_OTHER);
-
-	// try to parse from Roundcube format
-        $this->script = new rcube_sieve_script($script, $this->disabled);
-
-        // ... else try to import from different formats
-        if (empty($this->script->content)) {
-    	    $script = $this->_import_rules($script);
-    	    $this->script = new rcube_sieve_script($script, $this->disabled);
-    	}
-
-        // replace all elsif with if+stop, we support only ifs
-        foreach ($this->script->content as $idx => $rule) {
-            if (!isset($this->script->content[$idx+1])
-                || preg_match('/^else|elsif$/', $this->script->content[$idx+1]['type'])) {
-                // 'stop' not found?
-                if (!preg_match('/^(stop|vacation)$/', $rule['actions'][count($rule['actions'])-1]['type'])) {
-                    $this->script->content[$idx]['actions'][] = array(
-                        'type' => 'stop'
-                    );
-                }
-            }
-        }
-
-    	$this->current = $name;
-
-    	return true;
-    }
-
-    /**
-    * Creates empty script or copy of other script
-    */
-    public function copy($name, $copy)
-    {
-        if (!$this->sieve)
-    	    return $this->_set_error(SIEVE_ERROR_INTERNAL);
-
-	if ($copy) {
-    	    $content = $this->sieve->getScript($copy);
-    
-    	    if (PEAR::isError($content))
-    		return $this->_set_error(SIEVE_ERROR_OTHER);
-	}
-	
-	return $this->save_script($name, $content);
-    }
-
-
-    private function _import_rules($script)
-    {
-        $i = 0;
-        $name = array();
-
-        // Squirrelmail (Avelsieve)
-        if ($tokens = preg_split('/(#START_SIEVE_RULE.*END_SIEVE_RULE)\n/', $script, -1, PREG_SPLIT_DELIM_CAPTURE)) {
-    	    foreach($tokens as $token) {
-        	if (preg_match('/^#START_SIEVE_RULE.*/', $token, $matches)) {
-	    	    $name[$i] = "unnamed rule ".($i+1);
-                    $content .= "# rule:[".$name[$i]."]\n";
-                }
-        	elseif (isset($name[$i])) {
-	    	    $content .= "if $token\n";
-		    $i++;
-                }
-            }
-        }
-        // Horde (INGO)
-        else if ($tokens = preg_split('/(# .+)\r?\n/i', $script, -1, PREG_SPLIT_DELIM_CAPTURE)) {
-            foreach($tokens as $token) {
-                if (preg_match('/^# (.+)/i', $token, $matches)) {
-                    $name[$i] = $matches[1];
-                    $content .= "# rule:[" . $name[$i] . "]\n";
-                }
-                elseif (isset($name[$i])) {
-                    $token = str_replace(":comparator \"i;ascii-casemap\" ", "", $token);
-                    $content .= $token . "\n";
-                    $i++;
-                }
-            }
-        }
-
-        return $content;
-    }
-
-    private function _set_error($error)
-    {
-	$this->error = $error;
-        return false;
-    }
-
-    /**
-    * This is our own debug handler for connection
-    * @access public
-    */
-    public function debug_handler(&$sieve, $message)
-    {
-        write_log('sieve', preg_replace('/\r\n$/', '', $message));
-    }		        
-}
-
-class rcube_sieve_script
-{
-    public $content = array();	// script rules array   
-
-    private $supported = array(	// extensions supported by class
-        'fileinto',
-        'reject',
-        'ereject',
-        'vacation', 	// RFC5230
-    // TODO: (most wanted first) body, imapflags, notify, regex
-    );
-  
-    /**
-    * Object constructor
-    *
-    * @param  string  Script's text content
-    * @param  array   Disabled extensions
-    */
-    public function __construct($script, $disabled=NULL)
-    {
-        if (!empty($disabled))
-            foreach ($disabled as $ext)
-                if (($idx = array_search($ext, $this->supported)) !== false)
-	            unset($this->supported[$idx]);
-
-        $this->content = $this->_parse_text($script);
-    }
-
-    /**
-    * Adds script contents as text to the script array (at the end)
-    *
-    * @param	string	Text script contents
-    */
-    public function add_text($script)
-    {
-        $content = $this->_parse_text($script);
-        $result = false;
-
-        // check existsing script rules names
-        foreach ($this->content as $idx => $elem) {
-            $names[$elem['name']] = $idx;
-        }
-
-        foreach ($content as $elem) {
-            if (!isset($names[$elem['name']])) {
-                array_push($this->content, $elem);
-	        $result = true;
-	    }
-        }
-
-        return $result;
-    }
-
-    /**
-    * Adds rule to the script (at the end)
-    *
-    * @param	string	Rule name
-    * @param	array	Rule content (as array)
-    */
-    public function add_rule($content)
-    {
-        // TODO: check this->supported
-        array_push($this->content, $content);
-        return sizeof($this->content)-1;
-    }
-
-    public function delete_rule($index)
-    {
-        if(isset($this->content[$index])) {
-            unset($this->content[$index]);
-	    return true;
-	}
-        return false;
-    }
-
-    public function size()
-    {
-        return sizeof($this->content);
-    }
-
-    public function update_rule($index, $content)
-    {
-        // TODO: check this->supported
-        if ($this->content[$index]) {
-	    $this->content[$index] = $content;
-	    return $index;
-	}
-        return false;
-    }
-
-    /**
-    * Returns script as text
-    */
-    public function as_text()
-    {
-        $script = '';
-        $exts = array();
-        $idx = 0;
-
-        // rules
-        foreach ($this->content as $rule) {
-	    $extension = '';
-	    $tests = array();
-	    $i = 0;
-
-	    // header
-	    $script .= '# rule:[' . $rule['name'] . "]\n";
-  
-	    // constraints expressions
-	    foreach ($rule['tests'] as $test) {
-	        $tests[$i] = '';
-	        switch ($test['test']) {
-		    case 'size':
-		        $tests[$i] .= ($test['not'] ? 'not ' : '');
-		        $tests[$i] .= 'size :' . ($test['type']=='under' ? 'under ' : 'over ') . $test['arg'];
-		    break;
-		    case 'true':
-		        $tests[$i] .= ($test['not'] ? 'not true' : 'true');
-		    break;
-		    case 'exists':
-		        $tests[$i] .= ($test['not'] ? 'not ' : '');
-		        if (is_array($test['arg']))
-			    $tests[$i] .= 'exists ["' . implode('", "', $this->_escape_string($test['arg'])) . '"]';
-		        else
-			    $tests[$i] .= 'exists "' . $this->_escape_string($test['arg']) . '"';
-		    break;    
-		    case 'header':
-		        $tests[$i] .= ($test['not'] ? 'not ' : '');
-		        $tests[$i] .= 'header :' . $test['type'];
-		        if (is_array($test['arg1']))
-			    $tests[$i] .= ' ["' . implode('", "', $this->_escape_string($test['arg1'])) . '"]';
-		        else
-			    $tests[$i] .= ' "' . $this->_escape_string($test['arg1']) . '"';
-		        if (is_array($test['arg2']))
-			    $tests[$i] .= ' ["' . implode('", "', $this->_escape_string($test['arg2'])) . '"]';
-		        else
-			    $tests[$i] .= ' "' . $this->_escape_string($test['arg2']) . '"';
-		    break;
-		}
-	        $i++;
-	    }
-
-//            $script .= ($idx>0 ? 'els' : '').($rule['join'] ? 'if allof (' : 'if anyof (');
-            // disabled rule: if false #....
-            $script .= 'if' . ($rule['disabled'] ? ' false #' : '');
-	    $script .= $rule['join'] ? ' allof (' : ' anyof (';
-	    if (sizeof($tests) > 1)
-	        $script .= implode(",\n\t", $tests);
-	    else if (sizeof($tests))
-	        $script .= $tests[0];
-	    else
-	        $script .= 'true';
-	    $script .= ")\n{\n";
-  
-	    // action(s)
-	    foreach ($rule['actions'] as $action) {
-	        switch ($action['type']) {
-	            case 'fileinto':
-	                $extension = 'fileinto';
-		        $script .= "\tfileinto \"" . $this->_escape_string($action['target']) . "\";\n";
-	            break;
-	            case 'redirect':
-		        $script .= "\tredirect \"" . $this->_escape_string($action['target']) . "\";\n";
-	            break;
-	            case 'reject':
-	            case 'ereject':
-	                $extension = $action['type'];
-		        if (strpos($action['target'], "\n")!==false)
-		            $script .= "\t".$action['type']." text:\n" . $action['target'] . "\n.\n;\n";
-		        else
-		            $script .= "\t".$action['type']." \"" . $this->_escape_string($action['target']) . "\";\n";
-	            break;
-	            case 'keep':
-	            case 'discard':
-	            case 'stop':
-	                $script .= "\t" . $action['type'] .";\n";
-	            break;
-	            case 'vacation':
-                        $extension = 'vacation';
-                        $script .= "\tvacation";
-		        if ($action['days'])
-		            $script .= " :days " . $action['days'];
-		        if ($action['addresses'])
-		            $script .= " :addresses " . $this->_print_list($action['addresses']);
-		        if ($action['subject'])
-		            $script .= " :subject \"" . $this->_escape_string($action['subject']) . "\"";
-		        if ($action['handle'])
-		            $script .= " :handle \"" . $this->_escape_string($action['handle']) . "\"";
-		        if ($action['from'])
-		            $script .= " :from \"" . $this->_escape_string($action['from']) . "\"";
-		        if ($action['mime'])
-		            $script .= " :mime";
-		        if (strpos($action['reason'], "\n")!==false)
-		            $script .= " text:\n" . $action['reason'] . "\n.\n;\n";
-		        else
-		            $script .= " \"" . $this->_escape_string($action['reason']) . "\";\n";
-	            break;
-	        }
-
-	        if ($extension && !isset($exts[$extension]))
-	            $exts[$extension] = $extension;
-	    }
-
-	    $script .= "}\n";
-	    $idx++;
-	}
-      
-        // requires
-        if (sizeof($exts))
-            $script = 'require ["' . implode('","', $exts) . "\"];\n" . $script;
-
-        return $script;
-    }
-
-    /**
-    * Returns script object
-    *
-    */
-    public function as_array()
-    {
-        return $this->content;
-    }
-
-    /**
-    * Returns array of supported extensions
-    *
-    */
-    public function get_extensions()
-    {
-        return array_values($this->supported);
-    }
-
-    /**
-    * Converts text script to rules array
-    *
-    * @param	string	Text script
-    */
-    private function _parse_text($script)
-    {
-        $i = 0;
-        $content = array();
-
-        // remove C comments
-        $script = preg_replace('|/\*.*?\*/|sm', '', $script);
-
-        // tokenize rules
-        if ($tokens = preg_split('/(# rule:\[.*\])\r?\n/', $script, -1, PREG_SPLIT_DELIM_CAPTURE)) {
-            foreach($tokens as $token) {
-	        if (preg_match('/^# rule:\[(.*)\]/', $token, $matches)) {
-	            $content[$i]['name'] = $matches[1];
-	        }
-	        elseif (isset($content[$i]['name']) && sizeof($content[$i]) == 1) {
-	            if ($rule = $this->_tokenize_rule($token)) {
-	    	        $content[$i] = array_merge($content[$i], $rule);
-	    	        $i++;
-		    }
-		    else // unknown rule format
-		        unset($content[$i]);
-	        }
-	    }
-        }
-
-        return $content;
-    }
-
-    /**
-    * Convert text script fragment to rule object
-    *
-    * @param	string	Text rule
-    */
-    private function _tokenize_rule($content)
-    {
-        $result = NULL;
-    
-        if (preg_match('/^(if|elsif|else)\s+((true|false|not\s+true|allof|anyof|exists|header|not|size)(.*))\s+\{(.*)\}$/sm',
-            trim($content), $matches)) {
-
-            $tests = trim($matches[2]);
-
-            // disabled rule (false + comment): if false #.....
-            if ($matches[3] == 'false') {
-                $tests = preg_replace('/^false\s+#\s+/', '', $tests);
-                $disabled = true;
-            }
-            else
-                $disabled = false;
-
-	    list($tests, $join) = $this->_parse_tests($tests);
-	    $actions = $this->_parse_actions(trim($matches[5]));
-
-	    if ($tests && $actions)
-	        $result = array(
-                    'type' => $matches[1],
-		    'tests' => $tests,
-		    'actions' => $actions,
-		    'join' => $join,
-                    'disabled' => $disabled,
-	        );
-	}
-
-        return $result;
-    }    
-
-    /**
-    * Parse body of actions section
-    *
-    * @param	string	Text body
-    * @return	array	Array of parsed action type/target pairs
-    */
-    private function _parse_actions($content)
-    {
-        $result = NULL;
-
-        // supported actions
-        $patterns[] = '^\s*discard;';
-        $patterns[] = '^\s*keep;';
-        $patterns[] = '^\s*stop;';
-        $patterns[] = '^\s*redirect\s+(.*?[^\\\]);';
-        if (in_array('fileinto', $this->supported))
-            $patterns[] = '^\s*fileinto\s+(.*?[^\\\]);';
-        if (in_array('reject', $this->supported)) {
-            $patterns[] = '^\s*reject\s+text:(.*)\n\.\n;';
-            $patterns[] = '^\s*reject\s+(.*?[^\\\]);';
-            $patterns[] = '^\s*ereject\s+text:(.*)\n\.\n;';
-            $patterns[] = '^\s*ereject\s+(.*?[^\\\]);';
-        }
-        if (in_array('vacation', $this->supported))
-            $patterns[] = '^\s*vacation\s+(.*?[^\\\]);';
-
-        $pattern = '/(' . implode('$)|(', $patterns) . '$)/ms';
-
-        // parse actions body
-        if (preg_match_all($pattern, $content, $mm, PREG_SET_ORDER)) {
-    	    foreach ($mm as $m) {
-	        $content = trim($m[0]);
-	  
-    	        if(preg_match('/^(discard|keep|stop)/', $content, $matches)) {
-	            $result[] = array('type' => $matches[1]);
-	        }
-                elseif(preg_match('/^fileinto/', $content)) {
-	            $result[] = array('type' => 'fileinto', 'target' => $this->_parse_string($m[sizeof($m)-1])); 
-	        }
-                elseif(preg_match('/^redirect/', $content)) {
-	            $result[] = array('type' => 'redirect', 'target' => $this->_parse_string($m[sizeof($m)-1])); 
-	        }
-    	        elseif(preg_match('/^(reject|ereject)\s+(.*);$/sm', $content, $matches)) {
-	            $result[] = array('type' => $matches[1], 'target' => $this->_parse_string($matches[2])); 
-	        }
-                elseif(preg_match('/^vacation\s+(.*);$/sm', $content, $matches)) {
-	            $vacation = array('type' => 'vacation');
-
-    	            if (preg_match('/:(days)\s+([0-9]+)/', $content, $vm)) {
-	                $vacation['days'] = $vm[2];
-		        $content = preg_replace('/:(days)\s+([0-9]+)/', '', $content); 
-	            }
-    	            if (preg_match('/:(subject)\s+(".*?[^\\\]")/', $content, $vm)) {
-	                $vacation['subject'] = $vm[2];
-    		        $content = preg_replace('/:(subject)\s+(".*?[^\\\]")/', '', $content); 
-    	            }
-    	            if (preg_match('/:(addresses)\s+\[(.*?[^\\\])\]/', $content, $vm)) {
-	                $vacation['addresses'] = $this->_parse_list($vm[2]);
-		        $content = preg_replace('/:(addresses)\s+\[(.*?[^\\\])\]/', '', $content); 
-	            }
-    	            if (preg_match('/:(handle)\s+(".*?[^\\\]")/', $content, $vm)) {
-	                $vacation['handle'] = $vm[2];
-		        $content = preg_replace('/:(handle)\s+(".*?[^\\\]")/', '', $content); 
-	            }
-    	            if (preg_match('/:(from)\s+(".*?[^\\\]")/', $content, $vm)) {
-	                $vacation['from'] = $vm[2];
-		        $content = preg_replace('/:(from)\s+(".*?[^\\\]")/', '', $content); 
-	            }
-
-	            $content = preg_replace('/^vacation/', '', $content);	     
-	            $content = preg_replace('/;$/', '', $content);
-	            $content = trim($content);
-
-    	            if (preg_match('/^:(mime)/', $content, $vm)) {
-	                $vacation['mime'] = true;
-		        $content = preg_replace('/^:mime/', '', $content); 
-	            }
-
-	            $vacation['reason'] = $this->_parse_string($content);
-
-                    $result[] = $vacation;
-                }
-            }
-        }
-
-        return $result;
-    }    
-    
-    /**
-    * Parse test/conditions section
-    *
-    * @param	string	Text 
-    */
-    private function _parse_tests($content)
-    {
-        $result = NULL;
-
-        // lists
-        if (preg_match('/^(allof|anyof)\s+\((.*)\)$/sm', $content, $matches)) {
-	    $content = $matches[2];
-	    $join = $matches[1]=='allof' ? true : false;
-	}
-        else
-	    $join = false;
-      
-        // supported tests regular expressions
-        // TODO: comparators, envelope
-        $patterns[] = '(not\s+)?(exists)\s+\[(.*?[^\\\])\]';
-        $patterns[] = '(not\s+)?(exists)\s+(".*?[^\\\]")';
-        $patterns[] = '(not\s+)?(true)';
-        $patterns[] = '(not\s+)?(size)\s+:(under|over)\s+([0-9]+[KGM]{0,1})';
-        $patterns[] = '(not\s+)?(header)\s+:(contains|is|matches)\s+\[(.*?[^\\\]")\]\s+\[(.*?[^\\\]")\]';
-        $patterns[] = '(not\s+)?(header)\s+:(contains|is|matches)\s+(".*?[^\\\]")\s+(".*?[^\\\]")';
-        $patterns[] = '(not\s+)?(header)\s+:(contains|is|matches)\s+\[(.*?[^\\\]")\]\s+(".*?[^\\\]")';
-        $patterns[] = '(not\s+)?(header)\s+:(contains|is|matches)\s+(".*?[^\\\]")\s+\[(.*?[^\\\]")\]';
-      
-        // join patterns...
-        $pattern = '/(' . implode(')|(', $patterns) . ')/';
-
-        // ...and parse tests list
-        if (preg_match_all($pattern, $content, $matches, PREG_SET_ORDER)) {
-	    foreach ($matches as $match) {
-	        $size = sizeof($match);
-	      
-	        if (preg_match('/^(not\s+)?size/', $match[0])) {
-		    $result[] = array(
-		        'test' 	=> 'size',
-		        'not' 	=> $match[$size-4] ? true : false,
-		        'type' 	=> $match[$size-2], // under/over
-		        'arg'	=> $match[$size-1], // value
-		    );
-		}
-	        elseif (preg_match('/^(not\s+)?header/', $match[0])) {
-		    $result[] = array(
-		        'test'	=> 'header',
-		        'not' 	=> $match[$size-5] ? true : false,
-		        'type'	=> $match[$size-3], // is/contains/matches
-		        'arg1' 	=> $this->_parse_list($match[$size-2]), // header(s)
-		        'arg2'	=> $this->_parse_list($match[$size-1]), // string(s)
-		    );  
-		}
-	        elseif (preg_match('/^(not\s+)?exists/', $match[0])) {
-		    $result[] = array(
-		        'test' 	=> 'exists',
-		        'not' 	=> $match[$size-3] ? true : false,
-		        'arg' 	=> $this->_parse_list($match[$size-1]), // header(s)
-		    );
-	        }
-	        elseif (preg_match('/^(not\s+)?true/', $match[0])) {
-		    $result[] = array(
-		        'test' 	=> 'true',
-		        'not' 	=> $match[$size-2] ? true : false,
-		    );
-	        }
-	    }
-	}
-
-        return array($result, $join);
-    }    
-
-    /**
-    * Parse string value
-    *
-    * @param	string	Text 
-    */
-    private function _parse_string($content)
-    {
-        $text = '';
-        $content = trim($content);
-
-        if (preg_match('/^text:(.*)\.$/sm', $content, $matches))
-            $text = trim($matches[1]);
-        elseif (preg_match('/^"(.*)"$/', $content, $matches))
-            $text = str_replace('\"', '"', $matches[1]);
-
-        return $text;
-    }    
-
-    /**
-    * Escape special chars in string value
-    *
-    * @param	string	Text 
-    */
-    private function _escape_string($content)
-    {
-        $replace['/"/'] = '\\"';
-      
-        if (is_array($content)) {
-	    for ($x=0, $y=sizeof($content); $x<$y; $x++)
-	        $content[$x] = preg_replace(array_keys($replace), array_values($replace), $content[$x]);
-        
-	    return $content;
-	}
-        else
-            return preg_replace(array_keys($replace), array_values($replace), $content);
-    }
-
-    /**
-    * Parse string or list of strings to string or array of strings
-    *
-    * @param	string	Text 
-    */
-    private function _parse_list($content)
-    {
-        $result = array();
-      
-        for ($x=0, $len=strlen($content); $x<$len; $x++) {
-	    switch ($content[$x]) {
-	        case '\\':
-	            $str .= $content[++$x];
-                break;
-	        case '"':
-	            if (isset($str)) {
-		        $result[] = $str;
-		        unset($str);
-		    }
-	            else
-	                $str = '';
-	        break;
-	        default:
-	            if(isset($str))
-	                $str .= $content[$x];
-	        break;
-	    }
-	}
-      
-        if (sizeof($result)>1)
-            return $result;
-        elseif (sizeof($result) == 1)
-	    return $result[0];
-        else
-            return NULL;
-    }    
-
-    /**
-    * Convert array of elements to list of strings
-    *
-    * @param	string	Text 
-    */
-    private function _print_list($list)
-    {
-        $list = (array) $list;
-        foreach($list as $idx => $val)
-            $list[$idx] = $this->_escape_string($val);
-    
-        return '["' . implode('","', $list) . '"]';
-    }
-}
-
-?>
diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc
deleted file mode 100644
index 90f34bf8e..000000000
--- a/plugins/managesieve/localization/bg_BG.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-$labels = array();
-$labels['filters'] = 'Филтри';
-$labels['managefilters'] = 'Управление на филтри за входяща поща';
-$labels['filtername'] = 'Име на филтър';
-$labels['newfilter'] = 'Нов филтър';
-$labels['filteradd'] = 'Добавяне на филтър';
-$labels['filterdel'] = 'Изтриване на филтър';
-$labels['moveup'] = 'Преместване нагоре';
-$labels['movedown'] = 'Преместване надолу';
-$labels['filterallof'] = 'съвпадение на всички следващи правила';
-$labels['filteranyof'] = 'съвпадение на някое от следните правила';
-$labels['filterany'] = 'всички съобщения';
-$labels['filtercontains'] = 'съдържа';
-$labels['filternotcontains'] = 'не съдържа';
-$labels['filteris'] = 'е равно на';
-$labels['filterisnot'] = 'не е равно на';
-$labels['filterexists'] = 'съществува';
-$labels['filternotexists'] = 'не съществува';
-$labels['filterunder'] = 'под';
-$labels['filterover'] = 'над';
-$labels['addrule'] = 'Добавяне на правило';
-$labels['delrule'] = 'Изтриване на правило';
-$labels['messagemoveto'] = 'Преместване на съобщението в';
-$labels['messageredirect'] = 'Пренасочване на съобщението до';
-$labels['messagereply'] = 'Отговор със съобщение';
-$labels['messagedelete'] = 'Изтриване на съобщение';
-$labels['messagediscard'] = 'Отхвърляне със съобщение';
-$labels['messagesrules'] = 'За входящата поща:';
-$labels['messagesactions'] = '...изпълнение на следните действия';
-$labels['add'] = 'Добавяне';
-$labels['del'] = 'Изтриване';
-$labels['sender'] = 'Подател';
-$labels['recipient'] = 'Получател';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Неизвестна грешка на сървъра';
-$messages['filterconnerror'] = 'Невъзможност за свързване с managesieve сървъра ';
-$messages['filterdeleteerror'] = 'Невъзможност за изтриване на филтър. Сървър грешка';
-$messages['filterdeleted'] = 'Филтърът е изтрит успешно';
-$messages['filterdeleteconfirm'] = 'Наистина ли искате да изтриете избрания филтър?';
-$messages['filtersaved'] = 'Филтърът е записан успешно';
-$messages['filtersaveerror'] = 'Филтърът не може да бъде записан. Сървър грешка.';
-$messages['ruledeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното правило?';
-$messages['actiondeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното действие?';
-$messages['forbiddenchars'] = 'Забранени символи в полето';
-$messages['cannotbeempty'] = 'Полето не може да бъде празно';
-
-?>
diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc
deleted file mode 100644
index 033a1a0e3..000000000
--- a/plugins/managesieve/localization/cs_CZ.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Czech translation for Roundcube managesieve plugin
- *
- * @version 1.0 (2009-09-29)
- * @author Daniel Kolar <kolar@g2n.cz>
- *
- */
-
-$labels['filters'] = 'Filtry';
-$labels['managefilters'] = 'Nastavení filtrů';
-$labels['filtername'] = 'Název filtru';
-$labels['newfilter'] = 'Nový filtr';
-$labels['filteradd'] = 'Přidej filtr';
-$labels['filterdel'] = 'Smaž filtr';
-$labels['moveup'] = 'Posunout nahoru';
-$labels['movedown'] = 'Posunout dolů';
-$labels['filterallof'] = 'Odpovídají všechny pravidla';
-$labels['filteranyof'] = 'Odpovídá kterékoliv pravidlo';
-$labels['filterany'] = 'Všechny zprávy';
-$labels['filtercontains'] = 'obsahuje';
-$labels['filternotcontains'] = 'neobsahuje';
-$labels['filteris'] = 'odpovídá';
-$labels['filterisnot'] = 'neodpovídá';
-$labels['filterexists'] = 'existuje';
-$labels['filternotexists'] = 'neexistuje';
-$labels['filterunder'] = 'pod';
-$labels['filterover'] = 'nad';
-$labels['addrule'] = 'Přidej pravidlo';
-$labels['delrule'] = 'Smaž pravidlo';
-$labels['messagemoveto'] = 'Přesuň zprávu do';
-$labels['messageredirect'] = 'Přeposlat zprávu na';
-$labels['messagereply'] = 'Odpovědět se zprávou';
-$labels['messagedelete'] = 'Smazat zprávu';
-$labels['messagediscard'] = 'Smazat se zprávou';
-$labels['messagesrules'] = 'Pravidla pro příchozí zprávu:';
-$labels['messagesactions'] = '...vykonej následující akce:';
-$labels['add'] = 'Přidej';
-$labels['del'] = 'Smaž';
-$labels['sender'] = 'Odesílatel';
-$labels['recipient'] = 'Příjemce';
-$labels['vacationaddresses'] = 'Seznam příjemců, kterým nebude zpráva odeslána (oddělené čárkou):';
-$labels['vacationdays'] = 'Počet dnů mezi automatickými odpověďmi:';
-$labels['vacationreason'] = 'Zpráva (Důvod nepřítomnosti):';
-$labels['rulestop'] = 'Zastavit pravidla';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Neznámá chyba serveru';
-$messages['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
-$messages['filterdeleteerror'] = 'Nebylo možné smazat filtr. Server nahlásil chybu';
-$messages['filterdeleted'] = 'Filtr byl smazán';
-$messages['filterdeleteconfirm'] = 'Opravdu chcete smazat vybraný filtr?';
-$messages['filtersaved'] = 'Filtr byl uložen';
-$messages['filtersaveerror'] = 'Nebylo možné uložit filtr. Server nahlásil chybu.';
-$messages['ruledeleteconfirm'] = 'Jste si jisti, že chcete smazat vybrané pravidlo?';
-$messages['actiondeleteconfirm'] = 'Jste si jisti, že chcete smazat vybranou akci?';
-$messages['forbiddenchars'] = 'Zakázané znaky v poli';
-$messages['cannotbeempty'] = 'Pole nemůže být prázdné';
-
-?>
diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc
deleted file mode 100644
index c0fe389f5..000000000
--- a/plugins/managesieve/localization/de_CH.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-$labels['filters'] = 'Filter';
-$labels['managefilters'] = 'Verwalte eingehende Nachrichtenfilter';
-$labels['filtername'] = 'Filtername';
-$labels['newfilter'] = 'Neuer Filter';
-$labels['filteradd'] = 'Filter hinzufügen';
-$labels['filterdel'] = 'Filter löschen';
-$labels['moveup'] = 'Nach oben';
-$labels['movedown'] = 'Nach unten';
-$labels['filterallof'] = 'UND (alle Regeln müssen zutreffen)';
-$labels['filteranyof'] = 'ODER (eine der Regeln muss zutreffen';
-$labels['filterany'] = 'Für alle Nachrichten';
-$labels['filtercontains'] = 'enthält';
-$labels['filternotcontains'] = 'enthält nicht';
-$labels['filteris'] = 'ist gleich';
-$labels['filterisnot'] = 'ist ungleich';
-$labels['filterexists'] = 'ist vorhanden';
-$labels['filternotexists'] = 'nicht vorhanden';
-$labels['filterunder'] = 'unter';
-$labels['filterover'] = 'über';
-$labels['addrule'] = 'Regel hinzufügen';
-$labels['delrule'] = 'Regel löschen';
-$labels['messagemoveto'] = 'Verschiebe Nachricht nach';
-$labels['messageredirect'] = 'Leite Nachricht um nach';
-$labels['messagereply'] = 'Antworte mit Nachricht';
-$labels['messagedelete'] = 'Nachricht löschen';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagesrules'] = 'Für eingehende Nachrichten:';
-$labels['messagesactions'] = 'Führe folgende Aktionen aus:';
-$labels['add'] = 'Hinzufügen';
-$labels['del'] = 'Löschen';
-$labels['sender'] = 'Absender';
-$labels['recipient'] = 'Empfänger';
-$labels['vacationaddresses'] = 'Zusätzliche Liste von Empfängern (Komma getrennt):';
-$labels['vacationdays'] = 'Antwort wird erneut gesendet nach (in Tagen):';
-$labels['vacationreason'] = 'Inhalt der Nachricht (Abwesenheitsgrund):';
-$labels['rulestop'] = 'Regelauswertung anhalten';
-
-$messages['filterunknownerror'] = 'Unbekannter Serverfehler';
-$messages['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden';
-$messages['filterdeleteerror'] = 'Fehler beim des löschen  Filters. Serverfehler';
-$messages['filterdeleted'] = 'Filter erfolgreich gelöscht';
-$messages['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen ?';
-$messages['filtersaved'] = 'Filter gespeichert';
-$messages['filtersaveerror'] = 'Serverfehler, konnte den Filter nicht speichern.';
-$messages['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?';
-$messages['actiondeleteconfirm'] = 'Sicher, dass Sie die ausgewaehlte Aktion löschen wollen?';
-$messages['forbiddenchars'] = 'Unerlaubte Zeichen im Feld';
-$messages['cannotbeempty'] = 'Feld darf nicht leer sein';
-
-?>
diff --git a/plugins/managesieve/localization/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
deleted file mode 100644
index 31b5f8048..000000000
--- a/plugins/managesieve/localization/de_DE.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-$labels['filters'] = 'Filter';
-$labels['managefilters'] = 'Verwalte eingehende Nachrichtenfilter';
-$labels['filtername'] = 'Filtername';
-$labels['newfilter'] = 'Neuer Filter';
-$labels['filteradd'] = 'Filter hinzufügen';
-$labels['filterdel'] = 'Filter löschen';
-$labels['moveup'] = 'Nach oben';
-$labels['movedown'] = 'Nach unten';
-$labels['filterallof'] = 'trifft auf alle folgenden Regeln zu';
-$labels['filteranyof'] = 'trifft auf eine der folgenden Regeln zu';
-$labels['filterany'] = 'alle Nachrichten';
-$labels['filtercontains'] = 'enthält';
-$labels['filternotcontains'] = 'enthält nicht';
-$labels['filteris'] = 'ist gleich';
-$labels['filterisnot'] = 'ist ungleich';
-$labels['filterexists'] = 'vorhanden';
-$labels['filternotexists'] = 'nicht vorhanden';
-$labels['filterunder'] = 'unter';
-$labels['filterover'] = 'über';
-$labels['addrule'] = 'Regel hinzufügen';
-$labels['delrule'] = 'Regel löschen';
-$labels['messagemoveto'] = 'Verschiebe Nachricht nach';
-$labels['messageredirect'] = 'Leite Nachricht um nach';
-$labels['messagereply'] = 'Antworte mit Nachricht';
-$labels['messagedelete'] = 'Nachricht löschen';
-$labels['messagediscard'] = 'Weise ab mit Nachricht';
-$labels['messagesrules'] = 'Für eingehende Nachrichten:';
-$labels['messagesactions'] = '...führe folgende Aktionen aus:';
-$labels['add'] = 'Hinzufügen';
-$labels['del'] = 'Löschen';
-$labels['sender'] = 'Absender';
-$labels['recipient'] = 'Empfänger';
-$labels['vacationaddresses'] = 'Zusätzliche Liste von eMail-Empfängern (Komma getrennt):';
-$labels['vacationdays'] = 'Wie oft sollen Nachrichten gesendet werden (in Tagen):';
-$labels['vacationreason'] = 'Inhalt der Nachricht (Abwesenheitsgrund):';
-$labels['rulestop'] = 'Regelauswertung anhalten';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Unbekannter Serverfehler';
-$messages['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden';
-$messages['filterdeleteerror'] = 'Fehler beim Löschen des Filters. Serverfehler';
-$messages['filterdeleted'] = 'Filter erfolgreich gelöscht';
-$messages['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen?';
-$messages['filtersaved'] = 'Filter gespeichert';
-$messages['filtersaveerror'] = 'Serverfehler, konnte den Filter nicht speichern.';
-$messages['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?';
-$messages['actiondeleteconfirm'] = 'Sicher, dass Sie die ausgewählte Aktion löschen wollen?';
-$messages['forbiddenchars'] = 'Unerlaubte Zeichen im Feld';
-$messages['cannotbeempty'] = 'Feld darf nicht leer sein';
-
-?>
diff --git a/plugins/managesieve/localization/el_GR.inc b/plugins/managesieve/localization/el_GR.inc
deleted file mode 100644
index a1a5eeca3..000000000
--- a/plugins/managesieve/localization/el_GR.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-// Antonis Kanouras (2009-10-22)
-
-$labels = array();
-$labels['filters'] = 'Φίλτρα';
-$labels['managefilters'] = 'Διαχείριση φίλτρων εισερχόμενων';
-$labels['filtername'] = 'Ονομασία φίλτρου';
-$labels['newfilter'] = 'Δημιουργία φίλτρου';
-$labels['filteradd'] = 'Προσθήκη φίλτρου';
-$labels['filterdel'] = 'Διαγραφή φίλτρου';
-$labels['moveup'] = 'Μετακίνηση πάνω';
-$labels['movedown'] = 'Μετακίνηση κάτω';
-$labels['filterallof'] = 'ταιριάζουν με όλους τους παρακάτω κανόνες';
-$labels['filteranyof'] = 'ταιριάζουν με οποιονδήποτε από τους παρακάτω κανόνες';
-$labels['filterany'] = 'όλα τα μηνύματα';
-$labels['filtercontains'] = 'περιέχει';
-$labels['filternotcontains'] = 'δεν περιέχει';
-$labels['filteris'] = 'είναι ίσο με';
-$labels['filterisnot'] = 'δεν είναι ίσο με';
-$labels['filterexists'] = 'υπάρχει';
-$labels['filternotexists'] = 'δεν υπάρχει';
-$labels['filterunder'] = 'κάτω';
-$labels['filterover'] = 'πάνω';
-$labels['addrule'] = 'Προσθήκη κανόνα';
-$labels['delrule'] = 'Διαγραφή κανόνα';
-$labels['messagemoveto'] = 'Μετακίνηση μηνύματος στο';
-$labels['messageredirect'] = 'Προώθηση μηνύματος στο';
-$labels['messagereply'] = 'Απάντηση με μήνυμα';
-$labels['messagedelete'] = 'Διαγραφή μηνύματος';
-$labels['messagediscard'] = 'Απόρριψη με μήνυμα';
-$labels['messagesrules'] = 'Για εισερχόμενα μηνύματα που:';
-$labels['messagesactions'] = '...εκτέλεση των παρακάτω ενεργειών:';
-$labels['add'] = 'Προσθήκη';
-$labels['del'] = 'Διαγραφή';
-$labels['sender'] = 'Αποστολέας';
-$labels['recipient'] = 'Παραλήπτης';
-$labels['vacationaddresses'] = 'Πρόσθετη λίστα email παραληπτών (διαχωρισμένη με κόμματα):';
-$labels['vacationdays'] = 'Συχνότητα αποστολής μηνυμάτων (σε ημέρες):';
-$labels['vacationreason'] = 'Σώμα μηνύματος (λόγος απουσίας):';
-$labels['rulestop'] = 'Παύση επαλήθευσης κανόνων';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Άγνωστο σφάλμα διακομιστή';
-$messages['filterconnerror'] = 'Αδυναμία σύνδεσης στον διακομιστή managesieve';
-$messages['filterdeleteerror'] = 'Αδυναμία διαγραφής φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
-$messages['filterdeleted'] = 'Το φίλτρο διαγράφηκε επιτυχώς';
-$messages['filterconfirmdelete'] = 'Θέλετε όντως να διαγράψετε το επιλεγμένο φίλτρο;';
-$messages['filtersaved'] = 'Το φίλτρο αποθηκεύτηκε επιτυχώς';
-$messages['filtersaveerror'] = 'Αδυναμία αποθήκευσης φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
-$messages['ruledeleteconfirm'] = 'Θέλετε όντως να διαγράψετε τον επιλεγμένο κανόνα;';
-$messages['actiondeleteconfirm'] = 'Θέλετε όντως να διαγράψετε την επιλεγμένη ενέργεια;';
-$messages['forbiddenchars'] = 'Μη επιτρεπτοί χαρακτήρες στο πεδίο';
-$messages['cannotbeempty'] = 'Το πεδίο δεν μπορεί να είναι κενό';
-
-?>
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
deleted file mode 100644
index c62979cc5..000000000
--- a/plugins/managesieve/localization/en_GB.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-$labels['filters'] = 'Filters';
-$labels['managefilters'] = 'Manage incoming mail filters';
-$labels['filtername'] = 'Filter name';
-$labels['newfilter'] = 'New filter';
-$labels['filteradd'] = 'Add filter';
-$labels['filterdel'] = 'Delete filter';
-$labels['moveup'] = 'Move up';
-$labels['movedown'] = 'Move down';
-$labels['filterallof'] = 'matching all of the following rules';
-$labels['filteranyof'] = 'matching any of the following rules';
-$labels['filterany'] = 'all messages';
-$labels['filtercontains'] = 'contains';
-$labels['filternotcontains'] = 'not contains';
-$labels['filteris'] = 'is equal to';
-$labels['filterisnot'] = 'is not equal to';
-$labels['filterexists'] = 'exists';
-$labels['filternotexists'] = 'not exists';
-$labels['filterunder'] = 'under';
-$labels['filterover'] = 'over';
-$labels['addrule'] = 'Add rule';
-$labels['delrule'] = 'Delete rule';
-$labels['messagemoveto'] = 'Move message to';
-$labels['messageredirect'] = 'Redirect message to';
-$labels['messagereply'] = 'Reply with message';
-$labels['messagedelete'] = 'Delete message';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagesrules'] = 'For incoming mail:';
-$labels['messagesactions'] = '...execute the following actions:';
-$labels['add'] = 'Add';
-$labels['del'] = 'Delete';
-$labels['sender'] = 'Sender';
-$labels['recipient'] = 'Recipient';
-$labels['vacationaddresses'] = 'Additional list of recipient e-mails (comma separated):';
-$labels['vacationdays'] = 'How often send messages (in days):';
-$labels['vacationreason'] = 'Message body (vacation reason):';
-$labels['rulestop'] = 'Stop evaluating rules';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Unknown server error';
-$messages['filterconnerror'] = 'Unable to connect to managesieve server';
-$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured';
-$messages['filterdeleted'] = 'Filter deleted successfully';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$messages['filtersaved'] = 'Filter saved successfully';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
-$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$messages['forbiddenchars'] = 'Forbidden characters in field';
-$messages['cannotbeempty'] = 'Field cannot be empty';
-
-?>
diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc
deleted file mode 100644
index ac410d3db..000000000
--- a/plugins/managesieve/localization/en_US.inc
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-$labels['filters'] = 'Filters';
-$labels['managefilters'] = 'Manage incoming mail filters';
-$labels['filtername'] = 'Filter name';
-$labels['newfilter'] = 'New filter';
-$labels['filteradd'] = 'Add filter';
-$labels['filterdel'] = 'Delete filter';
-$labels['moveup'] = 'Move up';
-$labels['movedown'] = 'Move down';
-$labels['filterallof'] = 'matching all of the following rules';
-$labels['filteranyof'] = 'matching any of the following rules';
-$labels['filterany'] = 'all messages';
-$labels['filtercontains'] = 'contains';
-$labels['filternotcontains'] = 'not contains';
-$labels['filteris'] = 'is equal to';
-$labels['filterisnot'] = 'is not equal to';
-$labels['filterexists'] = 'exists';
-$labels['filternotexists'] = 'not exists';
-$labels['filterunder'] = 'under';
-$labels['filterover'] = 'over';
-$labels['addrule'] = 'Add rule';
-$labels['delrule'] = 'Delete rule';
-$labels['messagemoveto'] = 'Move message to';
-$labels['messageredirect'] = 'Redirect message to';
-$labels['messagereply'] = 'Reply with message';
-$labels['messagedelete'] = 'Delete message';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagesrules'] = 'For incoming mail:';
-$labels['messagesactions'] = '...execute the following actions:';
-$labels['add'] = 'Add';
-$labels['del'] = 'Delete';
-$labels['sender'] = 'Sender';
-$labels['recipient'] = 'Recipient';
-$labels['vacationaddresses'] = 'Additional list of recipient e-mails (comma separated):';
-$labels['vacationdays'] = 'How often send messages (in days):';
-$labels['vacationreason'] = 'Message body (vacation reason):';
-$labels['rulestop'] = 'Stop evaluating rules';
-$labels['filterset'] = 'Filters set';
-$labels['filtersetadd'] = 'Add filters set';
-$labels['filtersetdel'] = 'Delete current filters set';
-$labels['filtersetact'] = 'Activate current filters set';
-$labels['filterdef'] = 'Filter definition';
-$labels['filtersetname'] = 'Filters set name';
-$labels['newfilterset'] = 'New filters set';
-$labels['active'] = 'active';
-$labels['copyfromset'] = 'Copy filters from set';
-$labels['none'] = '- none -';
-$labels['filterdisabled'] = 'Filter disabled';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Unknown server error';
-$messages['filterconnerror'] = 'Unable to connect to managesieve server';
-$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured';
-$messages['filterdeleted'] = 'Filter deleted successfully';
-$messages['filtersaved'] = 'Filter saved successfully';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$messages['forbiddenchars'] = 'Forbidden characters in field';
-$messages['cannotbeempty'] = 'Field cannot be empty';
-$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured';
-$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured';
-$messages['setactivated'] = 'Filters set activated successfully';
-$messages['setdeleted'] = 'Filters set deleted successfully';
-$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$messages['setcreateerror'] = 'Unable to create filters set. Server error occured';
-$messages['setcreated'] = 'Filters set created successfully';
-$messages['emptyname'] = 'Unable to create filters set. Empty set name';
-$messages['nametoolong'] = 'Unable to create filters set. Name too long'
-
-?>
diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc
deleted file mode 100644
index 24e682a6e..000000000
--- a/plugins/managesieve/localization/es_ES.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-$labels = array();
-$labels['filters'] = 'Filtros';
-$labels['managefilters'] = 'Administrar filtros de correo entrante';
-$labels['filtername'] = 'Nombre del filtro';
-$labels['newfilter'] = 'Nuevo filtro';
-$labels['filteradd'] = 'Agregar filtro';
-$labels['filterdel'] = 'Eliminar filtro';
-$labels['moveup'] = 'Mover arriba';
-$labels['movedown'] = 'Mover abajo';
-$labels['filterallof'] = 'coinidir con todas las reglas siguientes';
-$labels['filteranyof'] = 'coincidir con alguna de las reglas siguientes';
-$labels['filterany'] = 'todos los mensajes';
-$labels['filtercontains'] = 'contiene';
-$labels['filternotcontains'] = 'no contiene';
-$labels['filteris'] = 'es igual a';
-$labels['filterisnot'] = 'no es igual a';
-$labels['filterexists'] = 'existe';
-$labels['filternotexists'] = 'no existe';
-$labels['filterunder'] = 'bajo';
-$labels['filterover'] = 'sobre';
-$labels['addrule'] = 'Agregar regla';
-$labels['delrule'] = 'Eliminar regla';
-$labels['messagemoveto'] = 'Mover mensaje a';
-$labels['messageredirect'] = 'Redirigir mensaje a';
-$labels['messagereply'] = 'Responder con un mensaje';
-$labels['messagedelete'] = 'Eliminar mensaje';
-$labels['messagediscard'] = 'Descartar con un mensaje';
-$labels['messagesrules'] = 'Para el correo entrante:';
-$labels['messagesactions'] = '... ejecutar las siguientes acciones:';
-$labels['add'] = 'Agregar';
-$labels['del'] = 'Eliminar';
-$labels['sender'] = 'Remitente';
-$labels['recipient'] = 'Destinatario';
-$labels['vacationaddresses'] = 'Lista de direcciones de correo de destinatarios adicionales (separados por comas):';
-$labels['vacationdays'] = 'Cada cuanto enviar mensajes (en días):';
-$labels['vacationreason'] = 'Cuerpo del mensaje (razón de vacaciones):';
-$labels['rulestop'] = 'Parar de evaluar reglas';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Error desconocido de servidor';
-$messages['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
-$messages['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
-$messages['filterdeleted'] = 'Filtro borrado satisfactoriamente';
-$messages['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
-$messages['filtersaved'] = 'Filtro guardado satisfactoriamente';
-$messages['filtersaveerror'] = 'Imposible guardar ell filtro. Ha ocurrido un error en el servidor';
-$messages['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
-$messages['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
-$messages['forbiddenchars'] = 'Caracteres prohibidos en el campo';
-$messages['cannotbeempty'] = 'El campo no puede estar vacío';
-
-?>
diff --git a/plugins/managesieve/localization/et_EE.inc b/plugins/managesieve/localization/et_EE.inc
deleted file mode 100644
index 7f891883b..000000000
--- a/plugins/managesieve/localization/et_EE.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-$labels['filters'] = 'Filtrid';
-$labels['managefilters'] = 'Halda sisenevate kirjade filtreid';
-$labels['filtername'] = 'Filtri nimi';
-$labels['newfilter'] = 'Uus filter';
-$labels['filteradd'] = 'Lisa filter';
-$labels['filterdel'] = 'Kustuta filter';
-$labels['moveup'] = 'Liiguta üles';
-$labels['movedown'] = 'Liiguta alla';
-$labels['filterallof'] = 'vastab kõikidele järgnevatele reeglitele';
-$labels['filteranyof'] = 'vastab mõnele järgnevatest reeglitest';
-$labels['filterany'] = 'kõik kirjad';
-$labels['filtercontains'] = 'sisaldab';
-$labels['filternotcontains'] = 'ei sisalda';
-$labels['filteris'] = 'on võrdne kui';
-$labels['filterisnot'] = 'ei ole võrdne kui';
-$labels['filterexists'] = 'on olemas';
-$labels['filternotexists'] = 'pole olemas';
-$labels['filterunder'] = 'alt';
-$labels['filterover'] = 'üle';
-$labels['addrule'] = 'Lisa reegel';
-$labels['delrule'] = 'Kustuta reegel';
-$labels['messagemoveto'] = 'Liiguta kiri';
-$labels['messageredirect'] = 'Suuna kiri ümber';
-$labels['messagereply'] = 'Vasta kirjaga';
-$labels['messagedelete'] = 'Kustuta kiri';
-$labels['messagediscard'] = 'Viska ära teatega';
-$labels['messagesrules'] = 'Siseneva kirja puhul, mis:';
-$labels['messagesactions'] = '...käivita järgnevad tegevused:';
-$labels['add'] = 'Lisa';
-$labels['del'] = 'Kustuta';
-$labels['sender'] = 'Saatja';
-$labels['recipient'] = 'Saaja';
-$labels['vacationaddresses'] = 'Lisanimekiri saaja e-posti aadressidest (komadega eraldatud):';
-$labels['vacationdays'] = 'Kui tihti kirju saata (päevades):';
-$labels['vacationreason'] = 'Kirja sisu (puhkuse põhjus):';
-$labels['rulestop'] = 'Peata reeglite otsimine';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Tundmatu serveri tõrge';
-$messages['filterconnerror'] = 'Managesieve serveriga ühendumine nurjus';
-$messages['filterdeleteerror'] = 'Filtri kustutamine nurjus. Ilmnes serveri tõrge.';
-$messages['filterdeleted'] = 'Filter edukalt kustutatud';
-$messages['filterdeleteconfirm'] = 'Soovid valitud filtri kustutada?';
-$messages['filtersaved'] = 'Filter edukalt salvestatud';
-$messages['filtersaveerror'] = 'Filtri salvestamine nurjus. Ilmnes serveri tõrge.';
-$messages['ruledeleteconfirm'] = 'Soovid valitud reegli kustutada?';
-$messages['actiondeleteconfirm'] = 'Soovid valitud tegevuse kustutada?';
-$messages['forbiddenchars'] = 'Väljal on lubamatu märk';
-$messages['cannotbeempty'] = 'Väli ei või tühi olla';
-
-?>
diff --git a/plugins/managesieve/localization/fi_FI.inc b/plugins/managesieve/localization/fi_FI.inc
deleted file mode 100644
index 1b51d3b44..000000000
--- a/plugins/managesieve/localization/fi_FI.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-$labels['filters'] = 'Suodattimet';
-$labels['managefilters'] = 'Muokkaa saapuvan sähköpostin suodattimia';
-$labels['filtername'] = 'Suodattimen nimi';
-$labels['newfilter'] = 'Uusi suodatin';
-$labels['filteradd'] = 'Lisää suodatin';
-$labels['filterdel'] = 'Poista suodatin';
-$labels['moveup'] = 'Siirrä ylös';
-$labels['movedown'] = 'Siirrä alas';
-$labels['filterallof'] = 'Täsmää kaikkien sääntöjen mukaan';
-$labels['filteranyof'] = 'Täsmää minkä tahansa sääntöjen mukaan';
-$labels['filterany'] = 'Kaikki viestit';
-$labels['filtercontains'] = 'Sisältää';
-$labels['filternotcontains'] = 'Ei Sisällä';
-$labels['filteris'] = 'on samanlainen kuin';
-$labels['filterisnot'] = 'ei ole samanlainen kuin';
-$labels['filterexists'] = 'on olemassa';
-$labels['filternotexists'] = 'ei ole olemassa';
-$labels['filterunder'] = 'alla';
-$labels['filterover'] = 'yli';
-$labels['addrule'] = 'Lisää sääntö';
-$labels['delrule'] = 'Poista sääntö';
-$labels['messagemoveto'] = 'Siirrä viesti';
-$labels['messageredirect'] = 'Uudelleen ohjaa viesti';
-$labels['messagereply'] = 'Vastaa viestin kanssa';
-$labels['messagedelete'] = 'Poista viesti';
-$labels['messagediscard'] = 'Hylkää viesti';
-$labels['messagesrules'] = 'Saapuva sähköposti';
-$labels['messagesactions'] = 'Suorita seuraavat tapahtumat';
-$labels['add'] = 'Lisää';
-$labels['del'] = 'Poista';
-$labels['sender'] = 'Lähettäjä';
-$labels['recipient'] = 'Vastaanottaja';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Tuntematon palvelin virhe';
-$messages['filterconnerror'] = 'Yhdistäminen palvelimeen epäonnistui';
-$messages['filterdeleteerror'] = 'Suodattimen poistaminen epäonnistui. Palvelin virhe';
-$messages['filterdeleted'] = 'Suodatin poistettu';
-$messages['filterdeleteconfirm'] = 'Haluatko varmasti poistaa valitut suodattimet?';
-$messages['filtersaved'] = 'Suodatin tallennettu';
-$messages['filtersaveerror'] = 'Suodattimen tallennus epäonnistui. Palvelin virhe';
-$messages['ruledeleteconfirm'] = 'Haluatko poistaa valitut säännöt?';
-$messages['actiondeleteconfirm'] = 'Haluatko poistaa valitut tapahtumat?';
-$messages['forbiddenchars'] = 'Sisältää kiellettyjä kirjaimia';
-$messages['cannotbeempty'] = 'Kenttä ei voi olla tyhjä';
-
-?>
diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
deleted file mode 100644
index e7d09945a..000000000
--- a/plugins/managesieve/localization/fr_FR.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-$labels['filters'] = 'Filtres';
-$labels['managefilters'] = 'Gestion des filtres sur les mails entrants';
-$labels['filtername'] = 'Nom du filtre';
-$labels['newfilter'] = 'Nouveau filtre';
-$labels['filteradd'] = 'Ajouter un filtre';
-$labels['filterdel'] = 'Supprimer un filtre';
-$labels['moveup'] = 'Monter';
-$labels['movedown'] = 'Descendre';
-$labels['filterallof'] = 'valident toutes les conditions suivantes';
-$labels['filteranyof'] = 'valident au moins une des conditions suivantes';
-$labels['filterany'] = 'tous les messages';
-$labels['filtercontains'] = 'contient';
-$labels['filternotcontains'] = 'ne contient pas';
-$labels['filteris'] = 'est ';
-$labels['filterisnot'] = 'n\'est pas';
-$labels['filterexists'] = 'existe';
-$labels['filternotexists'] = 'n\'existe pas';
-$labels['filterunder'] = 'est plus petit que';
-$labels['filterover'] = 'est plus grand que';
-$labels['addrule'] = 'Ajouter une règle';
-$labels['delrule'] = 'Supprimer une règle';
-$labels['messagemoveto'] = 'Déplacer le message vers';
-$labels['messageredirect'] = 'Transférer le message à';
-$labels['messagereply'] = 'Répondre avec le message';
-$labels['messagedelete'] = 'Supprimer le message';
-$labels['messagediscard'] = 'Rejeter avec le message';
-$labels['messagesrules'] = 'Pour les mails entrants:';
-$labels['messagesactions'] = '...exécuter les actions suivantes:';
-$labels['add'] = 'Ajouter';
-$labels['del'] = 'Supprimer';
-$labels['sender'] = 'Expéditeur';
-$labels['recipient'] = 'Destinataire';
-$labels['vacationaddresses'] = 'Liste des destinataires (séparés par une virgule) :';
-$labels['vacationdays'] = 'Ne pas renvoyer un message avant (jours) :';
-$labels['vacationreason'] = 'Corps du message (raison de l\'absence) :';
-$labels['rulestop'] = 'Arrêter d\'évaluer les prochaines règles';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Erreur du serveur inconnue';
-$messages['filterconnerror'] = 'Connexion au serveur Managesieve impossible';
-$messages['filterdeleteerror'] = 'Suppression du filtre impossible. Le serveur à produit une erreur';
-$messages['filterdeleted'] = 'Le filtre a bien été supprimé';
-$messages['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
-$messages['filtersaved'] = 'Le filtre a bien été enregistré';
-$messages['filtersaveerror'] = 'Enregistrement du filtre impossibe. Le serveur à produit une erreur';
-$messages['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée?';
-$messages['actiondeleteconfirm'] = 'Voulez-vous vraiment supprimer l\'action sélectionnée?';
-$messages['forbiddenchars'] = 'Caractères interdits dans le champ';
-$messages['cannotbeempty'] = 'Le champ ne peut pas être vide';
-
-?>
diff --git a/plugins/managesieve/localization/hu_HU.inc b/plugins/managesieve/localization/hu_HU.inc
deleted file mode 100644
index 47a84f1a6..000000000
--- a/plugins/managesieve/localization/hu_HU.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-$labels = array();
-$labels['filters'] = 'Üzenetszűrők';
-$labels['managefilters'] = 'Bejövő üzenetek szűrői';
-$labels['filtername'] = 'Szűrő neve';
-$labels['newfilter'] = 'Új szűrő';
-$labels['filteradd'] = 'Szűrő hozzáadása';
-$labels['filterdel'] = 'Szűrő törlése';
-$labels['moveup'] = 'Mozgatás felfelé';
-$labels['movedown'] = 'Mozgatás lefelé';
-$labels['filterallof'] = 'A következők mind illeszkedjenek';
-$labels['filteranyof'] = 'A következők bármelyike illeszkedjen';
-$labels['filterany'] = 'Minden üzenet illeszkedjen';
-$labels['filtercontains'] = 'tartalmazza';
-$labels['filternotcontains'] = 'nem tartalmazza';
-$labels['filteris'] = 'megegyezik';
-$labels['filterisnot'] = 'nem egyezik meg';
-$labels['filterexists'] = 'létezik';
-$labels['filternotexists'] = 'nem létezik';
-$labels['filterunder'] = 'alatta';
-$labels['filterover'] = 'felette';
-$labels['addrule'] = 'Szabály hozzáadása';
-$labels['delrule'] = 'Szabály törlése';
-$labels['messagemoveto'] = 'Üzenet áthelyezése ide:';
-$labels['messageredirect'] = 'Üzenet továbbítása ide:';
-$labels['messagereply'] = 'Válaszüzenet küldése (autoreply)';
-$labels['messagedelete'] = 'Üzenet törlése';
-$labels['messagediscard'] = 'Válaszüzenet küldése, a levél törlése';
-$labels['messagesrules'] = 'Az adott tulajdonságú beérkezett üzenetekre:';
-$labels['messagesactions'] = '... a következő műveletek végrehajtása:';
-$labels['add'] = 'Hozzáadás';
-$labels['del'] = 'Törlés';
-$labels['sender'] = 'Feladó';
-$labels['recipient'] = 'Címzett';
-$labels['vacationaddresses'] = 'További címzettek (vesszővel elválasztva):';
-$labels['vacationdays'] = 'Válaszüzenet küldése ennyi naponként:';
-$labels['vacationreason'] = 'Levél szövege (automatikus válasz):';
-$labels['rulestop'] = 'Műveletek végrehajtásának befejezése';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Ismeretlen szerverhiba';
-$messages['filterconnerror'] = 'Nem tudok a szűrőszerverhez kapcsolódni';
-$messages['filterdeleteerror'] = 'A szűrőt nem lehet törölni, szerverhiba történt';
-$messages['filterdeleted'] = 'A szűrő törlése sikeres';
-$messages['filterdeleteconfirm'] = 'Biztosan törli ezt a szűrőt?';
-$messages['filtersaved'] = 'A szűrő mentése sikeres';
-$messages['filtersaveerror'] = 'A szűrő mentése sikertelen, szerverhiba történt';
-$messages['ruledeleteconfirm'] = 'Biztosan törli ezt a szabályt?';
-$messages['actiondeleteconfirm'] = 'Biztosan törli ezt a műveletet?';
-$messages['forbiddenchars'] = 'Érvénytelen karakter a mezőben';
-$messages['cannotbeempty'] = 'A mező nem lehet üres';
-
-?>
diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc
deleted file mode 100644
index b8736d26f..000000000
--- a/plugins/managesieve/localization/it_IT.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-$labels = array();
-$labels['filters'] = 'Filtri';
-$labels['managefilters'] = 'Gestione dei filtri per la posta in arrivo';
-$labels['filtername'] = 'Nome del filtro';
-$labels['newfilter'] = 'Nuovo filtro';
-$labels['filteradd'] = 'Aggiungi filtro';
-$labels['filterdel'] = 'Elimina filtro';
-$labels['moveup'] = 'Sposta sopra';
-$labels['movedown'] = 'Sposta sotto';
-$labels['filterallof'] = 'che soddisfa tutte le regole seguenti';
-$labels['filteranyof'] = 'che soddisfa una qualsiasi delle regole seguenti';
-$labels['filterany'] = 'tutti i messaggi';
-$labels['filtercontains'] = 'contiene';
-$labels['filternotcontains'] = 'non contiene';
-$labels['filteris'] = 'è uguale a';
-$labels['filterisnot'] = 'è diverso da';
-$labels['filterexists'] = 'esiste';
-$labels['filternotexists'] = 'non esiste';
-$labels['filterunder'] = 'sotto';
-$labels['filterover'] = 'sopra';
-$labels['addrule'] = 'Aggiungi regola';
-$labels['delrule'] = 'Elimina regola';
-$labels['messagemoveto'] = 'Sposta il messaggio in';
-$labels['messageredirect'] = 'Inoltra il messaggio a';
-$labels['messagereply'] = 'Rispondi con il messaggio';
-$labels['messagedelete'] = 'Elimina il messaggio';
-$labels['messagediscard'] = 'Rifiuta con messaggio';
-$labels['messagesrules'] = 'Per la posta in arrivo';
-$labels['messagesactions'] = '...esegui le seguenti azioni:';
-$labels['add'] = 'Aggiungi';
-$labels['del'] = 'Elimina';
-$labels['sender'] = 'Mittente';
-$labels['recipient'] = 'Destinatario';
-$labels['vacationaddresses'] = 'Lista di indirizzi e-mail di destinatari addizionali (separati da virgola):';
-$labels['vacationdays'] = 'Ogni quanti giorni ribadire il messaggio allo stesso mittente';
-$labels['vacationreason'] = 'Corpo del messaggio (dettagli relativi all\'assenza):';
-$labels['rulestop'] = 'Non valutare le regole successive';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Errore sconosciuto del server';
-$messages['filterconnerror'] = 'Collegamento al server managesieve fallito';
-$messages['filterdeleteerror'] = 'Eliminazione del filtro fallita. Si è verificato un errore nel server';
-$messages['filterdeleted'] = 'Filtro eliminato con successo';
-$messages['filterdeleteconfirm'] = 'Vuoi veramente eliminare il filtro selezionato?';
-$messages['filtersaved'] = 'Filtro salvato con successo';
-$messages['filtersaveerror'] = 'Salvataggio del filtro fallito. Si è verificato un errore nel server';
-$messages['ruledeleteconfirm'] = 'Sei sicuro di voler eliminare la regola selezionata?';
-$messages['actiondeleteconfirm'] = 'Sei sicuro di voler eliminare l\'azione selezionata?';
-$messages['forbiddenchars'] = 'Caratteri non consentiti nel campo';
-$messages['cannotbeempty'] = 'Il campo non può essere vuoto';
-
-?>
diff --git a/plugins/managesieve/localization/nb_NO.inc b/plugins/managesieve/localization/nb_NO.inc
deleted file mode 100644
index a0ed1f3d7..000000000
--- a/plugins/managesieve/localization/nb_NO.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-$labels = array();
-$labels['filters'] = 'Filtre';
-$labels['managefilters'] = 'Rediger filter for innkommende e-post';
-$labels['filtername'] = 'Filternavn';
-$labels['newfilter'] = 'Nytt filter';
-$labels['filteradd'] = 'Legg til filter';
-$labels['filterdel'] = 'Slett filter';
-$labels['moveup'] = 'Flytt opp';
-$labels['movedown'] = 'Flytt ned';
-$labels['filterallof'] = 'som treffer alle følgende regler';
-$labels['filteranyof'] = 'som treffer en av følgende regler';
-$labels['filterany'] = 'og alle meldinger';
-$labels['filtercontains'] = 'inneholder';
-$labels['filternotcontains'] = 'ikke innehold';
-$labels['filteris'] = 'er';
-$labels['filterisnot'] = 'ikke er';
-$labels['filterexists'] = 'eksisterer';
-$labels['filternotexists'] = 'ikke eksisterer';
-$labels['filterunder'] = 'under';
-$labels['filterover'] = 'over';
-$labels['addrule'] = 'Legg til regel';
-$labels['delrule'] = 'Slett regel';
-$labels['messagemoveto'] = 'Flytt meldingen til';
-$labels['messageredirect'] = 'Videresend meldingen til';
-$labels['messagereply'] = 'Svar med melding';
-$labels['messagedelete'] = 'Slett melding';
-$labels['messagediscard'] = 'Avvis med melding';
-$labels['messagesrules'] = 'For innkommende e-post';
-$labels['messagesactions'] = '...gjør følgende';
-$labels['add'] = 'Legg til';
-$labels['del'] = 'Slett';
-$labels['sender'] = 'Avsender';
-$labels['recipient'] = 'Mottaker';
-$labels['vacationaddresses'] = 'Liste med mottakeradresser (adskilt med komma):';
-$labels['vacationdays'] = 'Periode mellom meldinger (i dager):';
-$labels['vacationreason'] = 'Innhold (begrunnelse for fravær)';
-$labels['rulestop'] = 'Stopp evaluering av regler';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Ukjent problem med tjener';
-$messages['filterconnerror'] = 'Kunne ikke koble til MANAGESIEVE-tjener';
-$messages['filterdeleteerror'] = 'Kunne ikke slette filter. Det dukket opp en feil på tjeneren.';
-$messages['filterdeleted'] = 'Filteret er blitt slettet';
-$messages['filterconfirmdelete'] = 'Er du sikker på at du vil slette følgende filter?';
-$messages['filtersaved'] = 'Filter er blitt lagret';
-$messages['filtersaveerror'] = 'Kunne ikke lagre filteret. Det dukket opp en feil på tjeneren.';
-$messages['ruledeleteconfirm'] = 'Er du sikker på at du vil slette valgte regel?';
-$messages['actiondeleteconfirm'] = 'Er du sikker på at du vil slette valgte hendelse?';
-$messages['forbiddenchars'] = 'Ugyldige tegn i felt';
-$messages['cannotbeempty'] = 'Feltet kan ikke stå tomt';
-
-?>
diff --git a/plugins/managesieve/localization/nl_NL.inc b/plugins/managesieve/localization/nl_NL.inc
deleted file mode 100644
index 8ee317216..000000000
--- a/plugins/managesieve/localization/nl_NL.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-$labels['filters'] = 'Filters';
-$labels['managefilters'] = 'Beheer inkomende mail filters';
-$labels['filtername'] = 'Filternaam';
-$labels['newfilter'] = 'Nieuw filter';
-$labels['filteradd'] = 'Filter toevoegen';
-$labels['filterdel'] = 'Filter verwijderen';
-$labels['moveup'] = 'Omhoog';
-$labels['movedown'] = 'Omlaag';
-$labels['filterallof'] = 'die voldoen aan alle volgende regels';
-$labels['filteranyof'] = 'die voldoen aan een van de volgende regels';
-$labels['filterany'] = 'alle berichten';
-$labels['filtercontains'] = 'bevat';
-$labels['filternotcontains'] = 'bevat niet';
-$labels['filteris'] = 'is gelijk aan';
-$labels['filterisnot'] = 'is niet gelijk aan';
-$labels['filterexists'] = 'bestaat';
-$labels['filternotexists'] = 'bestaat niet';
-$labels['filterunder'] = 'onder';
-$labels['filterover'] = 'over';
-$labels['addrule'] = 'Regel toevoegen';
-$labels['delrule'] = 'Regel verwijderen';
-$labels['messagemoveto'] = 'Verplaats bericht naar';
-$labels['messageredirect'] = 'Redirect bericht naar';
-$labels['messagereply'] = 'Beantwoord met bericht';
-$labels['messagedelete'] = 'Verwijder bericht';
-$labels['messagediscard'] = 'Wijs af met bericht';
-$labels['messagesrules'] = 'Voor binnenkomende e-mail';
-$labels['messagesactions'] = '...voer de volgende acties uit';
-$labels['add'] = 'Toevoegen';
-$labels['del'] = 'Verwijderen';
-$labels['sender'] = 'Afzender';
-$labels['recipient'] = 'Ontvanger';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Onbekende fout';
-$messages['filterconnerror'] = 'Kan geen verbinding maken met de managesieve server';
-$messages['filterdeleteerror'] = 'Kan filter niet verwijderen. Er is een fout opgetreden';
-$messages['filterdeleted'] = 'Filter succesvol verwijderd';
-$messages['filterdeleteconfirm'] = 'Weet je zeker dat je het geselecteerde filter wilt verwijderen?';
-$messages['filtersaved'] = 'Filter succesvol opgeslagen';
-$messages['filtersaveerror'] = 'Kan filter niet opslaan. Er is een fout opgetreden.';
-$messages['ruledeleteconfirm'] = 'Weet je zeker dat je de geselecteerde regel wilt verwijderen?';
-$messages['actiondeleteconfirm'] = 'Weet je zeker dat je de geselecteerde actie wilt verwijderen?';
-$messages['forbiddenchars'] = 'Verboden karakters in het veld';
-$messages['cannotbeempty'] = 'Veld mag niet leeg zijn';
-
-?>
diff --git a/plugins/managesieve/localization/pl_PL.inc b/plugins/managesieve/localization/pl_PL.inc
deleted file mode 100644
index 6d3ca3102..000000000
--- a/plugins/managesieve/localization/pl_PL.inc
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-$labels = array();
-$labels['filters'] = 'Filtry';
-$labels['managefilters'] = 'Zarządzaj filtrami wiadomości przychodzących';
-$labels['filtername'] = 'Nazwa filtru';
-$labels['newfilter'] = 'Nowy filtr';
-$labels['filteradd'] = 'Dodaj filtr';
-$labels['filterdel'] = 'Usuń filtr';
-$labels['moveup'] = 'Przenieś wyżej';
-$labels['movedown'] = 'Przenieś niżej';
-$labels['filterallof'] = 'spełniające wszystkie poniższe kryteria';
-$labels['filteranyof'] = 'spełniające dowolne z poniższych kryteriów';
-$labels['filterany'] = 'wszystkich';
-$labels['filtercontains'] = 'zawiera';
-$labels['filternotcontains'] = 'nie zawiera';
-$labels['filteris'] = 'jest równe';
-$labels['filterisnot'] = 'nie jest równe';
-$labels['filterexists'] = 'istnieje';
-$labels['filternotexists'] = 'nie istnieje';
-$labels['filterunder'] = 'poniżej';
-$labels['filterover'] = 'ponad';
-$labels['addrule'] = 'Dodaj regułę';
-$labels['delrule'] = 'Usuń regułę';
-$labels['messagemoveto'] = 'Przenieś wiadomość do';
-$labels['messageredirect'] = 'Przekaż wiadomość na konto';
-$labels['messagereply'] = 'Odpowiedz wiadomością o treści';
-$labels['messagedelete'] = 'Usuń wiadomość';
-$labels['messagediscard'] = 'Odrzuć z komunikatem';
-$labels['messagesrules'] = 'W stosunku do przychodzących wiadomości:';
-$labels['messagesactions'] = '...wykonaj następujące czynności:';
-$labels['add'] = 'Dodaj';
-$labels['del'] = 'Usuń';
-$labels['sender'] = 'Nadawca';
-$labels['recipient'] = 'Odbiorca';
-$labels['rulestop'] = 'Przerwij przetwarzanie reguł';
-$labels['vacationdays'] = 'Częstotliwość wysyłania wiadomości (w dniach):';
-$labels['vacationaddresses'] = 'Lista dodatkowych adresów odbiorców (oddzielonych przecinkami):';
-$labels['vacationreason'] = 'Treść (przyczyna nieobecności):';
-$labels['filterset'] = 'Zbiór filtrów';
-$labels['filtersetadd'] = 'Dodaj zbiór filtrów';
-$labels['filtersetdel'] = 'Usuń bierzący zbiór filtrów';
-$labels['filtersetact'] = 'Aktywuj bierzący zbiór filtrów';
-$labels['filterdef'] = 'Definicja filtra';
-$labels['filtersetname'] = 'Nazwa zbioru filtrów';
-$labels['newfilterset'] = 'Nowy zbiór filtrów';
-$labels['active'] = 'aktywny';
-$labels['copyfromset'] = 'Skopiuj filtry ze zbioru';
-$labels['none'] = '- brak -';
-$labels['filterdisabled'] = 'Filtr wyłączony';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Nieznany błąd serwera';
-$messages['filterconnerror'] = 'Nie można nawiązać połączenia z serwerem managesieve';
-$messages['filterdeleteerror'] = 'Nie można usunąć filtra. Wystąpił błąd serwera';
-$messages['filterdeleted'] = 'Filtr został usunięty pomyślnie';
-$messages['filterdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany filtr?';
-$messages['filtersaved'] = 'Filtr został zapisany pomyślnie';
-$messages['filtersaveerror'] = 'Nie można zapisać filtra. Wystąpił błąd serwera.';
-$messages['ruledeleteconfirm'] = 'Czy na pewno chcesz usunąć wybraną regułę?';
-$messages['actiondeleteconfirm'] = 'Czy na pewno usunąć wybraną akcję?';
-$messages['forbiddenchars'] = 'Pole zawiera niedozwolone znaki';
-$messages['cannotbeempty'] = 'Pole nie może być puste';
-$messages['setactivateerror'] = 'Nie można aktywować wybranego zbioru filtrów. Błąd serwera';
-$messages['setdeleteerror'] = 'Nie można usunąć wybranego zbioru filtrów. Błąd serwera';
-$messages['setactivated'] = 'Zbiór filtrów został aktywowany pomyślnie';
-$messages['setdeleted'] = 'Zbiór filtrów został usunięty pomyślnie';
-$messages['setdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany zbiór filtrów?';
-$messages['setcreateerror'] = 'Nie można utworzyć zbioru filtrów. Błąd serwera';
-$messages['setcreated'] = 'Zbiór filtrów został utworzony pomyślnie';
-$messages['emptyname'] = 'Nie można utworzyć zbioru filtrów. Pusta nazwa zbioru';
-$messages['nametoolong'] = 'Nie można utworzyć zbioru filtrów. Nazwa zbyt długa'
-
-?>
diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc
deleted file mode 100644
index b48774e97..000000000
--- a/plugins/managesieve/localization/pt_BR.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-$labels['filters'] = 'Filtros';
-$labels['managefilters'] = 'Gerenciar filtros de entrada de e-mail';
-$labels['filtername'] = 'Nome do filtro';
-$labels['newfilter'] = 'Novo filtro';
-$labels['filteradd'] = 'Adicionar filtro';
-$labels['filterdel'] = 'Excluir filtro';
-$labels['moveup'] = 'Mover para cima';
-$labels['movedown'] = 'Mover para baixo';
-$labels['filterallof'] = 'casando todas as seguintes regras';
-$labels['filteranyof'] = 'casando qualquer das seguintes regras';
-$labels['filterany'] = 'todas as mensagens';
-$labels['filtercontains'] = 'contem';
-$labels['filternotcontains'] = 'não contem';
-$labels['filteris'] = 'é igual a';
-$labels['filterisnot'] = 'não é igual a';
-$labels['filterexists'] = 'existe';
-$labels['filternotexists'] = 'não existe';
-$labels['filterunder'] = 'inferior a';
-$labels['filterover'] = 'superior a';
-$labels['addrule'] = 'Adicionar regra';
-$labels['delrule'] = 'Excluir regra';
-$labels['messagemoveto'] = 'Mover mensagem para';
-$labels['messageredirect'] = 'Redirecionar mensagem para';
-$labels['messagereply'] = 'Responder com mensagem';
-$labels['messagedelete'] = 'Excluir mensagem';
-$labels['messagediscard'] = 'Descartar com mensagem';
-$labels['messagesrules'] = 'Para e-mails recebidos:';
-$labels['messagesactions'] = '...execute as seguintes ações:';
-$labels['add'] = 'Adicionar';
-$labels['del'] = 'Excluir';
-$labels['sender'] = 'Remetente';
-$labels['recipient'] = 'Destinatário';
-$labels['vacationaddresses'] = 'Lista adicional de e-mails de remetente (separado por vírgula):';
-$labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
-$labels['vacationreason'] = 'Corpo da mensagem (motivo de férias):';
-$labels['rulestop'] = 'Parar de avaliar regras';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Erro desconhecido de servidor';
-$messages['filterconnerror'] = 'Não foi possível conectar ao servidor managesieve';
-$messages['filterdeleteerror'] = 'Não foi possível excluir filtro. Occorreu um erro de servidor';
-$messages['filterdeleted'] = 'Filtro excluído com sucesso';
-$messages['filterdeleteconfirm'] = 'Deseja realmente excluir o filtro selecionado?';
-$messages['filtersaved'] = 'Filtro gravado com sucesso';
-$messages['filtersaveerror'] = 'Não foi possível gravar filtro. Occoreu um erro de servidor.';
-$messages['ruledeleteconfirm'] = 'Deseja realmente excluir a regra selecionada?';
-$messages['actiondeleteconfirm'] = 'Deseja realmente excluir a ação selecionada?';
-$messages['forbiddenchars'] = 'Caracteres não permitidos no campo';
-$messages['cannotbeempty'] = 'Campo não pode ficar em branco';
-
-?>
diff --git a/plugins/managesieve/localization/ru_RU.inc b/plugins/managesieve/localization/ru_RU.inc
deleted file mode 100644
index 46a6db7d8..000000000
--- a/plugins/managesieve/localization/ru_RU.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-$labels['filters'] = 'Фильтры';
-$labels['managefilters'] = 'Управление фильтрами для входящей почты';
-$labels['filtername'] = 'Название фильтра';
-$labels['newfilter'] = 'Новый фильтр';
-$labels['filteradd'] = 'Добавить фильтр';
-$labels['filterdel'] = 'Удалить фильтр';
-$labels['moveup'] = 'Сдвинуть вверх';
-$labels['movedown'] = 'Сдвинуть вниз';
-$labels['filterallof'] = 'соответствует всем указанным правилам';
-$labels['filteranyof'] = 'соответствует любому из указанных правил';
-$labels['filterany'] = 'все сообщения';
-$labels['filtercontains'] = 'содержит';
-$labels['filternotcontains'] = 'не содержит';
-$labels['filteris'] = 'соответсвует';
-$labels['filterisnot'] = 'не соответсвует';
-$labels['filterexists'] = 'существует';
-$labels['filternotexists'] = 'не существует';
-$labels['filterunder'] = 'под';
-$labels['filterover'] = 'на';
-$labels['addrule'] = 'Добавить правило';
-$labels['delrule'] = 'Удалить правило';
-$labels['messagemoveto'] = 'Переместить сообщение в';
-$labels['messageredirect'] = 'Перенаправить сообщение на ';
-$labels['messagereply'] = 'Ответить с сообщением';
-$labels['messagedelete'] = 'Удалить сообщение';
-$labels['messagediscard'] = 'Отбросить с сообщением';
-$labels['messagesrules'] = 'Для входящей почты:';
-$labels['messagesactions'] = '...выполнить следующие действия:';
-$labels['add'] = 'Добавить';
-$labels['del'] = 'Удалить';
-$labels['sender'] = 'Отправитель';
-$labels['recipient'] = 'Получатель';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Неизвестная ошибка сервера';
-$messages['filterconnerror'] = 'Невозможно подсоединится к серверу фильтров';
-$messages['filterdeleteerror'] = 'Невозможно удалить фильтр. Ошибка сервера';
-$messages['filterdeleted'] = 'Фильтр успешно удалён';
-$messages['filterdeleteconfirm'] = 'Вы действительно хотите удалить фильтр?';
-$messages['filtersaved'] = 'Фильтр успешно сохранён';
-$messages['filtersaveerror'] = 'Невозможно сохранить фильтр. Ошибка сервера';
-$messages['ruledeleteconfirm'] = 'Вы уверенны, что хотите удалить это правило?';
-$messages['actiondeleteconfirm'] = 'Вы уверенны, что хотите удалить это действие?';
-$messages['forbiddenchars'] = 'Недопустимые символы в поле';
-$messages['cannotbeempty'] = 'Поле не может быть пустым';
-
-?>
diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc
deleted file mode 100644
index ab9ccad66..000000000
--- a/plugins/managesieve/localization/sl_SI.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-	
-$labels['filters'] = 'Pravila';
-$labels['managefilters'] = 'Uredi sporočilna pravila';
-$labels['filtername'] = 'Ime pravila';
-$labels['newfilter'] = 'Novo pravilo';
-$labels['filteradd'] = 'Dodaj pravilo';
-$labels['filterdel'] = 'Izbriši pravilo';
-$labels['moveup'] = 'Pomakni se više';
-$labels['movedown'] = 'Pomakni se niže';
-$labels['filterallof'] = 'izpolnjeni morajo biti vsi pogoji';
-$labels['filteranyof'] = 'izpolnjen mora biti vsaj eden od navedenih pogojev';
-$labels['filterany'] = 'pogoj velja za vsa sporočila';
-$labels['filtercontains'] = 'vsebuje';
-$labels['filternotcontains'] = 'ne vsebuje';
-$labels['filteris'] = 'je enak/a';
-$labels['filterisnot'] = 'ni enak/a';
-$labels['filterexists'] = 'obstaja';
-$labels['filternotexists'] = 'ne obstaja';
-$labels['filterunder'] = 'pod';
-$labels['filterover'] = 'nad';
-$labels['addrule'] = 'Dodaj pravilo';
-$labels['delrule'] = 'Izbriši pravilo';
-$labels['messagemoveto'] = 'Premakni sporočilo v';
-$labels['messageredirect'] = 'Preusmeri sporočilo v';
-$labels['messagereply'] = 'Odgovori s sporočilom';
-$labels['messagedelete'] = 'Izbriši sporočilo';
-$labels['messagediscard'] = 'Zavrži s sporočilom';
-$labels['messagesrules'] = 'Določi pravila za dohodno pošto:';
-$labels['messagesactions'] = '...izvrši naslednja dejanja:';
-$labels['add'] = 'Dodaj';
-$labels['del'] = 'Izbriši';
-$labels['sender'] = 'Pošiljatelj';
-$labels['recipient'] = 'Prejemnik';
-$labels['vacationaddresses'] = 'Dodaten seznam naslovov prejemnikov (ločenih z vejico):';
-$labels['vacationdays'] = 'Kako pogosto naj bodo sporočila poslana (v dnevih):';
-$labels['vacationreason'] = 'Vsebina sporočila (vzrok za odsotnost):';
-$labels['rulestop'] = 'Prekini z izvajanjem pravil';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Prišlo je do neznane napake.';
-$messages['filterconnerror'] = 'Povezave s strežnikom (managesieve) ni bilo mogoče vzpostaviti';
-$messages['filterdeleteerror'] = 'Pravila ni bilo mogoče izbrisati. Prišlo je do napake.';
-$messages['filterdeleted'] = 'Pravilo je bilo uspešno izbrisano.';
-$messages['filterdeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
-$messages['filtersaved'] = 'Pravilo je bilo uspešno shranjeno';
-$messages['filtersaveerror'] = 'Pravilo ni bilo shranjeno. Prišlo je do napake.';
-$messages['ruledeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
-$messages['actiondeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano dejanje?';
-$messages['forbiddenchars'] = 'V polju so neveljavni znaki';
-$messages['cannotbeempty'] = 'Polje ne sme biti prazno';
-
-?>
diff --git a/plugins/managesieve/localization/sv_SE.inc b/plugins/managesieve/localization/sv_SE.inc
deleted file mode 100644
index 2c5ab69e9..000000000
--- a/plugins/managesieve/localization/sv_SE.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-$labels = array();
-$labels['filters'] = 'Filter';
-$labels['managefilters'] = 'Administrera filter';
-$labels['filtername'] = 'Filternamn';
-$labels['newfilter'] = 'Nytt filter';
-$labels['filteradd'] = 'Lägg till filter';
-$labels['filterdel'] = 'Ta bort filter';
-$labels['moveup'] = 'Flytta upp filter';
-$labels['movedown'] = 'Flytta ner filter';
-$labels['filterallof'] = 'Filtrera på alla följande regler';
-$labels['filteranyof'] = 'Filtrera på någon av följande regler';
-$labels['filterany'] = 'Filtrera alla meddelanden';
-$labels['filtercontains'] = 'innehåller';
-$labels['filternotcontains'] = 'inte innehåller';
-$labels['filteris'] = 'är lika med';
-$labels['filterisnot'] = 'är inte lika med';
-$labels['filterexists'] = 'finns';
-$labels['filternotexists'] = 'inte finns';
-$labels['filterunder'] = 'under';
-$labels['filterover'] = 'över';
-$labels['addrule'] = 'Lägg till regel';
-$labels['delrule'] = 'Ta bort regel';
-$labels['messagemoveto'] = 'Flytta meddelande till';
-$labels['messageredirect'] = 'Ändra mottagare till';
-$labels['messagereply'] = 'Besvara meddelande';
-$labels['messagedelete'] = 'Ta bort meddelande';
-$labels['messagediscard'] = 'Avböj med felmeddelande';
-$labels['messagesrules'] = 'För inkommande meddelande';
-$labels['messagesactions'] = 'Utför följande åtgärd';
-$labels['add'] = 'Lägg till';
-$labels['del'] = 'Ta bort';
-$labels['sender'] = 'Avsändare';
-$labels['recipient'] = 'Mottagare';
-$labels['vacationaddresses'] = 'Ytterligare mottagaradresser (avdelade med kommatecken)';
-$labels['vacationdays'] = 'Antal dagar mellan auto-svar';
-$labels['vacationreason'] = 'Meddelande i auto-svar';
-$labels['rulestop'] = 'Avsluta filtrering';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Okänt serverfel';
-$messages['filterconnerror'] = 'Anslutning till serverns filtertjänst misslyckades';
-$messages['filterdeleteerror'] = 'Filtret kunde inte tas bort på grund av serverfel';
-$messages['filterdeleted'] = 'Filtret är borttaget';
-$messages['filterdeleteconfirm'] = 'Vill du ta bort det markerade filtret?';
-$messages['filtersaved'] = 'Filtret har sparats';
-$messages['filtersaveerror'] = 'Filtret kunde inte sparas på grund av serverfel';
-$messages['ruledeleteconfirm'] = 'Vill du ta bort filterregeln?';
-$messages['actiondeleteconfirm'] = 'Vill du ta bort filteråtgärden?';
-$messages['forbiddenchars'] = 'Otillåtet tecken i fältet';
-$messages['cannotbeempty'] = 'Fältet kan inte lämnas tomt';
-
-?>
diff --git a/plugins/managesieve/localization/uk_UA.inc b/plugins/managesieve/localization/uk_UA.inc
deleted file mode 100644
index 70b643da1..000000000
--- a/plugins/managesieve/localization/uk_UA.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-$labels = array();
-$labels['filters'] = 'Фільтри';
-$labels['managefilters'] = 'Керування фільтрами вхідної пошти';
-$labels['filtername'] = 'Назва фільтру';
-$labels['newfilter'] = 'Новий фільтр';
-$labels['filteradd'] = 'Додати фільтр';
-$labels['filterdel'] = 'Видалити фільтр';
-$labels['moveup'] = 'Пересунути вгору';
-$labels['movedown'] = 'Пересунути вниз';
-$labels['filterallof'] = 'задовольняє усім наступним';
-$labels['filteranyof'] = 'задовольняє будь-якому з наступного';
-$labels['filterany'] = 'всі повідомлення';
-$labels['filtercontains'] = 'містить';
-$labels['filternotcontains'] = 'не містить';
-$labels['filteris'] = 'ідентичний до';
-$labels['filterisnot'] = 'не ідентичний до';
-$labels['filterexists'] = 'існує';
-$labels['filternotexists'] = 'не існує';
-$labels['filterunder'] = 'під';
-$labels['filterover'] = 'над';
-$labels['addrule'] = 'Додати правило';
-$labels['delrule'] = 'Видалити правило';
-$labels['messagemoveto'] = 'Пересунути повідомлення до';
-$labels['messageredirect'] = 'Перенаправити повідомлення до';
-$labels['messagereply'] = 'Відповісти з повідомленням';
-$labels['messagedelete'] = 'Видалити повідомлення';
-$labels['messagediscard'] = 'Відхилити з повідомленням';
-$labels['messagesrules'] = 'Для вхідної пошти';
-$labels['messagesactions'] = '... виконати дію:';
-$labels['add'] = 'Додати';
-$labels['del'] = 'Видалити';
-$labels['sender'] = 'Відправник';
-$labels['recipient'] = 'Отримувач';
-$labels['vacationaddresses'] = 'Додатковий список адрес отримувачів (розділених комою)';
-$labels['vacationdays'] = 'Частота надсилання повідомлень (у днях):';
-$labels['vacationreason'] = 'Тіло повідомлення (причина):';
-$labels['rulestop'] = 'Зупинити перевірку правил';
-
-$messages = array();
-$messages['filterunknownerror'] = 'Невідома помилка сервера.';
-$messages['filterconnerror'] = 'Неможливо з\'єднатися з сервером.';
-$messages['filterdeleteerror'] = 'Неможливо видалити фільтр. Помилка сервера.';
-$messages['filterdeleted'] = 'Фільтр успішно видалено.';
-$messages['filterdeleteconfirm'] = 'Ви дійсно хочете видалити вибраний фільтр?';
-$messages['filtersaved'] = 'Фільтр успішно збережено.';
-$messages['filtersaveerror'] = 'Неможливо зберегти фільтр. Помилка сервера.';
-$messages['ruledeleteconfirm'] = 'Ви дійсно хочете видалити вибране правило?';
-$messages['actiondeleteconfirm'] = 'Ви дійсно хочете видалити вибрану дію?';
-$messages['forbiddenchars'] = 'Введено заборонений символ.';
-$messages['cannotbeempty'] = 'Поле не може бути пустим.';
-
-?>
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
deleted file mode 100644
index a31a67d33..000000000
--- a/plugins/managesieve/localization/zh_CN.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-$labels['filters'] = '过滤器';
-$labels['managefilters'] = '管理邮件过滤器';
-$labels['filtername'] = '过滤器名称';
-$labels['newfilter'] = '新建过滤器';
-$labels['filteradd'] = '添加过滤器';
-$labels['filterdel'] = '删除过滤器';
-$labels['moveup'] = '上移';
-$labels['movedown'] = '下移';
-$labels['filterallof'] = '匹配所有规则';
-$labels['filteranyof'] = '匹配任意一条规则';
-$labels['filterany'] = '所有邮件';
-$labels['filtercontains'] = '包含';
-$labels['filternotcontains'] = '不包含';
-$labels['filteris'] = '等于';
-$labels['filterisnot'] = '不等于';
-$labels['filterexists'] = '存在';
-$labels['filternotexists'] = '不存在';
-$labels['filterunder'] = '小于';
-$labels['filterover'] = '大于';
-$labels['addrule'] = '添加规则';
-$labels['delrule'] = '删除规则';
-$labels['messagemoveto'] = '将邮件移动到';
-$labels['messageredirect'] = '将邮件转发到';
-$labels['messagereply'] = '回复以下信息';
-$labels['messagedelete'] = '删除邮件';
-$labels['messagediscard'] = '丢弃邮件并回复以下信息';
-$labels['messagesrules'] = '对收取的邮件应用规则：';
-$labels['messagesactions'] = '...执行以下动作：';
-$labels['add'] = '添加';
-$labels['del'] = '删除';
-$labels['sender'] = '发件人';
-$labels['recipient'] = '收件人';
-
-$messages = array();
-$messages['filterunknownerror'] = '未知的服务器错误';
-$messages['filterconnerror'] = '无法连接到 managesieve 服务器';
-$messages['filterdeleteerror'] = '无法删除过滤器。服务器错误';
-$messages['filterdeleted'] = '过滤器已成功删除';
-$messages['filterdeleteconfirm'] = '您确定要删除所选择的过滤器吗？';
-$messages['filtersaved'] = '过滤器已成功保存。';
-$messages['filtersaveerror'] = '无法保存过滤器。服务器错误';
-$messages['ruledeleteconfirm'] = '您确定要删除所选择的规则吗？';
-$messages['actiondeleteconfirm'] = '您确定要删除所选择的动作吗？';
-$messages['forbiddenchars'] = '内容中包含禁用的字符';
-$messages['cannotbeempty'] = '内容不能为空';
-
-?>
diff --git a/plugins/managesieve/localization/zh_TW.inc b/plugins/managesieve/localization/zh_TW.inc
deleted file mode 100644
index 470b9bab8..000000000
--- a/plugins/managesieve/localization/zh_TW.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-$labels['filters'] = '篩選器';
-$labels['managefilters'] = '設定篩選器';
-$labels['filtername'] = '篩選器名稱';
-$labels['newfilter'] = '建立新篩選器';
-$labels['filteradd'] = '增加篩選器';
-$labels['filterdel'] = '刪除篩選器';
-$labels['moveup'] = '上移';
-$labels['movedown'] = '下移';
-$labels['filterallof'] = '符合所有規則';
-$labels['filteranyof'] = '符合任一條規則';
-$labels['filterany'] = '所有信件';
-$labels['filtercontains'] = '包含';
-$labels['filternotcontains'] = '不包含';
-$labels['filteris'] = '等於';
-$labels['filterisnot'] = '不等於';
-$labels['filterexists'] = '存在';
-$labels['filternotexists'] = '不存在';
-$labels['filterunder'] = '小於';
-$labels['filterover'] = '大於';
-$labels['addrule'] = '新增規則';
-$labels['delrule'] = '刪除規則';
-$labels['messagemoveto'] = '將信件移至';
-$labels['messageredirect'] = '將信件轉寄至';
-$labels['messagereply'] = '以下列內容回覆';
-$labels['messagedelete'] = '刪除信件';
-$labels['messagediscard'] = '刪除信件並以下列內容回覆';
-$labels['messagesrules'] = '對新收到的信件：';
-$labels['messagesactions'] = '執行下列動作：';
-$labels['add'] = '新增';
-$labels['del'] = '刪除';
-$labels['sender'] = '寄件者';
-$labels['recipient'] = '收件者';
-$labels['vacationaddresses'] = '其他收件者（用半形逗號隔開）：';
-$labels['vacationdays'] = '多久回覆一次（單位：天）：';
-$labels['vacationreason'] = '信件內容（休假原因）：';
-$labels['rulestop'] = '停止評估規則';
-
-$messages = array();
-$messages['filterunknownerror'] = '未知的伺服器錯誤';
-$messages['filterconnerror'] = '無法與伺服器連線';
-$messages['filterdeleteerror'] = '無法刪除篩選器。發生伺服器錯誤';
-$messages['filterdeleted'] = '成功刪除篩選器';
-$messages['filterconfirmdelete'] = '您確定要刪除選擇的篩選器嗎？';
-$messages['filtersaved'] = '成功儲存篩選器。';
-$messages['filtersaveerror'] = '無法儲存篩選器。發生伺服器錯誤';
-$messages['ruledeleteconfirm'] = '您確定要刪除選的規則嗎？';
-$messages['actiondeleteconfirm'] = '您確定要刪除選擇的動作嗎？';
-$messages['forbiddenchars'] = '內容包含禁用字元';
-$messages['cannotbeempty'] = '內容不能為空白';
-
-?>
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
deleted file mode 100644
index 08954c1c2..000000000
--- a/plugins/managesieve/managesieve.js
+++ /dev/null
@@ -1,479 +0,0 @@
-/* Sieve Filters (tab) */
-
-if (window.rcmail) {
-  rcmail.addEventListener('init', function(evt) {
-    // <span id="settingstabdefault" class="tablink"><roundcube:button command="preferences" type="link" label="preferences" title="editpreferences" /></span>
-    var tab = $('<span>').attr('id', 'settingstabpluginmanagesieve').addClass('tablink');
-    
-    var button = $('<a>').attr('href', rcmail.env.comm_path+'&_action=plugin.managesieve')
-	.attr('title', rcmail.gettext('managesieve.managefilters'))
-	.html(rcmail.gettext('managesieve.filters'))
-	.bind('click', function(e){ return rcmail.command('plugin.managesieve', this) })
-	.appendTo(tab);
-
-    // add button and register commands
-    rcmail.add_element(tab, 'tabs');
-    rcmail.register_command('plugin.managesieve', function() { rcmail.goto_url('plugin.managesieve') }, true);
-    rcmail.register_command('plugin.managesieve-save', function() { rcmail.managesieve_save() }, true);
-    rcmail.register_command('plugin.managesieve-add', function() { rcmail.managesieve_add() }, true);
-    rcmail.register_command('plugin.managesieve-del', function() { rcmail.managesieve_del() }, true);
-    rcmail.register_command('plugin.managesieve-up', function() { rcmail.managesieve_up() }, true);
-    rcmail.register_command('plugin.managesieve-down', function() { rcmail.managesieve_down() }, true);
-    rcmail.register_command('plugin.managesieve-set', function() { rcmail.managesieve_set() }, true);
-    rcmail.register_command('plugin.managesieve-setadd', function() { rcmail.managesieve_setadd() }, true);
-    rcmail.register_command('plugin.managesieve-setdel', function() { rcmail.managesieve_setdel() }, true);
-    rcmail.register_command('plugin.managesieve-setact', function() { rcmail.managesieve_setact() }, true);
-
-    if (rcmail.env.action == 'plugin.managesieve')
-      {
-	if (rcmail.gui_objects.sieveform) {
-	  rcmail.enable_command('plugin.managesieve-save', true);
-	}
-        else {
-	  rcmail.enable_command('plugin.managesieve-del', 'plugin.managesieve-up',
-	    'plugin.managesieve-down', false);
-          rcmail.enable_command('plugin.managesieve-add', 'plugin.managesieve-setadd', !rcmail.env.sieveconnerror);
-	  rcmail.enable_command('plugin.managesieve-set', rcmail.gui_objects.filtersetslist != null);
-	  rcmail.enable_command('plugin.managesieve-setact',
-	    (rcmail.gui_objects.filtersetslist && rcmail.gui_objects.filtersetslist.length > 1
-		&& rcmail.gui_objects.filtersetslist.value != rcmail.env.active_set));
-	  rcmail.enable_command('plugin.managesieve-setdel',
-	    (rcmail.gui_objects.filtersetslist && rcmail.gui_objects.filtersetslist.length > 1));
-	}
-        if (rcmail.gui_objects.filterslist) {
-	    var p = rcmail;
-    	    rcmail.filters_list = new rcube_list_widget(rcmail.gui_objects.filterslist, {multiselect:false, draggable:false, keyboard:false});
-    	    rcmail.filters_list.addEventListener('select', function(o){ p.managesieve_select(o); });
-    	    rcmail.filters_list.init();
-    	    rcmail.filters_list.focus();
-	  }
-      }
-    if (rcmail.gui_objects.sieveform && rcmail.env.rule_disabled)
-      $('#disabled').attr('checked', true);
-  });
-
-  /*********************************************************/
-  /*********     Managesieve filters methods       *********/
-  /*********************************************************/
-
-  rcube_webmail.prototype.managesieve_add = function()
-    {
-      this.load_managesieveframe();
-      this.filters_list.clear_selection();
-    };
-
-  rcube_webmail.prototype.managesieve_del = function()
-    {
-    var id = this.filters_list.get_single_selection();
-
-    if (confirm(this.get_label('managesieve.filterdeleteconfirm')))
-      this.http_request('plugin.managesieve',
-	    '_act=delete&_fid='+this.filters_list.rows[id].uid, true);
-    };
-
-  rcube_webmail.prototype.managesieve_up = function()
-    {
-    var id = this.filters_list.get_single_selection();
-    this.http_request('plugin.managesieve',
-    	    '_act=up&_fid='+this.filters_list.rows[id].uid, true);
-    };
-
-  rcube_webmail.prototype.managesieve_down = function()
-    {
-    var id = this.filters_list.get_single_selection();
-    this.http_request('plugin.managesieve',
-    	    '_act=down&_fid='+this.filters_list.rows[id].uid, true);
-    };
-
-  rcube_webmail.prototype.managesieve_rowid = function(id)
-    {
-    var rows = this.filters_list.rows;
-    
-    for (var i=0; i<rows.length; i++)
-      if (rows[i] != null && rows[i].uid == id)
-	return i;
-    }
-
-  rcube_webmail.prototype.managesieve_updatelist = function(action, name, id, disabled)
-    {
-    this.set_busy(true);
-
-    switch (action)
-      {
-      case 'delete':
-        this.filters_list.remove_row(this.managesieve_rowid(id));
-	this.filters_list.clear_selection();
-	this.enable_command('plugin.managesieve-del', 'plugin.managesieve-up', 'plugin.managesieve-down', false);
-	this.show_contentframe(false);
-
-	// re-numbering filters
-        var rows = this.filters_list.rows;
-        for (var i=0; i<rows.length; i++)
-          {
-	  if (rows[i] != null && rows[i].uid > id)
-	    rows[i].uid = rows[i].uid-1;
-	  }
-	break;
-
-      case 'down':
-        var rows = this.filters_list.rows;
-	var from, fromstatus, status;
-
-	// we need only to replace filter names...
-        for (var i=0; i<rows.length; i++)
-        {
-	  if (rows[i]==null) { // removed row
-	    continue;
-          } else if (rows[i].uid == id) {
-	    from = rows[i].obj;
-            fromstatus = $(from).hasClass('disabled');
-	  } else if (rows[i].uid == id+1){
-	    name = rows[i].obj.cells[0].innerHTML;
-            status = $(rows[i].obj).hasClass('disabled');
-	    rows[i].obj.cells[0].innerHTML = from.cells[0].innerHTML;
-	    from.cells[0].innerHTML = name;
-            $(from)[status?'addClass':'removeClass']('disabled');
-            $(rows[i].obj)[fromstatus?'addClass':'removeClass']('disabled');
-	    this.filters_list.highlight_row(i);
-	    break;
-	  }
-	}
-	// ... and disable/enable Down button
-	this.filters_listbuttons();
-        break;
-
-      case 'up':
-        var rows = this.filters_list.rows;
-	var from, status, fromstatus;
-
-	// we need only to replace filter names...
-        for (var i=0; i<rows.length; i++)
-        {
-	  if (rows[i]==null) { // removed row
-	    continue;
-          } else if (rows[i].uid == id-1) {
-	    from = rows[i].obj;
-            fromstatus = $(from).hasClass('disabled');
-	    this.filters_list.highlight_row(i);
-	  } else if (rows[i].uid == id) {
-	    name = rows[i].obj.cells[0].innerHTML;
-            status = $(rows[i].obj).hasClass('disabled');
-	    rows[i].obj.cells[0].innerHTML = from.cells[0].innerHTML;
-	    from.cells[0].innerHTML = name;
-            $(from)[status?'addClass':'removeClass']('disabled');
-            $(rows[i].obj)[fromstatus?'addClass':'removeClass']('disabled');
-	    break;
-	  }
-	}
-	// ... and disable/enable Up button
-	this.filters_listbuttons();
-        break;
-	
-      case 'update':
-        var rows = parent.rcmail.filters_list.rows;
-        for (var i=0; i<rows.length; i++)
-	  if (rows[i] && rows[i].uid == id)
-	    {
-	    rows[i].obj.cells[0].innerHTML = name;
-            if (disabled)
-              $(rows[i].obj).addClass('disabled');
-            else
-              $(rows[i].obj).removeClass('disabled');
-	    break;
-	    }
-        break;
-      
-      case 'add':
-        var row, new_row, td;
-	var list = parent.rcmail.filters_list;
-
-	if (!list)
-          break;
-
-	for (var i=0; i<list.rows.length; i++)
-	  if (list.rows[i] != null && String(list.rows[i].obj.id).match(/^rcmrow/))
-	    row = list.rows[i].obj;
-
-        if (row)
-	  {
-	    new_row = parent.document.createElement('tr');
-	    new_row.id = 'rcmrow'+id;
-    	    td = parent.document.createElement('td');
-    	    new_row.appendChild(td);
-	    list.insert_row(new_row, false);
-            if (disabled)
-              $(new_row).addClass('disabled');
-
-    	    if (row.cells[0].className)
-    	      td.className = row.cells[0].className;
-        
-    	    td.innerHTML = name;
-	    list.highlight_row(id);
-
-	    parent.rcmail.enable_command('plugin.managesieve-del', 'plugin.managesieve-up', true);
-	  }
-        else // refresh whole page
-	  parent.rcmail.goto_url('plugin.managesieve');
-	break;
-      }
-
-    this.set_busy(false);
-
-    };
-
-  rcube_webmail.prototype.managesieve_select = function(list)
-    {
-    var id = list.get_single_selection();
-    if (id != null)
-      this.load_managesieveframe(list.rows[id].uid);
-    };
-
-  rcube_webmail.prototype.managesieve_save = function()
-    {
-      if (parent.rcmail && parent.rcmail.filters_list && this.gui_objects.sieveform.name != 'filtersetform')
-        {
-        var id = parent.rcmail.filters_list.get_single_selection();
-	if (id != null)
-	  this.gui_objects.sieveform.elements['_fid'].value = parent.rcmail.filters_list.rows[id].uid;
-        }
-      this.gui_objects.sieveform.submit();
-    };
-
-  // load filter frame
-  rcube_webmail.prototype.load_managesieveframe = function(id)
-    {
-    if (typeof(id) != 'undefined' && id != null)
-      {
-      this.enable_command('plugin.managesieve-del', true);
-      this.filters_listbuttons();
-      }
-    else
-      this.enable_command('plugin.managesieve-up', 'plugin.managesieve-down', 'plugin.managesieve-del', false);
-
-    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
-      {
-      target = window.frames[this.env.contentframe];
-      this.set_busy(true, 'loading');
-      target.location.href = this.env.comm_path+'&_action=plugin.managesieve&_framed=1&_fid='+id;
-      }
-    };
-
-  // enable/disable Up/Down buttons
-  rcube_webmail.prototype.filters_listbuttons = function()
-    {
-    var id = this.filters_list.get_single_selection();
-    var rows = this.filters_list.rows;
-
-    for (var i=0; i<rows.length; i++)
-      {
-      if (rows[i] == null) { // removed row
-        } else if (i == id) {
-	  this.enable_command('plugin.managesieve-up', false);
-	  break;
-        } else {
-	  this.enable_command('plugin.managesieve-up', true);
-	  break;
-        }
-      }
-
-    for (var i=rows.length-1; i>0; i--)
-      {
-        if (rows[i] == null) { // removed row
-	} else if (i == id) {
-	  this.enable_command('plugin.managesieve-down', false);
-	  break;
-	} else {
-	  this.enable_command('plugin.managesieve-down', true);
-	  break;
-	}
-      } 
-    };
-
-  // operations on filters form
-  rcube_webmail.prototype.managesieve_ruleadd = function(id)
-    {
-      this.http_post('plugin.managesieve', '_act=ruleadd&_rid='+id);
-    };
-
-  rcube_webmail.prototype.managesieve_rulefill = function(content, id, after)
-    {
-      if (content != '')
-        {
-	// create new element
-	var div = document.getElementById('rules');
-	var row = document.createElement('div');
-
-	this.managesieve_insertrow(div, row, after);
-	// fill row after inserting (for IE)
-	row.setAttribute('id', 'rulerow'+id);
-	row.className = 'rulerow';
-        row.innerHTML = content;
-
-	this.managesieve_formbuttons(div);
-	}
-    };
-
-  rcube_webmail.prototype.managesieve_ruledel = function(id)
-    {
-      if (confirm(this.get_label('managesieve.ruledeleteconfirm')))
-	{
-	var row = document.getElementById('rulerow'+id);
-	row.parentNode.removeChild(row);
-	this.managesieve_formbuttons(document.getElementById('rules'));
-	}
-    };
-
-  rcube_webmail.prototype.managesieve_actionadd = function(id)
-    {
-      this.http_post('plugin.managesieve', '_act=actionadd&_aid='+id);
-    };
-
-  rcube_webmail.prototype.managesieve_actionfill = function(content, id, after)
-    {
-      if (content != '')
-        {
-	var div = document.getElementById('actions');
-	var row = document.createElement('div');
-
-	this.managesieve_insertrow(div, row, after);
-	// fill row after inserting (for IE)
-	row.className = 'actionrow';
-	row.setAttribute('id', 'actionrow'+id);
-        row.innerHTML = content;
-
-        this.managesieve_formbuttons(div);
-	}
-    };
-
-  rcube_webmail.prototype.managesieve_actiondel = function(id)
-    {
-      if (confirm(this.get_label('managesieve.actiondeleteconfirm')))
-	{
-	var row = document.getElementById('actionrow'+id);
-	row.parentNode.removeChild(row);
-	this.managesieve_formbuttons(document.getElementById('actions'));
-	}
-    };
-
-  // insert rule/action row in specified place on the list
-  rcube_webmail.prototype.managesieve_insertrow = function(div, row, after)
-    {
-      for (var i=0; i<div.childNodes.length; i++)
-	{
-        if (div.childNodes[i].id == (div.id == 'rules' ? 'rulerow' : 'actionrow')  + after)
-	  break;
-	}
-
-      if (div.childNodes[i+1])
-        div.insertBefore(row, div.childNodes[i+1]);
-      else
-        div.appendChild(row);
-    }
-
-  // update Delete buttons status
-  rcube_webmail.prototype.managesieve_formbuttons = function(div)
-    {
-      var buttons = new Array();
-      var i, j=0;
-      // count and get buttons
-      for (i=0; i<div.childNodes.length; i++)
-	{
-	if (div.id == 'rules' && div.childNodes[i].id)
-	  {
-	  if (/rulerow/.test(div.childNodes[i].id))
-	    buttons.push('ruledel' + div.childNodes[i].id.replace(/rulerow/, ''));
-	  }
-	else if (div.childNodes[i].id)
-	  {
-	  if (/actionrow/.test(div.childNodes[i].id))
-	    buttons.push( 'actiondel' + div.childNodes[i].id.replace(/actionrow/, ''));
-	  }
-        }
-
-      for (i=0; i<buttons.length; i++)
-	{
-	var button = document.getElementById(buttons[i]);
-	if (i>0 || buttons.length>1)
-	  {
-	  $(button).removeClass('disabled');
-	  button.removeAttribute('disabled');
-	  }
-	else
-	  {
-	  $(button).addClass('disabled');
-	  button.setAttribute('disabled', true);
-	  }
-        }
-    }
-
-  // Set change
-  rcube_webmail.prototype.managesieve_set = function()
-    {
-    var script = $(this.gui_objects.filtersetslist).val();
-    location.href = this.env.comm_path+'&_action=plugin.managesieve&_sid='+script;
-    };
-
-  // Set activate
-  rcube_webmail.prototype.managesieve_setact = function()
-    {
-      if (!this.gui_objects.filtersetslist)
-        return false;
-
-      var script = this.gui_objects.filtersetslist.value;
-      this.http_post('plugin.managesieve', '_act=setact&_set='+script);
-    };
-
-  // Set activate flag in sets list after set activation
-  rcube_webmail.prototype.managesieve_reset = function(name)
-    {
-      if (!this.gui_objects.filtersetslist || !name)
-        return false;
-
-      var opts = this.gui_objects.filtersetslist.getElementsByTagName('option');
-      var regx = new RegExp(RegExp.escape(' (' + this.get_label('managesieve.active') + ')'));
-      
-      for (var x=1; x<opts.length; x++)
-        if (opts[x].value != name && opts[x].innerHTML.match(regx))
-	  opts[x].innerHTML = opts[x].innerHTML.replace(regx, '');
-	else if (opts[x].value == name)
-	  opts[x].innerHTML = opts[x].innerHTML + ' (' + this.get_label('managesieve.active') + ')';
-    };
-
-  // Set delete
-  rcube_webmail.prototype.managesieve_setdel = function()
-    {
-      if (!this.gui_objects.filtersetslist)
-        return false;
-
-      if (!confirm(this.get_label('managesieve.setdeleteconfirm')))
-        return false;
-
-      var script = this.gui_objects.filtersetslist.value;
-      this.http_post('plugin.managesieve', '_act=setdel&_set='+script);
-    };
-
-  // Set add
-  rcube_webmail.prototype.managesieve_setadd = function()
-    {
-      this.filters_list.clear_selection();
-      this.enable_command('plugin.managesieve-up', 'plugin.managesieve-down', 'plugin.managesieve-del', false);
-
-      if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
-        {
-        target = window.frames[this.env.contentframe];
-        this.set_busy(true, 'loading');
-        target.location.href = this.env.comm_path+'&_action=plugin.managesieve&_framed=1&_newset=1';
-        }
-    };
-
-
-  rcube_webmail.prototype.managesieve_reload = function(set)
-    {
-      this.env.reload_set = set;
-      window.setTimeout(function() {
-        location.href = rcmail.env.comm_path + '&_action=plugin.managesieve'
-	  + (rcmail.env.reload_set ? '&_sid=' + rcmail.env.reload_set : '')
-	}, 500);
-    };
-
-}
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
deleted file mode 100644
index 4c50616b1..000000000
--- a/plugins/managesieve/managesieve.php
+++ /dev/null
@@ -1,1042 +0,0 @@
-<?php
-
-/**
- * Managesieve (Sieve Filters)
- *
- * Plugin that adds a possibility to manage Sieve filters in Thunderbird's style.
- * It's clickable interface which operates on text scripts and communicates
- * with server using managesieve protocol. Adds Filters tab in Settings.
- *
- * @version 2.3
- * @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
- *
- * Configuration (see config.inc.php.dist)
- *
- * $Id$
- */
-
-class managesieve extends rcube_plugin
-{
-  public $task = 'settings';
-
-  private $rc;
-  private $sieve;
-  private $errors;
-  private $form;
-  private $script = array();
-  private $exts = array();
-  private $headers = array(
-    'subject' => 'Subject',
-    'sender' => 'From',
-    'recipient' => 'To',
-  );
-
-  function init()
-  {
-    // add Tab label/title
-    $this->add_texts('localization/', array('filters','managefilters'));
-
-    // register actions
-    $this->register_action('plugin.managesieve', array($this, 'managesieve_actions'));
-    $this->register_action('plugin.managesieve-save', array($this, 'managesieve_save'));
-
-    // include main js script
-    $this->include_script('managesieve.js');
-  }
-  
-  function managesieve_start()
-  {
-    $this->rc = rcmail::get_instance();
-    $this->load_config();
-
-    // register UI objects
-    $this->rc->output->add_handlers(array(
-	'filterslist' => array($this, 'filters_list'),
-	'filtersetslist' => array($this, 'filtersets_list'),
-	'filterframe' => array($this, 'filter_frame'),
-	'filterform' => array($this, 'filter_form'),
-	'filtersetform' => array($this, 'filterset_form'),
-    ));
-
-    require_once($this->home . '/lib/Net/Sieve.php');
-    require_once($this->home . '/lib/rcube_sieve.php');
-
-    $host = str_replace('%h', $_SESSION['imap_host'], $this->rc->config->get('managesieve_host', 'localhost'));
-    $port = $this->rc->config->get('managesieve_port', 2000);
-
-    // try to connect to managesieve server and to fetch the script
-    $this->sieve = new rcube_sieve($_SESSION['username'],
-	$this->rc->decrypt($_SESSION['password']), 
-	$host, $port,
-	$this->rc->config->get('managesieve_usetls', false),
-	$this->rc->config->get('managesieve_disabled_extensions'),
-	$this->rc->config->get('managesieve_debug', false)
-    );
-
-    if (!($error = $this->sieve->error())) {
-      
-      $list = $this->sieve->get_scripts();
-      $active = $this->sieve->get_active();
-      $_SESSION['managesieve_active'] = $active;
-      
-      if (!empty($_GET['_sid'])) {
-        $script_name = get_input_value('_sid', RCUBE_INPUT_GET);
-      } else if (!empty($_SESSION['managesieve_current'])) {
-        $script_name = $_SESSION['managesieve_current'];
-      } else {
-        // get active script
-	if ($active) {
-	  $script_name = $active;
-        } else if ($list) {
-          $script_name = $list[0];
-        // create a new (initial) script
-        } else {
-          // if script not exists build default script contents
-          $script_file = $this->rc->config->get('managesieve_default');
-	  $script_name = 'roundcube';
-          if ($script_file && is_readable($script_file))
-	    $content = file_get_contents($script_file);
-
-	  // add script and set it active    
-	  if ($this->sieve->save_script($script_name, $content)) 
-            if ($this->sieve->activate($script_name))
-	      $_SESSION['managesieve_active'] = $script_name;
-	}
-      }
-
-      if ($script_name)
-        $this->sieve->load($script_name);
-
-      $error = $this->sieve->error();
-    }
-    
-    // finally set script objects
-    if ($error)
-    {
-      switch ($error) {
-	case SIEVE_ERROR_CONNECTION:
-	case SIEVE_ERROR_LOGIN:
-          $this->rc->output->show_message('managesieve.filterconnerror', 'error');  
-	break;
-	default:
-          $this->rc->output->show_message('managesieve.filterunknownerror', 'error');
-	break;
-      }
-
-      raise_error(array('code' => 403, 'type' => 'php', 'message' => "Unable to connect to managesieve on $host:$port"), true, false);
-
-      // to disable 'Add filter' button set env variable
-      $this->rc->output->set_env('filterconnerror', true);
-      $this->script = array();
-    }
-    else
-    {
-      $this->script = $this->sieve->script->as_array();
-      $this->exts = $this->sieve->get_extensions();
-      $this->rc->output->set_env('active_set', $_SESSION['managesieve_active']);
-      $_SESSION['managesieve_current'] = $this->sieve->current;
-    }
-    
-    return $error;
-  }
-
-  function managesieve_actions()
-  {
-    // Init plugin and handle managesieve connection
-    $error = $this->managesieve_start();
-
-    // Handle user requests
-    if ($action = get_input_value('_act', RCUBE_INPUT_GPC))
-    {
-      $fid = (int) get_input_value('_fid', RCUBE_INPUT_GET);
-
-      if ($action=='up' && !$error)
-      {
-        if ($fid && isset($this->script[$fid]) && isset($this->script[$fid-1]))
-        {
-          if ($this->sieve->script->update_rule($fid, $this->script[$fid-1]) !== false
-    		&& $this->sieve->script->update_rule($fid-1, $this->script[$fid]) !== false)
-	    $result = $this->sieve->save();
-      
-          if ($result) {
-//          $this->rc->output->show_message('managesieve.filtersaved', 'confirmation');
-	    $this->rc->output->command('managesieve_updatelist', 'up', '', $fid);
-          } else
-            $this->rc->output->show_message('managesieve.filtersaveerror', 'error');
-        }
-      }
-      else if ($action=='down' && !$error)
-      {
-        if (isset($this->script[$fid]) && isset($this->script[$fid+1]))
-        {
-          if ($this->sieve->script->update_rule($fid, $this->script[$fid+1]) !== false
-    		&& $this->sieve->script->update_rule($fid+1, $this->script[$fid]) !== false)
-	    $result = $this->sieve->save();
-      
-          if ($result === true) {
-//          $this->rc->output->show_message('managesieve.filtersaved', 'confirmation');
-	    $this->rc->output->command('managesieve_updatelist', 'down', '', $fid);
-          } else {
-            $this->rc->output->show_message('managesieve.filtersaveerror', 'error');
-          }
-	}
-      }
-      else if ($action=='delete' && !$error)
-      {
-        if (isset($this->script[$fid]))
-        {
-          if ($this->sieve->script->delete_rule($fid))
-            $result = $this->sieve->save();
-
-          if ($result === true) {
-	    $this->rc->output->show_message('managesieve.filterdeleted', 'confirmation');
-	    $this->rc->output->command('managesieve_updatelist', 'delete', '', $fid);
-          } else {
-            $this->rc->output->show_message('managesieve.filterdeleteerror', 'error');
-          }
-	}
-      }
-      else if ($action=='setact' && !$error)
-      {
-        $script_name = get_input_value('_set', RCUBE_INPUT_GPC);
-	$result = $this->sieve->activate($script_name);
-	
-	if ($result === true) {
-          $this->rc->output->set_env('active_set', $script_name);
-	  $this->rc->output->show_message('managesieve.setactivated', 'confirmation');
-	  $this->rc->output->command('enable_command', 'plugin.managesieve-setact', false);
-	  $this->rc->output->command('managesieve_reset', $script_name);
-	  $_SESSION['managesieve_active'] = $script_name;
-	} else {
-          $this->rc->output->show_message('managesieve.setactivateerror', 'error');
-	}
-      }
-      else if ($action=='setdel' && !$error)
-      {
-        $script_name = get_input_value('_set', RCUBE_INPUT_GPC);
-	$result = $this->sieve->remove($script_name);
-	
-	if ($result === true) {
-	  $this->rc->output->show_message('managesieve.setdeleted', 'confirmation');
-	  $this->rc->output->command('managesieve_reload');
-	  $this->rc->session->remove('managesieve_current');
-	} else {
-          $this->rc->output->show_message('managesieve.setdeleteerror', 'error');
-	}
-      }
-      elseif ($action=='ruleadd')
-      {
-        $rid = get_input_value('_rid', RCUBE_INPUT_GPC);
-        $id = $this->genid();
-        $content = $this->rule_div($fid, $id, false);
-
-        $this->rc->output->command('managesieve_rulefill', $content, $id, $rid);
-      }
-      elseif ($action=='actionadd')
-      {
-        $aid = get_input_value('_aid', RCUBE_INPUT_GPC);
-        $id = $this->genid();
-        $content = $this->action_div($fid, $id, false);
-    
-        $this->rc->output->command('managesieve_actionfill', $content, $id, $aid);
-      }
-
-      $this->rc->output->send();
-    }
-
-    $this->managesieve_send();
-  }
-
-  function managesieve_save()
-  {
-    // Init plugin and handle managesieve connection
-    $error = $this->managesieve_start();
-
-    // filters set add action
-    if (!empty($_POST['_newset']))
-    {
-      $name = get_input_value('_name', RCUBE_INPUT_GPC);
-      $copy = get_input_value('_copy', RCUBE_INPUT_GPC);
-
-      if (!$name)
-	$error = 'managesieve.emptyname';
-      else if (mb_strlen($name)>128)
-	$error = 'managesieve.nametoolong';
-      else if (!$this->sieve->copy($name, $copy))
-	$error = 'managesieve.setcreateerror';
-		
-      if (!$error) {
-	$this->rc->output->show_message('managesieve.setcreated', 'confirmation');
-	$this->rc->output->command('parent.managesieve_reload', $name);
-//	$this->rc->session->remove('managesieve_current');
-      } else {
-        $this->rc->output->show_message($error, 'error');
-      }
-    }
-    // filter add/edit action
-    else if (isset($_POST['_name']))
-    {
-      $name = trim(get_input_value('_name', RCUBE_INPUT_POST, true));
-      $fid = trim(get_input_value('_fid', RCUBE_INPUT_POST));
-      $join = trim(get_input_value('_join', RCUBE_INPUT_POST));
-  
-      // and arrays
-      $headers = $_POST['_header'];
-      $cust_headers = $_POST['_custom_header'];
-      $ops = $_POST['_rule_op'];
-      $sizeops = $_POST['_rule_size_op'];
-      $sizeitems = $_POST['_rule_size_item'];
-      $sizetargets = $_POST['_rule_size_target'];
-      $targets = $_POST['_rule_target'];
-      $act_types = $_POST['_action_type'];
-      $mailboxes = $_POST['_action_mailbox'];
-      $act_targets = $_POST['_action_target'];
-      $area_targets = $_POST['_action_target_area'];
-      $reasons = $_POST['_action_reason'];
-      $addresses = $_POST['_action_addresses'];
-      $days = $_POST['_action_days'];
-
-      // we need a "hack" for radiobuttons
-      foreach ($sizeitems as $item)
-	$items[] = $item;
-
-      $this->form['disabled'] = $_POST['_disabled'] ? true : false;
-      $this->form['join'] = $join=='allof' ? true : false;
-      $this->form['name'] = $name;
-      $this->form['tests'] = array();
-      $this->form['actions'] = array();
-
-      if ($name == '')
-	$this->errors['name'] = $this->gettext('cannotbeempty');
-      else
-	foreach($this->script as $idx => $rule)
-          if($rule['name'] == $name && $idx != $fid) {
-	    $this->errors['name'] = $this->gettext('ruleexist');
-    	      break;
-          }
-      
-      $i = 0;
-      // rules
-      if ($join == 'any')
-      {
-	$this->form['tests'][0]['test'] = 'true';
-      }
-      else foreach($headers as $idx => $header)
-      {
-	$header = $this->strip_value($header);
-	$target = $this->strip_value($targets[$idx], true);
-	$op = $this->strip_value($ops[$idx]);
-
-	// normal header
-	if (in_array($header, $this->headers))
-	{
-          if(preg_match('/^not/', $op))
-    	    $this->form['tests'][$i]['not'] = true;
-          $type = preg_replace('/^not/', '', $op);
-
-          if ($type == 'exists')
-    	  {
-	    $this->form['tests'][$i]['test'] = 'exists';
-    	    $this->form['tests'][$i]['arg'] = $header;
-	  }
-          else
-          {	
-	    $this->form['tests'][$i]['type'] = $type;
-    	    $this->form['tests'][$i]['test'] = 'header';
-    	    $this->form['tests'][$i]['arg1'] = $header;
-    	    $this->form['tests'][$i]['arg2'] = $target;
-
-    	    if ($target == '')
-              $this->errors['tests'][$i]['target'] = $this->gettext('cannotbeempty');
-	  }
-	}
-	else
-          switch ($header)
-          {
-    	    case 'size':
-	      $sizeop = $this->strip_value($sizeops[$idx]);
-	      $sizeitem = $this->strip_value($items[$idx]);
-	      $sizetarget = $this->strip_value($sizetargets[$idx]);
-
-              $this->form['tests'][$i]['test'] = 'size';
-              $this->form['tests'][$i]['type'] = $sizeop;
-              $this->form['tests'][$i]['arg'] = $sizetarget.$sizeitem;
-
-	      if (!preg_match('/^[0-9]+(K|M|G)*$/i', $sizetarget))
-		$this->errors['tests'][$i]['sizetarget'] = $this->gettext('wrongformat');
-	      break;
-	    case '...':
-              $cust_header = $headers = $this->strip_value($cust_headers[$idx]);
-
-              if(preg_match('/^not/', $op))
-		$this->form['tests'][$i]['not'] = true;
-    	      $type = preg_replace('/^not/', '', $op);
-
-              if ($cust_header == '')
-    		$this->errors['tests'][$i]['header'] = $this->gettext('cannotbeempty');
-              else {
-	        $headers = preg_split('/[\s,]+/', $cust_header, -1, PREG_SPLIT_NO_EMPTY);
-	        
-		if (!count($headers))
-    		  $this->errors['tests'][$i]['header'] = $this->gettext('cannotbeempty');
-		else {
-		  foreach ($headers as $hr)
-		    if (!preg_match('/^[a-z0-9-]+$/i', $hr))
-    		      $this->errors['tests'][$i]['header'] = $this->gettext('forbiddenchars');
-		}
-	      }
-	      
-	      if (empty($this->errors['tests'][$i]['header']))
-		$cust_header = (is_array($headers) && count($headers) == 1) ? $headers[0] : $headers;
-              
-	      if ($type == 'exists')
-    	      {
-		$this->form['tests'][$i]['test'] = 'exists';
-    		$this->form['tests'][$i]['arg'] = $cust_header;
-	      }
-              else
-    	      {	
-    		$this->form['tests'][$i]['test'] = 'header';
-		$this->form['tests'][$i]['type'] = $type;
-        	$this->form['tests'][$i]['arg1'] = $cust_header;
-    		$this->form['tests'][$i]['arg2'] = $target;
-
-        	if ($target == '')
-    	          $this->errors['tests'][$i]['target'] = $this->gettext('cannotbeempty');
-	      }
-	    break;
-          }
-	$i++;
-      }
-  
-      $i = 0;
-      // actions
-      foreach($act_types as $idx => $type)
-      {
-	$type = $this->strip_value($type);
-	$target = $this->strip_value($act_targets[$idx]);
-  
-	$this->form['actions'][$i]['type'] = $type;
-    
-	switch ($type)
-	{
-          case 'fileinto':
-	    $mailbox = $this->strip_value($mailboxes[$idx]);
-	    $this->form['actions'][$i]['target'] = $mailbox;
-          break;
-          case 'reject':
-          case 'ereject':
-	    $target = $this->strip_value($area_targets[$idx]);
-	    $this->form['actions'][$i]['target'] = str_replace("\r\n", "\n", $target);
-
- //         if ($target == '')
-//    	  	$this->errors['actions'][$i]['targetarea'] = $this->gettext('cannotbeempty');
-          break;
-          case 'redirect':
-	    $this->form['actions'][$i]['target'] = $target;
-
-    	    if ($this->form['actions'][$i]['target'] == '')
-    	      $this->errors['actions'][$i]['target'] = $this->gettext('cannotbeempty');
-    	    else if (!$this->check_email($this->form['actions'][$i]['target']))
-    	      $this->errors['actions'][$i]['target'] = $this->gettext('noemailwarning');
-    	  break;
-          case 'vacation':
-    	    $reason = $this->strip_value($reasons[$idx]);
-    	    $this->form['actions'][$i]['reason'] = str_replace("\r\n", "\n", $reason);
-	    $this->form['actions'][$i]['days'] = $days[$idx];
-	    $this->form['actions'][$i]['addresses'] = explode(',', $addresses[$idx]);
-// @TODO: vacation :subject, :mime, :from, :handle
-
-	    if ($this->form['actions'][$i]['addresses']) {
-	      foreach($this->form['actions'][$i]['addresses'] as $aidx => $address) {
-		$address = trim($address);
-		if (!$address)
-	          unset($this->form['actions'][$i]['addresses'][$aidx]);
-		else if(!$this->check_email($address)) {
-	          $this->errors['actions'][$i]['addresses'] = $this->gettext('noemailwarning');
-	          break;
-		} else
-	          $this->form['actions'][$i]['addresses'][$aidx] = $address;
-	      }
-	    }
-        
-	    if ($this->form['actions'][$i]['reason'] == '')
-    	      $this->errors['actions'][$i]['reason'] = $this->gettext('cannotbeempty');
-    	    if ($this->form['actions'][$i]['days'] && !preg_match('/^[0-9]+$/', $this->form['actions'][$i]['days']))
-    	      $this->errors['actions'][$i]['days'] = $this->gettext('forbiddenchars');
-          break;
-	}
-  
-        $i++;
-      }
-
-      if (!$this->errors)
-      {
-        // zapis skryptu
-        if (!isset($this->script[$fid])) {
-	  $fid = $this->sieve->script->add_rule($this->form);
-          $new = true;
-	} else
-          $fid = $this->sieve->script->update_rule($fid, $this->form);
-
-	if ($fid !== false)
-          $save = $this->sieve->save();
-
-	if ($save && $fid !== false)
-	{
-	  $this->rc->output->show_message('managesieve.filtersaved', 'confirmation');
-	  $this->rc->output->add_script(
-            sprintf("rcmail.managesieve_updatelist('%s', '%s', %d, %d);",
-	      isset($new) ? 'add' : 'update', Q($this->form['name']), $fid, $this->form['disabled']),
-              'foot');
-	}
-	else
-	{
-	  $this->rc->output->show_message('managesieve.filtersaveerror', 'error');
-//	  $this->rc->output->send();
-	}
-      }
-    }
-
-    $this->managesieve_send();
-  }
-
-  private function managesieve_send()
-  {
-    // Handle form action 
-    if (isset($_GET['_framed']) || isset($_POST['_framed'])) {
-      if (isset($_GET['_newset']) || isset($_POST['_newset'])) {
-        $this->rc->output->send('managesieve.setedit');
-      }
-      else {
-        $this->rc->output->send('managesieve.filteredit');
-      }
-    } else {
-      $this->rc->output->set_pagetitle($this->gettext('filters'));
-      $this->rc->output->send('managesieve.managesieve');
-    }
-  }
-  
-  // return the filters list as HTML table
-  function filters_list($attrib)
-  {
-    // add id to message list table if not specified
-    if (!strlen($attrib['id']))
-      $attrib['id'] = 'rcmfilterslist';
-  
-    // define list of cols to be displayed
-    $a_show_cols = array('managesieve.filtername');
-
-    foreach($this->script as $idx => $filter)
-      $result[] = array(
-        'managesieve.filtername' => $filter['name'],
-        'id' => $idx,
-        'class' => $filter['disabled'] ? 'disabled' : '',
-      );
-
-    // create XHTML table
-    $out = rcube_table_output($attrib, $result, $a_show_cols, 'id');
-
-    // set client env
-    $this->rc->output->add_gui_object('filterslist', $attrib['id']);
-    $this->rc->output->include_script('list.js');
-  
-    // add some labels to client
-    $this->rc->output->add_label('managesieve.filterdeleteconfirm');
-  
-    return $out;
-  }
-
-  // return the filters list as <SELECT>
-  function filtersets_list($attrib)
-  {
-    // add id to message list table if not specified
-    if (!strlen($attrib['id']))
-      $attrib['id'] = 'rcmfiltersetslist';
-
-    $list = $this->sieve->get_scripts();
-    $active = $this->sieve->get_active();
-  
-    $select = new html_select(array('name' => '_set', 'id' => $attrib['id'], 'onchange' => 'rcmail.managesieve_set()'));
-
-    if ($list) {
-      asort($list, SORT_LOCALE_STRING);
-
-      foreach($list as $set)
-        $select->add($set . ($set == $active ? ' ('.$this->gettext('active').')' : ''), $set);
-    }
-    
-    $out = $select->show($this->sieve->current);
-    
-    // set client env
-    $this->rc->output->add_gui_object('filtersetslist', $attrib['id']);
-    $this->rc->output->add_label('managesieve.setdeleteconfirm');
-    $this->rc->output->add_label('managesieve.active');
-  
-    return $out;
-  }
-
-  function filter_frame($attrib)
-  {
-    if (!$attrib['id'])
-      $attrib['id'] = 'rcmfilterframe';
-    
-    $attrib['name'] = $attrib['id'];
-
-    $this->rc->output->set_env('contentframe', $attrib['name']);
-    $this->rc->output->set_env('blankpage', $attrib['src'] ? 
-    $this->rc->output->abs_url($attrib['src']) : 'program/blank.gif');
-
-    return html::tag('iframe', $attrib);
-  }
-
-
-  function filterset_form($attrib)
-  {
-    if (!$attrib['id'])
-      $attrib['id'] = 'rcmfiltersetform';
-
-    $out = '<form name="filtersetform" action="./" method="post">'."\n";
-
-    $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
-    $hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
-    $hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] || $_GET['_framed'] ? 1 : 0)));
-    $hiddenfields->add(array('name' => '_newset', 'value' => 1));
-
-    $out .= $hiddenfields->show();
-
-    $name = get_input_value('_name', RCUBE_INPUT_GPC);
-    $copy = get_input_value('_copy', RCUBE_INPUT_GPC);
-
-    $table = new html_table(array('cols' => 2));
-
-    // filter set name input
-    $input_name = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30,
-	'class' => ($this->errors['name'] ? 'error' : '')));
-
-    $table->add('title', sprintf('<label for="%s"><b>%s:</b></label>', '_name', Q($this->gettext('filtersetname'))));
-    $table->add(null, $input_name->show($name));
-
-    // filters set list
-    $list = $this->sieve->get_scripts();
-    $active = $this->sieve->get_active();
-  
-    $select = new html_select(array('name' => '_copy', 'id' => '_copy'));
-
-    asort($list, SORT_LOCALE_STRING);
-
-    $select->add($this->gettext('none'), '');
-    foreach($list as $set)
-      $select->add($set . ($set == $active ? ' ('.$this->gettext('active').')' : ''), $set);
-    
-    $table->add('title', '<label>'.$this->gettext('copyfromset').':</label>');
-    $table->add(null, $select->show($copy));
-
-    $out .= $table->show();
-    
-    $this->rc->output->add_gui_object('sieveform', 'filtersetform');
-
-    return $out;
-  }
-
-
-  function filter_form($attrib)
-  {
-    if (!$attrib['id'])
-      $attrib['id'] = 'rcmfilterform';
-
-    $fid = get_input_value('_fid', RCUBE_INPUT_GPC);
-    $scr = isset($this->form) ? $this->form : $this->script[$fid];
-
-    $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
-    $hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
-    $hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] || $_GET['_framed'] ? 1 : 0)));
-    $hiddenfields->add(array('name' => '_fid', 'value' => $fid));
-
-    $out = '<form name="filterform" action="./" method="post">'."\n";
-    $out .= $hiddenfields->show();
-
-    // 'any' flag 
-    if (sizeof($scr['tests']) == 1 && $scr['tests'][0]['test'] == 'true' && !$scr['tests'][0]['not'])
-      $any = true; 
-
-    // filter name input
-    $field_id = '_name';
-    $input_name = new html_inputfield(array('name' => '_name', 'id' => $field_id, 'size' => 30,
-	'class' => ($this->errors['name'] ? 'error' : '')));
-
-    if (isset($scr))
-      $input_name = $input_name->show($scr['name']);
-    else
-      $input_name = $input_name->show();
-
-    $out .= sprintf("\n<label for=\"%s\"><b>%s:</b></label> %s<br /><br />\n",
-        	$field_id, Q($this->gettext('filtername')), $input_name);
-
-    $out .= '<fieldset><legend>' . Q($this->gettext('messagesrules')) . "</legend>\n";
-
-    // any, allof, anyof radio buttons
-    $field_id = '_allof';
-    $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'allof',
-	'onclick' => 'rule_join_radio(\'allof\')', 'class' => 'radio'));
-
-    if (isset($scr) && !$any)
-      $input_join = $input_join->show($scr['join'] ? 'allof' : '');
-    else
-      $input_join = $input_join->show();
-
-    $out .= sprintf("%s<label for=\"%s\">%s</label>&nbsp;\n",
-        	$input_join, $field_id, Q($this->gettext('filterallof')));
-
-    $field_id = '_anyof';
-    $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'anyof',
-	'onclick' => 'rule_join_radio(\'anyof\')', 'class' => 'radio'));
-
-    if (isset($scr) && !$any)
-      $input_join = $input_join->show($scr['join'] ? '' : 'anyof');
-    else
-      $input_join = $input_join->show('anyof'); // default
-
-    $out .= sprintf("%s<label for=\"%s\">%s</label>\n",
-        	$input_join, $field_id, Q($this->gettext('filteranyof')));
-
-    $field_id = '_any';
-    $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'any',
-  	'onclick' => 'rule_join_radio(\'any\')', 'class' => 'radio'));
-
-    $input_join = $input_join->show($any ? 'any' : '');
-
-    $out .= sprintf("%s<label for=\"%s\">%s</label>\n",
-        	$input_join, $field_id, Q($this->gettext('filterany')));
-
-    $rows_num = isset($scr) ? sizeof($scr['tests']) : 1;
-
-    $out .= '<div id="rules"'.($any ? ' style="display: none"' : '').'>';
-    for ($x=0; $x<$rows_num; $x++)
-      $out .= $this->rule_div($fid, $x);
-    $out .= "</div>\n";
-
-    $out .= "</fieldset>\n";
-
-    // actions
-    $out .= '<fieldset><legend>' . Q($this->gettext('messagesactions')) . "</legend>\n";
-
-    $rows_num = isset($scr) ? sizeof($scr['actions']) : 1;
-
-    $out .= '<div id="actions">';
-    for ($x=0; $x<$rows_num; $x++)
-      $out .= $this->action_div($fid, $x);
-    $out .= "</div>\n";
-
-    $out .= "</fieldset>\n";
-    
-    if ($scr['disabled']) {
-      $this->rc->output->set_env('rule_disabled', true);
-    }
-    $this->rc->output->add_label('managesieve.ruledeleteconfirm');
-    $this->rc->output->add_label('managesieve.actiondeleteconfirm');
-    $this->rc->output->add_gui_object('sieveform', 'filterform');
-
-    return $out;
-  }
-
-  function rule_div($fid, $id, $div=true)
-  {
-    $rule = isset($this->form) ? $this->form['tests'][$id] : $this->script[$fid]['tests'][$id];
-    $rows_num = isset($this->form) ? sizeof($this->form['tests']) : sizeof($this->script[$fid]['tests']);
-  
-    $out = $div ? '<div class="rulerow" id="rulerow' .$id .'">'."\n" : '';
-
-    $out .= '<table><tr><td class="rowactions">';
-
-    // headers select
-    $select_header = new html_select(array('name' => "_header[]", 'id' => 'header'.$id,
-	'onchange' => 'header_select(' .$id .')'));
-    foreach($this->headers as $name => $val)
-      $select_header->add(Q($this->gettext($name)), Q($val));
-    $select_header->add(Q($this->gettext('size')), 'size');
-    $select_header->add(Q($this->gettext('...')), '...');
-
-    // TODO: list arguments
-
-    if ((isset($rule['test']) && $rule['test'] == 'header')
-	&& !is_array($rule['arg1']) && in_array($rule['arg1'], $this->headers))
-      $out .= $select_header->show($rule['arg1']);
-    elseif ((isset($rule['test']) && $rule['test'] == 'exists')
-	&& !is_array($rule['arg']) && in_array($rule['arg'], $this->headers))
-      $out .= $select_header->show($rule['arg']);
-    elseif (isset($rule['test']) && $rule['test'] == 'size')
-      $out .= $select_header->show('size');
-    elseif (isset($rule['test']) && $rule['test'] != 'true')
-      $out .= $select_header->show('...');
-    else
-      $out .= $select_header->show();
-
-    $out .= '</td><td class="rowtargets">';
-
-    if ((isset($rule['test']) && $rule['test'] == 'header')
-	&& (is_array($rule['arg1']) || !in_array($rule['arg1'], $this->headers)))
-      $custom = is_array($rule['arg1']) ? implode(', ', $rule['arg1']) : $rule['arg1'];
-    elseif ((isset($rule['test']) && $rule['test'] == 'exists')
-	&& (is_array($rule['arg']) || !in_array($rule['arg'], $this->headers)))
-      $custom = is_array($rule['arg']) ? implode(', ', $rule['arg']) : $rule['arg'];
-    
-    $out .= '<div id="custom_header' .$id. '" style="display:' .(isset($custom) ? 'inline' : 'none'). '">
-	<input type="text" name="_custom_header[]" '. $this->error_class($id, 'test', 'header')
-	.' value="' .Q($custom). '" size="20" />&nbsp;</div>' . "\n";
-  
-    // matching type select (operator)
-    $select_op = new html_select(array('name' => "_rule_op[]", 'id' => 'rule_op'.$id, 
-	'style' => 'display:' .($rule['test']!='size' ? 'inline' : 'none'), 'onchange' => 'rule_op_select('.$id.')'));
-    $select_op->add(Q($this->gettext('filtercontains')), 'contains');
-    $select_op->add(Q($this->gettext('filternotcontains')), 'notcontains');
-    $select_op->add(Q($this->gettext('filteris')), 'is');
-    $select_op->add(Q($this->gettext('filterisnot')), 'notis');
-    $select_op->add(Q($this->gettext('filterexists')), 'exists');
-    $select_op->add(Q($this->gettext('filternotexists')), 'notexists');
-//    $select_op->add(Q($this->gettext('filtermatches')), 'matches');
-//    $select_op->add(Q($this->gettext('filternotmatches')), 'notmatches');
-
-    // target input (TODO: lists)
-
-    if ($rule['test'] == 'header')
-    {
-      $out .= $select_op->show(($rule['not'] ? 'not' : '').$rule['type']);
-      $target = $rule['arg2'];
-    }
-    elseif ($rule['test'] == 'size')
-    {
-      $out .= $select_op->show();
-      if(preg_match('/^([0-9]+)(K|M|G)*$/', $rule['arg'], $matches))
-      {
-	$sizetarget = $matches[1];
-	$sizeitem = $matches[2];
-      }
-    }
-    else
-    {
-      $out .= $select_op->show(($rule['not'] ? 'not' : '').$rule['test']);
-      $target = '';
-    }
-
-    $out .= '<input type="text" name="_rule_target[]" id="rule_target' .$id. '" 
-	value="' .Q($target). '" size="20" ' . $this->error_class($id, 'test', 'target') 
-	. ' style="display:' . ($rule['test']!='size' && $rule['test'] != 'exists' ? 'inline' : 'none') . '" />'."\n";
-
-    $select_size_op = new html_select(array('name' => "_rule_size_op[]", 'id' => 'rule_size_op'.$id));
-    $select_size_op->add(Q($this->gettext('filterunder')), 'under');
-    $select_size_op->add(Q($this->gettext('filterover')), 'over');
-
-    $out .= '<div id="rule_size' .$id. '" style="display:' . ($rule['test']=='size' ? 'inline' : 'none') .'">';
-    $out .= $select_size_op->show($rule['test']=='size' ? $rule['type'] : '');
-    $out .= '<input type="text" name="_rule_size_target[]" value="'.$sizetarget.'" size="10" ' . $this->error_class($id, 'test', 'sizetarget') .' />
-	<input type="radio" name="_rule_size_item['.$id.']" value=""'. (!$sizeitem ? ' checked="checked"' : '') .' class="radio" />B
-	<input type="radio" name="_rule_size_item['.$id.']" value="K"'. ($sizeitem=='K' ? ' checked="checked"' : '') .' class="radio" />kB
-	<input type="radio" name="_rule_size_item['.$id.']" value="M"'. ($sizeitem=='M' ? ' checked="checked"' : '') .' class="radio" />MB
-	<input type="radio" name="_rule_size_item['.$id.']" value="G"'. ($sizeitem=='G' ? ' checked="checked"' : '') .' class="radio" />GB';
-    $out .= '</div>';
-    $out .= '</td>';
-  
-    // add/del buttons
-    $out .= '<td class="rowbuttons">';
-    $out .= '<input type="button" id="ruleadd' . $id .'" value="'. Q($this->gettext('add')). '" 
-	onclick="rcmail.managesieve_ruleadd(' . $id .')" class="button" /> ';
-    $out .= '<input type="button" id="ruledel' . $id .'" value="'. Q($this->gettext('del')). '"
-	onclick="rcmail.managesieve_ruledel(' . $id .')" class="button' . ($rows_num<2 ? ' disabled' : '') .'"'
-	. ($rows_num<2 ? ' disabled="disabled"' : '') .' />';
-    $out .= '</td></tr></table>';
-
-    $out .= $div ? "</div>\n" : '';
-        
-    return $out;
-  }
-
-  function action_div($fid, $id, $div=true)
-  {
-    $action = isset($this->form) ? $this->form['actions'][$id] : $this->script[$fid]['actions'][$id];
-    $rows_num = isset($this->form) ? sizeof($this->form['actions']) : sizeof($this->script[$fid]['actions']);
-
-    $out = $div ? '<div class="actionrow" id="actionrow' .$id .'">'."\n" : '';
-
-    $out .= '<table><tr><td class="rowactions">';
-
-    // action select
-    $select_action = new html_select(array('name' => "_action_type[]", 'id' => 'action_type'.$id,
-	'onchange' => 'action_type_select(' .$id .')'));
-    if (in_array('fileinto', $this->exts))
-      $select_action->add(Q($this->gettext('messagemoveto')), 'fileinto');
-    $select_action->add(Q($this->gettext('messageredirect')), 'redirect');
-    if (in_array('reject', $this->exts))
-      $select_action->add(Q($this->gettext('messagediscard')), 'reject');
-    elseif (in_array('ereject', $this->exts))
-      $select_action->add(Q($this->gettext('messagediscard')), 'ereject');
-    if (in_array('vacation', $this->exts))
-      $select_action->add(Q($this->gettext('messagereply')), 'vacation');
-    $select_action->add(Q($this->gettext('messagedelete')), 'discard');
-    $select_action->add(Q($this->gettext('rulestop')), 'stop');
-
-    $out .= $select_action->show($action['type']);
-    $out .= '</td>';
-
-    // actions target inputs
-    $out .= '<td class="rowtargets">';
-    // shared targets
-    $out .= '<input type="text" name="_action_target[]" id="action_target' .$id. '" '
-	.'value="' .($action['type']=='redirect' ? Q($action['target'], 'strict', false) : ''). '" size="40" '
-	.'style="display:' .($action['type']=='redirect' ? 'inline' : 'none') .'" '
-	. $this->error_class($id, 'action', 'target') .' />';
-    $out .= '<textarea name="_action_target_area[]" id="action_target_area' .$id. '" '
-	.'rows="3" cols="40" '. $this->error_class($id, 'action', 'targetarea')
-	.'style="display:' .(in_array($action['type'], array('reject', 'ereject')) ? 'inline' : 'none') .'">'
-	. (in_array($action['type'], array('reject', 'ereject')) ? Q($action['target'], 'strict', false) : '')
-	. "</textarea>\n";
-
-    // vacation
-    $out .= '<div id="action_vacation' .$id.'" style="display:' .($action['type']=='vacation' ? 'inline' : 'none') .'">';
-    $out .= '<span class="label">'. Q($this->gettext('vacationreason')) .'</span><br />'
-	.'<textarea name="_action_reason[]" id="action_reason' .$id. '" '
-	.'rows="3" cols="40" '. $this->error_class($id, 'action', 'reason') . '>'
-	. Q($action['reason'], 'strict', false) . "</textarea>\n";
-    $out .= '<br /><span class="label">' .Q($this->gettext('vacationaddresses')) . '</span><br />'
-	.'<input type="text" name="_action_addresses[]" '
-        .'value="' . (is_array($action['addresses']) ? Q(implode(', ', $action['addresses']), 'strict', false) : $action['addresses']) . '" size="40" '
-        . $this->error_class($id, 'action', 'addresses') .' />';
-    $out .= '<br /><span class="label">' . Q($this->gettext('vacationdays')) . '</span><br />'
-	.'<input type="text" name="_action_days[]" '
-        .'value="' .Q($action['days'], 'strict', false) . '" size="2" '
-        . $this->error_class($id, 'action', 'days') .' />';
-    $out .= '</div>';
-
-    // mailbox select
-    $out .= '<select id="action_mailbox' .$id. '" name="_action_mailbox[]" style="display:' 
-	.(!isset($action) || $action['type']=='fileinto' ? 'inline' : 'none'). '">';
-
-    $this->rc->imap_connect();
-
-    $a_folders = $this->rc->imap->list_mailboxes();
-    $delimiter = $this->rc->imap->get_hierarchy_delimiter();
-
-    // set mbox encoding
-    $mbox_encoding = $this->rc->config->get('managesieve_mbox_encoding', 'UTF7-IMAP'); 
-
-    if ($action['type'] == 'fileinto')
-      $mailbox = $action['target'];
-    else
-      $mailbox = '';
-
-    foreach ($a_folders as $folder)
-    {
-      $utf7folder = $this->rc->imap->mod_mailbox($folder);
-      $names = explode($delimiter, rcube_charset_convert($folder, 'UTF7-IMAP'));
-      $name = $names[sizeof($names)-1];
-    
-      if ($replace_delimiter = $this->rc->config->get('managesieve_replace_delimiter'))
-        $utf7folder = str_replace($delimiter, $replace_delimiter, $utf7folder);
-    
-      // convert to Sieve implementation encoding
-      $utf7folder = $this->mbox_encode($utf7folder, $mbox_encoding);
-    
-      if ($folder_class = rcmail_folder_classname($name))
-        $foldername = $this->gettext($folder_class);
-      else
-        $foldername = $name;
-
-      $out .= sprintf('<option value="%s"%s>%s%s</option>'."\n",
-                    htmlspecialchars($utf7folder),
-		    ($mailbox == $utf7folder ? ' selected="selected"' : ''),
-		    str_repeat('&nbsp;', 4 * (sizeof($names)-1)),
-		    Q(abbreviate_string($foldername, 40 - (2 * sizeof($names)-1))));
-    }
-    $out .= '</select>';
-    $out .= '</td>';
-
-    // add/del buttons
-    $out .= '<td class="rowbuttons">';
-    $out .= '<input type="button" id="actionadd' . $id .'" value="'. Q($this->gettext('add')). '" 
-	onclick="rcmail.managesieve_actionadd(' . $id .')" class="button" /> ';
-    $out .= '<input type="button" id="actiondel' . $id .'" value="'. Q($this->gettext('del')). '"
-        onclick="rcmail.managesieve_actiondel(' . $id .')" class="button' . ($rows_num<2 ? ' disabled' : '') .'"'
-	. ($rows_num<2 ? ' disabled="disabled"' : '') .' />';
-    $out .= '</td>';
-  
-    $out .= '</tr></table>';
-
-    $out .= $div ? "</div>\n" : '';
-
-    return $out;
-  }
-
-  private function genid()
-  {
-    $result = intval(rcube_timer());
-    return $result;
-  }
-
-  private function strip_value($str, $allow_html=false)
-  {
-    if (!$allow_html)
-      $str = strip_tags($str);
-       
-    return trim($str);
-  }
-
-  private function error_class($id, $type, $target, $name_only=false)
-  {
-    // TODO: tooltips
-    if ($type == 'test' && isset($this->errors['tests'][$id][$target]))
-      return ($name_only ? 'error' : ' class="error"');
-    elseif ($type == 'action' && isset($this->errors['actions'][$id][$target]))
-      return ($name_only ? 'error' : ' class="error"');
-
-    return '';
-  }
-
-  private function check_email($email)
-  {
-    if (function_exists('check_email')); 
-      return check_email($email);
-
-    // Check for invalid characters
-    if (preg_match('/[\x00-\x1F\x7F-\xFF]/', $email))
-      return false;
-
-    // Check that there's one @ symbol, and that the lengths are right
-    if (!preg_match('/^[^@]{1,64}@[^@]{1,255}$/', $email))
-      return false;
-
-    // Split it into sections to make life easier
-    $email_array = explode('@', $email);
-
-    // Check local part
-    $local_array = explode('.', $email_array[0]);
-    foreach ($local_array as $local_part)
-      if (!preg_match('/^(([A-Za-z0-9!#$%&\'*+\/=?^_`{|}~-]+)|("[^"]+"))$/', $local_part))
-        return false;
-
-    // Check domain part
-    if (preg_match('/^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}$/', $email_array[1]) 
-      || preg_match('/^\[(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}\]$/', $email_array[1]))
-      return true; // If an IP address
-    else
-    { // If not an IP address
-      $domain_array = explode('.', $email_array[1]);
-      if (sizeof($domain_array) < 2)
-        return false; // Not enough parts to be a valid domain
-
-      foreach ($domain_array as $domain_part)
-        if (!preg_match('/^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|([A-Za-z0-9]))$/', $domain_part))
-	  return false;
-
-      return true;
-    }
-  
-    return false;
-  }
- 
-  private function mbox_encode($text, $encoding)
-  {
-    return rcube_charset_convert($text, 'UTF7-IMAP', $encoding);
-  }
-}
-
-?>
diff --git a/plugins/managesieve/skins/default/managesieve.css b/plugins/managesieve/skins/default/managesieve.css
deleted file mode 100644
index 9f72e4a62..000000000
--- a/plugins/managesieve/skins/default/managesieve.css
+++ /dev/null
@@ -1,268 +0,0 @@
-/***** RoundCube|Filters styles *****/
-
-
-#filterslist
-{
-  position: absolute;
-  left: 20px;
-  top: 120px;
-  bottom: 30px;
-  border: 1px solid #999999;
-  background-color: #F9F9F9;
-  overflow: auto;
-  /* css hack for IE */
-  height: expression((parseInt(document.documentElement.clientHeight)-155)+'px');
-}
-
-#filters-table
-{
-  width: 100%;
-  table-layout: fixed;
-  /* css hack for IE */
-  width: expression(document.getElementById('filterslist').clientWidth);
-}
-
-#filters-table tbody td
-{
-  cursor: pointer;
-}
-
-#filters-table tbody tr.disabled td
-{
-  color: #999999;
-}
-
-#filtersbuttons
-{
-  position: absolute;
-  left: 20px;
-  top: 85px;
-}
-
-#filtersetsbuttons
-{
-  position: absolute;
-  left: 230px;
-  top: 85px;
-}
-
-#filtersbuttons a,
-#filtersetsbuttons a
-{
-  display: block;
-  float: left;
-}
-
-#filtersbuttons a.button,
-#filtersbuttons a.buttonPas,
-#filtersetsbuttons a.button,
-#filtersetsbuttons a.buttonPas
-{
-  display: block;
-  float: left;
-  width: 32px;
-  height: 32px;
-  padding: 0;
-  margin-right: 3px;
-  overflow: hidden;
-  background: url('managesieve_toolbar.png') 0 0 no-repeat transparent;
-  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
-}
-
-#filtersbuttons a.buttonPas,
-#filtersetsbuttons a.buttonPas
-{
-  filter: alpha(opacity=35);
-  opacity: 0.35;
-}
-
-#filtersbuttons a.add {
-  background-position: 0px 0px;
-}
-
-#filtersbuttons a.addsel {
-  background-position: 0 -32px;
-}
-
-#filtersbuttons a.del {
-  background-position: -32px 0px;
-}
-
-#filtersbuttons a.delsel {
-  background-position: -32px -32px;
-}
-
-#filtersbuttons a.up {
-  background-position: -64px 0px;
-}
-
-#filtersbuttons a.upsel {
-  background-position: -64px -32px;
-}
-
-#filtersbuttons a.down {
-  background-position: -96px 0px;
-}
-
-#filtersbuttons a.downsel {
-  background-position: -96px -32px;
-}
-
-#filtersetsbuttons a.setadd {
-  background-position: -128px 0px;
-}
-
-#filtersetsbuttons a.setaddsel {
-  background-position: -128px -32px;
-}
-
-#filtersetsbuttons a.setdel {
-  background-position: -160px 0px;
-}
-
-#filtersetsbuttons a.setdelsel {
-  background-position: -160px -32px;
-}
-
-#filtersetsbuttons a.setset {
-  background-position: -192px 0px;
-}
-
-#filtersetsbuttons a.setsetsel {
-  background-position: -192px -32px;
-}
-
-#filtersetselect
-{
-  position: absolute;
-  left: 360px;
-  top: 90px;
-}
-
-#filter-box
-{
-  position: absolute;
-  top: 120px;
-  right: 20px;
-  bottom: 30px;
-  border: 1px solid #999999;
-  overflow: hidden;
-  /* css hack for IE */
-  width: expression((parseInt(document.documentElement.clientWidth)-30-parseInt(document.getElementById('filterslist').offsetLeft)-parseInt(document.getElementById('filterslist').offsetWidth))+'px');
-  height: expression((parseInt(document.documentElement.clientHeight)-155)+'px');
-}
-
-#filter-frame
-{
-  background-color: #F9F9F9;
-  border: none;
-}
-
-body.iframe
-{
-  background-color: #F9F9F9;
-  min-width: 740px;
-  width: expression(Math.max(740, document.documentElement.clientWidth)+'px');
-}
-
-#filter-form
-{
-  min-width: 650px;
-  white-space: nowrap;
-  background-color: #F9F9F9;
-  padding: 20px 10px 10px 10px;
-}
-
-fieldset
-{
-  background-color: white;
-}
-
-legend, label
-{
-  color: #666666;
-}
-
-#rules, #actions
-{
-  margin-top: 5px;
-  padding: 0;
-  border-collapse: collapse;
-}
-
-div.rulerow, div.actionrow
-{
-  width: auto;
-  padding: 2px;
-  white-space: nowrap;
-  border: 1px solid white;
-}
-
-div.rulerow:hover, div.actionrow:hover
-{
-  padding: 2px;
-  white-space: nowrap;
-  background: #F2F2F2;
-  border: 1px solid silver;
-}
-
-div.rulerow table, div.actionrow table
-{
-  padding: 0px;
-  width: 100%;
-}
-
-td.rowbuttons
-{
-  text-align: right;
-  white-space: nowrap;
-}
-
-td.rowactions, td.rowtargets
-{
-  white-space: nowrap;
-}
-
-input.disabled, input.disabled:hover
-{
-  color: #999999;
-}
-
-input.error, textarea.error
-{
-  background-color: #FFFF88;
-}
-
-input.box,
-input.radio
-{
-  border: 0;
-}
-
-span.label
-{
-  color: #666666;
-  font-size: 10px;
-  white-space: nowrap;
-}
-
-#footer
-{
-  padding-top: 5px;
-  width: 100%;
-}
-  
-#footer .footerleft
-{
-  padding-left: 2px;
-  white-space: nowrap;
-  float: left;
-}
-
-#footer .footerright
-{
-  padding-right: 2px;
-  white-space: nowrap;
-  text-align: right;
-  float: right;
-}
diff --git a/plugins/managesieve/skins/default/managesieve_toolbar.png b/plugins/managesieve/skins/default/managesieve_toolbar.png
deleted file mode 100644
index 3f96a9681..000000000
--- a/plugins/managesieve/skins/default/managesieve_toolbar.png
+++ /dev/null
diff --git a/plugins/managesieve/skins/default/templates/filteredit.html b/plugins/managesieve/skins/default/templates/filteredit.html
deleted file mode 100644
index 81c6e6bc6..000000000
--- a/plugins/managesieve/skins/default/templates/filteredit.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/this/managesieve.css" />
-</head>
-<body class="iframe">
-
-<script type="text/javascript">
-
-function header_select(id)
-{
-    var obj = document.getElementById('header'+id);
-
-    if (obj.value == 'size')
-    {
-	document.getElementById('rule_size' + id).style.display = 'inline';
-	document.getElementById('rule_op' + id).style.display = 'none';
-	document.getElementById('rule_target' + id).style.display = 'none';
-	document.getElementById('custom_header' + id).style.display = 'none';
-    }
-    else
-    {
-	if (obj.value != '...')
-	    document.getElementById('custom_header' + id).style.display = 'none';
-	else
-	    document.getElementById('custom_header' + id).style.display = 'inline';
-    
-	document.getElementById('rule_size' + id).style.display = 'none';
-	document.getElementById('rule_op' + id).style.display = 'inline';
-	rule_op_select(id);
-    }
-}
-
-function rule_op_select(id)
-{
-    var obj = document.getElementById('rule_op'+id);
-
-    if (obj.value == 'exists' || obj.value == 'notexists')
-    {
-	document.getElementById('rule_target' + id).style.display = 'none';
-    }
-    else
-    {
-	document.getElementById('rule_target' + id).style.display = 'inline';
-    }
-}
-
-function action_type_select(id)
-{
-    var obj = document.getElementById('action_type'+id);
-
-    if (obj.value == 'fileinto')
-    {
-	document.getElementById('action_mailbox' + id).style.display = 'inline';
-	document.getElementById('action_target' + id).style.display = 'none';
-	document.getElementById('action_target_area' + id).style.display = 'none';
-	document.getElementById('action_vacation' + id).style.display = 'none';
-    }
-    else if (obj.value == 'redirect')
-    {
-	document.getElementById('action_target' + id).style.display = 'inline';
-	document.getElementById('action_mailbox' + id).style.display = 'none';
-	document.getElementById('action_target_area' + id).style.display = 'none';
-	document.getElementById('action_vacation' + id).style.display = 'none';
-    }
-    else if (obj.value.match(/^reject|ereject$/))
-    {
-	document.getElementById('action_target_area' + id).style.display = 'inline';
-	document.getElementById('action_vacation' + id).style.display = 'none';
-	document.getElementById('action_target' + id).style.display = 'none';
-	document.getElementById('action_mailbox' + id).style.display = 'none';
-    }
-    else if (obj.value == 'vacation')
-    {
-	document.getElementById('action_vacation' + id).style.display = 'inline';
-        document.getElementById('action_target_area' + id).style.display = 'none';
-	document.getElementById('action_target' + id).style.display = 'none';
-	document.getElementById('action_mailbox' + id).style.display = 'none';
-    }
-    else // discard, keep, stop
-    {
-	document.getElementById('action_target_area' + id).style.display = 'none';
-	document.getElementById('action_vacation' + id).style.display = 'none';
-	document.getElementById('action_target' + id).style.display = 'none';
-	document.getElementById('action_mailbox' + id).style.display = 'none';
-    }
-}
-
-function rule_join_radio(value)
-{
-    document.getElementById('rules').style.display = (value=='any' ? 'none' : 'block');
-}
-</script>
-
-<div id="filter-title" class="boxtitle"><roundcube:label name="managesieve.filterdef" /></div>
-
-<div id="filter-form">
-<roundcube:object name="filterform" />
-
-<div id="footer">
-<div class="footerleft">
-<roundcube:button command="plugin.managesieve-save" type="input" class="button mainaction" label="save" />
-</div>
-<div class="footerright">
-<label for="disabled"><roundcube:label name="managesieve.filterdisabled" /></label>
-<input type="checkbox" id="disabled" name="_disabled" value="1" />
-</div>
-</div>
-
-</form>
-</div>
-
-
-</body>
-</html>
diff --git a/plugins/managesieve/skins/default/templates/managesieve.html b/plugins/managesieve/skins/default/templates/managesieve.html
deleted file mode 100644
index f99466e80..000000000
--- a/plugins/managesieve/skins/default/templates/managesieve.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/this/managesieve.css" />
-<script type="text/javascript" src="/functions.js"></script>
-<script type="text/javascript" src="/splitter.js"></script>
-
-<style type="text/css">
-#filterslist { width: <roundcube:exp expression="!empty(cookie:sieveviewsplitter) ? cookie:sieveviewsplitter-5 : 210" />px; }
-#filter-box { left: <roundcube:exp expression="!empty(cookie:sieveviewsplitter) ? cookie:sieveviewsplitter+5 : 220" />px;
-<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:sieveviewsplitter) ? cookie:sieveviewsplitter+5 : 220).')+\\'px\\');') : ''" />
-}
-</style>
-
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/settingstabs.html" />
-
-<div id="filtersbuttons">
-<roundcube:button command="plugin.managesieve-add" type="link" class="buttonPas add" classSel="button addsel" classAct="button add" title="managesieve.filteradd" content=" " />
-<roundcube:button command="plugin.managesieve-del" type="link" class="buttonPas del" classSel="button delsel" classAct="button del" title="managesieve.filterdel" content=" " />
-<roundcube:button command="plugin.managesieve-up" type="link" class="buttonPas up" classSel="button upsel" classAct="button up" title="managesieve.moveup" content=" " />
-<roundcube:button command="plugin.managesieve-down" type="link" class="buttonPas down" classSel="button downsel" classAct="button down" title="managesieve.movedown" content=" " />
-</div>
-
-<div id="filtersetsbuttons">
-<roundcube:button command="plugin.managesieve-setadd" type="link" class="buttonPas setadd" classSel="button setaddsel" classAct="button setadd" title="managesieve.filtersetadd" content=" " />
-<roundcube:button command="plugin.managesieve-setdel" type="link" class="buttonPas setdel" classSel="button setdelsel" classAct="button setdel" title="managesieve.filtersetdel" content=" " />
-<roundcube:button command="plugin.managesieve-setact" type="link" class="buttonPas setset" classSel="button setsetsel" classAct="button setset" title="managesieve.filtersetact" content=" " />
-</div>
-<div id="filtersetselect">
-<roundcube:label name="managesieve.filterset" />:
-<roundcube:object name="filtersetslist" id="filtersets-select" />
-</div>
-
-<div id="filterslist">
-<roundcube:object name="filterslist" id="filters-table" class="records-table" cellspacing="0" summary="Filters list" />
-</div>
-<script type="text/javascript">
-  var sieveviewsplit = new rcube_splitter({id:'sieveviewsplitter', p1: 'filterslist', p2: 'filter-box', orientation: 'v', relative: true, start: 215});
-  rcmail.add_onload('sieveviewsplit.init()');
-</script>
-<div id="filter-box">
-<roundcube:object name="filterframe" id="filter-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
-</div>
-
-</body>
-</html>
diff --git a/plugins/managesieve/skins/default/templates/setedit.html b/plugins/managesieve/skins/default/templates/setedit.html
deleted file mode 100644
index 343fe4e63..000000000
--- a/plugins/managesieve/skins/default/templates/setedit.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/this/managesieve.css" />
-</head>
-<body class="iframe">
-
-<div id="filter-title" class="boxtitle"><roundcube:label name="managesieve.newfilterset" /></div>
-
-<div id="filter-form">
-<roundcube:object name="filtersetform" />
-
-<p>
-<roundcube:button command="plugin.managesieve-save" type="input" class="button mainaction" label="save" />
-</p>
-
-</form>
-</div>
-
-
-</body>
-</html>