Bump version to 1.2.10

Fix CSRF bypass that could be used to log out an authenticated user (#7302 )
Fix local file inclusion (and code execution) via crafted 'plugins' option
458 changed files with 11853 additions and 2797 deletions
--- a/.htaccess
+++ b/.htaccess
@ -1,6 +1,4 @@
-# AddDefaultCharset UTF-8
-AddType text/x-component .htc
-
+# WARNING: For PHP 7 the module name in the line below need to be modified!
 <IfModule mod_php5.c>
 php_flag    display_errors  Off
 php_flag    log_errors      On
@ -25,7 +23,7 @@ php_value   session.gc_probability   1
 </IfModule>

 <IfModule mod_rewrite.c>
-Options +FollowSymLinks
+Options +SymLinksIfOwnerMatch
 RewriteEngine On
 RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico

@ -35,6 +33,8 @@ RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
 RewriteRule ^(?!installer|\.well-known\/|[a-zA-Z0-9]{16})(\.?[^\.]+)$ - [F]
 # - deny access to some locations
 RewriteRule ^/?(\.git|\.tx|SQL|bin|config|logs|temp|tests|program\/(include|lib|localization|steps)) - [F]
+# - deny access to composer binaries
+RewriteRule ^/vendor\/bin\/.* - [F]
 # - deny access to some documentation files
 RewriteRule /?(README\.md|composer\.json-dist|composer\.json|package\.xml|Dockerfile)$ - [F]
 </IfModule>
--- a/.tx/config
+++ b/.tx/config
@ -28,6 +28,11 @@ file_filter = plugins/attachment_reminder/localization/<lang>.inc
 source_file = plugins/attachment_reminder/localization/en_US.inc
 source_lang = en_US

+[roundcube-webmail.plugin-enigma]
+file_filter = plugins/enigma/localization/<lang>.inc
+source_file = plugins/enigma/localization/en_US.inc
+source_lang = en_US
+
 [roundcube-webmail.plugin-help]
 file_filter = plugins/help/localization/<lang>.inc
 source_file = plugins/help/localization/en_US.inc
@ -82,4 +87,3 @@ source_lang = en_US
 file_filter = plugins/zipdownload/localization/<lang>.inc
 source_file = plugins/zipdownload/localization/en_US.inc
 source_lang = en_US
-
--- a/152
+++ b/152
@ -1,12 +1,162 @@
 CHANGELOG Roundcube Webmail
 ===========================

+RELEASE 1.2.10
+--------------
+- Fix missing message-htmlpart1 class breaking inline CSS (#6493)
+- Security: Fix XSS issue in handling of CDATA in HTML messages
+- Security: Fix remote code execution via crafted 'im_convert_path' or 'im_identify_path' settings
+- Security: Fix local file inclusion (and code execution) via crafted 'plugins' option
+- Security: Fix CSRF bypass that could be used to log out an authenticated user (#7302)
+
+RELEASE 1.2.9
+-------------
+- Fix regression where IMAP commands with '*' uidset argument wasn't working
+
+RELEASE 1.2.8
+-------------
+- Fix check_request() bypass in places using get_uids() [CVE-2018-9846] (#6238)
+- Fix possible IMAP command injection vulnerability [CVE-2018-9846] (#6229)
+- Fix security issue in remote content blocking on HTML image and style tags (#6178)
+
+RELEASE 1.2.7
+-------------
+- Fix rewind(): stream does not support seeking (#5950)
+- Fix bug where HTML messages could have been rendered empty on some systems (#5957)
+- Fix (again) bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
+- Managesieve: Fix parsing dot-staffed lines in multiline text (#5838, #5959)
+- Fix file disclosure vulnerability caused by insufficient input validation [CVE-2017-16651] (#6026)
+
+RELEASE 1.2.6
+-------------
+- Don't ignore (global) userlogins/sendmail logging in per_user_logging mode
+- Enigma: Fix compatibility with assets_dir
+- Managesieve: Fix AM/PM suffix in vacation time selectors
+- Fix bug where comment notation within style tag would cause the whole style to be ignored (#5747)
+- Fix bug where it wasn't possible to scroll folders list in Edge (#5750)
+- Fix addressbook searching by gender (#5757)
+- Fix SQL syntax error on MariaDB 10.2 (#5774)
+- Fix bug where it wasn't possible to set timezone to auto-detected value (#5782)
+- Fix uninitialized string offset in rcube_utils::bin2ascii() and make sure rcube_utils::random_bytes() result has always requested length (#5788)
+- Fix potential XSS vulnerability with malformed HTML message markup
+
+RELEASE 1.2.5
+-------------
+- Fix re-positioning of the fixed header of messages list in Chrome when using minimal mode toggle and About dialog (#5711)
+- Fix so settings/upload.inc could not be used by plugins (#5694)
+- Fix regression in LDAP fuzzy search where it always used prefix search instead (#5713)
+- Fix bug where namespace prefix could not be truncated on folders list if show_real_foldernames=true (#5695)
+- Fix bug where base_dn setting was ignored inside group_filters (#5720)
+- Password: Fix security issue in virtualmin and sasl drivers [CVE-2017-8114]
+
+RELEASE 1.2.4
+-------------
+- Managesieve: Fix handling of scripts with nested rules (#5540)
+- Managesieve: Fix parser issue with empty lines between comments (#5657)
+- Managesieve: Fix possible defect in handling \r\n in scripts (#5685)
+- Enigma: Fix handling of messages with nested PGP encrypted parts (#5634)
+- Enigma: Fix PHP fatal error when decrypting a message with invalid signature (#5555)
+- Enigma: Fix missing require statement for Crypt_GPG_KeyGenerator (#5641)
+- Fix variable substitution in ldap host for some use-cases, e.g. new_user_identity (#5544)
+- Fix adding images to new identity signatures
+- Fix rsync error handling in installto.sh script (#5562)
+- Fix some advanced search issues with multiple addressbooks (#5572)
+- Fix so group/addressbook selection is retained on page refresh
+- Fix bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
+- Fix bug where external content in src attribute of input/video tags was not secured (#5583)
+- Fix PHP error on update of a contact with multiple email addresses when using PHP 7.1 (#5587)
+- Fix bug where mail content frame couldn't be reset in some corner cases (#5608)
+- Fix bug where some classic skin images were not displayed in IE/Edge (#5614)
+- Fix bug where signature couldn't be added above the quote in Firefox 51 (#5628)
+- Fix regression where groups with email address were resolved to its members' addresses
+- Fix update of group name in the contacts list header on group rename (#5648)
+- Add rewrite rule to disable access to /vendor/bin folder in .htaccess (#5630)
+- Fix bug where it was too easy accidentally move a folder when using the subscription checkbox (#5655)
+- Fix XSS issue in handling of a style tag inside of an svg element (CVE-2017-6820)
+
+RELEASE 1.2.3
+-------------
+- Searching in both contacts and groups when LDAP addressbook with group_filters option is used
+- Fix vulnerability in handling of mail()'s 5th argument
+- Fix To: header encoding in mail sent with mail() method (#5475)
+- Fix flickering of header topline in min-mode (#5426)
+- Fix bug where folders list would scroll to top when clicking on subscription checkbox (#5447)
+- Fix decoding of GB2312/GBK text when iconv is not installed (#5448)
+- Fix regression where creation of default folders wasn't functioning without prefix (#5460)
+- Enigma: Fix bug where last records on keys list were hidden (#5461)
+- Enigma: Fix key search with keyword containing non-ascii characters (#5459)
+- Fix bug where deleting folders with subfolders could fail in some cases (#5466)
+- Fix bug where IMAP password could be exposed via error message (#5472)
+- Fix bug where it wasn't possible to store more that 2MB objects in memcache/apc,
+  Added memcache_max_allowed_packet and apc_max_allowed_packet settings (#5452)
+- Fix "Illegal string offset" warning in rcube::log_bug() on PHP 7.1 (#5508)
+- Fix storing "empty" values in rcube_cache/rcube_cache_shared (#5519)
+- Fix missing content check when image resize fails on attachment thumbnail generation (#5485)
+- Fix displaying attached images with wrong Content-Type specified (#5527)
+
+RELEASE 1.2.2
+-------------
+- Enigma: Add possibility to configure gpg-agent binary location (enigma_pgp_agent)
+- Enigma: Fix signature verification with some IMAP servers, e.g. Gmail, DBMail (#5371)
+- Enigma: Make recipient key searches case-insensitive (#5434)
+- Fix regression in resizing JPEG images with Imagick (#5376)
+- Managesieve: Fix parsing of vacation date-time with non-default date_format (#5372)
+- Use SymLinksIfOwnerMatch in .htaccess instead of FollowSymLinks disabled on some hosts for security reasons (#5370)
+- Wash position:fixed style in HTML mail for better security (#5264)
+- Fix bug where memcache_debug didn't work for session operations
+- Fix bug where Message-ID domain part was tied to username instead of current identity (#5385)
+- Fix bug where blocked.gif couldn't be attached to reply/forward with insecure content
+- Fix E_DEPRECATED warning when using Auth_SASL::factory() (#5401)
+- Fix bug where names of downloaded files could be malformed when derived from the message subject (#5404)
+- Fix so "All" messages selection is resetted on search reset (#5413)
+- Fix bug where folder creation could fail if personal namespace contained more than one entry (#5403)
+- Fix error causing empty INBOX listing in Firefox when using an URL with user:password specified (#5400)
+- Fix PHP warning when handling shared namespace with empty prefix (#5420)
+- Fix so folders list is scrolled to the selected folder on page load (#5424)
+- Fix so when moving to Trash we make sure the folder exists (#5192)
+- Fix displaying size of attachments with zero size
+- Fix so "Action disabled" error uses more appropriate 404 code (#5440)
+
+RELEASE 1.2.1
+-------------
+- Update TinyMCE to version 4.3.13 (#5309)
+- Fix bug where errors could have been not logged when per_user_logging=true
+- Fix bug where message list columns could be in wrong order after column drag-n-drop and list sorting
+- Fix so minified publickey.js (with cache-buster) is used when available (#5254)
+- Fix (replace) application/x-tar file extension test as it might not exist in nginx config (#5253)
+- Fix PHP warning when password_hosts is set, but is not an array (#5260)
+- Fix redundant keep-alive requests when session_lifetime is greater than ~20000 (#5273)
+- Fix so subfolders of INBOX can be set as Archive (#5274)
+- Fix bug where multi-folder search could choose a wrong folder in "this and subfolders" scope (#5282)
+- Fix bug where multi-folder search didn't work for unsubscribed INBOX (#5259)
+- Fix bug where "no body" alert could be displayed when sending mailvelope email
+- Enigma: Fix keys import from inside of an encrypted message (#5285)
+- Enigma: Fix malformed signed messages with force_7bit=true (#5292)
+- Enigma: Add possibility to configure gpg binary location (enigma_pgp_binary)
+- Enigma: Add possibility to export private keys (#5321)
+- Fix searching by email address in contacts with multiple addresses (#5291)
+- Fix handling of --delete argument in moduserprefs.sh script (#5296)
+- Workaround PHP issue by calling closelog() on script shutdown when using log_driver=syslog (#5289)
+- Fix so upgrade script makes sure program/lib directory does not contain old libraries (#5287)
+- Fix subscription checkbox state on error in folder subscribe/unsubscribe action (#5243)
+- Fix bug where microsecond format in logged date didn't work in some cases
+- Fix conflict in new_user_dialog and password_force_new_user settings (#5275)
+- Don't create multipart/alternative messages with empty text/plain part (#5283)
+- Use contact_search_name format in popup on results in compose contacts search
+- Fix handling of 'mailto' and 'error' arguments in message_before_send hook (#5347)
+- Fix missing localization of HTML editor when assets_dir != INSTALL_PATH
+- Fix handling of blockquote tags with mixed case on html2text conversion (#5363)
+- Fix javascript errors in IE on page with iframe that points to another domain
+
+RELEASE 1.2.0
+-------------
 - Enigma: Added enigma_debug option
 - Fix message list multi-select/deselect issue (#5219)
 - Fix bug where getting HTML editor content could steal focus from other form controls (#5223)
 - Fix bug where contact search menu fields where always unchecked in Larry skin
 - Fix autoloading of 'html' class
 - Fix bug where Encrypt button appears when switching editor to HTML (#5235)
+- Fix XSS issue in href attribute on area tag (#5240)

 RELEASE 1.2-rc
 --------------
@ -49,6 +199,8 @@ RELEASE 1.2-rc
 RELEASE 1.2-beta
 ----------------
 - Update TinyMCE to version 4.2
+- Added support for Redis session handler
+- Removed some deprecated methods: https://github.com/roundcube/roundcubemail/commit/454b0b1c
 - Remove backward compatibility "layer" of bc.php (#4902)
 - Add possibility to define date format in write operations for ldap attributes (#3956)
 - Display attachment size in compose (#1329)
--- a/4
+++ b/4
@ -16,14 +16,14 @@ REQUIREMENTS
   - PHP PDO with driver for either MySQL, PostgreSQL, SQL Server, Oracle or SQLite (required)
   - Libiconv, Zip, Fileinfo, Intl, Exif (recommended)
   - LDAP for LDAP addressbook support (optional)
-* PEAR packages distributed with Roundcube or external:
+* PEAR and PEAR packages distributed with Roundcube or external:
   - Mail_Mime 1.10.0 or newer
   - Net_SMTP 1.7.1 or newer
   - Net_Socket 1.0.12 or newer
   - Net_IDNA2 0.1.1 or newer
   - Auth_SASL 1.0.6 or newer
   - Net_Sieve 1.3.2 or newer (for managesieve plugin)
-   - Crypt_GPG 1.4.1 or newer (for enigma plugin)
+   - Crypt_GPG 1.4.3 or newer (for enigma plugin)
 * php.ini options (see .htaccess file):
   - error_reporting E_ALL & ~E_NOTICE (or lower)
   - memory_limit > 16MB (increase as suitable to support large attachments)
--- a/README.md
+++ b/README.md
@ -3,14 +3,6 @@ Roundcube Webmail
 [roundcube.net](http://roundcube.net)


-ATTENTION
---------
-This is just a snapshot from the GIT repository and is **NOT A STABLE
-version of Roundcube**. It's not recommended to replace an existing installation
-of Roundcube with this version. Also using a separate database for this
-installation is highly recommended.
-
-
 INTRODUCTION
 ------------
 Roundcube Webmail is a browser-based multilingual IMAP client with an
--- a/bin/installto.sh
+++ b/bin/installto.sh
@ -5,7 +5,7 @@
 | bin/installto.sh                                                      |
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2014, The Roundcube Dev Team                            |
+ | Copyright (C) 2014-2016, The Roundcube Dev Team                       |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -42,7 +42,6 @@ echo "Upgrading from $oldversion. Do you want to continue? (y/N)\n";
 $input = trim(fgets(STDIN));

 if (strtolower($input) == 'y') {
-  $err = false;
  echo "Copying files to target location...";

  // Save a copy of original .htaccess file (#1490623)
@ -55,15 +54,17 @@ if (strtolower($input) == 'y') {
    $dirs[] = 'vendor';
  }
  foreach ($dirs as $dir) {
-    if (!system("rsync -avC " . INSTALL_PATH . "$dir/* $target_dir/$dir/")) {
-      $err = true;
-      break;
+    // @FIXME: should we use --delete for all directories?
+    $delete  = in_array($dir, array('program', 'installer')) ? '--delete ' : '';
+    $command = "rsync -aC --out-format \"%n\" " . $delete . INSTALL_PATH . "$dir/* $target_dir/$dir/";
+    if (!system($command, $ret) || $ret > 0) {
+      rcube::raise_error("Failed to execute command: $command", false, true);
    }
  }
  foreach (array('index.php','.htaccess','config/defaults.inc.php','composer.json-dist','CHANGELOG','README.md','UPGRADING','LICENSE','INSTALL') as $file) {
-    if (!system("rsync -av " . INSTALL_PATH . "$file $target_dir/$file")) {
-      $err = true;
-      break;
+    $command = "rsync -a --out-format \"%n\" " . INSTALL_PATH . "$file $target_dir/$file";
+    if (file_exists(INSTALL_PATH . $file) && (!system($command, $ret) || $ret > 0)) {
+      rcube::raise_error("Failed to execute command: $command", false, true);
    }
  }

@ -94,13 +95,12 @@ if (strtolower($input) == 'y') {
      echo "done.\n\n";
  }

-  if (!$err) {
-    echo "Running update script at target...\n";
-    system("cd $target_dir && php bin/update.sh --version=$oldversion");
-    echo "All done.\n";
-  }
+  echo "Running update script at target...\n";
+  system("cd $target_dir && php bin/update.sh --version=$oldversion");
+  echo "All done.\n";
 }
-else
+else {
  echo "Update cancelled. See ya!\n";
+}

 ?>
--- a/bin/moduserprefs.sh
+++ b/bin/moduserprefs.sh
@ -36,7 +36,7 @@ function print_usage()
 // get arguments
 $args = rcube_utils::get_opt(array(
        'u' => 'user',
-        'd' => 'delete',
+        'd' => 'delete:bool',
        't' => 'type',
        'c' => 'config',
 ));
@ -45,7 +45,7 @@ if ($_SERVER['argv'][1] == 'help') {
    print_usage();
    exit;
 }
-else if (empty($args[0]) || (!isset($args[1]) && !$args['delete'])) {
+else if (empty($args[0]) || (empty($args[1]) && empty($args['delete']))) {
    print "Missing required parameters.\n";
    print_usage();
    exit;
--- a/bin/update.sh
+++ b/bin/update.sh
@ -24,7 +24,7 @@ define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
 require_once INSTALL_PATH . 'program/include/clisetup.php';

 // get arguments
-$opts = rcube_utils::get_opt(array('v' => 'version', 'y' => 'accept'));
+$opts = rcube_utils::get_opt(array('v' => 'version', 'y' => 'accept:bool'));

 // ask user if no version is specified
 if (!$opts['version']) {
@ -169,14 +169,20 @@ if ($RCI->configured) {
    // update the require section with the new dependencies
    if (is_array($composer_data['require']) && is_array($composer_template['require'])) {
      $composer_data['require'] = array_merge($composer_data['require'], $composer_template['require']);
-      /* TO BE ADDED LATER
-      $old_packages = array();
-      for ($old_packages as $pkg) {
-        if (array_key_exists($composer_data['require'], $pkg)) {
+
+      // remove obsolete packages
+      $old_packages = array(
+        'pear/mail_mime',
+        'pear/mail_mime-decode',
+        'pear/net_smtp',
+        'pear/net_sieve',
+        'pear-pear.php.net/net_sieve',
+      );
+      foreach ($old_packages as $pkg) {
+        if (array_key_exists($pkg, $composer_data['require'])) {
          unset($composer_data['require'][$pkg]);
        }
      }
-      */
    }

    // update the repositories section with the new dependencies
@ -190,12 +196,18 @@ if ($RCI->configured) {
        $existing = false;
        foreach ($composer_data['repositories'] as $k =>  $_repo) {
          if ($rkey == $_repo['type'] . preg_replace('/^https?:/', '', $_repo['url']) . $_repo['package']['name']) {
+            // switch to https://
+            if (isset($_repo['url']) && strpos($_repo['url'], 'http://') === 0)
+              $composer_data['repositories'][$k]['url'] = 'https:' . substr($_repo['url'], 5);
            $existing = true;
            break;
          }
          // remove old repos
          else if (strpos($_repo['url'], 'git://git.kolab.org') === 0) {
-              unset($composer_data['repositories'][$k]);
+            unset($composer_data['repositories'][$k]);
+          }
+          else if ($_repo['type'] == 'package' && $_repo['package']['name'] == 'Net_SMTP') {
+            unset($composer_data['repositories'][$k]);
          }
        }
        if (!$existing) {
--- a/composer.json-dist
+++ b/composer.json-dist
@ -22,13 +22,14 @@
    ],
    "require": {
        "php": ">=5.3.7",
+        "pear/pear-core-minimal": "~1.10.1",
        "roundcube/plugin-installer": "~0.1.6",
        "pear-pear.php.net/net_socket": "~1.0.12",
        "pear-pear.php.net/auth_sasl": "~1.0.6",
        "pear-pear.php.net/net_idna2": "~0.1.1",
        "pear-pear.php.net/mail_mime": "~1.10.0",
        "pear-pear.php.net/net_smtp": "~1.7.1",
-        "pear-pear.php.net/crypt_gpg": "~1.4.1",
+        "pear-pear.php.net/crypt_gpg": "~1.4.2",
        "roundcube/net_sieve": "~1.5.0"
    },
    "require-dev": {
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@ -307,6 +307,40 @@ $config['ldap_cache'] = 'db';
 $config['ldap_cache_ttl'] = '10m';


+// ----------------------------------
+// CACHE(S)
+// ----------------------------------
+
+// Use these hosts for accessing memcached
+// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
+$config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );
+
+// Controls the use of a persistent connections to memcache servers
+// See http://php.net/manual/en/memcache.addserver.php
+$config['memcache_pconnect'] = true;
+
+// Value in seconds which will be used for connecting to the daemon
+// See http://php.net/manual/en/memcache.addserver.php
+$config['memcache_timeout'] = 1;
+
+// Controls how often a failed server will be retried (value in seconds).
+// Setting this parameter to -1 disables automatic retry.
+// See http://php.net/manual/en/memcache.addserver.php
+$config['memcache_retry_interval'] = 15;
+
+// use these hosts for accessing Redis.
+// Currently only one host is supported. cluster support may come in a future release.
+// You can pass 4 fields, host, port, database and password.
+// Unset fields will be set to the default values host=127.0.0.1, port=6379, database=0, password=  (empty)
+$config['redis_hosts'] = null; // e.g. array( 'localhost:6379' );  array( '192.168.1.1:6379:1:secret' );
+
+// Maximum size of an object in memcache (in bytes). Default: 2MB
+$config['memcache_max_allowed_packet'] = '2M';
+
+// Maximum size of an object in APC cache (in bytes). Default: 2MB
+$config['apc_max_allowed_packet'] = '2M';
+
+
 // ----------------------------------
 // SYSTEM
 // ----------------------------------
@ -422,30 +456,6 @@ $config['session_path'] = null;
 // Setting this value to 'php' will use the default session save handler configured in PHP
 $config['session_storage'] = 'db';

-// Use these hosts for accessing memcached
-// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
-$config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );
-
-// Controls the use of a persistent connections to memcache servers
-// See http://php.net/manual/en/memcache.addserver.php
-$config['memcache_pconnect'] = true;
-
-// Value in seconds which will be used for connecting to the daemon
-// See http://php.net/manual/en/memcache.addserver.php
-$config['memcache_timeout'] = 1;
-
-// Controls how often a failed server will be retried (value in seconds).
-// Setting this parameter to -1 disables automatic retry.
-// See http://php.net/manual/en/memcache.addserver.php
-$config['memcache_retry_interval'] = 15;
-
-// use this for accessing redis
-// currently only one host is supported. cluster support may come in a future release.
-// you can pass 4 fields, host, port, database and password.
-// unset fields will be set to the default values host=127.0.0.1, port=6379, database=0, password=  (empty)
-
-$config['redis_hosts'] = null; // e.g. array( 'localhost:6379' );  array( '192.168.1.1:6379:1:secret' );
-
 // check client IP in session authorization
 $config['ip_check'] = false;

@ -1022,11 +1032,11 @@ $config['addressbook_pagesize'] = 50;
 // sort contacts by this col (preferably either one of name, firstname, surname)
 $config['addressbook_sort_col'] = 'surname';

-// the way how contact names are displayed in the list
-// 0: display name
-// 1: (prefix) firstname middlename surname (suffix)
-// 2: (prefix) surname firstname middlename (suffix)
-// 3: (prefix) surname, firstname middlename (suffix)
+// The way how contact names are displayed in the list.
+// 0: prefix firstname middlename surname suffix (only if display name is not set)
+// 1: firstname middlename surname
+// 2: surname firstname middlename
+// 3: surname, firstname middlename
 $config['addressbook_name_listing'] = 0;

 // use this timezone to display date/time
--- a/index.php
+++ b/index.php
@ -2,9 +2,9 @@
 /**
 +-------------------------------------------------------------------------+
 | Roundcube Webmail IMAP Client                                           |
- | Version 1.2-git                                                         |
+ | Version 1.2.10                                                          |
 |                                                                         |
- | Copyright (C) 2005-2015, The Roundcube Dev Team                         |
+ | Copyright (C) 2005-2017, The Roundcube Dev Team                         |
 |                                                                         |
 | This program is free software: you can redistribute it and/or modify    |
 | it under the terms of the GNU General Public License (with exceptions   |
@ -93,7 +93,9 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
    $request_valid = $_SESSION['temp'] && $RCMAIL->check_request();

    // purge the session in case of new login when a session already exists
-    $RCMAIL->kill_session();
+    if ($request_valid) {
+        $RCMAIL->kill_session();
+    }

    $auth = $RCMAIL->plugins->exec_hook('authenticate', array(
        'host' => $RCMAIL->autoselect_host(),
@ -168,13 +170,15 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
        $RCMAIL->plugins->exec_hook('login_failed', array(
            'code' => $error_code, 'host' => $auth['host'], 'user' => $auth['user']));

-        $RCMAIL->kill_session();
+        if (!isset($_SESSION['user_id'])) {
+            $RCMAIL->kill_session();
+        }
    }
 }

 // end session
 else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id'])) {
-    $RCMAIL->request_security_check($mode = rcube_utils::INPUT_GET);
+    $RCMAIL->request_security_check(rcube_utils::INPUT_GET | rcube_utils::INPUT_POST);

    $userdata = array(
        'user' => $_SESSION['username'],
@ -243,7 +247,7 @@ else {
    $disabled_actions = (array) $RCMAIL->config->get('disabled_actions');
    if (in_array($RCMAIL->task . '.' . ($RCMAIL->action ?: 'index'), $disabled_actions)) {
        rcube::raise_error(array(
-            'code' => 403, 'type' => 'php',
+            'code' => 404, 'type' => 'php',
            'message' => "Action disabled"), true, true);
    }
 }
--- a/installer/index.php
+++ b/installer/index.php
@ -3,9 +3,9 @@
 /**
 +-------------------------------------------------------------------------+
 | Roundcube Webmail setup tool                                            |
- | Version 1.2-git                                                         |
+ | Version 1.2.10                                                          |
 |                                                                         |
- | Copyright (C) 2009-2015, The Roundcube Dev Team                         |
+ | Copyright (C) 2009-2017, The Roundcube Dev Team                         |
 |                                                                         |
 | This program is free software: you can redistribute it and/or modify    |
 | it under the terms of the GNU General Public License (with exceptions   |
--- a/plugins/acl/localization/br.inc
+++ b/plugins/acl/localization/br.inc
@ -18,31 +18,81 @@
 $labels['sharing'] = 'Rannañ';
 $labels['myrights'] = 'Aotreoù mont e-barzh';
 $labels['username'] = 'Implijer:';
-$labels['newuser'] = 'Ouzhpenan un enporzh';
+$labels['advanced'] = 'Mod kempleshoc\'h';
+$labels['newuser'] = 'Ouzhpennañ un elfenn';
+$labels['editperms'] = 'Embann an aotreoù';
 $labels['actions'] = 'Aotreoù mont e-barzh';
 $labels['anyone'] = 'An holl implijerien (neb hini)';
-$labels['anonymous'] = 'pedet (dizanv)';
-$labels['aclr'] = 'Kemennadoù lennet';
-$labels['aclc'] = 'Krouiñ isrenkelloù';
-$labels['aclk'] = 'Krouiñ isrenkelloù';
-$labels['acld'] = 'Dilemel kemennadoù';
-$labels['aclt'] = 'Dilemel kemennadoù';
-$labels['aclx'] = 'Dilemel ar renkell';
-$labels['aclread'] = 'Lennet';
+$labels['anonymous'] = 'Kouvidi (dizanv)';
+$labels['identifier'] = 'Naoudi';
+$labels['acll'] = 'Taol sell';
+$labels['aclr'] = 'Kemennadennoù lennet';
+$labels['acls'] = 'Derc\'hel ar stad "Gwelet"';
+$labels['aclw'] = 'Bannieloù skrivañ';
+$labels['acli'] = 'Enlakaat (Eilañ an digoradur)';
+$labels['aclp'] = 'Postañ';
+$labels['aclc'] = 'Krouiñ isteuliadoù';
+$labels['aclk'] = 'Krouiñ isteuliadoù';
+$labels['acld'] = 'Dilemel kemennadennoù';
+$labels['aclt'] = 'Dilemel kemennadennoù';
+$labels['acle'] = 'Skarzhañ';
+$labels['aclx'] = 'Dilemel an teuliad';
+$labels['acla'] = 'Ardeiñ';
+$labels['acln'] = 'Notennaouiñ kemennadennoù';
+$labels['aclfull'] = 'Reoliadur a-bezh';
+$labels['aclother'] = 'All';
+$labels['aclread'] = 'Lenn';
 $labels['aclwrite'] = 'Skrivañ';
 $labels['acldelete'] = 'Dilemel';
+$labels['shortacll'] = 'Teurel ur sell';
 $labels['shortaclr'] = 'Lenn';
-$labels['shortacls'] = 'Gwarezin';
+$labels['shortacls'] = 'Derc\'hel';
 $labels['shortaclw'] = 'Skrivañ';
 $labels['shortacli'] = 'Enlakaat';
+$labels['shortaclp'] = 'Postañ';
 $labels['shortaclc'] = 'Krouiñ';
 $labels['shortaclk'] = 'Krouiñ';
 $labels['shortacld'] = 'Dilemel';
 $labels['shortaclt'] = 'Dilemel';
-$labels['shortacle'] = 'Dilemel pep tra';
-$labels['shortaclx'] = 'Dilemel ar renkell';
-$labels['shortaclother'] = 'traoù all';
+$labels['shortacle'] = 'Skarzhañ';
+$labels['shortaclx'] = 'Dilemel an teuliad';
+$labels['shortacla'] = 'Ardeiñ';
+$labels['shortacln'] = 'Notennaouiñ';
+$labels['shortaclother'] = 'Traoù all';
 $labels['shortaclread'] = 'Lenn';
 $labels['shortaclwrite'] = 'Skrivañ';
 $labels['shortacldelete'] = 'Dilemel';
+$labels['longacll'] = 'Gwelus eo an teuliad-se er rolloù ha gallout a reer bezañ koumanantet dezhañ';
+$labels['longaclr'] = 'Gallout a reer digeriñ an teuliad-mañ evit e lenn';
+$labels['longacls'] = 'Gallout a reer kemmañ ar bannieloù "Kemennadenn gwelet"';
+$labels['longaclw'] = 'Gallout a reer kemmañ an bannieloù kemennadennoù hag ar gerioù-alc\'hwez, war-bouez "Gwelet" ha "Dilamet"';
+$labels['longacli'] = 'Gallout a ra ar c\'hemennadennoù bezañ skrivet be eilet en teuliad';
+$labels['longaclp'] = 'Gallout a reer postañ kemennadennoù d\'an teuliad-mañ';
+$labels['longaclc'] = 'Gallout a reer krouiñ (pe adenvel) teuliadoù en teuliad war-eeun';
+$labels['longaclk'] = 'Gallout a reer krouiñ (pe adenvel) teuliadoù en teuliad war-eeun';
+$labels['longacld'] = 'Gallout a reer kemmañ ar banniel ""Kemennadenn dilamet"';
+$labels['longaclt'] = 'Gallout a reer kemmañ ar banniel ""Kemennadenn dilamet"';
+$labels['longacle'] = 'Gallout a reer skarzhañ ar c\'hemennadennoù';
+$labels['longaclx'] = 'Gallout a ra bezañ dilamet pe adanvet an teuliad';
+$labels['longacla'] = 'Gallout a reer kemmañ aotreoù haeziñ an teuliad';
+$labels['longacln'] = 'Metaroadennoù rannet (notennoù) ar c\'hemennadennoù a c\'hell bezañ kemmet';
+$labels['longaclfull'] = 'Reoliadur a-bezh, ardeiñ an teuliad en o zouez';
+$labels['longaclread'] = 'Gallout a reer digeriñ an teuliad evit e lenn';
+$labels['longaclwrite'] = 'Gallout a reer merkañ, skrivañ pe eilañ kemennadennoù d\'an teuliad';
+$labels['longacldelete'] = 'Gallout a reer dilemel ar c\'hemennadennoù';
+$labels['longaclother'] = 'Aotreoù haeziñ all';
+$labels['ariasummaryacltable'] = 'Roll an aotreoù haeziñ';
+$labels['arialabelaclactions'] = 'Roll ar gweredoù';
+$labels['arialabelaclform'] = 'Aotreoù haeziñ a-berzh';
+$messages['deleting'] = 'O tilemel an aotreoù haeziñ...';
+$messages['saving'] = 'Oc\'h enrollañ an aotreoù haeziñ...';
+$messages['updatesuccess'] = 'Kemmet an aotreoù haeziñ gant berzh';
+$messages['deletesuccess'] = 'Dilamet an aotreoù haeziñ gant berzh';
+$messages['createsuccess'] = 'Ouzhpennet an aotreoù haeziñ gant berzh';
+$messages['updateerror'] = 'N\'haller ket hizivaat an aotreoù haeziñ';
+$messages['deleteerror'] = 'N\'haller ket dilemel an aotreoù haeziñ';
+$messages['createerror'] = 'N\'haller ket ouzhpennañ aotreoù haeziñ';
+$messages['deleteconfirm'] = 'Sur oc\'h e fell deoc\'h dilemel aotreoù haeziñ an arveriaded diuzet?';
+$messages['norights'] = 'Aotre ebet erspizet!';
+$messages['nouser'] = 'Anv arveriad ebet erspizet!';
 ?>
--- a/plugins/acl/localization/de_DE.inc
+++ b/plugins/acl/localization/de_DE.inc
@ -21,7 +21,7 @@ $labels['username'] = 'Benutzer:';
 $labels['advanced'] = 'Erweiterter Modus';
 $labels['newuser'] = 'Eintrag hinzufügen';
 $labels['editperms'] = 'Zugriffsrechte bearbeiten';
-$labels['actions'] = 'Zugriffsrechte Aktionen...';
+$labels['actions'] = 'Zugriffsrechteaktionen …';
 $labels['anyone'] = 'Alle Benutzer (anyone)';
 $labels['anonymous'] = 'Gäste (anonymous)';
 $labels['identifier'] = 'Bezeichnung';
--- a/plugins/acl/localization/sl_SI.inc
+++ b/plugins/acl/localization/sl_SI.inc
@ -38,6 +38,7 @@ $labels['aclt'] = 'Izbriši sporočila';
 $labels['acle'] = 'Izbriši';
 $labels['aclx'] = 'Izbriši mapo';
 $labels['acla'] = 'Uredi';
+$labels['acln'] = 'Komentarji';
 $labels['aclfull'] = 'Popolno upravljanje';
 $labels['aclother'] = 'Ostalo';
 $labels['aclread'] = 'Preberi';
@ -56,6 +57,7 @@ $labels['shortaclt'] = 'Izbriši';
 $labels['shortacle'] = 'Izbriši';
 $labels['shortaclx'] = 'Izbriši mapo';
 $labels['shortacla'] = 'Uredi';
+$labels['shortacln'] = 'Dodaj komentar';
 $labels['shortaclother'] = 'Ostalo';
 $labels['shortaclread'] = 'Preberi';
 $labels['shortaclwrite'] = 'Sestavi';
@ -73,10 +75,15 @@ $labels['longaclt'] = 'Oznako sporočila  \'Izbrisano\' je mogoče spremeniti';
 $labels['longacle'] = 'Sporočila so lahko izbrisana';
 $labels['longaclx'] = 'Mapa je lahko izbrisana ali preimenovana';
 $labels['longacla'] = 'Pravice na mapi so lahko spremenjene';
+$labels['longacln'] = 'Metapodatke (komentarjev), ki so v skupni rabi, je mogoče spremeniti';
 $labels['longaclfull'] = 'Popolno upravljanje, vključno z urejanjem map';
 $labels['longaclread'] = 'Mapa je na voljo za branje';
 $labels['longaclwrite'] = 'Sporočila je mogoče označiti, sestaviti ali kopirati v mapo';
 $labels['longacldelete'] = 'Sporočila so lahko izbrisana';
+$labels['longaclother'] = 'Ostale pravice dostopa';
+$labels['ariasummaryacltable'] = 'Seznam pravic dostopa';
+$labels['arialabelaclactions'] = 'Prikaži možnosti';
+$labels['arialabelaclform'] = 'Obrazec za nastavitve pravic dostopa';
 $messages['deleting'] = 'Brisanje pravic';
 $messages['saving'] = 'Shranjevanje pravic';
 $messages['updatesuccess'] = 'Pravice so bile uspešno spremenjene';
--- a/plugins/acl/localization/sq_AL.inc
+++ b/plugins/acl/localization/sq_AL.inc
@ -15,11 +15,82 @@

 For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-$labels['aclr'] = 'Lexo mesazhet';
-$labels['aclwrite'] = 'Shkruaj';
+$labels['myrights'] = 'Të drejta Hyrjeje';
+$labels['username'] = 'Përdorues:';
+$labels['advanced'] = 'Mënyra e përparuar';
+$labels['newuser'] = 'Shtoni zë';
+$labels['editperms'] = 'Përpunoni leje';
+$labels['actions'] = 'Veprime të drejtash hyrjeje…';
+$labels['anyone'] = 'Krejt përdoruesit (cilido)';
+$labels['anonymous'] = 'Mysafirë (në mënyrë anonime)';
+$labels['identifier'] = 'Identifikues';
+$labels['acll'] = 'Kërkim';
+$labels['aclr'] = 'Lexoni mesazhe';
+$labels['acls'] = 'Mbaje gjendjen i Parë';
+$labels['acli'] = 'Fut (Kopje te)';
+$labels['aclp'] = 'Postim';
+$labels['aclc'] = 'Krijo nëndosje';
+$labels['aclk'] = 'Krijo nëndosje';
+$labels['acld'] = 'Fshiji mesazhet';
+$labels['aclt'] = 'Fshiji mesazhet';
+$labels['acle'] = 'Spastroje';
+$labels['aclx'] = 'Fshije dosjen';
+$labels['acla'] = 'Administroni';
+$labels['acln'] = 'Shto shënime te mesazhet';
+$labels['aclfull'] = 'Kontroll i plotë';
+$labels['aclother'] = 'Tjetër';
+$labels['aclread'] = 'Leximi';
+$labels['aclwrite'] = 'Shkrimi';
 $labels['acldelete'] = 'Fshije';
-$labels['shortaclc'] = 'Krijo';
-$labels['shortaclk'] = 'Krijo';
+$labels['shortacll'] = 'Kërkim';
+$labels['shortaclr'] = 'Leximi';
+$labels['shortacls'] = 'Mbaje';
+$labels['shortaclw'] = 'Shkrimi';
+$labels['shortacli'] = 'Fut';
+$labels['shortaclp'] = 'Posto';
+$labels['shortaclc'] = 'Krijoje';
+$labels['shortaclk'] = 'Krijoje';
 $labels['shortacld'] = 'Fshije';
 $labels['shortaclt'] = 'Fshije';
+$labels['shortacle'] = 'Spastro';
+$labels['shortaclx'] = 'Fshirje dosjeje';
+$labels['shortacla'] = 'Administro';
+$labels['shortacln'] = 'Shto shënim';
+$labels['shortaclother'] = 'Tjetër';
+$labels['shortaclread'] = 'Leximi';
+$labels['shortaclwrite'] = 'Shkrimi';
+$labels['shortacldelete'] = 'Fshirjeje';
+$labels['longacll'] = 'Dosja është e dukshme në lista dhe në të mund të pajtoheni';
+$labels['longaclr'] = 'Dosja mund të hapet për lexim';
+$labels['longacls'] = 'Mund të ndryshohet shenja Mesazhe të Parë';
+$labels['longaclw'] = 'Mund të ndryshohen shenjat dhe fjalëkyçet për mesazhet, hiq të Parë dhe të Fshirë';
+$labels['longacli'] = 'Mesazhet mund të shkruhen ose kopjohen në dosje';
+$labels['longaclp'] = 'Mesazhet mund të postohen te kjo dosje';
+$labels['longaclc'] = 'Dosjet mund të krijohen (ose riemërtohen) drejt e nën këtë dosje';
+$labels['longaclk'] = 'Dosjet mund të krijohen (ose riemërtohen) drejt e nën këtë dosje';
+$labels['longacld'] = 'Mund të ndryshohet shenja Mesazhe të Fshirë';
+$labels['longaclt'] = 'Mund të ndryshohet shenja Mesazhe të Parë';
+$labels['longacle'] = 'Mesazhet mund të spastrohen';
+$labels['longaclx'] = 'Dosja mund të fshihet ose riemërtohet';
+$labels['longacla'] = 'Mund të ndryshohen të drejta hyrjeje te dosja';
+$labels['longacln'] = 'Mund të ndryshohen tejtëdhëna të përbashkëta (shënime) mesazhesh';
+$labels['longaclfull'] = 'Kontroll i plotë, përfshi administrim dosjesh';
+$labels['longaclread'] = 'Dosja mund të hapet për lexim';
+$labels['longaclwrite'] = 'Mesazheve mund t’u vihet shenjë, shkruhen ose kopjohen te dosja';
+$labels['longacldelete'] = 'Mesazhet mund të fshihen';
+$labels['longaclother'] = 'Të tjera të drejta hyrjesh';
+$labels['ariasummaryacltable'] = 'Listë të drejtash hyrjeje';
+$labels['arialabelaclactions'] = 'Paraqit veprime';
+$labels['arialabelaclform'] = 'Formular të drejtash hyrjeje';
+$messages['deleting'] = 'Po fshihen të drejta hyrjeje…';
+$messages['saving'] = 'Po ruhen të drejtash hyrjeje…';
+$messages['updatesuccess'] = 'U ndryshuan me sukses të drejta hyrjeje';
+$messages['deletesuccess'] = 'U fshinë me sukses të drejta hyrjeje';
+$messages['createsuccess'] = 'U shtuan me sukses të drejta hyrjeje';
+$messages['updateerror'] = 'I pazoti të përditësojë të drejta hyrjeje';
+$messages['deleteerror'] = 'I pazoti të fshijë të drejta hyrjeje';
+$messages['createerror'] = 'I pazoti të shtojë të drejta hyrjeje';
+$messages['deleteconfirm'] = 'Jeni i sigurt, doni t’i hiqni të drejta hyrjeje përdoruesit(ve) të përzgjedhur?';
+$messages['norights'] = 'Nuk janë specifikuar të drejta!';
+$messages['nouser'] = 'Nuk është specifikuar emër përdoruesi!';
 ?>
--- a/plugins/acl/localization/tr_TR.inc
+++ b/plugins/acl/localization/tr_TR.inc
@ -16,30 +16,30 @@
 For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 $labels['sharing'] = 'Paylaşım';
-$labels['myrights'] = 'Erişim Hakları';
+$labels['myrights'] = 'Erişim İzinleri';
 $labels['username'] = 'Kullanıcı:';
-$labels['advanced'] = 'Gelişmiş mod';
-$labels['newuser'] = 'Girdi ekle';
+$labels['advanced'] = 'Gelişmiş kip';
+$labels['newuser'] = 'Kayıt ekle';
 $labels['editperms'] = 'İzinleri düzenle';
-$labels['actions'] = 'Erişim hakları aksiyonları...';
-$labels['anyone'] = 'Tüm kullanıcılar(kim olursa)';
-$labels['anonymous'] = 'Ziyaretçiler(anonim)';
+$labels['actions'] = 'Erişim izinleri işlemleri...';
+$labels['anyone'] = 'Tüm kullanıcılar (kim olursa)';
+$labels['anonymous'] = 'Ziyaretçiler (isimsiz)';
 $labels['identifier'] = 'Tanımlayıcı';
 $labels['acll'] = 'Arama';
-$labels['aclr'] = 'Mesajları oku';
-$labels['acls'] = 'Göründü durumunu muhafaza et';
-$labels['aclw'] = 'Yazma bayrakları';
-$labels['acli'] = 'Ekle(kopyala)';
+$labels['aclr'] = 'İletileri oku';
+$labels['acls'] = 'Okundu durumu korunsun';
+$labels['aclw'] = 'Yazma işaretleri';
+$labels['acli'] = 'Ekle (kopyala)';
 $labels['aclp'] = 'Gönder';
-$labels['aclc'] = 'Alt dizinler oluştur';
-$labels['aclk'] = 'Alt dizinler oluştur';
-$labels['acld'] = 'Mesajları  sil';
-$labels['aclt'] = 'Mesajları  sil';
+$labels['aclc'] = 'Alt klasörler oluştur';
+$labels['aclk'] = 'Alt klasörler oluştur';
+$labels['acld'] = 'İletileri sil';
+$labels['aclt'] = 'İletileri sil';
 $labels['acle'] = 'Sil';
-$labels['aclx'] = 'Dizini sil';
+$labels['aclx'] = 'Klasörü sil';
 $labels['acla'] = 'Yönet';
-$labels['acln'] = 'Mesajlara not ekle';
-$labels['aclfull'] = 'Tam kontrol';
+$labels['acln'] = 'İletilere not ekle';
+$labels['aclfull'] = 'Tam denetim';
 $labels['aclother'] = 'Diğer';
 $labels['aclread'] = 'Oku';
 $labels['aclwrite'] = 'Yaz';
@ -55,7 +55,7 @@ $labels['shortaclk'] = 'Oluştur';
 $labels['shortacld'] = 'Sil';
 $labels['shortaclt'] = 'Sil';
 $labels['shortacle'] = 'Sil';
-$labels['shortaclx'] = 'Dizin sil';
+$labels['shortaclx'] = 'Klasörü sil';
 $labels['shortacla'] = 'Yönet';
 $labels['shortacln'] = 'Not ekle';
 $labels['shortaclother'] = 'Diğer';
@ -63,36 +63,36 @@ $labels['shortaclread'] = 'Oku';
 $labels['shortaclwrite'] = 'Yaz';
 $labels['shortacldelete'] = 'Sil';
 $labels['longacll'] = 'Klasör listesinde görülebilir ve abone olunabilir';
-$labels['longaclr'] = 'Dizin yazma için okunabilir';
-$labels['longacls'] = 'Mesajların göründü bayrağı değiştirilebilir';
-$labels['longaclw'] = 'Görülme ve Silinme bayrakları hariç bayraklar ve anahtar kelimeler değiştirilebilir';
-$labels['longacli'] = 'Mesajlar dizini yazılabilir veya kopyalanabilir';
-$labels['longaclp'] = 'Mesajlar bu dizine gönderilebilir';
-$labels['longaclc'] = 'Dizinler doğrudan bu klasör altında oluşturulabilir veya yeniden adlandırılabilir.';
-$labels['longaclk'] = 'Dizinler doğrudan bu klasör altında oluşturulabilir veya yeniden adlandırılabilir.';
-$labels['longacld'] = 'mesajları sil bayrakları değiştirilebilir';
-$labels['longaclt'] = 'mesajları sil, bayraklar değiştirilebilir';
-$labels['longacle'] = 'Mesajlar silinebilir';
-$labels['longaclx'] = 'Klasörü silinebilir veya yeniden adlandırılabilir';
-$labels['longacla'] = 'Dizin erişim hakları değiştirilebilir';
-$labels['longacln'] = 'Mesajların paylaşılan üst verileri (notlar) değiştirilebilir';
-$labels['longaclfull'] = 'Dizin yönetimi de dahil olmak üzere tam kontrol';
-$labels['longaclread'] = 'Dizin yazma için okunabilir';
-$labels['longaclwrite'] = 'Dizin yönetimi de dahil olmak üzere tam kontrol';
-$labels['longacldelete'] = 'Mesajlar silinebilir';
-$labels['longaclother'] = 'Diğer erişim hakları';
-$labels['ariasummaryacltable'] = 'Erişim hakları listesi';
-$labels['arialabelaclactions'] = 'Aksiyon listesi';
-$labels['arialabelaclform'] = 'Erişim hakları formu';
-$messages['deleting'] = 'Erişim hakları siliniyor...';
-$messages['saving'] = 'Erişim hakları kaydediliyor...';
-$messages['updatesuccess'] = 'Erişim hakları değiştirildi';
-$messages['deletesuccess'] = 'Erişim hakları silindi';
-$messages['createsuccess'] = 'Erişim hakları eklendi';
-$messages['updateerror'] = 'Erişim hakları güncellenemedi';
-$messages['deleteerror'] = 'Erişim haklarını silinemedi';
-$messages['createerror'] = 'Erişim hakları eklenemedi';
-$messages['deleteconfirm'] = 'Seçilen kullanıcılar için erişim haklarını silmek istediğinizden emin misiniz?';
-$messages['norights'] = 'Hiçbir hak belirtilmemiş!';
-$messages['nouser'] = 'Hiçbir kullanıcı belirtilmemiş!';
+$labels['longaclr'] = 'Klasör okunmak üzere açılabilir';
+$labels['longacls'] = 'İletilerin Okundu işareti değiştirilebilir';
+$labels['longaclw'] = 'Okundu ve Silindi işaretleri dışındaki işaret ve anahtar sözcükler değiştirilebilir';
+$labels['longacli'] = 'Klasöre iletiler yazılabilir ya da kopyalanabilir';
+$labels['longaclp'] = 'İletiler bu klasöre gönderilebilir';
+$labels['longaclc'] = 'Klasörler doğrudan bu klasör altında oluşturulabilir (ya da yeniden adlandırılabilir).';
+$labels['longaclk'] = 'Klasörler doğrudan bu klasör altında oluşturulabilir (ya da yeniden adlandırılabilir).';
+$labels['longacld'] = 'İleti Silindi işareti değiştirilebilir';
+$labels['longaclt'] = 'İleti Silindi işareti değiştirilebilir';
+$labels['longacle'] = 'İletiler silinebilir';
+$labels['longaclx'] = 'Klasör silinebilir ya da yeniden adlandırılabilir';
+$labels['longacla'] = 'Klasör erişim izinleri değiştirilebilir';
+$labels['longacln'] = 'İletilerin paylaşılan üst verileri (notlar) değiştirilebilir';
+$labels['longaclfull'] = 'Klasör yönetimi dahil tam denetim';
+$labels['longaclread'] = 'Klasör okunmak üzere açılabilir';
+$labels['longaclwrite'] = 'Klasöre iletiler işaretlenebilir, yazılabilir ya da kopyalanabilir';
+$labels['longacldelete'] = 'İletiler silinebilir';
+$labels['longaclother'] = 'Diğer erişim izinleri';
+$labels['ariasummaryacltable'] = 'Erişim izinleri listesi';
+$labels['arialabelaclactions'] = 'İşlem listesi';
+$labels['arialabelaclform'] = 'Erişim izinleri formu';
+$messages['deleting'] = 'Erişim izinleri siliniyor...';
+$messages['saving'] = 'Erişim izinleri kaydediliyor...';
+$messages['updatesuccess'] = 'Erişim izinleri değiştirildi';
+$messages['deletesuccess'] = 'Erişim izinleri silindi';
+$messages['createsuccess'] = 'Erişim izinleri eklendi';
+$messages['updateerror'] = 'Erişim izinleri güncellenemedi';
+$messages['deleteerror'] = 'Erişim izinleri silinemedi';
+$messages['createerror'] = 'Erişim izinleri eklenemedi';
+$messages['deleteconfirm'] = 'Seçilmiş kullanıcılar için erişim izinlerini silmek istediğinize emin misiniz?';
+$messages['norights'] = 'Herhangi bir izin belirtilmemiş!';
+$messages['nouser'] = 'Herhangi bir kullanıcı belirtilmemiş!';
 ?>
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@ -1,6 +1,6 @@
 /**
 * Archive plugin script
- * @version 2.3
+ * @version 2.4
 *
 * @licstart  The following is the entire license notice for the
 * JavaScript code in this file.
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@ -6,7 +6,7 @@
 * Plugin that adds a new button to the mailbox toolbar
 * to move messages to a (user selectable) archive folder.
 *
- * @version 2.3
+ * @version 2.4
 * @license GNU GPLv3+
 * @author Andre Rodier, Thomas Bruederli, Aleksander Machniak
 */
@ -122,8 +122,10 @@ class archive extends rcube_plugin
      $index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order());
      $messageset = array($current_mbox => $index->get());
    }
-    else {
-      $messageset = rcmail::get_uids();
+    else if (!empty($uids)) {
+      $messageset = rcmail::get_uids($uids, $current_mbox);
+    } else {
+      $messageset = array();
    }

    foreach ($messageset as $mbox => $uids) {
@ -245,14 +247,22 @@ class archive extends rcube_plugin
      $rcmail = rcmail::get_instance();

      // load folders list when needed
-      if ($CURR_SECTION)
-        $select = $rcmail->folder_selector(array('noselection' => '---', 'realnames' => true,
-          'maxlength' => 30, 'exceptions' => array('INBOX'), 'folder_filter' => 'mail', 'folder_rights' => 'w'));
-      else
+      if ($CURR_SECTION) {
+        $select = $rcmail->folder_selector(array(
+            'noselection'   => '---',
+            'realnames'     => true,
+            'maxlength'     => 30,
+            'folder_filter' => 'mail',
+            'folder_rights' => 'w',
+            'onchange'      => "if ($(this).val() == 'INBOX') $(this).val('')",
+        ));
+      }
+      else {
        $select = new html_select();
+      }

      $args['blocks']['main']['options']['archive_mbox'] = array(
-          'title' => $this->gettext('archivefolder'),
+          'title'   => $this->gettext('archivefolder'),
          'content' => $select->show($rcmail->config->get('archive_mbox'), array('name' => "_archive_mbox"))
      );

--- a/plugins/archive/composer.json
+++ b/plugins/archive/composer.json
@ -3,7 +3,7 @@
    "type": "roundcube-plugin",
    "description": "This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.",
    "license": "GPLv3+",
-    "version": "2.3",
+    "version": "2.4",
    "authors": [
        {
            "name": "Thomas Bruederli",
--- a/plugins/archive/localization/ar_SA.inc
+++ b/plugins/archive/localization/ar_SA.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/ast.inc
+++ b/plugins/archive/localization/ast.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/az_AZ.inc
+++ b/plugins/archive/localization/az_AZ.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/be_BE.inc
+++ b/plugins/archive/localization/be_BE.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/bg_BG.inc
+++ b/plugins/archive/localization/bg_BG.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Месец (пр. Архив/2012/06)';
 $labels['archivetypefolder'] = 'Оригинална папка';
 $labels['archivetypesender'] = 'E-mail адрес на подател';
 $labels['unkownsender'] = 'неизвестно';
+$labels['readonarchive'] = 'Маркирай писмото като прочетено в архива';
 ?>
--- a/plugins/archive/localization/br.inc
+++ b/plugins/archive/localization/br.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -16,8 +16,16 @@
 For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 $labels['buttontext'] = 'Diell';
-$labels['buttontitle'] = 'Dielliñ ar gemenadenn-mañ';
-$labels['archived'] = 'Diellet gant berzh';
+$labels['buttontitle'] = 'Diellaouiñ ar gemennadenn-mañ';
+$labels['archived'] = 'Diellaouet gant berzh';
+$labels['archivedreload'] = 'Diellaouet gant berzh. Adkargit ar bajenn da welet an teuliad dielloù nevez.';
+$labels['archiveerror'] = 'Ul lodenn eus ar c\'hemennadennoù n\'hallont ket bezañ diellaouet';
 $labels['archivefolder'] = 'Diell';
+$labels['settingstitle'] = 'Diell';
+$labels['archivetype'] = 'Rannañ an diell dre';
+$labels['archivetypeyear'] = 'Bloaz (sk: Diell/2012)';
+$labels['archivetypemonth'] = 'Miz (sk: Diell/2012/06)';
+$labels['archivetypefolder'] = 'Teuliad orin';
+$labels['archivetypesender'] = 'Postel ar c\'haser';
 $labels['unkownsender'] = 'dianav';
 ?>
--- a/plugins/archive/localization/bs_BA.inc
+++ b/plugins/archive/localization/bs_BA.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/ca_ES.inc
+++ b/plugins/archive/localization/ca_ES.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/cs_CZ.inc
+++ b/plugins/archive/localization/cs_CZ.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/cy_GB.inc
+++ b/plugins/archive/localization/cy_GB.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Mis (e.g. Archif/2012/06)';
 $labels['archivetypefolder'] = 'Ffolder gwreiddiol';
 $labels['archivetypesender'] = 'Ebost anfonwr';
 $labels['unkownsender'] = 'anhysbys';
+$labels['readonarchive'] = 'Nodi\'r neges fel darllenwyd ar archif';
 ?>
--- a/plugins/archive/localization/da_DK.inc
+++ b/plugins/archive/localization/da_DK.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Måned (f.eks. Arkiv/2012/06)';
 $labels['archivetypefolder'] = 'Original mappe';
 $labels['archivetypesender'] = 'Afsenders email';
 $labels['unkownsender'] = 'ukendt';
+$labels['readonarchive'] = 'Marker denne meddelelse som læst i arkivet';
 ?>
--- a/plugins/archive/localization/de_CH.inc
+++ b/plugins/archive/localization/de_CH.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Monat (z.B. Archiv/2012/06)';
 $labels['archivetypefolder'] = 'Originalordner';
 $labels['archivetypesender'] = 'Absender';
 $labels['unkownsender'] = 'unbekannt';
+$labels['readonarchive'] = 'Nachrichten beim Archivieren als gelesen markieren';
 ?>
--- a/plugins/archive/localization/de_DE.inc
+++ b/plugins/archive/localization/de_DE.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -18,7 +18,7 @@
 $labels['buttontext'] = 'Archiv';
 $labels['buttontitle'] = 'Nachricht archivieren';
 $labels['archived'] = 'Nachricht erfolgreich archiviert';
-$labels['archivedreload'] = 'Erfolgreich archiviert. Seite aktualisieren um die neuen Archiv-Ordner zu sehen';
+$labels['archivedreload'] = 'Erfolgreich archiviert. Bitte die Seite aktualisieren, um die neuen Archivordner zu sehen.';
 $labels['archiveerror'] = 'Einige Nachrichten konnten nicht archiviert werden';
 $labels['archivefolder'] = 'Archiv';
 $labels['settingstitle'] = 'Archiv';
@ -26,6 +26,7 @@ $labels['archivetype'] = 'Archiv aufteilen nach';
 $labels['archivetypeyear'] = 'Jahr (z.B. Archiv/2012)';
 $labels['archivetypemonth'] = 'Monat (z.B. Archiv/2012/06)';
 $labels['archivetypefolder'] = 'Originalordner';
-$labels['archivetypesender'] = 'Absender E-Mail';
+$labels['archivetypesender'] = 'Absender-E-Mail';
 $labels['unkownsender'] = 'unbekannt';
+$labels['readonarchive'] = 'Nachricht im Archiv als gelesen markieren';
 ?>
--- a/plugins/archive/localization/el_GR.inc
+++ b/plugins/archive/localization/el_GR.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/en_CA.inc
+++ b/plugins/archive/localization/en_CA.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/en_GB.inc
+++ b/plugins/archive/localization/en_GB.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/eo.inc
+++ b/plugins/archive/localization/eo.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/es_419.inc
+++ b/plugins/archive/localization/es_419.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/es_AR.inc
+++ b/plugins/archive/localization/es_AR.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/es_ES.inc
+++ b/plugins/archive/localization/es_ES.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Mes (p.ej. Archivo/2012/06)';
 $labels['archivetypefolder'] = 'Bandeja original';
 $labels['archivetypesender'] = 'Correo electrónico del remitente';
 $labels['unkownsender'] = 'desconocido';
+$labels['readonarchive'] = 'Marcar el mensaje como leído al archivar';
 ?>
--- a/plugins/archive/localization/et_EE.inc
+++ b/plugins/archive/localization/et_EE.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/eu_ES.inc
+++ b/plugins/archive/localization/eu_ES.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/fa_AF.inc
+++ b/plugins/archive/localization/fa_AF.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/fa_IR.inc
+++ b/plugins/archive/localization/fa_IR.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/fi_FI.inc
+++ b/plugins/archive/localization/fi_FI.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Kuukaudella (esim. Arkisto/2012/06)';
 $labels['archivetypefolder'] = 'Alkuperäinen kansio';
 $labels['archivetypesender'] = 'Lähettäjän osoite';
 $labels['unkownsender'] = 'tuntematon';
+$labels['readonarchive'] = 'Merkitse viesti luetuksi arkistoon';
 ?>
--- a/plugins/archive/localization/fo_FO.inc
+++ b/plugins/archive/localization/fo_FO.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/fr_FR.inc
+++ b/plugins/archive/localization/fr_FR.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Mois (ex. Archives/2012/06)';
 $labels['archivetypefolder'] = 'Dossier original';
 $labels['archivetypesender'] = 'Courriel de l\'expéditeur';
 $labels['unkownsender'] = 'inconnu';
+$labels['readonarchive'] = 'Marquer le courriel comme lu lors de l\'archivage';
 ?>
--- a/plugins/archive/localization/gl_ES.inc
+++ b/plugins/archive/localization/gl_ES.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/he_IL.inc
+++ b/plugins/archive/localization/he_IL.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'חודש ( לדוגמה, ארכיב/2012/96 )';
 $labels['archivetypefolder'] = 'תיקיה מקורית';
 $labels['archivetypesender'] = 'שולח ההודעה';
 $labels['unkownsender'] = 'לא ידוע';
+$labels['readonarchive'] = 'יש לסמן את ההודעה בארכיב כאילו נקראה';
 ?>
--- a/plugins/archive/localization/hr_HR.inc
+++ b/plugins/archive/localization/hr_HR.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/hu_HU.inc
+++ b/plugins/archive/localization/hu_HU.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Honap ( pl Arhívum/2012/06)';
 $labels['archivetypefolder'] = 'Eredeti mappa';
 $labels['archivetypesender'] = 'Feladó';
 $labels['unkownsender'] = 'ismeretlen';
+$labels['readonarchive'] = 'Üzenet olvasottként jelölése arhiváláskor';
 ?>
--- a/plugins/archive/localization/hy_AM.inc
+++ b/plugins/archive/localization/hy_AM.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/ia.inc
+++ b/plugins/archive/localization/ia.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/id_ID.inc
+++ b/plugins/archive/localization/id_ID.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Bulan (contoh: Arsip/2012/06)';
 $labels['archivetypefolder'] = 'Folder asli';
 $labels['archivetypesender'] = 'Email pengirim';
 $labels['unkownsender'] = 'Tidak dikenal';
+$labels['readonarchive'] = 'Tandai pesan telah dibaca di arsip';
 ?>
--- a/plugins/archive/localization/it_IT.inc
+++ b/plugins/archive/localization/it_IT.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/ja_JP.inc
+++ b/plugins/archive/localization/ja_JP.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = '月 (e.g. アーカイブ/2012/06)';
 $labels['archivetypefolder'] = '元のフォルダー';
 $labels['archivetypesender'] = '電子メールの送信者';
 $labels['unkownsender'] = '不明';
+$labels['readonarchive'] = 'アーカイブでメッセージを既読に設定';
 ?>
--- a/plugins/archive/localization/km_KH.inc
+++ b/plugins/archive/localization/km_KH.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/ko_KR.inc
+++ b/plugins/archive/localization/ko_KR.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = '월 (예: 보관/2012/06)';
 $labels['archivetypefolder'] = '원본 폴더';
 $labels['archivetypesender'] = '발송자 이메일';
 $labels['unkownsender'] = '알 수 없음';
+$labels['readonarchive'] = '편지 보관함에서 메시지를 읽음으로 표시';
 ?>
--- a/plugins/archive/localization/ku.inc
+++ b/plugins/archive/localization/ku.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/ku_IQ.inc
+++ b/plugins/archive/localization/ku_IQ.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/lb_LU.inc
+++ b/plugins/archive/localization/lb_LU.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/lt_LT.inc
+++ b/plugins/archive/localization/lt_LT.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/lv_LV.inc
+++ b/plugins/archive/localization/lv_LV.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/ml_IN.inc
+++ b/plugins/archive/localization/ml_IN.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/mn_MN.inc
+++ b/plugins/archive/localization/mn_MN.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/mr_IN.inc
+++ b/plugins/archive/localization/mr_IN.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/nb_NO.inc
+++ b/plugins/archive/localization/nb_NO.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/nl_NL.inc
+++ b/plugins/archive/localization/nl_NL.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/nn_NO.inc
+++ b/plugins/archive/localization/nn_NO.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/pl_PL.inc
+++ b/plugins/archive/localization/pl_PL.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Miesiąca (np. Archiwum/2012/06)';
 $labels['archivetypefolder'] = 'Oryginalny folder';
 $labels['archivetypesender'] = 'E-mail nadawcy';
 $labels['unkownsender'] = 'nieznany';
+$labels['readonarchive'] = 'Podczas archiwizowania oznacz wiadomość jako przeczytaną';
 ?>
--- a/plugins/archive/localization/pt_BR.inc
+++ b/plugins/archive/localization/pt_BR.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Mês (isto é, Arquivo/2012/06)';
 $labels['archivetypefolder'] = 'Pasta original';
 $labels['archivetypesender'] = 'E-mail do remetente';
 $labels['unkownsender'] = 'desconhecido';
+$labels['readonarchive'] = 'Marcar a mensagem como lida ao arquivar';
 ?>
--- a/plugins/archive/localization/pt_PT.inc
+++ b/plugins/archive/localization/pt_PT.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Mês (ex. Arquivo/2012/06)';
 $labels['archivetypefolder'] = 'Pasta original';
 $labels['archivetypesender'] = 'E-mail do remetente';
 $labels['unkownsender'] = 'desconhecido';
+$labels['readonarchive'] = 'Marcar a mensagem como lida ao arquivar';
 ?>
--- a/plugins/archive/localization/ro_RO.inc
+++ b/plugins/archive/localization/ro_RO.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/ru_RU.inc
+++ b/plugins/archive/localization/ru_RU.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Месяц (например, Архив/2012/06)
 $labels['archivetypefolder'] = 'Исходная папка';
 $labels['archivetypesender'] = 'Адрес отправителя';
 $labels['unkownsender'] = 'неизвестно';
+$labels['readonarchive'] = 'Помечать как прочитанное при архивировании';
 ?>
--- a/plugins/archive/localization/si_LK.inc
+++ b/plugins/archive/localization/si_LK.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/sk_SK.inc
+++ b/plugins/archive/localization/sk_SK.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'mesiacoch (napríklad Archív/2012/06)';
 $labels['archivetypefolder'] = 'Pôvodný priečinok';
 $labels['archivetypesender'] = 'E-mailová adresa odosielateľa';
 $labels['unkownsender'] = 'neznámy';
+$labels['readonarchive'] = 'Pri archivovaní označiť správu ako prečítanú';
 ?>
--- a/plugins/archive/localization/sl_SI.inc
+++ b/plugins/archive/localization/sl_SI.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/sq_AL.inc
+++ b/plugins/archive/localization/sq_AL.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -15,5 +15,18 @@

 For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-$labels['archivetypeyear'] = 'Viti (p.sh. Arkiv/2012)';
+$labels['buttontext'] = 'Arkivoje';
+$labels['buttontitle'] = 'Arkivoje këtë mesazh';
+$labels['archived'] = 'U arkivua me sukses';
+$labels['archivedreload'] = 'U arkivua me sukses. Ringarkoni faqen që të shihni dosjet e reja arkiv.';
+$labels['archiveerror'] = 'Ca nga mesazhet s’u arkivuan dot';
+$labels['archivefolder'] = 'Arkivoje';
+$labels['settingstitle'] = 'Arkivoje';
+$labels['archivetype'] = 'Ndaje arkivin sipas';
+$labels['archivetypeyear'] = 'Vit (p.sh. Arkiv/2012)';
+$labels['archivetypemonth'] = 'Muaj (p.sh. Arkiv/2012/06)';
+$labels['archivetypefolder'] = 'Dosje origjinale';
+$labels['archivetypesender'] = 'Email dërguesi';
+$labels['unkownsender'] = 'e panjohur';
+$labels['readonarchive'] = 'I vini shenjë si të lexuar mesazhit në arkiv';
 ?>
--- a/plugins/archive/localization/sr_CS.inc
+++ b/plugins/archive/localization/sr_CS.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/sv_SE.inc
+++ b/plugins/archive/localization/sv_SE.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Månad (ex. Arkiv/2012/06)';
 $labels['archivetypefolder'] = 'Ursprunglig katalog';
 $labels['archivetypesender'] = 'Avsändaradress';
 $labels['unkownsender'] = 'Okänd';
+$labels['readonarchive'] = 'Märk meddelande som läst vid arkivering';
 ?>
--- a/plugins/archive/localization/tr_TR.inc
+++ b/plugins/archive/localization/tr_TR.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -15,17 +15,18 @@

 For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-$labels['buttontext'] = 'Arşiv';
-$labels['buttontitle'] = 'Bu postayı arşivle';
-$labels['archived'] = 'Arşivleme başarılı.';
-$labels['archivedreload'] = 'Arşivleme başarılı. Yeni arşiv dosyalarını görmek için sayfayı yenileyin.';
-$labels['archiveerror'] = 'Bazı mesajlar arşivlenemedi.';
+$labels['buttontext'] = 'Arşivle';
+$labels['buttontitle'] = 'Bu iletiyi arşivle';
+$labels['archived'] = 'Arşivlendi.';
+$labels['archivedreload'] = 'Arşivlendi. Yeni arşiv klasörlerini görmek için sayfayı yenileyin.';
+$labels['archiveerror'] = 'Bazı iletiler arşivlenemedi';
 $labels['archivefolder'] = 'Arşiv';
 $labels['settingstitle'] = 'Arşiv';
-$labels['archivetype'] = 'Arşivi bununla böl';
+$labels['archivetype'] = 'Arşivleme şuna göre yapılsın';
 $labels['archivetypeyear'] = 'Yıl (Arşiv/2012)';
-$labels['archivetypemonth'] = 'Ay(Arşiv/2012/06)';
+$labels['archivetypemonth'] = 'Ay (Arşiv/2012/06)';
 $labels['archivetypefolder'] = 'Özgün dosya';
-$labels['archivetypesender'] = 'E-Posta Göndericisi';
+$labels['archivetypesender'] = 'Gönderici adresi';
 $labels['unkownsender'] = 'bilinmeyen';
+$labels['readonarchive'] = 'Arşivdeki ileti okunmuş olarak işaretlensin';
 ?>
--- a/plugins/archive/localization/tzl.inc
+++ b/plugins/archive/localization/tzl.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/uk_UA.inc
+++ b/plugins/archive/localization/uk_UA.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@ -28,4 +28,5 @@ $labels['archivetypemonth'] = 'Місяць (наприклад Архів/2012/
 $labels['archivetypefolder'] = 'Оригінальна тека';
 $labels['archivetypesender'] = 'Відправник email';
 $labels['unkownsender'] = 'невідомо';
+$labels['readonarchive'] = 'Позначити повідомлення як прочитане по архіву';
 ?>
--- a/plugins/archive/localization/vi_VN.inc
+++ b/plugins/archive/localization/vi_VN.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/zh_CN.inc
+++ b/plugins/archive/localization/zh_CN.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/archive/localization/zh_TW.inc
+++ b/plugins/archive/localization/zh_TW.inc
@ -5,7 +5,7 @@
 | plugins/archive/localization/<lang>.inc                                |
 |                                                                       |
 | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2016, The Roundcube Dev Team                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
--- a/plugins/attachment_reminder/localization/sq_AL.inc
+++ b/plugins/attachment_reminder/localization/sq_AL.inc
@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
+$messages['forgotattachment'] = "Mos harruat të bashkëngjitni një kartelë?";
+$messages['reminderoption'] = "Kujtoji për bashkëngjitje të harruara";
+$messages['keywords'] = "bashkëngjitje,skedar,kartelë,bashkëngjite,bashkëngjitur,përfshirë,CV,letër shoqëruese";
--- a/plugins/attachment_reminder/localization/tr_TR.inc
+++ b/plugins/attachment_reminder/localization/tr_TR.inc
@ -16,5 +16,5 @@
 For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
 $messages['forgotattachment'] = "Dosya eklemeyi mi unuttunuz?";
-$messages['reminderoption'] = "Dosya ek(ler)i unutulduysa hatırlat.";
+$messages['reminderoption'] = "Dosya ekleme unutulduysa hatırlatılsın";
 $messages['keywords'] = "ekleme,dosya,ek,eklenildi,ekleniliyor,ekteki,CV,mektup";
--- a/plugins/database_attachments/config.inc.php.dist
+++ b/plugins/database_attachments/config.inc.php.dist
@ -3,6 +3,10 @@
 // By default this plugin stores attachments in filesystem
 // and copies them into sql database.
 // You can change it to use 'memcache' or 'apc'.
+// -----------------------------------------------------------
+// WARNING: Remember to set max_allowed_packet in database or
+//          config to match with expected max attachment size.
+// -----------------------------------------------------------
 $config['database_attachments_cache'] = 'db';

 // Attachment data expires after specied TTL time in seconds (max.2592000).
--- a/plugins/database_attachments/database_attachments.php
+++ b/plugins/database_attachments/database_attachments.php
@ -85,6 +85,8 @@ class database_attachments extends filesystem_attachments
            if ($args['data'] === false) {
                return $args;
            }
+
+            $args['path'] = null;
        }

        $data   = base64_encode($args['data']);
@ -131,10 +133,13 @@ class database_attachments extends filesystem_attachments
        $cache = $this->get_cache();
        $data  = $cache->read($args['id']);

-        if ($data) {
+        if ($data !== null && $data !== false) {
            $args['data'] = base64_decode($data);
            $args['status'] = true;
        }
+        else {
+            $args['status'] = false;
+        }

        return $args;
    }
--- a/plugins/enigma/README
+++ b/plugins/enigma/README
@ -55,6 +55,12 @@ KNOWN ISSUES:
 There are some know issues with accepting key passphrases on various
 system configurations. This is caused by issues in PinEntry handling.
 Make sure that vendor/bin/crypt-gpg-pinentry works from command line.
+
 Possible reasons:
 - non-supported GnuPG version, i.e. >= 2.1
 - non-working loader in shebang (#! /usr/bin/env php)
+  Make sure it works for the user the php scripts are executed upon
+  (i.e. apache, www-date, etc.)
+- SELinux setting, try command: setsebool -P httpd_unified 0
+
+Note: for server use GnuPG developers still recommend version 1.4.
--- a/plugins/enigma/composer.json
+++ b/plugins/enigma/composer.json
@ -3,7 +3,7 @@
    "type": "roundcube-plugin",
    "description": "PGP Encryption for Roundcube",
    "license": "GPLv3+",
-    "version": "0.5",
+    "version": "0.6",
    "authors": [
        {
            "name": "Aleksander Machniak",
@ -24,6 +24,6 @@
    "require": {
        "php": ">=5.3.0",
        "roundcube/plugin-installer": "~0.1.6",
-        "pear-pear.php.net/crypt_gpg": "~1.4.1"
+        "pear-pear.php.net/crypt_gpg": "~1.4.2"
    }
 }
--- a/plugins/enigma/config.inc.php.dist
+++ b/plugins/enigma/config.inc.php.dist
@ -16,6 +16,14 @@ $config['enigma_debug'] = false;
 // Must be writeable by PHP process
 $config['enigma_pgp_homedir'] = null;

+// Location of gpg binary. By default it will be auto-detected.
+// This is also a way to force gpg2 use if there are both 1.x and 2.x on the system.
+$config['enigma_pgp_binary'] = '';
+
+// Location of gpg-agent binary. By default it will be auto-detected.
+// It's used with GnuPG 2.x.
+$config['enigma_pgp_agent'] = '';
+
 // Enables signatures verification feature.
 $config['enigma_signatures'] = true;

--- a/plugins/enigma/enigma.js
+++ b/plugins/enigma/enigma.js
@ -150,12 +150,50 @@ rcube_webmail.prototype.enigma_delete = function()
 // Export key(s)
 rcube_webmail.prototype.enigma_export = function(selected)
 {
-    var keys = selected ? this.keys_list.get_selection().join(',') : '*';
+    var priv = false,
+        list = this.keys_list,
+        keys = selected ? list.get_selection().join(',') : '*',
+        args = {_a: 'export', _keys: keys};

    if (!keys.length)
        return;

-    this.goto_url('plugin.enigmakeys', {_a: 'export', _keys: keys}, false, true);
+    // find out wether selected keys are private
+    if (keys == '*')
+        priv = true;
+    else
+        $.each(list.get_selection(), function() {
+            flags = $(list.rows[this].obj).data('flags');
+            if (flags && flags.indexOf('p') >= 0) {
+                priv = true;
+                return false;
+            }
+        });
+
+    // ask the user about including private key in the export
+    if (priv)
+        return this.show_popup_dialog(
+            this.get_label('enigma.keyexportprompt'),
+            this.get_label('enigma.exportkeys'),
+            [{
+                text: this.get_label('enigma.onlypubkeys'),
+                click: function(e) {
+                    rcmail.goto_url('plugin.enigmakeys', args, false, true);
+                    $(this).remove();
+                }
+            },
+            {
+                text: this.get_label('enigma.withprivkeys'),
+                click: function(e) {
+                    args._priv = 1;
+                    rcmail.goto_url('plugin.enigmakeys', args, false, true);
+                    $(this).remove();
+                }
+            }],
+            {width: 400}
+        );
+
+    this.goto_url('plugin.enigmakeys', args, false, true);
 };

 // Submit key(s) import form
@ -228,10 +266,10 @@ rcube_webmail.prototype.enigma_search = function(props)
        props = this.gui_objects.qsearchbox.value;

    if (props || this.env.search_request) {
-        var params = {'_a': 'search', '_q': urlencode(props)},
+        var params = {'_a': 'search', '_q': props},
          lock = this.set_busy(true, 'searching');
 //        if (this.gui_objects.search_filter)
-  //          addurl += '&_filter=' + this.gui_objects.search_filter.value;
+//          addurl += '&_filter=' + this.gui_objects.search_filter.value;
        this.env.current_page = 1;
        this.enigma_loadframe();
        this.enigma_clear_list();
@ -318,6 +356,7 @@ rcube_webmail.prototype.enigma_add_list_row = function(r)

    row.id = 'rcmrow' + r.id;
    row.className = css_class;
+    if (r.flags) $(row).data('flags', r.flags);

    col.innerHTML = r.name;
    row.appendChild(col);
@ -446,17 +485,26 @@ rcube_webmail.prototype.enigma_password_submit = function(data)
        return this.enigma_password_compose_submit(data);
    }

-    var lock = this.set_busy(true, 'loading');
-
-    // message preview
-    var form = $('<form>').attr({method: 'post', action: location.href, style: 'display:none'})
+    var lock = this.set_busy(true, 'loading'),
+      form = $('<form>').attr({method: 'post', action: data.action || location.href, style: 'display:none'})
        .append($('<input>').attr({type: 'hidden', name: '_keyid', value: data.key}))
        .append($('<input>').attr({type: 'hidden', name: '_passwd', value: data.password}))
        .append($('<input>').attr({type: 'hidden', name: '_token', value: this.env.request_token}))
-        .append($('<input>').attr({type: 'hidden', name: '_unlock', value: lock}))
-        .appendTo(document.body);
+        .append($('<input>').attr({type: 'hidden', name: '_unlock', value: lock}));
+
+    // Additional form fields for request parameters
+    $.each(data, function(i, v) {
+      if (i.indexOf('input') == 0)
+        form.append($('<input>').attr({type: 'hidden', name: i.substring(5), value: v}))
+    });
+
+    if (data.iframe) {
+      var name = 'enigma_frame_' + (new Date()).getTime(),
+        frame = $('<iframe>').attr({style: 'display:none', name: name}).appendTo(document.body);
+      form.attr('target', name);
+    }

-    form.submit();
+    form.appendTo(document.body).submit();
 }

 // submit entered password - in mail compose page
--- a/plugins/enigma/enigma.php
+++ b/plugins/enigma/enigma.php
@ -462,9 +462,9 @@ class enigma extends rcube_plugin
     */
    function import_file()
    {
-        $this->load_engine();
+        $this->load_ui();

-        $this->engine->import_file();
+        $this->ui->import_file();
    }

    /**
--- a/plugins/enigma/lib/enigma_driver.php
+++ b/plugins/enigma/lib/enigma_driver.php
@ -85,10 +85,11 @@ abstract class enigma_driver
     * Key/Cert export.
     *
     * @param string Key ID
+     * @param bool   Include private key
     *
     * @return mixed Key content or enigma_error
     */
-    abstract function export($key);
+    abstract function export($key, $with_private = false);

    /**
     * Keys listing.
--- a/plugins/enigma/lib/enigma_driver_gnupg.php
+++ b/plugins/enigma/lib/enigma_driver_gnupg.php
@ -41,41 +41,57 @@ class enigma_driver_gnupg extends enigma_driver
    {
        $homedir = $this->rc->config->get('enigma_pgp_homedir', INSTALL_PATH . 'plugins/enigma/home');
        $debug   = $this->rc->config->get('enigma_debug');
+        $binary  = $this->rc->config->get('enigma_pgp_binary');
+        $agent   = $this->rc->config->get('enigma_pgp_agent');

-        if (!$homedir)
+        if (!$homedir) {
            return new enigma_error(enigma_error::INTERNAL,
                "Option 'enigma_pgp_homedir' not specified");
+        }

        // check if homedir exists (create it if not) and is readable
-        if (!file_exists($homedir))
+        if (!file_exists($homedir)) {
            return new enigma_error(enigma_error::INTERNAL,
                "Keys directory doesn't exists: $homedir");
-        if (!is_writable($homedir))
+        }
+        if (!is_writable($homedir)) {
            return new enigma_error(enigma_error::INTERNAL,
                "Keys directory isn't writeable: $homedir");
+        }

        $homedir = $homedir . '/' . $this->user;

        // check if user's homedir exists (create it if not) and is readable
-        if (!file_exists($homedir))
+        if (!file_exists($homedir)) {
            mkdir($homedir, 0700);
+        }

-        if (!file_exists($homedir))
+        if (!file_exists($homedir)) {
            return new enigma_error(enigma_error::INTERNAL,
                "Unable to create keys directory: $homedir");
-        if (!is_writable($homedir))
+        }
+        if (!is_writable($homedir)) {
            return new enigma_error(enigma_error::INTERNAL,
                "Unable to write to keys directory: $homedir");
+        }

        $this->homedir = $homedir;

+        $options = array('homedir' => $this->homedir);
+
+        if ($debug) {
+            $options['debug'] = array($this, 'debug');
+        }
+        if ($binary) {
+            $options['binary'] = $binary;
+        }
+        if ($agent) {
+            $options['agent'] = $agent;
+        }
+
        // Create Crypt_GPG object
        try {
-            $this->gpg = new Crypt_GPG(array(
-                'homedir'   => $this->homedir,
-                // 'binary'    => '/usr/bin/gpg2',
-                'debug'     => $debug ? array($this, 'debug') : false,
-          ));
+            $this->gpg = new Crypt_GPG($options);
        }
        catch (Exception $e) {
            return $this->get_error_from_exception($e);
@ -191,13 +207,21 @@ class enigma_driver_gnupg extends enigma_driver
     * Key export.
     *
     * @param string Key ID
+     * @param bool   Include private key
     *
     * @return mixed Key content or enigma_error
     */
-    public function export($keyid)
+    public function export($keyid, $with_private = false)
    {
        try {
-            return $this->gpg->exportPublicKey($keyid, true);
+            $key = $this->gpg->exportPublicKey($keyid, true);
+
+            if ($with_private) {
+                $priv = $this->gpg->exportPrivateKey($keyid, true);
+                $key .= $priv;
+            }
+
+            return $key;
        }
        catch (Exception $e) {
            return $this->get_error_from_exception($e);
@ -257,6 +281,8 @@ class enigma_driver_gnupg extends enigma_driver
     */
    public function gen_key($data)
    {
+        require_once 'Crypt/GPG/KeyGenerator.php';
+
        try {
            $debug  = $this->rc->config->get('enigma_debug');
            $keygen = new Crypt_GPG_KeyGenerator(array(
@ -385,17 +411,20 @@ class enigma_driver_gnupg extends enigma_driver
     */
    protected function parse_signature($sig)
    {
-        $user = $sig->getUserId();
-
        $data = new enigma_signature();
+
        $data->id          = $sig->getId();
        $data->valid       = $sig->isValid();
        $data->fingerprint = $sig->getKeyFingerprint();
        $data->created     = $sig->getCreationDate();
        $data->expires     = $sig->getExpirationDate();
-        $data->name        = $user->getName();
-        $data->comment     = $user->getComment();
-        $data->email       = $user->getEmail();
+
+        // In case of ERRSIG user may not be set
+        if ($user = $sig->getUserId()) {
+            $data->name    = $user->getName();
+            $data->comment = $user->getComment();
+            $data->email   = $user->getEmail();
+        }

        return $data;
    }
--- a/plugins/enigma/lib/enigma_driver_phpssl.php
+++ b/plugins/enigma/lib/enigma_driver_phpssl.php
@ -126,6 +126,10 @@ class enigma_driver_phpssl extends enigma_driver
    {
    }

+    public function export($key, $with_private = false)
+    {
+    }
+
    public function list_keys($pattern='')
    {
    }
--- a/plugins/enigma/lib/enigma_engine.php
+++ b/plugins/enigma/lib/enigma_engine.php
@ -404,11 +404,6 @@ class enigma_engine
    {
        $part = $p['structure'];

-        // exit, if we're already inside a decrypted message
-        if (in_array($part->mime_id, $this->encrypted_parts)) {
-            return;
-        }
-
        // Get message body from IMAP server
        if ($body === null) {
            $body = $this->get_part_body($p['object'], $part);
@ -626,23 +621,33 @@ class enigma_engine
        $sig_part = $struct->parts[1];

        // Get bodies
-        // Note: The first part body need to be full part body with headers
-        //       it also cannot be decoded
-        if ($body !== null) {
-            // set signed part body
-            list($msg_body, $sig_body) = $this->explode_signed_body($body, $struct->ctype_parameters['boundary']);
+        if ($body === null) {
+            if (!$struct->body_modified) {
+                $body = $this->get_part_body($p['object'], $struct);
+            }
        }
-        else {
-            $msg_body = $this->get_part_body($p['object'], $msg_part, true);
-            $sig_body = $this->get_part_body($p['object'], $sig_part);
+
+        $boundary = $struct->ctype_parameters['boundary'];
+
+        // when it is a signed message forwarded as attachment
+        // ctype_parameters property will not be set
+        if (!$boundary && $struct->headers['content-type']
+            && preg_match('/boundary="?([a-zA-Z0-9\'()+_,-.\/:=?]+)"?/', $struct->headers['content-type'], $m)
+        ) {
+            $boundary = $m[1];
        }

+        // set signed part body
+        list($msg_body, $sig_body) = $this->explode_signed_body($body, $boundary);
+
        // Verify
-        $sig = $this->pgp_verify($msg_body, $sig_body);
+        if ($sig_body && $msg_body) {
+            $sig = $this->pgp_verify($msg_body, $sig_body);

-        // Store signature data for display
-        $this->signatures[$struct->mime_id] = $sig;
-        $this->signatures[$msg_part->mime_id] = $sig;
+            // Store signature data for display
+            $this->signatures[$struct->mime_id] = $sig;
+            $this->signatures[$msg_part->mime_id] = $sig;
+        }
    }

    /**
@ -1051,7 +1056,7 @@ class enigma_engine
    }

    /**
-     * PGP keys/certs importing.
+     * PGP keys/certs import.
     *
     * @param mixed   Import file name or content
     * @param boolean True if first argument is a filename
@ -1071,7 +1076,7 @@ class enigma_engine
                ), true, false);
        }
        else {
-            $result['imported'] = $result['public_imported'] + $result['private_imported'];
+            $result['imported']  = $result['public_imported'] + $result['private_imported'];
            $result['unchanged'] = $result['public_unchanged'] + $result['private_unchanged'];
        }

@ -1079,42 +1084,18 @@ class enigma_engine
    }

    /**
-     * Handler for keys/certs import request action
-     */
-    function import_file()
-    {
-        $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
-        $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
-        $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
-        $storage = $this->rc->get_storage();
-
-        if ($uid && $mime_id) {
-            $storage->set_folder($mbox);
-            $part = $storage->get_message_part($uid, $mime_id);
-        }
-
-        if ($part && is_array($result = $this->import_key($part))) {
-            $this->rc->output->show_message('enigma.keysimportsuccess', 'confirmation',
-                array('new' => $result['imported'], 'old' => $result['unchanged']));
-        }
-        else
-            $this->rc->output->show_message('enigma.keysimportfailed', 'error');
-
-        $this->rc->output->send();
-    }
-
-    /**
-     * PGP keys/certs export..
+     * PGP keys/certs export.
     *
     * @param string   Key ID
     * @param resource Optional output stream
+     * @param bool     Include private key
     *
     * @return mixed Key content or enigma_error
     */
-    function export_key($key, $fp = null)
+    function export_key($key, $fp = null, $include_private = false)
    {
        $this->load_pgp_driver();
-        $result = $this->pgp_driver->export($key, $fp);
+        $result = $this->pgp_driver->export($key, $include_private);

        if ($result instanceof enigma_error) {
            rcube::raise_error(array(
@ -1199,16 +1180,29 @@ class enigma_engine
     *
     * @param rcube_message      Message object
     * @param rcube_message_part Message part
-     * @param bool               Return raw body with headers
     */
-    private function get_part_body($msg, $part, $full = false)
+    private function get_part_body($msg, $part)
    {
        // @TODO: Handle big bodies using file handles

-        if ($full) {
+        // This is a special case when we want to get the whole body
+        // using direct IMAP access, in other cases we prefer
+        // rcube_message::get_part_body() as the body may be already in memory
+        if (!$part->mime_id) {
+            // fake the size which may be empty for multipart/* parts
+            // otherwise get_message_part() below will fail
+            if (!$part->size) {
+                $reset = true;
+                $part->size = 1;
+            }
+
            $storage = $this->rc->get_storage();
-            $body    = $storage->get_raw_headers($msg->uid, $part->mime_id);
-            $body   .= $storage->get_raw_body($msg->uid, null, $part->mime_id);
+            $body    = $storage->get_message_part($msg->uid, $part->mime_id, $part,
+                null, null, true, 0, false);
+
+            if ($reset) {
+                $part->size = 0;
+            }
        }
        else {
            $body = $msg->get_part_body($part->mime_id, false);
--- a/plugins/enigma/lib/enigma_key.php
+++ b/plugins/enigma/lib/enigma_key.php
@ -91,6 +91,20 @@ class enigma_key
        return false;
    }

+    /**
+     * Returns true if any of subkeys is a private key
+     */
+    function is_private()
+    {
+        $now = time();
+
+        foreach ($this->subkeys as $subkey)
+            if ($subkey->has_private)
+                return true;
+
+        return false;
+    }
+
    /**
     * Get key ID by user email
     */
@ -99,7 +113,7 @@ class enigma_key
        $now = time();

        foreach ($this->users as $user) {
-            if ($user->email === $email && $user->valid && !$user->revoked) {
+            if (strcasecmp($user->email, $email) === 0 && $user->valid && !$user->revoked) {
                foreach ($this->subkeys as $subkey) {
                    if (!$subkey->revoked && (!$subkey->expires || $subkey->expires > $now)) {
                        if ($subkey->usage & $mode) {
--- a/Show More
+++ b/Show More