moved plugins

160 files changed, 0 insertions, 10894 deletions

diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
deleted file mode 100644
index 21016dd10..000000000
--- a/plugins/additional_message_headers/additional_message_headers.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Additional Message Headers
- *
- * Very simple plugin which will add additional headers
- * to or remove them from outgoing messages.
- *
- * Enable the plugin in config/main.inc.php and add your desired headers:
- * $rcmail_config['additional_message_headers'] = array('User-Agent');
- *
- * @version @package_version@
- * @author Ziba Scott
- * @website http://roundcube.net
- */
-class additional_message_headers extends rcube_plugin
-{
-    public $task = 'mail';
-
-    function init()
-    {
-        $this->add_hook('outgoing_message_headers', array($this, 'message_headers'));
-    }
-
-    function message_headers($args)
-    {
-	$this->load_config();
-
-        // additional email headers
-        $additional_headers = rcmail::get_instance()->config->get('additional_message_headers',array());
-        foreach($additional_headers as $header=>$value){
-            if (null === $value) {
-                unset($args['headers'][$header]);
-            } else {
-                $args['headers'][$header] = $value;
-            }
-        }
-
-        return $args;
-    }
-}
-
-?>
diff --git a/plugins/additional_message_headers/package.xml b/plugins/additional_message_headers/package.xml
deleted file mode 100644
index a3db131eb..000000000
--- a/plugins/additional_message_headers/package.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.9.0" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
- <name>additional_message_headers</name>
- <channel>pear.roundcube.net</channel>
- <summary>Additional message headers for RoundCube</summary>
- <description>Very simple plugin which will add additional headers to or remove them from outgoing messages.</description>
- <lead>
-  <name>Ziba Scott</name>
-  <user>ziba</user>
-  <email>email@example.org</email>
-  <active>yes</active>
- </lead>
- <date>2010-01-16</date>
- <time>18:19:33</time>
- <version>
-  <release>1.1.0</release>
-  <api>1.1.0</api>
- </version>
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
- <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPL v2</license>
- <notes>-</notes>
- <contents>
-  <dir baseinstalldir="/" name="/">
-   <file name="additional_message_headers.php" role="php">
-    <tasks:replace from="@name@" to="name" type="package-info" />
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-  </dir> <!-- / -->
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.2.1</min>
-   </php>
-   <pearinstaller>
-    <min>1.7.0</min>
-   </pearinstaller>
-  </required>
- </dependencies>
- <phprelease />
-</package>
diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
deleted file mode 100644
index 954fd1549..000000000
--- a/plugins/archive/archive.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Archive plugin script
- * @version 1.2
- */
-
-function rcmail_archive(prop)
-{
-  if (!rcmail.env.uid && (!rcmail.message_list || !rcmail.message_list.get_selection().length))
-    return;
-  
-  var uids = rcmail.env.uid ? rcmail.env.uid : rcmail.message_list.get_selection().join(',');
-    
-  rcmail.set_busy(true, 'loading');
-  rcmail.http_post('plugin.archive', '_uid='+uids+'&_mbox='+urlencode(rcmail.env.mailbox), true);
-}
-
-// callback for app-onload event
-if (window.rcmail) {
-  rcmail.addEventListener('init', function(evt) {
-    
-    // register command (directly enable in message view mode)
-    rcmail.register_command('plugin.archive', rcmail_archive, (rcmail.env.uid && rcmail.env.mailbox != rcmail.env.archive_folder));
-    
-    // add event-listener to message list
-    if (rcmail.message_list)
-      rcmail.message_list.addEventListener('select', function(list){
-        rcmail.enable_command('plugin.archive', (list.get_selection().length > 0 && rcmail.env.mailbox != rcmail.env.archive_folder));
-      });
-    
-    // set css style for archive folder
-    var li;
-    if (rcmail.env.archive_folder && rcmail.env.archive_folder_icon && (li = rcmail.get_folder_li(rcmail.env.archive_folder)))
-      $(li).css('background-image', 'url(' + rcmail.env.archive_folder_icon + ')');
-  })
-}
-
diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
deleted file mode 100644
index 5d6131188..000000000
--- a/plugins/archive/archive.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * Archive
- *
- * Plugin that adds a new button to the mailbox toolbar
- * to move messages to a (user selectable) archive folder.
- *
- * @version 1.4
- * @author Andre Rodier, Thomas Bruederli
- */
-class archive extends rcube_plugin
-{
-  public $task = 'mail|settings';
-
-  function init()
-  {
-    $rcmail = rcmail::get_instance();
-
-    $this->register_action('plugin.archive', array($this, 'request_action'));
-
-    // There is no "Archived flags"
-    // $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
-    if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show')
-      && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
-      $skin_path = $this->local_skin_path();
-      
-      $this->include_script('archive.js');
-      $this->add_texts('localization', true);
-      $this->add_button(
-        array(
-            'command' => 'plugin.archive',
-            'imagepas' => $skin_path.'/archive_pas.png',
-            'imageact' => $skin_path.'/archive_act.png',
-            'title' => 'buttontitle',
-            'domain' => $this->ID,
-        ),
-        'toolbar');
-      
-      // register hook to localize the archive folder
-      $this->add_hook('render_mailboxlist', array($this, 'render_mailboxlist'));
-
-      // set env variable for client
-      $rcmail->output->set_env('archive_folder', $archive_folder);
-      $rcmail->output->set_env('archive_folder_icon', $this->url($skin_path.'/foldericon.png'));
-
-      // add archive folder to the list of default mailboxes
-      if (($default_folders = $rcmail->config->get('default_imap_folders')) && !in_array($archive_folder, $default_folders)) {
-        $default_folders[] = $archive_folder;
-        $rcmail->config->set('default_imap_folders', $default_folders);
-      }  
-    }
-    else if ($rcmail->task == 'settings') {
-      $dont_override = $rcmail->config->get('dont_override', array());
-      if (!in_array('archive_mbox', $dont_override)) {
-        $this->add_hook('user_preferences', array($this, 'prefs_table'));
-        $this->add_hook('save_preferences', array($this, 'save_prefs'));
-      }
-    }
-  }
-  
-  function render_mailboxlist($p)
-  {
-    $rcmail = rcmail::get_instance();
-    $archive_folder = $rcmail->config->get('archive_mbox');
-
-    // set localized name for the configured archive folder
-    if ($archive_folder) {
-      if (isset($p['list'][$archive_folder]))
-        $p['list'][$archive_folder]['name'] = $this->gettext('archivefolder');
-      else // search in subfolders
-        $this->_mod_folder_name($p['list'], $archive_folder, $this->gettext('archivefolder'));
-    }
-
-    return $p;
-  }
-
-  function _mod_folder_name(&$list, $folder, $new_name)
-  {
-    foreach ($list as $idx => $item) {
-      if ($item['id'] == $folder) {
-        $list[$idx]['name'] = $new_name;
-	return true;
-      } else if (!empty($item['folders']))
-        if ($this->_mod_folder_name($list[$idx]['folders'], $folder, $new_name))
-	  return true;
-    }
-    return false;
-  }
-
-  function request_action()
-  {
-    $this->add_texts('localization');
-    
-    $uids = get_input_value('_uid', RCUBE_INPUT_POST);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-    
-    $rcmail = rcmail::get_instance();
-    
-    // There is no "Archive flags", but I left this line in case it may be useful
-    // $rcmail->imap->set_flag($uids, 'ARCHIVE');
-    
-    if (($archive_mbox = $rcmail->config->get('archive_mbox')) && $mbox != $archive_mbox) {
-      $rcmail->output->command('move_messages', $archive_mbox);
-      $rcmail->output->command('display_message', $this->gettext('archived'), 'confirmation');
-    }
-    
-    $rcmail->output->send();
-  }
-
-  function prefs_table($args)
-  {
-    global $CURR_SECTION;
-
-    if ($args['section'] == 'folders') {
-      $this->add_texts('localization');
-
-      $rcmail = rcmail::get_instance();
-
-      // load folders list when needed
-      if ($CURR_SECTION)
-        $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true,
-          'maxlength' => 30, 'exceptions' => array('INBOX')));
-      else
-        $select = new html_select();
-
-      $args['blocks']['main']['options']['archive_mbox'] = array(
-          'title' => $this->gettext('archivefolder'),
-          'content' => $select->show($rcmail->config->get('archive_mbox'), array('name' => "_archive_mbox"))
-      );
-    }
-
-    return $args;
-  }
-
-  function save_prefs($args)
-  {
-    if ($args['section'] == 'folders') {
-      $args['prefs']['archive_mbox'] = get_input_value('_archive_mbox', RCUBE_INPUT_POST);
-      return $args;
-    }
-  }
-
-}
diff --git a/plugins/archive/localization/cs_CZ.inc b/plugins/archive/localization/cs_CZ.inc
deleted file mode 100644
index 04c8fcfa8..000000000
--- a/plugins/archive/localization/cs_CZ.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
-
-+-----------------------------------------------------------------------+
-| language/cs_CZ/labels.inc                                             |
-|                                                                       |
-| Language file of the RoundCube archive plugin                         |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Milan Kozak <hodza@hodza.net>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id: labels.inc 2993 2009-09-26 18:32:07Z alec $
-
-*/
-
-$labels = array();
-$labels['buttontitle'] = 'Archivovat zprávu';
-$labels['archived'] = 'Úspěšně vloženo do archivu';
-$labels['archivefolder'] = 'Archiv';
-
-?>
diff --git a/plugins/archive/localization/de_CH.inc b/plugins/archive/localization/de_CH.inc
deleted file mode 100644
index 2ed0f5ac8..000000000
--- a/plugins/archive/localization/de_CH.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Nachricht archivieren';
-$labels['archived'] = 'Nachricht erfolgreich archiviert';
-$labels['archivefolder'] = 'Archiv';
-
-?>
diff --git a/plugins/archive/localization/de_DE.inc b/plugins/archive/localization/de_DE.inc
deleted file mode 100644
index 2ed0f5ac8..000000000
--- a/plugins/archive/localization/de_DE.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Nachricht archivieren';
-$labels['archived'] = 'Nachricht erfolgreich archiviert';
-$labels['archivefolder'] = 'Archiv';
-
-?>
diff --git a/plugins/archive/localization/en_US.inc b/plugins/archive/localization/en_US.inc
deleted file mode 100644
index fce31a0b5..000000000
--- a/plugins/archive/localization/en_US.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Archive this message';
-$labels['archived'] = 'Successfully archived';
-$labels['archivefolder'] = 'Archive';
-
-?>
diff --git a/plugins/archive/localization/et_EE.inc b/plugins/archive/localization/et_EE.inc
deleted file mode 100644
index e3968d755..000000000
--- a/plugins/archive/localization/et_EE.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Arhiveeri see kiri';
-$labels['archived'] = 'Edukalt arhiveeritud';
-$labels['archivefolder'] = 'Arhiveeri';
-
-?>
diff --git a/plugins/archive/localization/fr_FR.inc b/plugins/archive/localization/fr_FR.inc
deleted file mode 100644
index f44f30f44..000000000
--- a/plugins/archive/localization/fr_FR.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Archiver ce message';
-$labels['archived'] = 'Message archiv� avec success';
-$labels['archivefolder'] = 'Archive';
-
-?>
diff --git a/plugins/archive/localization/pl_PL.inc b/plugins/archive/localization/pl_PL.inc
deleted file mode 100644
index 2ecc77991..000000000
--- a/plugins/archive/localization/pl_PL.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Przenieś do archiwum';
-$labels['archived'] = 'Pomyślnie zarchiwizowano';
-$labels['archivefolder'] = 'Archiwum';
-
-?>
diff --git a/plugins/archive/localization/ru_RU.inc b/plugins/archive/localization/ru_RU.inc
deleted file mode 100644
index e377ad017..000000000
--- a/plugins/archive/localization/ru_RU.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Переместить выбранное в архив';
-$labels['archived'] = 'Перенесено в Архив';
-$labels['archivefolder'] = 'Архив';
-
-?>
diff --git a/plugins/archive/localization/zh_TW.inc b/plugins/archive/localization/zh_TW.inc
deleted file mode 100644
index 5cccebbdc..000000000
--- a/plugins/archive/localization/zh_TW.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = '封存此信件';
-$labels['archived'] = '已成功封存';
-$labels['archivefolder'] = '封存';
-
-?>
diff --git a/plugins/archive/skins/default/archive_act.png b/plugins/archive/skins/default/archive_act.png
deleted file mode 100644
index 2a1735868..000000000
--- a/plugins/archive/skins/default/archive_act.png
+++ /dev/null
diff --git a/plugins/archive/skins/default/archive_pas.png b/plugins/archive/skins/default/archive_pas.png
deleted file mode 100644
index 8de208583..000000000
--- a/plugins/archive/skins/default/archive_pas.png
+++ /dev/null
diff --git a/plugins/archive/skins/default/foldericon.png b/plugins/archive/skins/default/foldericon.png
deleted file mode 100644
index ec0853c44..000000000
--- a/plugins/archive/skins/default/foldericon.png
+++ /dev/null
diff --git a/plugins/autologon/autologon.php b/plugins/autologon/autologon.php
deleted file mode 100644
index bc3d2ee76..000000000
--- a/plugins/autologon/autologon.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Sample plugin to try out some hooks.
- * This performs an automatic login if accessed from localhost
- */
-class autologon extends rcube_plugin
-{
-  public $task = 'login';
-
-  function init()
-  {
-    $this->add_hook('startup', array($this, 'startup'));
-    $this->add_hook('authenticate', array($this, 'authenticate'));
-  }
-
-  function startup($args)
-  {
-    $rcmail = rcmail::get_instance();
-
-    // change action to login
-    if (empty($_SESSION['user_id']) && !empty($_GET['_autologin']) && $this->is_localhost())
-      $args['action'] = 'login';
-
-    return $args;
-  }
-
-  function authenticate($args)
-  {
-    if (!empty($_GET['_autologin']) && $this->is_localhost()) {
-      $args['user'] = 'me';
-      $args['pass'] = '******';
-      $args['host'] = 'localhost';
-    }
-  
-    return $args;
-  }
-
-  function is_localhost()
-  {
-    return $_SERVER['REMOTE_ADDR'] == '::1' || $_SERVER['REMOTE_ADDR'] == '127.0.0.1';
-  }
-
-}
-
diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
deleted file mode 100644
index a8ac62e26..000000000
--- a/plugins/database_attachments/database_attachments.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Filesystem Attachments
- * 
- * This plugin which provides database backed storage for temporary
- * attachment file handling.  The primary advantage of this plugin
- * is its compatibility with round-robin dns multi-server roundcube
- * installations.
- *
- * This plugin relies on the core filesystem_attachments plugin
- *
- * @author Ziba Scott <ziba@umich.edu>
- * 
- */
-require_once('plugins/filesystem_attachments/filesystem_attachments.php');
-class database_attachments extends filesystem_attachments
-{
-
-    // A prefix for the cache key used in the session and in the key field of the cache table
-    private $cache_prefix = "db_attach";
-
-    /**
-     * Helper method to generate a unique key for the given attachment file
-     */
-    private function _key($filepath)
-    {
-        return  $this->cache_prefix.md5(mktime().$filepath.$_SESSION['user_id']); 
-    }
-
-    /**
-     * Save a newly uploaded attachment
-     */
-    function upload($args)
-    {
-        $args['status'] = false;
-        $rcmail = rcmail::get_instance();
-        $key = $this->_key($args['path']);
-        $data = base64_encode(file_get_contents($args['path']));
-
-        $status = $rcmail->db->query(
-            "INSERT INTO ".get_table_name('cache')."
-             (created, user_id, cache_key, data)
-             VALUES (".$rcmail->db->now().", ?, ?, ?)",
-            $_SESSION['user_id'],
-            $key,
-            $data);
-            
-        if ($status) {
-            $args['id'] = $key;
-            $args['status'] = true;
-            unset($args['path']);
-        }
-        
-        return $args;
-    }
-
-    /**
-     * Save an attachment from a non-upload source (draft or forward)
-     */
-    function save($args)
-    {
-        $args['status'] = false;
-        $rcmail = rcmail::get_instance();
-
-        $key = $this->_key($args['name']);
-
-	if ($args['path'])
-	    $args['data'] = file_get_contents($args['path']);
-
-        $data = base64_encode($args['data']);
-
-        $status = $rcmail->db->query(
-            "INSERT INTO ".get_table_name('cache')."
-             (created, user_id, cache_key, data)
-             VALUES (".$rcmail->db->now().", ?, ?, ?)",
-            $_SESSION['user_id'],
-            $key,
-            $data);
-        
-        if ($status) {
-            $args['id'] = $key;
-            $args['status'] = true;
-        }
-
-        return $args;
-    }
-
-    /**
-     * Remove an attachment from storage
-     * This is triggered by the remove attachment button on the compose screen
-     */
-    function remove($args)
-    {
-        $args['status'] = false;
-        $rcmail = rcmail::get_instance();
-        $status = $rcmail->db->query(
-            "DELETE FROM ".get_table_name('cache')."
-             WHERE  user_id=?
-             AND    cache_key=?",
-            $_SESSION['user_id'],
-            $args['id']);
-    
-        if ($status) {
-            $args['status'] = true;
-        }
-        
-        return $args;
-    }
-
-    /**
-     * When composing an html message, image attachments may be shown
-     * For this plugin, $this->get_attachment will check the file and
-     * return it's contents
-     */
-    function display($args)
-    {
-        return $this->get_attachment($args);
-    }
-
-    /**
-     * When displaying or sending the attachment the file contents are fetched
-     * using this method. This is also called by the display_attachment hook.
-     */
-    function get_attachment($args)
-    {
-        $rcmail = rcmail::get_instance();
-        
-        $sql_result = $rcmail->db->query(
-            "SELECT cache_id, data
-             FROM ".get_table_name('cache')."
-             WHERE  user_id=?
-             AND    cache_key=?",
-            $_SESSION['user_id'],
-            $args['id']);
-
-        if ($sql_arr = $rcmail->db->fetch_assoc($sql_result)) {
-            $args['data'] = base64_decode($sql_arr['data']);
-            $args['status'] = true;
-        }
-        
-        return $args;
-    }
-    
-    /**
-     * Delete all temp files associated with this user
-     */
-    function cleanup($args)
-    {
-        $rcmail = rcmail::get_instance();
-        $rcmail->db->query(
-            "DELETE FROM ".get_table_name('cache')."
-             WHERE  user_id=?
-             AND cache_key like '{$this->cache_prefix}%'",
-            $_SESSION['user_id']);
-    }
-}
diff --git a/plugins/debug_logger/debug_logger.php b/plugins/debug_logger/debug_logger.php
deleted file mode 100644
index f04ba6a61..000000000
--- a/plugins/debug_logger/debug_logger.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/**
- * Debug Logger
- *
- * Enhanced logging for debugging purposes.  It is not recommened
- * to be enabled on production systems without testing because of
- * the somewhat increased memory, cpu and disk i/o overhead.
- *
- * Debug Logger listens for existing console("message") calls and
- * introduces start and end tags as well as free form tagging
- * which can redirect messages to files.  The resulting log files
- * provide timing and tag quantity results.
- *
- * Enable the plugin in config/main.inc.php and add your desired
- * log types and files.
- *
- * @version 1.0
- * @author Ziba Scott
- * @website http://roundcube.net
- * 
- * Example:
- *
- * config/main.inc.php:
- *
- *   // $rcmail_config['debug_logger'][type of logging] = name of file in log_dir
- *   // The 'master' log includes timing information
- *   $rcmail_config['debug_logger']['master'] = 'master';
- *   // If you want sql messages to also go into a separate file 
- *   $rcmail_config['debug_logger']['sql'] = 'sql';
- *
- * index.php (just after $RCMAIL->plugins->init()):
- *
- *   console("my test","start");
- *   console("my message");
- *   console("my sql calls","start");
- *   console("cp -r * /dev/null","shell exec");
- *   console("select * from example","sql");
- *   console("select * from example","sql");
- *   console("select * from example","sql");
- *   console("end");
- *   console("end");
- *
- *
- * logs/master (after reloading the main page):
- *
- *   [17-Feb-2009 16:51:37 -0500] start: Task: mail. 
- *   [17-Feb-2009 16:51:37 -0500]   start: my test
- *   [17-Feb-2009 16:51:37 -0500]     my message
- *   [17-Feb-2009 16:51:37 -0500]     shell exec: cp -r * /dev/null
- *   [17-Feb-2009 16:51:37 -0500]     start: my sql calls
- *   [17-Feb-2009 16:51:37 -0500]       sql: select * from example
- *   [17-Feb-2009 16:51:37 -0500]       sql: select * from example
- *   [17-Feb-2009 16:51:37 -0500]       sql: select * from example
- *   [17-Feb-2009 16:51:37 -0500]     end: my sql calls - 0.0018 seconds shell exec: 1, sql: 3, 
- *   [17-Feb-2009 16:51:37 -0500]   end: my test - 0.0055 seconds shell exec: 1, sql: 3, 
- *   [17-Feb-2009 16:51:38 -0500] end: Task: mail.  - 0.8854 seconds shell exec: 1, sql: 3, 
- * 
- * logs/sql (after reloading the main page):
- *
- *   [17-Feb-2009 16:51:37 -0500]       sql: select * from example
- *   [17-Feb-2009 16:51:37 -0500]       sql: select * from example
- *   [17-Feb-2009 16:51:37 -0500]       sql: select * from example
- */
-class debug_logger extends rcube_plugin
-{
-    function init()
-    {
-        require_once(dirname(__FILE__).'/runlog/runlog.php');
-        $this->runlog = new runlog(); 
-
-        if(!rcmail::get_instance()->config->get('log_dir')){
-            rcmail::get_instance()->config->set('log_dir',INSTALL_PATH.'logs');
-        }
-
-        $log_config = rcmail::get_instance()->config->get('debug_logger',array());
-
-        foreach($log_config as $type=>$file){
-            $this->runlog->set_file(rcmail::get_instance()->config->get('log_dir').'/'.$file, $type);
-        }
-
-        $start_string = "";
-        $action = rcmail::get_instance()->action;
-        $task = rcmail::get_instance()->task;
-        if($action){
-               $start_string .= "Action: ".$action.". "; 
-        }
-        if($task){
-               $start_string .= "Task: ".$task.". "; 
-        }
-        $this->runlog->start($start_string);
-
-        $this->add_hook('console', array($this, 'console'));
-        $this->add_hook('authenticate', array($this, 'authenticate'));
-    }
-
-    function authenticate($args){
-        $this->runlog->note('Authenticating '.$args['user'].'@'.$args['host']);
-        return $args;
-    }
-
-    function console($args){
-        $note = $args[0];
-        $type = $args[1];
-
-
-        if(!isset($args[1])){
-            // This could be extended to detect types based on the 
-            // file which called console.  For now only rcube_imap.inc is supported
-            $bt = debug_backtrace();
-            $file  = $bt[3]['file'];
-            switch(basename($file)){
-                case 'rcube_imap.php':
-                    $type = 'imap';
-                    break;
-                default:
-                    $type = FALSE; 
-                    break; 
-            }
-        }
-        switch($note){
-            case 'end':
-                $type = 'end';
-                break;
-        }
-
-
-        switch($type){
-            case 'start':
-                $this->runlog->start($note);
-                break;
-            case 'end':
-                $this->runlog->end();
-                break;
-            default:
-                $this->runlog->note($note, $type);
-                break;
-        }
-        return $args;
-    }
-
-    function __destruct(){
-                $this->runlog->end();
-    }
-}
-?>
diff --git a/plugins/debug_logger/runlog/runlog.php b/plugins/debug_logger/runlog/runlog.php
deleted file mode 100644
index c9f672615..000000000
--- a/plugins/debug_logger/runlog/runlog.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-/**
- * runlog 
- * 
- * @author Ziba Scott <ziba@umich.edu> 
- */
-class runlog {
-
-    private $start_time = FALSE;
-
-    private $parent_stack = array();
-
-    public $print_to_console = FALSE;
-
-    private $file_handles = array();
-
-    private $indent = 0;
-
-    public $threshold = 0;
-
-    public $tag_count = array();
-
-    public $timestamp = "d-M-Y H:i:s O";
-
-    public $max_line_size = 150;
-
-    private $run_log = array();
-
-    function runlog()
-    {
-        $this->start_time = microtime( TRUE );
-    }
-
-    public function start( $name, $tag = FALSE  )
-    {
-        $this->run_log[] = array( 'type' => 'start',
-                                  'tag' => $tag,
-                                  'index' => count($this->run_log),
-                                  'value' => $name,
-                                  'time' => microtime( TRUE ),
-                                  'parents' => $this->parent_stack,
-                                  'ended' => false,
-                                   );
-        $this->parent_stack[] = $name;
-
-        $this->print_to_console("start: ".$name, $tag, 'start');
-        $this->print_to_file("start: ".$name, $tag, 'start');
-        $this->indent++;
-    }
-
-    public function end()
-    {
-        $name = array_pop( $this->parent_stack );
-        foreach ( $this->run_log as $k => $entry ) {
-            if ( $entry['value'] == $name && $entry['type'] == 'start'  && $entry['ended'] == false) {
-                $lastk = $k;
-            }
-        }
-        $start = $this->run_log[$lastk]['time'];
-        $this->run_log[$lastk]['duration'] = microtime( TRUE ) - $start;
-        $this->run_log[$lastk]['ended'] = true;
-
-        $this->run_log[] = array( 'type' => 'end',
-                                  'tag' =>  $this->run_log[$lastk]['tag'],
-                                  'index' => $lastk,
-                                  'value' => $name,
-                                  'time' => microtime( TRUE ),
-                                  'duration' => microtime( TRUE ) - $start,
-                                  'parents' => $this->parent_stack,
-                                   );
-        $this->indent--;
-        if($this->run_log[$lastk]['duration'] >= $this->threshold){ 
-            $tag_report = "";
-            foreach($this->tag_count as $tag=>$count){
-                $tag_report .= "$tag: $count, ";
-            }
-            if(!empty($tag_report)){
-//                $tag_report = "\n$tag_report\n";
-            }
-            $end_txt = sprintf("end: $name - %0.4f seconds $tag_report", $this->run_log[$lastk]['duration'] ); 
-            $this->print_to_console($end_txt, $this->run_log[$lastk]['tag'] , 'end');
-            $this->print_to_file($end_txt,  $this->run_log[$lastk]['tag'], 'end');
-        }
-    }
-
-    public function increase_tag_count($tag){
-            if(!isset($this->tag_count[$tag])){
-                $this->tag_count[$tag] = 0;
-            }
-            $this->tag_count[$tag]++;
-    }
-
-    public function get_text(){
-        $text = "";
-        foreach($this->run_log as $entry){
-           $text .= str_repeat("   ",count($entry['parents']));
-           if($entry['tag'] != 'text'){
-            $text .= $entry['tag'].': ';
-           }
-           $text .= $entry['value'];
-
-           if($entry['tag'] == 'end'){
-            $text .= sprintf(" - %0.4f seconds", $entry['duration'] ); 
-           }
-
-           $text .= "\n"; 
-        }
-        return $text;
-    }
-
-    public function set_file($filename, $tag = 'master'){
-        if(!isset($this->file_handle[$tag])){
-            $this->file_handles[$tag] = fopen($filename, 'a');
-            if(!$this->file_handles[$tag]){
-                trigger_error('Could not open file for writing: '.$filename);
-            }
-        }
-    }
-
-    public function note( $msg, $tag = FALSE )
-    {
-        if($tag){
-            $this->increase_tag_count($tag);
-        }
-        if ( is_array( $msg )) {
-            $msg = '<pre>' . print_r( $msg, TRUE ) . '</pre>';
-        }
-        $this->debug_messages[] = $msg;
-        $this->run_log[] = array( 'type' => 'note',
-                                  'tag' => $tag ? $tag:"text",
-                                  'value' => htmlentities($msg),
-                                  'time' => microtime( TRUE ),
-                                  'parents' => $this->parent_stack,
-             );
-
-       $this->print_to_file($msg, $tag);
-       $this->print_to_console($msg, $tag);
-
-    }
-
-    public function print_to_file($msg, $tag = FALSE, $type = FALSE){
-       if(!$tag){
-        $file_handle_tag = 'master';
-       }
-       else{
-            $file_handle_tag = $tag;
-       }
-       if($file_handle_tag != 'master' && isset($this->file_handles[$file_handle_tag])){
-           $buffer = $this->get_indent();
-           $buffer .= "$msg\n";
-           if(!empty($this->timestamp)){
-                $buffer = sprintf("[%s] %s",date($this->timestamp, mktime()), $buffer);
-           }
-           fwrite($this->file_handles[$file_handle_tag], wordwrap($buffer, $this->max_line_size, "\n     "));
-        }
-       if(isset($this->file_handles['master']) && $this->file_handles['master']){
-           $buffer = $this->get_indent();
-           if($tag){
-            $buffer .= "$tag: ";
-           }
-           $msg = str_replace("\n","",$msg);
-           $buffer .= "$msg";
-           if(!empty($this->timestamp)){
-                $buffer = sprintf("[%s] %s",date($this->timestamp, mktime()), $buffer);
-           }
-           if(strlen($buffer) > $this->max_line_size){
-                $buffer = substr($buffer,0,$this->max_line_size - 3)."...";
-           }
-           fwrite($this->file_handles['master'], $buffer."\n");
-       }
-    }
-
-    public function print_to_console($msg, $tag=FALSE){
-        if($this->print_to_console){
-            if(is_array($this->print_to_console)){
-                if(in_array($tag, $this->print_to_console)){
-                    echo $this->get_indent();
-                    if($tag){
-                        echo "$tag: ";
-                    }
-                    echo "$msg\n";
-                }
-            }
-            else{
-                echo $this->get_indent();
-                if($tag){
-                    echo "$tag: ";
-                }
-                echo "$msg\n";
-            }
-        }
-    }
-
-    public function print_totals(){
-        $totals = array();
-        foreach ( $this->run_log as $k => $entry ) {
-            if ( $entry['type'] == 'start'  && $entry['ended'] == true) {
-                $totals[$entry['value']]['duration'] += $entry['duration'];
-                $totals[$entry['value']]['count'] += 1;
-            }
-        }
-       if($this->file_handle){
-           foreach($totals as $name=>$details){
-            fwrite($this->file_handle,$name.": ".number_format($details['duration'],4)."sec,  ".$details['count']." calls \n");
-           }
-        }
-    }
-
-    private function get_indent(){
-           $buf = "";
-           for($i = 0; $i < $this->indent; $i++){
-               $buf .= "  "; 
-           }
-           return $buf;
-    }
-
-
-   function  __destruct(){
-       foreach($this->file_handles as $handle){
-            fclose($handle);
-        }
-    }
-
-}
-
-?>
diff --git a/plugins/emoticons/emoticons.php b/plugins/emoticons/emoticons.php
deleted file mode 100644
index be736b625..000000000
--- a/plugins/emoticons/emoticons.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Display Emoticons
- *
- * Sample plugin to replace emoticons in plain text message body with real icons
- *
- * @version 1.0.1
- * @author Thomas Bruederli
- * @website http://roundcube.net
- */
-class emoticons extends rcube_plugin
-{
-  public $task = 'mail';
-  private $map;
-
-  function init()
-  {
-    $this->task = 'mail';
-    $this->add_hook('message_part_after', array($this, 'replace'));
-  
-    $this->map = array(
-      ':)'  => html::img(array('src' => './program/js/tiny_mce/plugins/emotions/img/smiley-smile.gif', 'alt' => ':)')),
-      ':-)' => html::img(array('src' => './program/js/tiny_mce/plugins/emotions/img/smiley-smile.gif', 'alt' => ':-)')),
-      ':('  => html::img(array('src' => './program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif', 'alt' => ':(')),
-      ':-(' => html::img(array('src' => './program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif', 'alt' => ':-(')),
-    );
-  }
-
-  function replace($args)
-  {
-    if ($args['type'] == 'plain')
-      return array('body' => strtr($args['body'], $this->map));
-  
-    return null;
-  }
-
-}
-
diff --git a/plugins/example_addressbook/example_addressbook.php b/plugins/example_addressbook/example_addressbook.php
deleted file mode 100644
index 081efcb13..000000000
--- a/plugins/example_addressbook/example_addressbook.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Sample plugin to add a new address book
- * with just a static list of contacts
- */
-class example_addressbook extends rcube_plugin
-{
-  private $abook_id = 'static';
-  
-  public function init()
-  {
-    $this->add_hook('address_sources', array($this, 'address_sources'));
-    $this->add_hook('get_address_book', array($this, 'get_address_book'));
-    
-    // use this address book for autocompletion queries
-    // (maybe this should be configurable by the user?)
-    $config = rcmail::get_instance()->config;
-    $sources = $config->get('autocomplete_addressbooks', array('sql'));
-    if (!in_array($this->abook_id, $sources)) {
-      $sources[] = $this->abook_id;
-      $config->set('autocomplete_addressbooks', $sources);
-    }
-  }
-  
-  public function address_sources($p)
-  {
-    $p['sources'][$this->abook_id] = array('id' => $this->abook_id, 'name' => 'Static List', 'readonly' => true);
-    return $p;
-  }
-  
-  public function get_address_book($p)
-  {
-    if ($p['id'] == $this->abook_id) {
-      require_once(dirname(__FILE__) . '/example_addressbook_backend.php');
-      $p['instance'] = new example_addressbook_backend;
-    }
-    
-    return $p;
-  }
-  
-}
diff --git a/plugins/example_addressbook/example_addressbook_backend.php b/plugins/example_addressbook/example_addressbook_backend.php
deleted file mode 100644
index ad6b89d67..000000000
--- a/plugins/example_addressbook/example_addressbook_backend.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Example backend class for a custom address book
- *
- * This one just holds a static list of address records
- *
- * @author Thomas Bruederli
- */
-class example_addressbook_backend extends rcube_addressbook
-{
-  public $primary_key = 'ID';
-  public $readonly = true;
-  
-  private $filter;
-  private $result;
-  
-  public function __construct()
-  {
-    $this->ready = true;
-  }
-  
-  public function set_search_set($filter)
-  {
-    $this->filter = $filter;
-  }
-  
-  public function get_search_set()
-  {
-    return $this->filter;
-  }
-
-  public function reset()
-  {
-    $this->result = null;
-    $this->filter = null;
-  }
-
-  public function list_records($cols=null, $subset=0)
-  {
-    $this->result = $this->count();
-    $this->result->add(array('ID' => '111', 'name' => "Example Contact", 'firstname' => "Example", 'surname' => "Contact", 'email' => "example@roundcube.net"));
-    
-    return $this->result;
-  }
-
-  public function search($fields, $value, $strict=false, $select=true)
-  {
-    // no search implemented, just list all records
-    return $this->list_records();
-  }
-
-  public function count()
-  {
-    return new rcube_result_set(1, ($this->list_page-1) * $this->page_size);
-  }
-
-  public function get_result()
-  {
-    return $this->result;
-  }
-
-  public function get_record($id, $assoc=false)
-  {
-    $this->list_records();
-    $first = $this->result->first();
-    $sql_arr = $first['ID'] == $id ? $first : null;
-    
-    return $assoc && $sql_arr ? $sql_arr : $this->result;
-  }
-  
-}
diff --git a/plugins/filesystem_attachments/filesystem_attachments.php b/plugins/filesystem_attachments/filesystem_attachments.php
deleted file mode 100644
index d5f555311..000000000
--- a/plugins/filesystem_attachments/filesystem_attachments.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Filesystem Attachments
- * 
- * This is a core plugin which provides basic, filesystem based
- * attachment temporary file handling.  This includes storing
- * attachments of messages currently being composed, writing attachments
- * to disk when drafts with attachments are re-opened and writing
- * attachments to disk for inline display in current html compositions.
- *
- * Developers may wish to extend this class when creating attachment
- * handler plugins:
- *   require_once('plugins/filesystem_attachments/filesystem_attachments.php');
- *   class myCustom_attachments extends filesystem_attachments
- *
- * @author Ziba Scott <ziba@umich.edu>
- * @author Thomas Bruederli <roundcube@gmail.com>
- * 
- */
-class filesystem_attachments extends rcube_plugin
-{
-    public $task = 'mail';
-    
-    function init()
-    {
-        // Save a newly uploaded attachment
-        $this->add_hook('upload_attachment', array($this, 'upload'));
-
-        // Save an attachment from a non-upload source (draft or forward)
-        $this->add_hook('save_attachment', array($this, 'save'));
-
-        // Remove an attachment from storage
-        $this->add_hook('remove_attachment', array($this, 'remove'));
-
-        // When composing an html message, image attachments may be shown
-        $this->add_hook('display_attachment', array($this, 'display'));
-
-        // Get the attachment from storage and place it on disk to be sent
-        $this->add_hook('get_attachment', array($this, 'get_attachment'));
-
-        // Delete all temp files associated with this user
-        $this->add_hook('cleanup_attachments', array($this, 'cleanup'));
-        $this->add_hook('kill_session', array($this, 'cleanup'));
-    }
-
-    /**
-     * Save a newly uploaded attachment
-     */
-    function upload($args)
-    {
-        $args['status'] = false;
-        $rcmail = rcmail::get_instance();
-
-        // use common temp dir for file uploads
-        $temp_dir = $rcmail->config->get('temp_dir');
-        $tmpfname = tempnam($temp_dir, 'rcmAttmnt');
-
-        if (move_uploaded_file($args['path'], $tmpfname) && file_exists($tmpfname)) {
-            $args['id'] = $this->file_id();
-            $args['path'] = $tmpfname;
-            $args['status'] = true;
-
-            // Note the file for later cleanup
-            $_SESSION['plugins']['filesystem_attachments']['tmp_files'][] = $tmpfname;
-        }
-
-        return $args;
-    }
-
-    /**
-     * Save an attachment from a non-upload source (draft or forward)
-     */
-    function save($args)
-    {
-        $args['status'] = false;
-
-        if (!$args['path']) {
-            $rcmail = rcmail::get_instance();
-            $temp_dir = $rcmail->config->get('temp_dir');
-            $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
-
-            if ($fp = fopen($tmp_path, 'w')) {
-                fwrite($fp, $args['data']);
-                fclose($fp);
-                $args['path'] = $tmp_path;
-            } else
-                return $args;
-        }
-        
-        $args['id'] = $this->file_id();
-        $args['status'] = true;
-            
-        // Note the file for later cleanup
-        $_SESSION['plugins']['filesystem_attachments']['tmp_files'][] = $args['path'];
-
-        return $args;
-    }
-
-    /**
-     * Remove an attachment from storage
-     * This is triggered by the remove attachment button on the compose screen
-     */
-    function remove($args)
-    {
-        $args['status'] = @unlink($args['path']);
-        return $args;
-    }
-
-    /**
-     * When composing an html message, image attachments may be shown
-     * For this plugin, the file is already in place, just check for
-     * the existance of the proper metadata
-     */
-    function display($args)
-    {
-        $args['status'] = file_exists($args['path']);
-        return $args;
-    }
-
-    /**
-     * This attachment plugin doesn't require any steps to put the file
-     * on disk for use.  This stub function is kept here to make this 
-     * class handy as a parent class for other plugins which may need it.
-     */
-    function get_attachment($args)
-    {
-        return $args;
-    }
-    
-    /**
-     * Delete all temp files associated with this user
-     */
-    function cleanup($args)
-    {
-        // $_SESSION['compose']['attachments'] is not a complete record of
-        // temporary files because loading a draft or starting a forward copies
-        // the file to disk, but does not make an entry in that array
-        if (is_array($_SESSION['plugins']['filesystem_attachments']['tmp_files'])){
-            foreach ($_SESSION['plugins']['filesystem_attachments']['tmp_files'] as $filename){
-                if(file_exists($filename)){
-                    unlink($filename);
-                }
-            }
-            unset($_SESSION['plugins']['filesystem_attachments']['tmp_files']);
-        }
-        return $args;
-    }
-
-    function file_id()
-    {
-        $userid = rcmail::get_instance()->user->ID;
-	list($usec, $sec) = explode(' ', microtime()); 
-        return preg_replace('/[^0-9]/', '', $userid . $sec . $usec);
-    }
-}
diff --git a/plugins/help/config.inc.php.dist b/plugins/help/config.inc.php.dist
deleted file mode 100644
index 6b27227b0..000000000
--- a/plugins/help/config.inc.php.dist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-// Help content iframe source
-// $rcmail_config['help_source'] = 'http://trac.roundcube.net/wiki';
-$rcmail_config['help_source'] = '';
-
-?>
-  
\ No newline at end of file
diff --git a/plugins/help/content/about.html b/plugins/help/content/about.html
deleted file mode 100644
index 69ac080b6..000000000
--- a/plugins/help/content/about.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<div id="helpabout">
-<h3 align="center">Copyright &copy; 2005-2009, The Roundcube Dev Team</h3>
-
-<p>This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-</p>
-<p>
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
-GNU General Public License for more details.
-</p>
-<p>
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.   
-</p>
-
-<div align="center">
-<h3>Project management and administration</h3>
-<b>Thomas Bruederli (thomasb)</b> - Project leader and head developer<br />
-<b>Till Klampäckel (till)</b> - Co-leader<br />
-<b>Brett Patterson</b> - Forum administrator<br />
-<b>Adam Grelck</b> - Trac administrator<br />
-<b>Jason Fesler</b> - Mailing list administrator<br />
-<b>Brennan Stehling</b> - Mentor, Coordinator
-
-<h3>Developers</h3>
-<b>Eric Stadtherr (estadtherr)</b><br />
-<b>Robin Elfrink (robin, wobin)</b><br />
-<b>Rich Sandberg (richs)</b><br />
-<b>Tomasz Pajor (tomekp)</b><br />
-<b>Fourat Zouari (fourat.zouari)</b><br />
-<b>Aleksander Machniak (alec)</b>
-
-<p><br/>Website: <a href="http://roundcube.net">roundcube.net</a></p>
-</div>
-</div>
diff --git a/plugins/help/content/license.html b/plugins/help/content/license.html
deleted file mode 100644
index 2d83c6013..000000000
--- a/plugins/help/content/license.html
+++ /dev/null
@@ -1,387 +0,0 @@
-<div id="helplicense">
-<h3>GNU GENERAL PUBLIC LICENSE</h3>
-<p>
-Version 2, June 1991
-</p>
-
-<pre>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-</pre>
-
-<h3>Preamble</h3>
-
-<p>
-The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-</p>
-
-<p>
-When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-</p>
-
-<p>
-To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-</p>
-
-<p>
-For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-</p>
-
-<p>
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-</p>
-
-<p>
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-</p>
-
-<p>
-Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-</p>
-
-<p>
-  The precise terms and conditions for copying, distribution and
-modification follow.
-</p>
-
-
-<h3>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h3>
-
-
-<p>
-<strong>0.</strong>
-This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-</p>
-
-<p>
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-</p>
-
-<p>
-<strong>1.</strong>
-You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-</p>
-
-<p>
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-</p>
-
-<p>
-<strong>2.</strong>
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-</p>
-
-<dl>
-  <dt></dt>
-    <dd>
-      <strong>a)</strong>
-      You must cause the modified files to carry prominent notices
-      stating that you changed the files and the date of any change.
-    </dd>
-  <dt></dt>
-    <dd>
-      <strong>b)</strong>
-      You must cause any work that you distribute or publish, that in
-      whole or in part contains or is derived from the Program or any
-      part thereof, to be licensed as a whole at no charge to all third
-      parties under the terms of this License.
-    </dd>
-  <dt></dt>
-    <dd>
-      <strong>c)</strong>
-      If the modified program normally reads commands interactively
-      when run, you must cause it, when started running for such
-      interactive use in the most ordinary way, to print or display an
-      announcement including an appropriate copyright notice and a
-      notice that there is no warranty (or else, saying that you provide
-      a warranty) and that users may redistribute the program under
-      these conditions, and telling the user how to view a copy of this
-      License.  (Exception: if the Program itself is interactive but
-      does not normally print such an announcement, your work based on
-      the Program is not required to print an announcement.)
-    </dd>
-</dl>
-
-<p>
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-</p>
-
-<p>
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-</p>
-
-<p>
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-</p>
-
-<p>
-<strong>3.</strong>
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-</p>
-
-<dl>
-  <dt></dt>
-    <dd>
-      <strong>a)</strong>
-      Accompany it with the complete corresponding machine-readable
-      source code, which must be distributed under the terms of Sections
-      1 and 2 above on a medium customarily used for software interchange; or,
-    </dd>
-  <dt></dt>
-    <dd>
-      <strong>b)</strong>
-      Accompany it with a written offer, valid for at least three
-      years, to give any third party, for a charge no more than your
-      cost of physically performing source distribution, a complete
-      machine-readable copy of the corresponding source code, to be
-      distributed under the terms of Sections 1 and 2 above on a medium
-      customarily used for software interchange; or,
-    </dd>
-  <dt></dt>
-    <dd>
-      <strong>c)</strong>
-      Accompany it with the information you received as to the offer
-      to distribute corresponding source code.  (This alternative is
-      allowed only for noncommercial distribution and only if you
-      received the program in object code or executable form with such
-      an offer, in accord with Subsection b above.)
-    </dd>
-</dl>
-
-<p>
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-</p>
-
-<p>
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-</p>
-
-<p>
-<strong>4.</strong>
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-</p>
-
-<p>
-<strong>5.</strong>
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-</p>
-
-<p>
-<strong>6.</strong>
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-</p>
-
-<p>
-<strong>7.</strong>
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-</p>
-
-<p>
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-</p>
-
-<p>
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-</p>
-
-<p>
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-</p>
-
-<p>
-<strong>8.</strong>
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-</p>
-
-<p>
-<strong>9.</strong>
-The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-</p>
-
-<p>
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-</p>
-
-<p>
-<strong>10.</strong>
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-</p>
-
-<p><strong>NO WARRANTY</strong></p>
-
-<p>
-<strong>11.</strong>
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-</p>
-
-<p>
-<strong>12.</strong>
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p>
-</div>
diff --git a/plugins/help/help.php b/plugins/help/help.php
deleted file mode 100644
index a7b3d5793..000000000
--- a/plugins/help/help.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Help Plugin
- *
- * @author Aleksander 'A.L.E.C' Machniak
- * @licence GNU GPL
- *
- * Configuration (see config.inc.php.dist)
- * 
- **/
-
-class help extends rcube_plugin
-{
-    // all task excluding 'login' and 'logout'
-    public $task = '?(?!login|logout).*';
-
-    function init()
-    {
-      $rcmail = rcmail::get_instance();
-      
-      $this->add_texts('localization/', false);
-      
-      // register actions
-      $this->register_action('plugin.help', array($this, 'action'));
-      $this->register_action('plugin.helpabout', array($this, 'action'));
-      $this->register_action('plugin.helplicense', array($this, 'action'));
-
-      // add taskbar button
-      $this->add_button(array(
-	'name' 	=> 'helptask',
-	'class'	=> 'button-help',
-	'label'	=> 'help.help',
-	'href'	=> './?_task=dummy&_action=plugin.help',
-        ), 'taskbar');
-
-      $skin = $rcmail->config->get('skin');
-      if (!file_exists($this->home."/skins/$skin/help.css"))
-	$skin = 'default';
-
-      // add style for taskbar button (must be here) and Help UI    
-      $this->include_stylesheet("skins/$skin/help.css");
-    }
-
-    function action()
-    {
-      $rcmail = rcmail::get_instance();
-
-      $this->load_config();
-
-      // register UI objects
-      $rcmail->output->add_handlers(array(
-	    'helpcontent' => array($this, 'content'),
-      ));
-
-      if ($rcmail->action == 'plugin.helpabout')
-	$rcmail->output->set_pagetitle($this->gettext('about'));
-      else if ($rcmail->action == 'plugin.helplicense')
-        $rcmail->output->set_pagetitle($this->gettext('license'));
-      else
-        $rcmail->output->set_pagetitle($this->gettext('help'));
-
-      $rcmail->output->send('help.help');
-    }
-    
-    function content($attrib)
-    {
-      $rcmail = rcmail::get_instance();
-
-      if ($rcmail->action == 'plugin.helpabout') {
-	return @file_get_contents($this->home.'/content/about.html');
-      }
-      else if ($rcmail->action == 'plugin.helplicense') {
-	return @file_get_contents($this->home.'/content/license.html');
-      }
-
-      // default content: iframe
-
-      if ($src = $rcmail->config->get('help_source'))
-	$attrib['src'] = $src;
-
-      if (empty($attrib['id']))
-        $attrib['id'] = 'rcmailhelpcontent';
-    
-      // allow the following attributes to be added to the <iframe> tag
-      $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height', 'frameborder'));
-      $framename = $attrib['id'];
-
-      $out = sprintf('<iframe name="%s"%s></iframe>'."\n", $framename, $attrib_str);
-    
-      return $out;
-    }
-    
-}
-
-?>
diff --git a/plugins/help/localization/cs_CZ.inc b/plugins/help/localization/cs_CZ.inc
deleted file mode 100644
index 638b3556f..000000000
--- a/plugins/help/localization/cs_CZ.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
-
-+-----------------------------------------------------------------------+
-| language/cs_CZ/labels.inc                                             |
-|                                                                       |
-| Language file of the RoundCube help plugin                            |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Milan Kozak <hodza@hodza.net>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id: labels.inc 2993 2009-09-26 18:32:07Z alec $
-
-*/
-
-$labels = array();
-$labels['help'] = 'Nápověda';
-$labels['about'] = 'O aplikaci';
-$labels['license'] = 'Licence';
-
-?>
diff --git a/plugins/help/localization/en_GB.inc b/plugins/help/localization/en_GB.inc
deleted file mode 100644
index 8c2d1517c..000000000
--- a/plugins/help/localization/en_GB.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['help'] = 'Help';
-$labels['about'] = 'About';
-$labels['license'] = 'License';
-
-?>
diff --git a/plugins/help/localization/en_US.inc b/plugins/help/localization/en_US.inc
deleted file mode 100644
index 8c2d1517c..000000000
--- a/plugins/help/localization/en_US.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['help'] = 'Help';
-$labels['about'] = 'About';
-$labels['license'] = 'License';
-
-?>
diff --git a/plugins/help/localization/et_EE.inc b/plugins/help/localization/et_EE.inc
deleted file mode 100644
index f95f09824..000000000
--- a/plugins/help/localization/et_EE.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['help'] = 'Abi';
-$labels['about'] = 'Roundcube info';
-$labels['license'] = 'Litsents';
-
-?>
diff --git a/plugins/help/localization/hu_HU.inc b/plugins/help/localization/hu_HU.inc
deleted file mode 100644
index 6ff4f248e..000000000
--- a/plugins/help/localization/hu_HU.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['help'] = 'Segítség';
-$labels['about'] = 'Névjegy';
-$labels['license'] = 'Licenc';
-
-?>
diff --git a/plugins/help/localization/pl_PL.inc b/plugins/help/localization/pl_PL.inc
deleted file mode 100644
index 087bc0726..000000000
--- a/plugins/help/localization/pl_PL.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['help'] = 'Pomoc';
-$labels['about'] = 'O programie';
-$labels['license'] = 'Licencja';
-
-?>
diff --git a/plugins/help/localization/sv_SE.inc b/plugins/help/localization/sv_SE.inc
deleted file mode 100644
index 8b0d48741..000000000
--- a/plugins/help/localization/sv_SE.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$labels = array();
-$labels['help'] = 'Hjälp';
-$labels['about'] = 'Om';
-$labels['license'] = 'Licens';
-
-?>
diff --git a/plugins/help/skins/default/help.css b/plugins/help/skins/default/help.css
deleted file mode 100644
index e0b01bbf0..000000000
--- a/plugins/help/skins/default/help.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/***** RoundCube|Mail Help task styles *****/
-
-#taskbar a.button-help
-{
-  background-image: url('help.gif');
-}
-
-#help-box
-{
-  position: absolute;
-  bottom: 30px; 
-  top: 95px;
-  left: 20px;
-  right: 20px;
-  border: 1px solid #999999;
-  overflow: auto;  
-  background-color: #F2F2F2;
-  /* IE hack */
-  height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
-  width: expression((parseInt(document.documentElement.clientWight)-40)+'px');
-}
-
-#helplicense, #helpabout
-{
-  width: 46em;
-  padding: 1em 2em;
-}
-
-#helplicense a, #helpabout a
-{
-  color: #900;
-}
-
-#helpabout
-{
-  margin: 0 auto;
-}
-
diff --git a/plugins/help/skins/default/help.gif b/plugins/help/skins/default/help.gif
deleted file mode 100644
index fe41e43c0..000000000
--- a/plugins/help/skins/default/help.gif
+++ /dev/null
diff --git a/plugins/help/skins/default/templates/help.html b/plugins/help/skins/default/templates/help.html
deleted file mode 100644
index 14b8fca52..000000000
--- a/plugins/help/skins/default/templates/help.html
+++ /dev/null
@@ -1,38 +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/help.css" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
-<script type="text/javascript">
-function help_init_settings_tabs()
-{
-    var tab = '#helptabdefault';
-    if (window.rcmail && rcmail.env.action) {
-	var action = rcmail.env.action.replace(/^plugin\.help/, '');
-	tab = '#helptab' + (action ? action : 'default');
-    }
-    $(tab).addClass('tablink-selected');
-}	       
-</script>
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-
-<div id="tabsbar">
-<span id="helptabdefault" class="tablink"><roundcube:button name="helpdefault" href="?_task=dummy&_action=plugin.help" type="link" label="help.help" title="help.help" /></span>
-<span id="helptababout" class="tablink"><roundcube:button name="helpabout" href="?_task=dummy&_action=plugin.helpabout" type="link" label="help.about" title="help.about" class="tablink" /></span>
-<span id="helptablicense" class="tablink"><roundcube:button name="helplicense" href="?_task=dummy&_action=plugin.helplicense" type="link" label="help.license" title="help.license" class="tablink" /></span>
-<roundcube:container name="helptabs" id="helptabsbar" />
-<script type="text/javascript"> if (window.rcmail) rcmail.add_onload(help_init_settings_tabs);</script>
-</div>
-
-<div id="help-box">
-<roundcube:object name="helpcontent" id="helpcontentframe" width="100%" height="100%" frameborder="0" src="/watermark.html" />
-</div>
-
-</body>
-</html>
diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php
deleted file mode 100644
index a8003cf46..000000000
--- a/plugins/http_authentication/http_authentication.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * HTTP Basic Authentication
- *
- * Make use of an existing HTTP authentication and perform login with the existing user credentials
- *
- * @version 1.1
- * @author Thomas Bruederli
- */
-class http_authentication extends rcube_plugin
-{
-  public $task = 'login';
-
-  function init()
-  {
-    $this->add_hook('startup', array($this, 'startup'));
-    $this->add_hook('authenticate', array($this, 'authenticate'));
-  }
-
-  function startup($args)
-  {
-    // change action to login
-    if (empty($args['action']) && empty($_SESSION['user_id'])
-        && !empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW']))
-      $args['action'] = 'login';
-
-    return $args;
-  }
-
-  function authenticate($args)
-  {
-    if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
-      $args['user'] = $_SERVER['PHP_AUTH_USER'];
-      $args['pass'] = $_SERVER['PHP_AUTH_PW'];
-    }
-    
-    $args['cookiecheck'] = false;
-  
-    return $args;
-  }
-
-}
-
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>
diff --git a/plugins/markasjunk/localization/cs_CZ.inc b/plugins/markasjunk/localization/cs_CZ.inc
deleted file mode 100644
index 06ab2e93f..000000000
--- a/plugins/markasjunk/localization/cs_CZ.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
-
-+-----------------------------------------------------------------------+
-| language/cs_CZ/labels.inc                                             |
-|                                                                       |
-| Language file of the RoundCube markasjunk plugin                      |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Milan Kozak <hodza@hodza.net>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id: labels.inc 2993 2009-09-26 18:32:07Z alec $
-
-*/
-
-$labels = array();
-$labels['buttontitle'] = 'Označit jako Spam';
-$labels['reportedasjunk'] = 'Úspěšně nahlášeno jako Spam';
-
-?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/en_US.inc b/plugins/markasjunk/localization/en_US.inc
deleted file mode 100644
index 6f63e161a..000000000
--- a/plugins/markasjunk/localization/en_US.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Mark as Junk';
-$labels['reportedasjunk'] = 'Successfully reported as Junk';
-
-?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/et_EE.inc b/plugins/markasjunk/localization/et_EE.inc
deleted file mode 100644
index daf140512..000000000
--- a/plugins/markasjunk/localization/et_EE.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Märgista Rämpsuks';
-$labels['reportedasjunk'] = 'Edukalt Rämpsuks märgitud';
-
-?>
diff --git a/plugins/markasjunk/localization/pl_PL.inc b/plugins/markasjunk/localization/pl_PL.inc
deleted file mode 100644
index a98f0aab3..000000000
--- a/plugins/markasjunk/localization/pl_PL.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Oznacz jako SPAM';
-$labels['reportedasjunk'] = 'Pomyślnie oznaczono jako SPAM';
-
-?>
diff --git a/plugins/markasjunk/localization/ru_RU.inc b/plugins/markasjunk/localization/ru_RU.inc
deleted file mode 100644
index 32d00c2df..000000000
--- a/plugins/markasjunk/localization/ru_RU.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Переместить в "СПАМ"';
-$labels['reportedasjunk'] = 'Перемещено в "СПАМ"';
-
-?>
diff --git a/plugins/markasjunk/localization/sv_SE.inc b/plugins/markasjunk/localization/sv_SE.inc
deleted file mode 100644
index f4c5959b9..000000000
--- a/plugins/markasjunk/localization/sv_SE.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['buttontitle'] = 'Märk som skräp';
-$labels['reportedasjunk'] = 'Framgångsrikt rapporterat som skräp';
-
-?>
\ No newline at end of file
diff --git a/plugins/markasjunk/markasjunk.js b/plugins/markasjunk/markasjunk.js
deleted file mode 100644
index 8b02d7438..000000000
--- a/plugins/markasjunk/markasjunk.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Mark-as-Junk plugin script */
-
-function rcmail_markasjunk(prop)
-{
-  if (!rcmail.env.uid && (!rcmail.message_list || !rcmail.message_list.get_selection().length))
-    return;
-  
-    var uids = rcmail.env.uid ? rcmail.env.uid : rcmail.message_list.get_selection().join(',');
-    
-    rcmail.set_busy(true, 'loading');
-    rcmail.http_post('plugin.markasjunk', '_uid='+uids+'&_mbox='+urlencode(rcmail.env.mailbox), true);
-}
-
-// callback for app-onload event
-if (window.rcmail) {
-  rcmail.addEventListener('init', function(evt) {
-    
-    // register command (directly enable in message view mode)
-    rcmail.register_command('plugin.markasjunk', rcmail_markasjunk, rcmail.env.uid);
-    
-    // add event-listener to message list
-    if (rcmail.message_list)
-      rcmail.message_list.addEventListener('select', function(list){
-        rcmail.enable_command('plugin.markasjunk', list.get_selection().length > 0);
-      });
-  })
-}
-
diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php
deleted file mode 100644
index 046645872..000000000
--- a/plugins/markasjunk/markasjunk.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Mark as Junk
- *
- * Sample plugin that adds a new button to the mailbox toolbar
- * to mark the selected messages as Junk and move them to the Junk folder
- *
- * @version 1.0
- * @author Thomas Bruederli
- */
-class markasjunk extends rcube_plugin
-{
-  public $task = 'mail';
-
-  function init()
-  {
-    $rcmail = rcmail::get_instance();
-
-    $this->register_action('plugin.markasjunk', array($this, 'request_action'));
-      
-    if ($rcmail->action == '' || $rcmail->action == 'show') {
-      $skin_path = $this->local_skin_path();
-      $this->include_script('markasjunk.js');
-      $this->add_texts('localization', true);
-      $this->add_button(array(
-        'command' => 'plugin.markasjunk',
-        'imagepas' => $skin_path.'/junk_pas.png',
-        'imageact' => $skin_path.'/junk_act.png',
-	'title' => 'markasjunk.buttontitle'), 'toolbar');
-    }
-  }
-
-  function request_action()
-  {
-    $this->add_texts('localization');
-
-    $GLOBALS['IMAP_FLAGS']['JUNK'] = 'Junk';
-    $GLOBALS['IMAP_FLAGS']['NONJUNK'] = 'NonJunk';
-    
-    $uids = get_input_value('_uid', RCUBE_INPUT_POST);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-    
-    $rcmail = rcmail::get_instance();
-    $rcmail->imap->unset_flag($uids, 'NONJUNK');
-    $rcmail->imap->set_flag($uids, 'JUNK');
-    
-    if (($junk_mbox = $rcmail->config->get('junk_mbox')) && $mbox != $junk_mbox) {
-      $rcmail->output->command('move_messages', $junk_mbox);
-    }
-    
-    $rcmail->output->command('display_message', $this->gettext('reportedasjunk'), 'confirmation');
-    $rcmail->output->send();
-  }
-
-}
diff --git a/plugins/markasjunk/skins/default/junk_act.png b/plugins/markasjunk/skins/default/junk_act.png
deleted file mode 100644
index b5a84f604..000000000
--- a/plugins/markasjunk/skins/default/junk_act.png
+++ /dev/null
diff --git a/plugins/markasjunk/skins/default/junk_pas.png b/plugins/markasjunk/skins/default/junk_pas.png
deleted file mode 100644
index b88a561a4..000000000
--- a/plugins/markasjunk/skins/default/junk_pas.png
+++ /dev/null
diff --git a/plugins/new_user_dialog/localization/cs_CZ.inc b/plugins/new_user_dialog/localization/cs_CZ.inc
deleted file mode 100644
index fe05e6aae..000000000
--- a/plugins/new_user_dialog/localization/cs_CZ.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Prosím doplňte své jméno a e-mail';
-$labels['identitydialoghint'] = 'Tento dialog se objeví pouze při prvním přihlášení.';
-
-?>
diff --git a/plugins/new_user_dialog/localization/de_CH.inc b/plugins/new_user_dialog/localization/de_CH.inc
deleted file mode 100644
index d2a1310d0..000000000
--- a/plugins/new_user_dialog/localization/de_CH.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Bitte vervollständigen Sie Ihre Absender-Informationen';
-$labels['identitydialoghint'] = 'Dieser Dialog erscheint nur einmal beim ersten Login.';
-
-?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/de_DE.inc b/plugins/new_user_dialog/localization/de_DE.inc
deleted file mode 100644
index d2a1310d0..000000000
--- a/plugins/new_user_dialog/localization/de_DE.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Bitte vervollständigen Sie Ihre Absender-Informationen';
-$labels['identitydialoghint'] = 'Dieser Dialog erscheint nur einmal beim ersten Login.';
-
-?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/en_US.inc b/plugins/new_user_dialog/localization/en_US.inc
deleted file mode 100644
index d9f531ba7..000000000
--- a/plugins/new_user_dialog/localization/en_US.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Please complete your sender identity';
-$labels['identitydialoghint'] = 'This box only appears once at the first login.';
-
-?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/es_ES.inc b/plugins/new_user_dialog/localization/es_ES.inc
deleted file mode 100644
index 73f47f25a..000000000
--- a/plugins/new_user_dialog/localization/es_ES.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Por favor completa tus datos';
-$labels['identitydialoghint'] = 'Este diálogo sólo aparece la primera vez que te conectas.';
-
-?>
diff --git a/plugins/new_user_dialog/localization/et_EE.inc b/plugins/new_user_dialog/localization/et_EE.inc
deleted file mode 100644
index 7c6b3f20d..000000000
--- a/plugins/new_user_dialog/localization/et_EE.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Palun täida oma saatja identiteet';
-$labels['identitydialoghint'] = 'See kast ilmub ainult esimesel sisselogimisel.';
-
-?>
diff --git a/plugins/new_user_dialog/localization/it_IT.inc b/plugins/new_user_dialog/localization/it_IT.inc
deleted file mode 100644
index 6c834a9c8..000000000
--- a/plugins/new_user_dialog/localization/it_IT.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Per favore completa le informazioni riguardo la tua identità';
-$labels['identitydialoghint'] = 'Questa finestra comparirà una volta sola al primo accesso';
-
-?>
diff --git a/plugins/new_user_dialog/localization/pl_PL.inc b/plugins/new_user_dialog/localization/pl_PL.inc
deleted file mode 100644
index a385836a4..000000000
--- a/plugins/new_user_dialog/localization/pl_PL.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Uzupełnij tożsamość nadawcy';
-$labels['identitydialoghint'] = 'To okno pojawia się tylko przy pierwszym logowaniu.';
-
-?>
diff --git a/plugins/new_user_dialog/localization/ru_RU.inc b/plugins/new_user_dialog/localization/ru_RU.inc
deleted file mode 100644
index d1eb28e71..000000000
--- a/plugins/new_user_dialog/localization/ru_RU.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Пожалуйста, укажите Ваше имя.';
-$labels['identitydialoghint'] = 'Данное сообщение отображается только при первом входе.';
-
-?>
diff --git a/plugins/new_user_dialog/localization/sv_SE.inc b/plugins/new_user_dialog/localization/sv_SE.inc
deleted file mode 100644
index b3e665ef1..000000000
--- a/plugins/new_user_dialog/localization/sv_SE.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Vänligen fyll i namn och avsändaradress under personliga inställningar';
-$labels['identitydialoghint'] = 'Informationen visas endast vid första inloggningen.';
-
-?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/zh_TW.inc b/plugins/new_user_dialog/localization/zh_TW.inc
deleted file mode 100644
index 87261f9cd..000000000
--- a/plugins/new_user_dialog/localization/zh_TW.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['identitydialogtitle'] = '請完成您的身份資訊';
-$labels['identitydialoghint'] = '此視窗只會於第一次登入時出現。';
-
-?>
diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php
deleted file mode 100644
index 006cb2711..000000000
--- a/plugins/new_user_dialog/new_user_dialog.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * Present identities settings dialog to new users
- *
- * When a new user is created, this plugin checks the default identity
- * and sets a session flag in case it is incomplete. An overlay box will appear
- * on the screen until the user has reviewed/completed his identity.
- *
- * @version 1.0
- * @author Thomas Bruederli
- */
-class new_user_dialog extends rcube_plugin
-{
-  public $task = 'login|mail';
-  
-  function init()
-  {
-    $this->add_hook('create_identity', array($this, 'create_identity'));
-    
-    // register additional hooks if session flag is set
-    if ($_SESSION['plugin.newuserdialog']) {
-      $this->add_hook('render_page', array($this, 'render_page'));
-      $this->register_action('plugin.newusersave', array($this, 'save_data'));
-    }
-  }
-  
-  /**
-   * Check newly created identity at first login
-   */
-  function create_identity($p)
-  {
-    // set session flag when a new user was created and the default identity seems to be incomplete
-    if ($p['login'] && !$p['complete'])
-      $_SESSION['plugin.newuserdialog'] = true;
-  }
-
-  /**
-   * Callback function when HTML page is rendered
-   * We'll add an overlay box here.
-   */
-  function render_page($p)
-  {
-    if ($_SESSION['plugin.newuserdialog']) {
-      $this->add_texts('localization');
-      
-      $rcmail = rcmail::get_instance();
-      $identity = $rcmail->user->get_identity();
-      $identities_level = intval($rcmail->config->get('identities_level', 0));
-      
-      // compose user-identity dialog
-      $table = new html_table(array('cols' => 2));
-      
-      $table->add('title', $this->gettext('name'));
-      $table->add(null, html::tag('input', array('type' => "text", 'name' => "_name", 'value' => $identity['name'])));
-
-      $table->add('title', $this->gettext('email'));
-      $table->add(null, html::tag('input', array('type' => "text", 'name' => "_email", 'value' => $identity['email'], 'disabled' => ($identities_level == 1 || $identities_level == 3))));
-      
-      // add overlay input box to html page
-      $rcmail->output->add_footer(html::div(array('id' => "newuseroverlay"),
-        html::tag('form', array(
-            'action' => $rcmail->url('plugin.newusersave'),
-            'method' => "post"),
-          html::tag('h3', null, Q($this->gettext('identitydialogtitle'))) .
-          html::p('hint', Q($this->gettext('identitydialoghint'))) .
-          $table->show() .
-          html::p(array('class' => "formbuttons"),
-            html::tag('input', array('type' => "submit", 'class' => "button mainaction", 'value' => $this->gettext('save'))))
-        )
-      ));
-      
-      $this->include_stylesheet('newuserdialog.css');
-    }
-  }
-
-  /**
-   * Handler for submitted form
-   *
-   * Check fields and save to default identity if valid.
-   * Afterwards the session flag is removed and we're done.
-   */
-  function save_data()
-  {
-    $rcmail = rcmail::get_instance();
-    $identity = $rcmail->user->get_identity();
-    $identities_level = intval($rcmail->config->get('identities_level', 0));
-    
-    $save_data = array(
-      'name' => get_input_value('_name', RCUBE_INPUT_POST),
-      'email' => get_input_value('_email', RCUBE_INPUT_POST),
-    );
-    
-    // don't let the user alter the e-mail address if disabled by config
-    if ($identities_level == 1 || $identities_level == 3)
-      $save_data['email'] = $identity['email'];
-    
-    // save data if not empty
-    if (!empty($save_data['name']) && !empty($save_data['email'])) {
-      $rcmail->user->update_identity($identity['identity_id'], $save_data);
-      $rcmail->session->remove('plugin.newuserdialog');
-    }
-    
-    $rcmail->output->redirect('');
-  }
-  
-}
-
-?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/newuserdialog.css b/plugins/new_user_dialog/newuserdialog.css
deleted file mode 100644
index c03e6fd42..000000000
--- a/plugins/new_user_dialog/newuserdialog.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/** Styles for the new-user-dialog overlay box */
-
-#newuseroverlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 10000;
-  background: rgba(0,0,0,0.5) !important;
-  background: #333;
-  
-  /** IE hacks */
-  filter: alpha(opacity=90);
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
-  width: expression(document.documentElement.clientWidth+'px');
-  height: expression(document.documentElement.clientHeight+'px');
-}
-
-#newuseroverlay h3 {
-  color: #333;
-  font-size: normal;
-  margin-top: 0.5em;
-  margin-bottom: 0;
-}
-
-#newuseroverlay p.hint {
-  margin-top: 0.5em;
-  font-style: italic;
-}
-
-#newuseroverlay form {
-  width: 32em;
-  margin: 8em auto;
-  padding: 1em 2em;
-  background: #F6F6F6;
-  border: 2px solid #555;
-  border-radius: 6px;
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-}
-
-#newuseroverlay table td.title
-{
-  color: #666;
-  text-align: right;
-  padding-right: 1em;
-  white-space: nowrap;
-}
-
-#newuseroverlay table td input
-{
-  width: 20em;
-}
-
-#newuseroverlay .formbuttons {
-  margin-top: 1.5em;
-  text-align: center;
-}
\ No newline at end of file
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
deleted file mode 100644
index 43eeae9dd..000000000
--- a/plugins/new_user_identity/new_user_identity.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * New user identity
- *
- * Populates a new user's default identity from LDAP on their first visit.
- *
- * This plugin requires that a working public_ldap directory be configured.
- *
- * @version 1.0
- * @author Kris Steinhoff
- *
- * Example configuration:
- *
- *  // The id of the address book to use to automatically set a new
- *  // user's full name in their new identity. (This should be an
- *  // string, which refers to the $rcmail_config['ldap_public'] array.)
- *  $rcmail_config['new_user_identity_addressbook'] = 'People';
- *  
- *  // When automatically setting a new users's full name in their
- *  // new identity, match the user's login name against this field.
- *  $rcmail_config['new_user_identity_match'] = 'uid';
- */
-class new_user_identity extends rcube_plugin
-{
-    public $task = 'login';
-
-    function init()
-    {
-        $this->add_hook('create_user', array($this, 'lookup_user_name'));
-    }
-
-    function lookup_user_name($args)
-    {
-        $rcmail = rcmail::get_instance();
-        if ($addressbook = $rcmail->config->get('new_user_identity_addressbook')) {
-            $match = $rcmail->config->get('new_user_identity_match');
-            $ldap = $rcmail->get_address_book($addressbook);
-            $ldap->prop['search_fields'] = array($match);
-            $results = $ldap->search($match, $args['user'], TRUE);
-            if (count($results->records) == 1) {
-                $args['user_name'] = $results->records[0]['name'];
-            }
-        }
-        return $args;
-    }
-}
-?>
diff --git a/plugins/password/README b/plugins/password/README
deleted file mode 100644
index c7e8203ad..000000000
--- a/plugins/password/README
+++ /dev/null
@@ -1,200 +0,0 @@
- -----------------------------------------------------------------------
- Password Plugin for Roundcube
- -----------------------------------------------------------------------
-
- Plugin that adds a possibility to change user password using many
- methods (drivers) via Settings/Password tab.
-
- -----------------------------------------------------------------------
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- @version 1.2
- @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
- @author <see driver files for driver authors>
- -----------------------------------------------------------------------
-
- 1. 	Configuration
- 2.	Drivers
- 2.1. 	Database (sql)
- 2.2.	Cyrus/SASL (sasl)
- 2.3.	Poppassd/Courierpassd (poppassd)
- 2.4.	LDAP (ldap)
- 2.5.	DirectAdmin Control Panel
- 2.6.   cPanel
- 2.7.   XIMSS (Communigate)
- 3.	Driver API
-
-
- 1. Configuration
- ----------------
-
- Copy config.inc.php.dist to config.inc.php and set the options as described
- within the file.
-
-
- 2. Drivers
- ----------
-
- Password plugin supports many password change mechanisms which are
- handled by included drivers. Just pass driver name in 'password_driver' option.
-
-
- 2.1. Database (sql)
- -------------------
-
- You can specify which database to connect by 'password_db_dsn' option and
- what SQL query to execute by 'password_query'. See main.inc.php file for
- more info.
-
- Example implementations of an update_passwd function:
-
- - This is for use with LMS (http://lms.org.pl) database and postgres:
-
-	CREATE OR REPLACE FUNCTION update_passwd(hash text, account text) RETURNS integer AS $$
-	DECLARE
-    	    res integer;
-	BEGIN
-    	    UPDATE passwd SET password = hash
-	    WHERE login = split_part(account, '@', 1)
-		AND domainid = (SELECT id FROM domains WHERE name = split_part(account, '@', 2))
-	    RETURNING id INTO res;
-	    RETURN res;
-	END;
-	$$ LANGUAGE plpgsql SECURITY DEFINER;
-
- - This is for use with a SELECT update_passwd(%o,%c,%u) query
-	Updates the password only when the old password matches the MD5 password
-	in the database
-
-	CREATE FUNCTION update_password (oldpass text, cryptpass text, user text) RETURNS text
-    	    MODIFIES SQL DATA
-	BEGIN
-	    DECLARE currentsalt varchar(20);
-	    DECLARE error text;
-	    SET error = 'incorrect current password';
-	    SELECT substring_index(substr(user.password,4),_latin1'$',1) INTO currentsalt FROM users WHERE username=user;
-	    SELECT '' INTO error FROM users WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
-	    UPDATE users SET password=cryptpass WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
-	    RETURN error;
-	END
-
- Example SQL UPDATEs:
-
- - Plain text passwords:
-    UPDATE users SET password=%p WHERE username=%u AND password=%o AND domain=%h LIMIT 1
-
- - Crypt text passwords:
-    UPDATE users SET password=%c WHERE username=%u LIMIT 1
-
- - Use a MYSQL crypt function (*nix only) with random 8 character salt
-    UPDATE users SET password=ENCRYPT(%p,concat(_utf8'$1$',right(md5(rand()),8),_utf8'$')) WHERE username=%u LIMIT 1
-
- - MD5 stored passwords:
-    UPDATE users SET password=MD5(%p) WHERE username=%u AND password=MD5(%o) LIMIT 1
-
-
- 2.2. Cyrus/SASL (sasl)
- ----------------------
-
- Cyrus SASL database authentication allows your Cyrus+RoundCube
- installation to host mail users without requiring a Unix Shell account!
-
- This driver only covers the "sasldb" case when using Cyrus SASL. Kerberos
- and PAM authentication mechanisms will require other techniques to enable
- user password manipulations.
-
- Cyrus SASL includes a shell utility called "saslpasswd" for manipulating
- user passwords in the "sasldb" database.  This plugin attempts to use
- this utility to perform password manipulations required by your webmail
- users without any administrative interaction. Unfortunately, this
- scheme requires that the "saslpasswd" utility be run as the "cyrus"
- user - kind of a security problem since we have chosen to SUID a small
- script which will allow this to happen.
-
- This driver is based on the Squirrelmail Change SASL Password Plugin.
- See http://www.squirrelmail.org/plugin_view.php?id=107 for details.
-
- Installation:
-
- Change into the drivers directory. Edit the chgsaslpasswd.c file as is
- documented within it.
-
- Compile the wrapper program:
-	gcc -o chgsaslpasswd chgsaslpasswd.c
-
- Chown the compiled chgsaslpasswd binary to the cyrus user and group
- that your browser runs as, then chmod them to 4550.
-
- For example, if your cyrus user is 'cyrus' and the apache server group is
- 'nobody' (I've been told Redhat runs Apache as user 'apache'):
-
-	chown cyrus:nobody chgsaslpasswd
-	chmod 4550 chgsaslpasswd
-
- Stephen Carr has suggested users should try to run the scripts on a test
- account as the cyrus user eg;
-
-	su cyrus -c "./chgsaslpasswd -p test_account"
-
- This will allow you to make sure that the script will work for your setup.
- Should the script not work, make sure that:
- 1) the user the script runs as has access to the saslpasswd|saslpasswd2
-   file and proper permissions
- 2) make sure the user in the chgsaslpasswd.c file is set correctly.
-   This could save you some headaches if you are the paranoid type.
-
-
- 2.3. Poppassd/Courierpassd (poppassd)
- -------------------------------------
-
- You can specify which host to connect to via 'password_pop_host' and
- what port via 'password_pop_port'. See config.inc.php file for more info.
-
-
- 2.4. LDAP (ldap)
- ----------------
-
- See config.inc.php file. Requires PEAR::Net_LDAP2 package.
-
-
- 2.5. DirectAdmin Control Panel
- -------------------------------------
-
- You can specify which host to connect to via 'password_directadmin_host' 
- and what port via 'password_direactadmin_port'. See config.inc.php file 
- for more info.
-
-
- 2.6. cPanel
- -----------
-
- You can specify parameters for HTTP connection to cPanel's admin
- interface. See config.inc.php file for more info.
-
-
- 2.7. XIMSS (Communigate)
- -------------------------------------
-
- You can specify which host and port to connect to via 'password_ximss_host' 
- and 'password_ximss_port'. See config.inc.php file for more info.
-
-
- 3. Driver API
- -------------
-
- Driver file (<driver_name>.php) must define 'password_save' function with
- two arguments. First - current password, second - new password. Function
- may return PASSWORD_SUCCESS on success or any of PASSWORD_CONNECT_ERROR,
- PASSWORD_CRYPT_ERROR, PASSWORD_ERROR when driver was unable to change password.
- See existing drivers in drivers/ directory for examples.
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
deleted file mode 100644
index b9e3b9102..000000000
--- a/plugins/password/config.inc.php.dist
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-// Password Plugin options
-// -----------------------
-// A driver to use for password change. Default: "sql".
-// Current possibilities: 'directadmin', 'ldap', 'poppassd', 'sasl', 'sql', 'vpopmaild', 'cpanel'
-$rcmail_config['password_driver'] = 'sql';
-
-// Determine whether current password is required to change password.
-// Default: false.
-$rcmail_config['password_confirm_current'] = true;
-
-// Require the new password to be a certain length.
-// set to blank to allow passwords of any length
-$rcmail_config['password_minimum_length'] = 0;
- 
-// Require the new password to contain a letter and punctuation character
-// Change to false to remove this check.
-$rcmail_config['password_require_nonalpha'] = false;
-
-
-// SQL Driver options
-// ------------------
-// PEAR database DSN for performing the query. By default
-// Roundcube DB settings are used.
-$rcmail_config['password_db_dsn'] = '';
-
-// The SQL query used to change the password.
-// The query can contain the following macros that will be expanded as follows:
-//      %p is replaced with the plaintext new password
-//      %c is replaced with the crypt version of the new password, MD5 if available
-//         otherwise DES.
-//      %o is replaced with the password before the change
-//      %n is replaced with the hashed version of the new password
-//      %q is replaced with the hashed password before the change
-//      %h is replaced with the imap host (from the session info)
-//      %u is replaced with the username (from the session info)
-//      %l is replaced with the local part of the username
-//         (in case the username is an email address)
-//      %d is replaced with the domain part of the username
-//         (in case the username is an email address)
-// Escaping of macros is handled by this module.
-// Default: "SELECT update_passwd(%c, %u)"
-$rcmail_config['password_query'] = 'SELECT update_passwd(%c, %u)';
-
-// Using a password hash for %n and %q variables.
-// Determine which hashing algorithm should be used to generate
-// the hashed new and current password for using them within the
-// SQL query. Requires PHP's 'hash' extension.
-$rcmail_config['password_hash_algorithm'] = 'sha1';
-
-// You can also decide whether the hash should be provided
-// as hex string or in base64 encoded format.
-$rcmail_config['password_hash_base64'] = false;
-
-
-// Poppassd Driver options
-// -----------------------
-// The host which changes the password
-$rcmail_config['password_pop_host'] = 'localhost';
-
-// TCP port used for poppassd connections
-$rcmail_config['password_pop_port'] = 106;
-
-
-// SASL Driver options
-// -------------------
-// Additional arguments for the saslpasswd2 call
-$rcmail_config['password_saslpasswd_args'] = '';
-
-
-// LDAP Driver options
-// -------------------
-// LDAP server name to connect to. 
-// You can provide one or several hosts in an array in which case the hosts are tried from left to right.
-// Exemple: array('ldap1.exemple.com', 'ldap2.exemple.com');
-// Default: 'localhost'
-$rcmail_config['password_ldap_host'] = 'localhost';
-
-// LDAP server port to connect to
-// Default: '389'
-$rcmail_config['password_ldap_port'] = '389';
-
-// TLS is started after connecting
-// Using TLS for password modification is recommanded.
-// Default: false
-$rcmail_config['password_ldap_starttls'] = false;
-
-// LDAP version
-// Default: '3'
-$rcmail_config['password_ldap_version'] = '3';
-
-// LDAP base name (root directory)
-// Exemple: 'dc=exemple,dc=com'
-$rcmail_config['password_ldap_basedn'] = 'dc=exemple,dc=com';
-
-// LDAP connection method
-// There is two connection method for changing a user's LDAP password.
-// 'user': use user credential (recommanded, require password_confirm_current=true)
-// 'admin': use admin credential (this mode require password_ldap_adminDN and password_ldap_adminPW)
-// Default: 'user'
-$rcmail_config['password_ldap_method'] = 'user';
-
-// LDAP Admin DN
-// Used only in admin connection mode
-// Default: null
-$rcmail_config['password_ldap_adminDN'] = null;
-
-// LDAP Admin Password
-// Used only in admin connection mode
-// Default: null
-$rcmail_config['password_ldap_adminPW'] = null;
-
-// LDAP user DN mask
-// The user's DN is mandatory and as we only have his login,
-// we need to re-create his DN using a mask
-// '%login' will be replaced by the current roundcube user's login
-// '%name' will be replaced by the current roundcube user's name part
-// '%domain' will be replaced by the current roundcube user's domain part
-// Exemple: 'uid=%login,ou=people,dc=exemple,dc=com'
-$rcmail_config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,dc=com';
-
-// LDAP password hash type
-// Standard LDAP encryption type which must be one of: crypt,
-// ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
-// Please note that most encodage types require external libraries
-// to be included in your PHP installation, see function hashPassword in drivers/ldap.php for more info.
-// Default: 'crypt'
-$rcmail_config['password_ldap_encodage'] = 'crypt';
-
-// LDAP password attribute
-// Name of the ldap's attribute used for storing user password
-// Default: 'userPassword'
-$rcmail_config['password_ldap_pwattr'] = 'userPassword';
-
-// LDAP password force replace
-// Force LDAP replace in cases where ACL allows only replace not read
-// See http://pear.php.net/package/Net_LDAP2/docs/latest/Net_LDAP2/Net_LDAP2_Entry.html#methodreplace
-// Default: true
-$rcmail_config['password_ldap_force_replace'] = true;
-
-
-// DirectAdmin Driver options
-// --------------------------
-// The host which changes the password
-// Use 'ssl://serverip' instead of 'tcp://serverip' when running DirectAdmin over SSL.
-$rcmail_config['password_directadmin_host'] = 'tcp://localhost';
-
-// TCP port used for DirectAdmin connections
-$rcmail_config['password_directadmin_port'] = 2222;
-
-
-// vpopmaild Driver options
-// -----------------------
-// The host which changes the password
-$rcmail_config['password_vpopmaild_host'] = 'localhost';
-
-// TCP port used for vpopmaild connections
-$rcmail_config['password_vpopmaild_port'] = 89;
-
-
-// cPanel Driver options
-// --------------------------
-// The cPanel Host name
-$rcmail_config['password_cpanel_host'] = 'host.domain.com';
-
-// The cPanel admin username
-$rcmail_config['password_cpanel_username'] = 'username';
-
-// The cPanel admin password
-$rcmail_config['password_cpanel_password'] = 'password';
-
-// The cPanel port to use
-$rcmail_config['password_cpanel_port'] = 2082;
-
-// Using ssl for cPanel connections?
-$rcmail_config['password_cpanel_ssl'] = true;
-
-// The cPanel theme in use
-$rcmail_config['password_cpanel_theme'] = 'x';
-
-
-// XIMSS (Communigate server) Driver options
-// -----------------------------------------
-// Host name of the Communigate server
-$rcmail_config['password_ximss_host'] = 'mail.example.com';
-
-// XIMSS port on Communigate server
-$rcmail_config['password_ximss_port'] = 11024;
-
-?>
diff --git a/plugins/password/drivers/chgsaslpasswd.c b/plugins/password/drivers/chgsaslpasswd.c
deleted file mode 100644
index bcdcb2e0d..000000000
--- a/plugins/password/drivers/chgsaslpasswd.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-
-// set the UID this script will run as (cyrus user)
-#define UID 96
-// set the path to saslpasswd or saslpasswd2
-#define CMD "/usr/sbin/saslpasswd2"
-
-/* INSTALLING:
-  gcc -o chgsaslpasswd chgsaslpasswd.c
-  chown cyrus.apache chgsaslpasswd
-  strip chgsaslpasswd
-  chmod 4550 chgsaslpasswd
-*/
-
-main(int argc, char *argv[])
-{
-  int rc,cc;
-
-  cc = setuid(UID);
-  rc = execvp(CMD, argv);
-  if ((rc != 0) || (cc != 0))
-  {
-    fprintf(stderr, "__ %s:  failed %d  %d\n", argv[0], rc, cc);
-    return 1;
-  }
-
-  return 0;
-}
diff --git a/plugins/password/drivers/cpanel.php b/plugins/password/drivers/cpanel.php
deleted file mode 100644
index 82bfe74d2..000000000
--- a/plugins/password/drivers/cpanel.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * cPanel Password Driver
- *
- * Driver that adds functionality to change the users cPanel password.
- * The cPanel PHP API code has been taken from: http://www.phpclasses.org/browse/package/3534.html
- *
- * This driver has been tested with Hostmonster hosting and seems to work fine.
-
- *
- * @version 1.0
- * @author Fulvio Venturelli <fulvio@venturelli.org>
- */
-
-class HTTP
-{
-	function HTTP($host, $username, $password, $port, $ssl, $theme)
-	{
-		$this->ssl = $ssl ? 'ssl://' : '';
-		$this->username = $username;
-		$this->password = $password;
-		$this->theme = $theme;
-		$this->auth = base64_encode($username . ':' . $password);
-		$this->port = $port;
-		$this->host = $host;
-		$this->path = '/frontend/' . $theme . '/';
-	}
-
-	function getData($url, $data = '')
-	{
-		$url = $this->path . $url;
-		if(is_array($data))
-		{
-			$url = $url . '?';
-			foreach($data as $key=>$value)
-			{
-				$url .= urlencode($key) . '=' . urlencode($value) . '&';
-			}
-			$url = substr($url, 0, -1);
-		}
-		$response = '';
-		$fp = fsockopen($this->ssl . $this->host, $this->port);
-		if(!$fp)
-		{
-			return false;
-		}
-		$out = 'GET ' . $url . ' HTTP/1.0' . "\r\n";
-		$out .= 'Authorization: Basic ' . $this->auth . "\r\n";
-		$out .= 'Connection: Close' . "\r\n\r\n";
-		fwrite($fp, $out);
-		while (!feof($fp))
-		{
-			$response .= @fgets($fp);
-		}
-		fclose($fp);
-		return $response;
-	}
-}
-
-
-class emailAccount
-{          
-	function emailAccount($host, $username, $password, $port, $ssl, $theme, $address)
-	{
-		$this->HTTP = new HTTP($host, $username, $password, $port, $ssl, $theme);
-		if(strpos($address, '@'))
-		{
-			list($this->email, $this->domain) = explode('@', $address);
-		}
-		else
-		{
-			list($this->email, $this->domain) = array($address, '');
-		}
-	}
-
- /*
-  * Change email account password
-  *
-  * Returns true on success or false on failure.
-  * @param string $password email account password
-  * @return bool
-  */
-	function setPassword($password)
-	{
-		$data['email'] = $this->email;
-		$data['domain'] = $this->domain;
-		$data['password'] = $password;
-		$response = $this->HTTP->getData('mail/dopasswdpop.html', $data);
-		if(strpos($response, 'success') && !strpos($response, 'failure'))
-		{
-			return true;
-		}
-		return false;
-	}
-}
-
-
-function password_save($curpas, $newpass)
-{
-    $rcmail = rcmail::get_instance();
-
-    // Create a cPanel email object
-    $cPanel = new emailAccount($rcmail->config->get('password_cpanel_host'),
-	$rcmail->config->get('password_cpanel_username'),
-	$rcmail->config->get('password_cpanel_password'),
-	$rcmail->config->get('password_cpanel_port'),
-	$rcmail->config->get('password_cpanel_ssl'),
-	$rcmail->config->get('password_cpanel_theme'),
-	$_SESSION['username'] );
-
-    if ($cPanel->setPassword($newpass)){
-        return PASSWORD_SUCCESS;
-    }
-    else
-    {
-       return PASSWORD_ERROR;
-    }
-}
-
-?>
diff --git a/plugins/password/drivers/directadmin.php b/plugins/password/drivers/directadmin.php
deleted file mode 100644
index d11aae70a..000000000
--- a/plugins/password/drivers/directadmin.php
+++ /dev/null
@@ -1,483 +0,0 @@
-<?php
-
-/**
- * DirectAdmin Password Driver
- *
- * Driver to change passwords via DirectAdmin Control Panel
- *
- * @version 1.0
- * @author Victor Benincasa <vbenincasa@gmail.com>
- *
- */
-
-
-function password_save($curpass, $passwd){
-
-    $rcmail = rcmail::get_instance();
-    $Socket = new HTTPSocket;
-
-    $da_user    = $_SESSION['username'];
-    $da_curpass = $curpass;
-    $da_newpass = $passwd;
-    $da_host    = $rcmail->config->get('password_directadmin_host');
-    $da_port    = $rcmail->config->get('password_directadmin_port');
-
-    $Socket->connect($da_host,$da_port); 
-    $Socket->set_method('POST');
-    $Socket->query('/CMD_CHANGE_EMAIL_PASSWORD',
-        array(
-            'email' 		=> $da_user,
-            'oldpassword' 	=> $da_curpass,
-            'password1' 	=> $da_newpass,
-            'password2' 	=> $da_newpass,
-            'api' 			=> '1'
-    ));
-    $response = $Socket->fetch_parsed_body();
-
-	//console("DA error response: $response[text] [$da_user]");
-
-    if($Socket->result_status_code <> 200)
-        return PASSWORD_CONNECT_ERROR;
-    elseif($response['error'] == 1){ //Error description: $response[text] 
-        return PASSWORD_ERROR;
-    }else 
-        return PASSWORD_SUCCESS;
-
-}
-
-
-/**
- * Socket communication class.
- *
- * Originally designed for use with DirectAdmin's API, this class will fill any HTTP socket need.
- *
- * Very, very basic usage:
- *   $Socket = new HTTPSocket;
- *   echo $Socket->get('http://user:pass@somesite.com/somedir/some.file?query=string&this=that');
- *
- * @author Phi1 'l0rdphi1' Stier <l0rdphi1@liquenox.net>
- * @package HTTPSocket
- * @version 2.6
- */
-class HTTPSocket {
-
-    var $version = '2.6';
-    
-    /* all vars are private except $error, $query_cache, and $doFollowLocationHeader */
-
-    var $method = 'GET';
-
-    var $remote_host;
-    var $remote_port;
-    var $remote_uname;
-    var $remote_passwd;
-
-    var $result;
-    var $result_header;
-    var $result_body;
-    var $result_status_code;
-
-    var $lastTransferSpeed;
-
-    var $bind_host;
-
-    var $error = array();
-    var $warn = array();
-    var $query_cache = array();
-
-    var $doFollowLocationHeader = TRUE;
-    var $redirectURL;
-
-    var $extra_headers = array();
-
-    /**
-     * Create server "connection".
-     *
-     */
-    function connect($host, $port = '' )
-    {
-        if (!is_numeric($port))
-        {
-            $port = 80;
-        }
-
-        $this->remote_host = $host;
-        $this->remote_port = $port;
-    }
-
-    function bind( $ip = '' )
-    {
-        if ( $ip == '' )
-        {
-            $ip = $_SERVER['SERVER_ADDR'];
-        }
-
-        $this->bind_host = $ip;
-    }
-
-    /**
-     * Change the method being used to communicate.
-     *
-     * @param string|null request method. supports GET, POST, and HEAD. default is GET
-     */
-    function set_method( $method = 'GET' )
-    {
-        $this->method = strtoupper($method);
-    }
-
-    /**
-     * Specify a username and password.
-     *
-     * @param string|null username. defualt is null
-     * @param string|null password. defualt is null
-     */
-    function set_login( $uname = '', $passwd = '' )
-    {
-        if ( strlen($uname) > 0 )
-        {
-            $this->remote_uname = $uname;
-        }
-
-        if ( strlen($passwd) > 0 )
-        {
-            $this->remote_passwd = $passwd;
-        }
-
-    }
-
-    /**
-     * Query the server
-     *
-     * @param string containing properly formatted server API. See DA API docs and examples. Http:// URLs O.K. too.
-     * @param string|array query to pass to url
-     * @param int if connection KB/s drops below value here, will drop connection
-     */
-    function query( $request, $content = '', $doSpeedCheck = 0 )
-    {
-        $this->error = $this->warn = array();
-        $this->result_status_code = NULL;
-
-        // is our request a http:// ... ?
-        if (preg_match('!^http://!i',$request))
-        {
-            $location = parse_url($request);
-            $this->connect($location['host'],$location['port']);
-            $this->set_login($location['user'],$location['pass']);
-            
-            $request = $location['path'];
-            $content = $location['query'];
-
-            if ( strlen($request) < 1 )
-            {
-                $request = '/';
-            }
-
-        }
-
-        $array_headers = array(
-            'User-Agent' => "HTTPSocket/$this->version",
-            'Host' => ( $this->remote_port == 80 ? $this->remote_host : "$this->remote_host:$this->remote_port" ),
-            'Accept' => '*/*',
-            'Connection' => 'Close' );
-
-        foreach ( $this->extra_headers as $key => $value )
-        {
-            $array_headers[$key] = $value;
-        }
-
-        $this->result = $this->result_header = $this->result_body = '';
-
-        // was content sent as an array? if so, turn it into a string
-        if (is_array($content))
-        {
-            $pairs = array();
-
-            foreach ( $content as $key => $value )
-            {
-                $pairs[] = "$key=".urlencode($value);
-            }
-
-            $content = join('&',$pairs);
-            unset($pairs);
-        }
-
-        $OK = TRUE;
-
-        // instance connection
-        if ($this->bind_host)
-        {
-            $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-            socket_bind($socket,$this->bind_host);
-
-            if (!@socket_connect($socket,$this->remote_host,$this->remote_port))
-            {
-                $OK = FALSE;
-            }
-
-        }
-        else
-        {
-            $socket = @fsockopen( $this->remote_host, $this->remote_port, $sock_errno, $sock_errstr, 10 );
-        }
-
-        if ( !$socket || !$OK )
-        {
-            $this->error[] = "Can't create socket connection to $this->remote_host:$this->remote_port.";
-            return 0;
-        }
-
-        // if we have a username and password, add the header
-        if ( isset($this->remote_uname) && isset($this->remote_passwd) )
-        {
-            $array_headers['Authorization'] = 'Basic '.base64_encode("$this->remote_uname:$this->remote_passwd");
-        }
-
-        // for DA skins: if $this->remote_passwd is NULL, try to use the login key system
-        if ( isset($this->remote_uname) && $this->remote_passwd == NULL )
-        {
-            $array_headers['Cookie'] = "session={$_SERVER['SESSION_ID']}; key={$_SERVER['SESSION_KEY']}";
-        }
-
-        // if method is POST, add content length & type headers
-        if ( $this->method == 'POST' )
-        {
-            $array_headers['Content-type'] = 'application/x-www-form-urlencoded';
-            $array_headers['Content-length'] = strlen($content);
-        }
-        // else method is GET or HEAD. we don't support anything else right now.
-        else
-        {
-            if ($content)
-            {
-                $request .= "?$content";
-            }
-        }
-
-        // prepare query
-        $query = "$this->method $request HTTP/1.0\r\n";
-        foreach ( $array_headers as $key => $value )
-        {
-            $query .= "$key: $value\r\n";
-        }
-        $query .= "\r\n";
-
-        // if POST we need to append our content
-        if ( $this->method == 'POST' && $content )
-        {
-            $query .= "$content\r\n\r\n";
-        }
-
-        // query connection
-        if ($this->bind_host)
-        {
-            socket_write($socket,$query);
-
-            // now load results
-            while ( $out = socket_read($socket,2048) )
-            {
-                $this->result .= $out;
-            }
-        }
-        else
-        {
-            fwrite( $socket, $query, strlen($query) );
-
-            // now load results
-            $this->lastTransferSpeed = 0;
-            $status = socket_get_status($socket);
-            $startTime = time();
-            $length = 0;
-            $prevSecond = 0;
-            while ( !feof($socket) && !$status['timed_out'] )
-            {
-                $chunk = fgets($socket,1024);
-                $length += strlen($chunk);
-                $this->result .= $chunk;
-
-                $elapsedTime = time() - $startTime;
-
-                if ( $elapsedTime > 0 )
-                {
-                    $this->lastTransferSpeed = ($length/1024)/$elapsedTime;
-                }
-
-                if ( $doSpeedCheck > 0 && $elapsedTime > 5 && $this->lastTransferSpeed < $doSpeedCheck )
-                {
-                    $this->warn[] = "kB/s for last 5 seconds is below 50 kB/s (~".( ($length/1024)/$elapsedTime )."), dropping connection...";
-                    $this->result_status_code = 503;
-                    break;
-                }
-
-            }
-
-            if ( $this->lastTransferSpeed == 0 )
-            {
-                $this->lastTransferSpeed = $length/1024;
-            }
-
-        }
-        
-        list($this->result_header,$this->result_body) = split("\r\n\r\n",$this->result,2);
-
-        if ($this->bind_host)
-        {
-            socket_close($socket);
-        }
-        else
-        {
-            fclose($socket);
-        }
-
-        $this->query_cache[] = $query;
-
-
-        $headers = $this->fetch_header();
-
-        // what return status did we get?
-        if (!$this->result_status_code)
-        {
-            preg_match("#HTTP/1\.. (\d+)#",$headers[0],$matches);
-            $this->result_status_code = $matches[1];
-        }
-
-        // did we get the full file?
-        if ( !empty($headers['content-length']) && $headers['content-length'] != strlen($this->result_body) )
-        {
-            $this->result_status_code = 206;
-        }
-
-        // now, if we're being passed a location header, should we follow it?
-        if ($this->doFollowLocationHeader)
-        {
-            if ($headers['location'])
-            {
-                $this->redirectURL = $headers['location'];
-                $this->query($headers['location']);
-            }
-        }
-        
-    }
-
-    function getTransferSpeed()
-    {
-        return $this->lastTransferSpeed;
-    }
-
-    /**
-     * The quick way to get a URL's content :)
-     *
-     * @param string URL
-     * @param boolean return as array? (like PHP's file() command)
-     * @return string result body
-     */
-    function get($location, $asArray = FALSE )
-    {
-        $this->query($location);
-
-        if ( $this->get_status_code() == 200 )
-        {
-            if ($asArray)
-            {
-                return split("\n",$this->fetch_body());
-            }
-
-            return $this->fetch_body();
-        }
-
-        return FALSE;
-    }
-
-    /**
-     * Returns the last status code.
-     * 200 = OK;
-     * 403 = FORBIDDEN;
-     * etc.
-     *
-     * @return int status code
-     */
-    function get_status_code()
-    {
-        return $this->result_status_code;
-    }
-
-    /**
-     * Adds a header, sent with the next query.
-     *
-     * @param string header name
-     * @param string header value
-     */
-    function add_header($key,$value)
-    {
-        $this->extra_headers[$key] = $value;
-    }
-
-    /**
-     * Clears any extra headers.
-     *
-     */
-    function clear_headers()
-    {
-        $this->extra_headers = array();
-    }
-
-    /**
-     * Return the result of a query.
-     *
-     * @return string result
-     */
-    function fetch_result()
-    {
-        return $this->result;
-    }
-
-    /**
-     * Return the header of result (stuff before body).
-     *
-     * @param string (optional) header to return
-     * @return array result header
-     */
-    function fetch_header( $header = '' )
-    {
-        $array_headers = split("\r\n",$this->result_header);
-        
-        $array_return = array( 0 => $array_headers[0] );
-        unset($array_headers[0]);
-
-        foreach ( $array_headers as $pair )
-        {
-            list($key,$value) = split(": ",$pair,2);
-            $array_return[strtolower($key)] = $value;
-        }
-
-        if ( $header != '' )
-        {
-            return $array_return[strtolower($header)];
-        }
-
-        return $array_return;
-    }
-
-    /**
-     * Return the body of result (stuff after header).
-     *
-     * @return string result body
-     */
-    function fetch_body()
-    {
-        return $this->result_body;
-    }
-
-    /**
-     * Return parsed body in array format.
-     *
-     * @return array result parsed
-     */
-    function fetch_parsed_body()
-    {
-        parse_str($this->result_body,$x);
-        return $x;
-    }
-
-}
-
-?>
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
deleted file mode 100644
index e38f13f8c..000000000
--- a/plugins/password/drivers/ldap.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * LDAP Password Driver
- *
- * Driver for passwords stored in LDAP
- * This driver use the PEAR Net_LDAP2 class (http://pear.php.net/package/Net_LDAP2).
- *
- * @version 1.0 (2009-06-24)
- * @author Edouard MOREAU <edouard.moreau@ensma.fr>
- *
- * function hashPassword based on code from the phpLDAPadmin development team (http://phpldapadmin.sourceforge.net/).
- * function randomSalt based on code from the phpLDAPadmin development team (http://phpldapadmin.sourceforge.net/).
- *
- */
-
-function password_save($curpass, $passwd)
-{
-    $rcmail = rcmail::get_instance();
-    require_once ('Net/LDAP2.php');
-    
-    // Building user DN
-    $userDN = str_replace('%login', $_SESSION['username'], $rcmail->config->get('password_ldap_userDN_mask'));
-    
-    $parts = explode('@', $_SESSION['username']);
-    if (count($parts) == 2)
-    {
-        $userDN = str_replace('%name', $parts[0], $userDN);
-        $userDN = str_replace('%domain', $parts[1], $userDN);
-    }
-
-    if (empty($userDN)) {return PASSWORD_CONNECT_ERROR;}
-    
-    // Connection Method
-    switch($rcmail->config->get('password_ldap_method')) {
-        case 'user': $binddn = $userDN; $bindpw = $curpass; break;
-        case 'admin': $binddn = $rcmail->config->get('password_ldap_adminDN'); $bindpw = $rcmail->config->get('password_ldap_adminPW'); break;
-        default: $binddn = $userDN; $bindpw = $curpass; break; // default is user mode
-    }
-    
-    // Configuration array
-    $ldapConfig = array (
-        'binddn'    => $binddn,
-        'bindpw'    => $bindpw,
-        'basedn'    => $rcmail->config->get('password_ldap_basedn'),
-        'host'      => $rcmail->config->get('password_ldap_host'),
-        'port'      => $rcmail->config->get('password_ldap_port'),
-        'starttls'  => $rcmail->config->get('password_ldap_starttls'),
-        'version'   => $rcmail->config->get('password_ldap_version'),
-    );
-    
-    // Connecting using the configuration array
-    $ldap = Net_LDAP2::connect($ldapConfig);
-    
-    // Checking for connection error
-    if (PEAR::isError($ldap)) {return PASSWORD_CONNECT_ERROR;}
-    
-    // Crypting new password
-    $newCryptedPassword = hashPassword($passwd, $rcmail->config->get('password_ldap_encodage'));
-    if (!$newCryptedPassword) {return PASSWORD_CRYPT_ERROR;}
-    
-    // Writing new crypted password to LDAP
-    $userEntry = $ldap->getEntry($userDN);
-    if (Net_LDAP2::isError($userEntry)) {return PASSWORD_CONNECT_ERROR;}
-    if (!$userEntry->replace(array($rcmail->config->get('password_ldap_pwattr') => $newCryptedPassword),$rcmail->config->get('password_ldap_force_replace'))) {return PASSWORD_CONNECT_ERROR;}
-    if (Net_LDAP2::isError($userEntry->update())) {return PASSWORD_CONNECT_ERROR;}
-    
-    // All done, no error
-    return PASSWORD_SUCCESS;    
-}
-
-
-/**
- * Code originaly from the phpLDAPadmin development team
- * http://phpldapadmin.sourceforge.net/
- *
- * Hashes a password and returns the hash based on the specified enc_type.
- *
- * @param string $passwordClear The password to hash in clear text.
- * @param string $encodageType Standard LDAP encryption type which must be one of
- *        crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
- * @return string The hashed password.
- *
- */
-
-function hashPassword( $passwordClear, $encodageType ) 
-{
-    $encodageType = strtolower( $encodageType );
-    switch( $encodageType ) {
-        case 'crypt': 
-            $cryptedPassword = '{CRYPT}' . crypt($passwordClear,randomSalt(2)); 
-            break;
-            
-        case 'ext_des':
-            // extended des crypt. see OpenBSD crypt man page.
-            if ( ! defined( 'CRYPT_EXT_DES' ) || CRYPT_EXT_DES == 0 ) {return FALSE;} //Your system crypt library does not support extended DES encryption.
-            $cryptedPassword = '{CRYPT}' . crypt( $passwordClear, '_' . randomSalt(8) );
-            break;
-
-        case 'md5crypt':
-            if( ! defined( 'CRYPT_MD5' ) || CRYPT_MD5 == 0 ) {return FALSE;} //Your system crypt library does not support md5crypt encryption.
-            $cryptedPassword = '{CRYPT}' . crypt( $passwordClear , '$1$' . randomSalt(9) );
-            break;
-
-        case 'blowfish':
-            if( ! defined( 'CRYPT_BLOWFISH' ) || CRYPT_BLOWFISH == 0 ) {return FALSE;} //Your system crypt library does not support blowfish encryption.
-            $cryptedPassword = '{CRYPT}' . crypt( $passwordClear , '$2a$12$' . randomSalt(13) ); // hardcoded to second blowfish version and set number of rounds
-            break;
-
-        case 'md5':
-            $cryptedPassword = '{MD5}' . base64_encode( pack( 'H*' , md5( $passwordClear) ) );
-            break;
-
-        case 'sha':
-            if( function_exists('sha1') ) {
-                // use php 4.3.0+ sha1 function, if it is available.
-                $cryptedPassword = '{SHA}' . base64_encode( pack( 'H*' , sha1( $passwordClear) ) );
-            } elseif( function_exists( 'mhash' ) ) {
-                $cryptedPassword = '{SHA}' . base64_encode( mhash( MHASH_SHA1, $passwordClear) );
-            } else {
-                return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes.
-            }
-            break;
-
-        case 'ssha':
-            if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) ) {
-                mt_srand( (double) microtime() * 1000000 );
-                $salt = mhash_keygen_s2k( MHASH_SHA1, $passwordClear, substr( pack( "h*", md5( mt_rand() ) ), 0, 8 ), 4 );
-                $cryptedPassword = "{SSHA}".base64_encode( mhash( MHASH_SHA1, $passwordClear.$salt ).$salt );
-            } else {
-                return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes.
-            }
-            break;
-
-        case 'smd5':
-            if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) ) {
-                mt_srand( (double) microtime() * 1000000 );
-                $salt = mhash_keygen_s2k( MHASH_MD5, $passwordClear, substr( pack( "h*", md5( mt_rand() ) ), 0, 8 ), 4 );
-                $cryptedPassword = "{SMD5}".base64_encode( mhash( MHASH_MD5, $passwordClear.$salt ).$salt );
-            } else {
-                return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes.
-            }
-            break;
-
-        case 'clear':
-        default:
-            $cryptedPassword = $passwordClear;
-    }
-
-    return $cryptedPassword;
-}
-
-
-
-/**
- * Code originaly from the phpLDAPadmin development team
- * http://phpldapadmin.sourceforge.net/
- *
- * Used to generate a random salt for crypt-style passwords. Salt strings are used
- * to make pre-built hash cracking dictionaries difficult to use as the hash algorithm uses
- * not only the user's password but also a randomly generated string. The string is
- * stored as the first N characters of the hash for reference of hashing algorithms later.
- *
- * --- added 20021125 by bayu irawan <bayuir@divnet.telkom.co.id> ---
- * --- ammended 20030625 by S C Rigler <srigler@houston.rr.com> ---
- *
- * @param int $length The length of the salt string to generate.
- * @return string The generated salt string.
- */
- 
-function randomSalt( $length ) 
-{
-    $possible = '0123456789'.
-        'abcdefghijklmnopqrstuvwxyz'.
-        'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
-        './';
-    $str = "";
-    mt_srand((double)microtime() * 1000000);
-
-    while( strlen( $str ) < $length )
-        $str .= substr( $possible, ( rand() % strlen( $possible ) ), 1 );
-
-    return $str;
-}
-
-?>
diff --git a/plugins/password/drivers/poppassd.php b/plugins/password/drivers/poppassd.php
deleted file mode 100644
index 8a54fb7d9..000000000
--- a/plugins/password/drivers/poppassd.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Poppassd Password Driver
- *
- * Driver to change passwords via Poppassd/Courierpassd
- *
- * @version 1.0
- * @author Philip Weir
- *
- */
-
-function password_save($curpass, $passwd)
-{
-    $rcmail = rcmail::get_instance();
-//    include('Net/Socket.php');
-    $poppassd = new Net_Socket();
-
-    if (PEAR::isError($poppassd->connect($rcmail->config->get('password_pop_host'), $rcmail->config->get('password_pop_port'), null))) {
-        return PASSWORD_CONNECT_ERROR;
-    }
-    else {
-        $result = $poppassd->readLine();
-        if(!preg_match('/^2\d\d/', $result)) {
-            $poppassd->disconnect();
-            return PASSWORD_ERROR;
-        }
-        else {
-            $poppassd->writeLine("user ". $_SESSION['username']);
-            $result = $poppassd->readLine();
-            if(!preg_match('/^[23]\d\d/', $result) ) {
-                $poppassd->disconnect();
-                return PASSWORD_CONNECT_ERROR;
-            }
-            else {
-                $poppassd->writeLine("pass ". $curpass);
-                $result = $poppassd->readLine();
-                if(!preg_match('/^[23]\d\d/', $result) ) {
-                    $poppassd->disconnect();
-                    return PASSWORD_ERROR;
-                }
-                else {
-                    $poppassd->writeLine("newpass ". $passwd);
-                    $result = $poppassd->readLine();
-                    $poppassd->disconnect();
-                    if (!preg_match('/^2\d\d/', $result))
-                        return PASSWORD_ERROR;
-                    else
-                        return PASSWORD_SUCCESS;
-                }
-            }
-        }
-    }
-}
-
-?>
diff --git a/plugins/password/drivers/sasl.php b/plugins/password/drivers/sasl.php
deleted file mode 100644
index b1e9ba487..000000000
--- a/plugins/password/drivers/sasl.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * SASL Password Driver
- *
- * Driver that adds functionality to change the users Cyrus/SASL password.
- * The code is derrived from the Squirrelmail "Change SASL Password" Plugin
- * by Galen Johnson.
- *
- * It only works with saslpasswd2 on the same host where RoundCube runs
- * and requires shell access and gcc in order to compile the binary.
- *
- * For installation instructions please read the README file.
- *
- * @version 1.0
- * @author Thomas Bruederli
- */
- 
-function password_save($currpass, $newpass)
-{
-    $curdir = realpath(dirname(__FILE__));
-    $username = escapeshellcmd($_SESSION['username']);
-    $args = rcmail::get_instance()->config->get('password_saslpasswd_args', '');
-
-    if ($fh = popen("$curdir/chgsaslpasswd -p $args $username", 'w')) {
-        fwrite($fh, $newpass."\n");
-        $code = pclose($fh);
-
-        if ($code == 0)
-            return PASSWORD_SUCCESS;
-    }
-    else {
-        raise_error(array(
-            'code' => 600,
-            'type' => 'php',
-            'file' => __FILE__,
-            'message' => "Password plugin: Unable to execute $curdir/chgsaslpasswd"
-            ), true, false);
-    }
-
-    return PASSWORD_ERROR;
-}
-
-?>
diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
deleted file mode 100644
index 1e737f233..000000000
--- a/plugins/password/drivers/sql.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-/**
- * SQL Password Driver
- *
- * Driver for passwords stored in SQL database
- *
- * @version 1.3
- * @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
- *
- */
-
-function password_save($curpass, $passwd)
-{
-    $rcmail = rcmail::get_instance();
-
-    if (!($sql = $rcmail->config->get('password_query')))
-        $sql = 'SELECT update_passwd(%c, %u)';
-
-    if ($dsn = $rcmail->config->get('password_db_dsn')) {
-	// #1486067: enable new_link option
-	if (is_array($dsn) && empty($dsn['new_link']))
-	    $dsn['new_link'] = true;
-	else if (!is_array($dsn) && !preg_match('/\?new_link=true/', $dsn))
-	  $dsn .= '?new_link=true';
-
-        $db = new rcube_mdb2($dsn, '', FALSE);
-        $db->set_debug((bool)$rcmail->config->get('sql_debug'));
-        $db->db_connect('w');
-    } else {
-        $db = $rcmail->get_dbh();
-    }
-
-    if ($err = $db->is_error())
-        return PASSWORD_ERROR;
-    
-    // crypted password
-    if (strpos($sql, '%c') !== FALSE) {
-        $salt = '';
-        if (CRYPT_MD5) { 
-    	    $len = rand(3, CRYPT_SALT_LENGTH);
-        } else if (CRYPT_STD_DES) {
-    	    $len = 2;
-        } else {
-    	    return PASSWORD_CRYPT_ERROR;
-        }
-        for ($i = 0; $i < $len ; $i++) {
-    	    $salt .= chr(rand(ord('.'), ord('z')));
-        }
-        $sql = str_replace('%c',  $db->quote(crypt($passwd, CRYPT_MD5 ? '$1$'.$salt.'$' : $salt)), $sql);
-    }
-    
-    // hashed passwords
-    if (preg_match('/%[n|q]/', $sql)) {
-
-	if (!extension_loaded('hash')) {
-	    raise_error(array(
-	        'code' => 600,
-		'type' => 'php',
-		'file' => __FILE__,
-		'message' => "Password plugin: 'hash' extension not loaded!"
-		), true, false);
-	    return PASSWORD_ERROR;			    
-	}
-
-	if (!($hash_algo = strtolower($rcmail->config->get('password_hash_algorithm'))))
-            $hash_algo = 'sha1';
-        
-	$hash_passwd = hash($hash_algo, $passwd);
-        $hash_curpass = hash($hash_algo, $curpass);
-        
-	if ($rcmail->config->get('password_hash_base64')) {
-            $hash_passwd = base64_encode(pack('H*', $hash_passwd));
-            $hash_curpass = base64_encode(pack('H*', $hash_curpass));
-        }
-	
-	$sql = str_replace('%n', $db->quote($hash_passwd, 'text'), $sql);
-	$sql = str_replace('%q', $db->quote($hash_curpass, 'text'), $sql);
-    }
-
-    $user_info = explode('@', $_SESSION['username']);
-    if (count($user_info) >= 2) {
-	$sql = str_replace('%l', $db->quote($user_info[0], 'text'), $sql);
-	$sql = str_replace('%d', $db->quote($user_info[1], 'text'), $sql);
-    }
-    
-    $sql = str_replace('%u', $db->quote($_SESSION['username'],'text'), $sql);
-    $sql = str_replace('%h', $db->quote($_SESSION['imap_host'],'text'), $sql);
-    $sql = str_replace('%p', $db->quote($passwd,'text'), $sql);
-    $sql = str_replace('%o', $db->quote($curpass,'text'), $sql);
-
-    $res = $db->query($sql);
-
-    if (!$db->is_error()) {
-	if (strtolower(substr(trim($query),0,6))=='select') {
-    	    if ($result = $db->fetch_array($res))
-		return PASSWORD_SUCCESS;
-	} else { 
-    	    if ($db->affected_rows($res) == 1)
-		return PASSWORD_SUCCESS; // This is the good case: 1 row updated
-	}
-    }
-
-    return PASSWORD_ERROR;
-}
-
-?>
diff --git a/plugins/password/drivers/vpopmaild.php b/plugins/password/drivers/vpopmaild.php
deleted file mode 100644
index b6fb39343..000000000
--- a/plugins/password/drivers/vpopmaild.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * vpopmail Password Driver
- *
- * Driver to change passwords via vpopmaild
- *
- * @version 1.1
- * @author Johannes Hessellund
- *
- */
-
-function password_save($curpass, $passwd)
-{
-    $rcmail = rcmail::get_instance();
-//    include('Net/Socket.php');
-    $vpopmaild = new Net_Socket();
-
-    if (PEAR::isError($vpopmaild->connect($rcmail->config->get('password_vpopmaild_host'),
-	    $rcmail->config->get('password_vpopmaild_port'), null))) {
-        return PASSWORD_CONNECT_ERROR;
-    }
-
-    $result = $vpopmaild->readLine();
-    if(!preg_match('/^\+OK/', $result)) {
-        $vpopmaild->disconnect();
-        return PASSWORD_CONNECT_ERROR;
-    }
-
-    $vpopmaild->writeLine("slogin ". $_SESSION['username'] . " " . $curpass);
-    $result = $vpopmaild->readLine();
-    if(!preg_match('/^\+OK/', $result) ) {
-        $vpopmaild->writeLine("quit");
-        $vpopmaild->disconnect();
-        return PASSWORD_ERROR;
-    }
-
-    $vpopmaild->writeLine("mod_user ". $_SESSION['username']);
-    $vpopmaild->writeLine("clear_text_password ". $passwd);
-    $vpopmaild->writeLine(".");
-    $result = $vpopmaild->readLine();
-    $vpopmaild->writeLine("quit");
-    $vpopmaild->disconnect();
-
-    if (!preg_match('/^\+OK/', $result))
-        return PASSWORD_ERROR;
-
-    return PASSWORD_SUCCESS;
-}
-
-?>
diff --git a/plugins/password/drivers/ximss.php b/plugins/password/drivers/ximss.php
deleted file mode 100644
index 94aba1874..000000000
--- a/plugins/password/drivers/ximss.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Communigate driver for the Password Plugin for Roundcube 
- *
- * Tested with Communigate Pro 5.1.2
- *
- * Configuration options:
- *   password_ximss_host - Host name of Communigate server
- *   password_ximss_port - XIMSS port on Communigate server
- *
- *
- * References:
- *   http://www.communigate.com/WebGuide/XMLAPI.html
- *
- * @version 1
- * @author Erik Meitner <erik wanderings.us>
- */
- 
-function password_save($pass, $newpass)
-{
-
-  $rcmail = rcmail::get_instance();
-  
-  $sock = stream_socket_client("tcp://".$rcmail->config->get('password_ximss_host').":".$rcmail->config->get('password_ximss_port'), $errno, $errstr, 30) ;
-  if( $sock === FALSE )
-  {
-    return PASSWORD_CONNECT_ERROR;
-  }
-  
-  // send all requests at once(pipelined)
-  fwrite( $sock, '<login id="A001" authData="'.$_SESSION['username'].'" password="'.$pass.'" />'."\0");
-  fwrite( $sock, '<passwordModify id="A002" oldPassword="'.$pass.'" newPassword="'.$newpass.'"  />'."\0");
-  fwrite( $sock, '<bye id="A003" />'."\0");
-
-  //example responses
-  //  <session id="A001" urlID="4815-vN2Txjkggy7gjHRD10jw" userName="user@example.com"/>\0
-  //  <response id="A001"/>\0
-  //  <response id="A002"/>\0
-  //  <response id="A003"/>\0
-  // or an error:
-  //  <response id="A001" errorText="incorrect password or account name" errorNum="515"/>\0
-
-  $responseblob = '';
-  while (!feof($sock)) {
-    $responseblob .= fgets($sock, 1024);
-  }
-
-  fclose($sock);
-  
-  foreach( explode( "\0",$responseblob) as $response )
-  {
-    $resp = simplexml_load_string("<xml>".$response."</xml>");
-
-    if( $resp->response[0]['id'] == 'A001' )
-    {
-      if( isset( $resp->response[0]['errorNum'] ) )
-      {
-        return PASSWORD_CONNECT_ERROR;
-      }  
-    }
-    else if( $resp->response[0]['id'] == 'A002' )
-    {
-      if( isset( $resp->response[0]['errorNum'] ))
-      {
-        return PASSWORD_ERROR;
-      }  
-    }
-    else if( $resp->response[0]['id'] == 'A003' )
-    {
-      if( isset($resp->response[0]['errorNum'] ))
-      {
-        //There was a problem during logout(This is probably harmless)
-      }  
-    }
-  } //foreach
-
-  return PASSWORD_SUCCESS;
-  
-}
-  
-?>
\ No newline at end of file
diff --git a/plugins/password/localization/bg_BG.inc b/plugins/password/localization/bg_BG.inc
deleted file mode 100644
index b4576a0dc..000000000
--- a/plugins/password/localization/bg_BG.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Смяна на парола';
-$labels['curpasswd']  = 'Текуща парола:';
-$labels['newpasswd']  = 'Нова парола:';
-$labels['confpasswd']  = 'Повторете:';
-
-$messages = array();
-$messages['nopassword'] = 'Моля въведете нова парола.';
-$messages['nocurpassword'] = 'Моля въведете текущата .';
-$messages['passwordincorrect'] = 'Невалидна текуща парола.';
-$messages['passwordinconsistency'] = 'Паролите не съвпадат, опитайте пак.';
-$messages['crypterror'] = 'Паролата не може да бъде сменена. Грешка в криптирането.';
-$messages['connecterror'] = 'Паролата не може да бъде сменена. Грешка в свързването.';
-$messages['internalerror'] = 'Паролата не може да бъде сменена.';
-
-?>
diff --git a/plugins/password/localization/ca_ES.inc b/plugins/password/localization/ca_ES.inc
deleted file mode 100644
index 18c10c80e..000000000
--- a/plugins/password/localization/ca_ES.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Canviar contrasenya';
-$labels['curpasswd']  = 'Contrasenya actual:';
-$labels['newpasswd']  = 'Nova contrasenya:';
-$labels['confpasswd']  = 'Confirmar nova contrasenya:';
-
-$messages = array();
-$messages['nopassword'] = 'Si us plau, introdueix la nova contrasenya.';
-$messages['nocurpassword'] = 'Si us plau, introdueix la contrasenya actual.';
-$messages['passwordincorrect'] = 'Contrasenya actual incorrecte.';
-$messages['passwordinconsistency'] = 'La contrasenya nova no coincideix!.';
-$messages['crypterror'] = 'No es pot desar la nova contrasenya. No existeix la funció d\'encriptació.';
-$messages['connecterror'] = 'No es pot desar la nova contrasenya. Error de connexió.';
-$messages['internalerror'] = 'No es pot desar la nova contrasenya.';
-$messages['passwordshort'] = 'La nova contrasenya ha de tenir com a mínim $length caràcters de llarg.';
-$messages['passwordweak'] = 'La nova contrasenya ha d\'incloure com a mínim un nombre i un caràcter de puntuació.';
-
-?>
diff --git a/plugins/password/localization/cs_CZ.inc b/plugins/password/localization/cs_CZ.inc
deleted file mode 100644
index 18270db96..000000000
--- a/plugins/password/localization/cs_CZ.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Czech translation for Roundcube password plugin
- *
- * @version 1.0 (2009-08-29)
- * @author Milan Kozak <hodza@hodza.net>
- *
- */
-
-$labels = array();
-$labels['changepasswd']  = 'Změna hesla';
-$labels['curpasswd']  = 'Aktuální heslo:';
-$labels['newpasswd']  = 'Nové heslo:';
-$labels['confpasswd']  = 'Nové heslo (pro kontrolu):';
-
-$messages = array();
-$messages['nopassword'] = 'Prosím zadejte nové heslo.';
-$messages['nocurpassword'] = 'Prosím zadejte aktuální heslo.';
-$messages['passwordincorrect'] = 'Zadané aktuální heslo není správné.';
-$messages['passwordinconsistency'] = 'Zadaná hesla se neshodují. Prosím zkuste to znovu.';
-$messages['crypterror'] = 'Heslo se nepodařilo uložit. Chybí šifrovací funkce.';
-$messages['connecterror'] = 'Heslo se nepodařilo uložit. Problém s připojením.';
-$messages['internalerror'] = 'Heslo se nepodařilo uložit.';
-
-?>
diff --git a/plugins/password/localization/da_DK.inc b/plugins/password/localization/da_DK.inc
deleted file mode 100644
index 5d1d0c9cc..000000000
--- a/plugins/password/localization/da_DK.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Skift adgangskode';
-$labels['curpasswd']  = 'Nuværende adgangskode:';
-$labels['newpasswd']  = 'Ny adgangskode:';
-$labels['confpasswd']  = 'Bekræft ny adgangskode:';
-
-$messages = array();
-$messages['nopassword'] = 'Indtast venligst en ny adgangskode.';
-$messages['nocurpassword'] = 'Indtast venligst nyværende adgangskode.';
-$messages['passwordincorrect'] = 'Nyværende adgangskode er forkert.';
-$messages['passwordinconsistency'] = 'Adgangskoderne er ikke ens, prøv igen.';
-$messages['crypterror'] = 'Kunne ikke gemme den nye adgangskode. Krypteringsfunktion mangler.';
-$messages['connecterror'] = 'Kunne ikke gemme den nye adgangskode. Fejl ved forbindelsen.';
-$messages['internalerror'] = 'Kunne ikke gemme den nye adgangskode.';
-
-?>
diff --git a/plugins/password/localization/de_CH.inc b/plugins/password/localization/de_CH.inc
deleted file mode 100644
index a28990d67..000000000
--- a/plugins/password/localization/de_CH.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Passwort ändern';
-$labels['curpasswd']  = 'Aktuelles Passwort';
-$labels['newpasswd']  = 'Neues Passwort';
-$labels['confpasswd']  = 'Passwort Wiederholung';
-
-$messages = array();
-$messages['nopassword'] = "Bitte geben Sie ein neues Passwort ein";
-$messages['nocurpassword'] = "Bitte geben Sie Ihr aktuelles Passwort an";
-$messages['passwordincorrect'] = "Das aktuelle Passwort ist nicht korrekt";
-$messages['passwordinconsistency'] = "Das neue Passwort und dessen Wiederholung stimmen nicht überein";
-$messages['crypterror'] = "Neues Passwort nicht gespeichert: Verschlüsselungsfunktion fehlt";
-$messages['connecterror'] = "Neues Passwort nicht gespeichert: Verbindungsfehler";
-$messages['internalerror'] = "Neues Passwort nicht gespeichert";
-
-
-?>
\ No newline at end of file
diff --git a/plugins/password/localization/de_DE.inc b/plugins/password/localization/de_DE.inc
deleted file mode 100644
index a28990d67..000000000
--- a/plugins/password/localization/de_DE.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Passwort ändern';
-$labels['curpasswd']  = 'Aktuelles Passwort';
-$labels['newpasswd']  = 'Neues Passwort';
-$labels['confpasswd']  = 'Passwort Wiederholung';
-
-$messages = array();
-$messages['nopassword'] = "Bitte geben Sie ein neues Passwort ein";
-$messages['nocurpassword'] = "Bitte geben Sie Ihr aktuelles Passwort an";
-$messages['passwordincorrect'] = "Das aktuelle Passwort ist nicht korrekt";
-$messages['passwordinconsistency'] = "Das neue Passwort und dessen Wiederholung stimmen nicht überein";
-$messages['crypterror'] = "Neues Passwort nicht gespeichert: Verschlüsselungsfunktion fehlt";
-$messages['connecterror'] = "Neues Passwort nicht gespeichert: Verbindungsfehler";
-$messages['internalerror'] = "Neues Passwort nicht gespeichert";
-
-
-?>
\ No newline at end of file
diff --git a/plugins/password/localization/en_US.inc b/plugins/password/localization/en_US.inc
deleted file mode 100644
index 1ae2158b0..000000000
--- a/plugins/password/localization/en_US.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Change Password';
-$labels['curpasswd']  = 'Current Password:';
-$labels['newpasswd']  = 'New Password:';
-$labels['confpasswd']  = 'Confirm New Password:';
-
-$messages = array();
-$messages['nopassword'] = 'Please input new password.';
-$messages['nocurpassword'] = 'Please input current password.';
-$messages['passwordincorrect'] = 'Current password incorrect.';
-$messages['passwordinconsistency'] = 'Passwords do not match, please try again.';
-$messages['crypterror'] = 'Could not save new password. Encryption function missing.';
-$messages['connecterror'] = 'Could not save new password. Connection error.';
-$messages['internalerror'] = 'Could not save new password.';
-$messages['passwordshort'] = 'Password must be at least $length characters long.';
-$messages['passwordweak'] = 'Password must include at least one number and one punctuation character.';
-$messages['passwordforbidden'] = 'Password contains forbidden characters.';
-
-?>
diff --git a/plugins/password/localization/es_ES.inc b/plugins/password/localization/es_ES.inc
deleted file mode 100644
index b7e293efb..000000000
--- a/plugins/password/localization/es_ES.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Cambiar Contraseña';
-$labels['curpasswd']  = 'Contraseña Actual:';
-$labels['newpasswd']  = 'Contraseña Nueva:';
-$labels['confpasswd']  = 'Confirmar Contraseña:';
-
-$messages = array();
-$messages['nopassword'] = 'Por favor introduce una nueva contraseña.';
-$messages['nocurpassword'] = 'Por favor introduce la contraseña actual.';
-$messages['passwordincorrect'] = 'Contraseña actual incorrecta.';
-$messages['passwordinconsistency'] = 'Las contraseñas no coinciden, por favor inténtalo de nuevo.';
-$messages['crypterror'] = 'No se pudo guardar la contraseña nueva. Falta la función de cifrado.';
-$messages['connecterror'] = 'No se pudo guardar la contraseña nueva. Error de conexión';
-$messages['internalerror'] = 'No se pudo guardar la contraseña nueva.';
-$messages['passwordshort'] = 'Tu contraseña debe tener una longitud mínima de $length.';
-$messages['passwordweak'] = 'Tu nueva contraseña debe incluir al menos un número y un signo de puntuación.';
-
-?>
diff --git a/plugins/password/localization/et_EE.inc b/plugins/password/localization/et_EE.inc
deleted file mode 100644
index 0f351d77b..000000000
--- a/plugins/password/localization/et_EE.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Muuda parooli';
-$labels['curpasswd']  = 'Vana parool:';
-$labels['newpasswd']  = 'Uus parool:';
-$labels['confpasswd']  = 'Uus parool uuesti:';
-
-$messages = array();
-$messages['nopassword'] = 'Palun sisesta uus parool.';
-$messages['nocurpassword'] = 'Palun sisesta vana parool.';
-$messages['passwordincorrect'] = 'Vana parool on vale.';
-$messages['passwordinconsistency'] = 'Paroolid ei kattu, palun proovi uuesti.';
-$messages['crypterror'] = 'Serveris ei ole parooli krüpteerimiseks vajalikku funktsiooni.';
-$messages['internalerror'] = 'Uue parooli andmebaasi salvestamine nurjus.';
-
-?>
diff --git a/plugins/password/localization/fr_FR.inc b/plugins/password/localization/fr_FR.inc
deleted file mode 100644
index 8ba37b148..000000000
--- a/plugins/password/localization/fr_FR.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Changer le mot de passe';
-$labels['curpasswd']  = 'Mot de passe actuel:';
-$labels['newpasswd']  = 'Nouveau mot de passe:';
-$labels['confpasswd']  = 'Confirmez le nouveau mot de passe:';
-
-$messages = array();
-$messages['nopassword'] = 'Veuillez saisir le nouveau mot de passe.';
-$messages['nocurpassword'] = 'Veuillez saisir le mot de passe actuel.';
-$messages['passwordincorrect'] = 'Mot de passe actuel incorrect.';
-$messages['passwordinconsistency'] = 'Les nouveaux mots de passe ne correspondent pas, veuillez réessayer.';
-$messages['crypterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Fonction de cryptage manquante.';
-$messages['connecterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Erreur de connexion au serveur.';
-$messages['internalerror'] = 'Impossible d\'enregistrer le nouveau mot de passe.';
-
-?>
diff --git a/plugins/password/localization/hu_HU.inc b/plugins/password/localization/hu_HU.inc
deleted file mode 100644
index c8c3015a1..000000000
--- a/plugins/password/localization/hu_HU.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Jelszóváltás';
-$labels['curpasswd']  = 'Jelenlegi jelszó:';
-$labels['newpasswd']  = 'Új jelszó:';
-$labels['confpasswd']  = 'Új jelszó mégegyszer:';
-
-$messages = array();
-$messages['nopassword'] = 'Kérjük adja meg az új jelszót.';
-$messages['nocurpassword'] = 'Kérjük adja meg a jelenlegi jelszót.';
-$messages['passwordincorrect'] = 'Érvénytelen a jelenlegi jelszó.';
-$messages['passwordinconsistency'] = 'A két új jelszó nem egyezik.';
-$messages['crypterror'] = 'Hiba történt a kérés feldolgozása során.';
-$messages['internalerror'] = 'Hiba történt a kérés feldolgozása során.';
-
-?>
diff --git a/plugins/password/localization/it_IT.inc b/plugins/password/localization/it_IT.inc
deleted file mode 100644
index b33d8d54f..000000000
--- a/plugins/password/localization/it_IT.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Cambia la Password';
-$labels['curpasswd']  = 'Password corrente:';
-$labels['newpasswd']  = 'Nuova Password:';
-$labels['confpasswd']  = 'Conferma la Nuova Password:';
-
-$messages = array();
-$messages['nopassword'] = 'Per favore inserisci la nuova password.';
-$messages['nocurpassword'] = 'Per favore inserisci la password corrente.';
-$messages['passwordincorrect'] = 'Password corrente sbagliata.';
-$messages['passwordinconsistency'] = 'Le password non coincidono, inserirle di nuovo.';
-$messages['crypterror'] = 'Non posso salvare la password, funzione di cifratura assente.';
-$messages['connecterror'] = 'Non posso salvare la password, errore di connessione.';
-$messages['internalerror'] = 'Non posso salvare la password.';
-
-?>
diff --git a/plugins/password/localization/lv_LV.inc b/plugins/password/localization/lv_LV.inc
deleted file mode 100644
index 8f5f4c2c2..000000000
--- a/plugins/password/localization/lv_LV.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Nomainīt paroli';
-$labels['curpasswd']  = 'Pašreizējā parole:';
-$labels['newpasswd']  = 'Jaunā parole:';
-$labels['confpasswd']  = 'Vēlreiz jauno paroli:';
-
-$messages = array();
-$messages['nopassword'] = 'Lūdzu, ievadiet jauno paroli.';
-$messages['nocurpassword'] = 'Lūdzu, ievadiet pašreizējo paroli.';
-$messages['passwordincorrect'] = 'Pašreizējā parole nepareiza.';
-$messages['passwordinconsistency'] = 'Paroles nesakrīt. Lūdzu, ievadiet vēlreiz.';
-$messages['crypterror'] = 'Nevarēja saglabāt jauno paroli. Trūkst kriptēšanas funkcija.';
-$messages['connecterror'] = 'Nevarēja saglabāt jauno paroli. Savienojuma kļūda.';
-$messages['internalerror'] = 'Nevarēja saglabāt jauno paroli.';
-$messages['passwordshort'] = 'Jaunajai parolei jābūt vismaz $length simbola garai.';
-$messages['passwordweak'] = 'Jaunajai parolei jāsatur vismaz viens cipars un punktuācijas simbols.';
-
-?>
diff --git a/plugins/password/localization/nl_NL.inc b/plugins/password/localization/nl_NL.inc
deleted file mode 100644
index 6d7c401ac..000000000
--- a/plugins/password/localization/nl_NL.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Wijzig Wachtwoord';
-$labels['curpasswd']  = 'Huidig Wachtwoord:';
-$labels['newpasswd']  = 'Nieuw Wachtwoord:';
-$labels['confpasswd']  = 'Bevestig Nieuw Wachtwoord:';
-
-$messages = array();
-$messages['nopassword'] = 'Vul een wachtwoord in.';
-$messages['nocurpassword'] = 'vul het huidige wachtwoord in.';
-$messages['passwordincorrect'] = 'Huidig wachtwoord is onjuist.';
-$messages['passwordinconsistency'] = 'Wachtwoorden komen niet overeen, probeer het opnieuw.';
-$messages['crypterror'] = 'De server mist een functie om uw wachtwoord et beveiligen.';
-$messages['internalerror'] = 'Uw wachtwoord kan niet worden opgeslagen.';
-
-?>
diff --git a/plugins/password/localization/pl_PL.inc b/plugins/password/localization/pl_PL.inc
deleted file mode 100644
index 687ca9383..000000000
--- a/plugins/password/localization/pl_PL.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Zmiana hasła';
-$labels['curpasswd']  = 'Aktualne hasło:';
-$labels['newpasswd']  = 'Nowe hasło:';
-$labels['confpasswd']  = 'Potwierdź hasło:';
-
-$messages = array();
-$messages['nopassword'] = 'Wprowadź nowe hasło.';
-$messages['nocurpassword'] = 'Wprowadź aktualne hasło.';
-$messages['passwordincorrect'] = 'Błędne aktualne hasło, spróbuj ponownie.';
-$messages['passwordinconsistency'] = 'Hasła nie pasują, spróbuj ponownie.';
-$messages['crypterror'] = 'Nie udało się zapisać nowego hasła. Brak funkcji kodującej.';
-$messages['connecterror'] = 'Nie udało się zapisać nowego hasła. Błąd połączenia.';
-$messages['internalerror'] = 'Nie udało się zapisać nowego hasła.';
-$messages['passwordshort'] = 'Hasło musi posiadać co najmniej $length znaków.';
-$messages['passwordweak'] = 'Hasło musi zawierać co najmniej jedną cyfrę i znak interpunkcyjny.';
-$messages['passwordforbidden'] = 'Hasło zawiera niedozwolone znaki.';
-
-?>
diff --git a/plugins/password/localization/pt_BR.inc b/plugins/password/localization/pt_BR.inc
deleted file mode 100644
index c196d7541..000000000
--- a/plugins/password/localization/pt_BR.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Alterar senha';
-$labels['curpasswd']  = 'Senha atual:';
-$labels['newpasswd']  = 'Nova senha:';
-$labels['confpasswd']  = 'Confirmar nova senha:';
-
-$messages = array();
-$messages['nopassword'] = 'Por favor, informe a nova senha.';
-$messages['nocurpassword'] = 'Por favor, informe a senha atual.';
-$messages['passwordincorrect'] = 'Senha atual incorreta.';
-$messages['passwordinconsistency'] = 'Senhas não combinam, por favor tente novamente.';
-$messages['crypterror'] = 'Não foi possível gravar nova senha. Função de criptografia ausente.';
-$messages['connecterror'] = 'Não foi possível gravar nova senha. Erro de conexão.';
-$messages['internalerror'] = 'Não foi possível gravar nova senha.';
-
-?>
diff --git a/plugins/password/localization/pt_PT.inc b/plugins/password/localization/pt_PT.inc
deleted file mode 100644
index 5307ad69f..000000000
--- a/plugins/password/localization/pt_PT.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Alterar password';
-$labels['curpasswd']  = 'Password atual:';
-$labels['newpasswd']  = 'Nova password:';
-$labels['confpasswd']  = 'Confirmar password:';
-
-$messages = array();
-$messages['nopassword'] = 'Introduza a nova password.';
-$messages['nocurpassword'] = 'Introduza a password actual.';
-$messages['passwordincorrect'] = 'Password actual errada.';
-$messages['passwordinconsistency'] = 'Password\'s não combinam, tente novamente..';
-$messages['crypterror'] = 'Não foi possível gravar a nova password. Função de criptografica inexistente.';
-$messages['connecterror'] = 'Não foi possível gravar a nova password. Erro de ligação.';
-$messages['internalerror'] = 'Não foi possível gravar a nova password.';
-
-?>
diff --git a/plugins/password/localization/sl_SI.inc b/plugins/password/localization/sl_SI.inc
deleted file mode 100644
index df17583be..000000000
--- a/plugins/password/localization/sl_SI.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-	
-$labels = array();
-$labels['changepasswd']  = 'Spremeni geslo';
-$labels['curpasswd']  = 'Obstoječe geslo:';
-$labels['newpasswd']  = 'Novo geslo:';
-$labels['confpasswd']  = 'Potrdi novo geslo:';
-	
-$messages = array();
-$messages['nopassword'] = 'Vnesite novo geslo.';
-$messages['nocurpassword'] = 'Vnesite obstoječe geslo.';
-$messages['passwordincorrect'] = 'Obstoječe geslo ni veljavno.';
-$messages['passwordinconsistency'] = 'Gesli se ne ujemata, poskusite znova.';
-$messages['crypterror'] = 'Novega gesla ni bilo mogoče shraniti. Prišlo je do napake pri šifriranju.';
-$messages['connecterror'] = 'Novega gesla ni bilo mogoče shraniti. Prišlo je do napake v povezavi.';
-$messages['internalerror'] = 'Novega gesla ni bilo mogoče shraniti.';
-
-?>
diff --git a/plugins/password/localization/sv_SE.inc b/plugins/password/localization/sv_SE.inc
deleted file mode 100644
index 5d9398e5c..000000000
--- a/plugins/password/localization/sv_SE.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = 'Ändra lösenord';
-$labels['curpasswd']  = 'Nuvarande lösenord:';
-$labels['newpasswd']  = 'Nytt lösenord:';
-$labels['confpasswd']  = 'Bekräfta nytt lösenord:';
-
-$messages = array();
-$messages['nopassword'] = 'Vänligen ange nytt lösenord.';
-$messages['nocurpassword'] = 'Vänligen ange nuvarande lösenord.';
-$messages['passwordincorrect'] = 'Felaktigt nuvarande lösenord.';
-$messages['passwordinconsistency'] = 'Nya lösenordet och bekräftelsen överensstämmer inte, försök igen.';
-$messages['crypterror'] = 'Lösenordet kunde inte ändras. Krypteringsfunktionen saknas.';
-$messages['connecterror'] = 'Lösenordet kunde inte ändras. Anslutningen misslyckades.';
-$messages['internalerror'] = 'Lösenordet kunde inte ändras.';
-
-?>
\ No newline at end of file
diff --git a/plugins/password/localization/zh_TW.inc b/plugins/password/localization/zh_TW.inc
deleted file mode 100644
index 1198f29fc..000000000
--- a/plugins/password/localization/zh_TW.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-$labels = array();
-$labels['changepasswd']  = '更改密碼';
-$labels['curpasswd']  = '目前的密碼';
-$labels['newpasswd']  = '新密碼';
-$labels['confpasswd']  = '確認新密碼';
-
-$messages = array();
-$messages['nopassword'] = '請輸入新密碼';
-$messages['nocurpassword'] = '請輸入目前的密碼';
-$messages['passwordincorrect'] = '目前的密碼錯誤';
-$messages['passwordinconsistency'] = '密碼不相符，請重新輸入';
-$messages['crypterror'] = '無法更新密碼：無加密機制';
-$messages['connecterror'] = '無法更新密碼：連線失敗';
-$messages['internalerror'] = '無法更新密碼';
-$messages['passwordshort'] = '您的密碼至少需 $length 個字元長';
-$messages['passwordweak'] = '您的新密碼至少需含有一個數字與一個標點符號';
-
-?>
diff --git a/plugins/password/password.js b/plugins/password/password.js
deleted file mode 100644
index 8a079de2d..000000000
--- a/plugins/password/password.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Password change interface (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', 'settingstabpluginpassword').addClass('tablink');
-    
-    var button = $('<a>').attr('href', rcmail.env.comm_path+'&_action=plugin.password').html(rcmail.gettext('password')).appendTo(tab);
-    button.bind('click', function(e){ return rcmail.command('plugin.password', this) });
-
-    // add button and register commands
-    rcmail.add_element(tab, 'tabs');
-    rcmail.register_command('plugin.password', function() { rcmail.goto_url('plugin.password') }, true);
-    rcmail.register_command('plugin.password-save', function() { 
-      var input_curpasswd = rcube_find_object('_curpasswd');
-      var input_newpasswd = rcube_find_object('_newpasswd');
-          var input_confpasswd = rcube_find_object('_confpasswd');
-    
-      if (input_curpasswd && input_curpasswd.value=='') {
-          alert(rcmail.gettext('nocurpassword', 'password'));
-          input_curpasswd.focus();
-      } else if (input_newpasswd && input_newpasswd.value=='') {
-          alert(rcmail.gettext('nopassword', 'password'));
-          input_newpasswd.focus();
-      } else if (input_confpasswd && input_confpasswd.value=='') {
-          alert(rcmail.gettext('nopassword', 'password'));
-          input_confpasswd.focus();
-      } else if (input_newpasswd && input_confpasswd && input_newpasswd.value != input_confpasswd.value) {
-          alert(rcmail.gettext('passwordinconsistency', 'password'));
-          input_newpasswd.focus();
-      } else {
-          rcmail.gui_objects.passform.submit();
-      }
-    }, true);
-  })
-}
diff --git a/plugins/password/password.php b/plugins/password/password.php
deleted file mode 100644
index 3121eb6fe..000000000
--- a/plugins/password/password.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-
-/*
- +-------------------------------------------------------------------------+
- | Password Plugin for Roundcube                                           |
- | Version 1.3.2                                                           |
- |                                                                         |
- | Copyright (C) 2009, RoundCube Dev.                                      |
- |                                                                         |
- | This program is free software; you can redistribute it and/or modify    |
- | it under the terms of the GNU General Public License version 2          |
- | as published by the Free Software Foundation.                           |
- |                                                                         |
- | This program is distributed in the hope that it will be useful,         |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of          |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           |
- | GNU General Public License for more details.                            |
- |                                                                         |
- | You should have received a copy of the GNU General Public License along |
- | with this program; if not, write to the Free Software Foundation, Inc., |
- | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.             |
- |                                                                         |
- +-------------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                              |
- +-------------------------------------------------------------------------+
-
- $Id: index.php 2645 2009-06-15 07:01:36Z alec $
-
-*/
-
-define('PASSWORD_CRYPT_ERROR', 1);
-define('PASSWORD_ERROR', 2);
-define('PASSWORD_CONNECT_ERROR', 3);
-define('PASSWORD_SUCCESS', 0);
-
-/**
- * Change password plugin
- *
- * Plugin that adds functionality to change a users password.
- * It provides common functionality and user interface and supports
- * several backends to finally update the password.
- *
- * For installation and configuration instructions please read the README file.
- *
- * @author Aleksander Machniak
- */
-class password extends rcube_plugin
-{
-  public $task = 'settings';
-
-  function init()
-  {
-    $rcmail = rcmail::get_instance();
-    // add Tab label
-    $rcmail->output->add_label('password');
-    $this->register_action('plugin.password', array($this, 'password_init'));
-    $this->register_action('plugin.password-save', array($this, 'password_save'));
-    $this->include_script('password.js');
-  }
-
-  function password_init()
-  {
-    $this->add_texts('localization/');
-    $this->register_handler('plugin.body', array($this, 'password_form'));
-
-    $rcmail = rcmail::get_instance();
-    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
-    $rcmail->output->send('plugin');
-  }
-  
-  function password_save()
-  {
-    $rcmail = rcmail::get_instance();
-    $this->load_config();
-
-    $this->add_texts('localization/');
-    $this->register_handler('plugin.body', array($this, 'password_form'));
-    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
-
-    $confirm = $rcmail->config->get('password_confirm_current');
-    $required_length = intval($rcmail->config->get('password_minimum_length'));
-    $check_strength = $rcmail->config->get('password_require_nonalpha');
-
-    if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd'])) {
-      $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
-    }
-    else {
-
-      $charset = strtoupper($rcmail->config->get('password_charset', 'ISO-8859-1'));
-      $rc_charset = strtoupper($rcmail->output->get_charset());
-
-      $curpwd = get_input_value('_curpasswd', RCUBE_INPUT_POST, true, $charset);
-      $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST, true);
-      $conpwd = get_input_value('_confpasswd', RCUBE_INPUT_POST, true);
-
-      // check allowed characters according to the configured 'password_charset' option
-      // by converting the password entered by the user to this charset and back to UTF-8
-      $orig_pwd = $newpwd;
-      $chk_pwd = rcube_charset_convert($orig_pwd, $rc_charset, $charset);
-      $chk_pwd = rcube_charset_convert($chk_pwd, $charset, $rc_charset);
-
-      // WARNING: Default password_charset is ISO-8859-1, so conversion will
-      // change national characters. This may disable possibility of using
-      // the same password in other MUA's.
-      // We're doing this for consistence with Roundcube core
-      $newpwd = rcube_charset_convert($newpwd, $rc_charset, $charset);
-      $conpwd = rcube_charset_convert($conpwd, $rc_charset, $charset);
-
-      if ($chk_pwd != $orig_pwd) {
-        $rcmail->output->command('display_message', $this->gettext('passwordforbidden'), 'error');
-      }
-      // other passwords validity checks
-      else if ($conpwd != $newpwd) {
-        $rcmail->output->command('display_message', $this->gettext('passwordinconsistency'), 'error');
-      }
-      else if ($confirm && $rcmail->decrypt($_SESSION['password']) != $curpwd) {
-        $rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error');
-      }
-      else if ($required_length && strlen($newpwd) < $required_length) {
-        $rcmail->output->command('display_message', $this->gettext(
-	  array('name' => 'passwordshort', 'vars' => array('length' => $required_length))), 'error');
-      }
-      else if ($check_strength && (!preg_match("/[0-9]/", $newpwd) || !preg_match("/[^A-Za-z0-9]/", $newpwd))) {
-        $rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error');
-      }
-      // try to save the password
-      else if (!($res = $this->_save($curpwd,$newpwd))) {
-        $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
-        $_SESSION['password'] = $rcmail->encrypt($newpwd);
-      }
-      else
-        $rcmail->output->command('display_message', $res, 'error');
-    }
-
-    rcmail_overwrite_action('plugin.password');
-    $rcmail->output->send('plugin');
-  }
-
-  function password_form()
-  {
-    $rcmail = rcmail::get_instance();
-    $this->load_config();
-
-    // add some labels to client
-    $rcmail->output->add_label(
-      'password.nopassword',
-      'password.nocurpassword',
-      'password.passwordinconsistency'
-    );
-
-    $rcmail->output->set_env('product_name', $rcmail->config->get('product_name'));
-
-    $table = new html_table(array('cols' => 2));
-
-    if ($rcmail->config->get('password_confirm_current')) {
-      // show current password selection
-      $field_id = 'curpasswd';
-      $input_curpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id,
-        'size' => 20, 'autocomplete' => 'off'));
-  
-      $table->add('title', html::label($field_id, Q($this->gettext('curpasswd'))));
-      $table->add(null, $input_curpasswd->show());
-    }
-
-    // show new password selection
-    $field_id = 'newpasswd';
-    $input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id,
-      'size' => 20, 'autocomplete' => 'off'));
-
-    $table->add('title', html::label($field_id, Q($this->gettext('newpasswd'))));
-    $table->add(null, $input_newpasswd->show());
-
-    // show confirm password selection
-    $field_id = 'confpasswd';
-    $input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id,
-      'size' => 20, 'autocomplete' => 'off'));
-
-    $table->add('title', html::label($field_id, Q($this->gettext('confpasswd'))));
-    $table->add(null, $input_confpasswd->show());
-
-    $out = html::div(array('class' => 'settingsbox', 'style' => 'margin:0'),
-      html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('changepasswd')) .
-      html::div(array('class' => 'boxcontent'), $table->show() .
-        html::p(null,
-          $rcmail->output->button(array(
-            'command' => 'plugin.password-save',
-            'type' => 'input',
-            'class' => 'button mainaction',
-            'label' => 'save'
-        )))
-      )
-    );
-
-    $rcmail->output->add_gui_object('passform', 'password-form');
-
-    return $rcmail->output->form_tag(array(
-      'id' => 'password-form',
-      'name' => 'password-form',
-      'method' => 'post',
-      'action' => './?_task=settings&_action=plugin.password-save',
-      ), $out);
-  }
-
-  private function _save($curpass, $passwd)
-  {
-    $config = rcmail::get_instance()->config;
-    $driver = $this->home.'/drivers/'.$config->get('password_driver', 'sql').'.php';
-    
-    if (!is_readable($driver)) {
-      raise_error(array(
-        'code' => 600,
-        'type' => 'php',
-        'file' => __FILE__,
-        'message' => "Password plugin: Unable to open driver file $driver"
-        ), true, false);
-      return $this->gettext('internalerror');
-    }
-    
-    include($driver);
-
-    if (!function_exists('password_save')) {
-      raise_error(array(
-        'code' => 600,
-        'type' => 'php',
-        'file' => __FILE__,
-        'message' => "Password plugin: Broken driver: $driver"
-        ), true, false);
-      return $this->gettext('internalerror');
-    }
-
-    $result = password_save($curpass, $passwd);
-
-    switch ($result) {
-      case PASSWORD_SUCCESS:
-        return;
-      case PASSWORD_CRYPT_ERROR;
-        return $this->gettext('crypterror');
-      case PASSWORD_CONNECT_ERROR;
-        return $this->gettext('connecterror');
-      case PASSWORD_ERROR:
-      default:
-        return $this->gettext('internalerror');
-    }
-  }
-
-}
-
-?>
diff --git a/plugins/show_additional_headers/show_additional_headers.php b/plugins/show_additional_headers/show_additional_headers.php
deleted file mode 100644
index 1cbe690e9..000000000
--- a/plugins/show_additional_headers/show_additional_headers.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Show additional message headers
- *
- * Proof-of-concept plugin which will fetch additional headers
- * and display them in the message view.
- *
- * Enable the plugin in config/main.inc.php and add your desired headers:
- *   $rcmail_config['show_additional_headers'] = array('User-Agent');
- *
- * @version 1.0
- * @author Thomas Bruederli
- * @website http://roundcube.net
- */
-class show_additional_headers extends rcube_plugin
-{
-  public $task = 'mail';
-  
-  function init()
-  {
-    $rcmail = rcmail::get_instance();
-    if ($rcmail->action == 'show' || $rcmail->action == 'preview') {
-      $this->add_hook('imap_init', array($this, 'imap_init'));
-      $this->add_hook('message_headers_output', array($this, 'message_headers'));
-    } else if ($rcmail->action == '') {
-      // with enabled_caching we're fetching additional headers before show/preview
-      $this->add_hook('imap_init', array($this, 'imap_init'));
-    }
-  }
-  
-  function imap_init($p)
-  {
-    $rcmail = rcmail::get_instance();
-    if ($add_headers = (array)$rcmail->config->get('show_additional_headers', array()))
-      $p['fetch_headers'] = trim($p['fetch_headers'].' ' . strtoupper(join(' ', $add_headers)));
-
-    return $p;
-  }
-
-  function message_headers($p)
-  {
-    $rcmail = rcmail::get_instance();
-    foreach ((array)$rcmail->config->get('show_additional_headers', array()) as $header) {
-      $key = strtolower($header);
-      if ($value = $p['headers']->others[$key])
-        $p['output'][$key] = array('title' => $header, 'value' => $value);
-    }
-
-    return $p;
-  }
-}
diff --git a/plugins/squirrelmail_usercopy/config.inc.php.dist b/plugins/squirrelmail_usercopy/config.inc.php.dist
deleted file mode 100644
index 5c2560f15..000000000
--- a/plugins/squirrelmail_usercopy/config.inc.php.dist
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-// full path to the squirrelmail data directory
-$rcmail_config['squirrelmail_data_dir'] = '';
-
diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
deleted file mode 100644
index 634f837c6..000000000
--- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * Copy a new users identity and settings from a nearby Squirrelmail installation
- *
- * Currently only file-based data storage of Squirrelmail is supported.
- *
- * @version 1.1
- * @author Thomas Bruederli
- */
-class squirrelmail_usercopy extends rcube_plugin
-{
-	public $task = 'login|settings';
-
-	private $prefs = null;
-	private $abook = array();
-
-	public function init()
-	{
-		$this->add_hook('create_user', array($this, 'create_user'));
-		$this->add_hook('create_identity', array($this, 'create_identity'));
-	}
-
-	public function create_user($p)
-	{
-		// read prefs and add email address
-		$this->read_squirrel_prefs($p['user']);
-		if ($this->prefs['email_address'])
-			$p['user_email'] = $this->prefs['email_address'];
-
-		return $p;
-	}
-
-	public function create_identity($p)
-	{
-		$rcmail = rcmail::get_instance();
-
-		// only execute on login
-		if ($rcmail->task == 'login' && $this->prefs) {
-			if ($this->prefs['full_name'])
-				$p['record']['name'] = $this->prefs['full_name'];
-			if ($this->prefs['email_address'])
-				$p['record']['email'] = $this->prefs['email_address'];
-			if ($this->prefs['signature'])
-				$p['record']['signature'] = $this->prefs['signature'];
-                        if ($this->prefs['reply-to']) 
-                                $p['record']['reply-to'] = $this->prefs['reply-to']; 		
-
-			// copy address book
-			$contacts = $rcmail->get_address_book(null, true);
-			if ($contacts && count($this->abook)) {
-				foreach ($this->abook as $rec)
-					$contacts->insert($rec, true);
-			}
-			
-			// mark identity as complete for following hooks
-			$p['complete'] = true;
-		}
-
-		return $p;
-	}
-
-	private function read_squirrel_prefs($uname)
-	{
-		$this->load_config();
-		$rcmail = rcmail::get_instance();
-
-		if ($srcdir = $rcmail->config->get('squirrelmail_data_dir')) {
-			$prefsfile = slashify($srcdir) . $uname . '.pref';
-			$abookfile = slashify($srcdir) . $uname . '.abook';
-			$sigfile = slashify($srcdir) . $uname . '.sig';
-
-			if (is_readable($prefsfile)) {
-				$this->prefs = array();
-				foreach (file($prefsfile) as $line) {
-					list($key, $value) = explode('=', $line);
-					$this->prefs[$key] = utf8_encode(rtrim($value));
-				}
-
-				// also read signature file if exists
-				if (is_readable($sigfile)) {
-					$this->prefs['signature'] = utf8_encode(file_get_contents($sigfile));
-				}
-
-				// parse addres book file
-				if (filesize($abookfile)) {
-					foreach(file($abookfile) as $line) {
-						list($rec['name'], $rec['firstname'], $rec['surname'], $rec['email']) = explode('|', utf8_encode(rtrim($line)));
-						if ($rec['name'] && $rec['email'])
-							$this->abook[] = $rec;
-					}
-				}
-			}
-		}
-	}
-
-}
-
-?>
diff --git a/plugins/subscriptions_option/localization/cs_CZ.inc b/plugins/subscriptions_option/localization/cs_CZ.inc
deleted file mode 100644
index ca637fc6c..000000000
--- a/plugins/subscriptions_option/localization/cs_CZ.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
-
-+-----------------------------------------------------------------------+
-| language/cs_CZ/labels.inc                                             |
-|                                                                       |
-| Language file of the RoundCube subscriptions option plugin            |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Milan Kozak <hodza@hodza.net>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id: labels.inc 2993 2009-09-26 18:32:07Z alec $
-
-*/
-
-$labels = array();
-$labels['useimapsubscriptions']  = 'Používat odebírání IMAP složek';
-
-?>
diff --git a/plugins/subscriptions_option/localization/de_CH.inc b/plugins/subscriptions_option/localization/de_CH.inc
deleted file mode 100644
index b4affe0c8..000000000
--- a/plugins/subscriptions_option/localization/de_CH.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$labels = array();
-$labels['useimapsubscriptions']  = 'Nur abonnierte Ordner anzeigen';
-
-?>
diff --git a/plugins/subscriptions_option/localization/de_DE.inc b/plugins/subscriptions_option/localization/de_DE.inc
deleted file mode 100644
index b4affe0c8..000000000
--- a/plugins/subscriptions_option/localization/de_DE.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$labels = array();
-$labels['useimapsubscriptions']  = 'Nur abonnierte Ordner anzeigen';
-
-?>
diff --git a/plugins/subscriptions_option/localization/en_US.inc b/plugins/subscriptions_option/localization/en_US.inc
deleted file mode 100644
index 5a348e0ee..000000000
--- a/plugins/subscriptions_option/localization/en_US.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$labels = array();
-$labels['useimapsubscriptions']  = 'Use IMAP Subscriptions';
-
-?>
diff --git a/plugins/subscriptions_option/localization/et_EE.inc b/plugins/subscriptions_option/localization/et_EE.inc
deleted file mode 100644
index 6c5f6f435..000000000
--- a/plugins/subscriptions_option/localization/et_EE.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$labels = array();
-$labels['useimapsubscriptions']  = 'Kasuta IMAP tellimusi';
-
-?>
diff --git a/plugins/subscriptions_option/localization/pl_PL.inc b/plugins/subscriptions_option/localization/pl_PL.inc
deleted file mode 100644
index 8544c7d30..000000000
--- a/plugins/subscriptions_option/localization/pl_PL.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$labels = array();
-$labels['useimapsubscriptions']  = 'Używaj subskrypcji IMAP';
-
-?>
diff --git a/plugins/subscriptions_option/localization/ru_RU.inc b/plugins/subscriptions_option/localization/ru_RU.inc
deleted file mode 100644
index 5deb84e0d..000000000
--- a/plugins/subscriptions_option/localization/ru_RU.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$labels = array();
-$labels['useimapsubscriptions']  = 'Использовать IMAP подписку';
-
-?>
diff --git a/plugins/subscriptions_option/localization/sv_SE.inc b/plugins/subscriptions_option/localization/sv_SE.inc
deleted file mode 100644
index 05b7006f4..000000000
--- a/plugins/subscriptions_option/localization/sv_SE.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$labels = array();
-$labels['useimapsubscriptions']  = 'Använd IMAP-prenumerationer';
-
-?>
diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php
deleted file mode 100644
index 4d471b8e6..000000000
--- a/plugins/subscriptions_option/subscriptions_option.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * Subscription Options
- *
- * A plugin which can enable or disable the use of imap subscriptions.
- * It includes a toggle on the settings page under "Server Settings".
- * The preference can also be locked
- *
- * Add it to the plugins list in config/main.inc.php to enable the user option
- * The user option can be hidden and set globally by adding 'use_subscriptions'
- * to the the 'dont_override' configure line:
- * $rcmail_config['dont_override'] = array('use_subscriptions');
- * and then set the global preference
- * $rcmail_config['use_subscriptions'] = true; // or false
- *
- * Roundcube caches folder lists.  When a user changes this option or visits
- * their folder list, this cache is refreshed.  If the option is on the
- * 'dont_override' list and the global option has changed, don't expect
- * to see the change until the folder list cache is refreshed.
- *
- * @version 1.0
- * @author Ziba Scott
- */
-class subscriptions_option extends rcube_plugin
-{
-    public $task = 'mail|settings';
-    
-    function init()
-    {
-        $this->add_texts('localization/', false);
-        $dont_override = rcmail::get_instance()->config->get('dont_override', array());
-        if (!in_array('use_subscriptions', $dont_override)) {
-            $this->add_hook('user_preferences', array($this, 'settings_blocks'));
-            $this->add_hook('save_preferences', array($this, 'save_prefs'));
-        }
-        $this->add_hook('list_mailboxes', array($this, 'list_mailboxes'));
-        $this->add_hook('manage_folders', array($this, 'manage_folders'));
-    }
-
-    function settings_blocks($args)
-    {
-        if ($args['section'] == 'server') {
-            $use_subscriptions = rcmail::get_instance()->config->get('use_subscriptions');
-            $field_id = 'rcmfd_use_subscriptions';
-            $checkbox = new html_checkbox(array('name' => '_use_subscriptions', 'id' => $field_id, 'value' => 1));
-
-            $args['blocks']['main']['options']['use_subscriptions'] = array(
-                'title' => html::label($field_id, Q($this->gettext('useimapsubscriptions'))),
-                'content' => $checkbox->show($use_subscriptions?1:0),
-            );
-        }
-
-        return $args;
-    }
-
-    function save_prefs($args)
-    {
-        if ($args['section'] == 'server') {
-            $rcmail = rcmail::get_instance();
-            $use_subscriptions = $rcmail->config->get('use_subscriptions');
-
-            $args['prefs']['use_subscriptions'] = isset($_POST['_use_subscriptions']) ? true : false;
-
-            // if the use_subscriptions preference changes, flush the folder cache
-            if (($use_subscriptions && !isset($_POST['_use_subscriptions'])) ||
-                (!$use_subscriptions && isset($_POST['_use_subscriptions']))) {
-                    $rcmail->imap_connect();
-                    $rcmail->imap->clear_cache('mailboxes');
-            }
-        }
-        return $args;
-    }
-
-    function list_mailboxes($args)
-    {
-        $rcmail = rcmail::get_instance();
-        if (!$rcmail->config->get('use_subscriptions', true)) {
-            $args['folders'] = iil_C_ListMailboxes($rcmail->imap->conn, $rcmail->imap->mod_mailbox($args['root']), $args['filter']);
-        }
-        return $args;
-    }
-
-    function manage_folders($args)
-    {
-        $rcmail = rcmail::get_instance();
-        if (!$rcmail->config->get('use_subscriptions', true)) {
-            $args['table']->remove_column('subscribed');
-        }
-        return $args;
-    }
-}
diff --git a/plugins/userinfo/localization/cs_CZ.inc b/plugins/userinfo/localization/cs_CZ.inc
deleted file mode 100644
index 812ca7b2a..000000000
--- a/plugins/userinfo/localization/cs_CZ.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
-
-+-----------------------------------------------------------------------+
-| language/cs_CZ/labels.inc                                             |
-|                                                                       |
-| Language file of the RoundCube userinfo plugin                        |
-| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Milan Kozak <hodza@hodza.net>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id: labels.inc 2993 2009-09-26 18:32:07Z alec $
-
-*/
-
-$labels = array();
-$labels['infosfor'] = 'Informace pro';
-$labels['userinfo'] = 'Uživatel';
-$labels['created'] = 'Vytvořen';
-$labels['lastlogin'] = 'Naspoledy přihlášen';
-$labels['defaultidentity'] = 'Výchozí identita';
-
-?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/de_CH.inc b/plugins/userinfo/localization/de_CH.inc
deleted file mode 100644
index 5f236b66c..000000000
--- a/plugins/userinfo/localization/de_CH.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$labels = array();
-$labels['userinfo'] = 'Benutzerinfo';
-$labels['created'] = 'Erstellt';
-$labels['lastlogin'] = 'Letztes Login';
-$labels['defaultidentity'] = 'Standard-Absender';
-
-?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/en_US.inc b/plugins/userinfo/localization/en_US.inc
deleted file mode 100644
index 1a2fd9016..000000000
--- a/plugins/userinfo/localization/en_US.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$labels = array();
-$labels['userinfo'] = 'User info';
-$labels['created'] = 'Created';
-$labels['lastlogin'] = 'Last Login';
-$labels['defaultidentity'] = 'Default Identity';
-
-?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/et_EE.inc b/plugins/userinfo/localization/et_EE.inc
deleted file mode 100644
index 97830b45c..000000000
--- a/plugins/userinfo/localization/et_EE.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$labels = array();
-$labels['userinfo'] = 'Kasutaja info';
-$labels['created'] = 'Loodud';
-$labels['lastlogin'] = 'Viimane logimine';
-$labels['defaultidentity'] = 'Vaikeidentiteet';
-
-?>
diff --git a/plugins/userinfo/localization/pl_PL.inc b/plugins/userinfo/localization/pl_PL.inc
deleted file mode 100644
index 6b03c32e7..000000000
--- a/plugins/userinfo/localization/pl_PL.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$labels = array();
-$labels['userinfo'] = 'Informacje';
-$labels['created'] = 'Utworzony';
-$labels['lastlogin'] = 'Ostatnie logowanie';
-$labels['defaultidentity'] = 'Domyślna tożsamość';
-
-?>
diff --git a/plugins/userinfo/localization/pt_PT.inc b/plugins/userinfo/localization/pt_PT.inc
deleted file mode 100644
index 45009f9f4..000000000
--- a/plugins/userinfo/localization/pt_PT.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$labels = array();
-$labels['userinfo'] = 'Informação do utilizador';
-$labels['created'] = 'Criado';
-$labels['lastlogin'] = 'Último login';
-$labels['defaultidentity'] = 'Identidade pré-definida';
-
-?>
diff --git a/plugins/userinfo/localization/sv_SE.inc b/plugins/userinfo/localization/sv_SE.inc
deleted file mode 100644
index a34923a88..000000000
--- a/plugins/userinfo/localization/sv_SE.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$labels = array();
-$labels['userinfo'] = 'Användarinfo';
-$labels['created'] = 'Skapad';
-$labels['lastlogin'] = 'Senast inloggad';
-$labels['defaultidentity'] = 'Standardprofil';
-
-?>
\ No newline at end of file
diff --git a/plugins/userinfo/userinfo.js b/plugins/userinfo/userinfo.js
deleted file mode 100644
index 70a5085b3..000000000
--- a/plugins/userinfo/userinfo.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Show user-info plugin script */
-
-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', 'settingstabpluginuserinfo').addClass('tablink');
-    
-    var button = $('<a>').attr('href', rcmail.env.comm_path+'&_action=plugin.userinfo').html(rcmail.gettext('userinfo', 'userinfo')).appendTo(tab);
-    button.bind('click', function(e){ return rcmail.command('plugin.userinfo', this) });
-    
-    // add button and register command
-    rcmail.add_element(tab, 'tabs');
-    rcmail.register_command('plugin.userinfo', function(){ rcmail.goto_url('plugin.userinfo') }, true);
-  })
-}
-
diff --git a/plugins/userinfo/userinfo.php b/plugins/userinfo/userinfo.php
deleted file mode 100644
index 0f1b18cd9..000000000
--- a/plugins/userinfo/userinfo.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Sample plugin that adds a new tab to the settings section
- * to display some information about the current user
- */
-class userinfo extends rcube_plugin
-{
-  public $task = 'settings';
-
-  function init()
-  {
-    $this->add_texts('localization/', array('userinfo'));
-    $this->register_action('plugin.userinfo', array($this, 'infostep'));
-    $this->include_script('userinfo.js');
-  }
-
-  function infostep()
-  {
-    $this->register_handler('plugin.body', array($this, 'infohtml'));
-    rcmail::get_instance()->output->send('plugin');
-  }
-  
-  function infohtml()
-  {
-    $rcmail = rcmail::get_instance();
-    $user = $rcmail->user;
-    
-    $table = new html_table(array('cols' => 2, 'cellpadding' => 3));
-
-    $table->add('title', 'ID');
-    $table->add('', Q($user->ID));
-    
-    $table->add('title', Q($this->gettext('username')));
-    $table->add('', Q($user->data['username']));
-    
-    $table->add('title', Q($this->gettext('server')));
-    $table->add('', Q($user->data['mail_host']));
-
-    $table->add('title', Q($this->gettext('created')));
-    $table->add('', Q($user->data['created']));
-
-    $table->add('title', Q($this->gettext('lastlogin')));
-    $table->add('', Q($user->data['last_login']));
-    
-    $identity = $user->get_identity();
-    $table->add('title', Q($this->gettext('defaultidentity')));
-    $table->add('', Q($identity['name'] . ' <' . $identity['email'] . '>'));
-    
-    return html::tag('h4', null, Q('Infos for ' . $user->get_username())) . $table->show();
-  }
-
-}
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/de_CH.inc b/plugins/vcard_attachments/localization/de_CH.inc
deleted file mode 100644
index dcc8ce713..000000000
--- a/plugins/vcard_attachments/localization/de_CH.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['addvardmsg'] = 'Kontakt im Adressbuch speichern';
-$labels['vcardsavefailed'] = 'Der Kontakt konnte nicht gespeichert werden';
-
-?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/de_DE.inc b/plugins/vcard_attachments/localization/de_DE.inc
deleted file mode 100644
index dcc8ce713..000000000
--- a/plugins/vcard_attachments/localization/de_DE.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['addvardmsg'] = 'Kontakt im Adressbuch speichern';
-$labels['vcardsavefailed'] = 'Der Kontakt konnte nicht gespeichert werden';
-
-?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/en_US.inc b/plugins/vcard_attachments/localization/en_US.inc
deleted file mode 100644
index 59a36e9bd..000000000
--- a/plugins/vcard_attachments/localization/en_US.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['addvardmsg'] = 'Add vCard to addressbook';
-$labels['vcardsavefailed'] = 'Unable to save vCard';
-
-?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ru_RU.inc b/plugins/vcard_attachments/localization/ru_RU.inc
deleted file mode 100644
index e127b58d6..000000000
--- a/plugins/vcard_attachments/localization/ru_RU.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$labels = array();
-$labels['addvardmsg'] = 'Добавить в контакты';
-$labels['vcardsavefailed'] = 'Не удалось сохранить vCard';
-
-?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/vcard_add_contact.png b/plugins/vcard_attachments/vcard_add_contact.png
deleted file mode 100644
index 478c1f3f2..000000000
--- a/plugins/vcard_attachments/vcard_add_contact.png
+++ /dev/null
diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
deleted file mode 100644
index d23cf37b1..000000000
--- a/plugins/vcard_attachments/vcard_attachments.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * Detect VCard attachments and show a button to add them to address book
- *
- * @version 1.0
- * @author Thomas Bruederli
- */
-class vcard_attachments extends rcube_plugin
-{
-  public $task = 'mail';
-  
-  private $message;
-  private $vcard_part;
-
-  function init()
-  {
-    $rcmail = rcmail::get_instance();
-    if ($rcmail->action == 'show' || $rcmail->action == 'preview') {
-      $this->add_hook('message_load', array($this, 'message_load'));
-      $this->add_hook('template_object_messagebody', array($this, 'html_output'));
-    }
-    
-    $this->register_action('plugin.savevcard', array($this, 'save_vcard'));
-  }
-  
-  /**
-   * Check message attachments for vcards
-   */
-  function message_load($p)
-  {
-    $this->message = $p['object'];
-    
-    foreach ((array)$this->message->attachments as $attachment) {
-      if (in_array($attachment->mimetype, array('text/vcard', 'text/x-vcard')))
-        $this->vcard_part = $attachment->mime_id;
-    }
-
-    if ($this->vcard_part)
-      $this->add_texts('localization');
-  }
-  
-  /**
-   * This callback function adds a box below the message content
-   * if there is a vcard attachment available
-   */
-  function html_output($p)
-  {
-    if ($this->vcard_part) {
-      $vcard = new rcube_vcard($this->message->get_part_content($this->vcard_part));
-      
-      // successfully parsed vcard
-      if ($vcard->displayname) {
-        $display = $vcard->displayname;
-        if ($vcard->email[0])
-          $display .= ' <'.$vcard->email[0].'>';
-        
-        // add box below messsage body
-        $p['content'] .= html::p(array('style' => "margin:1em; padding:0.5em; border:1px solid #999; border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; width: auto;"),
-          html::a(array(
-              'href' => "#",
-              'onclick' => "return plugin_vcard_save_contact('".JQ($this->vcard_part)."')",
-              'title' => $this->gettext('addvardmsg')),
-            html::img(array('src' => $this->url('vcard_add_contact.png'), 'align' => "middle")))
-            . ' ' . html::span(null, Q($display)));
-        
-        $this->include_script('vcardattach.js');
-      }
-    }
-    
-    return $p;
-  }
-  
-  /**
-   * Handler for request action
-   */
-  function save_vcard()
-  {
-	  $this->add_texts('localization', true);
-
-    $uid = get_input_value('_uid', RCUBE_INPUT_POST);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-    $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
-    
-    $rcmail = rcmail::get_instance();
-    $part = $uid && $mime_id ? $rcmail->imap->get_message_part($uid, $mime_id) : null;
-    
-    $error_msg = $this->gettext('vcardsavefailed');
-    
-    if ($part && ($vcard = new rcube_vcard($part)) && $vcard->displayname && $vcard->email) {
-      $contacts = $rcmail->get_address_book(null, true);
-      
-      // check for existing contacts
-      $existing = $contacts->search('email', $vcard->email[0], true, false);
-      if ($done = $existing->count) {
-        $rcmail->output->command('display_message', $this->gettext('contactexists'), 'warning');
-      }
-      else {
-        // add contact
-        $success = $contacts->insert(array(
-          'name' => $vcard->displayname,
-          'firstname' => $vcard->firstname,
-          'surname' => $vcard->surname,
-          'email' => $vcard->email[0],
-          'vcard' => $vcard->export(),
-        ));
-        
-        if ($success)
-          $rcmail->output->command('display_message', $this->gettext('addedsuccessfully'), 'confirmation');
-        else
-          $rcmail->output->command('display_message', $error_msg, 'error');
-      }
-    }
-    else
-      $rcmail->output->command('display_message', $error_msg, 'error');
-    
-    $rcmail->output->send();
-  }
-}
diff --git a/plugins/vcard_attachments/vcardattach.js b/plugins/vcard_attachments/vcardattach.js
deleted file mode 100644
index e03e5084d..000000000
--- a/plugins/vcard_attachments/vcardattach.js
+++ /dev/null
@@ -1,10 +0,0 @@
-
-function plugin_vcard_save_contact(mime_id)
-{
-  rcmail.set_busy(true, 'loading');
-  rcmail.http_post('plugin.savevcard', '_uid='+rcmail.env.uid+'&_mbox='+urlencode(rcmail.env.mailbox)+'&_part='+urlencode(mime_id), true);
-  
-  return false;
-}
-
-
diff --git a/plugins/virtuser_file/virtuser_file.php b/plugins/virtuser_file/virtuser_file.php
deleted file mode 100644
index 071722bf4..000000000
--- a/plugins/virtuser_file/virtuser_file.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * File based User-to-Email and Email-to-User lookup
- * 
- * Add it to the plugins list in config/main.inc.php and set
- * path to a virtuser table file to resolve user names and e-mail
- * addresses
- * $rcmail_config['virtuser_file'] = '';
- *
- * @version 1.0
- * @author Aleksander Machniak
- */
-class virtuser_file extends rcube_plugin
-{
-    private $file;
-    private $app;
-
-    function init()
-    {
-	$this->app = rcmail::get_instance();
-	$this->file = $this->app->config->get('virtuser_file');
-
-	if ($this->file) {
-	    $this->add_hook('user2email', array($this, 'user2email'));
-	    $this->add_hook('email2user', array($this, 'email2user'));
-	}
-    }
-
-    /**
-     * User > Email
-     */
-    function user2email($p)
-    {
-        $r = $this->findinvirtual('/\s' . preg_quote($p['user'], '/') . '\s*$/');
-	$result = array();
-
-	for ($i=0; $i<count($r); $i++)
-	{
-	    $arr = preg_split('/\s+/', $r[$i]);
-
-	    if (count($arr) > 0 && strpos($arr[0], '@'))
-	    {
-		$result[] = trim(str_replace('\\@', '@', $arr[0]));
-
-		if ($p['first']) {
-		    $p['email'] = $result[0];
-		    break;
-		}
-	    }
-	}
-
-	$p['email'] = empty($result) ? NULL : $result;
-
-	return $p;
-    }
-
-    /**
-     * Email > User
-     */
-    function email2user($p)
-    {
-	$r = $this->findinvirtual('/^' . preg_quote($p['email'], '/') . '\s/');
-
-	for ($i=0; $i<count($r); $i++)
-        {
-	    $arr = preg_split('/\s+/', trim($r[$i]));
-	    
-	    if (count($arr) > 0) {
-		$p['user'] = trim($arr[count($arr)-1]);
-		break;
-	    }
-	}
-
-	return $p;
-    }
-
-    /**
-     * Find matches of the given pattern in virtuser file
-     *
-     * @param string Regular expression to search for
-     * @return array Matching entries
-     */
-    private function findinvirtual($pattern)
-    {
-	$result = array();
-	$virtual = null;
-	
-	if ($this->file)
-	    $virtual = file($virtuser_file);
-	
-	if (empty($virtual))
-	    return $result;
-	
-	// check each line for matches
-	foreach ($virtual as $line)
-	{
-	    $line = trim($line);
-	    if (empty($line) || $line[0]=='#')
-	        continue;
-	
-	    if (preg_match($pattern, $line))
-	        $result[] = $line;
-	}
-	
-	return $result;
-    }
-
-}
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
deleted file mode 100644
index 0264bf8f9..000000000
--- a/plugins/virtuser_query/virtuser_query.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * DB based User-to-Email and Email-to-User lookup
- *
- * Add it to the plugins list in config/main.inc.php and set
- * SQL query to resolve user names and e-mail addresses from the database
- * %u will be replaced with the current username for login.
- * The query should select the user's e-mail address as first column
- * and optional identity data columns in specified order:
- *    name, organization, reply-to, bcc, signature, html_signature
- *
- * $rcmail_config['virtuser_query'] = '';
- *
- * @version 1.0
- * @author Aleksander Machniak
- */
-class virtuser_query extends rcube_plugin
-{
-    private $query;
-    private $app;
-
-    function init()
-    {
-	$this->app = rcmail::get_instance();
-	$this->query = $this->app->config->get('virtuser_query');
-
-	if ($this->query) {
-	    $this->add_hook('user2email', array($this, 'user2email'));
-//	    $this->add_hook('email2user', array($this, 'email2user'));
-	}
-    }
-
-    /**
-     * User > Email
-     */
-    function user2email($p)
-    {
-	$dbh = $rcmail->get_dbh();
-
-	$sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->query));
-
-	while ($sql_arr = $dbh->fetch_array($sql_result)) {
-	    if (strpos($sql_arr[0], '@')) {
-		if ($p['extended'] && count($sql_arr) > 1) {
-		    $result[] = array(
-			'email' 	=> $sql_arr[0],
-			'name' 		=> $sql_arr[1],
-			'organization'  => $sql_arr[2],
-			'reply-to' 	=> $sql_arr[3],
-			'bcc' 		=> $sql_arr[4],
-			'signature' 	=> $sql_arr[5],
-			'html_signature' => (int)$sql_arr[6],
-    		    );
-		}
-		else {
-		    $result[] = $sql_arr[0];
-		}
-
-		if ($p['first'])
-		    break;
-	    }
-	}
-	
-	$p['email'] = $result;
-
-	return $p;
-    }
-
-}