No OneTemporary
Actions

Size

1 MB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/.htaccess b/.htaccess
	index a9cc5c3f3..32c47f01e 100644
	--- a/.htaccess
	+++ b/.htaccess
	@@ -1,58 +1,58 @@
	# AddDefaultCharset UTF-8
	AddType text/x-component .htc

	<IfModule mod_php5.c>
	php_flag display_errors Off
	php_flag log_errors On
	# php_value error_log logs/errors

	php_value upload_max_filesize 5M
	php_value post_max_size 6M
	php_value memory_limit 64M

	php_flag register_globals Off
	php_flag zlib.output_compression Off
	php_flag magic_quotes_gpc Off
	php_flag magic_quotes_runtime Off
	php_flag suhosin.session.encrypt Off

	#php_value session.cookie_path /
	php_flag session.auto_start Off
	php_value session.gc_maxlifetime 21600
	php_value session.gc_divisor 500
	php_value session.gc_probability 1
	</IfModule>

	<IfModule mod_rewrite.c>
	RewriteEngine On
	RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico

	# security rules:
	# - deny access to files not containing a dot or starting with a dot
	# in all locations except installer directory
	-RewriteRule ^(?!installer)(\.?[^\.]+)$ - [F]
	+RewriteRule ^(?!installer\|[a-f0-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 some documentation files
	RewriteRule /?(README\.md\|composer\.json-dist\|composer\.json\|package\.xml)$ - [F]
	</IfModule>

	<IfModule mod_deflate.c>
	SetOutputFilter DEFLATE
	</IfModule>

	<IfModule mod_headers.c>
	# replace 'append' with 'merge' for Apache version 2.2.9 and later
	#Header append Cache-Control public env=!NO_CACHE
	</IfModule>

	<IfModule mod_expires.c>
	ExpiresActive On
	ExpiresDefault "access plus 1 month"
	</IfModule>

	FileETag MTime Size

	<IfModule mod_autoindex.c>
	Options -Indexes
	</ifModule>
	diff --git a/CHANGELOG b/CHANGELOG
	index 60ec32467..5b541cda7 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,1987 +1,1990 @@
	CHANGELOG Roundcube Webmail
	===========================

	+- Improve system security by using optional special URL with security token - use_secure_urls
	+- Allow to define separate server/path for image/js/css files - assets_url/assets_dir
	- Fix import of multiple contact email addresses from Outlook-csv format (#1490169)
	- Fix drag-n-drop to folders expanded while dragging (#1490157)
	- Fix import of multiple contact groups from Google-csv format (#1490159)
	- Fix import of contacts with multiple email addresses from Google-csv format (#1490178)
	- Fix generation of Blowfish-based password hashes (#1490184)
	+- Fix bugs where CSRF attacks were still possible on some requests

	RELEASE 1.1-beta
	----------------
	- Fix skin path handling in plugin context (#1488967)
	- Prevent memory exhaustion on image resizing with GD on Windows (#1489937)
	- Add plugin hook for database table name lookups as requested in #1489837
	- Added Oracle database support
	- Support contacts import in GMail CSV format
	- Added namespace filter in Folder Manager
	- Added folder searching in Folder Manager
	- Fix restoring draft messages from localStorage if editor mode differs (#1490016)
	- Added config option/user preference to disable saving messages in localStorage (#1489979)
	- Added config option 'imap_log_session' to enable Roundcube <-> IMAP session ID logging
	- Added config option 'log_session_id' to control the lengh of the session identifer in logs
	- Implemented 'storage_connected' API hook after successful IMAP login (#1490025)
	- Intergrate Net_LDAP3 and rcube_ldap_generic classes
	- Add option (disabled_actions) to disable UI elements/actions (#1489638)
	- Support password encryption using openssl extension (#1489989)
	- Create/rename groups in UI dialogs (#1489951)
	- Added 'contact_search_name' option to define autocompletion entry format
	- Display quota information for current folder not INBOX only (#1487993)
	- Support images in HTML signatures (#1488676)
	- Display full quota information in popup (#1485769, #1486604)
	- Mail compose: Selecting contact inserts recipient to previously focused input - to/cc/bcc accordingly (#1489684)
	- Close "no subject" prompt with Enter key (#1489580)
	- Password: Add option to force new users to change their password (#1486884)
	- Improve support for screen readers and assistive technology using WCAG 2.0 and WAI ARIA standards
	- Enable basic keyboard navigation throughout the UI (#1487845)
	- Select/scroll to previously selected message when returning from message page (#1489023)
	- Display a warning if popup window was blocked (#1489618)
	- Remove (was: ...) from message subject on reply (#1489375)
	- Update to TinyMCE 4.1 (#1489057)
	- Enable autolink plugin in TinyMCE (#1488845)
	- Support image operations with Imagick extension (#1489734)
	- Support upload progress with session.upload_progress and PECL uploadprogress module (#1488702)
	- Make identity name field optional (#1489510)
	- Utility script to remove user records from the local database
	- Plugin API: Added message_saved hook (#1489752)
	- Plugin API: Added imap_search_before hook
	- Support messages import from zip archives
	- Zipdownload: Added mbox format support (#1486069)
	- Drop support for IE6, move IE7/IE8 support to legacy_browser plugin
	- Update to jQuery-2.1.1
	- Search across multiple folders (#1485234)
	- Improve UI integration of ACL settings
	- Drop support for PHP < 5.3.7
	- Set In-Reply-To and References for forwarded messages (#1489593)
	- Removed redundant default_folders config option (#1489737)
	- Implemented IMAP SPECIAL-USE extension support [RFC6154] (#1487830)
	- Optimize some framed pages content for better performance (#1489792)
	- Improve text messages display and conversion to HTML (#1488937)
	- Don't remove links when html signature is converted to text (#1489621)
	- Fix page title when using search filter (#1490023)
	- Fix mbox files import
	- Fix some character sets detection (#1490135)
	- Fix so attachment charset is set in headers of forward/draft message (#1490109)
	- Fix bug where wrong charset could be used for text attachment preview page (#1490106)
	- Fix setting flags on servers with no PERMANENTFLAGS response (#1490087)
	- Fix regression in SHAA password generation in ldap driver of password plugin (#1490094)
	- Fix displaying of HTML messages with absolutely positioned elements in Larry skin (#1490103)
	- Fix font style display issue in HTML messages with styled <span> elements (#1490101)
	- Fix download of attachments that are part of TNEF message (#1490091)
	- Fix handling of uuencoded messages if messages_cache is enabled (#1490108)
	- Fix handling of base64-encoded attachments with extra spaces (#1490111)
	- Fix handling of UNKNOWN-CTE response, try do decode content client-side (#1490046)
	- Fix bug where creating subfolders in shared folders wasn't possible without ACL extension (#1490113)
	- Fix reply scrolling issue with text mode and start message below the quote (#1490114)
	- Fix possible issues in skin/skin_path config handling (#1490125)
	- Fix lack of delimiter for recipient addresses in smtp_log (#1490150)

	RELEASE 1.0.3
	-------------
	- Initialize HTML editor before restoring a message from localStorage (#1490016)
	- Add 'sig_max_lines' config option to default config file (#1490071)
	- Add config option to specify IMAP connection socket parameters - imap_conn_options (#1489948)
	- Add option to set default message list mode - default_list_mode (#1487312)
	- Enable contextmenu plugin for TinyMCE editor (#1487014)
	- Fix insert-signature command in external compose window if opened from inline compose screen (#1490074)
	- Fix some mime-type to extension mapping checks in Installer (#1489983)
	- Fix errors when using localStorage in Safari's private browsing mode (#1489996)
	- Fix bug where $Forwarded flag was being set even if server didn't support it (#1490000)
	- Fix various iCloud vCard issues, added fallback for external photos (#1489993)
	- Fix invalid Content-Type header when send_format_flowed=false (#1489992)
	- Fix errors when adding/updating contacts in active search (#1490015)
	- Fix incorrect thumbnail rotation with GD and exif orientation data (#1490029)
	- Fix contacts list update after adding/deleting/moving a contact (#1490028, #1490033)
	- Fix handling of email addresses with quoted domain part (#1490040)
	- Fix comm_path update on task switch (#1490041)
	- Fix error in MSSQL update script 2013061000.sql (#1490061)
	- Fix validation of email addresses with IDNA domains (#1490067)

	RELEASE 1.0.2
	-------------
	- Fix storing unsaved drafts in localStorage (#1489818)
	- Add configurable LDAP_OPT_DEREF option (#1489864)
	- Fix so when switching editor mode original version of signature is used (#1488849)
	- Fix unintentional draft autosave request if autosave is disabled (#1489882)
	- Fix malformed References: header in send/saved mail (#1489891)
	- Fix handling unicode characters in links (#1489898)
	- Fix incorrect handling of HTML comments in messages sanitization code (#1489904)
	- Fix so current page is reset on list-mode change (#1489907)
	- Fix so responses menu hides on click in classic skin (#1489915)
	- Fix unintentional line-height style modification in HTML messages (#1489917)
	- Fix broken normalize_string(), add support for ISO-8859-2 (#1489918)
	- Support csv contacts import in German localization (#1489920)
	- Fix so message list and counters are updated when a message is opened in new window (#1489919)
	- Fix malformed recipient name when composing a message by clicking on mailto link (#1489942)
	- Fix list reload after sending message in another window (#1489931)
	- Fix so address format errors are ignored when saving a draft (#1489954)
	- Fix incorrect label translation in return receipt (#1489963)
	- Fix security issue in delete-response action - allow only ajax request
	- Fix Delete button state after deleting identity/response (#1489972)
	- Fix bug where contacts with no email address were listed on compose addressbook (#1489970)
	- Fix images import from various vCard formats (#1489977)
	- Fix sorting messages by size on servers without SORT capability (#1489981)

	RELEASE 1.0.1
	-------------
	- Support 'error' and 'body_file' return attribs in 'message_before_send' hook (#1489595)
	- Apply user-specific replacements to group's base_dn property (#1489779)
	- Fix missing email address when importing contacts from outlook csv (#1489830)
	- Fix bug where "With attachment" option in search filter wasn't selected after return from mail view (#1489774)
	- Fix "washing" of unicoded style attributes (#1489777)
	- Fix unintentional redirect from compose page in Webkit browsers (#1489789)
	- Fix messages index cache update under some conditions (e.g. proxy) (#1489756)
	- Fix lack of translation of special folders in some configurations (#1489799)
	- Fix XSS issue in plain text spellchecker (#1489806)
	- Fix invalid page title for some folders (1489804)
	- Fix redundant alert message on over-size uploads (#1489817)
	- Fix next message display after removing a message (#1489800)
	- Fix missing Mail-Followup-To header in sent mail (#1489829)
	- Fix error when spell-checking an empty text (#1489831)
	- Avoid popupmenus being closed when scrollbar is clicked (#1489832)
	- Add proxy_whitelist configuration option (#1489729)
	- Fix identities_level=4 handling in new_user_dialog plugin (#1489840)
	- Fix various db_prefix issues (#1489839)
	- Fix too small length of users.preferences column data type on MySQL
	- Fix redundant warning when switching from html to text in empty editor (#1489819)
	- Fix invalid host validation on login (#1489841)
	- Fix IMAP connection test in installer so it is aware of imap_auth_type (#1489746)

	RELEASE 1.0.0
	-------------
	- Added toolbar button to move message in message view
	- Fix style of disabled protocol handler link on IE (#1489569)
	- Fix message import dialog when no file is selected (#1489685)
	- Fix opening compose screen in new window after saving as draft (#1489643)
	- Fix directories check in Installer on Windows (#1489576)
	- Fix issue when default_addressbook option is set to integer value (#1489407)
	- Fix Opera > 15 detection (#1489562)
	- Fix security issue in DomainFactory driver of Password plugin
	- Fix invalid X-Draft-Info on forwarded message draft (#1489587)
	- Fix regression in handling of 'attachments' result in message_compose hook (#1489627)
	- Fix issue where msgexport.sh printed the message to STDOUT instead of a file (#1489634)
	- Fix fatal error in database_attachments plugin under some conditions (#1489726)

	RELEASE 1.0-rc
	--------------
	- Small CSS fix with message notice boxes in Larry skin (#1489497)
	- Include groups in contacts search on mail compose (#1489082)
	- Add mime-type mapping for .7z files (#1489512)
	- Invoke update scripts with php to circumvent execution restrictions (#1489322)
	- Fix drag & drop message/contact moving on touch device (#1489431)
	- Fix canned responses in HTML mode (#1489536)
	- Check/create default folders on every login not only the first (#1489423)
	- Update to jQuery-1.11.0 and jQuery-UI-1.9.2
	- Support SMTP socket context options via new config option 'smtp_conn_options'
	- Fix compatibility with PHP 5.2 in html.php file (#1489514)
	- Remove expand/collapse with plus/minus keys (on numeric keypad) (#1489513)
	- Fix issue where filesystem path was added to all-attachments (zip) file (#1489507)
	- Fix case-sensitivity of email addresses handling on compose (#1485499)
	- Don't alter Message-ID of a draft when sending (#1489409)
	- Fix issue where deprecated syntax for HTML lists was not handled properly (#1488768)
	- Display different icons when Trash folder is empty or full (#1485775)
	- Remember last position of more headers switch (#1488323)
	- Fix so message flags modified by another client are applied on the list on refresh (#1485186)
	- Fix broken text/* attachments when forwarding/editing a message (#1489426)
	- Improved minified files handling, added css minification (#1486988)
	- Fix handling of X-Forwarded-For header with multiple addresses (#1489481)
	- Fix border issue on folders list in classic skin (#1489473)
	- Implemented menu actions to copy/move messages, added folder-selector widget (#1484086)
	- Fix security rules in .htaccess preventing access to base URL without the ending slash (#1489477)
	- Fix regression where only first new folder was placed in correct place on the list (#1489472)
	- Fix issue where children of selected and collapsed thread were skipped on various actions (#1489457)
	- Fix issue where groups were not deleted when "Replace entire addressbook" option on contacts import was used (#1489420)
	- Fix unreliable mimetype tests in Installer (#1489453)
	- Fix performance of listing writeable folders (#1489451)

	RELEASE 1.0-beta
	----------------
	- Fix handling of invalid closing tags in HTML messages (#1489446)
	- Set real content-type for file downloads (#1489439)
	- Update TinyMCE to version 3.5.10 (#1489442)
	- Fix keyboard navigation in list widgets (#1489392)
	- Allow plugins to grab the reference of opened windows (#1489413)
	- Larry skin: Improved status message display for better visibility (#1488974)
	- Fix Internet Explorer 11 detection (#1489434)
	- Fix date column width to fit the widest possible date format (#1489368)
	- Move certain user preference options to a collapsed "advanced" block (#1488829)
	- Add file type icons for Powerpoint and Open Office presentations (#1489225)
	- Fix operations on folders with trailing spaces in name (#1489419)
	- Improve identity selection based on From: header (#1489378)
	- Fix issue where mails with inline images of the same name contained only the first image multiple times (#1489406)
	- Use left/right arrow keys to collapse/expand thread and spacebar to select a row, change Ctrl key behavior (#1489392)
	- Fix an issue where using arrow keys to go up a list can result in selected message being under headers (#1489403)
	- Fix an issue where Home/End keys don't focus list row properly, don't scrollTo properly (#1489396)
	- Add an option to disable smart Reply-List behaviour - reply_all_mode (#1488734)
	- Fix an issue where pressing minus key on contacts list was hiding list records (#1489393)
	- Fix an issue where shift + arrow-up key wasn't selecting all messages in collapsed thread (#1489397)
	- Added icon for priority column in messages list header (#1489234)
	- New feature "Canned Responses" to save and recall boilerplate text snippets
	- Fix HTML part detection when encapsulated inside multipart/signed (#1489372)
	- Add spellchecker backend for the After the Deadline service
	- Replace markdown-style [1] link indexes in plain text email bodies
	- Improved mailto: link arguments handling (#1489363)
	- Use DOMDocument LIBXML_PARSEHUGE and LIBXML_COMPACT options if possible (#1489302)
	- Support HTTP_HOST, SERVER_NAME and SERVER_ADDR values in include_host_config feature
	- Make default font size for HTML messages configurable (request #118)
	- Fix XSS issue in addressbook group name field [CVE-2013-5646] (#1489333)
	- After message is sent refresh messages list of replied message folder (#1489249)
	- Add option force specified domain in user login - username_domain_forced (#1489264)
	- Add option to import Vcards with group assignments
	- Save groups membership in Vcard export (#1488509)
	- Workaround broken PHP function timezone_name_from_abbr (#1489261)
	- Make cached message size limit configurable - messages_cache_threshold (#1489317)
	- Log also failed logins to userlogins log
	- Add temp_dir_ttl configuration option (#1489304)
	- Allow setting INBOX as Sent folder (#1489219)
	- Fix replacement variables in user-specific base_dn in some LDAP requests (#1489279)
	- Fix image scaling issues when image has only one dimension smaller than the limit (#1489274)
	- Fix issue where uploaded photo was lost when contact form did not validate (#1489274)
	- Move identity selection based on non-standard headers into (new) identity_select plugin (#1488553)
	- Fix downloading binary files with (wrong) text/* content-type (#1489267)
	- Respect HTTP_X_FORWARDED_FOR and HTTP_X_REAL_IP variables for session IP check
	- Simplified configuration by merging it into one file + defaults (#1487311)
	- Make message list header stay on top when scrolling (#1295420)
	- Add support for 'enchant' spellcheck engine
	- Check filetype detection in installer and update script (#1489193)
	- Fix folder names truncation in Classic skin (#1489220)
	- Make possible to disable some (broken) IMAP extensions with imap_disable_caps option (#1489184)
	- Contacts drag-n-drop default action is to move contacts (#1488751)
	- Added possibility to choose to move or copy contacts from drag-n-drop menu (#1488751)
	- Fix Close link and remove About link on error pages (#1489109)
	- Improved/unified attachment preview screen, added print button
	- Fix lack of space between searchfiler and quicksearchbar in Larry skin (#1489158)
	- Cache LDAP's user_specific search and use vlv for better performance (#1489186)
	- LDAP: auto-detect and use VLV indices for all search operations
	- LDAP: additional group configuration options for address books
	- LDAP: separated address book implementation from a generic LDAP wrapper class
	- Allow address books to browse a multi-level group hierarchy in the contacts list
	- Fix session issues when local and database time differs (#1486132)
	- Fix thread cache syncronization/validation (#1489028)
	- Added feature to import messages to the currently selected folder
	- Add option show_real_foldernames to disable localization of special folders
	- Fix database cache expunge issues (#1489149)
	- Fix date format issues on MS SQL Server (#1488918)
	- Add imap_cache_ttl option to configure TTL of imap_cache
	- Make LDAP cache engine configurable via ldap_cache and ldap_cache_ttl options
	- Fix "duplicate entry" errors on inserts to imap cache tables (#1489146)
	- Improved handling of Reply-To/Bcc addresses of identity in compose form (#1489016)
	- Added user preference to open all popups as standard windows
	- Implemented shared cache (rcube_cache_shared)
	- Change Reply-All button label/title when mailing list is detected (#1488938)
	- Fix SMTP connection using IPv6 address in smtp_server option (#1489024)
	- Added attachment_reminder plugin
	- Make PHP code eval() free, use create_function()
	- Add option to display email address together with a name in mail preview (#1488732)
	- Support CSV import from Atmail (#1489045)
	- Add db_prefix configuration option in place of db_table_/db_sequence_ options
	- Make possible to use db_prefix for schema initialization in Installer (#1489067)
	- Fix updatedb.sh script so it recognizes also table prefix for external DDL files
	- Fix parsing invalid date string (#1489035)
	- Add "with attachment" option to messages list filter (#1485382)
	- Call resize handler in intervals to prevent lags and double onresize calls in Chrome (#1489005)
	- Add rel="noreferrer" for links in displayed messages (#1484686)
	- Add ability to toggle between HTML and text while viewing a message (#1486939)
	- Remove "HTML message" from attachments list while viewing a message in text mode (#1486939)
	- Support IMAP MOVE extension [RFC 6851]
	- Add attachment menu with Open and Download options (#1488975)
	- Display user-friendly message on IMAP "over quota" errors (#1484164)
	- Extended archive plugin with user-configurable options to store messages into subfolders
	- Fix export of selected contacts from search result (#1488905)
	- Feature to export only selected contacts from addressbook (by Phil Weir)

	RELEASE 0.9.5
	-------------
	- Fix failing vCard import when email address field contains spaces (#1489386)
	- Fix default spell-check configuration after Google suspended their spell service
	- Fix vulnerability in handling _session argument of utils/save-prefs [CVE-2013-6172] (#1489382)
	- Fix iframe onload for upload errors handling (#1489379)
	- Fix address matching in Return-Path header on identity selection (#1489374)
	- Fix text wrapping issue with long unwrappable lines (#1489371)
	- Fixed issues where HTML comments inside style tag would hang Internet Explorer
	- Hide Delivery Status Notification option when smtp_server is unset (#1489336)
	- Display full attachment name using title attribute when name is too long to display (#1489320)
	- Fix attachment icon issue when rare font/language is used (#1489326)
	- Fix expanded thread root message styling after refreshing messages list (#1489327)
	- Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319)
	- Fix error_reporting directive check (#1489323)
	- Fix de_DE localization of "About" label in Help plugin (#1489325)

	RELEASE 0.9.4
	-------------
	- Make identities matching case insensitive (#1485480)
	- Fix issue where too big message data was stored in cache causing sql errors (#1489316)
	- Fix iframe scrollbars on webkit desktop browsers (#1489306)
	- Fix issue where legacy config was overriden by default config (#1489288)
	- Fix newmail_notifier issue where favicon wasn't changed back to default (#1489313)
	- Fix setting of Junk and NonJunk flags by markasjunk plugin (#1489285)
	- Fix lack of Reply-To address in header of forwarded message body (#1489298)
	- Fix bugs when invoking contact creation form when read-only addressbook is selected (#1489296)
	- Fix identity selection on reply (#1489291)
	- Fix so additional headers are added to all messages sent (#1489284)
	- Fix display issue after moving folder in Folder Manager (#1489293)
	- Fix handling of non-default date formats (#1489294)
	- Fix unquoted path in PREG expression on Windows (#1489290)
	- Fix wrong close tag in /template/mail.html (#1489295)

	RELEASE 0.9.3
	-------------
	- Fix setting refresh_interval to "Never" in Preferences (#1489286)
	- Fixed iframe scrolling on touch devices
	- Optimized message list for touch devices
	- Fix purge action in folder manager (#1489280)
	- Fix base URL resolving on attribute values with no quotes (#1489275)
	- Fix wrong handling of links with '\|' character (#1489276)
	- Fix colorspace issue on image conversion using ImageMagick (#1489270)
	- Fix XSS vulnerability when editing a message "as new" or draft [CVE-2013-5645] (#1489251)
	- Fix XSS vulnerability when saving HTML signatures [CVE-2013-5645] (#1489251)
	- Fix rewrite rule in .htaccess (#1489240)
	- Fix detecting Turkish language in ISO-8859-9 encoding (#1489252)
	- Fix identity-selection using Return-Path headers (#1489241)
	- Fix parsing of links with ... in URL (#1489192)
	- Fix compose priority selector when opening in new window (#1489257)
	- Fix bug where signature wasn't changed on identity selection when editing a draft (#1489229)
	- Fix IMAP SETMETADATA parameters quoting (#1489231)
	- Fix "could not load message" error on valid empty message body (#1489228)
	- Fix handling of message/rfc822 attachments on message forward and edit (#1489214)
	- Fix parsing of square bracket characters in IMAP response strings (#1489223)
	- Don't clear References and in-Reply-To when a message is "edited as new" (#1489216)
	- Fix messages list sorting with THREAD=REFS
	- Remove deprecated (in PHP 5.5) PREG /e modifier usage (#1489174)
	- Fix empty messages list when register_globals is enabled (#1489157)
	- Fix so valid and set date.timezone is not required by installer checks (#1489180)
	- Canonize boolean ini_get() results (#1489189)
	- Fix so install do not fail when one of DB driver checks fails but other drivers exist (#1489178)
	- Fix so exported vCard specifies encoding in v3-compatible format (#1489183)

	RELEASE 0.9.2
	-------------
	- Fix image thumbnails display in print mode (#1489134)
	- Fix height of message headers block (#1489108)
	- Fix timeout issue on drag&drop uploads (#1489170)
	- Fix default sorting of threaded list when THREAD=REFS isn't supported
	- Fix list mode switch to 'List' after saving list settings in Larry skin (#1489164)
	- Fix error when there's no writeable addressbook source (#1489162)
	- Fix zipdownload plugin issue with filenames charset (#1489156)
	- Fix so non-inline images aren't skipped on forward (#1489150)
	- Fix "null" instead of empty string on messages list in IE10 (#1489145)
	- Fix legacy options handling
	- Fix so bounces addresses in Sender headers are skipped on Reply-All (#1489011)
	- Fix bug where serialized strings were truncated in PDO::quote() (#1489142)
	- Fix displaying messages with invalid self-closing HTML tags (#1489137)
	- Fix PHP warning when responding to a message with many Return-Path headers (#1489136)
	- Fix unintentional compose window resize (#1489114)
	- Fix performance regression in text wrapping function (#1489133)
	- Fix connection to posgtres db using unix socket (#1489132)
	- Fix handling of comma when adding contact from contacts widget (#1489107)
	- Fix bug where a message was opened in both preview pane and new window on double-click (#1489122)
	- Fix fatal error when xdebug.max_nesting_level was exceeded in rcube_washtml (#1489110)
	- Fix PHP warning in html_table::set_row_attribs() in PHP 5.4 (#1489094)
	- Fix invalid option selected in default_font selector when font is unset (#1489112)
	- Fix displaying contact with ID divisible by 100 in sql addressbook (#1489121)
	- Fix browser warnings on PDF plugin detection (#1489118)
	- Fix fatal error when parsing UUencoded messages (#1489119)

	RELEASE 0.9.1
	-------------
	- Better German labels for from/to to avoid conflicts with 'sender' (#1489084)
	- Fix problem where security warning was displayed for valid images with image/jpg type (#1489097)
	- Fix handling of invalid email addresses in headers (#1489092)
	- Fix IMAP connection issue with default_socket_timeout < 0 and imap_timeout < 0 (#1489090)
	- Fix various PHP code bugs found using static analysis (#1489086)
	- Fix backslash character handling on vCard import (#1489085)
	- Fix csv import from Thunderbird with French localization (#1489059)
	- Fix messages list focus issue in Opera and Webkit (#1489058)
	- Fix Reply-To header handling in Reply-All action (#1489037)
	- Fix so Sender: address is added to Cc: field on reply to all (#1489011)
	- Fix so addressbook_search_mode works also for group search (#1489079)
	- Fix removal of a contact from a group in LDAP addressbook (#1489081)
	- Inlcude SQL query in the log on SQL error (#1489064)
	- Fix handling untagged responses in IMAP FETCH - "could not load message" error (#1489074)
	- Fix very small window size in Chrome (#1488931)
	- Fix list page reset when viewing a message in Larry skin (#1489076)
	- Fix min_refresh_interval handling on preferences save (#1489073)
	- Fix PDF support detection for Firefox PDF.js (#1488972)
	- Fix possible collision in generated thumbnail cache key (#1489069)
	- Fix exit code on bootsrap errors in CLI mode (#1489044)
	- Fix error handling in CLI mode, use STDERR and non-empty exit code (#1489043)
	- Fix error when using check_referer=true
	- Fix incorrect handling of some specific links (#1489060)
	- Fix incorrect handling of leading spaces in text wrapping
	- Fix unintentional messages list jumps on click in Internet Explorer (#1489056)
	- Fix list of required configuration options (#1489055)
	- Fix DB error when creating a new contact and a group is selected (#1489051)
	- Fix handling of deprecated boolean value of reply_mode option (#1489052)

	RELEASE 0.9.0
	-------------
	- Fix display of HTML entities in protected folder name (#1489042)
	- Set minimal permissions to temp files (#1488996)
	- Improve content check for embedded images without filename (#1489029)
	- Fix handling of invalid characters in message headers and output (#1489032)
	- Fix selecting collapsed rows on select-all (#1489036)
	- Avoid race-conditions with concurrent attachment uploads (#1488422)
	- Fix possible header duplicates when using additional headers (#1489033)
	- Fix session issues with use_https=true (#1488986)
	- Fix blockquote width in sent mail (#1489031)
	- Fix keyboard events on list widgets in Internet Explorer (#1489025)

	RELEASE 0.9-rc2
	---------------
	- Fix security issue in save-pref command
	- Remove sig_above configuration option, use reply_mode only (#1489001)
	- Refresh current folder in opener window after draft save or message sent (#1488997)
	- Fix saving draft just after entering compose window (#1489012)
	- Fix javascript error in IE9 when loading form with placeholders into an iframe (#1489008)
	- Fix handling of some conditional comment tags in HTML message (#1489004)
	- Fix so forward as attachment works if additional attachment is added by message_compose hook (#1489000)
	- Better handling of session errors in ajax requests (#1488960)
	- Fix HTML part detection for some specific message structures (#1488992)
	- Don't show fake address - phishing prevention (#1488981)
	- Fix forward as attachment bug with editormode != 1 (#1488991)
	- Fix LIMIT/OFFSET queries handling on MS SQL Server (#1488984)
	- Fix so task name can really contain all from a-z0-9_- characters (#1488941)
	- Fix javascript errors when working in a page opened with taget="_blank"
	- Mention SQLite database format change in UPGRADING file (#1488983)
	- Increase maxlength to 254 chars for email input fields in addressbook (#1488987)
	- Fix thumbnail size when GD extension is used for image resize (#1488985)
	- Display notice that message is encrypted also for application/pkcs7-mime messages (#1488526)

	RELEASE 0.9-rc
	--------------
	- Fix plain text spellchecker incorrect highlighting in non-ASCII text (#1488973)
	- Add workaround for invalid message charset detection by IMAP servers (#1488968)
	- Fix NUL characters in content-type of ms-tnef attachment (#1488964)
	- Fix regression in handling LDAP contact identifiers (#1488959)
	- Updated translations from Transifex
	- Fix buggy error template in a frame (#1488938)
	- Add addressbook widget on compose page in classic skin
	- Add search box to compose address book widget (#1488381)
	- Fix login in case when default_host is an array with one element (#1488928)
	- Use LDAP fallback hosts on connect + bind instead of ldap_connect() only.
	- Add config option for LDAP bind timeout (sets LDAP_OPT_NETWORK_TIMEOUT option)
	- Submit Addressbook advanced search form with Enter key (#1488568)
	- Also block remote images in HTML part view (#1488827)
	- Improved database schema upgrade procedure, added updatedb.sh script
	- Force autocommit mode in mysql database driver (#1488902)

	RELEASE 0.9-beta
	----------------
	- Fix searching by date in address book (#1488888)
	- Improve charset detection by prioritizing charset according to user language (#1485669)
	- Fix handling of escaped separator in vCard file (#1488896)
	- Add option to use envelope From address for MDN responses (#1488880)
	- Add possibility to search in message body only (#1488770)
	- Support "multipart/relative" as an alias for "multipart/related" type (#1488886)
	- Display PGP/MIME signature attachments as "Digital Signature" (#1488570)
	- Workaround UW-IMAP bug where hierarchy separator is added to the shared folder name (#1488879)
	- Fix version comparisons with -stable suffix (#1488876)
	- Add unsupported alternative parts to attachments list (#1488870)
	- Add Compose button on message view page (#1488747)
	- Display 'Sender' header in message preview
	- Plugin API: Added message_before_send hook
	- Fix contact copy/add-to-group operations on search result (#1488862)
	- Use matching identity in MDN response (#1488864)
	- Fix handling of signatures on draft edit (#1488798)
	- Fix so compacting of non-empty folder is possible also when messages list is empty (#1488858)
	- Allow forwarding of multiple emails (#1486854)
	- Fix big memory consumption of DB layer (#1488856)
	- Fix broken message/part bodies when FETCH response contains more untagged lines (#1488836)
	- Fix empty email on identities list after identity update (#1488834)
	- Add new identities_level: (4) one identity with possibility to edit only signature
	- Use Delivered-To and Envelope-To headers for identity selection (#1488840, #1488553)
	- Fix XSS vulnerability using Flash files (#1488828)
	- Always save drafts with format=flowed in order to keep original line wraps (#1488799)
	- Select default_addressbook on the list in Address Book (#1488280)
	- Fix so mobile phone has TYPE=CELL in exported vCard (#1488812)
	- Support contacts import from CSV file (#1486399)
	- Improved keep-alive action. Now the interval is based on session_lifetime (#1488507)
	- Added cross-task 'refresh' request for system state updates (#1488507)
	- Renamed config options: keep_alive to refresh_interval, min_keep_alive to min_refresh_interval
	- Fix handling of text/enriched content on message reply/forward/edit
	- Option to display attached images as thumbnails below message body
	- Upgraded to jQuery 1.8.3 and jQuery UI 1.9.1
	- Add config option to automatically generate LDAP attributes for new entries
	- Add user settings to open message view and compose form in new windows (#1485486)
	- Better client-side timezone detection using the jsTimezoneDetect library (#1488725)
	- Add option to disable saving sent mail in Sent folder - no_save_sent_messages (#1488686)
	- Fix handling dont_override with message_sort_col and message_sort_order settings (#1488760)
	- Fix handling of URLs with asterisk characters (#1488759)
	- Remove automatic to-lowercase conversion of usernames (#1488715)
	- Plugin API: Add 'email_list' argument for identities data in user_create hook
	- Integrated zipdownload plugin to download all attachments (#1445509)
	- Fix HTML special characters handling in message list/header display (#1488523)
	- List related text/html part as attachment in plain text mode (#1488677)
	- Use IMAP BINARY (RFC3516) extension to fetch message/part bodies
	- Fix folder creation under public namespace root (#1488665)
	- Fix so "Edit as new" on draft creates a new message (#1488687)
	- Fix invalid error message on deleting mail from read only folder (#1488694)
	- Replace data URIs of images (pasted in HTML editor) with inline attachments (#1488502)
	- Remove (too big) min-width on mail screen
	- Added template object 'frame'
	- Add option to enable HTML editor on forwarding (#1488517)
	- Add option to not include original message on reply, rename option top_posting to reply_mode (#1485149)
	- Added session_path config option and unified cookies settings in javascript
	- Added "Undeleted" option to messages list filter
	- Rewritten test scripts for PHPUnit
	- Add new DB abstraction layer based on PHP PDO, supporting SQLite3 (#1488332)
	- Removed PEAR::MDB2 package
	- Removed users.alias column, added option ('user_aliases')
	to use email address from identities as username (#1488581)
	- Removed redundant cache.cache_id column (#1488528)
	- Fix order of attachments in sent mail (#1488423)
	- Fix Shift + delete button does not permanently delete messages (#1488243)
	- Add Content-Length for attachments where possible (#1485478)
	- Fix attachment sizes in message print page and attachment preview page (#1488515)
	- Add mail attachments using drag & drop on HTML5 enabled browsers
	- Add workaround for invalid BODYSTRUCTURE response - parse message with Mail_mimeDecode package (#1485585)
	- Display Tiff as Jpeg in browsers without Tiff support (#1488452)
	- Don't display Pdf/Tiff/Flash attachments inline without browser support (#1488452, #1487929)
	- Add is_escaped attribute for html_select and html_textarea (#1488485)
	- Fix issue where draft auto-save wasn't executed after some inactivity time
	- Add vCard import from multiple files at once (#1488015)
	- Roundcube Framework:
	Add possibility to replace IMAP driver with custom class
	Add IMAP auto-connection feature, improving performance with caching enabled
	Replace imap_init hook with storage_init (with additional 'driver' argument)
	Improved performance by caching IMAP server's capabilities in session
	Unified global functions naming (rcube_ prefix)
	Better classes separation
	Framework files moved to lib/Roundcube

	RELEASE 0.8.5
	-------------
	- Fix #countcontrols issue in IE<=8 when text is very long (#1488890)
	- Fix unwanted horizontal scrollbar in message preview header (#1488866)
	- Add workaround for IE<=8 bug where Content-Disposition:inline was ignored (#1488844)
	- Fix XSS vulnerability in vbscript: and data:text links handling [CVE-2012-6121] (#1488850)
	- Fix absolute positioning in HTML messages (#1488819)
	- Fix cache (in)validation after setting \Deleted flag
	- Fix keybord events on messages list in opera browser (#1488823)
	- Fix selection of collapsed thread rows (#1488772)
	- Fix wrapping of quoted text with format=flowed (#1488177)

	RELEASE 0.8.4
	-------------
	- Fix regression where unintentional page reload was done after request abort (#1488802)
	- Fix XSS vulnerability in handling of text/enriched messages (#1488806)
	- Fix handling of 'media' attribute on linked css (#1488789)
	- Fix excessive LFs at the end of composed message with top_posting=true (#1488797)
	- Fix bug where leading blanks were stripped from quoted lines (#1488795)

	RELEASE 0.8.3
	-------------
	- Fix AREA links handling (#1488792)
	- Fix possible HTTP DoS on error in keep-alive requests (#1488782)
	- Fix compatybility with MDB2 2.5.0b4 (#1488779)
	- Fix a bug where saving a message in INBOX wasn't possible
	- Fix HTML part detection in messages with attachments (#1488769)
	- Fix bug where wrong words were highlighted on spell-before-send check
	- Fix scrolling quirk in email preview frame using Opera 12 (#1488763)
	- Fix displaying of multipart/alternative messages with empty parts (#1488750)
	- Fix threaded list sorting on PHP < 5.2.9 (#1488748)
	- Fix Warning: htmlspecialchars(): charset `RCMAIL_CHARSET' not supported warning in Installer (#1488744)

	RELEASE 0.8.2
	-------------
	- Fix XSS vulnerability from HTTP User-Agent header (#1488737)
	- Force fonts in compose fields to be all the same (#1488690)
	- Fix handling vCard entries with TEL;TYPE=CELL (#1488728)
	- Fix error where session wasn't updated after folder rename/delete (#1488692)
	- Fix PLAIN authentication for some IMAP servers (#1488674)
	- Fix encoding vCard file when contains PHOTO;ENCODING=b (#1488683)
	- Fix focus issue in IE when selecting message row (#1488620)
	- Add full headers view in message preview window (#1488538)
	- Fix message display page issues - unified with message preview (#1488590, #1488642)
	- Fix displaying all headers when they contain malformed characters (#1488666)
	- Fix decoding of HTML messages with UTF-16 charset specified (#1488654)
	- Fix quota capability detection so it can be overwritten by a plugin (#1488655)
	- Fix identity selection on reply (#1488101)
	- Fix Larry's messages list filter in IE (#1488632)
	- Fix more IE issues by disabling Compat. mode with X-UA-Compatible meta tag (#1488626)
	- Fix setting locales under Solaris - use additional .UTF-8 suffix (#1488628)
	- Fix email address validation for addresses with IP address in domain part
	- Fix Larry skin issues in IE7 compat. mode (#1488618)
	- Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed

	RELEASE 0.8.1
	-------------
	- Fix bug where domain name was converted to lower-case even with login_lc=false (#1488593)
	- Fix lower-casing email address on replies (#1488598)
	- Fix line separator in exported messages (#1488603)
	- Fix XSS issue where plain signatures wasn't secured in HTML mode [CVE-2012-4668] (#1488613)
	- Fix XSS issue where href="javascript:" wasn't secured [CVE-2012-3508] (#1488613)
	- Fix impossible to create message with empty plain text part (#1488610)
	- Fix stripped apostrophes when replying in plain text to HTML message (#1488606)
	- Fix inactive Save search option after advanced search (#1488607)
	- Fix Remove from group option is active for contact search result (#1488608)
	- Disable autocapitalization in login form on iPad/iPhone (#1488609)
	- Fix focus on the list when list row is clicked (#1488600)
	- Added separate From and To columns apart from smart From/To column (#1486891)
	- Fix fallback to Larry skin when configured skin isn't available (#1488591)
	- Fix (workaround) delete operations with some versions of memcache (#1488592)
	- Fix (disable) request validation for spell and spell_html actions

	RELEASE 0.8.0
	-------------
	- Don't show product version on login screen (can be enabled by config)
	- Renamed old default skin to 'classic'. Larry is the new default skin.
	- Support connections to memcached socket file (#1488577)
	- Enable TinyMCE inlinepopups plugin
	- Update to TinyMCE 3.5.6
	- Correctly escape localized labels in javascript variable (#1488567)
	- Update Net_SMTP/Auth_SASL packages to fix Digest-MD5/Cram-MD5 authentication (#1488571)
	- Don't add attachments content into reply/forward/draft message body (#1488557)
	- Fix 'no connection' errors on page unloads (#1488547)
	- Plugin API: Add 'unauthenticated' hook (#1488138)
	- Show explicit error message when provided hostname is invalid (#1488550)
	- Fix wrong compose screen elements focus in IE9 (#1488541)
	- Fix fatal error when date.timezone isn't set (#1488546)
	- Update to TinyMCE 3.5.4.1
	- Better icons with distinct shapes for priority columns (#1488377)
	- Show dedicated icon for multipart/report messages (#1488524)
	- Properly hide text of icon links/buttons (#1488534)
	- Fix handling of unitless CSS size values in HTML message (#1488535)
	- Fix removing contact photo using LDAP addressbook (#1488420)
	- Fix storing X-ANNIVERSARY date in vCard format (#1488527)
	- Update to Mail_Mime-1.8.5 (#1488521)
	- Fix XSS vulnerability in message subject handling using Larry skin [CVE-2012-3507] (#1488519)
	- Fix handling of links with various URI schemes e.g. "skype:" (#1488106)
	- Fix handling of links inside PRE elements on html to text conversion
	- Fix indexing of links on html to text conversion
	- Decode header value in rcube_mime::get() by default (#1488511)
	- Fix errors with enabled PHP magic_quotes_sybase option (#1488506)
	- Fix SQL query for contacts listing on MS SQL Server (#1488505)
	- Fix window.resize handler on IE8 and Opera (#1488453)
	- Don't let error message popups cover the login form (#1488500)
	- Update to TinyMCE 3.5.2
	- Don't show errors when moving contacts into groups they are already in (#1488493)
	- Make folders with unread messages in subfolders bold again (#1486793)
	- Abbreviate long attachment file names with ellipsis (#1488499)
	- Fix html2text conversion of strong\|b\|a\|th\|h tags when used in upper case
	- Add listcontrols template container in Larry skin (#1488498)
	- Fix host autoselection when default_host is an array (#1488495)
	- Move messages forwarding mode setting into Preferences
	- Fix HTML entities handling in HTML editor (#1488483)
	- Fix listing shared folders on Courier IMAP (#1488466)

	RELEASE 0.8-rc
	--------------
	- Added new translations in Belarusian, Interlingua and Malayalam
	- Flipped compose options arrow (#1488474)
	- Fix handling of large uuencode attachments (#1488473)
	- Fix handling of "usemap" attribute (#1488472)
	- Fix handling of some HTML tags e.g. IMG (#1488471)
	- Use similar language as a fallback for plugin localization (#1488401)
	- Fix issue where signature wasn't re-added on draft compose (#1488322)
	- Update to TinyMCE 3.5 (#1488459)
	- Fixed multi-threaded autocompletion when number of threads > number of sources
	- Allow to configure the number of values allowed for each LDAP attribute
	- Support for serialized LDAP address values (usually delimited with a $)
	- Less restrictive session auth checks, repeat keep-alive requests on failure (#1488449)
	- Fix redirect to mail/compose on re-login (#1488226)
	- Add IE8 hack for messages list issue (#1487821)
	- Fix handling errors on draft auto-save
	- Fix importing vCard photo with ENCODING param specified (#1488432)
	- Support mutliple name/email pairs for Bcc and Reply-To identity settings (#1488445)
	- Set flexible width to login form fields (#1488418)
	- Fix re-draw bug on list columns change in IE8 (#1487822)
	- Allow mass-removal of addresses from a group (#1487748)
	- Fix removing all contacts on import to LDAP addressbook
	- Fix so "Back" from compose/show doesn't reset search request (#1488238)
	- Add option to delete messages instead of moving to Trash when in Junk folder (#1486686)
	- Fix invisible cursor when replying to a html message (#1487073)
	- Reset IP stored in session when destroying session data (#1488056)
	- Fix bug where memory_limit = -1 wasn't handled properly
	- Support LDAP RFC2256's country object class read/write (#1488123)
	- Upgraded to jQuery 1.7.2
	- Image resize with GD extension (#1488383)
	- Fix lack of warning when switching task in compose window (#1488399)
	- Fix bug where it wasn't possible to enter ( or & characters in autocomplete fields
	- Request all needed fields from address book backends (#1488394)
	- Unified (single) spellchecker button
	- Scroll long lists on drag&drop (#1485946)
	- Copy all skins in installto script (#1488376)

	RELEASE 0.8-beta
	----------------
	- Upgraded to jQuery 1.7.1 (#1488337) and jQuery UI 1.8.18
	- Add Russian to the spellchecker languages list (#1488135)
	- Remember custom skin selection after logout (#1488355)
	- Make sure About tab is always the last tab (#1488257)
	- Fix issue with folder creation under INBOX. namespace (#1488349)
	- Added mailto: protocol handler registration link in User Preferences (#1486580)
	- Handle identity details box with an iframe (#1487020)
	- Fix issue where some text from original message was missing on reply (#1488340)
	- Fix autoselect_host() for login (#1488297)
	- Changed license to GNU GPLv3+ with exceptions for skins & plugins
	- Added address book widget on compose screen
	- Use proper timezones from PHP's internal timezonedb (#1485592)
	- Add separate pagesize setting for mail messages and contacts (#1488269)
	- Deprecate $DB, $USER, $IMAP global variables, Use $RCMAIL instead
	- Add option to set default font for HTML message (#1484137)
	- Fix issues with big memory allocation of IMAP results
	- Prevent from memory_limit exceeding when trying to parse big messages bodies (#1487424)
	- Add possibility to add SASL mechanisms for SMTP in smtp_connect hook (#1487937)
	- Mark (with different color) folders with recent messages (#1486234)
	- Added About tab in Settings
	- TinyMCE updated to 3.4.6

	RELEASE 0.7.2
	-------------
	- Fix encoding of attachment with comma in name (#1488389)
	- Fix handling of % character in IMAP protocol (#1488382)
	- Fix duplicate names handling in addressbook searches (#1488375)
	- Fix displaying of HTML messages from Disqus (#1488372)
	- Disable E_STRICT warnings on PHP 5.4
	- Prevent from folder selection on virtual folder collapsing (#1488346)
	- Fix automatic unsubscribe of non-existent folders
	- Fix double-quotes handling in recipient names
	- User configurable setting how to display contact names in list
	- Make contacts list sorting configurable for the admin/user
	- Fix parse errors in DDL files for MS SQL Server
	- Revert SORT=DISPLAY support, removed by mistake (#1488327)
	- Add lost translation label in de_DE (#1488315)
	- Fix drafts update issues when edited from preview pane (#1488314)
	- Fix wrong variable name in rcube_ldap.php (#1488302)
	- Make mime type detection based on filename extension to be case-insensitive
	- Fix failure on MySQL database upgrade from 0.7 - text column can't have default value (#1488300)


	RELEASE 0.7.1
	-------------
	- Fix bug in handling of base href and inline content (#1488290)
	- Fix SQL Error when saving a contact with many email addresses (#1488286)
	- Fix strict email address searching if contact has more than one address
	- Remove duplicated 'organization' label (#1488287)
	- Fix so editor selector is hidden when 'htmleditor' is listed in 'dont_override'
	- Fix wrong (long) label usage (#1488283)
	- Fix handling of INBOX's subfolders in special folders config (#1488279)
	- Add ifModule statement for setting Options -Indexes in .htaccess file (#1488274)
	- Fix crashes with eAccelerator (#1488256)
	- Fix searching on IMAP servers without CHARSET specifier support (#1488271)
	- Fix expanding folders during drag&drop (#1488260)
	- Fix wrong postgres sequence name in upgrade from 0.6
	- Fix broken CREATE INDEX queries in SQLite DDL files (#1488255)

	RELEASE 0.7
	-----------
	- Make Roundcube render the Email Standards Project Acid Test correctly
	- Replace prompt() with jQuery UI dialog (#1485135)
	- Fix navigation in messages search results
	- Improved handling of some malformed values encoded with quoted-printable (#1488232)
	- Add possibility to do LDAP bind before searching for bind DN
	- Fix handling of empty <U> tags in HTML messages (#1488225)
	- Add content filter for embedded attachments to protect from XSS on IE [CVE-2012-1253] (#1487895)
	- Use strpos() instead of strstr() when possible (#1488211)
	- Fix handling HTML entities when converting HTML to text (#1488212)
	- Fix fit_string_to_size() renders browser and ui unresponsive (#1488207)
	- Fix handling of invalid characters in request (#1488124)
	- Fix merging some configuration options in update.sh script (#1485864)
	- Fix so TEXT key will remove all HEADER keys in IMAP SEARCH (#1488208)
	- Fix handling contact photo url with https:// prefix (#1488202)
	- Fix possible infinite redirect on attachment preview (#1488199)
	- Improved clickjacking protection for browsers which don't support X-Frame-Options headers
	- Fixed bug where similar folder names were highlighted wrong (#1487860)
	- Fixed bug in handling link with '!' character in it (#1488195)
	- Fixed bug where session ID's length was limited to 40 characters (#1488196)
	- TinyMCE security issue: removed moxieplayer (embedding flv and mp4 is not supported anymore)

	RELEASE 0.7-beta
	----------------
	- Fix handling of HTML form elements in messages (#1485137)
	- Fix regression in setting recipient to self when replying to a Sent message (#1487074)
	- Fix listing of folders in hidden namespaces (#1486796)
	- Don't consider \Noselect flag when building folders tree (#1488004)
	- Fix sorting autocomplete results (#1488084)
	- Add option to set session name (#1486433)
	- Add option to skip alternative email addresses in autocompletion
	- Fix inconsistent behaviour of Compose button in Drafts folder, add Edit button for drafts
	- Fix problem with parsing HTML message body with non-unicode characters (#1487813)
	- Add option to define matching method for addressbook search (#1486564, #1487907)
	- Make email recipients separator configurable
	- Fix so folders with \Noinferiors attribute aren't listed in parent selector
	- Fix handling of curly brackets in URLs (#1488168)
	- Fix handling of dates (birthday/anniversary) in contact data (#1488147)
	- Fix error on opening searched LDAP contact (#1488144)
	- Fix redundant line break in flowed format (#1488146)
	- Fix IDN address validation issue (#1488137)
	- Fix JS error when dst_active checkbox doesn't exist (#1488133)
	- Autocomplete LDAP records when adding contacts from mail (#1488073)
	- Plugin API: added 'ready' hook (#1488063)
	- Ignore DSN request when it isn't supported by SMTP server (#1487800)
	- Make sure LDAP name fields aren't arrays (#1488108)
	- Fixed imap test to non-default port when using ssl (#1488118)
	- Force all files to be overwritten when updating (#1488117)
	- Fix issue where it wasn't possible to change list view mode in folder manager for INBOX (#1488107)
	- Fix namespace handling in special folders settings (#1488112)
	- Disable time limit for CLI scripts (#1488109)
	- Fix misleading display when chaning editor type (#1488104)
	- Add loading indicator on contact delete
	- Fix bug where after delete message rows can be added to the list of another folder (#1487752)
	- Add notice on autocompletion that not all records were displayed
	- Add option 'searchonly' for LDAP address books
	- Add Priority filter to the messages list
	- Cache synchronization using QRESYNC/CONDSTORE
	- Trigger 'new_messages' hook for all checked folders (#1488083)
	- Make date/time format user configurable; drop 'date_today' config option
	- Fix setting title for truncated subject in IE (#1487128)
	- Fix displaying multipart/alternative messages with only one part (#1487938)
	- Rewritten messages caching:
	Indexes are stored in a separate table, so there's no need to store all messages in a folder
	Added threads data caching
	Flags are stored separately, so flag change doesn't cause DELETE+INSERT, just UPDATE
	- Improved FETCH response handling
	- Improvements in response tokenization method
	- Use 'From' and 'To' labels instead of 'Sender' and 'Recipient'
	- Fix username case-insensitivity issue in MySQL (#1488021)
	- Addressbook Saved Searches
	- Added spellchecker exceptions dictionary (shared or per-user)
	- Added possibility to ignore words containing caps, numbers, symbols (spellcheck_ignore_* options)
	- Added 'priority' column on messages list (#1486782)
	- Localize forwarded message header (#1488058)

	RELEASE 0.6
	-----------
	- Fix bug where the last identity is used on reply (#1488101)
	- Fix locked folder rename option on servers supporting RFC2086 only (#1488089)
	- Fix session race conditions when composing new messages
	- Fix encoding of LDAP contacts identifiers (#1488079)
	- jQuery 1.6.4
	- Fix handling of binary attachments encoded with quoted-printable (#1488065)
	- Fix text-overflow:ellipsis issues on messages list in FF7 and Webkit (#1488061)
	- Fix handling of links with IP address
	- Fix compacting folder resets message list filter (#1488076)

	RELEASE 0.6-rc
	----------------
	- Send X-Frame-Options headers to protect from clickjacking (#1487037)
	- Fallback to mail_domain in LDAP variable replacements; added 'host' to 'user_create' hook arguments (#1488024)
	- Fixed wrong vCard type parameter mobile (#1488067)
	- Fixed vCard WORKFAX issue (#1488046)
	- Add vCard's Profile URL support (#1488062)
	- jQuery 1.6.3
	- Fix imap_cache setting to values other than 'db' (#1488060)
	- Fix handling of attachments inside message/rfc822 parts (#1488026)
	- Make list of mimetypes that open in preview window configurable (#1487625)
	- Added plugin hook 'message_part_get' for attachment downloads
	- Added unique connection identifier to IMAP debug messages
	- Fix image type check for contact photo uploads

	RELEASE 0.6-beta
	----------------
	- Fixed selecting identity on reply/forward (#1487981)
	- Add option to hide selected LDAP addressbook on the list
	- Add client-side checking of uploaded files size
	- Add newlines between organization, department, jobtitle (#1488028)
	- Recalculate date when replying to a message and localize the cite header (#1487675)
	- Fix handling of email addresses with quoted local part (#1487939)
	- Fix EOL character in vCard exports (#1487873)
	- Added optional "multithreading" autocomplete feature
	- Plugin API: Added 'config_get' hook
	- Fixed new_user_identity plugin to work with updated rcube_ldap class (#1487994)
	- Plugin API: added folder_delete and folder_rename hooks
	- Added possibility to undo last contact delete operation
	- Fix sorting of contact groups after group create (#1487747)
	- Add optional textual upload progress indicator (#1486039)
	- Fix parsing URLs containing commas (#1487970)
	- Added vertical splitter for books/groups list in addressbook (#1487923)
	- Improved namespace roots handling in folder manager
	- Added searching in all addressbook sources
	- Added addressbook source selection in contacts import
	- Implement LDAPv3 Virtual List View (VLV) for paged results listing
	- Use 'address_template' config option when adding a new address block (#1487944)
	- Added addressbook advanced search
	- Add popup with basic fields selection for addressbook search
	- Case-insensitive matching in autocompletion (#1487933)
	- Added option to force spellchecking before sending a message (#1485458)
	- Fix handling of "<" character in contact data, search fields and folder names (#1487864)
	- Fix saving "<" character in identity name and organization fields (#1487864)
	- Added option to specify to which address book add new contacts
	- Added plugin hook for keep-alive requests
	- Store user preferences in session when write-master is not available and session is stored in memcache, write them later
	- Improve performence of folder manager operations
	- Fix default_port option handling in Installer when config.inc.php file exists (#1487925)
	- Removed option focus_on_new_message, added newmail_notifier plugin
	- Added general rcube_cache class with Memcache and APC support
	- Improved caching performance by skipping writes of unchanged data
	- Option enable_caching replaced by imap_cache and messages_cache options
	- Fix WORKFAX saving in address book (#1487910)
	- Add forward-as-attachment feature
	- jQuery-1.6.2 (#1487913, #1487144)
	- Improve display name composition when saving contacts (#1487143)
	- Fix problems with subfolders of INBOX folder on some IMAP servers (#1487725)
	- Fix handling of folders that doesn't belong to any namespace (#1487637)
	- Enable multiselection for attachments uploading in capable browsers (#1485969)
	- Add possibility to change HTML editor configuration by skin
	- Fix a bug where selecting too many contacts would produce too large URI request (#1487892)
	- Improve performance by including files with absolute path (#1487849)
	- Move folder name truncation to client/skin (#1485412)
	- Added plugin hook for request token creation
	- Replace LDAP vars in group queries (#1487837)
	- Fix vcard folding with uncode characters (#1487868)
	- Keep all submitted data if contact form validation fails (#1487865)
	- Handle uncode strings in rcube_addressbook::normalize_string() (#1487866)
	- Fix handling of debug_level=4 in ajax requests (#1487831)
	- Enable TinyMCE's contextmenu (#1487014)
	- Allow multiple concurrent compose sessions
	- New config option for custom logo
	- Allow skins to define/override texts with <roundcube:label />
	- Add simple ACL rights/namespace handling in folder manager
	- Force IE to send referers (#1487806)
	- Better display of vcard import results (#1485457)
	- Improved vcard import
	- Interactive update script with improved DB schema check
	- Fix problem with contactgroupmembers table creation on MySQL 4.x, add index on contact_id column
	- Add LDAP SASL bind and proxy authentication (#1486692)
	- Replying to a sent message puts the old recipient as the new recipient (#1487074)
	- Fulltext search over (almost) all data for contacts
	- Extend address book with rich contact information

	RELEASE 0.5.4
	-------------
	- Fix XSS vulnerability in UI messages [CVE-2011-2937] (#1488030)

	RELEASE 0.5.3
	-------------
	- Fix identities "reply-to" and "bcc" fields have a bogus value when left empty (#1487943)
	- Fix issue which cases IMAP disconnection when encrypt() method was used (#1487900)
	- Fix some CSS issues in Settings for Internet Explorer
	- Fixed handling of folder with name "0" in folder selector
	- Fix bug where messages were deleted instead moved to trash folder after Shift key was used (#1487902)
	- Fix relative URLs handling according to a <base> in HTML (#1487889)
	- Fix handling of top-level domains with more than 5 chars or unicode chars (#1487883)
	- Fix usage of non-standard HTTP error codes (#1487797)
	- Fix PHP warning on mistaken in_array() usage (#1487901)

	RELEASE 0.5.2
	-------------
	- TinyMCE 3.4.2 now compatible with IE9
	- PEAR::Net_SMTP 1.5.2, fixed timeout issue (#1487843)
	- Fix bug where template name without plugin prefix was used in render_page hook
	- Support 'abort' and 'result' response in 'preferences_save' hook, add error handling
	- Fix bug where some content would cause hang on html2text conversion (#1487863)
	- Improve space-stuffing handling in format=flowed messages (#1487861)
	- Fix bug where some dates would produce SQL error in MySQL (#1487856)
	- Added workaround for some IMAP server with broken STATUS response (#1487859)
	- Fix bug where default_charset was not used for text messages (#1487836)
	- Stateless request tokens. No keep-alive necessary on login page (#1487829)
	- Force names of unique constraints in PostgreSQL DDL
	- Add code for prevention from IMAP connection hangs when server closes socket unexpectedly
	- Remove redundant DELETE query (for old session deletion) on login
	- Get around unreliable rand() and mt_rand() in session ID generation (#1486281)
	- Fix some emails are not shown using Cyrus IMAP (#1487820)
	- Fix handling of mime-encoded words with non-integral number of octets in a word (#1487801)
	- Fix parsing links with non-printable characters inside (#1487805)
	- Fixed de_CH Localization bugs (#1487773)
	- Add variable for 'Today' label in date_today option (#1486120)
	- Fix dont_override setting does not override existing user preferences (#1487664)
	- Use only one from IMAP authentication methods to prevent login delays (1487784)
	- Support strftime format in date_today option
	- Fix SQL query in rcube_user::query() so it uses index on MySQL again
	- Removed redundant </form> tags from contact add/edit pages
	- Fix CSS error in contact details screen on IE7 (#1487775)

	RELEASE 0.5.1
	-------------
	- Fix handling of attachments with invalid content type (#1487767)
	- Add workaround for DBMail's bug http://www.dbmail.org/mantis/view.php?id=881 (#1487766)
	- Use IMAP's ID extension (RFC2971) to print more info into debug log
	- Security: add optional referer check to prevent CSRF in GET requests
	- Fix email_dns_check setting not used for identities/contacts (#1487740)
	- Fix ICANN example addresses doesn't validate (#1487742)
	- Security: protect login form submission from CSRF [CVE-2011-1491]
	- Security: prevent from relaying malicious requests through modcss.inc [CVE-2011-1492]
	- Fix handling of non-image attachments in multipart/related messages (#1487750)
	- Fix IDNA support when IDN/INTL modules are in use (#1487742)
	- Fix handling of invalid HTML comments in messages (#1487759)
	- Fix parsing FETCH response for very long headers (#1487753)
	- Fix add/remove columns in message list when message_sort_order isn't set (#1487751)
	- Check mime headers before attempt to parse them (#1487745)
	- Quote header values in show_additional_headers plugin (#1487744)
	- Fix settings UI on IE 6 (#1487724)
	- Remove double borders in folder listing (#1487713)
	- Separate full message headers UI element from headers table (#1487715)
	- Add part MIME ID to message_part_* hooks (#1487718)
	- Improve parsing of MS Outlook vCards (#1487716)
	- Updated PEAR::Net_Socket to 1.0.10
	- Updated PEAR::Net_IDNA2 to 0.1.1
	- Fix handling of comments inside an email address spec. (#1487673)
	- Show full mail subject as title when hovering a cut subject link (#1487128)
	- Fix randomly disappearing folders list in IE (#1487704)
	- Fix list column add/removal in IE (#1487703)
	- Fix login redirect issues (#1487686)
	- Require PHP 5.2.1 or greater
	- Fix %h/%z variables in username_domain option (#1487701)
	- Workaround for setting charset in case of malformed bodystructure response (#1487700)
	- Fix impossible to subscribe to protected folders (#1487656)
	- Fix setting timezone in Preferences (#1487705)

	RELEASE 0.5
	-----------
	- Fix double-login/session issue (#1487104)
	- Wrap HTML parts with <html><body> and add Doctype declaration (#1487098)
	- Make rcube_autoload silently skip unknown classes (#1487109)
	- Fix charset detection in vcards with encoded values (#1485542)
	- Better CSS cursors for splitters (#1486874)
	- Show the same message only once (#1487641)
	- Fix namespaces handling (#1487649)
	- Add handling of multifolder METADATA/ANNOTATION responses
	- Fix handling of INBOX when personal namespace prefix is non-empty (#1487657)
	- Fix handling square brackets in links (#1487672)
	- Add description of 'use_https' option in main.inc.php.dist file

	RELEASE 0.5-RC
	--------------
	- Plugin API: Add 'pass' argument in 'authenticate' hook (#1487134)
	- Fix attachments of type message/rfc822 are not listed on attachments list
	- Add 'login_lc' config option for case-insensitive authentication (#1487113)
	- Fix window is blur'ed in IE when selecting a message (#1487316)
	- Fix cursor position on compose form in Webkit browsers (#1486674)
	- Fix setting charset of attachment filenames (#1487122)
	- Allow setting autocomplete attribute for all inputs separately (#1487313)
	- New Folder Manager UI
	- Fix invalid Request when creating a folder (#1487443)
	- Add folder size and quota indicator in folder manager (#1485780)
	- Add possibility to move a subfolder into root folder (#1486791)
	- Fix copying all messages in a folder copies only messages from current page
	- Improve performance of moving or copying of all messages in a folder
	- Fix plaintext versions of HTML messages don't contain placeholders for emotions (#1485206)
	- Improve performance of folder rename and delete actions
	- Better support for READ-ONLY and NOPERM responses handling (#1487083)
	- Add confirmation message on purge/expunge command response
	- Fix handling of untagged responses for AUTHENTICATE command (#1487450)
	- Add username and IP address to log message on unsuccessful login (#1487626)
	- Improved Mail-Followup-To and Mail-Reply-To headers handling
	- Fix charset conversion for text attachments without charset specification (#1487634)

	RELEASE 0.5-BETA
	----------------
	- Make session data storage more robust against garbage session data (#1487136)
	- Config option for autocomplete on login screen
	- Allow plugin templates to include local files (#1487133)
	- List groups in address detail view and allow to subscribe/unsubscribe from there (#1486753)
	- Messages caching: performance improvements, fixed syncing, fixes related with #1486748
	- Add link to identities in compose window (#1486729)
	- Add Internationalized Domain Name (IDNA) support (#1483894)
	- Add option to automatically send read notifications for known senders (#1485883)
	- Add option to "Return receipt" will be always checked (#1486352)
	- Fix HTML to plain text conversion doesn't handle citation blocks (#1486921)
	- Use custom sorting when SORT is disabled by IMAP admin (#1486959)
	- Allow setting some washtml options from plugin (#1486578)
	- Add option do bind for an individual LDAP address book (#1486997)
	- Change reply prefix to display email address only if sender name doesn't exist (#1486550)
	- Plugin API: improved 'abort' flag handling, added 'result' item in some hooks (#1486914)
	- Fix mailto optional params in plain text messages aren't handled (#1487026)
	- Add Reply-to-List feature (#1484252)
	- Add Mail-Followup-To/Mail-Reply-To support (#1485547)
	- Fix confirmation message isn't displayed after sending mail on Chrome (#1486177)
	- Fix keyboard doesn't work with autocomplete list with Chrome (#1487029)
	- Improve tabs to fixed width and add tabs in identities info (#1486974)
	- Add unique index on users.username+users.mail_host
	- Make htmleditor option more consistent and add option to use HTML on reply to HTML message (#1485840)
	- Use empty envelope sender address for message disposition notifications (RFC 2298.3)
	- Support SMTP Delivery Status Notifications - RFC 3461 (#1486142)
	- Use css sprite image for messages list
	- Add (different) attachment icon for messages of type multipart/report (#1486165)
	- Prevent from inserting empty link when composing HTML message (#1486944)
	- Add caching support in id2uid and uid2id functions (#1487019)
	- Add SASL proxy authentication for SMTP (#1486693)
	- Improve displaying of UI messages (#1486977)
	- Fix double e-mail filed in identity form (#1487054)
	- Display IMAP errors for LIST/THREAD/SEARCH commands (#1486905)
	- Add LITERAL+ (IMAP4 non-synchronizing literals) support (RFC 2088)
	- Add separate column for message status icon (#1486665)
	- Add ACL extension support into IMAP classes (RFC 4314)
	- Add ANNOTATEMORE extension support into IMAP classes (draft-daboo-imap-annotatemore)
	- Add METADATA extension support into IMAP classes (RFC 5464)
	- Fix decoding of e-mail address strings in message headers (#1487068)
	- Fix handling of attachments when Content-Disposition is not inline nor attachment (#1487051)
	- Improve performance of unseen messages counting (#1487058)
	- Improve performance of messages counting using ESEARCH extension (RFC4731)
	- Add LIST-STATUS support in rcube_imap_generic class (RFC 5819)
	- Add SASL-IR support in IMAP (RFC 4959)
	- Add LOGINDISABLED support (RFC 2595)
	- Add support for AUTH=PLAIN in IMAP authentication
	- Re-implemented SMTP proxy authentication support
	- Add support for IMAP proxy authentication (#1486690)
	- Add support for AUTH=DIGEST-MD5 in IMAP (RFC 2831)
	- Fix parent folder with unread subfolder not bold when message is open (#1487078)
	- Add basic IMAP LIST's \Noselect option support
	- Add support for selection options from LIST-EXTENDED extension (RFC 5258)
	- Don't list subscribed but non-existent folders (#1486225)
	- Fix handling of URLs with tilde (~) or semicolon (;) character (#1487087, #1487088)
	- Plugin API: added 'contact_form' hook
	- Add SORT=DISPLAY support (RFC 5957)
	- Plugin API: add possibility to disable plugin in AJAX mode, 'noajax' property
	- Plugin API: add possibility to disable plugin in framed mode, 'noframe' property
	- Improve performance of setting IMAP flags using .SILENT suffix
	- Improve performance of message cache status checking with skip_disabled=true
	- Support contact's email addresses up to 255 characters long (#1487095)
	- Add option to place replies in the folder of the message being replied to (#1485945)
	- Add missing confirmation/error messages on contact/group/message actions (#1486845)
	- Add 'loading' message on message move/copy/delete/mark actions
	- Improve responsiveness of messages displaying (#1486986)
	- Add option for minimum length of autocomplete's string (#1486428)
	- Fix operations on messages in unsubscribed folder (#1487107)
	- Add support for shared folders (#1403507)
	- Fix handling of folders with name "0" (#1487119)
	- Fix handling of folders with "<>" characters in name
	- jQuery 1.4.4
	- Fix handling of HTML entity strings in plain text messages
	- Fix focused elements aren't unfocused when clicking on the list (#1487123)
	- Fix error in MSSQL DDL scripts (#1487112)
	- Lock submit button in onsubmit event on login page (#1487036)
	- Don't set attachment's charset in Content-type header (#1487122)
	- Fix handling of message bodies (quoted-printable encoded) with NULL characters (#1486189)
	- Add workaround for MSOE's multipart/related messages with non-related attachments

	RELEASE 0.4.2
	-------------
	- Fix handling of backslash as IMAP delimiter
	- Fix charset replacement in HTML message bodies (#1487021)
	- Fix: contact group input is empty when using rename action more than once on the same group record
	- Fix "Server Error! (Not Found)" when using utils/save-pref action (#1487023)
	- Fix handling of Thunderbird's vCards (#1487024)

	RELEASE 0.4.1
	-------------
	- Fix space-stuffing in format=flowed messages (#1487018)
	- Fix msgexport.sh now using the new imap wrapper
	- Avoid displaying password on shell (#1486947)
	- Only lower-case user name if first login attempt failed (#1486393)
	- Make alias setting in squirrelmail_usercopy plugin configurable (patch by pommi, #1487007)
	- Prevent from saving a non-existing skin path in user prefs (#1486936)
	- Improve handling of single-part messages with bogus BODYSTRUCTURE (#1486898)
	- Fix path to SQL files when using pgsql/mysqli/sqlsrv drivers (#1486902)
	- Fix upgrade script for SQLite (#1486903)
	- Fixes in SQL init script + added update script for MSSQL database
	- Remove redundant date in syslog messages (#1486945)
	- Fix contacts list page controls when a group is selected (#1486946)
	- Fix SMTP test in Installer (#1486952)
	- Fix "Select all" causes message to be opened in folder with exactly one message (#1486913)
	- Fix Tab key doesn't work in HTML editor in Google Chrome (#1486925)
	- Fix TinyMCE uses zh_CN when zh_TW locale is set (#1486929)
	- Fix TinyMCE buttons are hidden in Opera (#1486922)
	- Fix JS error on IE when trying to send HTML message with enabled spellchecker (#1486940)
	- Display inline images with known extensions and non-image content-type (#1486934)
	- Fix "Threaded" checkbox after subfolder creation (#1486928)
	- Fix timezone string in sent mail (#1486961)
	- Show disabled checkboxes for protected folders instead of dots (#1485498)
	- Added fieldsets in Identity form, added 'identity_form' hook
	- Re-added 'Close' button in upload form (#1486930, #1486823)
	- Fix handling of charsets with LATIN-* label
	- Fix messages background image handling in some cases (#1486990)
	- Fix format=flowed handling (#1486989)
	- Fix when IMAP connection fails in 'get' action session shouldn't be destroyed (#1486995)
	- Fix list_cols is not updated after column dragging (#1486999)
	- Support %z variable in host configuration options (#1487003)

	RELEASE 0.4
	-----------
	- Fix disapearing upload form disapears when user selects a file on Safari (#1486823)
	- Don't replace error messages with loading info (#1486300)
	- Fix JS errors on compose mode switch (#1486870)
	- Fix message structure parsing when it lacks optional fields (#1486881)
	- Include all recipients in sendmail log
	- Support HTTP_X_FORWARDED_PROTO header for HTTPS detecting (#1486866)
	- Fix default IMAP port configuration (#1486864)
	- Create Sent folder when starting to compose a new message (#1486802)
	- Fix handling of messages with Content-Type: application/* and no filename (#1484050)
	- Improved compose screen: resizable body and attachments list, vertical splitter, options menu
	- Fix RC forgets search results (#1483883)
	- TinyMCE 3.3.7
	- Improve parsing of styled empty tags in HTML messages (#1486812)
	- Add %dc variable support in base_dn/bind_dn config (#1486779)
	- Add button to hide/unhide the preview pane (#1484215)
	- Fix no-cache headers on https to prevent content caching by proxies (#1486798)
	- Fix attachment filenames broken with TNEF decoder using long filenames (#1486795)
	- Use user's timezone in Date header, not server's timezone (#1486119)
	- Add option to set separate footer for HTML messages (#1486660)
	- Add real SMTP error description to displayed error messages (#1485927)
	- Fix some IMAP errors handling when opening the message (#1485443)
	- Fix related parts aren't displayed when got mimetype other than image/* (#1486432)
	- Multiple identity and database support for squirrelmail_usercopy plugin (#1486517)
	- Support dynamic hostname (%d/%n) variables in configuration options (#1485438)
	- Add 'messages_list' hook (#1486266)
	- Add request* event triggers in http_post/http_request (#1486054)
	- Fix use RFC-compliant line-delimiter when saving messages on IMAP (#1486712)
	- Add 'imap_timeout' option (#1486760)
	- Fix forwarding of messages with winmail attachments
	- Fix handling of uuencoded attachments in message body (#1485839)
	- Added list_mailboxes hook in rcube_imap::list_unsubscribed() (#1486668)
	- Fix wrong message on file upload error (#1486725)
	- Add support for data URI scheme [RFC2397] (#1486740)
	- Added 'actionbefore', 'actionafter', 'responsebefore', 'responseafter' events
	- Fix double-addition of e-mail domain to content ID in HTML images
	- Read and send messages with format=flowed (#1484370), fixes word wrapping issues (#1486543)
	- Fix duplicated attachments when forwarding a message (#1486487)
	- Fix message/rfc822 attachments containing only attachments are not parsed properly (#1486743)
	- Fix %00 character in winmail.dat attachments names (#1486738)
	- Fix handling errors of folder deletion (#1486705)
	- Parse untagged CAPABILITY response for LOGIN command (#1486742)
	- Renamed all php-cli scripts to use .sh extension
	- Some files from /bin + spellchecking actions moved to the new 'utils' task
	- Added thread tree icons
	- Extend contact groups support (#1486682)
	- Fix check-recent action issues and performance (#1486526)
	- Fix messages order after checking for recent (#1484664)
	- Fix autocomplete shows entries without email (#1486452)
	- Fix listupdate event doesn't trigger on search response (#1486708)
	- Fix select_all_mode value after selecting a message (#1486720)
	- Set focus to editor on reply in HTML mode (#1486632)
	- Fix composing in HTML jumps cursor to body instead of recipients (#1486674)
	- Allow columns order change per user - drag&drop (#1485795)
	- Add References header in read receipt (#1486681)
	- Fix database constraint violation when opening a message (#1486696)
	- Add 'loading' message while login is in progress (#1486667)
	- Fix quota_zero_as_unlimited (#1486662)
	- Fix folder subscription checking (#1486684)
	- Fix INBOX appears (sometimes) twice in mailbox list (#1486672)
	- Fix listing of attachments of some types e.g. "x-epoc/x-sisx-app" (#1486653)
	- Fix DB Schema checking when some db_table_* options are not set (#1486654)

	RELEASE 0.4-beta
	----------------
	- Add sizelimit and timelimit variables in LDAP config (#1486544)
	- Hide IMAP host dropdown when single host is defined (#1486326)
	- Add images pre-loading on login page (#1451160)
	- Add HTTP_X_REAL_IP and HTTP_X_FORWARDED_FOR to successful logins log (#1486441)
	- Fix setting spellcheck languages with extended codes (#1486605)
	- Fix messages list scrolling in FF3.6 (#1486472)
	- Fix quicksearch input focus (#1486637)
	- Always set changed date when flagging a DB record as deleted + provide a cleanup script
	- Fix address book/group selection (#1486619)
	- Assign newly created contacts to the active group (#1486626)
	- Added option not to mark messages as read when viewed in preview pane (#1485012)
	- Allow plugins modify the Sent folder when composing (#1486548)
	- Added optional (max_recipients) support to restrict total number of recipients per message (#1484542)
	- Re-organize editor buttons, add blockquote and search buttons
	- Make possible to write inside or after a quoted html message (#1485476)
	- Fix bugs on unexpected IMAP connection close (#1486190, #1486270)
	- Iloha's imap.inc rewritten into rcube_imap_generic class
	- Added contact groups in address book (not finished yet)
	- Added PageUp/PageDown/Home/End keys support on lists (#1486430)
	- Added possibility to select all messages in a folder (#1484756)
	- Added 'imap_force_caps' option for after-login CAPABILITY checking (#1485750)
	- Password: Support dovecotpw encryption
	- TinyMCE 3.3.1
	- Implemented messages copying using drag&drop + SHIFT (#1484086)
	- Improved performance of folders operations (#1486525)
	- Fix blocked.gif attachment is not attached to the message (#1486516)
	- Managesieve: import from Horde-INGO
	- Managesieve: support for more than one match (#1486078)
	- Managesieve: support for selectively disabling rules within a single sieve script (#1485882)
	- Threaded message listing now available
	- Added sorting by ARRIVAL and CC
	- Message list columns configurable by the user
	- Removed 'index_sort' option, now we're using empty 'message_sort_col' for this
	- virtuser_query: support other identity data (#1486148)
	- Options virtuser_* replaced with virtuser_* plugins
	- Plugin API: Implemented 'email2user' and 'user2email' hooks
	- Fix forwarding message omits CC header (#1486305)
	- Add 'default_charset' option to user preferences (#1485451)
	- Add 'delete_always' option to user preferences
	- Support/Require tls:// prefix in 'smtp_server' option for TLS connections
	- Fix inconsistent behaviour of 'delete_always' option (#1486299)
	- Fix deleting all messages from last list page (#1486293)
	- Flag original messages when sending a draft (#1486203)
	- Changed signature separator when top-posting (#1486330)
	- Let the admin define defaults for search modifiers (#1485897)
	- Fix long e-mail addresses validation (#1486453)
	- Remember search modifiers in user prefs (#1486146)
	- Added force_7bit option to force MIME encoding of plain/text messages (#1486510)
	- Use case sensitive check when checking for default folders (#1486346)
	- Fix checking for new mail: now checks unseen count of inbox (#1485794)
	- Improve performance by avoiding unnecessary updates to the session table (#1486325)
	- Fix invalid <font> tags which cause HTML message rendering problems (#1486521)
	- Fix CVE-2010-0464: Disable DNS prefetching (#1486449)
	- Fix Received headers to behave better with SpamAssassin (#1486513)
	- Password: Make passwords encoding consistent with core, add 'password_charset' global option (#1486473)
	- Fix adding contacts SQL error on mysql (#1486459)
	- Squirrelmail_usercopy: support reply-to field (#1486506)
	- Fix IE spellcheck suggestion popup issue (#1486471)
	- Fix email address auto-completion shows regexp pattern (#1486258)
	- Fix merging of configuration parameters: user prefs always survive (#1486368)
	- Fix quota indicator value after folder purge/expunge (#1486488)
	- Fix external mailto links support for use as protocol handler (#1486037)
	- Fix attachment excessive memory use, support messages of any size (#1484660)
	- Fix setting task name according to auth state
	- Password: fix vpopmaild driver (#1486478)
	- Add workaround for MySQL bug [http://bugs.mysql.com/bug.php?id=46293] (#1486474)
	- Fix quoted text wrapping when replying to an HTML email in plain text (#1484141)
	- Fix handling of extended mailto links (with params) (#1486354)
	- Fix sorting by date of messages without date header on servers without SORT (#1486286)
	- Fix inconsistency when not using default table names (#1486467)
	- Fix folder rename/delete buttons do not appear on creation of first folder (#1486468)
	- Fix character set conversion fails on systems where iconv doesn't accept //IGNORE (#1486375)
	- Log in performance: Create default folders on first login only
	- Import contacts into the selected address book (by Phil Weir)
	- Add support for MDB2's 'sqlsrv' driver (#1486395)
	- Use jQuery-1.4
	- Removed problematic browser-caching of messages
	- Fix incompatybility with suhosin.executor.disable_emodifier (#1486321)
	- Use PLAIN auth when CRAM fails and imap_auth_type='check' (#1486371)
	- Fix removal of <title> tag from HTML messages (#1486432)
	- Fix 'force_https' to specified port when URL contains a port number (#1486411)
	- Fix to-text converting of HTML entities inside b/strong/th/hX tags (#1486422)
	- Bug in spellchecker suggestions when server charset != UTF8 (#1486406)
	- Managesieve: Fix requires generation for multiple actions (#1486397)
	- Fix LDAP problem with special characters in RDN (#1486320)
	- Improved handling of message parts of type message/rfc822
	- Plugin API: added 'quota' hook
	- Fix parsing conditional comments in HTML messages (#1486350)
	- Use built-in json_encode() for proper JSON format in AJAX replies
	- Allow setting only selected params in 'message_compose' hook (#1486312)
	- Plugin API: added 'message_compose_body' hook (#1486285)
	- Fix counters of all folders are checked in 'getunread' action with check_all_folders disabled (#1486128)
	- Fix displaying alternative parts in messages of type message/rfc822 (#1486246)
	- Fix possible messages exposure when using Roundcube behind a proxy (#1486281)
	- Fix unicode para and line separators in javascript response (#1486310)
	- Additional_message_headers: allow unsetting headers, support plugin's config file (#1486268)
	- Fix displaying of hidden directories in skins list (#1486301)
	- Fix open_basedir restriction error when reading skins list (#1486304)
	- Fix pasting from Office apps into html editor (#1486271)
	- Fix empty <a> tags parsing (#1486272)
	- Don't cut off attachment names when using non-RFC2231 encoding (#1485515)
	- Allow inserting signatures above replied message body (#1484272)
	- Managesieve 2.0: multi-script support
	- Fix imap_auth_type regression (#1486263)

	RELEASE 0.3.1
	------------------
	- Specify toolbar container in compose template (#1486247)
	- Fix $_SERVER['HTTPS'] check for SSL forcing on IIS (#1486243)
	- Avoid unnecessary page loads for selected tab (#1486032)
	- Fix quota indicator issues by content generation on client-size (#1486197, #1486220)
	- Don't display disabled sections in Settings (#1486099)
	- Added server-side e-mail address validation with 'email_dns_check' option (#1485857)
	- Fix login page loading into an iframe when session expires (#1485952)
	- Allow setting port number in 'force_https' option (#1486091)
	- Option 'force_https' replaced by 'force_https' plugin
	- Fix IE issue with non-UTF-8 characters in AJAX response (#1486159)
	- Partially fixed "empty body" issue by showing raw body of malformed message (#1486166)
	- Fix importing/sending to email address with whitespace (#1486214)
	- Added XIMSS (CommuniGate) driver for Password plugin
	- Fix newly attached files are not saved in drafts w/o editing any text (#1486202)
	- Added attachment upload indicator with parallel upload (#1486058)
	- Use default_charset for bodies of messages without charset definition (#1486187)
	- Password: added cPanel driver
	- Fix return to first page from e-mail screen (#1486105)
	- Fix handling HTML comments in HTML messages (#1486189)
	- Fix folder/messagelist controls alignment - icons used (#1486072)
	- Fix LDAP addressbook shows 'Contact not found' error sometimes (#1486178)
	- Fix cache status checking + improve cache operations performance (#1486104)
	- Prevent from setting INBOX as any of special folders (#1486114)
	- Fix regular expression for e-mail address (#1486152)
	- Fix Received header format
	- Implemented sorting by message index - added 'index_sort' option (#1485936)
	- Fix dl() use in installer (#1486150)
	- Added 'ldap_debug' option
	- Fix "Empty startup greeting" bug (#1486085)
	- Fix setting user name in 'new_user_identity' plugin (#1486137)
	- Fix incorrect count of new messages in folder list when using multiple IMAP clients (#1485995)
	- Fix all folders checking for new messages with disabled caching (#1486128)
	- Support skins in 'archive' and 'markasjunk' plugins
	- Added 'html_editor' hook (#1486068)
	- Fix DB constraint violation when populating messages cache (#1486052)
	- Password: added password strength options (#1486062)
	- Fix LDAP partial result warning (#1485536)
	- Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101)
	- Use faster/secure mt_rand() (#1486094)
	- Fix roundcube hangs on empty inbox with bincimapd (#1486093)
	- Fix wrong headers for IE on servers without $_SERVER['HTTPS'] (#1485926)
	- Force IE style headers for attachments in non-HTTPS session, 'use_https' option (#1485655)
	- Check 'post_max_size' for upload max filesize (#1486089)
	- Password Plugin: Fix %d inserts username instead of domain (#1486088)
	- Fix rcube_mdb2::affected_rows() (#1486082)

	RELEASE 0.3-stable
	------------------
	- Fix gn and givenName should be synonymous in LDAP addressbook (#1485892)
	- Add mail_domain to LDAP email entries without @ sign (#1485201)
	- Fix saving empty values in LDAP contact data (#1485781)
	- Fix LDAP contact update when RDN field is changed (#1485788)
	- Fix LDAP attributes case senitivity problems (#1485830)
	- Fix LDAP addressbook browsing when only one directory is used (#1486022)
	- Fix endless loop on error response for APPEND command (#1486060)
	- Don't require date.timezone setting in installer (#1485989)
	- Fix date sorting problem with Courier IMAP server (#1486065)
	- Unselect pressed buttons on mouse up (#1485987)
	- Don't set php_value error_log in .htaccess but mention in INSTALL (#1485924)
	- Fix too small status/flag/attachment columns in Safari 4 (#1486063)
	- Fix selection disabling while dragging splitter in webkit browsers (#1486056)
	- Added 'new_messages' plugin hook (#1486005)
	- Added 'logout_after' plugin hook (#1486042)
	- Added 'message_compose' hook
	- Added 'imap_connect' hook (#1485956)
	- Fix vcard_attachments plugin (#1486035)
	- Updated PEAR::Auth_SASL to 1.0.3 version
	- Use sequence names only with PostgreSQL (#1486018)
	- Re-designed User Preferences interface
	- Fix MS SQL DDL (#1486020)
	- Fix rcube_mdb2.php: call to setCharset not implemented in mssql driver (#1486019)
	- Added 'display_next' option
	- Fix rcube_mdb2::unixtimestamp for MS SQL (#1486015)
	- Fix HTML washing to respect character encoding
	- Fix endless loop in iil_C_Login() with Courier IMAP (#1486010)
	- Fix #messagemenu display on IE (#1486006)
	- Speedup UI by using sprites for (toolbar) buttons
	- Fix charset names with X- prefix handling
	- Fix displaying of HTML messages with unknown/malformed tags (#1486003)

	RELEASE 0.3-RC1
	---------------
	- Fix import of vCard entries with params (#1485453)
	- Fix HTML messages output with empty block elements (#1485974)
	- Use request tokens to protect POST requests from CSRF [CVE-2009-4076, CVE-2009-4077]
	- Added hook when killing a session
	- Added hook to write_log function (#1485971)
	- Performance improvements by use UID commands (#1485690)
	- Fix HTML editor tabIndex setting (#1485972)
	- Added 'imap_debug' and 'smtp_debug' options
	- Support strftime's format modifiers in date_* options (#1484806)
	- Support %h variable in 'smtp_server' option (#1485766)
	- Show SMTP errors in browser (#1485927)
	- Allow WBR tag in HTML message (#1485960)
	- Use spl_autoload_register() instead of __autoload (#1485947)
	- Add hook for identities listing (#1485958)
	- Trigger hook 'smtp_connect' when opening an SMTP connection (#1485954)
	- Added config option to enforce HTTPS connections
	- Fix non-unicode characters caching in unicode database (#1484608)
	- Performance improvements of messages caching
	- Fix empty Date header issue (#1485923)
	- Open collapsed folders during drag & drop (#1485914)
	- Fixed link text replacements (#1485789)
	- Also trigger 'insertrow' events on page load (#1485826)
	- No link on subject in IE browsers (#1484913)
	- Fixed filename encoding according to RFC2231 (#1485875)
	- Added message Edit feature (#1483891, #1484440)
	- Fix message Etag generation for counter issues (#1485623)
	- Fix messages searching on MailEnable IMAP (#1485762)
	- Fixed many 'skip_deleted' issues (#1485634)
	- Fixed messages list sorting on servers without SORT capability
	- Colorized signatures in plain text messages
	- Reviewed/fixed skip_deleted/read_when_deleted/flag_for_deletion options handling in UI
	- Fix displaying of big maximum upload filesize (#1485889)
	- Added possibility to invert messages selection
	- After move/delete from 'show' action display next message instead of messages list (#1485887)
	- Fixed problem with double quote at the end of folder name (#1485884)
	- Speedup UI by using CSS sprites and etags/expires/deflate in Apache config (#1484858,#1485800)
	- Support UID EXPUNGE: remove only moved/deleted messages
	- Add drag cancelling with ESC key (#1484344)
	- Support initial identity name from virtuser_query (#1484003)
	- Added message menu, removed Print and Source buttons
	- Added possibility to save message as .eml file (#1485861)
	- Added 1 minute interval in autosave options (#1485854)
	- Support UTF-7 encoding in messages (#1485832)
	- Better support for malformed character names (#1485758)

	RELEASE 0.3-BETA
	----------------
	- Plugin API + jQuery engine
	- Added possibility to encrypt received header, option 'http_received_header_encrypt',
	added some more logic in encrypt/decrypt functions for security
	- Fix Answered/Forwarded flag setting for messages in subfolders
	- Fix autocomplete problem with capital letters (#1485792)
	- Support UUencode content encoding (#1485839)
	- Minimize chance of race condition in session handling (#1485659, #1484678)
	- Fix session handling on non-session SQL query error (#1485734)
	- Fix html editor mode setting when reopening draft message (#1485834)
	- Added quick search box menu (#1484304)
	- Fix wrong column sort order icons (#1485823)
	- Updated TinyMCE to 3.2.3 version
	- Fix attachment names encoding when charset isn't specified in attachment part (#1484969)
	- Fix message normal priority problem (#1485820)
	- Fix autocomplete spinning wheel does not disappear (#1485804)
	- Added log_date_format option (#1485709)
	- Fix text wrapping in HTML editor after switching from plain text to HTML (#1485521)
	- Fix auto-complete function hangs with plus sign (#1485815)
	- Fix AJAX requests errors handler (#1485000)
	- Speed up message list displaying on IE
	- Fix read/write database recognition (#1485811)

	RELEASE 0.2.2
	-------------
	- Fix quicksearchbox look in Chrome and Konqueror (#1484841)
	- Fix UTF-8 byte-order mark removing (#1485514)
	- Fix folders subscribtions on Konqueror (#1484841)
	- Fix debug console on Konqueror and Safari
	- Fix messagelist focus issue when modifying status of selected messages (#1485807)
	- Support STARTTLS in IMAP connection (#1485284)
	- Fix DEL key problem in search boxes (#1485528)
	- Support several e-mail addresses per user from virtuser_file (#1485678)
	- Fix drag&drop with scrolling on IE (#1485786)
	- Fix adding signature separator in html mode (#1485350)
	- Fix opening attachment marks message as read (#1485803)
	- Fix 'temp_dir' does not support relative path under Windows (#1484529)
	- Fix "Initialize Database" button missing from installer (#1485802)
	- Fix compose window doesn't fit 1024x768 window (#1485396)
	- Fix service not available error when pressing back from compose dialog (#1485552)
	- Fix using mail() on Windows (#1485779)
	- Fix word wrapping in message-part's <PRE>s for printing (#1485787)
	- Fix incorrect word wrapping in outgoing plaintext multibyte messages (#1485714)
	- Fix double footer in HTML message with embedded images
	- Fix TNEF implementation bug (#1485773)
	- Fix incorrect row id parsing for LDAP contacts list (#1485784)
	- Fix 'mode' parameter in sqlite DSN (#1485772)

	RELEASE 0.2.1
	------------------
	- Use US-ASCII as failover when Unicode searching fails (#1485762)
	- Fix errors handling in IMAP command continuations (#1485762)
	- Fix FETCH result parsing for servers returning flags at the end of result (#1485763)
	- Fix datetime columns defaults in mysql's DDL (#1485641)
	- Fix attaching more than nine inline images (#1485759)
	- Support 'UNICODE-1-1-UTF-7' alias for UTF-7 encoding (#1485758)
	- Fix mime-type detection using a hard-coded map (#1485311)
	- Don't return empty string if charset conversion failed (#1485757)
	- Disable concurrent autocomplete query results display (#1485743)
	- Fix new lines stripped from message footer (#1485751)
	- Fix IE problem with mouse click autocomplete (#1485739)
	- Fix html body washing on reply/forward + fix attachments handling (#1485676)
	- Fix multiple recipients input parsing (#1485733)
	- Fix replying to message with html attachment (#1485676)
	- Use default_charset for messages without specified charset (#1485661, #1484961)
	- Support non-standard "GMT-XXXX" literal in date header (#1485729)
	- Added TNEF support to decode MS Outlook attachments (winmail.dat)
	- Fix "value continuation" MIME headers by adding required semicolon (#1485727)
	- Fix pressing select all/unread multiple times (#1485723)
	- Fix selecting all unread does not honor new messages (#1485724)
	- Fix some base64 encoded attachments handling (#1485725)
	- Support NGINX as IMAP backend: better BAD response handling (#1485720)
	- Performance fix: don't fetch attachment parts headers twice to parse filename
	- Fix checking for recent messages on various IMAP servers (#1485702)
	- Performance fix: Don't fetch quota and recent messages in "message view" mode
	- Fix displaying of alternative-inside-alternative messages (#1485713)
	- Fix MDNSent flag checking, use arbitrary keywords (asterisk) flag (#1485706)
	- Fix creation of folders with '&' sign in name
	- Fix parsing of email addresses without angle brackets (#1485693)
	- Save spellcheck corrections when switching from plain to html editor (and spellchecking is on)
	- Fix large search results on server without SORT capability (#1485668)
	- Get rid of preg_replace() with eval modifier and create_function usage (#1485686)
	- Bring back <base> and <link> tags in HTML messages
	- Fix XSS vulnerability through background attributes [CVE-2009-0413]
	- Fix problems with backslash as IMAP hierarchy delimiter (#1484467)
	- Secure vcard export by getting rid of preg's 'e' modifier use (#1485689)
	- Fix authentication when submitting form with existing session (#1485679)
	- Allow absolute URLs to images in HTML messages/sigs (#1485666)
	- Fix message body which contains both inline attachments and emotions
	- Fix SQL query execution errors handling in rcube_mdb2 class (#1485509)
	- Fix address names with '@' sign handling (#1485654)
	- Improve messages display performance
	- Fix messages searching with 'to:' modifier

	RELEASE 0.2-STABLE
	------------------
	- Fix mark popup in IE 7 (#1485369)
	- Fix line-break issue when copy & paste in Firefox (#1485425)
	- Fix autocomplete "unknown server error" (#1485637)
	- Fix STARTTLS before AUTH in SMTP connection (#1484883)
	- Support multiple quota values in QUOTAROOT resonse (#1485626)
	- Only abbreviate file name for IE < 7 browsers (#1485063)
	- Performance: allow setting imap rootdir and delimiter before connect (#1485172)
	- Fix sorting of folders with more than 2 levels (#1485569)
	- Fix search results page jumps in LDAP addressbook (#1485253)
	- Fix empty line before the signature in IE (#1485351)
	- Fix horizontal scrollbar in preview pane on IE (#1484633)
	- Add Robots meta tag in login page and installer (#1484846)
	- Added 'show_images' option, removed 'addrbook_show_images' (#1485597)
	- Option to check for new mails in all folders (#1484374)
	- Don't set client busy when checking for new messages (#1485276)
	- Allow UTF-8 folder names in config (#1485579)
	- Add junk_mbox option configuration in installer (#1485579)
	- Do serverside addressbook queries for autocompletion (#1485531)
	- Allow setting attachment col position in 'list_cols' option
	- Allow override 'list_cols' via skin (#1485577)
	- Fix 'cache' table cleanup on session destroy (#1485516)
	- Increase speed of session destroy and garbage clean up
	- Fix session timeout when DB server got clock skew (#1485490)
	- Fix handling of some malformed messages (#1484438)
	- Speed up raw message body handling
	- Better HTML entities conversion in html2text (#1485519)
	- Fix big memory consumption and speed up searching on servers without SORT capability
	- Fix setting locale to tr_TR, ku and az_AZ (#1485470)
	- Use SORT for searching on servers with SORT capability
	- Added message status filter
	- Fix empty file sending (#1485389)
	- Improved searching with many criterias (calling one SEARCH command)
	- Fix HTML editor initialization on IE (#1485304)
	- Add warning when switching editor mode from html to plain (#1485488)
	- Make identities list scrollable (#1485538)
	- Fix problem with numeric folder names (#1485527)
	- Added BYE response simple support to prevent from endless loops in imap.inc (#1483956)
	- Fix unread message unintentionally marked as read if read_when_deleted=true (#1485409)
	- Remove port number from SERVER_NAME in smtp_helo_host (#1485518)
	- Don't send disposition notification receipts for messages marked as 'read' (#1485523)
	- Added 'keep_alive' and 'min_keep_alive' options (#1485360)
	- Added option 'identities_level', removed 'multiple_identities'
	- Allow deleting identities when multiple_identities=false (#1485435)
	- Added option focus_on_new_message (#1485374)
	- Fix html2text class autoloading on Windows (#1485505)
	- Fix html signature formatting when identity save error occurred (#1485426)
	- Add feedback and set busy when moving folder (#1485497)
	- Fix 'Empty' link visibility for some languages e.g. Slovak (#1485489)
	- Fix messages count bar overlapping (#1485270)
	- Fix adding signature in drafts compose mode (#1485484)
	- Fix iil_C_Sort() to support very long and/or divided responses (#1485283)
	- Fix matching case sensitivity when setting identity on reply (#1485480)
	- Prefer default identity on reply
	- Fix imap searching on ISMail server (#1485466)
	- Add css class for flagged messages (#1485464)
	- Write username instead of id in sendmail log (#1485477)
	- Fix htmlspecialchars() use for PHP version < 5.2.3 (#1485475)
	- Fix js keywords escaping in json_serialize() for IE/Opera (#1485472)
	- Added bin/killcache.php script (#1485434)
	- Add support for SJIS, GB2312, BIG5 in rc_detect_encoding()
	- Fix vCard file encoding detection for non-UTF-8 strings (#1485410)
	- Add 'skip_deleted' option in User Preferences (#1485445)
	- Minimize "inline" javascript scripts use (#1485433)
	- Fix css class setting for folders with names matching defined classes names (#1485355)
	- Fix race conditions when changing mailbox
	- Fix spellchecking when switching to html editor (#1485362)
	- Fix compose window width/height (#1485396)
	- Allow calling msgimport.sh/msgexport.sh from any directory (#1485431)
	- Localized filesize units (#1485340)
	- Better handling of "no identity" and "no email in identity" situations (#1485117)
	- Added 'mime_param_folding' option with possibility to choose long/non-ascii attachment names encoding eg. to be readable in MS Outlook/OE (#1485320)
	- Added "advanced options" feature in User Preferences
	- Fix unread counter when displaying cached massage in preview panel (#1485290)
	- Fix htmleditor spellchecking on MS Windows (#1485397)
	- Fix problem with non-ascii attachment names in Mail_mime (#1485267, #1485096)
	- Fix language autodetection (#1485401)
	- Fix button label in folders management (#1485405)
	- Fix collapsed folder not indicating unread msgs count of all subfolders (#1485403)
	- Fix handling of apostrophes in filenames decoded according to rfc2231

	RELEASE 0.2-BETA
	----------------
	- Made config files location configurable (#1485215)
	- Reduced memory footprint when forwarding attachments (#1485345)
	- Allow and use spellcheck attribute for input/textarea fields (#1485060)
	- Added icons for forwarded/forwarded+replied messages (#1485257)
	- Added Reply-To to forwarded emails (#1485315)
	- Display progress message for folders create/delete/rename (#1485357)
	- Smart Tags and NOBR tag support in html messages (#1485363, #1485327)
	- Redesign of the identities settings (#1484042)
	- Add config option to disable creation/deletion of identities (#1484498)
	- Added 'sendmail_delay' option to restrict messages sending interval (#1484491)
	- Added vertical splitter for folders list resizing
	- Added possibility to view all headers in message view
	- Fixed splitter drag/resize on Opera (#1485170)
	- Fixed quota img height/width setting from template (#1484857)
	- Refactor drag & drop functionality. Don't rely on browser events anymore (#1484453)
	- Insert "virtual" folders in subscription list (#1484779)
	- Added link to open message in new window
	- Enable export of address book contacts as vCard
	- Add feature to import contacts from vcard files (#1326103)
	- Respect Content-Location headers in multipart/related messages according to RFC2110 (#1484946)
	- Allowed max. attachment size now indicated in compose screen (#1485030)
	- Also capture backspace key in list mode (#1484566)
	- Allow application/pgp parts to be displayed (#1484753)
	- Correctly handle options in mailto-links (#1485228)
	- Immediately save sort_col/sort_order in user prefs (#1485265)
	- Truncate very long (above 50 characters) attachment filenames when displaying
	- Allow to auto-detect client language if none set (#1484434)
	- Auto-detect the client timezone (user configurable)
	- Add RFC2231 header value continuations support for attachment filenames + hack for servers that not support that feature
	- Fix Reply-To header displaying (#1485314)
	- Mark form buttons that provide the most obvious operation (mainaction)
	- Added option 'quota_zero_as_unlimited' (#1484604)
	- Added PRE handling in html2text class (#1484740)
	- Added folder hierarchy collapsing
	- Added options to use syslog instead of log file (#1484850)
	- Added Logging & Debugging section in Installer
	- Fix In-Reply-To and References headers when composing saved draft message (#1485288)
	- Fix html message charset conversion for charsets with underline (#1485287)
	- Fix buttons status after contacts deletion (#1485233)
	- Fix escaping of To: and From: fields when building message body for reply or forward in the HTML editor (#1484904)
	- Use current mailbox name in template (#1485256)
	- Better fix for skipping untagged responses (#1485261)
	- Added pspell support patch by Kris Steinhoff (#1483960)
	- Enable spellchecker for HTML editor (#1485114)
	- Respect spellcheck_uri in tinyMCE spellchecker (#1484196)
	- Case insensitive contacts searching using PostgreSQL (#1485259)
	- Make default imap folders configurable for each user (#1485075)
	- Save outgoing mail to selectable folder (#1324581)
	- Fix hiding of mark menu when clicking th button again (#1484944)
	- Use long date format in print mode (#1485191)
	- Updated TinyMCE to version 3.1.0.1
	- Re-enable autocomplete attribute for login form (#1485211)
	- Check PERMANENTFLAGS before saving $MDNSent flag (#1484963, #1485163)
	- Added flag column on messages list (#1484623)
	- Patched Mail/MimePart.php (http://pear.php.net/bugs/bug.php?id=14232)
	- Allow trash/junk subfolders to be purged (#1485085)
	- Store compose parameters in session and redirect to a unique URL
	- Fixed CRAM-MD5 authentication (#1484819)
	- Fixed forwarding messages with one HTML attachment (#1484442)
	- Fixed encoding of message/rfc822 attachments and image/pjpeg handling (#1484914)
	- Added option to select skin in user preferences
	- Added option to configure displaying of attached images below the message body
	- Added option to display images in messages from known senders (#1484601)
	- User preferences grouped in more fieldsets
	- Fix corrupted MIME headers of messages in Sent folder (#1485111)
	- Fixed bug in MDB2 package: http://pear.php.net/bugs/bug.php?id=14124
	- Use keypress instead of keydown to select list's row (#1484816)
	- Don't call expunge and don't remove message row after message move if flag_for_deletion is set to true (#1485002)

	RELEASE 0.2-ALPHA
	-----------------
	- Added option to disable autocompletion from selected LDAP address books (#1484922)
	- TLS support in LDAP connections: 'use_tls' property (#1485104)
	- Fixed removing messages from search set after deleting them (#1485106)
	- imap.inc: Fixed iil_C_FetchStructureString() to handle many
	literal strings in response (#1484969)
	- Support for subfolders in default/protected folders (#1484665)
	- Disallowed delimiter in folder name (#1484803)
	- Support " and \ in folder names
	- Escape \ in login (#1484614)
	- Better HTML sanitization with the DOM-based washtml script (#1484701)
	- Fixed sorting of folders with non-ascii characters
	- Fixed Mysql DDL for default identities creation (#1485070)
	- In Preferences added possibility to configure 'read_when_deleted',
	'mdn_requests', 'flag_for_deletion' options
	- Made IMAP auth type configurable (#1483825)
	- Fixed empty values with FROM_UNIXTIME() in rcube_mdb2 (#1485055)
	- Fixed attachment list on IE 6/7 (#1484807)
	- Fixed JavaScript in compose.html that shows cc/bcc fields if populated
	- Make password input fields of type password in installer (#1484886)
	- Don't attempt to delete cache entries if enable_caching is FALSE (#1485051)
	- Optimized messages sorting on servers without sort capability (#1485049)
	- Corrected message headers decoding when charset isn't specified and improved
	support for native languages (#1485050, #1485048)
	- Expanded LDAP configuration options to support LDAP server writes.
	- Installer: encode special characters in DB username/password (#1485042)
	- Fixed management of folders with national characters in names (#1485036, #1485001)
	- Fixed identities saving when using MDB2 pgsql driver (#1485032)
	- Fixed BCC header reset (#1484997)
	- Improved messages list performance - patch from Justin Heesemann
	- Append skin_path to images location only when it starts with '/' sign (#1484859)
	- Fix IMAP response in message body when message has no body (#1484964)
	- Fixed non-RFC dates formatting (#1484901)
	- Fixed typo in set_charset() (#1484991)
	- Decode entities when inserting HTML signature to plain text message (#1484990)
	- HTML editing is now working with PHP5 updates and TinyMCE v3.0.6
	- Fixed signature loading on Windows (#1484545)
	- Added language support to HTML editing (#1484862)
	- Fixed remove signature when replying (#1333167)
	- Fixed problem with line with a space at the end (#1484916)
	- Fixed <!DOCTYPE> tag filtering (#1484391)
	- Fixed <?xml> tag filtering (#1484403)
	- Added sections (fieldset+label) in Settings interface
	- Mark as read in one action with message preview (#1484972)
	- Deleted redundant quota reads (#1484972)
	- Added options for empty trash and expunge inbox on logout (#1483863)
	- Removed lines wrapping when displaying message
	- Fixed month localization
	- Changed codebase to PHP5 with autoloader

	RELEASE 0.1.1
	-------------
	- Clear selection when selecting single item (#1484942)
	- Remove hard-coded image size in skin templates (#1484893)
	- Database schema improvements (dropped unnecessary indexes)
	- Fixed creating a new folder with a comma in its name (#1484681)
	- Fixed sorting of messages when default mailbox is empty (#1484317)
	- Improve message previewpane - less loading (#1484316)
	- Fixed login form autoompletion (#1484839)
	- Fixed virtuser_query option for mdb2 backend (#1484874)
	- Fixed attachment resoting from Drafts when message body was empty (#1484506)
	- Fixed usage of ob_gzhandler (#1484851)
	- Fixed message part window in IE6 (#1484610)
	- Fixed decoding of mime-encoded strings (#1484191)
	- Fixed some iconv/mb_string problems (#1484598)
	- Correctly quote mailbox name when using in URL (#1484313)
	- Fixed "headers already sent" errors (#1484860)

	RELEASE 0.1-STABLE
	------------------
	- Added interactive installer script
	- Fix folder adding/renaming inspired by #1484800
	- Localize folder name in page title (#1484785)
	- Fix code using wrong variable name (#1484018)
	- Allow to send mail with BCC recipients only
	- condense TinyMCE toolbar down to one line, removing table buttons (#1484747)
	- Add function to mark the selected messages as read/unread (#1457360)
	- Also do charset decoding as suggested in RFC 2231 (fix #1484321)
	- Show message count in folder list and hint when creating a subfolder
	- Distinguish ssl and tls for imap connections (#1484667)
	- Added some charset aliases to fix typical mis-labelling (#1484565)
	- Remember decision to display images for a certain message during session (#1484754)
	- Truncate attachment filenames to 55 characters due to an IE bug (#1484757)
	- Make sending of read receipts configurable
	- Respect config when localize folder names (#1484707)
	- Also respect receipt and priority settings when re-opening a draft message
	- Remember search results (closes #1483883), patch by the_glu
	- Add Received header on outgoing mail
	- Upgrade to TinyMCE 2.1.3
	- Allow inserting image attachments into HTML messages while composing (#1484557)
	- Implement Message-Disposition-Notification (Receipts)
	- Fix overriding of session vars when register_globals is on (#1484670)
	- Fix bug with case-sensitive folder names (#1484245)
	- Don't create default folders by default
	- Fixed some potential security risks (audited by Andris)
	- Only show new messages if they match the current search (#1484176)
	- Switch to/from when searcing in Sent folder (#1484555)
	- Correctly read the References header (#1484646)
	- Unset old cookie before sending a new value (#1484639)
	- Correctly decode attachments when downloading them (#1484645 and #1484642)
	- Suppress IE errors when clearing attachments form (#1484356)
	- Log error when login fails due to auto_create_user turned off
	- Filter linked/imported CSS files (closes #1484056)
	- Improve message compose screen (closes #1484383)
	- Select next row after removing one from list (#1484387)

	RELEASE 0.1-RC2
	---------------
	- Enable drag-&-dropping of folders to a new parent and allow to create subfolders (#1457344)
	- Suppress IE errors when clearing attachments form (#1484356)
	- Set preferences field in user table to NULL (#1484386)
	- Log error when login fails due to auto_create_user turned off
	- Filter linked/imported CSS files (closes #1484056)
	- Improve message compose screen (closes #1484383)
	- Select next row after removing one from list (#1484387)
	- Make smtp HELO/EHLO hostname configurable (#1484067)
	- IPv6 Compatability (#1484322), Patch #1484373
	- Unlock interface when message sending fails (#1484570)
	- Eval PHP code in template includes (if configured)
	- Show message when folder is empty. Mo more static text in table (#1484395)
	- Only display unread count in page title when new messages arrived
	- Fixed wrong delete button tooltip (#1483965)
	- Fixed charset encoding bug (#1484429)
	- Applied patch for LDAP version (#1484552)
	- Improved XHTML validation
	- Fix message list selection (#1484550)
	- Better fix lowercased usernames (#1484473)
	- Update pngbehavior Script as suggested in #1484490
	- Fixed moving/deleting messages when more than 1 is selected
	- Applied patch for LDAP contacts listing by Glen Ogilvie
	- Applied patch for more address fields in LDAP contacts (#1484402)
	- Add alternative for getallheaders() (fix #1484508)
	- Identify mailboxes case-sensitive
	- Sort mailbox list case-insensitive (closes #1484338)
	- Fix display of multipart messages from Apple Mail (closes #1484027)
	- Protect AJAX request from being fetched by a foreign site (XSS)
	- Make autocomplete for loginform configurable by the skin template
	- Fix compose function from address book (closes #1484426)
	- Added //IGNORE to iconv call (patch #1484420, closes #1484023)
	- Check if mbstring supports charset (#1484290 and #1484292)
	- Prefer iconv over mbstring (as suggested in #1484292)
	- Check filesize of template includes (#1484409)
	- Fixed bug with buttons not dimming/enabling properly after switching folders
	- Fixed compose window becoming unresponsive after saving a draft (#1484487)
	- Re-enabled "Back" button in compose window now that bug #1484487 is fixed
	- Fixed unresponsive interface issue when downloading attachments (#1484496)
	- Lowered status message time from 5 to 3 seconds to improve responsiveness
	- Raised .htaccess upload_max_filesize from 2M to 5M to differ from default php.ini
	- Increased "mailboxcontrols" mail.css width from 160 to 170px to fix non-english languages (#1484499)
	- Fix status message bug #1484464 with regard to #1484353
	- Fix address adding bug reported by David Koblas
	- Applied socket error patch by Thomas Mangin
	- Pass-by-reference workarround for PHP5 in sendmail.inc
	- Fixed buggy imap_root settings (closes #1484379)
	- Prevent default events on subject links (#1484399)
	- Use HTTP-POST requests for actions that change state

	RELEASE 0.1-RC1
	---------------
	- Use global filters and bind username/ for Ldap searches (#1484159)
	- Hide quota display if imap server does not support it
	- Hide address groups if no LDAP servers configured
	- Add link to message subjects (closes #1484257)
	- Better SQL query for contact listing/search (closes #1484369)
	- Fixed marking as read in preview pane (closes #1484364)
	- CSS hack to display attachments correctly in IE6
	- Wrap message body text (closes #1484148)
	- LDAP access is back in address book (closes #1484087)
	- Added search function for contacts
	- New Template parsing and output encoding
	- Fixed bugs #1484119 and #1483978
	- Fixed message moving procedure (closes #1484308)
	- Fixed display of multiple attachments (closes #1466563)
	- Fixed check for new messages (closes #1484310)
	- List attachments without filename
	- New session authentication: Change sessid cookie when login, authentication with sessauth cookie is now configurable.
	Should close bugs #1483951 and #1484299
	- Correctly translate mailbox names (closes #1484276)
	- Quote e-mail address links (closes #1484300)
	- Updated PEAR::Mail_mime package
	- Accept single quotes for HTML attributes when modifying message body (thanks Jason)
	- Sanitize input for new users/identities (thanks Colin Alston)
	- Don't download HTML message parts
	- Convert HTML parts to plaintext if 'prefer_html' is off
	- Correctly parse message/rfc822 parts (closes #1484045)
	- Also use user_id for unique key in messages table (closes #1484074)
	- Hide contacts drop down on blur (closes #1484203)
	- Make entries in contacts drop down clickable
	- Turn off browser autocompletion on login page
	- Quote <? in text/html message parts
	- Hide border around radio buttons
	- Applied patch for attachment download by crichardson (closes #1484198)
	- Fixed bug in Postgres DB handling (closes #1484068)
	- Fixed bug of invalid calls to fetchRow() in rcube_db.inc (closes #1484280)
	- Fixed array_merge bug (closes #1484281)
	- Fixed flag for deletion in list view (closes #1484264)
	- Finally support semicolons as recipient separator (closes ##1484251)
	- Fixed message headers (subject) encoding
	- check if safe mode is on or not (closes #1484269)
	- Show "no subject" in message list if subject is missing (closes #1484243)
	- Solved page caching of message preview (closes #1484153)
	- Only use gzip compression if configured (closes #1484236)
	- Fixed priority selector issue (#1484150)
	- Fixed some CSS issues in default skin (closes #1484210 and #1484161)
	- Prevent from double quoting of numeric HTML character references (closes #1484253)
	- Fixed display of HTML message attachments (closes #1484178)
	- Applied patch for preview caching (closes #1484186)
	- Added error handling for attachment uploads
	- Use multibyte safe string functions where necessary (closes #1483988)
	- Applied security patch to validate the submitted host value (by Kees Cook)
	- Applied security patch to validate input values when deleting contacts (by Kees Cook)
	- Applied security patch that sanitizes emoticon paths when attaching them (by Kees Cook)
	- Applied a patch to more aggressively sanitize a HTML message
	- Visualize blocked images in HTML messages
	- Fixed wrong message listing when showing search results (closes #1484131)
	- Show remote images when opening HTML message part as attachment
	- Improve memory usage when sending mail (closes #1484098)
	- Mark messages as read once the preview is loaded (closes #1484132)
	- Include smtp final response in log (closes #1484081)
	- Corrected date string in sent message header (closes #1484125)
	- Correclty choose "To" column in sent and draft mailboxes (closes #1483943)
	- Changed srong tooltips for message browse buttons (closes #1483930)
	- Fixed signature delimeter character to be standard (Bug #1484035)
	- Fixed XSS vulnerability (Bug #1484109)
	- Remove newlines from mail headers (Bug #1484031)
	- Selection issues when moving/deleting (Bug #1484044)
	- Applied patch of Clement Moulin for imap host auto-selection
	- ISO-encode IMAP password for plaintext login (Bugs #1483977 & #1483886)
	- Fixed folder name encoding in subscription list (Bug #1484113)
	- Fixed JS errors in identity list (Bug #1484120)
	- Translate foldernames in folder form (closes #1484113)
	- Added first and last buttons to message list, address book
	and message detail
	- Pressing Shift-Del bypasses Trash folder
	- Enable purge command for Junk folder
	- Fetch all aliases if virtuser_query is used instead
	- Re-enabled multi select of contacts (Bug #1484017)
	- Enable contact editing right after creation (Bug #1459641)
	- Correct UTF-7 to UTF-8 conversion if mbstring is not available
	- Fixed IMAP fetch of message body (Bug #1484019)
	- Fixed safe_mode problems (Bug #1418381)
	- Fixed wrong header encoding (Bug #1483976)
	- Made automatic draft saving configurable
	- Fixed JS bug when renaming folders (Bug #1483989)
	- Added quota display as image (by Brett Patterson)
	- Corrected creation of a message-id
	- New indentation for quoted message text
	- Improved HTML validity
	- Fixed URL character set (Ticket #1445501)
	- Fixed saving of contact into MySQL from LDAP query results (Ticket #1483820)
	- Fixed folder renaming: unsubscribe before rename (Bug #1483920)
	- Finalized new message parsing (+ chaching)
	- Fixed wrong usage of mbstring (Bug #1462439)
	- Set default spelling language (Ticket #1483938)
	- Added support for Nox Spell Server
	- Re-built message parsing (Bug #1327068)
	Now based on the message structure delivered by the IMAP server.
	- Fixed some XSS and SQL injection issues
	- Fixed charset problems with folder renaming
	diff --git a/config/defaults.inc.php b/config/defaults.inc.php
	index e369608a2..5a5bffb5e 100644
	--- a/config/defaults.inc.php
	+++ b/config/defaults.inc.php
	@@ -1,1102 +1,1124 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| Main configuration file with default settings \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-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. \|
	+-----------------------------------------------------------------------+
	*/

	$config = array();

	// ----------------------------------
	// SQL DATABASE
	// ----------------------------------

	// Database connection string (DSN) for read+write operations
	// Format (compatible with PEAR MDB2): db_provider://user:password@host/database
	// Currently supported db_providers: mysql, pgsql, sqlite, mssql or sqlsrv
	// For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
	// NOTE: for SQLite use absolute path: 'sqlite:////full/path/to/sqlite.db?mode=0646'
	$config['db_dsnw'] = 'mysql://roundcube:@localhost/roundcubemail';

	// Database DSN for read-only operations (if empty write database will be used)
	// useful for database replication
	$config['db_dsnr'] = '';

	// Disable the use of already established dsnw connections for subsequent reads
	$config['db_dsnw_noread'] = false;

	// use persistent db-connections
	// beware this will not "always" work as expected
	// see: http://www.php.net/manual/en/features.persistent-connections.php
	$config['db_persistent'] = false;

	// you can define specific table (and sequence) names prefix
	$config['db_prefix'] = '';

	// Mapping of table names and connections to use for ALL operations.
	// This can be used in a setup with replicated databases and a DB master
	// where read/write access to cache tables should not go to master.
	$config['db_table_dsn'] = array(
	// 'cache' => 'r',
	// 'cache_index' => 'r',
	// 'cache_thread' => 'r',
	// 'cache_messages' => 'r',
	);


	// ----------------------------------
	// LOGGING/DEBUGGING
	// ----------------------------------

	// system error reporting, sum of: 1 = log; 4 = show
	$config['debug_level'] = 1;

	// log driver: 'syslog' or 'file'.
	$config['log_driver'] = 'file';

	// date format for log entries
	// (read http://php.net/manual/en/function.date.php for all format characters)
	$config['log_date_format'] = 'd-M-Y H:i:s O';

	// length of the session ID to prepend each log line with
	// set to 0 to avoid session IDs being logged.
	$config['log_session_id'] = 8;

	// Syslog ident string to use, if using the 'syslog' log driver.
	$config['syslog_id'] = 'roundcube';

	// Syslog facility to use, if using the 'syslog' log driver.
	// For possible values see installer or http://php.net/manual/en/function.openlog.php
	$config['syslog_facility'] = LOG_USER;

	// Activate this option if logs should be written to per-user directories.
	// Data will only be logged if a directry <log_dir>/<username>/ exists and is writable.
	$config['per_user_logging'] = false;

	// Log sent messages to <log_dir>/sendmail or to syslog
	$config['smtp_log'] = true;

	// Log successful/failed logins to <log_dir>/userlogins or to syslog
	$config['log_logins'] = false;

	// Log session authentication errors to <log_dir>/session or to syslog
	$config['log_session'] = false;

	// Log SQL queries to <log_dir>/sql or to syslog
	$config['sql_debug'] = false;

	// Log IMAP conversation to <log_dir>/imap or to syslog
	$config['imap_debug'] = false;

	// Log LDAP conversation to <log_dir>/ldap or to syslog
	$config['ldap_debug'] = false;

	// Log SMTP conversation to <log_dir>/smtp or to syslog
	$config['smtp_debug'] = false;

	// ----------------------------------
	// IMAP
	// ----------------------------------

	// The mail host chosen to perform the log-in.
	// Leave blank to show a textbox at login, give a list of hosts
	// to display a pulldown menu or set one host as string.
	// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
	// Supported replacement variables:
	// %n - hostname ($_SERVER['SERVER_NAME'])
	// %t - hostname without the first part
	// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
	// %s - domain name after the '@' from e-mail address provided at login screen
	// For example %n = mail.domain.tld, %t = domain.tld
	// WARNING: After hostname change update of mail_host column in users table is
	// required to match old user data records with the new host.
	$config['default_host'] = 'localhost';

	// TCP port used for IMAP connections
	$config['default_port'] = 143;

	// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or null to use
	// best server supported one)
	$config['imap_auth_type'] = null;

	// IMAP socket context options
	// See http://php.net/manual/en/context.ssl.php
	// The example below enables server certificate validation
	//$config['imap_conn_options'] = array(
	// 'ssl' => array(
	// 'verify_peer' => true,
	// 'verify_depth' => 3,
	// 'cafile' => '/etc/openssl/certs/ca.crt',
	// ),
	// );
	$config['imap_conn_options'] = null;

	// IMAP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
	$config['imap_timeout'] = 0;

	// Optional IMAP authentication identifier to be used as authorization proxy
	$config['imap_auth_cid'] = null;

	// Optional IMAP authentication password to be used for imap_auth_cid
	$config['imap_auth_pw'] = null;

	// If you know your imap's folder delimiter, you can specify it here.
	// Otherwise it will be determined automatically
	$config['imap_delimiter'] = null;

	// If IMAP server doesn't support NAMESPACE extension, but you're
	// using shared folders or personal root folder is non-empty, you'll need to
	// set these options. All can be strings or arrays of strings.
	// Folders need to be ended with directory separator, e.g. "INBOX."
	// (special directory "~" is an exception to this rule)
	// These can be used also to overwrite server's namespaces
	$config['imap_ns_personal'] = null;
	$config['imap_ns_other'] = null;
	$config['imap_ns_shared'] = null;

	// By default IMAP capabilities are readed after connection to IMAP server
	// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list
	// after login. Set to True if you've got this case.
	$config['imap_force_caps'] = false;

	// By default list of subscribed folders is determined using LIST-EXTENDED
	// extension if available. Some servers (dovecot 1.x) returns wrong results
	// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225
	// Enable this option to force LSUB command usage instead.
	// Deprecated: Use imap_disabled_caps = array('LIST-EXTENDED')
	$config['imap_force_lsub'] = false;

	// Some server configurations (e.g. Courier) doesn't list folders in all namespaces
	// Enable this option to force listing of folders in all namespaces
	$config['imap_force_ns'] = false;

	// List of disabled imap extensions.
	// Use if your IMAP server has broken implementation of some feature
	// and you can't remove it from CAPABILITY string on server-side.
	// For example UW-IMAP server has broken ESEARCH.
	// Note: Because the list is cached, re-login is required after change.
	$config['imap_disabled_caps'] = array();

	// Log IMAP session identifers after each IMAP login.
	// This is used to relate IMAP session with Roundcube user sessions
	$config['imap_log_session'] = false;

	// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'.
	$config['imap_cache'] = null;

	// Enables messages cache. Only 'db' cache is supported.
	// This requires an IMAP server that supports QRESYNC and CONDSTORE
	// extensions (RFC7162). See synchronize() in program/lib/Roundcube/rcube_imap_cache.php
	// for further info, or if you experience syncing problems.
	$config['messages_cache'] = false;

	// Lifetime of IMAP indexes cache. Possible units: s, m, h, d, w
	$config['imap_cache_ttl'] = '10d';

	// Lifetime of messages cache. Possible units: s, m, h, d, w
	$config['messages_cache_ttl'] = '10d';

	// Maximum cached message size in kilobytes.
	// Note: On MySQL this should be less than (max_allowed_packet - 30%)
	$config['messages_cache_threshold'] = 50;


	// ----------------------------------
	// SMTP
	// ----------------------------------

	// SMTP server host (for sending mails).
	// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
	// If left blank, the PHP mail() function is used
	// Supported replacement variables:
	// %h - user's IMAP hostname
	// %n - hostname ($_SERVER['SERVER_NAME'])
	// %t - hostname without the first part
	// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
	// %z - IMAP domain (IMAP hostname without the first part)
	// For example %n = mail.domain.tld, %t = domain.tld
	$config['smtp_server'] = '';

	// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
	// deprecated SSL over SMTP (aka SMTPS))
	$config['smtp_port'] = 25;

	// SMTP username (if required) if you use %u as the username Roundcube
	// will use the current username for login
	$config['smtp_user'] = '';

	// SMTP password (if required) if you use %p as the password Roundcube
	// will use the current user's password for login
	$config['smtp_pass'] = '';

	// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
	// best server supported one)
	$config['smtp_auth_type'] = '';

	// Optional SMTP authentication identifier to be used as authorization proxy
	$config['smtp_auth_cid'] = null;

	// Optional SMTP authentication password to be used for smtp_auth_cid
	$config['smtp_auth_pw'] = null;

	// SMTP HELO host
	// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages
	// Leave this blank and you will get the server variable 'server_name' or
	// localhost if that isn't defined.
	$config['smtp_helo_host'] = '';

	// SMTP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
	// Note: There's a known issue where using ssl connection with
	// timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
	$config['smtp_timeout'] = 0;

	// SMTP socket context options
	// See http://php.net/manual/en/context.ssl.php
	// The example below enables server certificate validation, and
	// requires 'smtp_timeout' to be non zero.
	// $config['smtp_conn_options'] = array(
	// 'ssl' => array(
	// 'verify_peer' => true,
	// 'verify_depth' => 3,
	// 'cafile' => '/etc/openssl/certs/ca.crt',
	// ),
	// );
	$config['smtp_conn_options'] = null;


	// ----------------------------------
	// LDAP
	// ----------------------------------

	// Type of LDAP cache. Supported values: 'db', 'apc' and 'memcache'.
	$config['ldap_cache'] = 'db';

	// Lifetime of LDAP cache. Possible units: s, m, h, d, w
	$config['ldap_cache_ttl'] = '10m';

	// ----------------------------------
	// SYSTEM
	// ----------------------------------

	// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA.
	// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING!
	$config['enable_installer'] = false;

	// don't allow these settings to be overriden by the user
	$config['dont_override'] = array();

	// List of disabled UI elements/actions
	$config['disabled_actions'] = array();

	// define which settings should be listed under the 'advanced' block
	// which is hidden by default
	$config['advanced_prefs'] = array();

	// provide an URL where a user can get support for this Roundcube installation
	// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
	$config['support_url'] = '';

	// replace Roundcube logo with this image
	// specify an URL relative to the document root of this Roundcube installation
	// an array can be used to specify different logos for specific template files, '*' for default logo
	// for example array("*" => "/images/roundcube_logo.png", "messageprint" => "/images/roundcube_logo_print.png")
	$config['skin_logo'] = null;

	// automatically create a new Roundcube user when log-in the first time.
	// a new user will be created once the IMAP login succeeds.
	// set to false if only registered users can use this service
	$config['auto_create_user'] = true;

	// Enables possibility to log in using email address from user identities
	$config['user_aliases'] = false;

	// use this folder to store log files
	// must be writeable for the user who runs PHP process (Apache user if mod_php is being used)
	// This is used by the 'file' log driver.
	$config['log_dir'] = RCUBE_INSTALL_PATH . 'logs/';

	// use this folder to store temp files
	// must be writeable for the user who runs PHP process (Apache user if mod_php is being used)
	$config['temp_dir'] = RCUBE_INSTALL_PATH . 'temp/';

	// expire files in temp_dir after 48 hours
	// possible units: s, m, h, d, w
	$config['temp_dir_ttl'] = '48h';

	// enforce connections over https
	// with this option enabled, all non-secure connections will be redirected.
	// set the port for the ssl connection as value of this option if it differs from the default 443
	$config['force_https'] = false;

	// tell PHP that it should work as under secure connection
	// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set)
	// e.g. when you're running Roundcube behind a https proxy
	// this option is mutually exclusive to 'force_https' and only either one of them should be set to true.
	$config['use_https'] = false;

	// Allow browser-autocompletion on login form.
	// 0 - disabled, 1 - username and host only, 2 - username, host, password
	$config['login_autocomplete'] = 0;

	// Forces conversion of logins to lower case.
	// 0 - disabled, 1 - only domain part, 2 - domain and local part.
	// If users authentication is case-insensitive this must be enabled.
	// Note: After enabling it all user records need to be updated, e.g. with query:
	// UPDATE users SET username = LOWER(username);
	$config['login_lc'] = 2;

	// Includes should be interpreted as PHP files
	$config['skin_include_php'] = false;

	// display software version on login screen
	$config['display_version'] = false;

	// Session lifetime in minutes
	$config['session_lifetime'] = 10;

	// Session domain: .example.org
	$config['session_domain'] = '';

	// Session name. Default: 'roundcube_sessid'
	$config['session_name'] = null;

	// Session authentication cookie name. Default: 'roundcube_sessauth'
	$config['session_auth_name'] = null;

	// Session path. Defaults to PHP session.cookie_path setting.
	$config['session_path'] = null;

	// Backend to use for session storage. Can either be 'db' (default), 'memcache' or 'php'
	// If set to 'memcache', a list of servers need to be specified in 'memcache_hosts'
	// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed
	// 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' );

	// check client IP in session authorization
	$config['ip_check'] = false;

	// List of trusted proxies
	// X_FORWARDED_* and X_REAL_IP headers are only accepted from these IPs
	$config['proxy_whitelist'] = array();

	// check referer of incoming requests
	$config['referer_check'] = false;

	// X-Frame-Options HTTP header value sent to prevent from Clickjacking.
	// Possible values: sameorigin\|deny. Set to false in order to disable sending them
	$config['x_frame_options'] = 'sameorigin';

	// this key is used to encrypt the users imap password which is stored
	// in the session record (and the client cookie if remember password is enabled).
	// please provide a string of exactly 24 chars.
	$config['des_key'] = 'rcmail-!24ByteDESkey*Str';

	// Automatically add this domain to user names for login
	// Only for IMAP servers that require full e-mail addresses for login
	// Specify an array with 'host' => 'domain' values to support multiple hosts
	// Supported replacement variables:
	// %h - user's IMAP hostname
	// %n - hostname ($_SERVER['SERVER_NAME'])
	// %t - hostname without the first part
	// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
	// %z - IMAP domain (IMAP hostname without the first part)
	// For example %n = mail.domain.tld, %t = domain.tld
	$config['username_domain'] = '';

	// Force domain configured in username_domain to be used for login.
	// Any domain in username will be replaced by username_domain.
	$config['username_domain_forced'] = false;

	// This domain will be used to form e-mail addresses of new users
	// Specify an array with 'host' => 'domain' values to support multiple hosts
	// Supported replacement variables:
	// %h - user's IMAP hostname
	// %n - http hostname ($_SERVER['SERVER_NAME'])
	// %d - domain (http hostname without the first part)
	// %z - IMAP domain (IMAP hostname without the first part)
	// For example %n = mail.domain.tld, %t = domain.tld
	$config['mail_domain'] = '';

	// Password charset.
	// Use it if your authentication backend doesn't support UTF-8.
	// Defaults to ISO-8859-1 for backward compatibility
	$config['password_charset'] = 'ISO-8859-1';

	// How many seconds must pass between emails sent by a user
	$config['sendmail_delay'] = 0;

	// Maximum number of recipients per message. Default: 0 (no limit)
	$config['max_recipients'] = 0;

	// Maximum allowednumber of members of an address group. Default: 0 (no limit)
	// If 'max_recipients' is set this value should be less or equal
	$config['max_group_members'] = 0;

	// Name your service. This is displayed on the login screen and in the window title
	$config['product_name'] = 'Roundcube Webmail';

	// Add this user-agent to message headers when sending
	$config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION;

	// try to load host-specific configuration
	// see http://trac.roundcube.net/wiki/Howto_Config for more details
	$config['include_host_config'] = false;

	// path to a text file which will be added to each sent message
	// paths are relative to the Roundcube root folder
	$config['generic_message_footer'] = '';

	// path to a text file which will be added to each sent HTML message
	// paths are relative to the Roundcube root folder
	$config['generic_message_footer_html'] = '';

	// add a received header to outgoing mails containing the creators IP and hostname
	$config['http_received_header'] = false;

	// Whether or not to encrypt the IP address and the host name
	// these could, in some circles, be considered as sensitive information;
	// however, for the administrator, these could be invaluable help
	// when tracking down issues.
	$config['http_received_header_encrypt'] = false;

	// This string is used as a delimiter for message headers when sending
	// a message via mail() function. Leave empty for auto-detection
	$config['mail_header_delimiter'] = NULL;

	// number of chars allowed for line when wrapping text.
	// text wrapping is done when composing/sending messages
	$config['line_length'] = 72;

	// send plaintext messages as format=flowed
	$config['send_format_flowed'] = true;

	// According to RFC2298, return receipt envelope sender address must be empty.
	// If this option is true, Roundcube will use user's identity as envelope sender for MDN responses.
	$config['mdn_use_from'] = false;

	// Set identities access level:
	// 0 - many identities with possibility to edit all params
	// 1 - many identities with possibility to edit all params but not email address
	// 2 - one identity with possibility to edit all params
	// 3 - one identity with possibility to edit all params but not email address
	// 4 - one identity with possibility to edit only signature
	$config['identities_level'] = 0;

	// Maximum size of uploaded image in kilobytes
	// Images (in html signatures) are stored in database as data URIs
	$config['identity_image_size'] = 64;

	// Mimetypes supported by the browser.
	// attachments of these types will open in a preview window
	// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf'
	$config['client_mimetypes'] = null; # null == default

	// Path to a local mime magic database file for PHPs finfo extension.
	// Set to null if the default path should be used.
	$config['mime_magic'] = null;

	// Absolute path to a local mime.types mapping table file.
	// This is used to derive mime-types from the filename extension or vice versa.
	// Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system,
	// download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
	$config['mime_types'] = null;

	// path to imagemagick identify binary (if not set we'll use Imagick or GD extensions)
	$config['im_identify_path'] = null;

	// path to imagemagick convert binary (if not set we'll use Imagick or GD extensions)
	$config['im_convert_path'] = null;

	// Size of thumbnails from image attachments displayed below the message content.
	// Note: whether images are displayed at all depends on the 'inline_images' option.
	// Set to 0 to display images in full size.
	$config['image_thumbnail_size'] = 240;

	// maximum size of uploaded contact photos in pixel
	$config['contact_photo_size'] = 160;

	// Enable DNS checking for e-mail address validation
	$config['email_dns_check'] = false;

	// Disables saving sent messages in Sent folder (like gmail) (Default: false)
	// Note: useful when SMTP server stores sent mail in user mailbox
	$config['no_save_sent_messages'] = false;

	+// Improve system security by using special URL with security token.
	+// This can be set to a number defining token length. Default: 16.
	+// Warning: This requires http server configuration. Sample:
	+// RewriteRule ^/roundcubemail/[a-f0-9]{16}/(.*) /roundcubemail/$1 [PT]
	+// Alias /roundcubemail /var/www/roundcubemail/
	+// Note: Use assets_path to not prevent the browser from caching assets
	+$config['use_secure_urls'] = false;
	+
	+// Allows to define separate server/path for image/js/css files
	+// Warning: If the domain is different cross-domain access to some
	+// resources need to be allowed
	+// Sample:
	+// <FilesMatch ".(eot\|ttf\|woff)">
	+// Header set Access-Control-Allow-Origin "*"
	+// </FilesMatch>
	+$config['assets_path'] = '';
	+
	+// While assets_path is for the browser, assets_dir informs
	+// PHP code about the location of asset files in filesystem
	+$config['assets_dir'] = '';
	+
	+
	// ----------------------------------
	// PLUGINS
	// ----------------------------------

	// List of active plugins (in plugins/ directory)
	$config['plugins'] = array();

	// ----------------------------------
	// USER INTERFACE
	// ----------------------------------

	// default messages sort column. Use empty value for default server's sorting,
	// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc'
	$config['message_sort_col'] = '';

	// default messages sort order
	$config['message_sort_order'] = 'DESC';

	// These cols are shown in the message list. Available cols are:
	// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority'
	$config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment');

	// the default locale setting (leave empty for auto-detection)
	// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR
	$config['language'] = null;

	// use this format for date display (date or strftime format)
	$config['date_format'] = 'Y-m-d';

	// give this choice of date formats to the user to select from
	// Note: do not use ambiguous formats like m/d/Y
	$config['date_formats'] = array('Y-m-d', 'Y/m/d', 'Y.m.d', 'd-m-Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');

	// use this format for time display (date or strftime format)
	$config['time_format'] = 'H:i';

	// give this choice of time formats to the user to select from
	$config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A');

	// use this format for short date display (derived from date_format and time_format)
	$config['date_short'] = 'D H:i';

	// use this format for detailed date/time formatting (derived from date_format and time_format)
	$config['date_long'] = 'Y-m-d H:i';

	// store draft message is this mailbox
	// leave blank if draft messages should not be stored
	// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
	$config['drafts_mbox'] = 'Drafts';

	// store spam messages in this mailbox
	// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
	$config['junk_mbox'] = 'Junk';

	// store sent message is this mailbox
	// leave blank if sent messages should not be stored
	// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
	$config['sent_mbox'] = 'Sent';

	// move messages to this folder when deleting them
	// leave blank if they should be deleted directly
	// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
	$config['trash_mbox'] = 'Trash';

	// automatically create the above listed default folders on first login
	$config['create_default_folders'] = false;

	// protect the default folders from renames, deletes, and subscription changes
	$config['protect_default_folders'] = true;

	// Disable localization of the default folder names listed above
	$config['show_real_foldernames'] = false;

	// if in your system 0 quota means no limit set this option to true
	$config['quota_zero_as_unlimited'] = false;

	// Make use of the built-in spell checker. It is based on GoogieSpell.
	// Since Google only accepts connections over https your PHP installatation
	// requires to be compiled with Open SSL support
	$config['enable_spellcheck'] = true;

	// Enables spellchecker exceptions dictionary.
	// Setting it to 'shared' will make the dictionary shared by all users.
	$config['spellcheck_dictionary'] = false;

	// Set the spell checking engine. Possible values:
	// - 'googie' - the default (also used for connecting to Nox Spell Server, see 'spellcheck_uri' setting)
	// - 'pspell' - requires the PHP Pspell module and aspell installed
	// - 'enchant' - requires the PHP Enchant module
	// - 'atd' - install your own After the Deadline server or check with the people at http://www.afterthedeadline.com before using their API
	// Since Google shut down their public spell checking service, the default settings
	// connect to http://spell.roundcube.net which is a hosted service provided by Roundcube.
	// You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
	$config['spellcheck_engine'] = 'googie';

	// For locally installed Nox Spell Server or After the Deadline services,
	// please specify the URI to call it.
	// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 or
	// the After the Deadline package from http://www.afterthedeadline.com.
	// Leave empty to use the public API of service.afterthedeadline.com
	$config['spellcheck_uri'] = '';

	// These languages can be selected for spell checking.
	// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch');
	// Leave empty for default set of available language.
	$config['spellcheck_languages'] = NULL;

	// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE)
	$config['spellcheck_ignore_caps'] = false;

	// Makes that words with numbers will be ignored (e.g. g00gle)
	$config['spellcheck_ignore_nums'] = false;

	// Makes that words with symbols will be ignored (e.g. g@@gle)
	$config['spellcheck_ignore_syms'] = false;

	// Use this char/string to separate recipients when composing a new message
	$config['recipients_separator'] = ',';

	// Number of lines at the end of a message considered to contain the signature.
	// Increase this value if signatures are not properly detected and colored
	$config['sig_max_lines'] = 15;

	// don't let users set pagesize to more than this value if set
	$config['max_pagesize'] = 200;

	// Minimal value of user's 'refresh_interval' setting (in seconds)
	$config['min_refresh_interval'] = 60;

	// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option.
	// By default refresh time is set to 1 second. You can set this value to true
	// or any integer value indicating number of seconds.
	$config['upload_progress'] = false;

	// Specifies for how many seconds the Undo button will be available
	// after object delete action. Currently used with supporting address book sources.
	// Setting it to 0, disables the feature.
	$config['undo_timeout'] = 0;

	// A static list of canned responses which are immutable for the user
	$config['compose_responses_static'] = array(
	// array('name' => 'Canned Response 1', 'text' => 'Static Response One'),
	// array('name' => 'Canned Response 2', 'text' => 'Static Response Two'),
	);

	// ----------------------------------
	// ADDRESSBOOK SETTINGS
	// ----------------------------------

	// This indicates which type of address book to use. Possible choises:
	// 'sql' (default), 'ldap' and ''.
	// If set to 'ldap' then it will look at using the first writable LDAP
	// address book as the primary address book and it will not display the
	// SQL address book in the 'Address Book' view.
	// If set to '' then no address book will be displayed or only the
	// addressbook which is created by a plugin (like CardDAV).
	$config['address_book_type'] = 'sql';

	// In order to enable public ldap search, configure an array like the Verisign
	// example further below. if you would like to test, simply uncomment the example.
	// Array key must contain only safe characters, ie. a-zA-Z0-9_
	$config['ldap_public'] = array();

	// If you are going to use LDAP for individual address books, you will need to
	// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it.
	//
	// The recommended directory structure for LDAP is to store all the address book entries
	// under the users main entry, e.g.:
	//
	// o=root
	// ou=people
	// uid=user@domain
	// mail=contact@contactdomain
	//
	// So the base_dn would be uid=%fu,ou=people,o=root
	// The bind_dn would be the same as based_dn or some super user login.
	/*
	* example config for Verisign directory
	*
	$config['ldap_public']['Verisign'] = array(
	'name' => 'Verisign.com',
	// Replacement variables supported in host names:
	// %h - user's IMAP hostname
	// %n - hostname ($_SERVER['SERVER_NAME'])
	// %t - hostname without the first part
	// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
	// %z - IMAP domain (IMAP hostname without the first part)
	// For example %n = mail.domain.tld, %t = domain.tld
	'hosts' => array('directory.verisign.com'),
	'port' => 389,
	'use_tls' => false,
	'ldap_version' => 3, // using LDAPv3
	'network_timeout' => 10, // The timeout (in seconds) for connect + bind arrempts. This is only supported in PHP >= 5.3.0 with OpenLDAP 2.x
	'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
	// When 'user_specific' is enabled following variables can be used in base_dn/bind_dn config:
	// %fu - The full username provided, assumes the username is an email
	// address, uses the username_domain value if not an email address.
	// %u - The username prior to the '@'.
	// %d - The domain name after the '@'.
	// %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
	// %dn - DN found by ldap search when search_filter/search_base_dn are used
	'base_dn' => '',
	'bind_dn' => '',
	'bind_pass' => '',
	// It's possible to bind for an individual address book
	// The login name is used to search for the DN to bind with
	'search_base_dn' => '',
	'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))'
	// DN and password to bind as before searching for bind DN, if anonymous search is not allowed
	'search_bind_dn' => '',
	'search_bind_pw' => '',
	// Optional map of replacement strings => attributes used when binding for an individual address book
	'search_bind_attrib' => array(), // e.g. array('%udc' => 'ou')
	// Default for %dn variable if search doesn't return DN value
	'search_dn_default' => '',
	// Optional authentication identifier to be used as SASL authorization proxy
	// bind_dn need to be empty
	'auth_cid' => '',
	// SASL authentication method (for proxy auth), e.g. DIGEST-MD5
	'auth_method' => '',
	// Indicates if the addressbook shall be hidden from the list.
	// With this option enabled you can still search/view contacts.
	'hidden' => false,
	// Indicates if the addressbook shall not list contacts but only allows searching.
	'searchonly' => false,
	// Indicates if we can write to the LDAP directory or not.
	// If writable is true then these fields need to be populated:
	// LDAP_Object_Classes, required_fields, LDAP_rdn
	'writable' => false,
	// To create a new contact these are the object classes to specify
	// (or any other classes you wish to use).
	'LDAP_Object_Classes' => array('top', 'inetOrgPerson'),
	// The RDN field that is used for new entries, this field needs
	// to be one of the search_fields, the base of base_dn is appended
	// to the RDN to insert into the LDAP directory.
	'LDAP_rdn' => 'cn',
	// The required fields needed to build a new contact as required by
	// the object classes (can include additional fields not required by the object classes).
	'required_fields' => array('cn', 'sn', 'mail'),
	'search_fields' => array('mail', 'cn'), // fields to search in
	// mapping of contact fields to directory attributes
	// for every attribute one can specify the number of values (limit) allowed.
	// default is 1, a wildcard * means unlimited
	'fieldmap' => array(
	// Roundcube => LDAP:limit
	'name' => 'cn',
	'surname' => 'sn',
	'firstname' => 'givenName',
	'jobtitle' => 'title',
	'email' => 'mail:*',
	'phone:home' => 'homePhone',
	'phone:work' => 'telephoneNumber',
	'phone:mobile' => 'mobile',
	'phone:pager' => 'pager',
	'phone:workfax' => 'facsimileTelephoneNumber',
	'street' => 'street',
	'zipcode' => 'postalCode',
	'region' => 'st',
	'locality' => 'l',
	// if you country is a complex object, you need to configure 'sub_fields' below
	'country' => 'c',
	'organization' => 'o',
	'department' => 'ou',
	'jobtitle' => 'title',
	'notes' => 'description',
	'photo' => 'jpegPhoto',
	// these currently don't work:
	// 'manager' => 'manager',
	// 'assistant' => 'secretary',
	),
	// Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country'
	'sub_fields' => array(),
	// Generate values for the following LDAP attributes automatically when creating a new record
	'autovalues' => array(
	// 'uid' => 'md5(microtime())', // You may specify PHP code snippets which are then eval'ed
	// 'mail' => '{givenname}.{sn}@mydomain.com', // or composite strings with placeholders for existing attributes
	),
	'sort' => 'cn', // The field to sort the listing by.
	'scope' => 'sub', // search mode: sub\|base\|list
	'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
	'fuzzy_search' => true, // server allows wildcard search
	'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it)
	'vlv_search' => false, // Use Virtual List View functions for autocompletion searches (if server supports it)
	'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting
	'config_root_dn' => 'cn=config', // Root DN to search config entries (e.g. vlv indexes)
	'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit.
	'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit.
	'referrals' => false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups
	'dereference' => 0, // Sets the LDAP_OPT_DEREF option. One of: LDAP_DEREF_NEVER, LDAP_DEREF_SEARCHING, LDAP_DEREF_FINDING, LDAP_DEREF_ALWAYS
	// Used where addressbook contains aliases to objects elsewhere in the LDAP tree.

	// definition for contact groups (uncomment if no groups are supported)
	// for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above)
	// if the groups base_dn is empty, the contact base_dn is used for the groups as well
	// -> in this case, assure that groups and contacts are separated due to the concernig filters!
	'groups' => array(
	'base_dn' => '',
	'scope' => 'sub', // Search mode: sub\|base\|list
	'filter' => '(objectClass=groupOfNames)',
	'object_classes' => array('top', 'groupOfNames'), // Object classes to be assigned to new groups
	'member_attr' => 'member', // Name of the default member attribute, e.g. uniqueMember
	'name_attr' => 'cn', // Attribute to be used as group name
	'email_attr' => 'mail', // Group email address attribute (e.g. for mailing lists)
	'member_filter' => '(objectclass=*)', // Optional filter to use when querying for group members
	'vlv' => false, // Use VLV controls to list groups
	'class_member_attr' => array( // Mapping of group object class to member attribute used in these objects
	'groupofnames' => 'member',
	'groupofuniquenames' => 'uniquemember'
	),
	),
	// this configuration replaces the regular groups listing in the directory tree with
	// a hard-coded list of groups, each listing entries with the configured base DN and filter.
	// if the 'groups' option from above is set, it'll be shown as the first entry with the name 'Groups'
	'group_filters' => array(
	'departments' => array(
	'name' => 'Company Departments',
	'scope' => 'list',
	'base_dn' => 'ou=Groups,dc=mydomain,dc=com',
	'filter' => '(\|(objectclass=groupofuniquenames)(objectclass=groupofurls))',
	'name_attr' => 'cn',
	),
	'customers' => array(
	'name' => 'Customers',
	'scope' => 'sub',
	'base_dn' => 'ou=Customers,dc=mydomain,dc=com',
	'filter' => '(objectClass=inetOrgPerson)',
	'name_attr' => 'sn',
	),
	),
	);
	*/

	// An ordered array of the ids of the addressbooks that should be searched
	// when populating address autocomplete fields server-side. ex: array('sql','Verisign');
	$config['autocomplete_addressbooks'] = array('sql');

	// The minimum number of characters required to be typed in an autocomplete field
	// before address books will be searched. Most useful for LDAP directories that
	// may need to do lengthy results building given overly-broad searches
	$config['autocomplete_min_length'] = 1;

	// Number of parallel autocomplete requests.
	// If there's more than one address book, n parallel (async) requests will be created,
	// where each request will search in one address book. By default (0), all address
	// books are searched in one request.
	$config['autocomplete_threads'] = 0;

	// Max. numer of entries in autocomplete popup. Default: 15.
	$config['autocomplete_max'] = 15;

	// show address fields in this order
	// available placeholders: {street}, {locality}, {zipcode}, {country}, {region}
	$config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';

	// Matching mode for addressbook search (including autocompletion)
	// 0 - partial (abc), default
	// 1 - strict (abc)
	// 2 - prefix (abc*)
	// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode
	$config['addressbook_search_mode'] = 0;

	// Template of contact entry on the autocompletion list.
	// You can use contact fields as: name, email, organization, department, etc.
	// See program/steps/addressbook/func.inc for a list
	$config['contact_search_name'] = '{name} <{email}>';

	// ----------------------------------
	// USER PREFERENCES
	// ----------------------------------

	// Use this charset as fallback for message decoding
	$config['default_charset'] = 'ISO-8859-1';

	// skin name: folder from skins/
	$config['skin'] = 'larry';

	// Enables using standard browser windows (that can be handled as tabs)
	// instead of popup windows
	$config['standard_windows'] = false;

	// show up to X items in messages list view
	$config['mail_pagesize'] = 50;

	// show up to X items in contacts list view
	$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)
	$config['addressbook_name_listing'] = 0;

	// use this timezone to display date/time
	// valid timezone identifers are listed here: php.net/manual/en/timezones.php
	// 'auto' will use the browser's timezone settings
	$config['timezone'] = 'auto';

	// prefer displaying HTML messages
	$config['prefer_html'] = true;

	// display remote inline images
	// 0 - Never, always ask
	// 1 - Ask if sender is not in address book
	// 2 - Always show inline images
	$config['show_images'] = 0;

	// open messages in new window
	$config['message_extwin'] = false;

	// open message compose form in new window
	$config['compose_extwin'] = false;

	// compose html formatted messages by default
	// 0 - never, 1 - always, 2 - on reply to HTML message, 3 - on forward or reply to HTML message
	$config['htmleditor'] = 0;

	// save copies of compose messages in the browser's local storage
	// for recovery in case of browser crashes and session timeout.
	$config['compose_save_localstorage'] = true;

	// show pretty dates as standard
	$config['prettydate'] = true;

	// save compose message every 300 seconds (5min)
	$config['draft_autosave'] = 300;

	// default setting if preview pane is enabled
	$config['preview_pane'] = false;

	// Mark as read when viewed in preview pane (delay in seconds)
	// Set to -1 if messages in preview pane should not be marked as read
	$config['preview_pane_mark_read'] = 0;

	// Clear Trash on logout
	$config['logout_purge'] = false;

	// Compact INBOX on logout
	$config['logout_expunge'] = false;

	// Display attached images below the message body
	$config['inline_images'] = true;

	// Encoding of long/non-ascii attachment names:
	// 0 - Full RFC 2231 compatible
	// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default)
	// 2 - Full 2047 compatible
	$config['mime_param_folding'] = 1;

	// Set true if deleted messages should not be displayed
	// This will make the application run slower
	$config['skip_deleted'] = false;

	// Set true to Mark deleted messages as read as well as deleted
	// False means that a message's read status is not affected by marking it as deleted
	$config['read_when_deleted'] = true;

	// Set to true to never delete messages immediately
	// Use 'Purge' to remove messages marked as deleted
	$config['flag_for_deletion'] = false;

	// Default interval for auto-refresh requests (in seconds)
	// These are requests for system state updates e.g. checking for new messages, etc.
	// Setting it to 0 disables the feature.
	$config['refresh_interval'] = 60;

	// If true all folders will be checked for recent messages
	$config['check_all_folders'] = false;

	// If true, after message delete/move, the next message will be displayed
	$config['display_next'] = true;

	// Default messages listing mode. One of 'threads' or 'list'.
	$config['default_list_mode'] = 'list';

	// 0 - Do not expand threads
	// 1 - Expand all threads automatically
	// 2 - Expand only threads with unread messages
	$config['autoexpand_threads'] = 0;

	// When replying:
	// -1 - don't cite the original message
	// 0 - place cursor below the original message
	// 1 - place cursor above original message (top posting)
	$config['reply_mode'] = 0;

	// When replying strip original signature from message
	$config['strip_existing_sig'] = true;

	// Show signature:
	// 0 - Never
	// 1 - Always
	// 2 - New messages only
	// 3 - Forwards and Replies only
	$config['show_sig'] = 1;

	// Use MIME encoding (quoted-printable) for 8bit characters in message body
	$config['force_7bit'] = false;

	// Defaults of the search field configuration.
	// The array can contain a per-folder list of header fields which should be considered when searching
	// The entry with key '*' stands for all folders which do not have a specific list set.
	// Please note that folder names should to be in sync with $config['*_mbox'] options
	$config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1));

	// Defaults of the addressbook search field configuration.
	$config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1);

	// 'Delete always'
	// This setting reflects if mail should be always deleted
	// when moving to Trash fails. This is necessary in some setups
	// when user is over quota and Trash is included in the quota.
	$config['delete_always'] = false;

	// Directly delete messages in Junk instead of moving to Trash
	$config['delete_junk'] = false;

	// Behavior if a received message requests a message delivery notification (read receipt)
	// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask)
	// 3 = send automatically if sender is in addressbook, otherwise ask the user
	// 4 = send automatically if sender is in addressbook, otherwise ignore
	$config['mdn_requests'] = 0;

	// Return receipt checkbox default state
	$config['mdn_default'] = 0;

	// Delivery Status Notification checkbox default state
	// Note: This can be used only if smtp_server is non-empty
	$config['dsn_default'] = 0;

	// Place replies in the folder of the message being replied to
	$config['reply_same_folder'] = false;

	// Sets default mode of Forward feature to "forward as attachment"
	$config['forward_attachment'] = false;

	// Defines address book (internal index) to which new contacts will be added
	// By default it is the first writeable addressbook.
	// Note: Use '0' for built-in address book.
	$config['default_addressbook'] = null;

	// Enables spell checking before sending a message.
	$config['spellcheck_before_send'] = false;

	// Skip alternative email addresses in autocompletion (show one address per contact)
	$config['autocomplete_single'] = false;

	// Default font for composed HTML message.
	// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New,
	// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana
	$config['default_font'] = 'Verdana';

	// Default font size for composed HTML message.
	// Supported sizes: 8pt, 10pt, 12pt, 14pt, 18pt, 24pt, 36pt
	$config['default_font_size'] = '10pt';

	// Enables display of email address with name instead of a name (and address in title)
	$config['message_show_email'] = false;

	// Default behavior of Reply-All button:
	// 0 - Reply-All always
	// 1 - Reply-List if mailing list is detected
	$config['reply_all_mode'] = 0;
	diff --git a/index.php b/index.php
	index 5ca2af608..e19d81a26 100644
	--- a/index.php
	+++ b/index.php
	@@ -1,334 +1,311 @@
	<?php
	/*
	+-------------------------------------------------------------------------+
	\| Roundcube Webmail IMAP Client \|
	\| Version 1.1-git \|
	\| \|
	\| Copyright (C) 2005-2014, 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 \|
	\| for skins & plugins) as published by the Free Software Foundation, \|
	\| either version 3 of the License, or (at your option) any later version. \|
	\| \|
	\| This file forms part of the Roundcube Webmail Software for which the \|
	\| following exception is added: Plugins and Skins which merely make \|
	\| function calls to the Roundcube Webmail Software, and for that purpose \|
	\| include it by reference shall not be considered modifications of \|
	\| the software. \|
	\| \|
	\| If you wish to use this file in another project or create a modified \|
	\| version that will not be part of the Roundcube Webmail Software, you \|
	\| may remove the exception above and use this source code under the \|
	\| original version of the license. \|
	\| \|
	\| This program is distributed in the hope that it will be useful, \|
	\| but WITHOUT ANY WARRANTY; without even the implied warranty of \|
	\| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \|
	\| GNU General Public License for more details. \|
	\| \|
	\| You should have received a copy of the GNU General Public License \|
	\| along with this program. If not, see http://www.gnu.org/licenses/. \|
	\| \|
	+-------------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-------------------------------------------------------------------------+
	*/

	// include environment
	require_once 'program/include/iniset.php';

	// init application, start session, init output class, etc.
	$RCMAIL = rcmail::get_instance($GLOBALS['env']);

	// Make the whole PHP output non-cacheable (#1487797)
	$RCMAIL->output->nocacheing_headers();
	$RCMAIL->output->common_headers();

	// turn on output buffering
	ob_start();

	// check if config files had errors
	if ($err_str = $RCMAIL->config->get_error()) {
	rcmail::raise_error(array(
	'code' => 601,
	'type' => 'php',
	'message' => $err_str), false, true);
	}

	// check DB connections and exit on failure
	if ($err_str = $RCMAIL->db->is_error()) {
	rcmail::raise_error(array(
	'code' => 603,
	'type' => 'db',
	'message' => $err_str), FALSE, TRUE);
	}

	// error steps
	if ($RCMAIL->action == 'error' && !empty($_GET['_code'])) {
	rcmail::raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
	}

	// check if https is required (for login) and redirect if necessary
	if (empty($_SESSION['user_id']) && ($force_https = $RCMAIL->config->get('force_https', false))) {
	$https_port = is_bool($force_https) ? 443 : $force_https;

	if (!rcube_utils::https_check($https_port)) {
	$host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']);
	$host .= ($https_port != 443 ? ':' . $https_port : '');

	header('Location: https://' . $host . $_SERVER['REQUEST_URI']);
	exit;
	}
	}

	// trigger startup plugin hook
	$startup = $RCMAIL->plugins->exec_hook('startup', array('task' => $RCMAIL->task, 'action' => $RCMAIL->action));
	$RCMAIL->set_task($startup['task']);
	$RCMAIL->action = $startup['action'];

	// try to log in
	if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
	- $request_valid = $_SESSION['temp'] && $RCMAIL->check_request(rcube_utils::INPUT_POST, 'login');
	+ $request_valid = $_SESSION['temp'] && $RCMAIL->check_request();

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

	$auth = $RCMAIL->plugins->exec_hook('authenticate', array(
	'host' => $RCMAIL->autoselect_host(),
	'user' => trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST)),
	'pass' => rcube_utils::get_input_value('_pass', rcube_utils::INPUT_POST, true,
	$RCMAIL->config->get('password_charset', 'ISO-8859-1')),
	'cookiecheck' => true,
	'valid' => $request_valid,
	));

	// Login
	if ($auth['valid'] && !$auth['abort']
	&& $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'], $auth['cookiecheck'])
	) {
	// create new session ID, don't destroy the current session
	// it was destroyed already by $RCMAIL->kill_session() above
	$RCMAIL->session->remove('temp');
	$RCMAIL->session->regenerate_id(false);

	// send auth cookie if necessary
	$RCMAIL->session->set_auth_cookie();

	// log successful login
	$RCMAIL->log_login();

	// restore original request parameters
	$query = array();
	if ($url = rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST)) {
	parse_str($url, $query);

	// prevent endless looping on login page
	if ($query['_task'] == 'login') {
	unset($query['_task']);
	}

	// prevent redirect to compose with specified ID (#1488226)
	if ($query['_action'] == 'compose' && !empty($query['_id'])) {
	$query = array();
	}
	}

	// allow plugins to control the redirect url after login success
	$redir = $RCMAIL->plugins->exec_hook('login_after', $query + array('_task' => 'mail'));
	unset($redir['abort'], $redir['_err']);

	// send redirect
	- $OUTPUT->redirect($redir);
	+ $OUTPUT->redirect($redir, 0, true);
	}
	else {
	if (!$auth['valid']) {
	$error_code = RCMAIL::ERROR_INVALID_REQUEST;
	}
	else {
	$error_code = is_numeric($auth['error']) ? $auth['error'] : $RCMAIL->login_error();
	}

	$error_labels = array(
	RCMAIL::ERROR_STORAGE => 'storageerror',
	RCMAIL::ERROR_COOKIES_DISABLED => 'cookiesdisabled',
	RCMAIL::ERROR_INVALID_REQUEST => 'invalidrequest',
	RCMAIL::ERROR_INVALID_HOST => 'invalidhost',
	);

	$error_message = !empty($auth['error']) && !is_numeric($auth['error']) ? $auth['error'] : ($error_labels[$error_code] ?: 'loginfailed');

	$OUTPUT->show_message($error_message, 'warning');

	// log failed login
	$RCMAIL->log_login($auth['user'], true, $error_code);

	$RCMAIL->plugins->exec_hook('login_failed', array(
	'code' => $error_code, 'host' => $auth['host'], 'user' => $auth['user']));

	$RCMAIL->kill_session();
	}
	}

	-// end session (after optional referer check)
	-else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id'])
	- && (!$RCMAIL->config->get('referer_check') \|\| rcube_utils::check_referer())
	-) {
	+// end session
	+else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id'])) {
	+ $RCMAIL->request_security_check($mode = rcube_utils::INPUT_GET);
	+
	$userdata = array(
	'user' => $_SESSION['username'],
	'host' => $_SESSION['storage_host'],
	'lang' => $RCMAIL->user->language,
	);

	$OUTPUT->show_message('loggedout');

	$RCMAIL->logout_actions();
	$RCMAIL->kill_session();
	$RCMAIL->plugins->exec_hook('logout_after', $userdata);
	}

	// check session and auth cookie
	else if ($RCMAIL->task != 'login' && $_SESSION['user_id']) {
	if (!$RCMAIL->session->check_auth()) {
	$RCMAIL->kill_session();
	$session_error = true;
	}
	}

	// not logged in -> show login page
	if (empty($RCMAIL->user->ID)) {
	// log session failures
	$task = rcube_utils::get_input_value('_task', rcube_utils::INPUT_GPC);

	if ($task && !in_array($task, array('login','logout'))
	&& !$session_error && ($sess_id = $_COOKIE[ini_get('session.name')])
	) {
	$RCMAIL->session->log("Aborted session $sess_id; no valid session data found");
	$session_error = true;
	}

	if ($session_error \|\| $_REQUEST['_err'] == 'session') {
	$OUTPUT->show_message('sessionerror', 'error', null, true, -1);
	}

	if ($OUTPUT->ajax_call \|\| $OUTPUT->get_env('framed')) {
	$OUTPUT->command('session_error', $RCMAIL->url(array('_err' => 'session')));
	$OUTPUT->send('iframe');
	}

	// check if installer is still active
	if ($RCMAIL->config->get('enable_installer') && is_readable('./installer/index.php')) {
	$OUTPUT->add_footer(html::div(array('style' => "background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em"),
	html::tag('h2', array('style' => "margin-top:0.2em"), "Installer script is still accessible") .
	html::p(null, "The install script of your Roundcube installation is still stored in its default location!") .
	html::p(null, "Please <b>remove</b> the whole <tt>installer</tt> folder from the Roundcube directory because .
	these files may expose sensitive configuration data like server passwords and encryption keys
	to the public. Make sure you cannot access the <a href=\"./installer/\">installer script</a> from your browser.")
	));
	}

	$plugin = $RCMAIL->plugins->exec_hook('unauthenticated', array('task' => 'login', 'error' => $session_error));

	$RCMAIL->set_task($plugin['task']);

	$OUTPUT->send($plugin['task']);
	}
	-// CSRF prevention
	else {
	- // don't check for valid request tokens in these actions
	- $request_check_whitelist = array('login'=>1, 'spell'=>1, 'spell_html'=>1);
	-
	- if (!$request_check_whitelist[$RCMAIL->action]) {
	- // check client X-header to verify request origin
	- if ($OUTPUT->ajax_call) {
	- if (rcube_utils::request_header('X-Roundcube-Request') != $RCMAIL->get_request_token()) {
	- header('HTTP/1.1 403 Forbidden');
	- die("Invalid Request");
	- }
	- }
	- // check request token in POST form submissions
	- else if (!empty($_POST) && !$RCMAIL->check_request()) {
	- $OUTPUT->show_message('invalidrequest', 'error');
	- $OUTPUT->send($RCMAIL->task);
	- }
	-
	- // check referer if configured
	- if ($RCMAIL->config->get('referer_check') && !rcube_utils::check_referer()) {
	- raise_error(array(
	- 'code' => 403, 'type' => 'php',
	- 'message' => "Referer check failed"), true, true);
	- }
	- }
	+ // CSRF prevention
	+ $RCMAIL->request_security_check();

	// check access to disabled actions
	$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',
	'message' => "Action disabled"), true, true);
	}
	}

	// we're ready, user is authenticated and the request is safe
	$plugin = $RCMAIL->plugins->exec_hook('ready', array('task' => $RCMAIL->task, 'action' => $RCMAIL->action));
	$RCMAIL->set_task($plugin['task']);
	$RCMAIL->action = $plugin['action'];

	// handle special actions
	if ($RCMAIL->action == 'keep-alive') {
	$OUTPUT->reset();
	$RCMAIL->plugins->exec_hook('keep_alive', array());
	$OUTPUT->send();
	}
	else if ($RCMAIL->action == 'save-pref') {
	include INSTALL_PATH . 'program/steps/utils/save_pref.inc';
	}


	// include task specific functions
	if (is_file($incfile = INSTALL_PATH . 'program/steps/'.$RCMAIL->task.'/func.inc')) {
	include_once $incfile;
	}

	// allow 5 "redirects" to another action
	$redirects = 0; $incstep = null;
	while ($redirects < 5) {
	// execute a plugin action
	if (preg_match('/^plugin\./', $RCMAIL->action)) {
	$RCMAIL->plugins->exec_action($RCMAIL->action);
	break;
	}
	// execute action registered to a plugin task
	else if ($RCMAIL->plugins->is_plugin_task($RCMAIL->task)) {
	if (!$RCMAIL->action) $RCMAIL->action = 'index';
	$RCMAIL->plugins->exec_action($RCMAIL->task.'.'.$RCMAIL->action);
	break;
	}
	// try to include the step file
	else if (($stepfile = $RCMAIL->get_action_file())
	&& is_file($incfile = INSTALL_PATH . 'program/steps/'.$RCMAIL->task.'/'.$stepfile)
	) {
	// include action file only once (in case it don't exit)
	include_once $incfile;
	$redirects++;
	}
	else {
	break;
	}
	}

	if ($RCMAIL->action == 'refresh') {
	$RCMAIL->plugins->exec_hook('refresh', array('last' => intval(rcube_utils::get_input_value('_last', rcube_utils::INPUT_GPC))));
	}

	// parse main template (default)
	$OUTPUT->send($RCMAIL->task);

	// if we arrive here, something went wrong
	rcmail::raise_error(array(
	'code' => 404,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => "Invalid request"), true, true);
	diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
	index e59ac72a2..14634534e 100644
	--- a/plugins/acl/acl.js
	+++ b/plugins/acl/acl.js
	@@ -1,384 +1,393 @@
	/**
	* ACL plugin script
	*
	* @version @package_version@
	* @author Aleksander Machniak <alec@alec.pl>
	*/

	if (window.rcmail) {
	rcmail.addEventListener('init', function() {
	if (rcmail.gui_objects.acltable) {
	rcmail.acl_list_init();
	// enable autocomplete on user input
	if (rcmail.env.acl_users_source) {
	var inst = rcmail.is_framed() ? parent.rcmail : rcmail;
	inst.init_address_input_events($('#acluser'), {action:'settings/plugin.acl-autocomplete'});

	// pass config settings and localized texts to autocomplete context
	inst.set_env({ autocomplete_max:rcmail.env.autocomplete_max, autocomplete_min_length:rcmail.env.autocomplete_min_length });
	inst.add_label('autocompletechars', rcmail.labels.autocompletechars);
	inst.add_label('autocompletemore', rcmail.labels.autocompletemore);

	// fix inserted value
	inst.addEventListener('autocomplete_insert', function(e) {
	if (e.field.id != 'acluser')
	return;

	e.field.value = e.insert.replace(/[ ,;]+$/, '');
	});
	}
	}

	rcmail.enable_command('acl-create', 'acl-save', 'acl-cancel', 'acl-mode-switch', true);
	rcmail.enable_command('acl-delete', 'acl-edit', false);

	if (rcmail.env.acl_advanced)
	$('#acl-switch').addClass('selected');
	});
	}

	// Display new-entry form
	rcube_webmail.prototype.acl_create = function()
	{
	this.acl_init_form();
	}

	// Display ACL edit form
	rcube_webmail.prototype.acl_edit = function()
	{
	// @TODO: multi-row edition
	var id = this.acl_list.get_single_selection();
	if (id)
	this.acl_init_form(id);
	}

	// ACL entry delete
	rcube_webmail.prototype.acl_delete = function()
	{
	var users = this.acl_get_usernames();

	if (users && users.length && confirm(this.get_label('acl.deleteconfirm'))) {
	- this.http_request('settings/plugin.acl', '_act=delete&_user='+urlencode(users.join(','))
	- + '&_mbox='+urlencode(this.env.mailbox),
	+ this.http_post('settings/plugin.acl', {
	+ _act: 'delete',
	+ _user: users.join(','),
	+ _mbox: this.env.mailbox
	+ },
	this.set_busy(true, 'acl.deleting'));
	}
	}

	// Save ACL data
	rcube_webmail.prototype.acl_save = function()
	{
	- var user = $('#acluser', this.acl_form).val(), rights = '', type;
	+ var data, type, rights = '', user = $('#acluser', this.acl_form).val();

	$((this.env.acl_advanced ? '#advancedrights :checkbox' : '#simplerights :checkbox'), this.acl_form).map(function() {
	if (this.checked)
	rights += this.value;
	});

	if (type = $('input:checked[name=usertype]', this.acl_form).val()) {
	if (type != 'user')
	user = type;
	}

	if (!user) {
	alert(this.get_label('acl.nouser'));
	return;
	}
	if (!rights) {
	alert(this.get_label('acl.norights'));
	return;
	}

	- this.http_request('settings/plugin.acl', '_act=save'
	- + '&_user='+urlencode(user)
	- + '&_acl=' +rights
	- + '&_mbox='+urlencode(this.env.mailbox)
	- + (this.acl_id ? '&_old='+this.acl_id : ''),
	- this.set_busy(true, 'acl.saving'));
	+ data = {
	+ _act: 'save',
	+ _user: user,
	+ _acl: rights,
	+ _mbox: this.env.mailbox
	+ }
	+
	+ if (this.acl_id) {
	+ data._old = this.acl_id;
	+ }
	+
	+ this.http_post('settings/plugin.acl', data, this.set_busy(true, 'acl.saving'));
	}

	// Cancel/Hide form
	rcube_webmail.prototype.acl_cancel = function()
	{
	this.ksearch_blur();
	this.acl_popup.dialog('close');
	}

	// Update data after save (and hide form)
	rcube_webmail.prototype.acl_update = function(o)
	{
	// delete old row
	if (o.old)
	this.acl_remove_row(o.old);
	// make sure the same ID doesn't exist
	else if (this.env.acl[o.id])
	this.acl_remove_row(o.id);

	// add new row
	this.acl_add_row(o, true);
	// hide autocomplete popup
	this.ksearch_blur();
	// hide form
	this.acl_popup.dialog('close');
	}

	// Switch table display mode
	rcube_webmail.prototype.acl_mode_switch = function(elem)
	{
	this.env.acl_advanced = !this.env.acl_advanced;
	this.enable_command('acl-delete', 'acl-edit', false);
	this.http_request('settings/plugin.acl', '_act=list'
	+ '&_mode='+(this.env.acl_advanced ? 'advanced' : 'simple')
	+ '&_mbox='+urlencode(this.env.mailbox),
	this.set_busy(true, 'loading'));
	}

	// ACL table initialization
	rcube_webmail.prototype.acl_list_init = function()
	{
	var method = this.env.acl_advanced ? 'addClass' : 'removeClass';

	$('#acl-switch')[method]('selected');
	$(this.gui_objects.acltable)[method]('advanced');

	this.acl_list = new rcube_list_widget(this.gui_objects.acltable,
	{multiselect: true, draggable: false, keyboard: true});
	this.acl_list.addEventListener('select', function(o) { rcmail.acl_list_select(o); })
	.addEventListener('dblclick', function(o) { rcmail.acl_list_dblclick(o); })
	.addEventListener('keypress', function(o) { rcmail.acl_list_keypress(o); })
	.init();
	}

	// ACL table row selection handler
	rcube_webmail.prototype.acl_list_select = function(list)
	{
	rcmail.enable_command('acl-delete', list.selection.length > 0);
	rcmail.enable_command('acl-edit', list.selection.length == 1);
	list.focus();
	}

	// ACL table double-click handler
	rcube_webmail.prototype.acl_list_dblclick = function(list)
	{
	this.acl_edit();
	}

	// ACL table keypress handler
	rcube_webmail.prototype.acl_list_keypress = function(list)
	{
	if (list.key_pressed == list.ENTER_KEY)
	this.command('acl-edit');
	else if (list.key_pressed == list.DELETE_KEY \|\| list.key_pressed == list.BACKSPACE_KEY)
	if (!this.acl_form \|\| !this.acl_form.is(':visible'))
	this.command('acl-delete');
	}

	// Reloads ACL table
	rcube_webmail.prototype.acl_list_update = function(html)
	{
	$(this.gui_objects.acltable).html(html);
	this.acl_list_init();
	}

	// Returns names of users in selected rows
	rcube_webmail.prototype.acl_get_usernames = function()
	{
	var users = [], n, len, cell, row,
	list = this.acl_list,
	selection = list.get_selection();

	for (n=0, len=selection.length; n<len; n++) {
	if (this.env.acl_specials.length && $.inArray(selection[n], this.env.acl_specials) >= 0) {
	users.push(selection[n]);
	}
	else if (row = list.rows[selection[n]]) {
	cell = $('td.user', row.obj);
	if (cell.length == 1)
	users.push(cell.text());
	}
	}

	return users;
	}

	// Removes ACL table row
	rcube_webmail.prototype.acl_remove_row = function(id)
	{
	var list = this.acl_list;

	list.remove_row(id);
	list.clear_selection();

	// we don't need it anymore (remove id conflict)
	$('#rcmrow'+id).remove();
	this.env.acl[id] = null;

	this.enable_command('acl-delete', list.selection.length > 0);
	this.enable_command('acl-edit', list.selection.length == 1);
	}

	// Adds ACL table row
	rcube_webmail.prototype.acl_add_row = function(o, sel)
	{
	var n, len, ids = [], spec = [], id = o.id, list = this.acl_list,
	items = this.env.acl_advanced ? [] : this.env.acl_items,
	table = this.gui_objects.acltable,
	row = $('thead > tr', table).clone();

	// Update new row
	$('th', row).map(function() {
	var td = $('<td>'),
	title = $(this).attr('title'),
	cl = this.className.replace(/^acl/, '');

	if (title)
	td.attr('title', title);

	if (items && items[cl])
	cl = items[cl];

	if (cl == 'user')
	td.addClass(cl).append($('<a>').text(o.username));
	else
	td.addClass(this.className + ' ' + rcmail.acl_class(o.acl, cl)).text('');

	$(this).replaceWith(td);
	});

	row.attr('id', 'rcmrow'+id);
	row = row.get(0);

	this.env.acl[id] = o.acl;

	// sorting... (create an array of user identifiers, then sort it)
	for (n in this.env.acl) {
	if (this.env.acl[n]) {
	if (this.env.acl_specials.length && $.inArray(n, this.env.acl_specials) >= 0)
	spec.push(n);
	else
	ids.push(n);
	}
	}
	ids.sort();
	// specials on the top
	ids = spec.concat(ids);

	// find current id
	for (n=0, len=ids.length; n<len; n++)
	if (ids[n] == id)
	break;

	// add row
	if (n && n < len) {
	$('#rcmrow'+ids[n-1]).after(row);
	list.init_row(row);
	list.rowcount++;
	}
	else
	list.insert_row(row);

	if (sel)
	list.select_row(o.id);
	}

	// Initializes and shows ACL create/edit form
	rcube_webmail.prototype.acl_init_form = function(id)
	{
	var ul, row, td, val = '', type = 'user', li_elements, body = $('body'),
	adv_ul = $('#advancedrights'), sim_ul = $('#simplerights'),
	name_input = $('#acluser'), type_list = $('#usertype');

	if (!this.acl_form) {
	var fn = function () { $('input[value="user"]').prop('checked', true); };
	name_input.click(fn).keypress(fn);
	}

	this.acl_form = $('#aclform');

	// Hide unused items
	if (this.env.acl_advanced) {
	adv_ul.show();
	sim_ul.hide();
	ul = adv_ul;
	}
	else {
	sim_ul.show();
	adv_ul.hide();
	ul = sim_ul;
	}

	// initialize form fields
	li_elements = $(':checkbox', ul);
	li_elements.attr('checked', false);

	if (id && (row = this.acl_list.rows[id])) {
	row = row.obj;
	li_elements.map(function() {
	td = $('td.'+this.id, row);
	if (td.length && td.hasClass('enabled'))
	this.checked = true;
	});

	if (!this.env.acl_specials.length \|\| $.inArray(id, this.env.acl_specials) < 0)
	val = $('td.user', row).text();
	else
	type = id;
	}
	// mark read (lrs) rights by default
	else {
	li_elements.filter(function() { return this.id.match(/^acl([lrs]\|read)$/); }).prop('checked', true);
	}

	name_input.val(val);
	$('input[value='+type+']').prop('checked', true);

	this.acl_id = id;

	var buttons = {}, me = this, body = document.body;

	buttons[this.gettext('save')] = function(e) { me.command('acl-save'); };
	buttons[this.gettext('cancel')] = function(e) { me.command('acl-cancel'); };

	// display it as popup
	this.acl_popup = this.show_popup_dialog(
	'<div style="width:480px;height:280px"> </div>',
	id ? this.gettext('acl.editperms') : this.gettext('acl.newuser'),
	buttons,
	{
	modal: true,
	closeOnEscape: true,
	close: function(e, ui) {
	(me.is_framed() ? parent.rcmail : me).ksearch_hide();
	me.acl_form.appendTo(body).hide();
	$(this).remove();
	window.focus(); // focus iframe
	}
	}
	);

	this.acl_form.appendTo(this.acl_popup).show();

	if (type == 'user')
	name_input.focus();
	else
	$('input:checked', type_list).focus();
	}

	// Returns class name according to ACL comparision result
	rcube_webmail.prototype.acl_class = function(acl1, acl2)
	{
	var i, len, found = 0;

	acl1 = String(acl1);
	acl2 = String(acl2);

	for (i=0, len=acl2.length; i<len; i++)
	if (acl1.indexOf(acl2[i]) > -1)
	found++;

	if (found == len)
	return 'enabled';
	else if (found)
	return 'partial';

	return 'disabled';
	}
	diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
	index 349f7e518..35a92bb1c 100644
	--- a/plugins/acl/acl.php
	+++ b/plugins/acl/acl.php
	@@ -1,760 +1,760 @@
	<?php

	/**
	* Folders Access Control Lists Management (RFC4314, RFC2086)
	*
	* @version @package_version@
	* @author Aleksander Machniak <alec@alec.pl>
	*
	*
	* Copyright (C) 2011-2012, Kolab Systems AG
	*
	* This program is free software: you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation, either version 3 of the License, or
	* (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*
	* You should have received a copy of the GNU General Public License
	* along with this program. If not, see http://www.gnu.org/licenses/.
	*/

	class acl extends rcube_plugin
	{
	public $task = 'settings\|addressbook\|calendar';

	private $rc;
	private $supported = null;
	private $mbox;
	private $ldap;
	private $specials = array('anyone', 'anonymous');

	/**
	* Plugin initialization
	*/
	function init()
	{
	$this->rc = rcmail::get_instance();

	// Register hooks
	$this->add_hook('folder_form', array($this, 'folder_form'));
	// kolab_addressbook plugin
	$this->add_hook('addressbook_form', array($this, 'folder_form'));
	$this->add_hook('calendar_form_kolab', array($this, 'folder_form'));
	// Plugin actions
	$this->register_action('plugin.acl', array($this, 'acl_actions'));
	$this->register_action('plugin.acl-autocomplete', array($this, 'acl_autocomplete'));
	}

	/**
	* Handler for plugin actions (AJAX)
	*/
	function acl_actions()
	{
	$action = trim(rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC));

	// Connect to IMAP
	$this->rc->storage_init();

	// Load localization and configuration
	$this->add_texts('localization/');
	$this->load_config();

	if ($action == 'save') {
	$this->action_save();
	}
	else if ($action == 'delete') {
	$this->action_delete();
	}
	else if ($action == 'list') {
	$this->action_list();
	}

	// Only AJAX actions
	$this->rc->output->send();
	}

	/**
	* Handler for user login autocomplete request
	*/
	function acl_autocomplete()
	{
	$this->load_config();

	$search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
	$reqid = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
	$users = array();
	$keys = array();

	if ($this->init_ldap()) {
	$max = (int) $this->rc->config->get('autocomplete_max', 15);
	$mode = (int) $this->rc->config->get('addressbook_search_mode');

	$this->ldap->set_pagesize($max);
	$result = $this->ldap->search('*', $search, $mode);

	foreach ($result->records as $record) {
	$user = $record['uid'];

	if (is_array($user)) {
	$user = array_filter($user);
	$user = $user[0];
	}

	if ($user) {
	$display = rcube_addressbook::compose_search_name($record);
	$user = array('name' => $user, 'display' => $display);
	$users[] = $user;
	$keys[] = $display ?: $user['name'];
	}
	}

	if ($this->rc->config->get('acl_groups')) {
	$prefix = $this->rc->config->get('acl_group_prefix');
	$group_field = $this->rc->config->get('acl_group_field', 'name');
	$result = $this->ldap->list_groups($search, $mode);

	foreach ($result as $record) {
	$group = $record['name'];
	$group_id = is_array($record[$group_field]) ? $record[$group_field][0] : $record[$group_field];

	if ($group) {
	$users[] = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group);
	$keys[] = $group;
	}
	}
	}
	}

	if (count($users)) {
	// sort users index
	asort($keys, SORT_LOCALE_STRING);
	// re-sort users according to index
	foreach ($keys as $idx => $val) {
	$keys[$idx] = $users[$idx];
	}
	$users = array_values($keys);
	}

	$this->rc->output->command('ksearch_query_results', $users, $search, $reqid);
	$this->rc->output->send();
	}

	/**
	* Handler for 'folder_form' hook
	*
	* @param array $args Hook arguments array (form data)
	*
	* @return array Hook arguments array
	*/
	function folder_form($args)
	{
	$mbox_imap = $args['options']['name'];
	$myrights = $args['options']['rights'];

	// Edited folder name (empty in create-folder mode)
	if (!strlen($mbox_imap)) {
	return $args;
	}
	/*
	// Do nothing on protected folders (?)
	if ($args['options']['protected']) {
	return $args;
	}
	*/
	// Get MYRIGHTS
	if (empty($myrights)) {
	return $args;
	}

	// Load localization and include scripts
	$this->load_config();
	$this->specials = $this->rc->config->get('acl_specials', $this->specials);
	$this->add_texts('localization/', array('deleteconfirm', 'norights',
	'nouser', 'deleting', 'saving', 'newuser', 'editperms'));
	$this->rc->output->add_label('save', 'cancel');
	$this->include_script('acl.js');
	$this->rc->output->include_script('list.js');
	$this->include_stylesheet($this->local_skin_path().'/acl.css');

	// add Info fieldset if it doesn't exist
	if (!isset($args['form']['props']['fieldsets']['info']))
	$args['form']['props']['fieldsets']['info'] = array(
	'name' => $this->rc->gettext('info'),
	'content' => array());

	// Display folder rights to 'Info' fieldset
	$args['form']['props']['fieldsets']['info']['content']['myrights'] = array(
	'label' => rcube::Q($this->gettext('myrights')),
	'value' => $this->acl2text($myrights)
	);

	// Return if not folder admin
	if (!in_array('a', $myrights)) {
	return $args;
	}

	// The 'Sharing' tab
	$this->mbox = $mbox_imap;
	$this->rc->output->set_env('acl_users_source', (bool) $this->rc->config->get('acl_users_source'));
	$this->rc->output->set_env('mailbox', $mbox_imap);
	$this->rc->output->add_handlers(array(
	'acltable' => array($this, 'templ_table'),
	'acluser' => array($this, 'templ_user'),
	'aclrights' => array($this, 'templ_rights'),
	));

	$this->rc->output->set_env('autocomplete_max', (int)$this->rc->config->get('autocomplete_max', 15));
	$this->rc->output->set_env('autocomplete_min_length', $this->rc->config->get('autocomplete_min_length'));
	$this->rc->output->add_label('autocompletechars', 'autocompletemore');

	$args['form']['sharing'] = array(
	'name' => rcube::Q($this->gettext('sharing')),
	'content' => $this->rc->output->parse('acl.table', false, false),
	);

	return $args;
	}

	/**
	* Creates ACL rights table
	*
	* @param array $attrib Template object attributes
	*
	* @return string HTML Content
	*/
	function templ_table($attrib)
	{
	if (empty($attrib['id']))
	$attrib['id'] = 'acl-table';

	$out = $this->list_rights($attrib);

	$this->rc->output->add_gui_object('acltable', $attrib['id']);

	return $out;
	}

	/**
	* Creates ACL rights form (rights list part)
	*
	* @param array $attrib Template object attributes
	*
	* @return string HTML Content
	*/
	function templ_rights($attrib)
	{
	// Get supported rights
	$supported = $this->rights_supported();

	// depending on server capability either use 'te' or 'd' for deleting msgs
	$deleteright = implode(array_intersect(str_split('ted'), $supported));

	$out = '';
	$ul = '';
	$input = new html_checkbox();

	// Advanced rights
	$attrib['id'] = 'advancedrights';
	foreach ($supported as $key => $val) {
	$id = "acl$val";
	$ul .= html::tag('li', null,
	$input->show('', array(
	'name' => "acl[$val]", 'value' => $val, 'id' => $id))
	. html::label(array('for' => $id, 'title' => $this->gettext('longacl'.$val)),
	$this->gettext('acl'.$val)));
	}

	$out = html::tag('ul', $attrib, $ul, html::$common_attrib);

	// Simple rights
	$ul = '';
	$attrib['id'] = 'simplerights';
	$items = array(
	'read' => 'lrs',
	'write' => 'wi',
	'delete' => $deleteright,
	'other' => preg_replace('/[lrswi'.$deleteright.']/', '', implode($supported)),
	);

	foreach ($items as $key => $val) {
	$id = "acl$key";
	$ul .= html::tag('li', null,
	$input->show('', array(
	'name' => "acl[$val]", 'value' => $val, 'id' => $id))
	. html::label(array('for' => $id, 'title' => $this->gettext('longacl'.$key)),
	$this->gettext('acl'.$key)));
	}

	$out .= "\n" . html::tag('ul', $attrib, $ul, html::$common_attrib);

	$this->rc->output->set_env('acl_items', $items);

	return $out;
	}

	/**
	* Creates ACL rights form (user part)
	*
	* @param array $attrib Template object attributes
	*
	* @return string HTML Content
	*/
	function templ_user($attrib)
	{
	// Create username input
	$attrib['name'] = 'acluser';

	$textfield = new html_inputfield($attrib);

	$fields['user'] = html::label(array('for' => $attrib['id']), $this->gettext('username'))
	. ' ' . $textfield->show();

	// Add special entries
	if (!empty($this->specials)) {
	foreach ($this->specials as $key) {
	$fields[$key] = html::label(array('for' => 'id'.$key), $this->gettext($key));
	}
	}

	$this->rc->output->set_env('acl_specials', $this->specials);

	// Create list with radio buttons
	if (count($fields) > 1) {
	$ul = '';
	$radio = new html_radiobutton(array('name' => 'usertype'));
	foreach ($fields as $key => $val) {
	$ul .= html::tag('li', null, $radio->show($key == 'user' ? 'user' : '',
	array('value' => $key, 'id' => 'id'.$key))
	. $val);
	}

	$out = html::tag('ul', array('id' => 'usertype', 'class' => $attrib['class']), $ul, html::$common_attrib);
	}
	// Display text input alone
	else {
	$out = $fields['user'];
	}

	return $out;
	}

	/**
	* Creates ACL rights table
	*
	* @param array $attrib Template object attributes
	*
	* @return string HTML Content
	*/
	private function list_rights($attrib=array())
	{
	// Get ACL for the folder
	$acl = $this->rc->storage->get_acl($this->mbox);

	if (!is_array($acl)) {
	$acl = array();
	}

	// Keep special entries (anyone/anonymous) on top of the list
	if (!empty($this->specials) && !empty($acl)) {
	foreach ($this->specials as $key) {
	if (isset($acl[$key])) {
	$acl_special[$key] = $acl[$key];
	unset($acl[$key]);
	}
	}
	}

	// Sort the list by username
	uksort($acl, 'strnatcasecmp');

	if (!empty($acl_special)) {
	$acl = array_merge($acl_special, $acl);
	}

	// Get supported rights and build column names
	$supported = $this->rights_supported();

	// depending on server capability either use 'te' or 'd' for deleting msgs
	$deleteright = implode(array_intersect(str_split('ted'), $supported));

	// Use advanced or simple (grouped) rights
	$advanced = $this->rc->config->get('acl_advanced_mode');

	if ($advanced) {
	$items = array();
	foreach ($supported as $sup) {
	$items[$sup] = $sup;
	}
	}
	else {
	$items = array(
	'read' => 'lrs',
	'write' => 'wi',
	'delete' => $deleteright,
	'other' => preg_replace('/[lrswi'.$deleteright.']/', '', implode($supported)),
	);
	}

	// Create the table
	$attrib['noheader'] = true;
	$table = new html_table($attrib);

	// Create table header
	$table->add_header('user', $this->gettext('identifier'));
	foreach (array_keys($items) as $key) {
	$label = $this->gettext('shortacl'.$key);
	$table->add_header(array('class' => 'acl'.$key, 'title' => $label), $label);
	}

	$js_table = array();
	foreach ($acl as $user => $rights) {
	if ($this->rc->storage->conn->user == $user) {
	continue;
	}

	// filter out virtual rights (c or d) the server may return
	$userrights = array_intersect($rights, $supported);
	$userid = rcube_utils::html_identifier($user);

	if (!empty($this->specials) && in_array($user, $this->specials)) {
	$user = $this->gettext($user);
	}

	$table->add_row(array('id' => 'rcmrow'.$userid));
	$table->add('user', html::a(array('id' => 'rcmlinkrow'.$userid), rcube::Q($user)));

	foreach ($items as $key => $right) {
	$in = $this->acl_compare($userrights, $right);
	switch ($in) {
	case 2: $class = 'enabled'; break;
	case 1: $class = 'partial'; break;
	default: $class = 'disabled'; break;
	}
	$table->add('acl' . $key . ' ' . $class, '');
	}

	$js_table[$userid] = implode($userrights);
	}

	$this->rc->output->set_env('acl', $js_table);
	$this->rc->output->set_env('acl_advanced', $advanced);

	$out = $table->show();

	return $out;
	}

	/**
	* Handler for ACL update/create action
	*/
	private function action_save()
	{
	- $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
	- $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));
	- $acl = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_GPC));
	- $oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_GPC));
	+ $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST, true)); // UTF7-IMAP
	+ $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST));
	+ $acl = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_POST));
	+ $oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_POST));

	$acl = array_intersect(str_split($acl), $this->rights_supported());
	$users = $oldid ? array($user) : explode(',', $user);
	$result = 0;

	foreach ($users as $user) {
	$user = trim($user);
	$prefix = $this->rc->config->get('acl_groups') ? $this->rc->config->get('acl_group_prefix') : '';

	if ($prefix && strpos($user, $prefix) === 0) {
	$username = $user;
	}
	else if (!empty($this->specials) && in_array($user, $this->specials)) {
	$username = $this->gettext($user);
	}
	else if (!empty($user)) {
	if (!strpos($user, '@') && ($realm = $this->get_realm())) {
	$user .= '@' . rcube_utils::idn_to_ascii(preg_replace('/^@/', '', $realm));
	}
	$username = $user;
	}

	if (!$acl \|\| !$user \|\| !strlen($mbox)) {
	continue;
	}

	$user = $this->mod_login($user);
	$username = $this->mod_login($username);

	if ($user != $_SESSION['username'] && $username != $_SESSION['username']) {
	if ($this->rc->storage->set_acl($mbox, $user, $acl)) {
	$ret = array('id' => rcube_utils::html_identifier($user),
	'username' => $username, 'acl' => implode($acl), 'old' => $oldid);
	$this->rc->output->command('acl_update', $ret);
	$result++;
	}
	}
	}

	if ($result) {
	$this->rc->output->show_message($oldid ? 'acl.updatesuccess' : 'acl.createsuccess', 'confirmation');
	}
	else {
	$this->rc->output->show_message($oldid ? 'acl.updateerror' : 'acl.createerror', 'error');
	}
	}

	/**
	* Handler for ACL delete action
	*/
	private function action_delete()
	{
	- $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); //UTF7-IMAP
	- $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));
	+ $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST, true)); //UTF7-IMAP
	+ $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST));

	$user = explode(',', $user);

	foreach ($user as $u) {
	$u = trim($u);
	if ($this->rc->storage->delete_acl($mbox, $u)) {
	$this->rc->output->command('acl_remove_row', rcube_utils::html_identifier($u));
	}
	else {
	$error = true;
	}
	}

	if (!$error) {
	$this->rc->output->show_message('acl.deletesuccess', 'confirmation');
	}
	else {
	$this->rc->output->show_message('acl.deleteerror', 'error');
	}
	}

	/**
	* Handler for ACL list update action (with display mode change)
	*/
	private function action_list()
	{
	if (in_array('acl_advanced_mode', (array)$this->rc->config->get('dont_override'))) {
	return;
	}

	$this->mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
	$advanced = trim(rcube_utils::get_input_value('_mode', rcube_utils::INPUT_GPC));
	$advanced = $advanced == 'advanced' ? true : false;

	// Save state in user preferences
	$this->rc->user->save_prefs(array('acl_advanced_mode' => $advanced));

	$out = $this->list_rights();

	$out = preg_replace(array('/^<table[^>]+>/', '/<\/table>$/'), '', $out);

	$this->rc->output->command('acl_list_update', $out);
	}

	/**
	* Creates <UL> list with descriptive access rights
	*
	* @param array $rights MYRIGHTS result
	*
	* @return string HTML content
	*/
	function acl2text($rights)
	{
	if (empty($rights)) {
	return '';
	}

	$supported = $this->rights_supported();
	$list = array();
	$attrib = array(
	'name' => 'rcmyrights',
	'style' => 'margin:0; padding:0 15px;',
	);

	foreach ($supported as $right) {
	if (in_array($right, $rights)) {
	$list[] = html::tag('li', null, rcube::Q($this->gettext('acl' . $right)));
	}
	}

	if (count($list) == count($supported))
	return rcube::Q($this->gettext('aclfull'));

	return html::tag('ul', $attrib, implode("\n", $list));
	}

	/**
	* Compares two ACLs (according to supported rights)
	*
	* @param array $acl1 ACL rights array (or string)
	* @param array $acl2 ACL rights array (or string)
	*
	* @param int Comparision result, 2 - full match, 1 - partial match, 0 - no match
	*/
	function acl_compare($acl1, $acl2)
	{
	if (!is_array($acl1)) $acl1 = str_split($acl1);
	if (!is_array($acl2)) $acl2 = str_split($acl2);

	$rights = $this->rights_supported();

	$acl1 = array_intersect($acl1, $rights);
	$acl2 = array_intersect($acl2, $rights);
	$res = array_intersect($acl1, $acl2);

	$cnt1 = count($res);
	$cnt2 = count($acl2);

	if ($cnt1 == $cnt2)
	return 2;
	else if ($cnt1)
	return 1;
	else
	return 0;
	}

	/**
	* Get list of supported access rights (according to RIGHTS capability)
	*
	* @return array List of supported access rights abbreviations
	*/
	function rights_supported()
	{
	if ($this->supported !== null) {
	return $this->supported;
	}

	$capa = $this->rc->storage->get_capability('RIGHTS');

	if (is_array($capa)) {
	$rights = strtolower($capa[0]);
	}
	else {
	$rights = 'cd';
	}

	return $this->supported = str_split('lrswi' . $rights . 'pa');
	}

	/**
	* Username realm detection.
	*
	* @return string Username realm (domain)
	*/
	private function get_realm()
	{
	// When user enters a username without domain part, realm
	// allows to add it to the username (and display correct username in the table)

	if (isset($_SESSION['acl_username_realm'])) {
	return $_SESSION['acl_username_realm'];
	}

	// find realm in username of logged user (?)
	list($name, $domain) = explode('@', $_SESSION['username']);

	// Use (always existent) ACL entry on the INBOX for the user to determine
	// whether or not the user ID in ACL entries need to be qualified and how
	// they would need to be qualified.
	if (empty($domain)) {
	$acl = $this->rc->storage->get_acl('INBOX');
	if (is_array($acl)) {
	$regexp = '/^' . preg_quote($_SESSION['username'], '/') . '@(.*)$/';
	foreach (array_keys($acl) as $name) {
	if (preg_match($regexp, $name, $matches)) {
	$domain = $matches[1];
	break;
	}
	}
	}
	}

	return $_SESSION['acl_username_realm'] = $domain;
	}

	/**
	* Initializes autocomplete LDAP backend
	*/
	private function init_ldap()
	{
	if ($this->ldap) {
	return $this->ldap->ready;
	}

	// get LDAP config
	$config = $this->rc->config->get('acl_users_source');

	if (empty($config)) {
	return false;
	}

	// not an array, use configured ldap_public source
	if (!is_array($config)) {
	$ldap_config = (array) $this->rc->config->get('ldap_public');
	$config = $ldap_config[$config];
	}

	$uid_field = $this->rc->config->get('acl_users_field', 'mail');
	$filter = $this->rc->config->get('acl_users_filter');

	if (empty($uid_field) \|\| empty($config)) {
	return false;
	}

	// get name attribute
	if (!empty($config['fieldmap'])) {
	$name_field = $config['fieldmap']['name'];
	}
	// ... no fieldmap, use the old method
	if (empty($name_field)) {
	$name_field = $config['name_field'];
	}

	// add UID field to fieldmap, so it will be returned in a record with name
	$config['fieldmap']['name'] = $name_field;
	$config['fieldmap']['uid'] = $uid_field;

	// search in UID and name fields
	$config['search_fields'] = array_values($config['fieldmap']);
	$config['required_fields'] = array($uid_field);

	// set search filter
	if ($filter) {
	$config['filter'] = $filter;
	}

	// disable vlv
	$config['vlv'] = false;

	// Initialize LDAP connection
	$this->ldap = new rcube_ldap($config,
	$this->rc->config->get('ldap_debug'),
	$this->rc->config->mail_domain($_SESSION['imap_host']));

	return $this->ldap->ready;
	}

	/**
	* Modify user login according to 'login_lc' setting
	*/
	protected function mod_login($user)
	{
	$login_lc = $this->rc->config->get('login_lc');

	if ($login_lc === true \|\| $login_lc == 2) {
	$user = mb_strtolower($user);
	}
	// lowercase domain name
	else if ($login_lc && strpos($user, '@')) {
	list($local, $domain) = explode('@', $user);
	$user = $local . '@' . mb_strtolower($domain);
	}

	return $user;
	}
	}
	diff --git a/plugins/legacy_browser/js/iehacks.js b/plugins/legacy_browser/js/iehacks.js
	index 8f88e6f57..105b7dabc 100644
	--- a/plugins/legacy_browser/js/iehacks.js
	+++ b/plugins/legacy_browser/js/iehacks.js
	@@ -1,108 +1,108 @@

	// Make getElementById() case-sensitive on IE7
	document._getElementById = document.getElementById;
	document.getElementById = function(id)
	{
	var i = 0, obj = document._getElementById(id);

	if (obj && obj.id != id)
	while ((obj = document.all[i]) && obj.id != id)
	i++;

	return obj;
	}

	// fix missing :last-child selectors
	$(document).ready(function() {
	if (rcmail && rcmail.env.skin != 'classic')
	$('ul.treelist ul').each(function(i, ul) {
	$('li:last-child', ul).css('border-bottom', 0);
	});
	});

	// gets cursor position (IE<9)
	rcube_webmail.prototype.get_caret_pos = function(obj)
	{
	if (document.selection && document.selection.createRange) {
	var range = document.selection.createRange();
	if (range.parentElement() != obj)
	return 0;

	var gm = range.duplicate();
	if (obj.tagName == 'TEXTAREA')
	gm.moveToElementText(obj);
	else
	gm.expand('textedit');

	gm.setEndPoint('EndToStart', range);
	var p = gm.text.length;

	return p <= obj.value.length ? p : -1;
	}

	return obj.value.length;
	};

	// moves cursor to specified position (IE<9)
	rcube_webmail.prototype.set_caret_pos = function(obj, pos)
	{
	if (obj.createTextRange) {
	var range = obj.createTextRange();
	range.collapse(true);
	range.moveEnd('character', pos);
	range.moveStart('character', pos);
	range.select();
	}
	};

	// get selected text from an input field (IE<9)
	// http://stackoverflow.com/questions/7186586/how-to-get-the-selected-text-in-textarea-using-jquery-in-internet-explorer-7
	rcube_webmail.prototype.get_input_selection = function(obj)
	{
	var start = 0, end = 0, len,
	normalizedValue, textInputRange, endRange,
	range = document.selection.createRange();

	if (range && range.parentElement() == obj) {
	len = obj.value.length;
	normalizedValue = obj.value; //.replace(/\r\n/g, "\n");

	// create a working TextRange that lives only in the input
	textInputRange = obj.createTextRange();
	textInputRange.moveToBookmark(range.getBookmark());

	// Check if the start and end of the selection are at the very end
	// of the input, since moveStart/moveEnd doesn't return what we want
	// in those cases
	endRange = obj.createTextRange();
	endRange.collapse(false);

	if (textInputRange.compareEndPoints("StartToEnd", endRange) > -1) {
	start = end = len;
	}
	else {
	start = -textInputRange.moveStart("character", -len);
	start += normalizedValue.slice(0, start).split("\n").length - 1;

	if (textInputRange.compareEndPoints("EndToEnd", endRange) > -1) {
	end = len;
	}
	else {
	end = -textInputRange.moveEnd("character", -len);
	end += normalizedValue.slice(0, end).split("\n").length - 1;
	}
	}
	}

	return {start: start, end: end, text: normalizedValue.substr(start, end-start)};
	};

	// For IE<9 we have to do it this way
	// otherwise the form will be posted to a new window
	rcube_webmail.prototype.async_upload_form_frame = function(name)
	{
	document.body.insertAdjacentHTML('BeforeEnd', '<iframe name="' + name + '"'
	- + ' src="program/resources/blank.gif" style="width:0; height:0; visibility:hidden"></iframe>');
	+ + ' src="' + rcmail.assets_path('program/resources/blank.gif') + '" style="width:0; height:0; visibility:hidden"></iframe>');

	return $('iframe[name="' + name + '"]');
	};
	diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	index 8d0dca4d0..25016c878 100644
	--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	@@ -1,2339 +1,2339 @@
	<?php

	/**
	* Managesieve (Sieve Filters) Engine
	*
	* Engine part of Managesieve plugin implementing UI and backend access.
	*
	* Copyright (C) 2008-2014, The Roundcube Dev Team
	* Copyright (C) 2011-2014, Kolab Systems AG
	*
	* This program is free software: you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation, either version 3 of the License, or
	* (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*
	* You should have received a copy of the GNU General Public License
	* along with this program. If not, see http://www.gnu.org/licenses/.
	*/

	class rcube_sieve_engine
	{
	protected $rc;
	protected $sieve;
	protected $errors;
	protected $form;
	protected $tips = array();
	protected $script = array();
	protected $exts = array();
	protected $list;
	protected $active = array();
	protected $headers = array(
	'subject' => 'Subject',
	'from' => 'From',
	'to' => 'To',
	);
	protected $addr_headers = array(
	// Required
	"from", "to", "cc", "bcc", "sender", "resent-from", "resent-to",
	// Additional (RFC 822 / RFC 2822)
	"reply-to", "resent-reply-to", "resent-sender", "resent-cc", "resent-bcc",
	// Non-standard (RFC 2076, draft-palme-mailext-headers-08.txt)
	"for-approval", "for-handling", "for-comment", "apparently-to", "errors-to",
	"delivered-to", "return-receipt-to", "x-admin", "read-receipt-to",
	"x-confirm-reading-to", "return-receipt-requested",
	"registered-mail-reply-requested-by", "mail-followup-to", "mail-reply-to",
	"abuse-reports-to", "x-complaints-to", "x-report-abuse-to",
	// Undocumented
	"x-beenthere",
	);
	protected $notify_methods = array(
	'mailto',
	// 'sms',
	// 'tel',
	);
	protected $notify_importance_options = array(
	3 => 'notifyimportancelow',
	2 => 'notifyimportancenormal',
	1 => 'notifyimportancehigh'
	);

	const VERSION = '8.1';
	const PROGNAME = 'Roundcube (Managesieve)';
	const PORT = 4190;


	/**
	* Class constructor
	*/
	function __construct($plugin)
	{
	$this->rc = rcube::get_instance();
	$this->plugin = $plugin;
	}

	/**
	* Loads configuration, initializes plugin (including sieve connection)
	*/
	function start($mode = null)
	{
	// register UI objects
	$this->rc->output->add_handlers(array(
	'filterslist' => array($this, 'filters_list'),
	'filtersetslist' => array($this, 'filtersets_list'),
	'filterframe' => array($this, 'filter_frame'),
	'filterform' => array($this, 'filter_form'),
	'filtersetform' => array($this, 'filterset_form'),
	));

	// connect to managesieve server
	$error = $this->connect($_SESSION['username'], $this->rc->decrypt($_SESSION['password']));

	// load current/active script
	if (!$error) {
	// Get list of scripts
	$list = $this->list_scripts();

	// reset current script when entering filters UI (#1489412)
	if ($this->rc->action == 'plugin.managesieve') {
	$this->rc->session->remove('managesieve_current');
	}

	if ($mode != 'vacation') {
	if (!empty($_GET['_set']) \|\| !empty($_POST['_set'])) {
	$script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
	}
	else if (!empty($_SESSION['managesieve_current'])) {
	$script_name = $_SESSION['managesieve_current'];
	}
	}

	$error = $this->load_script($script_name);
	}

	// finally set script objects
	if ($error) {
	switch ($error) {
	case rcube_sieve::ERROR_CONNECTION:
	case rcube_sieve::ERROR_LOGIN:
	$this->rc->output->show_message('managesieve.filterconnerror', 'error');
	rcube::raise_error(array('code' => 403, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Unable to connect to managesieve on $host:$port"), true, false);
	break;

	default:
	$this->rc->output->show_message('managesieve.filterunknownerror', 'error');
	break;
	}

	// reload interface in case of possible error when specified script wasn't found (#1489412)
	if ($script_name !== null && !empty($list) && !in_array($script_name, $list)) {
	$this->rc->output->command('reload', 500);
	}

	// to disable 'Add filter' button set env variable
	$this->rc->output->set_env('filterconnerror', true);
	$this->script = array();
	}
	else {
	$this->exts = $this->sieve->get_extensions();
	$this->init_script();
	$this->rc->output->set_env('currentset', $this->sieve->current);
	$_SESSION['managesieve_current'] = $this->sieve->current;
	}

	return $error;
	}

	/**
	* Connect to configured managesieve server
	*
	* @param string $username User login
	* @param string $password User password
	*
	* @return int Connection status: 0 on success, >0 on failure
	*/
	public function connect($username, $password)
	{
	// Get connection parameters
	$host = $this->rc->config->get('managesieve_host', 'localhost');
	$port = $this->rc->config->get('managesieve_port');
	$tls = $this->rc->config->get('managesieve_usetls', false);

	$host = rcube_utils::parse_host($host);
	$host = rcube_utils::idn_to_ascii($host);

	// remove tls:// prefix, set TLS flag
	if (($host = preg_replace('\|^tls://\|i', '', $host, 1, $cnt)) && $cnt) {
	$tls = true;
	}

	if (empty($port)) {
	$port = getservbyname('sieve', 'tcp');
	if (empty($port)) {
	$port = self::PORT;
	}
	}

	$plugin = $this->rc->plugins->exec_hook('managesieve_connect', array(
	'user' => $username,
	'password' => $password,
	'host' => $host,
	'port' => $port,
	'usetls' => $tls,
	'auth_type' => $this->rc->config->get('managesieve_auth_type'),
	'disabled' => $this->rc->config->get('managesieve_disabled_extensions'),
	'debug' => $this->rc->config->get('managesieve_debug', false),
	'auth_cid' => $this->rc->config->get('managesieve_auth_cid'),
	'auth_pw' => $this->rc->config->get('managesieve_auth_pw'),
	'socket_options' => $this->rc->config->get('managesieve_conn_options'),
	));

	// try to connect to managesieve server and to fetch the script
	$this->sieve = new rcube_sieve(
	$plugin['user'],
	$plugin['password'],
	$plugin['host'],
	$plugin['port'],
	$plugin['auth_type'],
	$plugin['usetls'],
	$plugin['disabled'],
	$plugin['debug'],
	$plugin['auth_cid'],
	$plugin['auth_pw'],
	$plugin['socket_options']
	);

	return $this->sieve->error();
	}

	/**
	* Load specified (or active) script
	*
	* @param string $script_name Optional script name
	*
	* @return int Connection status: 0 on success, >0 on failure
	*/
	public function load_script($script_name = null)
	{
	// Get list of scripts
	$list = $this->list_scripts();

	if ($script_name === null \|\| $script_name === '') {
	// get (first) active script
	if (!empty($this->active[0])) {
	$script_name = $this->active[0];
	}
	else if ($list) {
	$script_name = $list[0];
	}
	// create a new (initial) script
	else {
	// if script not exists build default script contents
	$script_file = $this->rc->config->get('managesieve_default');
	$script_name = $this->rc->config->get('managesieve_script_name');

	if (empty($script_name)) {
	$script_name = 'roundcube';
	}

	if ($script_file && is_readable($script_file)) {
	$content = file_get_contents($script_file);
	}

	// add script and set it active
	if ($this->sieve->save_script($script_name, $content)) {
	$this->activate_script($script_name);
	$this->list[] = $script_name;
	}
	}
	}

	if ($script_name) {
	$this->sieve->load($script_name);
	}

	return $this->sieve->error();
	}

	/**
	* User interface actions handler
	*/
	function actions()
	{
	$error = $this->start();

	// Handle user requests
	if ($action = rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC)) {
	$fid = (int) rcube_utils::get_input_value('_fid', rcube_utils::INPUT_POST);

	if ($action == 'delete' && !$error) {
	if (isset($this->script[$fid])) {
	if ($this->sieve->script->delete_rule($fid))
	$result = $this->save_script();

	if ($result === true) {
	$this->rc->output->show_message('managesieve.filterdeleted', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'del', array('id' => $fid));
	} else {
	$this->rc->output->show_message('managesieve.filterdeleteerror', 'error');
	}
	}
	}
	else if ($action == 'move' && !$error) {
	if (isset($this->script[$fid])) {
	$to = (int) rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST);
	$rule = $this->script[$fid];

	// remove rule
	unset($this->script[$fid]);
	$this->script = array_values($this->script);

	// add at target position
	if ($to >= count($this->script)) {
	$this->script[] = $rule;
	}
	else {
	$script = array();
	foreach ($this->script as $idx => $r) {
	if ($idx == $to)
	$script[] = $rule;
	$script[] = $r;
	}
	$this->script = $script;
	}

	$this->sieve->script->content = $this->script;
	$result = $this->save_script();

	if ($result === true) {
	$result = $this->list_rules();

	$this->rc->output->show_message('managesieve.moved', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'list',
	array('list' => $result, 'clear' => true, 'set' => $to));
	} else {
	$this->rc->output->show_message('managesieve.moveerror', 'error');
	}
	}
	}
	else if ($action == 'act' && !$error) {
	if (isset($this->script[$fid])) {
	$rule = $this->script[$fid];
	$disabled = $rule['disabled'] ? true : false;
	$rule['disabled'] = !$disabled;
	$result = $this->sieve->script->update_rule($fid, $rule);

	if ($result !== false)
	$result = $this->save_script();

	if ($result === true) {
	if ($rule['disabled'])
	$this->rc->output->show_message('managesieve.deactivated', 'confirmation');
	else
	$this->rc->output->show_message('managesieve.activated', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'update',
	array('id' => $fid, 'disabled' => $rule['disabled']));
	} else {
	if ($rule['disabled'])
	$this->rc->output->show_message('managesieve.deactivateerror', 'error');
	else
	$this->rc->output->show_message('managesieve.activateerror', 'error');
	}
	}
	}
	else if ($action == 'setact' && !$error) {
	- $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
	+ $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);
	$result = $this->activate_script($script_name);
	$kep14 = $this->rc->config->get('managesieve_kolab_master');

	if ($result === true) {
	$this->rc->output->set_env('active_sets', $this->active);
	$this->rc->output->show_message('managesieve.setactivated', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'setact',
	array('name' => $script_name, 'active' => true, 'all' => !$kep14));
	} else {
	$this->rc->output->show_message('managesieve.setactivateerror', 'error');
	}
	}
	else if ($action == 'deact' && !$error) {
	- $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
	+ $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);
	$result = $this->deactivate_script($script_name);

	if ($result === true) {
	$this->rc->output->set_env('active_sets', $this->active);
	$this->rc->output->show_message('managesieve.setdeactivated', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'setact',
	array('name' => $script_name, 'active' => false));
	} else {
	$this->rc->output->show_message('managesieve.setdeactivateerror', 'error');
	}
	}
	else if ($action == 'setdel' && !$error) {
	- $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
	+ $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);
	$result = $this->remove_script($script_name);

	if ($result === true) {
	$this->rc->output->show_message('managesieve.setdeleted', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'setdel',
	array('name' => $script_name));
	$this->rc->session->remove('managesieve_current');
	} else {
	$this->rc->output->show_message('managesieve.setdeleteerror', 'error');
	}
	}
	else if ($action == 'setget') {
	$script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
	$script = $this->sieve->get_script($script_name);

	if (PEAR::isError($script))
	exit;

	$browser = new rcube_browser;

	// send download headers
	header("Content-Type: application/octet-stream");
	header("Content-Length: ".strlen($script));

	if ($browser->ie) {
	header("Content-Type: application/force-download");
	$filename = rawurlencode($script_name);
	}
	else {
	$filename = addcslashes($script_name, '\\"');
	}

	header("Content-Disposition: attachment; filename=\"$filename.txt\"");
	echo $script;
	exit;
	}
	else if ($action == 'list') {
	$result = $this->list_rules();

	$this->rc->output->command('managesieve_updatelist', 'list', array('list' => $result));
	}
	else if ($action == 'ruleadd') {
	- $rid = rcube_utils::get_input_value('_rid', rcube_utils::INPUT_GPC);
	+ $rid = rcube_utils::get_input_value('_rid', rcube_utils::INPUT_POST);
	$id = $this->genid();
	$content = $this->rule_div($fid, $id, false);

	$this->rc->output->command('managesieve_rulefill', $content, $id, $rid);
	}
	else if ($action == 'actionadd') {
	- $aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_GPC);
	+ $aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_POST);
	$id = $this->genid();
	$content = $this->action_div($fid, $id, false);

	$this->rc->output->command('managesieve_actionfill', $content, $id, $aid);
	}

	$this->rc->output->send();
	}
	else if ($this->rc->task == 'mail') {
	// Initialize the form
	$rules = rcube_utils::get_input_value('r', rcube_utils::INPUT_GET);
	if (!empty($rules)) {
	$i = 0;
	foreach ($rules as $rule) {
	list($header, $value) = explode(':', $rule, 2);
	$tests[$i] = array(
	'type' => 'contains',
	'test' => 'header',
	'arg1' => $header,
	'arg2' => $value,
	);
	$i++;
	}

	$this->form = array(
	'join' => count($tests) > 1 ? 'allof' : 'anyof',
	'name' => '',
	'tests' => $tests,
	'actions' => array(
	0 => array('type' => 'fileinto'),
	1 => array('type' => 'stop'),
	),
	);
	}
	}

	$this->send();
	}

	function save()
	{
	// Init plugin and handle managesieve connection
	$error = $this->start();

	// get request size limits (#1488648)
	$max_post = max(array(
	ini_get('max_input_vars'),
	ini_get('suhosin.request.max_vars'),
	ini_get('suhosin.post.max_vars'),
	));
	$max_depth = max(array(
	ini_get('suhosin.request.max_array_depth'),
	ini_get('suhosin.post.max_array_depth'),
	));

	// check request size limit
	if ($max_post && count($_POST, COUNT_RECURSIVE) >= $max_post) {
	rcube::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Request size limit exceeded (one of max_input_vars/suhosin.request.max_vars/suhosin.post.max_vars)"
	), true, false);
	$this->rc->output->show_message('managesieve.filtersaveerror', 'error');
	}
	// check request depth limits
	else if ($max_depth && count($_POST['_header']) > $max_depth) {
	rcube::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Request size limit exceeded (one of suhosin.request.max_array_depth/suhosin.post.max_array_depth)"
	), true, false);
	$this->rc->output->show_message('managesieve.filtersaveerror', 'error');
	}
	// filters set add action
	else if (!empty($_POST['_newset'])) {
	$name = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true);
	$copy = rcube_utils::get_input_value('_copy', rcube_utils::INPUT_POST, true);
	$from = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);
	$exceptions = $this->rc->config->get('managesieve_filename_exceptions');
	$kolab = $this->rc->config->get('managesieve_kolab_master');
	$name_uc = mb_strtolower($name);
	$list = $this->list_scripts();

	if (!$name) {
	$this->errors['name'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (mb_strlen($name) > 128) {
	$this->errors['name'] = $this->plugin->gettext('nametoolong');
	}
	else if (!empty($exceptions) && in_array($name, (array)$exceptions)) {
	$this->errors['name'] = $this->plugin->gettext('namereserved');
	}
	else if (!empty($kolab) && in_array($name_uc, array('MASTER', 'USER', 'MANAGEMENT'))) {
	$this->errors['name'] = $this->plugin->gettext('namereserved');
	}
	else if (in_array($name, $list)) {
	$this->errors['name'] = $this->plugin->gettext('setexist');
	}
	else if ($from == 'file') {
	// from file
	if (is_uploaded_file($_FILES['_file']['tmp_name'])) {
	$file = file_get_contents($_FILES['_file']['tmp_name']);
	$file = preg_replace('/\r/', '', $file);
	// for security don't save script directly
	// check syntax before, like this...
	$this->sieve->load_script($file);
	if (!$this->save_script($name)) {
	$this->errors['file'] = $this->plugin->gettext('setcreateerror');
	}
	}
	else { // upload failed
	$err = $_FILES['_file']['error'];

	if ($err == UPLOAD_ERR_INI_SIZE \|\| $err == UPLOAD_ERR_FORM_SIZE) {
	$msg = $this->rc->gettext(array('name' => 'filesizeerror',
	'vars' => array('size' =>
	$this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
	}
	else {
	$this->errors['file'] = $this->plugin->gettext('fileuploaderror');
	}
	}
	}
	else if (!$this->sieve->copy($name, $from == 'set' ? $copy : '')) {
	$error = 'managesieve.setcreateerror';
	}

	if (!$error && empty($this->errors)) {
	// Find position of the new script on the list
	$list[] = $name;
	asort($list, SORT_LOCALE_STRING);
	$list = array_values($list);
	$index = array_search($name, $list);

	$this->rc->output->show_message('managesieve.setcreated', 'confirmation');
	$this->rc->output->command('parent.managesieve_updatelist', 'setadd',
	array('name' => $name, 'index' => $index));
	} else if ($msg) {
	$this->rc->output->command('display_message', $msg, 'error');
	} else if ($error) {
	$this->rc->output->show_message($error, 'error');
	}
	}
	// filter add/edit action
	else if (isset($_POST['_name'])) {
	$name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true));
	$fid = trim(rcube_utils::get_input_value('_fid', rcube_utils::INPUT_POST));
	$join = trim(rcube_utils::get_input_value('_join', rcube_utils::INPUT_POST));

	// and arrays
	$headers = rcube_utils::get_input_value('_header', rcube_utils::INPUT_POST);
	$cust_headers = rcube_utils::get_input_value('_custom_header', rcube_utils::INPUT_POST);
	$ops = rcube_utils::get_input_value('_rule_op', rcube_utils::INPUT_POST);
	$sizeops = rcube_utils::get_input_value('_rule_size_op', rcube_utils::INPUT_POST);
	$sizeitems = rcube_utils::get_input_value('_rule_size_item', rcube_utils::INPUT_POST);
	$sizetargets = rcube_utils::get_input_value('_rule_size_target', rcube_utils::INPUT_POST);
	$targets = rcube_utils::get_input_value('_rule_target', rcube_utils::INPUT_POST, true);
	$mods = rcube_utils::get_input_value('_rule_mod', rcube_utils::INPUT_POST);
	$mod_types = rcube_utils::get_input_value('_rule_mod_type', rcube_utils::INPUT_POST);
	$body_trans = rcube_utils::get_input_value('_rule_trans', rcube_utils::INPUT_POST);
	$body_types = rcube_utils::get_input_value('_rule_trans_type', rcube_utils::INPUT_POST, true);
	$comparators = rcube_utils::get_input_value('_rule_comp', rcube_utils::INPUT_POST);
	$indexes = rcube_utils::get_input_value('_rule_index', rcube_utils::INPUT_POST);
	$lastindexes = rcube_utils::get_input_value('_rule_index_last', rcube_utils::INPUT_POST);
	$dateheaders = rcube_utils::get_input_value('_rule_date_header', rcube_utils::INPUT_POST);
	$dateparts = rcube_utils::get_input_value('_rule_date_part', rcube_utils::INPUT_POST);
	$act_types = rcube_utils::get_input_value('_action_type', rcube_utils::INPUT_POST, true);
	$mailboxes = rcube_utils::get_input_value('_action_mailbox', rcube_utils::INPUT_POST, true);
	$act_targets = rcube_utils::get_input_value('_action_target', rcube_utils::INPUT_POST, true);
	$domain_targets = rcube_utils::get_input_value('_action_target_domain', rcube_utils::INPUT_POST);
	$area_targets = rcube_utils::get_input_value('_action_target_area', rcube_utils::INPUT_POST, true);
	$reasons = rcube_utils::get_input_value('_action_reason', rcube_utils::INPUT_POST, true);
	$addresses = rcube_utils::get_input_value('_action_addresses', rcube_utils::INPUT_POST, true);
	$intervals = rcube_utils::get_input_value('_action_interval', rcube_utils::INPUT_POST);
	$interval_types = rcube_utils::get_input_value('_action_interval_type', rcube_utils::INPUT_POST);
	$subject = rcube_utils::get_input_value('_action_subject', rcube_utils::INPUT_POST, true);
	$flags = rcube_utils::get_input_value('_action_flags', rcube_utils::INPUT_POST);
	$varnames = rcube_utils::get_input_value('_action_varname', rcube_utils::INPUT_POST);
	$varvalues = rcube_utils::get_input_value('_action_varvalue', rcube_utils::INPUT_POST);
	$varmods = rcube_utils::get_input_value('_action_varmods', rcube_utils::INPUT_POST);
	$notifymethods = rcube_utils::get_input_value('_action_notifymethod', rcube_utils::INPUT_POST);
	$notifytargets = rcube_utils::get_input_value('_action_notifytarget', rcube_utils::INPUT_POST, true);
	$notifyoptions = rcube_utils::get_input_value('_action_notifyoption', rcube_utils::INPUT_POST, true);
	$notifymessages = rcube_utils::get_input_value('_action_notifymessage', rcube_utils::INPUT_POST, true);
	$notifyfrom = rcube_utils::get_input_value('_action_notifyfrom', rcube_utils::INPUT_POST);
	$notifyimp = rcube_utils::get_input_value('_action_notifyimportance', rcube_utils::INPUT_POST);

	// we need a "hack" for radiobuttons
	foreach ($sizeitems as $item)
	$items[] = $item;

	$this->form['disabled'] = $_POST['_disabled'] ? true : false;
	$this->form['join'] = $join=='allof' ? true : false;
	$this->form['name'] = $name;
	$this->form['tests'] = array();
	$this->form['actions'] = array();

	if ($name == '')
	$this->errors['name'] = $this->plugin->gettext('cannotbeempty');
	else {
	foreach($this->script as $idx => $rule)
	if($rule['name'] == $name && $idx != $fid) {
	$this->errors['name'] = $this->plugin->gettext('ruleexist');
	break;
	}
	}

	$i = 0;
	// rules
	if ($join == 'any') {
	$this->form['tests'][0]['test'] = 'true';
	}
	else {
	foreach ($headers as $idx => $header) {
	// targets are indexed differently (assume form order)
	$target = $this->strip_value(array_shift($targets), true);
	$header = $this->strip_value($header);
	$operator = $this->strip_value($ops[$idx]);
	$comparator = $this->strip_value($comparators[$idx]);

	if ($header == 'size') {
	$sizeop = $this->strip_value($sizeops[$idx]);
	$sizeitem = $this->strip_value($items[$idx]);
	$sizetarget = $this->strip_value($sizetargets[$idx]);

	$this->form['tests'][$i]['test'] = 'size';
	$this->form['tests'][$i]['type'] = $sizeop;
	$this->form['tests'][$i]['arg'] = $sizetarget;

	if ($sizetarget == '')
	$this->errors['tests'][$i]['sizetarget'] = $this->plugin->gettext('cannotbeempty');
	else if (!preg_match('/^[0-9]+(K\|M\|G)?$/i', $sizetarget.$sizeitem, $m)) {
	$this->errors['tests'][$i]['sizetarget'] = $this->plugin->gettext('forbiddenchars');
	$this->form['tests'][$i]['item'] = $sizeitem;
	}
	else
	$this->form['tests'][$i]['arg'] .= $m[1];
	}
	else if ($header == 'currentdate') {
	$datepart = $this->strip_value($dateparts[$idx]);

	if (preg_match('/^not/', $operator))
	$this->form['tests'][$i]['not'] = true;
	$type = preg_replace('/^not/', '', $operator);

	if ($type == 'exists') {
	$this->errors['tests'][$i]['op'] = true;
	}

	$this->form['tests'][$i]['test'] = 'currentdate';
	$this->form['tests'][$i]['type'] = $type;
	$this->form['tests'][$i]['part'] = $datepart;
	$this->form['tests'][$i]['arg'] = $target;

	if ($type != 'exists') {
	if (!count($target)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (strpos($type, 'count-') === 0) {
	foreach ($target as $arg) {
	if (preg_match('/[^0-9]/', $arg)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('forbiddenchars');
	}
	}
	}
	else if (strpos($type, 'value-') === 0) {
	// Some date/time formats do not support i;ascii-numeric comparator
	if ($comparator == 'i;ascii-numeric' && in_array($datepart, array('date', 'time', 'iso8601', 'std11'))) {
	$comparator = '';
	}
	}

	if (!preg_match('/^(regex\|matches\|count-)/', $type) && count($target)) {
	foreach ($target as $arg) {
	if (!$this->validate_date_part($datepart, $arg)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('invaliddateformat');
	break;
	}
	}
	}
	}
	}
	else if ($header == 'date') {
	$datepart = $this->strip_value($dateparts[$idx]);
	$dateheader = $this->strip_value($dateheaders[$idx]);
	$index = $this->strip_value($indexes[$idx]);
	$indexlast = $this->strip_value($lastindexes[$idx]);

	if (preg_match('/^not/', $operator))
	$this->form['tests'][$i]['not'] = true;
	$type = preg_replace('/^not/', '', $operator);

	if ($type == 'exists') {
	$this->errors['tests'][$i]['op'] = true;
	}

	if (!empty($index) && $mod != 'envelope') {
	$this->form['tests'][$i]['index'] = intval($index);
	$this->form['tests'][$i]['last'] = !empty($indexlast);
	}

	if (empty($dateheader)) {
	$dateheader = 'Date';
	}
	else if (!preg_match('/^[\x21-\x39\x41-\x7E]+$/i', $dateheader)) {
	$this->errors['tests'][$i]['dateheader'] = $this->plugin->gettext('forbiddenchars');
	}

	$this->form['tests'][$i]['test'] = 'date';
	$this->form['tests'][$i]['type'] = $type;
	$this->form['tests'][$i]['part'] = $datepart;
	$this->form['tests'][$i]['arg'] = $target;
	$this->form['tests'][$i]['header'] = $dateheader;

	if ($type != 'exists') {
	if (!count($target)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (strpos($type, 'count-') === 0) {
	foreach ($target as $arg) {
	if (preg_match('/[^0-9]/', $arg)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('forbiddenchars');
	}
	}
	}
	else if (strpos($type, 'value-') === 0) {
	// Some date/time formats do not support i;ascii-numeric comparator
	if ($comparator == 'i;ascii-numeric' && in_array($datepart, array('date', 'time', 'iso8601', 'std11'))) {
	$comparator = '';
	}
	}

	if (count($target) && !preg_match('/^(regex\|matches\|count-)/', $type)) {
	foreach ($target as $arg) {
	if (!$this->validate_date_part($datepart, $arg)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('invaliddateformat');
	break;
	}
	}
	}
	}
	}
	else if ($header == 'body') {
	$trans = $this->strip_value($body_trans[$idx]);
	$trans_type = $this->strip_value($body_types[$idx], true);

	if (preg_match('/^not/', $operator))
	$this->form['tests'][$i]['not'] = true;
	$type = preg_replace('/^not/', '', $operator);

	if ($type == 'exists') {
	$this->errors['tests'][$i]['op'] = true;
	}

	$this->form['tests'][$i]['test'] = 'body';
	$this->form['tests'][$i]['type'] = $type;
	$this->form['tests'][$i]['arg'] = $target;

	if (empty($target) && $type != 'exists') {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (preg_match('/^(value\|count)-/', $type)) {
	foreach ($target as $target_value) {
	if (preg_match('/[^0-9]/', $target_value)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('forbiddenchars');
	}
	}
	}

	$this->form['tests'][$i]['part'] = $trans;
	if ($trans == 'content') {
	$this->form['tests'][$i]['content'] = $trans_type;
	}
	}
	else {
	$cust_header = $headers = $this->strip_value(array_shift($cust_headers));
	$mod = $this->strip_value($mods[$idx]);
	$mod_type = $this->strip_value($mod_types[$idx]);
	$index = $this->strip_value($indexes[$idx]);
	$indexlast = $this->strip_value($lastindexes[$idx]);

	if (preg_match('/^not/', $operator))
	$this->form['tests'][$i]['not'] = true;
	$type = preg_replace('/^not/', '', $operator);

	if (!empty($index) && $mod != 'envelope') {
	$this->form['tests'][$i]['index'] = intval($index);
	$this->form['tests'][$i]['last'] = !empty($indexlast);
	}

	if ($header == '...') {
	if (!count($headers))
	$this->errors['tests'][$i]['header'] = $this->plugin->gettext('cannotbeempty');
	else {
	foreach ($headers as $hr) {
	// RFC2822: printable ASCII except colon
	if (!preg_match('/^[\x21-\x39\x41-\x7E]+$/i', $hr)) {
	$this->errors['tests'][$i]['header'] = $this->plugin->gettext('forbiddenchars');
	}
	}
	}

	if (empty($this->errors['tests'][$i]['header']))
	$cust_header = (is_array($headers) && count($headers) == 1) ? $headers[0] : $headers;
	}

	$header = $header == '...' ? $cust_header : $header;

	if (is_array($header)) {
	foreach ($header as $h_index => $val) {
	if (isset($this->headers[$val])) {
	$header[$h_index] = $this->headers[$val];
	}
	}
	}

	if ($type == 'exists') {
	$this->form['tests'][$i]['test'] = 'exists';
	$this->form['tests'][$i]['arg'] = $header;
	}
	else {
	$test = 'header';

	if ($mod == 'address' \|\| $mod == 'envelope') {
	$found = false;
	if (empty($this->errors['tests'][$i]['header'])) {
	foreach ((array)$header as $hdr) {
	if (!in_array(strtolower(trim($hdr)), $this->addr_headers))
	$found = true;
	}
	}
	if (!$found)
	$test = $mod;
	}

	$this->form['tests'][$i]['type'] = $type;
	$this->form['tests'][$i]['test'] = $test;
	$this->form['tests'][$i]['arg1'] = $header;
	$this->form['tests'][$i]['arg2'] = $target;

	if (empty($target)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (preg_match('/^(value\|count)-/', $type)) {
	foreach ($target as $target_value) {
	if (preg_match('/[^0-9]/', $target_value)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('forbiddenchars');
	}
	}
	}

	if ($mod) {
	$this->form['tests'][$i]['part'] = $mod_type;
	}
	}
	}

	if ($header != 'size' && $comparator) {
	$this->form['tests'][$i]['comparator'] = $comparator;
	}

	$i++;
	}
	}

	$i = 0;
	// actions
	foreach ($act_types as $idx => $type) {
	$type = $this->strip_value($type);

	switch ($type) {
	case 'fileinto':
	case 'fileinto_copy':
	$mailbox = $this->strip_value($mailboxes[$idx], false, false);
	$this->form['actions'][$i]['target'] = $this->mod_mailbox($mailbox, 'in');

	if ($type == 'fileinto_copy') {
	$type = 'fileinto';
	$this->form['actions'][$i]['copy'] = true;
	}
	break;

	case 'reject':
	case 'ereject':
	$target = $this->strip_value($area_targets[$idx]);
	$this->form['actions'][$i]['target'] = str_replace("\r\n", "\n", $target);

	// if ($target == '')
	// $this->errors['actions'][$i]['targetarea'] = $this->plugin->gettext('cannotbeempty');
	break;

	case 'redirect':
	case 'redirect_copy':
	$target = $this->strip_value($act_targets[$idx]);
	$domain = $this->strip_value($domain_targets[$idx]);

	// force one of the configured domains
	$domains = (array) $this->rc->config->get('managesieve_domains');
	if (!empty($domains) && !empty($target)) {
	if (!$domain \|\| !in_array($domain, $domains)) {
	$domain = $domains[0];
	}

	$target .= '@' . $domain;
	}

	$this->form['actions'][$i]['target'] = $target;

	if ($target == '')
	$this->errors['actions'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	else if (!rcube_utils::check_email($target))
	$this->errors['actions'][$i]['target'] = $this->plugin->gettext(!empty($domains) ? 'forbiddenchars' : 'noemailwarning');

	if ($type == 'redirect_copy') {
	$type = 'redirect';
	$this->form['actions'][$i]['copy'] = true;
	}

	break;

	case 'addflag':
	case 'setflag':
	case 'removeflag':
	$_target = array();
	if (empty($flags[$idx])) {
	$this->errors['actions'][$i]['target'] = $this->plugin->gettext('noflagset');
	}
	else {
	foreach ($flags[$idx] as $flag) {
	$_target[] = $this->strip_value($flag);
	}
	}
	$this->form['actions'][$i]['target'] = $_target;
	break;

	case 'vacation':
	$reason = $this->strip_value($reasons[$idx]);
	$interval_type = $interval_types[$idx] == 'seconds' ? 'seconds' : 'days';

	$this->form['actions'][$i]['reason'] = str_replace("\r\n", "\n", $reason);
	$this->form['actions'][$i]['subject'] = $subject[$idx];
	$this->form['actions'][$i]['addresses'] = array_shift($addresses);
	$this->form['actions'][$i][$interval_type] = $intervals[$idx];
	// @TODO: vacation :mime, :from, :handle

	foreach ((array)$this->form['actions'][$i]['addresses'] as $aidx => $address) {
	$this->form['actions'][$i]['addresses'][$aidx] = $address = trim($address);

	if (empty($address)) {
	unset($this->form['actions'][$i]['addresses'][$aidx]);
	}
	else if (!rcube_utils::check_email($address)) {
	$this->errors['actions'][$i]['addresses'] = $this->plugin->gettext('noemailwarning');
	break;
	}
	}

	if ($this->form['actions'][$i]['reason'] == '')
	$this->errors['actions'][$i]['reason'] = $this->plugin->gettext('cannotbeempty');
	if ($this->form['actions'][$i][$interval_type] && !preg_match('/^[0-9]+$/', $this->form['actions'][$i][$interval_type]))
	$this->errors['actions'][$i]['interval'] = $this->plugin->gettext('forbiddenchars');
	break;

	case 'set':
	$this->form['actions'][$i]['name'] = $varnames[$idx];
	$this->form['actions'][$i]['value'] = $varvalues[$idx];
	foreach ((array)$varmods[$idx] as $v_m) {
	$this->form['actions'][$i][$v_m] = true;
	}

	if (empty($varnames[$idx])) {
	$this->errors['actions'][$i]['name'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (!preg_match('/^[0-9a-z_]+$/i', $varnames[$idx])) {
	$this->errors['actions'][$i]['name'] = $this->plugin->gettext('forbiddenchars');
	}

	if (!isset($varvalues[$idx]) \|\| $varvalues[$idx] === '') {
	$this->errors['actions'][$i]['value'] = $this->plugin->gettext('cannotbeempty');
	}
	break;

	case 'notify':
	if (empty($notifymethods[$idx])) {
	$this->errors['actions'][$i]['method'] = $this->plugin->gettext('cannotbeempty');
	}
	if (empty($notifytargets[$idx])) {
	$this->errors['actions'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	}
	if (!empty($notifyfrom[$idx]) && !rcube_utils::check_email($notifyfrom[$idx])) {
	$this->errors['actions'][$i]['from'] = $this->plugin->gettext('noemailwarning');
	}

	// skip empty options
	foreach ((array)$notifyoptions[$idx] as $opt_idx => $opt) {
	if (!strlen(trim($opt))) {
	unset($notifyoptions[$idx][$opt_idx]);
	}
	}

	$this->form['actions'][$i]['method'] = $notifymethods[$idx] . ':' . $notifytargets[$idx];
	$this->form['actions'][$i]['options'] = $notifyoptions[$idx];
	$this->form['actions'][$i]['message'] = $notifymessages[$idx];
	$this->form['actions'][$i]['from'] = $notifyfrom[$idx];
	$this->form['actions'][$i]['importance'] = $notifyimp[$idx];
	break;
	}

	$this->form['actions'][$i]['type'] = $type;
	$i++;
	}

	if (!$this->errors && !$error) {
	// save the script
	if (!isset($this->script[$fid])) {
	$fid = $this->sieve->script->add_rule($this->form);
	$new = true;
	}
	else {
	$fid = $this->sieve->script->update_rule($fid, $this->form);
	}

	if ($fid !== false)
	$save = $this->save_script();

	if ($save && $fid !== false) {
	$this->rc->output->show_message('managesieve.filtersaved', 'confirmation');
	if ($this->rc->task != 'mail') {
	$this->rc->output->command('parent.managesieve_updatelist',
	isset($new) ? 'add' : 'update',
	array(
	'name' => $this->form['name'],
	'id' => $fid,
	'disabled' => $this->form['disabled']
	));
	}
	else {
	$this->rc->output->command('managesieve_dialog_close');
	$this->rc->output->send('iframe');
	}
	}
	else {
	$this->rc->output->show_message('managesieve.filtersaveerror', 'error');
	// $this->rc->output->send();
	}
	}
	}

	$this->send();
	}

	protected function send()
	{
	// Handle form action
	if (isset($_GET['_framed']) \|\| isset($_POST['_framed'])) {
	if (isset($_GET['_newset']) \|\| isset($_POST['_newset'])) {
	$this->rc->output->send('managesieve.setedit');
	}
	else {
	$this->rc->output->send('managesieve.filteredit');
	}
	}
	else {
	$this->rc->output->set_pagetitle($this->plugin->gettext('filters'));
	$this->rc->output->send('managesieve.managesieve');
	}
	}

	// return the filters list as HTML table
	function filters_list($attrib)
	{
	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmfilterslist';

	// define list of cols to be displayed
	$a_show_cols = array('name');

	$result = $this->list_rules();

	// create XHTML table
	$out = $this->rc->table_output($attrib, $result, $a_show_cols, 'id');

	// set client env
	$this->rc->output->add_gui_object('filterslist', $attrib['id']);
	$this->rc->output->include_script('list.js');

	// add some labels to client
	$this->rc->output->add_label('managesieve.filterdeleteconfirm');

	return $out;
	}

	// return the filters list as <SELECT>
	function filtersets_list($attrib, $no_env = false)
	{
	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmfiltersetslist';

	$list = $this->list_scripts();

	if ($list) {
	asort($list, SORT_LOCALE_STRING);
	}

	if (!empty($attrib['type']) && $attrib['type'] == 'list') {
	// define list of cols to be displayed
	$a_show_cols = array('name');

	if ($list) {
	foreach ($list as $idx => $set) {
	$scripts['S'.$idx] = $set;
	$result[] = array(
	'name' => $set,
	'id' => 'S'.$idx,
	'class' => !in_array($set, $this->active) ? 'disabled' : '',
	);
	}
	}

	// create XHTML table
	$out = $this->rc->table_output($attrib, $result, $a_show_cols, 'id');

	$this->rc->output->set_env('filtersets', $scripts);
	$this->rc->output->include_script('list.js');
	}
	else {
	$select = new html_select(array('name' => '_set', 'id' => $attrib['id'],
	'onchange' => $this->rc->task != 'mail' ? 'rcmail.managesieve_set()' : ''));

	if ($list) {
	foreach ($list as $set)
	$select->add($set, $set);
	}

	$out = $select->show($this->sieve->current);
	}

	// set client env
	if (!$no_env) {
	$this->rc->output->add_gui_object('filtersetslist', $attrib['id']);
	$this->rc->output->add_label('managesieve.setdeleteconfirm');
	}

	return $out;
	}

	function filter_frame($attrib)
	{
	return $this->rc->output->frame($attrib, true);
	}

	function filterset_form($attrib)
	{
	if (!$attrib['id'])
	$attrib['id'] = 'rcmfiltersetform';

	$out = '<form name="filtersetform" action="./" method="post" enctype="multipart/form-data">'."\n";

	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
	$hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
	$hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] \|\| $_GET['_framed'] ? 1 : 0)));
	$hiddenfields->add(array('name' => '_newset', 'value' => 1));

	$out .= $hiddenfields->show();

	$name = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST);
	$copy = rcube_utils::get_input_value('_copy', rcube_utils::INPUT_POST);
	$selected = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);

	// filter set name input
	$input_name = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30,
	'class' => ($this->errors['name'] ? 'error' : '')));

	$out .= sprintf('<label for="%s"><b>%s:</b></label> %s<br /><br />',
	'_name', rcube::Q($this->plugin->gettext('filtersetname')), $input_name->show($name));

	$out .="\n<fieldset class=\"itemlist\"><legend>" . $this->plugin->gettext('filters') . ":</legend>\n";
	$out .= '<input type="radio" id="from_none" name="_from" value="none"'
	.(!$selected \|\| $selected=='none' ? ' checked="checked"' : '').'></input>';
	$out .= sprintf('<label for="%s">%s</label> ', 'from_none', rcube::Q($this->plugin->gettext('none')));

	// filters set list
	$list = $this->list_scripts();
	$select = new html_select(array('name' => '_copy', 'id' => '_copy'));

	if (is_array($list)) {
	asort($list, SORT_LOCALE_STRING);

	if (!$copy)
	$copy = $_SESSION['managesieve_current'];

	foreach ($list as $set) {
	$select->add($set, $set);
	}

	$out .= '<br /><input type="radio" id="from_set" name="_from" value="set"'
	.($selected=='set' ? ' checked="checked"' : '').'></input>';
	$out .= sprintf('<label for="%s">%s:</label> ', 'from_set', rcube::Q($this->plugin->gettext('fromset')));
	$out .= $select->show($copy);
	}

	// script upload box
	$upload = new html_inputfield(array('name' => '_file', 'id' => '_file', 'size' => 30,
	'type' => 'file', 'class' => ($this->errors['file'] ? 'error' : '')));

	$out .= '<br /><input type="radio" id="from_file" name="_from" value="file"'
	.($selected=='file' ? ' checked="checked"' : '').'></input>';
	$out .= sprintf('<label for="%s">%s:</label> ', 'from_file', rcube::Q($this->plugin->gettext('fromfile')));
	$out .= $upload->show();
	$out .= '</fieldset>';

	$this->rc->output->add_gui_object('sieveform', 'filtersetform');

	if ($this->errors['name'])
	$this->add_tip('_name', $this->errors['name'], true);
	if ($this->errors['file'])
	$this->add_tip('_file', $this->errors['file'], true);

	$this->print_tips();

	return $out;
	}


	function filter_form($attrib)
	{
	if (!$attrib['id'])
	$attrib['id'] = 'rcmfilterform';

	$fid = rcube_utils::get_input_value('_fid', rcube_utils::INPUT_GPC);
	$scr = isset($this->form) ? $this->form : $this->script[$fid];

	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
	$hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
	$hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] \|\| $_GET['_framed'] ? 1 : 0)));
	$hiddenfields->add(array('name' => '_fid', 'value' => $fid));

	$out = '<form name="filterform" action="./" method="post">'."\n";
	$out .= $hiddenfields->show();

	// 'any' flag
	if (sizeof($scr['tests']) == 1 && $scr['tests'][0]['test'] == 'true' && !$scr['tests'][0]['not'])
	$any = true;

	// filter name input
	$field_id = '_name';
	$input_name = new html_inputfield(array('name' => '_name', 'id' => $field_id, 'size' => 30,
	'class' => ($this->errors['name'] ? 'error' : '')));

	if ($this->errors['name'])
	$this->add_tip($field_id, $this->errors['name'], true);

	if (isset($scr))
	$input_name = $input_name->show($scr['name']);
	else
	$input_name = $input_name->show();

	$out .= sprintf("\n<label for=\"%s\"><b>%s:</b></label> %s\n",
	$field_id, rcube::Q($this->plugin->gettext('filtername')), $input_name);

	// filter set selector
	if ($this->rc->task == 'mail') {
	$out .= sprintf("\n <label for=\"%s\"><b>%s:</b></label> %s\n",
	$field_id, rcube::Q($this->plugin->gettext('filterset')),
	$this->filtersets_list(array('id' => 'sievescriptname'), true));
	}

	$out .= '<br /><br /><fieldset><legend>' . rcube::Q($this->plugin->gettext('messagesrules')) . "</legend>\n";

	// any, allof, anyof radio buttons
	$field_id = '_allof';
	$input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'allof',
	'onclick' => 'rule_join_radio(\'allof\')', 'class' => 'radio'));

	if (isset($scr) && !$any)
	$input_join = $input_join->show($scr['join'] ? 'allof' : '');
	else
	$input_join = $input_join->show();

	$out .= sprintf("%s<label for=\"%s\">%s</label> \n",
	$input_join, $field_id, rcube::Q($this->plugin->gettext('filterallof')));

	$field_id = '_anyof';
	$input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'anyof',
	'onclick' => 'rule_join_radio(\'anyof\')', 'class' => 'radio'));

	if (isset($scr) && !$any)
	$input_join = $input_join->show($scr['join'] ? '' : 'anyof');
	else
	$input_join = $input_join->show('anyof'); // default

	$out .= sprintf("%s<label for=\"%s\">%s</label>\n",
	$input_join, $field_id, rcube::Q($this->plugin->gettext('filteranyof')));

	$field_id = '_any';
	$input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'any',
	'onclick' => 'rule_join_radio(\'any\')', 'class' => 'radio'));

	$input_join = $input_join->show($any ? 'any' : '');

	$out .= sprintf("%s<label for=\"%s\">%s</label>\n",
	$input_join, $field_id, rcube::Q($this->plugin->gettext('filterany')));

	$rows_num = isset($scr) ? sizeof($scr['tests']) : 1;

	$out .= '<div id="rules"'.($any ? ' style="display: none"' : '').'>';
	for ($x=0; $x<$rows_num; $x++)
	$out .= $this->rule_div($fid, $x);
	$out .= "</div>\n";

	$out .= "</fieldset>\n";

	// actions
	$out .= '<fieldset><legend>' . rcube::Q($this->plugin->gettext('messagesactions')) . "</legend>\n";

	$rows_num = isset($scr) ? sizeof($scr['actions']) : 1;

	$out .= '<div id="actions">';
	for ($x=0; $x<$rows_num; $x++)
	$out .= $this->action_div($fid, $x);
	$out .= "</div>\n";

	$out .= "</fieldset>\n";

	$this->print_tips();

	if ($scr['disabled']) {
	$this->rc->output->set_env('rule_disabled', true);
	}
	$this->rc->output->add_label(
	'managesieve.ruledeleteconfirm',
	'managesieve.actiondeleteconfirm'
	);
	$this->rc->output->add_gui_object('sieveform', 'filterform');

	return $out;
	}

	function rule_div($fid, $id, $div=true)
	{
	$rule = isset($this->form) ? $this->form['tests'][$id] : $this->script[$fid]['tests'][$id];
	$rows_num = isset($this->form) ? sizeof($this->form['tests']) : sizeof($this->script[$fid]['tests']);

	// headers select
	$select_header = new html_select(array('name' => "_header[]", 'id' => 'header'.$id,
	'onchange' => 'rule_header_select(' .$id .')'));

	foreach ($this->headers as $index => $header) {
	$header = $this->rc->text_exists($index) ? $this->plugin->gettext($index) : $header;
	$select_header->add($header, $index);
	}
	$select_header->add($this->plugin->gettext('...'), '...');
	if (in_array('body', $this->exts))
	$select_header->add($this->plugin->gettext('body'), 'body');
	$select_header->add($this->plugin->gettext('size'), 'size');
	if (in_array('date', $this->exts)) {
	$select_header->add($this->plugin->gettext('datetest'), 'date');
	$select_header->add($this->plugin->gettext('currdate'), 'currentdate');
	}

	if (isset($rule['test'])) {
	if (in_array($rule['test'], array('header', 'address', 'envelope'))
	&& !is_array($rule['arg1'])
	&& ($header = strtolower($rule['arg1']))
	&& isset($this->headers[$header])
	) {
	$test = $header;
	}
	else if ($rule['test'] == 'exists'
	&& !is_array($rule['arg'])
	&& ($header = strtolower($rule['arg']))
	&& isset($this->headers[$header])
	) {
	$test = $header;
	}
	else if (in_array($rule['test'], array('size', 'body', 'date', 'currentdate'))) {
	$test = $rule['test'];
	}
	else if ($rule['test'] != 'true') {
	$test = '...';
	}
	}

	$aout = $select_header->show($test);

	// custom headers input
	if (isset($rule['test']) && in_array($rule['test'], array('header', 'address', 'envelope'))) {
	$custom = (array) $rule['arg1'];
	if (count($custom) == 1 && isset($this->headers[strtolower($custom[0])])) {
	unset($custom);
	}
	}
	else if (isset($rule['test']) && $rule['test'] == 'exists') {
	$custom = (array) $rule['arg'];
	if (count($custom) == 1 && isset($this->headers[strtolower($custom[0])])) {
	unset($custom);
	}
	}

	$tout = $this->list_input($id, 'custom_header', $custom, isset($custom),
	$this->error_class($id, 'test', 'header', 'custom_header'), 15) . "\n";

	// matching type select (operator)
	$select_op = new html_select(array('name' => "_rule_op[]", 'id' => 'rule_op'.$id,
	'style' => 'display:' .($rule['test']!='size' ? 'inline' : 'none'),
	'class' => 'operator_selector',
	'onchange' => 'rule_op_select(this, '.$id.')'));
	$select_op->add(rcube::Q($this->plugin->gettext('filtercontains')), 'contains');
	$select_op->add(rcube::Q($this->plugin->gettext('filternotcontains')), 'notcontains');
	$select_op->add(rcube::Q($this->plugin->gettext('filteris')), 'is');
	$select_op->add(rcube::Q($this->plugin->gettext('filterisnot')), 'notis');
	$select_op->add(rcube::Q($this->plugin->gettext('filterexists')), 'exists');
	$select_op->add(rcube::Q($this->plugin->gettext('filternotexists')), 'notexists');
	$select_op->add(rcube::Q($this->plugin->gettext('filtermatches')), 'matches');
	$select_op->add(rcube::Q($this->plugin->gettext('filternotmatches')), 'notmatches');
	if (in_array('regex', $this->exts)) {
	$select_op->add(rcube::Q($this->plugin->gettext('filterregex')), 'regex');
	$select_op->add(rcube::Q($this->plugin->gettext('filternotregex')), 'notregex');
	}
	if (in_array('relational', $this->exts)) {
	$select_op->add(rcube::Q($this->plugin->gettext('countisgreaterthan')), 'count-gt');
	$select_op->add(rcube::Q($this->plugin->gettext('countisgreaterthanequal')), 'count-ge');
	$select_op->add(rcube::Q($this->plugin->gettext('countislessthan')), 'count-lt');
	$select_op->add(rcube::Q($this->plugin->gettext('countislessthanequal')), 'count-le');
	$select_op->add(rcube::Q($this->plugin->gettext('countequals')), 'count-eq');
	$select_op->add(rcube::Q($this->plugin->gettext('countnotequals')), 'count-ne');
	$select_op->add(rcube::Q($this->plugin->gettext('valueisgreaterthan')), 'value-gt');
	$select_op->add(rcube::Q($this->plugin->gettext('valueisgreaterthanequal')), 'value-ge');
	$select_op->add(rcube::Q($this->plugin->gettext('valueislessthan')), 'value-lt');
	$select_op->add(rcube::Q($this->plugin->gettext('valueislessthanequal')), 'value-le');
	$select_op->add(rcube::Q($this->plugin->gettext('valueequals')), 'value-eq');
	$select_op->add(rcube::Q($this->plugin->gettext('valuenotequals')), 'value-ne');
	}

	// target(s) input
	if (in_array($rule['test'], array('header', 'address', 'envelope'))) {
	$test = ($rule['not'] ? 'not' : '').($rule['type'] ? $rule['type'] : 'is');
	$target = $rule['arg2'];
	}
	else if (in_array($rule['test'], array('body', 'date', 'currentdate'))) {
	$test = ($rule['not'] ? 'not' : '').($rule['type'] ? $rule['type'] : 'is');
	$target = $rule['arg'];
	}
	else if ($rule['test'] == 'size') {
	$test = '';
	$target = '';
	if (preg_match('/^([0-9]+)(K\|M\|G)?$/', $rule['arg'], $matches)) {
	$sizetarget = $matches[1];
	$sizeitem = $matches[2];
	}
	else {
	$sizetarget = $rule['arg'];
	$sizeitem = $rule['item'];
	}
	}
	else {
	$test = ($rule['not'] ? 'not' : '').$rule['test'];
	$target = '';
	}

	// (current)date part select
	if (in_array('date', $this->exts) \|\| in_array('currentdate', $this->exts)) {
	$date_parts = array('date', 'iso8601', 'std11', 'julian', 'time',
	'year', 'month', 'day', 'hour', 'minute', 'second', 'weekday', 'zone');
	$select_dp = new html_select(array('name' => "_rule_date_part[]", 'id' => 'rule_date_part'.$id,
	'style' => in_array($rule['test'], array('currentdate', 'date')) && !preg_match('/^(notcount\|count)-/', $test) ? '' : 'display:none',
	'class' => 'datepart_selector',
	));

	foreach ($date_parts as $part) {
	$select_dp->add(rcube::Q($this->plugin->gettext($part)), $part);
	}

	$tout .= $select_dp->show($rule['test'] == 'currentdate' \|\| $rule['test'] == 'date' ? $rule['part'] : '');
	}

	$tout .= $select_op->show($test);
	$tout .= $this->list_input($id, 'rule_target', $target,
	$rule['test'] != 'size' && $rule['test'] != 'exists',
	$this->error_class($id, 'test', 'target', 'rule_target')) . "\n";

	$select_size_op = new html_select(array('name' => "_rule_size_op[]", 'id' => 'rule_size_op'.$id));
	$select_size_op->add(rcube::Q($this->plugin->gettext('filterover')), 'over');
	$select_size_op->add(rcube::Q($this->plugin->gettext('filterunder')), 'under');

	$tout .= '<div id="rule_size' .$id. '" style="display:' . ($rule['test']=='size' ? 'inline' : 'none') .'">';
	$tout .= $select_size_op->show($rule['test']=='size' ? $rule['type'] : '');
	$tout .= '<input type="text" name="_rule_size_target[]" id="rule_size_i'.$id.'" value="'.$sizetarget.'" size="10" '
	. $this->error_class($id, 'test', 'sizetarget', 'rule_size_i') .' />
	<label><input type="radio" name="_rule_size_item['.$id.']" value=""'
	. (!$sizeitem ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('B').'</label>
	<label><input type="radio" name="_rule_size_item['.$id.']" value="K"'
	. ($sizeitem=='K' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('KB').'</label>
	<label><input type="radio" name="_rule_size_item['.$id.']" value="M"'
	. ($sizeitem=='M' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('MB').'</label>
	<label><input type="radio" name="_rule_size_item['.$id.']" value="G"'
	. ($sizeitem=='G' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('GB').'</label>';
	$tout .= '</div>';

	// Advanced modifiers (address, envelope)
	$select_mod = new html_select(array('name' => "_rule_mod[]", 'id' => 'rule_mod_op'.$id,
	'onchange' => 'rule_mod_select(' .$id .')'));
	$select_mod->add(rcube::Q($this->plugin->gettext('none')), '');
	$select_mod->add(rcube::Q($this->plugin->gettext('address')), 'address');
	if (in_array('envelope', $this->exts))
	$select_mod->add(rcube::Q($this->plugin->gettext('envelope')), 'envelope');

	$select_type = new html_select(array('name' => "_rule_mod_type[]", 'id' => 'rule_mod_type'.$id));
	$select_type->add(rcube::Q($this->plugin->gettext('allparts')), 'all');
	$select_type->add(rcube::Q($this->plugin->gettext('domain')), 'domain');
	$select_type->add(rcube::Q($this->plugin->gettext('localpart')), 'localpart');
	if (in_array('subaddress', $this->exts)) {
	$select_type->add(rcube::Q($this->plugin->gettext('user')), 'user');
	$select_type->add(rcube::Q($this->plugin->gettext('detail')), 'detail');
	}

	$need_mod = !in_array($rule['test'], array('size', 'body', 'date', 'currentdate'));
	$mout = '<div id="rule_mod' .$id. '" class="adv"' . (!$need_mod ? ' style="display:none"' : '') . '>';
	$mout .= ' <span class="label">' . rcube::Q($this->plugin->gettext('modifier')) . ' </span>';
	$mout .= $select_mod->show($rule['test']);
	$mout .= ' <span id="rule_mod_type' . $id . '"';
	$mout .= ' style="display:' . (in_array($rule['test'], array('address', 'envelope')) ? 'inline' : 'none') .'">';
	$mout .= rcube::Q($this->plugin->gettext('modtype')) . ' ';
	$mout .= $select_type->show($rule['part']);
	$mout .= '</span>';
	$mout .= '</div>';

	// Advanced modifiers (body transformations)
	$select_mod = new html_select(array('name' => "_rule_trans[]", 'id' => 'rule_trans_op'.$id,
	'onchange' => 'rule_trans_select(' .$id .')'));
	$select_mod->add(rcube::Q($this->plugin->gettext('text')), 'text');
	$select_mod->add(rcube::Q($this->plugin->gettext('undecoded')), 'raw');
	$select_mod->add(rcube::Q($this->plugin->gettext('contenttype')), 'content');

	$mout .= '<div id="rule_trans' .$id. '" class="adv"' . ($rule['test'] != 'body' ? ' style="display:none"' : '') . '>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('modifier')) . '</span>';
	$mout .= $select_mod->show($rule['part']);
	$mout .= '<input type="text" name="_rule_trans_type[]" id="rule_trans_type'.$id
	. '" value="'.(is_array($rule['content']) ? implode(',', $rule['content']) : $rule['content'])
	.'" size="20"' . ($rule['part'] != 'content' ? ' style="display:none"' : '')
	. $this->error_class($id, 'test', 'part', 'rule_trans_type') .' />';
	$mout .= '</div>';

	// Advanced modifiers (body transformations)
	$select_comp = new html_select(array('name' => "_rule_comp[]", 'id' => 'rule_comp_op'.$id));
	$select_comp->add(rcube::Q($this->plugin->gettext('default')), '');
	$select_comp->add(rcube::Q($this->plugin->gettext('octet')), 'i;octet');
	$select_comp->add(rcube::Q($this->plugin->gettext('asciicasemap')), 'i;ascii-casemap');
	if (in_array('comparator-i;ascii-numeric', $this->exts)) {
	$select_comp->add(rcube::Q($this->plugin->gettext('asciinumeric')), 'i;ascii-numeric');
	}

	// Comparators
	$mout .= '<div id="rule_comp' .$id. '" class="adv"' . ($rule['test'] == 'size' ? ' style="display:none"' : '') . '>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('comparator')) . '</span>';
	$mout .= $select_comp->show($rule['comparator']);
	$mout .= '</div>';

	// Date header
	if (in_array('date', $this->exts)) {
	$mout .= '<div id="rule_date_header_div' .$id. '" class="adv"'. ($rule['test'] != 'date' ? ' style="display:none"' : '') .'>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('dateheader')) . '</span>';
	$mout .= '<input type="text" name="_rule_date_header[]" id="rule_date_header'.$id
	. '" value="'. Q($rule['test'] == 'date' ? $rule['header'] : '')
	. '" size="15"' . $this->error_class($id, 'test', 'dateheader', 'rule_date_header') .' />';
	$mout .= '</div>';
	}

	// Index
	if (in_array('index', $this->exts)) {
	$need_index = in_array($rule['test'], array('header', ', address', 'date'));
	$mout .= '<div id="rule_index_div' .$id. '" class="adv"'. (!$need_index ? ' style="display:none"' : '') .'>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('index')) . '</span>';
	$mout .= '<input type="text" name="_rule_index[]" id="rule_index'.$id
	. '" value="'. ($rule['index'] ? intval($rule['index']) : '')
	. '" size="3"' . $this->error_class($id, 'test', 'index', 'rule_index') .' />';
	$mout .= ' <input type="checkbox" name="_rule_index_last[]" id="rule_index_last'.$id
	. '" value="1"' . (!empty($rule['last']) ? ' checked="checked"' : '') . ' />'
	. '<label for="rule_index_last'.$id.'">'.rcube::Q($this->plugin->gettext('indexlast')).'</label>';
	$mout .= '</div>';
	}

	// Build output table
	$out = $div ? '<div class="rulerow" id="rulerow' .$id .'">'."\n" : '';
	$out .= '<table><tr>';
	$out .= '<td class="advbutton">';
	$out .= '<a href="#" id="ruleadv' . $id .'" title="'. rcube::Q($this->plugin->gettext('advancedopts')). '"
	onclick="rule_adv_switch(' . $id .', this)" class="show">  </a>';
	$out .= '</td>';
	$out .= '<td class="rowactions">' . $aout . '</td>';
	$out .= '<td class="rowtargets">' . $tout . "\n";
	$out .= '<div id="rule_advanced' .$id. '" style="display:none">' . $mout . '</div>';
	$out .= '</td>';

	// add/del buttons
	$out .= '<td class="rowbuttons">';
	$out .= '<a href="#" id="ruleadd' . $id .'" title="'. rcube::Q($this->plugin->gettext('add')). '"
	onclick="rcmail.managesieve_ruleadd(' . $id .')" class="button add"></a>';
	$out .= '<a href="#" id="ruledel' . $id .'" title="'. rcube::Q($this->plugin->gettext('del')). '"
	onclick="rcmail.managesieve_ruledel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
	$out .= '</td>';
	$out .= '</tr></table>';

	$out .= $div ? "</div>\n" : '';

	return $out;
	}

	function action_div($fid, $id, $div=true)
	{
	$action = isset($this->form) ? $this->form['actions'][$id] : $this->script[$fid]['actions'][$id];
	$rows_num = isset($this->form) ? sizeof($this->form['actions']) : sizeof($this->script[$fid]['actions']);

	$out = $div ? '<div class="actionrow" id="actionrow' .$id .'">'."\n" : '';

	$out .= '<table><tr><td class="rowactions">';

	// action select
	$select_action = new html_select(array('name' => "_action_type[$id]", 'id' => 'action_type'.$id,
	'onchange' => 'action_type_select(' .$id .')'));
	if (in_array('fileinto', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagemoveto')), 'fileinto');
	if (in_array('fileinto', $this->exts) && in_array('copy', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagecopyto')), 'fileinto_copy');
	$select_action->add(rcube::Q($this->plugin->gettext('messageredirect')), 'redirect');
	if (in_array('copy', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagesendcopy')), 'redirect_copy');
	if (in_array('reject', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagediscard')), 'reject');
	else if (in_array('ereject', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagediscard')), 'ereject');
	if (in_array('vacation', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagereply')), 'vacation');
	$select_action->add(rcube::Q($this->plugin->gettext('messagedelete')), 'discard');
	if (in_array('imapflags', $this->exts) \|\| in_array('imap4flags', $this->exts)) {
	$select_action->add(rcube::Q($this->plugin->gettext('setflags')), 'setflag');
	$select_action->add(rcube::Q($this->plugin->gettext('addflags')), 'addflag');
	$select_action->add(rcube::Q($this->plugin->gettext('removeflags')), 'removeflag');
	}
	if (in_array('variables', $this->exts)) {
	$select_action->add(rcube::Q($this->plugin->gettext('setvariable')), 'set');
	}
	if (in_array('enotify', $this->exts) \|\| in_array('notify', $this->exts)) {
	$select_action->add(rcube::Q($this->plugin->gettext('notify')), 'notify');
	}
	$select_action->add(rcube::Q($this->plugin->gettext('messagekeep')), 'keep');
	$select_action->add(rcube::Q($this->plugin->gettext('rulestop')), 'stop');

	$select_type = $action['type'];
	if (in_array($action['type'], array('fileinto', 'redirect')) && $action['copy']) {
	$select_type .= '_copy';
	}

	$out .= $select_action->show($select_type);
	$out .= '</td>';

	// actions target inputs
	$out .= '<td class="rowtargets">';

	// force domain selection in redirect email input
	$domains = (array) $this->rc->config->get('managesieve_domains');
	if (!empty($domains)) {
	sort($domains);

	$domain_select = new html_select(array('name' => "_action_target_domain[$id]", 'id' => 'action_target_domain'.$id));
	$domain_select->add(array_combine($domains, $domains));

	if ($action['type'] == 'redirect') {
	$parts = explode('@', $action['target']);
	if (!empty($parts)) {
	$action['domain'] = array_pop($parts);
	$action['target'] = implode('@', $parts);
	}
	}
	}

	// redirect target
	$out .= '<span id="redirect_target' . $id . '" style="white-space:nowrap;'
	. ' display:' . ($action['type'] == 'redirect' ? 'inline' : 'none') . '">'
	. '<input type="text" name="_action_target['.$id.']" id="action_target' .$id. '"'
	. ' value="' .($action['type'] == 'redirect' ? rcube::Q($action['target'], 'strict', false) : '') . '"'
	. (!empty($domains) ? ' size="20"' : ' size="35"')
	. $this->error_class($id, 'action', 'target', 'action_target') .' />'
	. (!empty($domains) ? ' @ ' . $domain_select->show($action['domain']) : '')
	. '</span>';

	// (e)reject target
	$out .= '<textarea name="_action_target_area['.$id.']" id="action_target_area' .$id. '" '
	.'rows="3" cols="35" '. $this->error_class($id, 'action', 'targetarea', 'action_target_area')
	.'style="display:' .(in_array($action['type'], array('reject', 'ereject')) ? 'inline' : 'none') .'">'
	. (in_array($action['type'], array('reject', 'ereject')) ? rcube::Q($action['target'], 'strict', false) : '')
	. "</textarea>\n";

	// vacation
	$vsec = in_array('vacation-seconds', $this->exts);
	$out .= '<div id="action_vacation' .$id.'" style="display:' .($action['type']=='vacation' ? 'inline' : 'none') .'">';
	$out .= '<span class="label">'. rcube::Q($this->plugin->gettext('vacationreason')) .'</span><br />'
	.'<textarea name="_action_reason['.$id.']" id="action_reason' .$id. '" '
	.'rows="3" cols="35" '. $this->error_class($id, 'action', 'reason', 'action_reason') . '>'
	. Q($action['reason'], 'strict', false) . "</textarea>\n";
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('vacationsubject')) . '</span><br />'
	.'<input type="text" name="_action_subject['.$id.']" id="action_subject'.$id.'" '
	.'value="' . (is_array($action['subject']) ? rcube::Q(implode(', ', $action['subject']), 'strict', false) : $action['subject']) . '" size="35" '
	. $this->error_class($id, 'action', 'subject', 'action_subject') .' />';
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('vacationaddr')) . '</span><br />'
	. $this->list_input($id, 'action_addresses', $action['addresses'], true,
	$this->error_class($id, 'action', 'addresses', 'action_addresses'), 30);
	$out .= '<br /><span class="label">' . rcube::Q($this->plugin->gettext($vsec ? 'vacationinterval' : 'vacationdays')) . '</span><br />'
	.'<input type="text" name="_action_interval['.$id.']" id="action_interval'.$id.'" '
	.'value="' .rcube::Q(isset($action['seconds']) ? $action['seconds'] : $action['days'], 'strict', false) . '" size="2" '
	. $this->error_class($id, 'action', 'interval', 'action_interval') .' />';
	if ($vsec) {
	$out .= ' <label><input type="radio" name="_action_interval_type['.$id.']" value="days"'
	. (!isset($action['seconds']) ? ' checked="checked"' : '') .' class="radio" />'.$this->plugin->gettext('days').'</label>'
	. ' <label><input type="radio" name="_action_interval_type['.$id.']" value="seconds"'
	. (isset($action['seconds']) ? ' checked="checked"' : '') .' class="radio" />'.$this->plugin->gettext('seconds').'</label>';
	}
	$out .= '</div>';

	// flags
	$flags = array(
	'read' => '\\Seen',
	'answered' => '\\Answered',
	'flagged' => '\\Flagged',
	'deleted' => '\\Deleted',
	'draft' => '\\Draft',
	);
	$flags_target = (array)$action['target'];

	$out .= '<div id="action_flags' .$id.'" style="display:'
	. (preg_match('/^(set\|add\|remove)flag$/', $action['type']) ? 'inline' : 'none') . '"'
	. $this->error_class($id, 'action', 'flags', 'action_flags') . '>';
	foreach ($flags as $fidx => $flag) {
	$out .= '<input type="checkbox" name="_action_flags[' .$id .'][]" value="' . $flag . '"'
	. (in_array_nocase($flag, $flags_target) ? 'checked="checked"' : '') . ' />'
	. rcube::Q($this->plugin->gettext('flag'.$fidx)) .'<br>';
	}
	$out .= '</div>';

	// set variable
	$set_modifiers = array(
	'lower',
	'upper',
	'lowerfirst',
	'upperfirst',
	'quotewildcard',
	'length'
	);

	$out .= '<div id="action_set' .$id.'" style="display:' .($action['type']=='set' ? 'inline' : 'none') .'">';
	$out .= '<span class="label">' .rcube::Q($this->plugin->gettext('setvarname')) . '</span><br />'
	.'<input type="text" name="_action_varname['.$id.']" id="action_varname'.$id.'" '
	.'value="' . rcube::Q($action['name']) . '" size="35" '
	. $this->error_class($id, 'action', 'name', 'action_varname') .' />';
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('setvarvalue')) . '</span><br />'
	.'<input type="text" name="_action_varvalue['.$id.']" id="action_varvalue'.$id.'" '
	.'value="' . rcube::Q($action['value']) . '" size="35" '
	. $this->error_class($id, 'action', 'value', 'action_varvalue') .' />';
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('setvarmodifiers')) . '</span><br />';
	foreach ($set_modifiers as $s_m) {
	$s_m_id = 'action_varmods' . $id . $s_m;
	$out .= sprintf('<input type="checkbox" name="_action_varmods[%s][]" value="%s" id="%s"%s />%s<br>',
	$id, $s_m, $s_m_id,
	(array_key_exists($s_m, (array)$action) && $action[$s_m] ? ' checked="checked"' : ''),
	rcube::Q($this->plugin->gettext('var' . $s_m)));
	}
	$out .= '</div>';

	// notify
	$notify_methods = (array) $this->rc->config->get('managesieve_notify_methods');
	$importance_options = $this->notify_importance_options;

	if (empty($notify_methods)) {
	$notify_methods = $this->notify_methods;
	}

	list($method, $target) = explode(':', $action['method'], 2);
	$method = strtolower($method);

	if ($method && !in_array($method, $notify_methods)) {
	$notify_methods[] = $method;
	}

	$select_method = new html_select(array(
	'name' => "_action_notifymethod[$id]",
	'id' => "_action_notifymethod$id",
	'class' => $this->error_class($id, 'action', 'method', 'action_notifymethod'),
	));
	foreach ($notify_methods as $m_n) {
	$select_method->add(rcube::Q($this->rc->text_exists('managesieve.notifymethod'.$m_n) ? $this->plugin->gettext('managesieve.notifymethod'.$m_n) : $m_n), $m_n);
	}

	$select_importance = new html_select(array(
	'name' => "_action_notifyimportance[$id]",
	'id' => "_action_notifyimportance$id",
	'class' => $this->error_class($id, 'action', 'importance', 'action_notifyimportance')
	));
	foreach ($importance_options as $io_v => $io_n) {
	$select_importance->add(rcube::Q($this->plugin->gettext($io_n)), $io_v);
	}

	// @TODO: nice UI for mailto: (other methods too) URI parameters
	$out .= '<div id="action_notify' .$id.'" style="display:' .($action['type'] == 'notify' ? 'inline' : 'none') .'">';
	$out .= '<span class="label">' .rcube::Q($this->plugin->gettext('notifytarget')) . '</span><br />'
	. $select_method->show($method)
	.'<input type="text" name="_action_notifytarget['.$id.']" id="action_notifytarget'.$id.'" '
	.'value="' . rcube::Q($target) . '" size="25" '
	. $this->error_class($id, 'action', 'target', 'action_notifytarget') .' />';
	$out .= '<br /><span class="label">'. rcube::Q($this->plugin->gettext('notifymessage')) .'</span><br />'
	.'<textarea name="_action_notifymessage['.$id.']" id="action_notifymessage' .$id. '" '
	.'rows="3" cols="35" '. $this->error_class($id, 'action', 'message', 'action_notifymessage') . '>'
	. rcube::Q($action['message'], 'strict', false) . "</textarea>\n";
	if (in_array('enotify', $this->exts)) {
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('notifyfrom')) . '</span><br />'
	.'<input type="text" name="_action_notifyfrom['.$id.']" id="action_notifyfrom'.$id.'" '
	.'value="' . rcube::Q($action['from']) . '" size="35" '
	. $this->error_class($id, 'action', 'from', 'action_notifyfrom') .' />';
	}
	$out .= '<br /><span class="label">' . rcube::Q($this->plugin->gettext('notifyimportance')) . '</span><br />';
	$out .= $select_importance->show($action['importance'] ? (int) $action['importance'] : 2);
	$out .= '<div id="action_notifyoption_div' . $id . '">'
	.'<span class="label">' . rcube::Q($this->plugin->gettext('notifyoptions')) . '</span><br />'
	.$this->list_input($id, 'action_notifyoption', (array)$action['options'], true,
	$this->error_class($id, 'action', 'options', 'action_notifyoption'), 30) . '</div>';
	$out .= '</div>';

	// mailbox select
	if ($action['type'] == 'fileinto') {
	$mailbox = $this->mod_mailbox($action['target'], 'out');
	// make sure non-existing (or unsubscribed) mailbox is listed (#1489956)
	$additional = array($mailbox);
	}
	else {
	$mailbox = '';
	}

	$select = $this->rc->folder_selector(array(
	'realnames' => false,
	'maxlength' => 100,
	'id' => 'action_mailbox' . $id,
	'name' => "_action_mailbox[$id]",
	'style' => 'display:'.(empty($action['type']) \|\| $action['type'] == 'fileinto' ? 'inline' : 'none'),
	'additional' => $additional,
	));
	$out .= $select->show($mailbox);
	$out .= '</td>';

	// add/del buttons
	$out .= '<td class="rowbuttons">';
	$out .= '<a href="#" id="actionadd' . $id .'" title="'. rcube::Q($this->plugin->gettext('add')). '"
	onclick="rcmail.managesieve_actionadd(' . $id .')" class="button add"></a>';
	$out .= '<a href="#" id="actiondel' . $id .'" title="'. rcube::Q($this->plugin->gettext('del')). '"
	onclick="rcmail.managesieve_actiondel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
	$out .= '</td>';

	$out .= '</tr></table>';

	$out .= $div ? "</div>\n" : '';

	return $out;
	}

	protected function genid()
	{
	return preg_replace('/[^0-9]/', '', microtime(true));
	}

	protected function strip_value($str, $allow_html = false, $trim = true)
	{
	if (is_array($str)) {
	foreach ($str as $idx => $val) {
	$val = $this->strip_value($val, $allow_html, $trim);

	if ($val === '') {
	unset($str[$idx]);
	}
	}

	return $str;
	}

	if (!$allow_html) {
	$str = strip_tags($str);
	}

	return $trim ? trim($str) : $str;
	}

	protected function error_class($id, $type, $target, $elem_prefix='')
	{
	// TODO: tooltips
	if (($type == 'test' && ($str = $this->errors['tests'][$id][$target])) \|\|
	($type == 'action' && ($str = $this->errors['actions'][$id][$target]))
	) {
	$this->add_tip($elem_prefix.$id, $str, true);
	return ' class="error"';
	}

	return '';
	}

	protected function add_tip($id, $str, $error=false)
	{
	if ($error)
	$str = html::span('sieve error', $str);

	$this->tips[] = array($id, $str);
	}

	protected function print_tips()
	{
	if (empty($this->tips))
	return;

	$script = rcmail_output::JS_OBJECT_NAME.'.managesieve_tip_register('.json_encode($this->tips).');';
	$this->rc->output->add_script($script, 'foot');
	}

	protected function list_input($id, $name, $value, $enabled, $class, $size=null)
	{
	$value = (array) $value;
	$value = array_map(array('rcube', 'Q'), $value);
	$value = implode("\n", $value);

	return '<textarea data-type="list" name="_' . $name . '['.$id.']" id="' . $name.$id . '"'
	. ($enabled ? '' : ' disabled="disabled"')
	. ($size ? ' data-size="'.$size.'"' : '')
	. $class
	. ' style="display:none">' . $value . '</textarea>';
	}

	/**
	* Validate input for date part elements
	*/
	protected function validate_date_part($type, $value)
	{
	// we do simple validation of date/part format
	switch ($type) {
	case 'date': // yyyy-mm-dd
	return preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $value);
	case 'iso8601':
	return preg_match('/^[0-9: .,ZWT+-]+$/', $value);
	case 'std11':
	return preg_match('/^((Sun\|Mon\|Tue\|Wed\|Thu\|Fri\|Sat),\s+)?[0-9]{1,2}\s+'
	. '(Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec)\s+[0-9]{2,4}\s+'
	. '[0-9]{2}:[0-9]{2}(:[0-9]{2})?\s+([+-]*[0-9]{4}\|[A-Z]{1,3})$', $value);
	case 'julian':
	return preg_match('/^[0-9]+$/', $value);
	case 'time': // hh:mm:ss
	return preg_match('/^[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $value);
	case 'year':
	return preg_match('/^[0-9]{4}$/', $value);
	case 'month':
	return preg_match('/^[0-9]{2}$/', $value) && $value > 0 && $value < 13;
	case 'day':
	return preg_match('/^[0-9]{2}$/', $value) && $value > 0 && $value < 32;
	case 'hour':
	return preg_match('/^[0-9]{2}$/', $value) && $value < 24;
	case 'minute':
	return preg_match('/^[0-9]{2}$/', $value) && $value < 60;
	case 'second':
	// According to RFC5260, seconds can be from 00 to 60
	return preg_match('/^[0-9]{2}$/', $value) && $value < 61;
	case 'weekday':
	return preg_match('/^[0-9]$/', $value) && $value < 7;
	case 'zone':
	return preg_match('/^[+-][0-9]{4}$/', $value);
	}
	}

	/**
	* Converts mailbox name from/to UTF7-IMAP from/to internal Sieve encoding
	* with delimiter replacement.
	*
	* @param string $mailbox Mailbox name
	* @param string $mode Conversion direction ('in'\|'out')
	*
	* @return string Mailbox name
	*/
	protected function mod_mailbox($mailbox, $mode = 'out')
	{
	$delimiter = $_SESSION['imap_delimiter'];
	$replace_delimiter = $this->rc->config->get('managesieve_replace_delimiter');
	$mbox_encoding = $this->rc->config->get('managesieve_mbox_encoding', 'UTF7-IMAP');

	if ($mode == 'out') {
	$mailbox = rcube_charset::convert($mailbox, $mbox_encoding, 'UTF7-IMAP');
	if ($replace_delimiter && $replace_delimiter != $delimiter)
	$mailbox = str_replace($replace_delimiter, $delimiter, $mailbox);
	}
	else {
	$mailbox = rcube_charset::convert($mailbox, 'UTF7-IMAP', $mbox_encoding);
	if ($replace_delimiter && $replace_delimiter != $delimiter)
	$mailbox = str_replace($delimiter, $replace_delimiter, $mailbox);
	}

	return $mailbox;
	}

	/**
	* List sieve scripts
	*
	* @return array Scripts list
	*/
	public function list_scripts()
	{
	if ($this->list !== null) {
	return $this->list;
	}

	$this->list = $this->sieve->get_scripts();

	// Handle active script(s) and list of scripts according to Kolab's KEP:14
	if ($this->rc->config->get('managesieve_kolab_master')) {

	// Skip protected names
	foreach ((array)$this->list as $idx => $name) {
	$_name = strtoupper($name);
	if ($_name == 'MASTER')
	$master_script = $name;
	else if ($_name == 'MANAGEMENT')
	$management_script = $name;
	else if($_name == 'USER')
	$user_script = $name;
	else
	continue;

	unset($this->list[$idx]);
	}

	// get active script(s), read USER script
	if ($user_script) {
	$extension = $this->rc->config->get('managesieve_filename_extension', '.sieve');
	$filename_regex = '/'.preg_quote($extension, '/').'$/';
	$_SESSION['managesieve_user_script'] = $user_script;

	$this->sieve->load($user_script);

	foreach ($this->sieve->script->as_array() as $rules) {
	foreach ($rules['actions'] as $action) {
	if ($action['type'] == 'include' && empty($action['global'])) {
	$name = preg_replace($filename_regex, '', $action['target']);
	$this->active[] = $name;
	}
	}
	}
	}
	// create USER script if it doesn't exist
	else {
	$content = "# USER Management Script\n"
	."#\n"
	."# This script includes the various active sieve scripts\n"
	."# it is AUTOMATICALLY GENERATED. DO NOT EDIT MANUALLY!\n"
	."#\n"
	."# For more information, see http://wiki.kolab.org/KEP:14#USER\n"
	."#\n";
	if ($this->sieve->save_script('USER', $content)) {
	$_SESSION['managesieve_user_script'] = 'USER';
	if (empty($this->master_file))
	$this->sieve->activate('USER');
	}
	}
	}
	else if (!empty($this->list)) {
	// Get active script name
	if ($active = $this->sieve->get_active()) {
	$this->active = array($active);
	}

	// Hide scripts from config
	$exceptions = $this->rc->config->get('managesieve_filename_exceptions');
	if (!empty($exceptions)) {
	$this->list = array_diff($this->list, (array)$exceptions);
	}
	}

	return $this->list;
	}

	/**
	* Removes sieve script
	*
	* @param string $name Script name
	*
	* @return bool True on success, False on failure
	*/
	public function remove_script($name)
	{
	$result = $this->sieve->remove($name);

	// Kolab's KEP:14
	if ($result && $this->rc->config->get('managesieve_kolab_master')) {
	$this->deactivate_script($name);
	}

	return $result;
	}

	/**
	* Activates sieve script
	*
	* @param string $name Script name
	*
	* @return bool True on success, False on failure
	*/
	public function activate_script($name)
	{
	// Kolab's KEP:14
	if ($this->rc->config->get('managesieve_kolab_master')) {
	$extension = $this->rc->config->get('managesieve_filename_extension', '.sieve');
	$user_script = $_SESSION['managesieve_user_script'];

	// if the script is not active...
	if ($user_script && array_search($name, $this->active) === false) {
	// ...rewrite USER file adding appropriate include command
	if ($this->sieve->load($user_script)) {
	$script = $this->sieve->script->as_array();
	$list = array();
	$regexp = '/' . preg_quote($extension, '/') . '$/';

	// Create new include entry
	$rule = array(
	'actions' => array(
	0 => array(
	'target' => $name.$extension,
	'type' => 'include',
	'personal' => true,
	)));

	// get all active scripts for sorting
	foreach ($script as $rid => $rules) {
	foreach ($rules['actions'] as $action) {
	if ($action['type'] == 'include' && empty($action['global'])) {
	$target = $extension ? preg_replace($regexp, '', $action['target']) : $action['target'];
	$list[] = $target;
	}
	}
	}
	$list[] = $name;

	// Sort and find current script position
	asort($list, SORT_LOCALE_STRING);
	$list = array_values($list);
	$index = array_search($name, $list);

	// add rule at the end of the script
	if ($index === false \|\| $index == count($list)-1) {
	$this->sieve->script->add_rule($rule);
	}
	// add rule at index position
	else {
	$script2 = array();
	foreach ($script as $rid => $rules) {
	if ($rid == $index) {
	$script2[] = $rule;
	}
	$script2[] = $rules;
	}
	$this->sieve->script->content = $script2;
	}

	$result = $this->sieve->save();
	if ($result) {
	$this->active[] = $name;
	}
	}
	}
	}
	else {
	$result = $this->sieve->activate($name);
	if ($result)
	$this->active = array($name);
	}

	return $result;
	}

	/**
	* Deactivates sieve script
	*
	* @param string $name Script name
	*
	* @return bool True on success, False on failure
	*/
	public function deactivate_script($name)
	{
	// Kolab's KEP:14
	if ($this->rc->config->get('managesieve_kolab_master')) {
	$extension = $this->rc->config->get('managesieve_filename_extension', '.sieve');
	$user_script = $_SESSION['managesieve_user_script'];

	// if the script is active...
	if ($user_script && ($key = array_search($name, $this->active)) !== false) {
	// ...rewrite USER file removing appropriate include command
	if ($this->sieve->load($user_script)) {
	$script = $this->sieve->script->as_array();
	$name = $name.$extension;

	foreach ($script as $rid => $rules) {
	foreach ($rules['actions'] as $action) {
	if ($action['type'] == 'include' && empty($action['global'])
	&& $action['target'] == $name
	) {
	break 2;
	}
	}
	}

	// Entry found
	if ($rid < count($script)) {
	$this->sieve->script->delete_rule($rid);
	$result = $this->sieve->save();
	if ($result) {
	unset($this->active[$key]);
	}
	}
	}
	}
	}
	else {
	$result = $this->sieve->deactivate();
	if ($result)
	$this->active = array();
	}

	return $result;
	}

	/**
	* Saves current script (adding some variables)
	*/
	public function save_script($name = null)
	{
	// Kolab's KEP:14
	if ($this->rc->config->get('managesieve_kolab_master')) {
	$this->sieve->script->set_var('EDITOR', self::PROGNAME);
	$this->sieve->script->set_var('EDITOR_VERSION', self::VERSION);
	}

	return $this->sieve->save($name);
	}

	/**
	* Returns list of rules from the current script
	*
	* @return array List of rules
	*/
	public function list_rules()
	{
	$result = array();
	$i = 1;

	foreach ($this->script as $idx => $filter) {
	if ($filter['type'] != 'if') {
	continue;
	}
	$fname = $filter['name'] ? $filter['name'] : "#$i";
	$result[] = array(
	'id' => $idx,
	'name' => $fname,
	'class' => $filter['disabled'] ? 'disabled' : '',
	);
	$i++;
	}

	return $result;
	}

	/**
	* Initializes internal script data
	*/
	protected function init_script()
	{
	$this->script = $this->sieve->script->as_array();

	if (!$this->script) {
	return;
	}

	$headers = array();
	$exceptions = array('date', 'currentdate', 'size', 'body');

	// find common headers used in script, will be added to the list
	// of available (predefined) headers (#1489271)
	foreach ($this->script as $rule) {
	foreach ((array) $rule['tests'] as $test) {
	if ($test['test'] == 'header') {
	foreach ((array) $test['arg1'] as $header) {
	$lc_header = strtolower($header);

	// skip special names to not confuse UI
	if (in_array($lc_header, $exceptions)) {
	continue;
	}

	if (!isset($this->headers[$lc_header]) && !isset($headers[$lc_header])) {
	$headers[$lc_header] = $header;
	}
	}
	}
	}
	}

	ksort($headers);

	$this->headers += $headers;
	}
	}
	diff --git a/program/include/rcmail.php b/program/include/rcmail.php
	index 27ec831e6..8b47a8d6c 100644
	--- a/program/include/rcmail.php
	+++ b/program/include/rcmail.php
	@@ -1,2332 +1,2343 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcmail.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-2014, The Roundcube Dev Team \|
	\| Copyright (C) 2011-2014, Kolab Systems AG \|
	\| \|
	\| 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. \|
	\| \|
	\| PURPOSE: \|
	\| Application class providing core functions and holding \|
	\| instances of all 'global' objects like db- and imap-connections \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	/**
	* Application class of Roundcube Webmail
	* implemented as singleton
	*
	* @package Webmail
	*/
	class rcmail extends rcube
	{
	/**
	* Main tasks.
	*
	* @var array
	*/
	static public $main_tasks = array('mail','settings','addressbook','login','logout','utils','dummy');

	/**
	* Current task.
	*
	* @var string
	*/
	public $task;

	/**
	* Current action.
	*
	* @var string
	*/
	public $action = '';
	public $comm_path = './';
	public $filename = '';

	private $address_books = array();
	private $action_map = array();


	const ERROR_STORAGE = -2;
	const ERROR_INVALID_REQUEST = 1;
	const ERROR_INVALID_HOST = 2;
	const ERROR_COOKIES_DISABLED = 3;


	/**
	* This implements the 'singleton' design pattern
	*
	* @param string Environment name to run (e.g. live, dev, test)
	*
	* @return rcmail The one and only instance
	*/
	static function get_instance($env = '')
	{
	if (!self::$instance \|\| !is_a(self::$instance, 'rcmail')) {
	self::$instance = new rcmail($env);
	// init AFTER object was linked with self::$instance
	self::$instance->startup();
	}

	return self::$instance;
	}

	/**
	* Initial startup function
	* to register session, create database and imap connections
	*/
	protected function startup()
	{
	$this->init(self::INIT_WITH_DB \| self::INIT_WITH_PLUGINS);

	// set filename if not index.php
	if (($basename = basename($_SERVER['SCRIPT_FILENAME'])) && $basename != 'index.php') {
	$this->filename = $basename;
	}

	// start session
	$this->session_init();

	// create user object
	$this->set_user(new rcube_user($_SESSION['user_id']));

	// set task and action properties
	$this->set_task(rcube_utils::get_input_value('_task', rcube_utils::INPUT_GPC));
	$this->action = asciiwords(rcube_utils::get_input_value('_action', rcube_utils::INPUT_GPC));

	// reset some session parameters when changing task
	if ($this->task != 'utils') {
	// we reset list page when switching to another task
	// but only to the main task interface - empty action (#1489076, #1490116)
	// this will prevent from unintentional page reset on cross-task requests
	if ($this->session && $_SESSION['task'] != $this->task && empty($this->action)) {
	$this->session->remove('page');

	// set current task to session
	$_SESSION['task'] = $this->task;
	}
	}

	// init output class (not in CLI mode)
	if (!empty($_REQUEST['_remote'])) {
	$GLOBALS['OUTPUT'] = $this->json_init();
	}
	else if ($_SERVER['REMOTE_ADDR']) {
	$GLOBALS['OUTPUT'] = $this->load_gui(!empty($_REQUEST['_framed']));
	}

	// load plugins
	$this->plugins->init($this, $this->task);
	$this->plugins->load_plugins((array)$this->config->get('plugins', array()),
	array('filesystem_attachments', 'jqueryui'));
	}

	/**
	* Setter for application task
	*
	* @param string Task to set
	*/
	public function set_task($task)
	{
	$task = asciiwords($task, true);

	if ($this->user && $this->user->ID)
	$task = !$task ? 'mail' : $task;
	else if (php_sapi_name() == 'cli')
	$task = 'cli';
	else
	$task = 'login';

	$this->task = $task;
	$this->comm_path = $this->url(array('task' => $this->task));

	if (!empty($_REQUEST['_framed'])) {
	$this->comm_path .= '&_framed=1';
	}

	if ($this->output) {
	$this->output->set_env('task', $this->task);
	$this->output->set_env('comm_path', $this->comm_path);
	}
	}

	/**
	* Setter for system user object
	*
	* @param rcube_user Current user instance
	*/
	public function set_user($user)
	{
	parent::set_user($user);

	$lang = $this->language_prop($this->config->get('language', $_SESSION['language']));
	$_SESSION['language'] = $this->user->language = $lang;

	// set localization
	setlocale(LC_ALL, $lang . '.utf8', $lang . '.UTF-8', 'en_US.utf8', 'en_US.UTF-8');

	// workaround for http://bugs.php.net/bug.php?id=18556
	if (PHP_VERSION_ID < 50500 && in_array($lang, array('tr_TR', 'ku', 'az_AZ'))) {
	setlocale(LC_CTYPE, 'en_US.utf8', 'en_US.UTF-8');
	}
	}

	/**
	* Return instance of the internal address book class
	*
	* @param string Address book identifier (-1 for default addressbook)
	* @param boolean True if the address book needs to be writeable
	*
	* @return rcube_contacts Address book object
	*/
	public function get_address_book($id, $writeable = false)
	{
	$contacts = null;
	$ldap_config = (array)$this->config->get('ldap_public');

	// 'sql' is the alias for '0' used by autocomplete
	if ($id == 'sql')
	$id = '0';
	else if ($id == -1) {
	$id = $this->config->get('default_addressbook');
	$default = true;
	}

	// use existing instance
	if (isset($this->address_books[$id]) && ($this->address_books[$id] instanceof rcube_addressbook)) {
	$contacts = $this->address_books[$id];
	}
	else if ($id && $ldap_config[$id]) {
	$domain = $this->config->mail_domain($_SESSION['storage_host']);
	$contacts = new rcube_ldap($ldap_config[$id], $this->config->get('ldap_debug'), $domain);
	}
	else if ($id === '0') {
	$contacts = new rcube_contacts($this->db, $this->get_user_id());
	}
	else {
	$plugin = $this->plugins->exec_hook('addressbook_get', array('id' => $id, 'writeable' => $writeable));

	// plugin returned instance of a rcube_addressbook
	if ($plugin['instance'] instanceof rcube_addressbook) {
	$contacts = $plugin['instance'];
	}
	}

	// when user requested default writeable addressbook
	// we need to check if default is writeable, if not we
	// will return first writeable book (if any exist)
	if ($contacts && $default && $contacts->readonly && $writeable) {
	$contacts = null;
	}

	// Get first addressbook from the list if configured default doesn't exist
	// This can happen when user deleted the addressbook (e.g. Kolab folder)
	if (!$contacts && (!$id \|\| $default)) {
	$source = reset($this->get_address_sources($writeable, !$default));
	if (!empty($source)) {
	$contacts = $this->get_address_book($source['id']);
	if ($contacts) {
	$id = $source['id'];
	}
	}
	}

	if (!$contacts) {
	// there's no default, just return
	if ($default) {
	return null;
	}

	self::raise_error(array(
	'code' => 700,
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Addressbook source ($id) not found!"
	),
	true, true);
	}

	// add to the 'books' array for shutdown function
	$this->address_books[$id] = $contacts;

	if ($writeable && $contacts->readonly) {
	return null;
	}

	// set configured sort order
	if ($sort_col = $this->config->get('addressbook_sort_col')) {
	$contacts->set_sort_order($sort_col);
	}

	return $contacts;
	}

	/**
	* Return identifier of the address book object
	*
	* @param rcube_addressbook Addressbook source object
	*
	* @return string Source identifier
	*/
	public function get_address_book_id($object)
	{
	foreach ($this->address_books as $index => $book) {
	if ($book === $object) {
	return $index;
	}
	}
	}

	/**
	* Return address books list
	*
	* @param boolean True if the address book needs to be writeable
	* @param boolean True if the address book needs to be not hidden
	*
	* @return array Address books array
	*/
	public function get_address_sources($writeable = false, $skip_hidden = false)
	{
	$abook_type = (string) $this->config->get('address_book_type');
	$ldap_config = (array) $this->config->get('ldap_public');
	$autocomplete = (array) $this->config->get('autocomplete_addressbooks');
	$list = array();

	// We are using the DB address book or a plugin address book
	if (!empty($abook_type) && strtolower($abook_type) != 'ldap') {
	if (!isset($this->address_books['0'])) {
	$this->address_books['0'] = new rcube_contacts($this->db, $this->get_user_id());
	}

	$list['0'] = array(
	'id' => '0',
	'name' => $this->gettext('personaladrbook'),
	'groups' => $this->address_books['0']->groups,
	'readonly' => $this->address_books['0']->readonly,
	'undelete' => $this->address_books['0']->undelete && $this->config->get('undo_timeout'),
	'autocomplete' => in_array('sql', $autocomplete),
	);
	}

	if (!empty($ldap_config)) {
	foreach ($ldap_config as $id => $prop) {
	// handle misconfiguration
	if (empty($prop) \|\| !is_array($prop)) {
	continue;
	}

	$list[$id] = array(
	'id' => $id,
	'name' => html::quote($prop['name']),
	'groups' => !empty($prop['groups']) \|\| !empty($prop['group_filters']),
	'readonly' => !$prop['writable'],
	'hidden' => $prop['hidden'],
	'autocomplete' => in_array($id, $autocomplete)
	);
	}
	}

	$plugin = $this->plugins->exec_hook('addressbooks_list', array('sources' => $list));
	$list = $plugin['sources'];

	foreach ($list as $idx => $item) {
	// register source for shutdown function
	if (!is_object($this->address_books[$item['id']])) {
	$this->address_books[$item['id']] = $item;
	}
	// remove from list if not writeable as requested
	if ($writeable && $item['readonly']) {
	unset($list[$idx]);
	}
	// remove from list if hidden as requested
	else if ($skip_hidden && $item['hidden']) {
	unset($list[$idx]);
	}
	}

	return $list;
	}

	/**
	* Getter for compose responses.
	* These are stored in local config and user preferences.
	*
	* @param boolean True to sort the list alphabetically
	* @param boolean True if only this user's responses shall be listed
	*
	* @return array List of the current user's stored responses
	*/
	public function get_compose_responses($sorted = false, $user_only = false)
	{
	$responses = array();

	if (!$user_only) {
	foreach ($this->config->get('compose_responses_static', array()) as $response) {
	if (empty($response['key'])) {
	$response['key'] = substr(md5($response['name']), 0, 16);
	}

	$response['static'] = true;
	$response['class'] = 'readonly';

	$k = $sorted ? '0000-' . strtolower($response['name']) : $response['key'];
	$responses[$k] = $response;
	}
	}

	foreach ($this->config->get('compose_responses', array()) as $response) {
	if (empty($response['key'])) {
	$response['key'] = substr(md5($response['name']), 0, 16);
	}

	$k = $sorted ? strtolower($response['name']) : $response['key'];
	$responses[$k] = $response;
	}

	// sort list by name
	if ($sorted) {
	ksort($responses, SORT_LOCALE_STRING);
	}

	return array_values($responses);
	}

	/**
	* Init output object for GUI and add common scripts.
	* This will instantiate a rcmail_output_html object and set
	* environment vars according to the current session and configuration
	*
	* @param boolean True if this request is loaded in a (i)frame
	*
	* @return rcube_output Reference to HTML output object
	*/
	public function load_gui($framed = false)
	{
	// init output page
	if (!($this->output instanceof rcmail_output_html)) {
	$this->output = new rcmail_output_html($this->task, $framed);
	}

	// set refresh interval
	$this->output->set_env('refresh_interval', $this->config->get('refresh_interval', 0));
	$this->output->set_env('session_lifetime', $this->config->get('session_lifetime', 0) * 60);

	if ($framed) {
	$this->comm_path .= '&_framed=1';
	$this->output->set_env('framed', true);
	}

	$this->output->set_env('task', $this->task);
	$this->output->set_env('action', $this->action);
	$this->output->set_env('comm_path', $this->comm_path);
	$this->output->set_charset(RCUBE_CHARSET);

	if ($this->user && $this->user->ID) {
	$this->output->set_env('user_id', $this->user->get_hash());
	}

	// set compose mode for all tasks (message compose step can be triggered from everywhere)
	$this->output->set_env('compose_extwin', $this->config->get('compose_extwin',false));

	// add some basic labels to client
	$this->output->add_label('loading', 'servererror', 'connerror', 'requesttimedout',
	'refreshing', 'windowopenerror', 'uploadingmany');

	return $this->output;
	}

	/**
	* Create an output object for JSON responses
	*
	* @return rcube_output Reference to JSON output object
	*/
	public function json_init()
	{
	if (!($this->output instanceof rcmail_output_json)) {
	$this->output = new rcmail_output_json($this->task);
	}

	return $this->output;
	}

	/**
	* Create session object and start the session.
	*/
	public function session_init()
	{
	parent::session_init();

	// set initial session vars
	if (!$_SESSION['user_id']) {
	$_SESSION['temp'] = true;
	}

	// restore skin selection after logout
	if ($_SESSION['temp'] && !empty($_SESSION['skin'])) {
	$this->config->set('skin', $_SESSION['skin']);
	}
	}

	/**
	* Perfom login to the mail server and to the webmail service.
	* This will also create a new user entry if auto_create_user is configured.
	*
	* @param string Mail storage (IMAP) user name
	* @param string Mail storage (IMAP) password
	* @param string Mail storage (IMAP) host
	* @param bool Enables cookie check
	*
	* @return boolean True on success, False on failure
	*/
	function login($username, $pass, $host = null, $cookiecheck = false)
	{
	$this->login_error = null;

	if (empty($username)) {
	return false;
	}

	if ($cookiecheck && empty($_COOKIE)) {
	$this->login_error = self::ERROR_COOKIES_DISABLED;
	return false;
	}

	$default_host = $this->config->get('default_host');
	$default_port = $this->config->get('default_port');
	$username_domain = $this->config->get('username_domain');
	$login_lc = $this->config->get('login_lc', 2);

	// host is validated in rcmail::autoselect_host(), so here
	// we'll only handle unset host (if possible)
	if (!$host && !empty($default_host)) {
	if (is_array($default_host)) {
	list($key, $val) = each($default_host);
	$host = is_numeric($key) ? $val : $key;
	}
	else {
	$host = $default_host;
	}

	$host = rcube_utils::parse_host($host);
	}

	if (!$host) {
	$this->login_error = self::ERROR_INVALID_HOST;
	return false;
	}

	// parse $host URL
	$a_host = parse_url($host);
	if ($a_host['host']) {
	$host = $a_host['host'];
	$ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? $a_host['scheme'] : null;

	if (!empty($a_host['port']))
	$port = $a_host['port'];
	else if ($ssl && $ssl != 'tls' && (!$default_port \|\| $default_port == 143))
	$port = 993;
	}

	if (!$port) {
	$port = $default_port;
	}

	// Check if we need to add/force domain to username
	if (!empty($username_domain)) {
	$domain = is_array($username_domain) ? $username_domain[$host] : $username_domain;

	if ($domain = rcube_utils::parse_host((string)$domain, $host)) {
	$pos = strpos($username, '@');

	// force configured domains
	if ($pos !== false && $this->config->get('username_domain_forced')) {
	$username = substr($username, 0, $pos) . '@' . $domain;
	}
	// just add domain if not specified
	else if ($pos === false) {
	$username .= '@' . $domain;
	}
	}
	}

	// Convert username to lowercase. If storage backend
	// is case-insensitive we need to store always the same username (#1487113)
	if ($login_lc) {
	if ($login_lc == 2 \|\| $login_lc === true) {
	$username = mb_strtolower($username);
	}
	else if (strpos($username, '@')) {
	// lowercase domain name
	list($local, $domain) = explode('@', $username);
	$username = $local . '@' . mb_strtolower($domain);
	}
	}

	// try to resolve email address from virtuser table
	if (strpos($username, '@') && ($virtuser = rcube_user::email2user($username))) {
	$username = $virtuser;
	}

	// Here we need IDNA ASCII
	// Only rcube_contacts class is using domain names in Unicode
	$host = rcube_utils::idn_to_ascii($host);
	$username = rcube_utils::idn_to_ascii($username);

	// user already registered -> overwrite username
	if ($user = rcube_user::query($username, $host)) {
	$username = $user->data['username'];
	}

	$storage = $this->get_storage();

	// try to log in
	if (!$storage->connect($host, $username, $pass, $port, $ssl)) {
	return false;
	}

	// user already registered -> update user's record
	if (is_object($user)) {
	// update last login timestamp
	$user->touch();
	}
	// create new system user
	else if ($this->config->get('auto_create_user')) {
	if ($created = rcube_user::create($username, $host)) {
	$user = $created;
	}
	else {
	self::raise_error(array(
	'code' => 620,
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Failed to create a user record. Maybe aborted by a plugin?"
	),
	true, false);
	}
	}
	else {
	self::raise_error(array(
	'code' => 621,
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Access denied for new user $username. 'auto_create_user' is disabled"
	),
	true, false);
	}

	// login succeeded
	if (is_object($user) && $user->ID) {
	// Configure environment
	$this->set_user($user);
	$this->set_storage_prop();

	// set session vars
	$_SESSION['user_id'] = $user->ID;
	$_SESSION['username'] = $user->data['username'];
	$_SESSION['storage_host'] = $host;
	$_SESSION['storage_port'] = $port;
	$_SESSION['storage_ssl'] = $ssl;
	$_SESSION['password'] = $this->encrypt($pass);
	$_SESSION['login_time'] = time();

	if (isset($_REQUEST['_timezone']) && $_REQUEST['_timezone'] != '_default_') {
	$_SESSION['timezone'] = rcube_utils::get_input_value('_timezone', rcube_utils::INPUT_GPC);
	}

	// fix some old settings according to namespace prefix
	$this->fix_namespace_settings($user);

	// set/create special folders
	$this->set_special_folders();

	// clear all mailboxes related cache(s)
	$storage->clear_cache('mailboxes', true);

	return true;
	}

	return false;
	}

	/**
	* Returns error code of last login operation
	*
	* @return int Error code
	*/
	public function login_error()
	{
	if ($this->login_error) {
	return $this->login_error;
	}

	if ($this->storage && $this->storage->get_error_code() < -1) {
	return self::ERROR_STORAGE;
	}
	}

	/**
	* Auto-select IMAP host based on the posted login information
	*
	* @return string Selected IMAP host
	*/
	public function autoselect_host()
	{
	$default_host = $this->config->get('default_host');
	$host = null;

	if (is_array($default_host)) {
	$post_host = rcube_utils::get_input_value('_host', rcube_utils::INPUT_POST);
	$post_user = rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST);

	list(, $domain) = explode('@', $post_user);

	// direct match in default_host array
	if ($default_host[$post_host] \|\| in_array($post_host, array_values($default_host))) {
	$host = $post_host;
	}
	// try to select host by mail domain
	else if (!empty($domain)) {
	foreach ($default_host as $storage_host => $mail_domains) {
	if (is_array($mail_domains) && in_array_nocase($domain, $mail_domains)) {
	$host = $storage_host;
	break;
	}
	else if (stripos($storage_host, $domain) !== false \|\| stripos(strval($mail_domains), $domain) !== false) {
	$host = is_numeric($storage_host) ? $mail_domains : $storage_host;
	break;
	}
	}
	}

	// take the first entry if $host is still not set
	if (empty($host)) {
	list($key, $val) = each($default_host);
	$host = is_numeric($key) ? $val : $key;
	}
	}
	else if (empty($default_host)) {
	$host = rcube_utils::get_input_value('_host', rcube_utils::INPUT_POST);
	}
	else {
	$host = rcube_utils::parse_host($default_host);
	}

	return $host;
	}

	/**
	* Destroy session data and remove cookie
	*/
	public function kill_session()
	{
	$this->plugins->exec_hook('session_destroy');

	$this->session->kill();
	$_SESSION = array('language' => $this->user->language, 'temp' => true, 'skin' => $this->config->get('skin'));
	$this->user->reset();
	}

	/**
	* Do server side actions on logout
	*/
	public function logout_actions()
	{
	$storage = $this->get_storage();
	$logout_expunge = $this->config->get('logout_expunge');
	$logout_purge = $this->config->get('logout_purge');
	$trash_mbox = $this->config->get('trash_mbox');

	if ($logout_purge && !empty($trash_mbox)) {
	$storage->clear_folder($trash_mbox);
	}

	if ($logout_expunge) {
	$storage->expunge_folder('INBOX');
	}

	// Try to save unsaved user preferences
	if (!empty($_SESSION['preferences'])) {
	$this->user->save_prefs(unserialize($_SESSION['preferences']));
	}
	}

	- /**
	- * Generate a unique token to be used in a form request
	- *
	- * @return string The request token
	- */
	- public function get_request_token()
	- {
	- $sess_id = $_COOKIE[ini_get('session.name')];
	-
	- if (!$sess_id) {
	- $sess_id = session_id();
	- }
	-
	- $plugin = $this->plugins->exec_hook('request_token', array(
	- 'value' => md5('RT' . $this->get_user_id() . $this->config->get('des_key') . $sess_id)));
	-
	- return $plugin['value'];
	- }
	-
	- /**
	- * Check if the current request contains a valid token
	- *
	- * @param int Request method
	- *
	- * @return boolean True if request token is valid false if not
	- */
	- public function check_request($mode = rcube_utils::INPUT_POST)
	- {
	- $token = rcube_utils::get_input_value('_token', $mode);
	- $sess_id = $_COOKIE[ini_get('session.name')];
	-
	- return !empty($sess_id) && $token == $this->get_request_token();
	- }
	-
	/**
	* Build a valid URL to this instance of Roundcube
	*
	* @param mixed Either a string with the action or url parameters as key-value pairs
	* @param boolean Build an URL absolute to document root
	* @param boolean Create fully qualified URL including http(s):// and hostname
	+ * @param bool Return absolute URL in secure location
	*
	* @return string Valid application URL
	*/
	- public function url($p, $absolute = false, $full = false)
	+ public function url($p, $absolute = false, $full = false, $secure = false)
	{
	if (!is_array($p)) {
	if (strpos($p, 'http') === 0) {
	return $p;
	}

	$p = array('_action' => @func_get_arg(0));
	}

	$pre = array();
	$task = $p['_task'] ?: ($p['task'] ?: $this->task);
	$pre['_task'] = $task;
	unset($p['task'], $p['_task']);

	$url = $this->filename;
	$delm = '?';

	foreach (array_merge($pre, $p) as $key => $val) {
	if ($val !== '' && $val !== null) {
	$par = $key[0] == '_' ? $key : '_'.$key;
	$url .= $delm.urlencode($par).'='.urlencode($val);
	$delm = '&';
	}
	}

	+ $base_path = strval($_SERVER['REDIRECT_SCRIPT_URL'] ?: $_SERVER['SCRIPT_NAME']);
	+ $base_path = preg_replace('![^/]+$!', '', $base_path);
	+
	+ if ($secure && ($token = $this->get_secure_url_token(true))) {
	+ // add token to the url
	+ $url = $token . '/' . $url;
	+
	+ // remove old token from the path
	+ $base_path = rtrim($base_path, '/');
	+ $base_path = preg_replace('/\/[a-f0-9]{' . strlen($token) . '}$/', '', $base_path);
	+
	+ // this need to be full url to make redirects work
	+ $absolute = true;
	+ }
	+
	if ($absolute \|\| $full) {
	// add base path to this Roundcube installation
	- $base_path = preg_replace('![^/]+$!', '', strval($_SERVER['SCRIPT_NAME']));
	if ($base_path == '') $base_path = '/';
	$prefix = $base_path;

	// prepend protocol://hostname:port
	if ($full) {
	$prefix = rcube_utils::resolve_url($prefix);
	}

	$prefix = rtrim($prefix, '/') . '/';
	}
	else {
	$prefix = './';
	}

	return $prefix . $url;
	}

	/**
	* Function to be executed in script shutdown
	*/
	public function shutdown()
	{
	parent::shutdown();

	foreach ($this->address_books as $book) {
	if (is_object($book) && is_a($book, 'rcube_addressbook'))
	$book->close();
	}

	// write performance stats to logs/console
	if ($this->config->get('devel_mode') \|\| $this->config->get('performance_stats')) {
	// make sure logged numbers use unified format
	setlocale(LC_NUMERIC, 'en_US.utf8', 'en_US.UTF-8', 'en_US', 'C');

	if (function_exists('memory_get_usage'))
	$mem = $this->show_bytes(memory_get_usage());
	if (function_exists('memory_get_peak_usage'))
	$mem .= '/'.$this->show_bytes(memory_get_peak_usage());

	$log = $this->task . ($this->action ? '/'.$this->action : '') . ($mem ? " [$mem]" : '');

	if (defined('RCMAIL_START'))
	self::print_timer(RCMAIL_START, $log);
	else
	self::console($log);
	}
	}

	+ /**
	+ * CSRF attack prevention code
	+ *
	+ * @param int Request mode
	+ */
	+ public function request_security_check($mode = rcube_utils::INPUT_POST)
	+ {
	+ // don't check for valid request tokens in these actions
	+ // @TODO: get rid of this
	+ $request_check_whitelist = array('spell'=>1, 'spell_html'=>1);
	+
	+ if ($request_check_whitelist[$this->action]) {
	+ return;
	+ }
	+
	+ // check request token
	+ if (!$this->check_request($mode)) {
	+ self::raise_error(array(
	+ 'code' => 403, 'type' => 'php',
	+ 'message' => "Request security check failed"), false, true);
	+ }
	+
	+ // check referer if configured
	+ if ($this->config->get('referer_check') && !rcube_utils::check_referer()) {
	+ self::raise_error(array(
	+ 'code' => 403, 'type' => 'php',
	+ 'message' => "Referer check failed"), true, true);
	+ }
	+ }
	+
	/**
	* Registers action aliases for current task
	*
	* @param array $map Alias-to-filename hash array
	*/
	public function register_action_map($map)
	{
	if (is_array($map)) {
	foreach ($map as $idx => $val) {
	$this->action_map[$idx] = $val;
	}
	}
	}

	/**
	* Returns current action filename
	*
	* @param array $map Alias-to-filename hash array
	*/
	public function get_action_file()
	{
	if (!empty($this->action_map[$this->action])) {
	return $this->action_map[$this->action];
	}

	return strtr($this->action, '-', '_') . '.inc';
	}

	/**
	* Fixes some user preferences according to namespace handling change.
	* Old Roundcube versions were using folder names with removed namespace prefix.
	* Now we need to add the prefix on servers where personal namespace has prefix.
	*
	* @param rcube_user $user User object
	*/
	private function fix_namespace_settings($user)
	{
	$prefix = $this->storage->get_namespace('prefix');
	$prefix_len = strlen($prefix);

	if (!$prefix_len) {
	return;
	}

	if ($this->config->get('namespace_fixed')) {
	return;
	}

	$prefs = array();

	// Build namespace prefix regexp
	$ns = $this->storage->get_namespace();
	$regexp = array();

	foreach ($ns as $entry) {
	if (!empty($entry)) {
	foreach ($entry as $item) {
	if (strlen($item[0])) {
	$regexp[] = preg_quote($item[0], '/');
	}
	}
	}
	}
	$regexp = '/^('. implode('\|', $regexp).')/';

	// Fix preferences
	$opts = array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox', 'archive_mbox');
	foreach ($opts as $opt) {
	if ($value = $this->config->get($opt)) {
	if ($value != 'INBOX' && !preg_match($regexp, $value)) {
	$prefs[$opt] = $prefix.$value;
	}
	}
	}

	if (($search_mods = $this->config->get('search_mods')) && !empty($search_mods)) {
	$folders = array();
	foreach ($search_mods as $idx => $value) {
	if ($idx != 'INBOX' && $idx != '*' && !preg_match($regexp, $idx)) {
	$idx = $prefix.$idx;
	}
	$folders[$idx] = $value;
	}

	$prefs['search_mods'] = $folders;
	}

	if (($threading = $this->config->get('message_threading')) && !empty($threading)) {
	$folders = array();
	foreach ($threading as $idx => $value) {
	if ($idx != 'INBOX' && !preg_match($regexp, $idx)) {
	$idx = $prefix.$idx;
	}
	$folders[$prefix.$idx] = $value;
	}

	$prefs['message_threading'] = $folders;
	}

	if ($collapsed = $this->config->get('collapsed_folders')) {
	$folders = explode('&&', $collapsed);
	$count = count($folders);
	$folders_str = '';

	if ($count) {
	$folders[0] = substr($folders[0], 1);
	$folders[$count-1] = substr($folders[$count-1], 0, -1);
	}

	foreach ($folders as $value) {
	if ($value != 'INBOX' && !preg_match($regexp, $value)) {
	$value = $prefix.$value;
	}
	$folders_str .= '&'.$value.'&';
	}

	$prefs['collapsed_folders'] = $folders_str;
	}

	$prefs['namespace_fixed'] = true;

	// save updated preferences and reset imap settings (default folders)
	$user->save_prefs($prefs);
	$this->set_storage_prop();
	}

	/**
	* Overwrite action variable
	*
	* @param string New action value
	*/
	public function overwrite_action($action)
	{
	$this->action = $action;
	$this->output->set_env('action', $action);
	}

	/**
	* Set environment variables for specified config options
	*/
	public function set_env_config($options)
	{
	foreach ((array) $options as $option) {
	if ($this->config->get($option)) {
	$this->output->set_env($option, true);
	}
	}
	}

	/**
	* Returns RFC2822 formatted current date in user's timezone
	*
	* @return string Date
	*/
	public function user_date()
	{
	// get user's timezone
	try {
	$tz = new DateTimeZone($this->config->get('timezone'));
	$date = new DateTime('now', $tz);
	}
	catch (Exception $e) {
	$date = new DateTime();
	}

	return $date->format('r');
	}

	/**
	* Write login data (name, ID, IP address) to the 'userlogins' log file.
	*/
	public function log_login($user = null, $failed_login = false, $error_code = 0)
	{
	if (!$this->config->get('log_logins')) {
	return;
	}

	// failed login
	if ($failed_login) {
	$message = sprintf('Failed login for %s from %s in session %s (error: %d)',
	$user, rcube_utils::remote_ip(), session_id(), $error_code);
	}
	// successful login
	else {
	$user_name = $this->get_user_name();
	$user_id = $this->get_user_id();

	if (!$user_id) {
	return;
	}

	$message = sprintf('Successful login for %s (ID: %d) from %s in session %s',
	$user_name, $user_id, rcube_utils::remote_ip(), session_id());
	}

	// log login
	self::write_log('userlogins', $message);
	}

	/**
	* Create a HTML table based on the given data
	*
	* @param array Named table attributes
	* @param mixed Table row data. Either a two-dimensional array or a valid SQL result set
	* @param array List of cols to show
	* @param string Name of the identifier col
	*
	* @return string HTML table code
	*/
	public function table_output($attrib, $table_data, $a_show_cols, $id_col)
	{
	$table = new html_table($attrib);

	// add table header
	if (!$attrib['noheader']) {
	foreach ($a_show_cols as $col) {
	$table->add_header($col, $this->Q($this->gettext($col)));
	}
	}

	if (!is_array($table_data)) {
	$db = $this->get_dbh();
	while ($table_data && ($sql_arr = $db->fetch_assoc($table_data))) {
	$table->add_row(array('id' => 'rcmrow' . rcube_utils::html_identifier($sql_arr[$id_col])));

	// format each col
	foreach ($a_show_cols as $col) {
	$table->add($col, $this->Q($sql_arr[$col]));
	}
	}
	}
	else {
	foreach ($table_data as $row_data) {
	$class = !empty($row_data['class']) ? $row_data['class'] : null;
	if (!empty($attrib['rowclass']))
	$class = trim($class . ' ' . $attrib['rowclass']);
	$rowid = 'rcmrow' . rcube_utils::html_identifier($row_data[$id_col]);

	$table->add_row(array('id' => $rowid, 'class' => $class));

	// format each col
	foreach ($a_show_cols as $col) {
	$val = is_array($row_data[$col]) ? $row_data[$col][0] : $row_data[$col];
	$table->add($col, empty($attrib['ishtml']) ? $this->Q($val) : $val);
	}
	}
	}

	return $table->show($attrib);
	}

	/**
	* Convert the given date to a human readable form
	* This uses the date formatting properties from config
	*
	* @param mixed Date representation (string, timestamp or DateTime object)
	* @param string Date format to use
	* @param bool Enables date convertion according to user timezone
	*
	* @return string Formatted date string
	*/
	public function format_date($date, $format = null, $convert = true)
	{
	if (is_object($date) && is_a($date, 'DateTime')) {
	$timestamp = $date->format('U');
	}
	else {
	if (!empty($date)) {
	$timestamp = rcube_utils::strtotime($date);
	}

	if (empty($timestamp)) {
	return '';
	}

	try {
	$date = new DateTime("@".$timestamp);
	}
	catch (Exception $e) {
	return '';
	}
	}

	if ($convert) {
	try {
	// convert to the right timezone
	$stz = date_default_timezone_get();
	$tz = new DateTimeZone($this->config->get('timezone'));
	$date->setTimezone($tz);
	date_default_timezone_set($tz->getName());

	$timestamp = $date->format('U');
	}
	catch (Exception $e) {
	}
	}

	// define date format depending on current time
	if (!$format) {
	$now = time();
	$now_date = getdate($now);
	$today_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday'], $now_date['year']);
	$week_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday']-6, $now_date['year']);
	$pretty_date = $this->config->get('prettydate');

	if ($pretty_date && $timestamp > $today_limit && $timestamp <= $now) {
	$format = $this->config->get('date_today', $this->config->get('time_format', 'H:i'));
	$today = true;
	}
	else if ($pretty_date && $timestamp > $week_limit && $timestamp <= $now) {
	$format = $this->config->get('date_short', 'D H:i');
	}
	else {
	$format = $this->config->get('date_long', 'Y-m-d H:i');
	}
	}

	// strftime() format
	if (preg_match('/%[a-z]+/i', $format)) {
	$format = strftime($format, $timestamp);
	if ($stz) {
	date_default_timezone_set($stz);
	}
	return $today ? ($this->gettext('today') . ' ' . $format) : $format;
	}

	// parse format string manually in order to provide localized weekday and month names
	// an alternative would be to convert the date() format string to fit with strftime()
	$out = '';
	for ($i=0; $i<strlen($format); $i++) {
	if ($format[$i] == "\\") { // skip escape chars
	continue;
	}

	// write char "as-is"
	if ($format[$i] == ' ' \|\| $format[$i-1] == "\\") {
	$out .= $format[$i];
	}
	// weekday (short)
	else if ($format[$i] == 'D') {
	$out .= $this->gettext(strtolower(date('D', $timestamp)));
	}
	// weekday long
	else if ($format[$i] == 'l') {
	$out .= $this->gettext(strtolower(date('l', $timestamp)));
	}
	// month name (short)
	else if ($format[$i] == 'M') {
	$out .= $this->gettext(strtolower(date('M', $timestamp)));
	}
	// month name (long)
	else if ($format[$i] == 'F') {
	$out .= $this->gettext('long'.strtolower(date('M', $timestamp)));
	}
	else if ($format[$i] == 'x') {
	$out .= strftime('%x %X', $timestamp);
	}
	else {
	$out .= date($format[$i], $timestamp);
	}
	}

	if ($today) {
	$label = $this->gettext('today');
	// replcae $ character with "Today" label (#1486120)
	if (strpos($out, '$') !== false) {
	$out = preg_replace('/\$/', $label, $out, 1);
	}
	else {
	$out = $label . ' ' . $out;
	}
	}

	if ($stz) {
	date_default_timezone_set($stz);
	}

	return $out;
	}

	/**
	* Return folders list in HTML
	*
	* @param array $attrib Named parameters
	*
	* @return string HTML code for the gui object
	*/
	public function folder_list($attrib)
	{
	static $a_mailboxes;

	$attrib += array('maxlength' => 100, 'realnames' => false, 'unreadwrap' => ' (%s)');

	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();

	// add some labels to client
	$rcmail->output->add_label('purgefolderconfirm', 'deletemessagesconfirm');

	$type = $attrib['type'] ? $attrib['type'] : 'ul';
	unset($attrib['type']);

	if ($type == 'ul' && !$attrib['id']) {
	$attrib['id'] = 'rcmboxlist';
	}

	if (empty($attrib['folder_name'])) {
	$attrib['folder_name'] = '*';
	}

	// get current folder
	$mbox_name = $storage->get_folder();

	// build the folders tree
	if (empty($a_mailboxes)) {
	// get mailbox list
	$a_folders = $storage->list_folders_subscribed(
	'', $attrib['folder_name'], $attrib['folder_filter']);
	$delimiter = $storage->get_hierarchy_delimiter();
	$a_mailboxes = array();

	foreach ($a_folders as $folder) {
	$rcmail->build_folder_tree($a_mailboxes, $folder, $delimiter);
	}
	}

	// allow plugins to alter the folder tree or to localize folder names
	$hook = $rcmail->plugins->exec_hook('render_mailboxlist', array(
	'list' => $a_mailboxes,
	'delimiter' => $delimiter,
	'type' => $type,
	'attribs' => $attrib,
	));

	$a_mailboxes = $hook['list'];
	$attrib = $hook['attribs'];

	if ($type == 'select') {
	$attrib['is_escaped'] = true;
	$select = new html_select($attrib);

	// add no-selection option
	if ($attrib['noselection']) {
	$select->add(html::quote($rcmail->gettext($attrib['noselection'])), '');
	}

	$rcmail->render_folder_tree_select($a_mailboxes, $mbox_name, $attrib['maxlength'], $select, $attrib['realnames']);
	$out = $select->show($attrib['default']);
	}
	else {
	$js_mailboxlist = array();
	$tree = $rcmail->render_folder_tree_html($a_mailboxes, $mbox_name, $js_mailboxlist, $attrib);

	if ($type != 'js') {
	$out = html::tag('ul', $attrib, $tree, html::$common_attrib);

	$rcmail->output->include_script('treelist.js');
	$rcmail->output->add_gui_object('mailboxlist', $attrib['id']);
	$rcmail->output->set_env('unreadwrap', $attrib['unreadwrap']);
	$rcmail->output->set_env('collapsed_folders', (string)$rcmail->config->get('collapsed_folders'));
	}

	$rcmail->output->set_env('mailboxes', $js_mailboxlist);

	// we can't use object keys in javascript because they are unordered
	// we need sorted folders list for folder-selector widget
	$rcmail->output->set_env('mailboxes_list', array_keys($js_mailboxlist));
	}

	return $out;
	}

	/**
	* Return folders list as html_select object
	*
	* @param array $p Named parameters
	*
	* @return html_select HTML drop-down object
	*/
	public function folder_selector($p = array())
	{
	$realnames = $this->config->get('show_real_foldernames');
	$p += array('maxlength' => 100, 'realnames' => $realnames, 'is_escaped' => true);
	$a_mailboxes = array();
	$storage = $this->get_storage();

	if (empty($p['folder_name'])) {
	$p['folder_name'] = '*';
	}

	if ($p['unsubscribed']) {
	$list = $storage->list_folders('', $p['folder_name'], $p['folder_filter'], $p['folder_rights']);
	}
	else {
	$list = $storage->list_folders_subscribed('', $p['folder_name'], $p['folder_filter'], $p['folder_rights']);
	}

	$delimiter = $storage->get_hierarchy_delimiter();

	if (!empty($p['exceptions'])) {
	$list = array_diff($list, (array) $p['exceptions']);
	}

	if (!empty($p['additional'])) {
	foreach ($p['additional'] as $add_folder) {
	$add_items = explode($delimiter, $add_folder);
	$folder = '';
	while (count($add_items)) {
	$folder .= array_shift($add_items);

	// @TODO: sorting
	if (!in_array($folder, $list)) {
	$list[] = $folder;
	}

	$folder .= $delimiter;
	}
	}
	}

	foreach ($list as $folder) {
	$this->build_folder_tree($a_mailboxes, $folder, $delimiter);
	}

	$select = new html_select($p);

	if ($p['noselection']) {
	$select->add(html::quote($p['noselection']), '');
	}

	$this->render_folder_tree_select($a_mailboxes, $mbox, $p['maxlength'], $select, $p['realnames'], 0, $p);

	return $select;
	}

	/**
	* Create a hierarchical array of the mailbox list
	*/
	public function build_folder_tree(&$arrFolders, $folder, $delm = '/', $path = '')
	{
	// Handle namespace prefix
	$prefix = '';
	if (!$path) {
	$n_folder = $folder;
	$folder = $this->storage->mod_folder($folder);

	if ($n_folder != $folder) {
	$prefix = substr($n_folder, 0, -strlen($folder));
	}
	}

	$pos = strpos($folder, $delm);

	if ($pos !== false) {
	$subFolders = substr($folder, $pos+1);
	$currentFolder = substr($folder, 0, $pos);

	// sometimes folder has a delimiter as the last character
	if (!strlen($subFolders)) {
	$virtual = false;
	}
	else if (!isset($arrFolders[$currentFolder])) {
	$virtual = true;
	}
	else {
	$virtual = $arrFolders[$currentFolder]['virtual'];
	}
	}
	else {
	$subFolders = false;
	$currentFolder = $folder;
	$virtual = false;
	}

	$path .= $prefix . $currentFolder;

	if (!isset($arrFolders[$currentFolder])) {
	$arrFolders[$currentFolder] = array(
	'id' => $path,
	'name' => rcube_charset::convert($currentFolder, 'UTF7-IMAP'),
	'virtual' => $virtual,
	'folders' => array());
	}
	else {
	$arrFolders[$currentFolder]['virtual'] = $virtual;
	}

	if (strlen($subFolders)) {
	$this->build_folder_tree($arrFolders[$currentFolder]['folders'], $subFolders, $delm, $path.$delm);
	}
	}

	/**
	* Return html for a structured list <ul> for the mailbox tree
	*/
	public function render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
	{
	$maxlength = intval($attrib['maxlength']);
	$realnames = (bool)$attrib['realnames'];
	$msgcounts = $this->storage->get_cache('messagecount');
	$collapsed = $this->config->get('collapsed_folders');
	$realnames = $this->config->get('show_real_foldernames');

	$out = '';
	foreach ($arrFolders as $folder) {
	$title = null;
	$folder_class = $this->folder_classname($folder['id']);
	$is_collapsed = strpos($collapsed, '&'.rawurlencode($folder['id']).'&') !== false;
	$unread = $msgcounts ? intval($msgcounts[$folder['id']]['UNSEEN']) : 0;

	if ($folder_class && !$realnames) {
	$foldername = $this->gettext($folder_class);
	}
	else {
	$foldername = $folder['name'];

	// shorten the folder name to a given length
	if ($maxlength && $maxlength > 1) {
	$fname = abbreviate_string($foldername, $maxlength);
	if ($fname != $foldername) {
	$title = $foldername;
	}
	$foldername = $fname;
	}
	}

	// make folder name safe for ids and class names
	$folder_id = rcube_utils::html_identifier($folder['id'], true);
	$classes = array('mailbox');

	// set special class for Sent, Drafts, Trash and Junk
	if ($folder_class) {
	$classes[] = $folder_class;
	}

	if ($folder['id'] == $mbox_name) {
	$classes[] = 'selected';
	}

	if ($folder['virtual']) {
	$classes[] = 'virtual';
	}
	else if ($unread) {
	$classes[] = 'unread';
	}

	$js_name = $this->JQ($folder['id']);
	$html_name = $this->Q($foldername) . ($unread ? html::span('unreadcount', sprintf($attrib['unreadwrap'], $unread)) : '');
	$link_attrib = $folder['virtual'] ? array() : array(
	'href' => $this->url(array('_mbox' => $folder['id'])),
	'onclick' => sprintf("return %s.command('list','%s',this,event)", rcmail_output::JS_OBJECT_NAME, $js_name),
	'rel' => $folder['id'],
	'title' => $title,
	);

	$out .= html::tag('li', array(
	'id' => "rcmli".$folder_id,
	'class' => join(' ', $classes),
	'noclose' => true),
	html::a($link_attrib, $html_name));

	if (!empty($folder['folders'])) {
	$out .= html::div('treetoggle ' . ($is_collapsed ? 'collapsed' : 'expanded'), ' ');
	}

	$jslist[$folder['id']] = array(
	'id' => $folder['id'],
	'name' => $foldername,
	'virtual' => $folder['virtual'],
	);

	if (!empty($folder_class)) {
	$jslist[$folder['id']]['class'] = $folder_class;
	}

	if (!empty($folder['folders'])) {
	$out .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
	$this->render_folder_tree_html($folder['folders'], $mbox_name, $jslist, $attrib, $nestLevel+1));
	}

	$out .= "</li>\n";
	}

	return $out;
	}

	/**
	* Return html for a flat list <select> for the mailbox tree
	*/
	public function render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = array())
	{
	$out = '';

	foreach ($arrFolders as $folder) {
	// skip exceptions (and its subfolders)
	if (!empty($opts['exceptions']) && in_array($folder['id'], $opts['exceptions'])) {
	continue;
	}

	// skip folders in which it isn't possible to create subfolders
	if (!empty($opts['skip_noinferiors'])) {
	$attrs = $this->storage->folder_attributes($folder['id']);
	if ($attrs && in_array('\\Noinferiors', $attrs)) {
	continue;
	}
	}

	if (!$realnames && ($folder_class = $this->folder_classname($folder['id']))) {
	$foldername = $this->gettext($folder_class);
	}
	else {
	$foldername = $folder['name'];

	// shorten the folder name to a given length
	if ($maxlength && $maxlength > 1) {
	$foldername = abbreviate_string($foldername, $maxlength);
	}
	}

	$select->add(str_repeat(' ', $nestLevel*4) . html::quote($foldername), $folder['id']);

	if (!empty($folder['folders'])) {
	$out .= $this->render_folder_tree_select($folder['folders'], $mbox_name, $maxlength,
	$select, $realnames, $nestLevel+1, $opts);
	}
	}

	return $out;
	}

	/**
	* Return internal name for the given folder if it matches the configured special folders
	*/
	public function folder_classname($folder_id)
	{
	if ($folder_id == 'INBOX') {
	return 'inbox';
	}

	// for these mailboxes we have localized labels and css classes
	foreach (array('sent', 'drafts', 'trash', 'junk') as $smbx)
	{
	if ($folder_id === $this->config->get($smbx.'_mbox')) {
	return $smbx;
	}
	}
	}

	/**
	* Try to localize the given IMAP folder name.
	* UTF-7 decode it in case no localized text was found
	*
	* @param string $name Folder name
	* @param bool $with_path Enable path localization
	*
	* @return string Localized folder name in UTF-8 encoding
	*/
	public function localize_foldername($name, $with_path = false)
	{
	$realnames = $this->config->get('show_real_foldernames');

	if (!$realnames && ($folder_class = $this->folder_classname($name))) {
	return $this->gettext($folder_class);
	}

	// try to localize path of the folder
	if ($with_path && !$realnames) {
	$storage = $this->get_storage();
	$delimiter = $storage->get_hierarchy_delimiter();
	$path = explode($delimiter, $name);
	$count = count($path);

	if ($count > 1) {
	for ($i = 1; $i < $count; $i++) {
	$folder = implode($delimiter, array_slice($path, 0, -$i));
	if ($folder_class = $this->folder_classname($folder)) {
	$name = implode($delimiter, array_slice($path, $count - $i));
	return $this->gettext($folder_class) . $delimiter . rcube_charset::convert($name, 'UTF7-IMAP');
	}
	}
	}
	}

	return rcube_charset::convert($name, 'UTF7-IMAP');
	}


	public function localize_folderpath($path)
	{
	$protect_folders = $this->config->get('protect_default_folders');
	$delimiter = $this->storage->get_hierarchy_delimiter();
	$path = explode($delimiter, $path);
	$result = array();

	foreach ($path as $idx => $dir) {
	$directory = implode($delimiter, array_slice($path, 0, $idx+1));
	if ($protect_folders && $this->storage->is_special_folder($directory)) {
	unset($result);
	$result[] = $this->localize_foldername($directory);
	}
	else {
	$result[] = rcube_charset::convert($dir, 'UTF7-IMAP');
	}
	}

	return implode($delimiter, $result);
	}


	public static function quota_display($attrib)
	{
	$rcmail = rcmail::get_instance();

	if (!$attrib['id']) {
	$attrib['id'] = 'rcmquotadisplay';
	}

	$_SESSION['quota_display'] = !empty($attrib['display']) ? $attrib['display'] : 'text';

	$rcmail->output->add_gui_object('quotadisplay', $attrib['id']);

	$quota = $rcmail->quota_content($attrib);

	$rcmail->output->add_script('rcmail.set_quota('.rcube_output::json_serialize($quota).');', 'docready');

	return html::span($attrib, ' ');
	}


	public function quota_content($attrib = null, $folder = null)
	{
	$quota = $this->storage->get_quota($folder);
	$quota = $this->plugins->exec_hook('quota', $quota);

	$quota_result = (array) $quota;
	$quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
	$quota_result['folder'] = $folder !== null && $folder !== '' ? $folder : 'INBOX';

	if ($quota['total'] > 0) {
	if (!isset($quota['percent'])) {
	$quota_result['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100));
	}

	$title = sprintf('%s / %s (%.0f%%)',
	$this->show_bytes($quota['used'] * 1024), $this->show_bytes($quota['total'] * 1024),
	$quota_result['percent']);

	$quota_result['title'] = $title;

	if ($attrib['width']) {
	$quota_result['width'] = $attrib['width'];
	}
	if ($attrib['height']) {
	$quota_result['height'] = $attrib['height'];
	}

	// build a table of quota types/roots info
	if (($root_cnt = count($quota_result['all'])) > 1 \|\| count($quota_result['all'][key($quota_result['all'])]) > 1) {
	$table = new html_table(array('cols' => 3, 'class' => 'quota-info'));

	$table->add_header(null, self::Q($this->gettext('quotatype')));
	$table->add_header(null, self::Q($this->gettext('quotatotal')));
	$table->add_header(null, self::Q($this->gettext('quotaused')));

	foreach ($quota_result['all'] as $root => $data) {
	if ($root_cnt > 1 && $root) {
	$table->add(array('colspan' => 3, 'class' => 'root'), self::Q($root));
	}

	if ($storage = $data['storage']) {
	$percent = min(100, round(($storage['used']/max(1,$storage['total']))*100));

	$table->add('name', self::Q($this->gettext('quotastorage')));
	$table->add(null, $this->show_bytes($storage['total'] * 1024));
	$table->add(null, sprintf('%s (%.0f%%)', $this->show_bytes($storage['used'] * 1024), $percent));
	}
	if ($message = $data['message']) {
	$percent = min(100, round(($message['used']/max(1,$message['total']))*100));

	$table->add('name', self::Q($this->gettext('quotamessage')));
	$table->add(null, intval($message['total']));
	$table->add(null, sprintf('%d (%.0f%%)', $message['used'], $percent));
	}
	}

	$quota_result['table'] = $table->show();
	}
	}
	else {
	$unlimited = $this->config->get('quota_zero_as_unlimited');
	$quota_result['title'] = $this->gettext($unlimited ? 'unlimited' : 'unknown');
	$quota_result['percent'] = 0;
	}

	// cleanup
	unset($quota_result['abort']);
	if (empty($quota_result['table'])) {
	unset($quota_result['all']);
	}

	return $quota_result;
	}

	/**
	* Outputs error message according to server error/response codes
	*
	* @param string $fallback Fallback message label
	* @param array $fallback_args Fallback message label arguments
	* @param string $suffix Message label suffix
	*/
	public function display_server_error($fallback = null, $fallback_args = null, $suffix = '')
	{
	$err_code = $this->storage->get_error_code();
	$res_code = $this->storage->get_response_code();
	$args = array();

	if ($res_code == rcube_storage::NOPERM) {
	$error = 'errornoperm';
	}
	else if ($res_code == rcube_storage::READONLY) {
	$error = 'errorreadonly';
	}
	else if ($res_code == rcube_storage::OVERQUOTA) {
	$error = 'erroroverquota';
	}
	else if ($err_code && ($err_str = $this->storage->get_error_str())) {
	// try to detect access rights problem and display appropriate message
	if (stripos($err_str, 'Permission denied') !== false) {
	$error = 'errornoperm';
	}
	// try to detect full mailbox problem and display appropriate message
	// there can be e.g. "Quota exceeded" or "quotum would exceed"
	else if (stripos($err_str, 'quot') !== false && stripos($err_str, 'exceed') !== false) {
	$error = 'erroroverquota';
	}
	else {
	$error = 'servererrormsg';
	$args = array('msg' => $err_str);
	}
	}
	else if ($err_code < 0) {
	$error = 'storageerror';
	}
	else if ($fallback) {
	$error = $fallback;
	$args = $fallback_args;
	}

	if ($error) {
	if ($suffix && $this->text_exists($error . $suffix)) {
	$error .= $suffix;
	}
	$this->output->show_message($error, 'error', $args);
	}
	}

	/**
	* Output HTML editor scripts
	*
	* @param string $mode Editor mode
	*/
	public function html_editor($mode = '')
	{
	$hook = $this->plugins->exec_hook('html_editor', array('mode' => $mode));

	if ($hook['abort']) {
	return;
	}

	$lang_codes = array($_SESSION['language']);

	if ($pos = strpos($_SESSION['language'], '_')) {
	$lang_codes[] = substr($_SESSION['language'], 0, $pos);
	}

	foreach ($lang_codes as $code) {
	if (file_exists(INSTALL_PATH . 'program/js/tinymce/langs/'.$code.'.js')) {
	$lang = $code;
	break;
	}
	}

	if (empty($lang)) {
	$lang = 'en';
	}

	$config = array(
	'mode' => $mode,
	'lang' => $lang,
	'skin_path' => $this->output->get_skin_path(),
	'spellcheck' => intval($this->config->get('enable_spellcheck')),
	'spelldict' => intval($this->config->get('spellcheck_dictionary'))
	);

	$this->output->add_label('selectimage', 'addimage', 'selectmedia', 'addmedia');
	$this->output->set_env('editor_config', $config);
	$this->output->include_css('program/js/tinymce/roundcube/browser.css');
	$this->output->include_script('tinymce/tinymce.min.js');
	$this->output->include_script('editor.js');
	}

	/**
	* Replaces TinyMCE's emoticon images with plain-text representation
	*
	* @param string $html HTML content
	*
	* @return string HTML content
	*/
	public static function replace_emoticons($html)
	{
	$emoticons = array(
	'8-)' => 'smiley-cool',
	':-#' => 'smiley-foot-in-mouth',
	':-*' => 'smiley-kiss',
	':-X' => 'smiley-sealed',
	':-P' => 'smiley-tongue-out',
	':-@' => 'smiley-yell',
	":'(" => 'smiley-cry',
	':-(' => 'smiley-frown',
	':-D' => 'smiley-laughing',
	':-)' => 'smiley-smile',
	':-S' => 'smiley-undecided',
	':-$' => 'smiley-embarassed',
	'O:-)' => 'smiley-innocent',
	':-\|' => 'smiley-money-mouth',
	':-O' => 'smiley-surprised',
	';-)' => 'smiley-wink',
	);

	foreach ($emoticons as $idx => $file) {
	// <img title="Cry" src="http://.../program/js/tinymce/plugins/emoticons/img/smiley-cry.gif" border="0" alt="Cry" />
	$search[] = '/<img title="[a-z ]+" src="https?:\/\/[a-z0-9_.\/-]+\/tinymce\/plugins\/emoticons\/img\/'.$file.'.gif"[^>]+\/>/i';
	$replace[] = $idx;
	}

	return preg_replace($search, $replace, $html);
	}

	/**
	* File upload progress handler.
	*/
	public function upload_progress()
	{
	$params = array(
	'action' => $this->action,
	'name' => rcube_utils::get_input_value('_progress', rcube_utils::INPUT_GET),
	);

	if (function_exists('uploadprogress_get_info')) {
	$status = uploadprogress_get_info($params['name']);

	if (!empty($status)) {
	$params['current'] = $status['bytes_uploaded'];
	$params['total'] = $status['bytes_total'];
	}
	}

	if (!isset($status) && filter_var(ini_get('apc.rfc1867'), FILTER_VALIDATE_BOOLEAN)
	&& ini_get('apc.rfc1867_name')
	) {
	$prefix = ini_get('apc.rfc1867_prefix');
	$status = apc_fetch($prefix . $params['name']);

	if (!empty($status)) {
	$params['current'] = $status['current'];
	$params['total'] = $status['total'];
	}
	}

	if (!isset($status) && filter_var(ini_get('session.upload_progress.enabled'), FILTER_VALIDATE_BOOLEAN)
	&& ini_get('session.upload_progress.name')
	) {
	$key = ini_get('session.upload_progress.prefix') . $params['name'];

	$params['total'] = $_SESSION[$key]['content_length'];
	$params['current'] = $_SESSION[$key]['bytes_processed'];
	}

	if (!empty($params['total'])) {
	$total = $this->show_bytes($params['total'], $unit);
	switch ($unit) {
	case 'GB':
	$gb = $params['current']/1073741824;
	$current = sprintf($gb >= 10 ? "%d" : "%.1f", $gb);
	break;
	case 'MB':
	$mb = $params['current']/1048576;
	$current = sprintf($mb >= 10 ? "%d" : "%.1f", $mb);
	break;
	case 'KB':
	$current = round($params['current']/1024);
	break;
	case 'B':
	default:
	$current = $params['current'];
	break;
	}

	$params['percent'] = round($params['current']/$params['total']*100);
	$params['text'] = $this->gettext(array(
	'name' => 'uploadprogress',
	'vars' => array(
	'percent' => $params['percent'] . '%',
	'current' => $current,
	'total' => $total
	)
	));
	}

	$this->output->command('upload_progress_update', $params);
	$this->output->send();
	}

	/**
	* Initializes file uploading interface.
	*
	* @param $int Optional maximum file size in bytes
	*/
	public function upload_init($max_size = null)
	{
	// Enable upload progress bar
	if ($seconds = $this->config->get('upload_progress')) {
	if (function_exists('uploadprogress_get_info')) {
	$field_name = 'UPLOAD_IDENTIFIER';
	}
	if (!$field_name && filter_var(ini_get('apc.rfc1867'), FILTER_VALIDATE_BOOLEAN)) {
	$field_name = ini_get('apc.rfc1867_name');
	}
	if (!$field_name && filter_var(ini_get('session.upload_progress.enabled'), FILTER_VALIDATE_BOOLEAN)) {
	$field_name = ini_get('session.upload_progress.name');
	}

	if ($field_name) {
	$this->output->set_env('upload_progress_name', $field_name);
	$this->output->set_env('upload_progress_time', (int) $seconds);
	}
	}

	// find max filesize value
	$max_filesize = parse_bytes(ini_get('upload_max_filesize'));
	$max_postsize = parse_bytes(ini_get('post_max_size'));

	if ($max_postsize && $max_postsize < $max_filesize) {
	$max_filesize = $max_postsize;
	}

	if ($max_size && $max_size < $max_filesize) {
	$max_filesize = $max_size;
	}

	$this->output->set_env('max_filesize', $max_filesize);
	$max_filesize = $this->show_bytes($max_filesize);
	$this->output->set_env('filesizeerror', $this->gettext(array(
	'name' => 'filesizeerror', 'vars' => array('size' => $max_filesize))));

	return $max_filesize;
	}

	/**
	* Outputs uploaded file content (with image thumbnails support
	*
	* @param array $file Upload file data
	*/
	public function display_uploaded_file($file)
	{
	if (empty($file)) {
	return;
	}

	$file = $this->plugins->exec_hook('attachment_display', $file);

	if ($file['status']) {
	if (empty($file['size'])) {
	$file['size'] = $file['data'] ? strlen($file['data']) : @filesize($file['path']);
	}

	// generate image thumbnail for file browser in HTML editor
	if (!empty($_GET['_thumbnail'])) {
	$temp_dir = $this->config->get('temp_dir');
	$thumbnail_size = 80;
	list(,$ext) = explode('/', $file['mimetype']);
	$mimetype = $file['mimetype'];
	$file_ident = $file['id'] . ':' . $file['mimetype'] . ':' . $file['size'];
	$cache_basename = $temp_dir . '/' . md5($file_ident . ':' . $this->user->ID . ':' . $thumbnail_size);
	$cache_file = $cache_basename . '.' . $ext;

	// render thumbnail image if not done yet
	if (!is_file($cache_file)) {
	if (!$file['path']) {
	$orig_name = $filename = $cache_basename . '.orig.' . $ext;
	file_put_contents($orig_name, $file['data']);
	}
	else {
	$filename = $file['path'];
	}

	$image = new rcube_image($filename);
	if ($imgtype = $image->resize($thumbnail_size, $cache_file, true)) {
	$mimetype = 'image/' . $imgtype;

	if ($orig_name) {
	unlink($orig_name);
	}
	}
	}

	if (is_file($cache_file)) {
	// cache for 1h
	$this->output->future_expire_header(3600);
	header('Content-Type: ' . $mimetype);
	header('Content-Length: ' . filesize($cache_file));

	readfile($cache_file);
	exit;
	}
	}

	header('Content-Type: ' . $file['mimetype']);
	header('Content-Length: ' . $file['size']);

	if ($file['data']) {
	echo $file['data'];
	}
	else if ($file['path']) {
	readfile($file['path']);
	}
	}
	}

	/**
	* Initializes client-side autocompletion.
	*/
	public function autocomplete_init()
	{
	static $init;

	if ($init) {
	return;
	}

	$init = 1;

	if (($threads = (int)$this->config->get('autocomplete_threads')) > 0) {
	$book_types = (array) $this->config->get('autocomplete_addressbooks', 'sql');
	if (count($book_types) > 1) {
	$this->output->set_env('autocomplete_threads', $threads);
	$this->output->set_env('autocomplete_sources', $book_types);
	}
	}

	$this->output->set_env('autocomplete_max', (int)$this->config->get('autocomplete_max', 15));
	$this->output->set_env('autocomplete_min_length', $this->config->get('autocomplete_min_length'));
	$this->output->add_label('autocompletechars', 'autocompletemore');
	}

	/**
	* Returns supported font-family specifications
	*
	* @param string $font Font name
	*
	* @param string\|array Font-family specification array or string (if $font is used)
	*/
	public static function font_defs($font = null)
	{
	$fonts = array(
	'Andale Mono' => '"Andale Mono",Times,monospace',
	'Arial' => 'Arial,Helvetica,sans-serif',
	'Arial Black' => '"Arial Black","Avant Garde",sans-serif',
	'Book Antiqua' => '"Book Antiqua",Palatino,serif',
	'Courier New' => '"Courier New",Courier,monospace',
	'Georgia' => 'Georgia,Palatino,serif',
	'Helvetica' => 'Helvetica,Arial,sans-serif',
	'Impact' => 'Impact,Chicago,sans-serif',
	'Tahoma' => 'Tahoma,Arial,Helvetica,sans-serif',
	'Terminal' => 'Terminal,Monaco,monospace',
	'Times New Roman' => '"Times New Roman",Times,serif',
	'Trebuchet MS' => '"Trebuchet MS",Geneva,sans-serif',
	'Verdana' => 'Verdana,Geneva,sans-serif',
	);

	if ($font) {
	return $fonts[$font];
	}

	return $fonts;
	}

	/**
	* Create a human readable string for a number of bytes
	*
	* @param int Number of bytes
	* @param string Size unit
	*
	* @return string Byte string
	*/
	public function show_bytes($bytes, &$unit = null)
	{
	if ($bytes >= 1073741824) {
	$unit = 'GB';
	$gb = $bytes/1073741824;
	$str = sprintf($gb >= 10 ? "%d " : "%.1f ", $gb) . $this->gettext($unit);
	}
	else if ($bytes >= 1048576) {
	$unit = 'MB';
	$mb = $bytes/1048576;
	$str = sprintf($mb >= 10 ? "%d " : "%.1f ", $mb) . $this->gettext($unit);
	}
	else if ($bytes >= 1024) {
	$unit = 'KB';
	$str = sprintf("%d ", round($bytes/1024)) . $this->gettext($unit);
	}
	else {
	$unit = 'B';
	$str = sprintf('%d ', $bytes) . $this->gettext($unit);
	}

	return $str;
	}

	/**
	* Returns real size (calculated) of the message part
	*
	* @param rcube_message_part Message part
	*
	* @return string Part size (and unit)
	*/
	public function message_part_size($part)
	{
	if (isset($part->d_parameters['size'])) {
	$size = $this->show_bytes((int)$part->d_parameters['size']);
	}
	else {
	$size = $part->size;
	if ($part->encoding == 'base64') {
	$size = $size / 1.33;
	}

	$size = '~' . $this->show_bytes($size);
	}

	return $size;
	}

	/**
	* Returns message UID(s) and IMAP folder(s) from GET/POST data
	*
	* @param string UID value to decode
	* @param string Default mailbox value (if not encoded in UIDs)
	* @param bool Will be set to True if multi-folder request
	*
	* @return array List of message UIDs per folder
	*/
	public static function get_uids($uids = null, $mbox = null, &$is_multifolder = false)
	{
	// message UID (or comma-separated list of IDs) is provided in
	// the form of <ID>-<MBOX>[,<ID>-<MBOX>]*

	$_uid = $uids ?: rcube_utils::get_input_value('_uid', RCUBE_INPUT_GPC);
	$_mbox = $mbox ?: (string)rcube_utils::get_input_value('_mbox', RCUBE_INPUT_GPC);

	// already a hash array
	if (is_array($_uid) && !isset($_uid[0])) {
	return $_uid;
	}

	$result = array();

	// special case: *
	if ($_uid == '*' && is_object($_SESSION['search'][1]) && $_SESSION['search'][1]->multi) {
	$is_multifolder = true;
	// extract the full list of UIDs per folder from the search set
	foreach ($_SESSION['search'][1]->sets as $subset) {
	$mbox = $subset->get_parameters('MAILBOX');
	$result[$mbox] = $subset->get();
	}
	}
	else {
	if (is_string($_uid))
	$_uid = explode(',', $_uid);

	// create a per-folder UIDs array
	foreach ((array)$_uid as $uid) {
	list($uid, $mbox) = explode('-', $uid, 2);
	if (!strlen($mbox)) {
	$mbox = $_mbox;
	}
	else {
	$is_multifolder = true;
	}

	if ($uid == '*') {
	$result[$mbox] = $uid;
	}
	else {
	$result[$mbox][] = $uid;
	}
	}
	}

	return $result;
	}


	/************************************************************************
	******* Deprecated methods (to be removed) *******
	***********************************************************************/

	public static function setcookie($name, $value, $exp = 0)
	{
	rcube_utils::setcookie($name, $value, $exp);
	}

	public function imap_connect()
	{
	return $this->storage_connect();
	}

	public function imap_init()
	{
	return $this->storage_init();
	}

	/**
	* Connect to the mail storage server with stored session data
	*
	* @return bool True on success, False on error
	*/
	public function storage_connect()
	{
	$storage = $this->get_storage();

	if ($_SESSION['storage_host'] && !$storage->is_connected()) {
	$host = $_SESSION['storage_host'];
	$user = $_SESSION['username'];
	$port = $_SESSION['storage_port'];
	$ssl = $_SESSION['storage_ssl'];
	$pass = $this->decrypt($_SESSION['password']);

	if (!$storage->connect($host, $user, $pass, $port, $ssl)) {
	if (is_object($this->output)) {
	$this->output->show_message('storageerror', 'error');
	}
	}
	else {
	$this->set_storage_prop();
	}
	}

	return $storage->is_connected();
	}
	}
	diff --git a/program/include/rcmail_output.php b/program/include/rcmail_output.php
	index 0f7aaf966..76ff4e75e 100644
	--- a/program/include/rcmail_output.php
	+++ b/program/include/rcmail_output.php
	@@ -1,120 +1,121 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcmail_output.php \|
	\| \|
	\| This file is part of the Roundcube PHP suite \|
	\| Copyright (C) 2005-2012 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. \|
	\| CONTENTS: \|
	\| Abstract class for output generation \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	/**
	* Class for output generation
	*
	* @package Webmail
	* @subpackage View
	*/
	abstract class rcmail_output extends rcube_output
	{
	const JS_OBJECT_NAME = 'rcmail';
	+ const BLANK_GIF = 'R0lGODlhDwAPAIAAAMDAwAAAACH5BAEAAAAALAAAAAAPAA8AQAINhI+py+0Po5y02otnAQA7';

	public $type = 'html';
	public $ajax_call = false;
	public $framed = false;

	protected $pagetitle = '';
	protected $object_handlers = array();


	/**
	* Object constructor
	*/
	public function __construct($task = null, $framed = false)
	{
	parent::__construct();
	}


	/**
	* Setter for page title
	*
	* @param string $title Page title
	*/
	public function set_pagetitle($title)
	{
	$this->pagetitle = $title;
	}


	/**
	* Getter for the current skin path property
	*/
	public function get_skin_path()
	{
	return $this->config->get('skin_path');
	}


	/**
	* Delete all stored env variables and commands
	*/
	public function reset()
	{
	parent::reset();

	$this->object_handlers = array();
	$this->pagetitle = '';
	}


	/**
	* Call a client method
	*
	* @param string Method to call
	* @param ... Additional arguments
	*/
	abstract function command();


	/**
	* Add a localized label to the client environment
	*/
	abstract function add_label();


	/**
	* Register a template object handler
	*
	* @param string Object name
	* @param string Function name to call
	* @return void
	*/
	public function add_handler($obj, $func)
	{
	$this->object_handlers[$obj] = $func;
	}


	/**
	* Register a list of template object handlers
	*
	* @param array Hash array with object=>handler pairs
	* @return void
	*/
	public function add_handlers($arr)
	{
	$this->object_handlers = array_merge($this->object_handlers, $arr);
	}

	}
	diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
	index 026e9f869..c6c43b532 100644
	--- a/program/include/rcmail_output_html.php
	+++ b/program/include/rcmail_output_html.php
	@@ -1,1932 +1,2039 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcmail_output_html.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2006-2014, 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. \|
	\| \|
	\| PURPOSE: \|
	\| Class to handle HTML page output using a skin template. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Class to create HTML page output using a skin template
	*
	* @package Webmail
	* @subpackage View
	*/
	class rcmail_output_html extends rcmail_output
	{
	public $type = 'html';

	protected $message;
	protected $template_name;
	protected $js_env = array();
	protected $js_labels = array();
	protected $js_commands = array();
	protected $skin_paths = array();
	protected $scripts_path = '';
	protected $script_files = array();
	protected $css_files = array();
	protected $scripts = array();
	protected $default_template = "<html>\n<head><title></title></head>\n<body></body>\n</html>";
	protected $header = '';
	protected $footer = '';
	protected $body = '';
	protected $base_path = '';
	+ protected $assets_path;
	+ protected $assets_dir = RCUBE_INSTALL_PATH;
	protected $devel_mode = false;

	// deprecated names of templates used before 0.5
	protected $deprecated_templates = array(
	'contact' => 'showcontact',
	'contactadd' => 'addcontact',
	'contactedit' => 'editcontact',
	'identityedit' => 'editidentity',
	'messageprint' => 'printmessage',
	);

	/**
	* Constructor
	*/
	public function __construct($task = null, $framed = false)
	{
	parent::__construct();

	$this->devel_mode = $this->config->get('devel_mode');

	$this->set_env('task', $task);
	$this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));
	$this->set_env('standard_windows', (bool) $this->config->get('standard_windows'));
	$this->set_env('locale', $_SESSION['language']);

	// add cookie info
	$this->set_env('cookie_domain', ini_get('session.cookie_domain'));
	$this->set_env('cookie_path', ini_get('session.cookie_path'));
	$this->set_env('cookie_secure', filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN));

	// load the correct skin (in case user-defined)
	$skin = $this->config->get('skin');
	$this->set_skin($skin);
	$this->set_env('skin', $skin);

	+ $this->set_assets_path($this->config->get('assets_path'), $this->config->get('assets_dir'));
	+
	if (!empty($_REQUEST['_extwin']))
	$this->set_env('extwin', 1);
	if ($this->framed \|\| $framed)
	$this->set_env('framed', 1);

	$lic = <<<EOF
	/*
	@licstart The following is the entire license notice for the
	JavaScript code in this page.

	Copyright (C) 2005-2014 The Roundcube Dev Team

	The JavaScript code in this page is free software: you can redistribute
	it and/or modify it under the terms of the GNU General Public License
	as published by the Free Software Foundation, either version 3 of
	the License, or (at your option) any later version.

	The code is distributed WITHOUT ANY WARRANTY; without even the implied
	warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	See the GNU GPL for more details.

	@licend The above is the entire license notice
	for the JavaScript code in this page.
	*/
	EOF;
	// add common javascripts
	$this->add_script($lic, 'head_top');
	$this->add_script('var '.self::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');

	// don't wait for page onload. Call init at the bottom of the page (delayed)
	$this->add_script(self::JS_OBJECT_NAME.'.init();', 'docready');

	$this->scripts_path = 'program/js/';
	$this->include_script('jquery.min.js');
	$this->include_script('common.js');
	$this->include_script('app.js');

	// register common UI objects
	$this->add_handlers(array(
	'loginform' => array($this, 'login_form'),
	'preloader' => array($this, 'preloader'),
	'username' => array($this, 'current_username'),
	'message' => array($this, 'message_container'),
	'charsetselector' => array($this, 'charset_selector'),
	'aboutcontent' => array($this, 'about_content'),
	));
	}

	/**
	* Set environment variable
	*
	* @param string Property name
	* @param mixed Property value
	* @param boolean True if this property should be added to client environment
	*/
	public function set_env($name, $value, $addtojs = true)
	{
	$this->env[$name] = $value;

	if ($addtojs \|\| isset($this->js_env[$name])) {
	$this->js_env[$name] = $value;
	}
	}

	+ /**
	+ * Parse and set assets path
	+ *
	+ * @param string Assets path (relative or absolute URL)
	+ */
	+ public function set_assets_path($path, $fs_dir = null)
	+ {
	+ if (empty($path)) {
	+ return;
	+ }
	+
	+ $path = rtrim($path, '/') . '/';
	+
	+ // handle relative assets path
	+ if (!preg_match('\|^https?://\|', $path) && $path[0] != '/') {
	+ // save the path to search for asset files later
	+ $this->assets_dir = $path;
	+
	+ $base = preg_replace('/[?#&].*$/', '', $_SERVER['REQUEST_URI']);
	+ $base = rtrim($base, '/');
	+
	+ // remove url token if exists
	+ if ($len = intval($this->config->get('use_secure_urls'))) {
	+ $_base = explode('/', $base);
	+ $last = count($_base) - 1;
	+ $length = $len > 1 ? $len : 16; // as in rcube::get_secure_url_token()
	+
	+ // we can't use real token here because it
	+ // does not exists in unauthenticated state,
	+ // hope this will not produce false-positive matches
	+ if ($last > -1 && preg_match('/^[a-f0-9]{' . $length . '}$/', $_base[$last])) {
	+ $path = '../' . $path;
	+ }
	+ }
	+ }
	+
	+ // set filesystem path for assets
	+ if ($fs_dir) {
	+ if ($fs_dir[0] != '/') {
	+ $fs_dir = realpath(RCUBE_INSTALL_PATH . $fs_dir);
	+ }
	+ // ensure the path ends with a slash
	+ $this->assets_dir = rtrim($fs_dir, '/') . '/';
	+ }
	+
	+ $this->assets_path = $path;
	+ $this->set_env('assets_path', $path);
	+ }
	+
	/**
	* Getter for the current page title
	*
	* @return string The page title
	*/
	protected function get_pagetitle()
	{
	if (!empty($this->pagetitle)) {
	$title = $this->pagetitle;
	}
	else if ($this->env['task'] == 'login') {
	$title = $this->app->gettext(array(
	'name' => 'welcome',
	'vars' => array('product' => $this->config->get('product_name')
	)));
	}
	else {
	$title = ucfirst($this->env['task']);
	}

	return $title;
	}

	/**
	* Set skin
	*/
	public function set_skin($skin)
	{
	$valid = false;
	$path = RCUBE_INSTALL_PATH . 'skins/';

	if (!empty($skin) && is_dir($path . $skin) && is_readable($path . $skin)) {
	$skin_path = 'skins/' . $skin;
	$valid = true;
	}
	else {
	$skin_path = $this->config->get('skin_path');
	if (!$skin_path) {
	$skin_path = 'skins/' . rcube_config::DEFAULT_SKIN;
	}
	$valid = !$skin;
	}

	$skin_path = rtrim($skin_path, '/');

	$this->config->set('skin_path', $skin_path);
	$this->base_path = $skin_path;

	// register skin path(s)
	$this->skin_paths = array();
	$this->load_skin($skin_path);

	return $valid;
	}

	/**
	* Helper method to recursively read skin meta files and register search paths
	*/
	private function load_skin($skin_path)
	{
	$this->skin_paths[] = $skin_path;

	// read meta file and check for dependecies
	$meta = @file_get_contents(RCUBE_INSTALL_PATH . $skin_path . '/meta.json');
	$meta = @json_decode($meta, true);

	$meta['path'] = $skin_path;
	$skin_id = end(explode('/', $skin_path));
	if (!$meta['name']) {
	$meta['name'] = $skin_id;
	}
	$this->skins[$skin_id] = $meta;

	if ($meta['extends']) {
	$path = RCUBE_INSTALL_PATH . 'skins/';
	if (is_dir($path . $meta['extends']) && is_readable($path . $meta['extends'])) {
	$this->load_skin('skins/' . $meta['extends']);
	}
	}
	}

	/**
	* Check if a specific template exists
	*
	* @param string Template name
	* @return boolean True if template exists
	*/
	public function template_exists($name)
	{
	foreach ($this->skin_paths as $skin_path) {
	$filename = RCUBE_INSTALL_PATH . $skin_path . '/templates/' . $name . '.html';
	if ((is_file($filename) && is_readable($filename))
	\|\| ($this->deprecated_templates[$name] && $this->template_exists($this->deprecated_templates[$name]))
	) {
	return true;
	}
	}

	return false;
	}

	/**
	* Find the given file in the current skin path stack
	*
	* @param string File name/path to resolve (starting with /)
	* @param string Reference to the base path of the matching skin
	* @param string Additional path to search in
	+ *
	* @return mixed Relative path to the requested file or False if not found
	*/
	public function get_skin_file($file, &$skin_path = null, $add_path = null)
	{
	$skin_paths = $this->skin_paths;
	if ($add_path) {
	array_unshift($skin_paths, $add_path);
	}

	foreach ($skin_paths as $skin_path) {
	- $path = realpath($skin_path . $file);
	- if (is_file($path)) {
	+ $path = realpath(RCUBE_INSTALL_PATH . $skin_path . $file);
	+
	+ if ($path && is_file($path)) {
	return $skin_path . $file;
	}
	+
	+ if ($this->assets_dir != RCUBE_INSTALL_PATH) {
	+ $path = realpath($this->assets_dir . $skin_path . $file);
	+
	+ if ($path && is_file($path)) {
	+ return $skin_path . $file;
	+ }
	+ }
	}

	return false;
	}

	/**
	* Register a GUI object to the client script
	*
	* @param string Object name
	* @param string Object ID
	* @return void
	*/
	public function add_gui_object($obj, $id)
	{
	$this->add_script(self::JS_OBJECT_NAME.".gui_object('$obj', '$id');");
	}

	/**
	* Call a client method
	*
	* @param string Method to call
	* @param ... Additional arguments
	*/
	public function command()
	{
	$cmd = func_get_args();
	if (strpos($cmd[0], 'plugin.') !== false)
	$this->js_commands[] = array('triggerEvent', $cmd[0], $cmd[1]);
	else
	$this->js_commands[] = $cmd;
	}

	/**
	* Add a localized label to the client environment
	*/
	public function add_label()
	{
	$args = func_get_args();
	if (count($args) == 1 && is_array($args[0]))
	$args = $args[0];

	foreach ($args as $name) {
	$this->js_labels[$name] = $this->app->gettext($name);
	}
	}

	/**
	* Invoke display_message command
	*
	* @param string $message Message to display
	* @param string $type Message type [notice\|confirm\|error]
	* @param array $vars Key-value pairs to be replaced in localized text
	* @param boolean $override Override last set message
	* @param int $timeout Message display time in seconds
	* @uses self::command()
	*/
	public function show_message($message, $type='notice', $vars=null, $override=true, $timeout=0)
	{
	if ($override \|\| !$this->message) {
	if ($this->app->text_exists($message)) {
	if (!empty($vars))
	$vars = array_map('Q', $vars);
	$msgtext = $this->app->gettext(array('name' => $message, 'vars' => $vars));
	}
	else
	$msgtext = $message;

	$this->message = $message;
	$this->command('display_message', $msgtext, $type, $timeout * 1000);
	}
	}

	/**
	* Delete all stored env variables and commands
	*
	* @param bool $all Reset all env variables (including internal)
	*/
	public function reset($all = false)
	{
	$framed = $this->framed;
	$env = $all ? null : array_intersect_key($this->env, array('extwin'=>1, 'framed'=>1));

	parent::reset();

	// let some env variables survive
	$this->env = $this->js_env = $env;
	$this->framed = $framed \|\| $this->env['framed'];
	$this->js_labels = array();
	$this->js_commands = array();
	$this->script_files = array();
	$this->scripts = array();
	$this->header = '';
	$this->footer = '';
	$this->body = '';

	// load defaults
	if (!$all) {
	$this->__construct();
	}
	}

	/**
	* Redirect to a certain url
	*
	- * @param mixed $p Either a string with the action or url parameters as key-value pairs
	- * @param int $delay Delay in seconds
	+ * @param mixed $p Either a string with the action or url parameters as key-value pairs
	+ * @param int $delay Delay in seconds
	+ * @param bool $secure Redirect to secure location (see rcmail::url())
	*/
	- public function redirect($p = array(), $delay = 1)
	+ public function redirect($p = array(), $delay = 1, $secure = false)
	{
	if ($this->env['extwin'])
	$p['extwin'] = 1;
	- $location = $this->app->url($p);
	+ $location = $this->app->url($p, false, false, $secure);
	header('Location: ' . $location);
	exit;
	}

	/**
	* Send the request output to the client.
	* This will either parse a skin tempalte or send an AJAX response
	*
	* @param string Template name
	* @param boolean True if script should terminate (default)
	*/
	public function send($templ = null, $exit = true)
	{
	if ($templ != 'iframe') {
	// prevent from endless loops
	if ($exit != 'recur' && $this->app->plugins->is_processing('render_page')) {
	rcube::raise_error(array('code' => 505, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => 'Recursion alert: ignoring output->send()'), true, false);
	return;
	}
	$this->parse($templ, false);
	}
	else {
	$this->framed = true;
	$this->write();
	}

	// set output asap
	ob_flush();
	flush();

	if ($exit) {
	exit;
	}
	}

	/**
	* Process template and write to stdOut
	*
	* @param string $template HTML template content
	*/
	public function write($template = '')
	{
	if (!empty($this->script_files)) {
	$this->set_env('request_token', $this->app->get_request_token());
	}

	$commands = $this->get_js_commands($framed);

	// if all js commands go to parent window we can ignore all
	// script files and skip rcube_webmail initialization (#1489792)
	if ($framed) {
	$this->scripts = array();
	$this->script_files = array();
	$this->header = '';
	$this->footer = '';
	}

	// write all javascript commands
	$this->add_script($commands, 'head_top');

	// send clickjacking protection headers
	$iframe = $this->framed \|\| $this->env['framed'];
	if (!headers_sent() && ($xframe = $this->app->config->get('x_frame_options', 'sameorigin'))) {
	header('X-Frame-Options: ' . ($iframe && $xframe == 'deny' ? 'sameorigin' : $xframe));
	}

	// call super method
	$this->_write($template, $this->config->get('skin_path'));
	}

	/**
	* Parse a specific skin template and deliver to stdout (or return)
	*
	* @param string Template name
	* @param boolean Exit script
	* @param boolean Don't write to stdout, return parsed content instead
	*
	* @link http://php.net/manual/en/function.exit.php
	*/
	function parse($name = 'main', $exit = true, $write = true)
	{
	$plugin = false;
	$realname = $name;
	$plugin_skin_paths = array();

	$this->template_name = $realname;

	$temp = explode('.', $name, 2);
	if (count($temp) > 1) {
	$plugin = $temp[0];
	$name = $temp[1];
	$skin_dir = $plugin . '/skins/' . $this->config->get('skin');

	// apply skin search escalation list to plugin directory
	foreach ($this->skin_paths as $skin_path) {
	$plugin_skin_paths[] = $this->app->plugins->url . $plugin . '/' . $skin_path;
	}

	// add fallback to default skin
	if (is_dir($this->app->plugins->dir . $plugin . '/skins/default')) {
	$skin_dir = $plugin . '/skins/default';
	$plugin_skin_paths[] = $this->app->plugins->url . $skin_dir;
	}

	// prepend plugin skin paths to search list
	$this->skin_paths = array_merge($plugin_skin_paths, $this->skin_paths);
	}

	// find skin template
	$path = false;
	foreach ($this->skin_paths as $skin_path) {
	- $path = "$skin_path/templates/$name.html";
	+ $path = RCUBE_INSTALL_PATH . "$skin_path/templates/$name.html";

	// fallback to deprecated template names
	if (!is_readable($path) && $this->deprecated_templates[$realname]) {
	- $path = "$skin_path/templates/" . $this->deprecated_templates[$realname] . ".html";
	+ $path = RCUBE_INSTALL_PATH . "$skin_path/templates/" . $this->deprecated_templates[$realname] . ".html";

	if (is_readable($path)) {
	rcube::raise_error(array(
	'code' => 502, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Using deprecated template '" . $this->deprecated_templates[$realname]
	. "' in $skin_path/templates. Please rename to '$realname'"),
	true, false);
	}
	}

	if (is_readable($path)) {
	$this->config->set('skin_path', $skin_path);
	$this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin)
	$skin_dir = preg_replace('!^plugins/!', '', $skin_path);
	break;
	}
	else {
	$path = false;
	}
	}

	// read template file
	if (!$path \|\| ($templ = @file_get_contents($path)) === false) {
	rcube::raise_error(array(
	'code' => 501,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => 'Error loading template for '.$realname
	), true, $write);

	$this->skin_paths = array_slice($this->skin_paths, count($plugin_skin_paths));
	return false;
	}

	// replace all path references to plugins/... with the configured plugins dir
	// and /this/ to the current plugin skin directory
	if ($plugin) {
	$templ = preg_replace(array('/\bplugins\//', '/(["\']?)\/this\//'), array($this->app->plugins->url, '\\1'.$this->app->plugins->url.$skin_dir.'/'), $templ);
	}

	// parse for specialtags
	$output = $this->parse_conditions($templ);
	$output = $this->parse_xml($output);

	// trigger generic hook where plugins can put additional content to the page
	$hook = $this->app->plugins->exec_hook("render_page", array('template' => $realname, 'content' => $output));

	// save some memory
	$output = $hook['content'];
	unset($hook['content']);

	// make sure all <form> tags have a valid request token
	$output = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $output);
	$this->footer = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $this->footer);

	// remove plugin skin paths from current context
	$this->skin_paths = array_slice($this->skin_paths, count($plugin_skin_paths));

	if (!$write) {
	return $output;
	}

	$this->write(trim($output));

	if ($exit) {
	exit;
	}
	}

	/**
	* Return executable javascript code for all registered commands
	*
	* @return string $out
	*/
	protected function get_js_commands(&$framed = null)
	{
	$out = '';
	$parent_commands = 0;
	$top_commands = array();

	// these should be always on top,
	// e.g. hide_message() below depends on env.framed
	if (!$this->framed && !empty($this->js_env)) {
	$top_commands[] = array('set_env', $this->js_env);
	}
	if (!empty($this->js_labels)) {
	$top_commands[] = array('add_label', $this->js_labels);
	}

	// unlock interface after iframe load
	$unlock = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['_unlock']);
	if ($this->framed) {
	$top_commands[] = array('iframe_loaded', $unlock);
	}
	else if ($unlock) {
	$top_commands[] = array('hide_message', $unlock);
	}

	$commands = array_merge($top_commands, $this->js_commands);

	foreach ($commands as $i => $args) {
	$method = array_shift($args);
	$parent = $this->framed \|\| preg_match('/^parent\./', $method);

	foreach ($args as $i => $arg) {
	$args[$i] = self::json_serialize($arg);
	}

	if ($parent) {
	$parent_commands++;
	$method = preg_replace('/^parent\./', '', $method);
	$parent_prefix = 'if (window.parent && parent.' . self::JS_OBJECT_NAME . ') parent.';
	$method = $parent_prefix . self::JS_OBJECT_NAME . '.' . $method;
	}
	else {
	$method = self::JS_OBJECT_NAME . '.' . $method;
	}

	$out .= sprintf("%s(%s);\n", $method, implode(',', $args));
	}

	$framed = $parent_prefix && $parent_commands == count($commands);

	// make the output more compact if all commands go to parent window
	if ($framed) {
	$out = "if (window.parent && parent." . self::JS_OBJECT_NAME . ") {\n"
	. str_replace($parent_prefix, "\tparent.", $out)
	. "}\n";
	}

	return $out;
	}

	/**
	* Make URLs starting with a slash point to skin directory
	*
	* @param string Input string
	* @param boolean True if URL should be resolved using the current skin path stack
	* @return string
	*/
	public function abs_url($str, $search_path = false)
	{
	if ($str[0] == '/') {
	if ($search_path && ($file_url = $this->get_skin_file($str, $skin_path))) {
	return $file_url;
	}

	return $this->base_path . $str;
	}

	return $str;
	}

	/**
	* Show error page and terminate script execution
	*
	* @param int $code Error code
	* @param string $message Error message
	*/
	public function raise_error($code, $message)
	{
	global $__page_content, $ERROR_CODE, $ERROR_MESSAGE;

	$ERROR_CODE = $code;
	$ERROR_MESSAGE = $message;

	include RCUBE_INSTALL_PATH . 'program/steps/utils/error.inc';
	exit;
	}

	+ /**
	+ * Modify path by adding URL prefix if configured
	+ */
	+ public function asset_url($path)
	+ {
	+ // iframe content can't be in a different domain
	+ // @TODO: check if assests are on a different domain
	+
	+ if (!$this->assets_path \|\| in_array($path[0], array('?', '/', '.')) \|\| strpos($path, '://')) {
	+ return $path;
	+ }
	+
	+ return $this->assets_path . $path;
	+ }
	+

	/*** Template parsing methods ***/

	/**
	* Replace all strings ($varname)
	* with the content of the according global variable.
	*/
	protected function parse_with_globals($input)
	{
	$GLOBALS['__version'] = html::quote(RCMAIL_VERSION);
	$GLOBALS['__comm_path'] = html::quote($this->app->comm_path);
	$GLOBALS['__skin_path'] = html::quote($this->base_path);

	return preg_replace_callback('/\$(__[a-z0-9_\-]+)/',
	array($this, 'globals_callback'), $input);
	}

	/**
	* Callback funtion for preg_replace_callback() in parse_with_globals()
	*/
	protected function globals_callback($matches)
	{
	return $GLOBALS[$matches[1]];
	}

	/**
	* Correct absolute paths in images and other tags
	* add timestamp to .js and .css filename
	*/
	protected function fix_paths($output)
	{
	return preg_replace_callback(
	'!(src\|href\|background)=(["\']?)([a-z0-9/_.-]+)(["\'\s>])!i',
	array($this, 'file_callback'), $output);
	}

	/**
	- * Callback function for preg_replace_callback in write()
	+ * Callback function for preg_replace_callback in fix_paths()
	*
	* @return string Parsed string
	*/
	protected function file_callback($matches)
	{
	$file = $matches[3];
	$file = preg_replace('!^/this/!', '/', $file);

	// correct absolute paths
	if ($file[0] == '/') {
	$file = $this->base_path . $file;
	}

	// add file modification timestamp
	if (preg_match('/\.(js\|css)$/', $file, $m)) {
	$file = $this->file_mod($file);
	}

	return $matches[1] . '=' . $matches[2] . $file . $matches[4];
	}

	+ /**
	+ * Correct paths of asset files according to assets_path
	+ */
	+ protected function fix_assets_paths($output)
	+ {
	+ return preg_replace_callback(
	+ '!(src\|href\|background)=(["\']?)([a-z0-9/_.?=-]+)(["\'\s>])!i',
	+ array($this, 'assets_callback'), $output);
	+ }
	+
	+ /**
	+ * Callback function for preg_replace_callback in fix_assets_paths()
	+ *
	+ * @return string Parsed string
	+ */
	+ protected function assets_callback($matches)
	+ {
	+ $file = $this->asset_url($matches[3]);
	+
	+ return $matches[1] . '=' . $matches[2] . $file . $matches[4];
	+ }
	+
	/**
	* Modify file by adding mtime indicator
	*/
	protected function file_mod($file)
	{
	$fs = false;
	$ext = substr($file, strrpos($file, '.') + 1);

	// use minified file if exists (not in development mode)
	if (!$this->devel_mode && !preg_match('/\.min\.' . $ext . '$/', $file)) {
	$minified_file = substr($file, 0, strlen($ext) * -1) . 'min.' . $ext;
	- if ($fs = @filemtime($minified_file)) {
	+ if ($fs = @filemtime($this->assets_dir . $minified_file)) {
	return $minified_file . '?s=' . $fs;
	}
	}

	- if ($fs = @filemtime($file)) {
	+ if ($fs = @filemtime($this->assets_dir . $file)) {
	$file .= '?s=' . $fs;
	}

	return $file;
	}

	/**
	* Public wrapper to dipp into template parsing.
	*
	* @param string $input
	* @return string
	* @uses rcmail_output_html::parse_xml()
	* @since 0.1-rc1
	*/
	public function just_parse($input)
	{
	$input = $this->parse_conditions($input);
	$input = $this->parse_xml($input);

	return $input;
	}

	/**
	* Parse for conditional tags
	*
	* @param string $input
	* @return string
	*/
	protected function parse_conditions($input)
	{
	$matches = preg_split('/<roundcube:(if\|elseif\|else\|endif)\s+([^>]+)>\n?/is', $input, 2, PREG_SPLIT_DELIM_CAPTURE);
	if ($matches && count($matches) == 4) {
	if (preg_match('/^(else\|endif)$/i', $matches[1])) {
	return $matches[0] . $this->parse_conditions($matches[3]);
	}
	$attrib = html::parse_attrib_string($matches[2]);
	if (isset($attrib['condition'])) {
	$condmet = $this->check_condition($attrib['condition']);
	$submatches = preg_split('/<roundcube:(elseif\|else\|endif)\s+([^>]+)>\n?/is', $matches[3], 2, PREG_SPLIT_DELIM_CAPTURE);
	if ($condmet) {
	$result = $submatches[0];
	$result.= ($submatches[1] != 'endif' ? preg_replace('/.*<roundcube:endif\s+[^>]+>\n?/Uis', '', $submatches[3], 1) : $submatches[3]);
	}
	else {
	$result = "<roundcube:$submatches[1] $submatches[2]>" . $submatches[3];
	}
	return $matches[0] . $this->parse_conditions($result);
	}
	rcube::raise_error(array(
	'code' => 500,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => "Unable to parse conditional tag " . $matches[2]
	), true, false);
	}
	return $input;
	}

	/**
	* Determines if a given condition is met
	*
	* @todo Extend this to allow real conditions, not just "set"
	* @param string Condition statement
	* @return boolean True if condition is met, False if not
	*/
	protected function check_condition($condition)
	{
	return $this->eval_expression($condition);
	}

	/**
	* Inserts hidden field with CSRF-prevention-token into POST forms
	*/
	protected function alter_form_tag($matches)
	{
	$out = $matches[0];
	$attrib = html::parse_attrib_string($matches[1]);

	if (strtolower($attrib['method']) == 'post') {
	$hidden = new html_hiddenfield(array('name' => '_token', 'value' => $this->app->get_request_token()));
	$out .= "\n" . $hidden->show();
	}

	return $out;
	}

	/**
	* Parse & evaluate a given expression and return its result.
	*
	* @param string Expression statement
	*
	* @return mixed Expression result
	*/
	protected function eval_expression ($expression)
	{
	$expression = preg_replace(
	array(
	'/session:([a-z0-9_]+)/i',
	'/config:([a-z0-9_]+)(:([a-z0-9_]+))?/i',
	'/env:([a-z0-9_]+)/i',
	'/request:([a-z0-9_]+)/i',
	'/cookie:([a-z0-9_]+)/i',
	'/browser:([a-z0-9_]+)/i',
	'/template:name/i',
	),
	array(
	"\$_SESSION['\\1']",
	"\$app->config->get('\\1',rcube_utils::get_boolean('\\3'))",
	"\$env['\\1']",
	"rcube_utils::get_input_value('\\1', rcube_utils::INPUT_GPC)",
	"\$_COOKIE['\\1']",
	"\$browser->{'\\1'}",
	$this->template_name,
	),
	$expression
	);

	$fn = create_function('$app,$browser,$env', "return ($expression);");
	if (!$fn) {
	rcube::raise_error(array(
	'code' => 505,
	'type' => 'php',
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Expression parse error on: ($expression)"), true, false);

	return null;
	}

	return $fn($this->app, $this->browser, $this->env);
	}

	/**
	* Search for special tags in input and replace them
	* with the appropriate content
	*
	* @param string Input string to parse
	* @return string Altered input string
	* @todo Use DOM-parser to traverse template HTML
	* @todo Maybe a cache.
	*/
	protected function parse_xml($input)
	{
	return preg_replace_callback('/<roundcube:([-_a-z]+)\s+((?:[^>]\|\\\\>)+)(?<!\\\\)>/Ui', array($this, 'xml_command'), $input);
	}

	/**
	* Callback function for parsing an xml command tag
	* and turn it into real html content
	*
	* @param array Matches array of preg_replace_callback
	* @return string Tag/Object content
	*/
	protected function xml_command($matches)
	{
	$command = strtolower($matches[1]);
	$attrib = html::parse_attrib_string($matches[2]);

	// empty output if required condition is not met
	if (!empty($attrib['condition']) && !$this->check_condition($attrib['condition'])) {
	return '';
	}

	// localize title and summary attributes
	if ($command != 'button' && !empty($attrib['title']) && $this->app->text_exists($attrib['title'])) {
	$attrib['title'] = $this->app->gettext($attrib['title']);
	}
	if ($command != 'button' && !empty($attrib['summary']) && $this->app->text_exists($attrib['summary'])) {
	$attrib['summary'] = $this->app->gettext($attrib['summary']);
	}

	// execute command
	switch ($command) {
	// return a button
	case 'button':
	if ($attrib['name'] \|\| $attrib['command']) {
	return $this->button($attrib);
	}
	break;

	// frame
	case 'frame':
	return $this->frame($attrib);
	break;

	// show a label
	case 'label':
	if ($attrib['expression'])
	$attrib['name'] = $this->eval_expression($attrib['expression']);

	if ($attrib['name'] \|\| $attrib['command']) {
	$vars = $attrib + array('product' => $this->config->get('product_name'));
	unset($vars['name'], $vars['command']);

	$label = $this->app->gettext($attrib + array('vars' => $vars));
	$quoting = !empty($attrib['quoting']) ? strtolower($attrib['quoting']) : (rcube_utils::get_boolean((string)$attrib['html']) ? 'no' : '');

	// 'noshow' can be used in skins to define new labels
	if ($attrib['noshow']) {
	return '';
	}

	switch ($quoting) {
	case 'no':
	case 'raw':
	break;
	case 'javascript':
	case 'js':
	$label = rcube::JQ($label);
	break;
	default:
	$label = html::quote($label);
	break;
	}

	return $label;
	}
	break;

	// include a file
	case 'include':
	$old_base_path = $this->base_path;
	if (!empty($attrib['skin_path'])) $attrib['skinpath'] = $attrib['skin_path'];
	if ($path = $this->get_skin_file($attrib['file'], $skin_path, $attrib['skinpath'])) {
	$this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin)
	- $path = realpath($path);
	+ $path = realpath(RCUBE_INSTALL_PATH . $path);
	}

	if (is_readable($path)) {
	if ($this->config->get('skin_include_php')) {
	$incl = $this->include_php($path);
	}
	else {
	$incl = file_get_contents($path);
	}
	$incl = $this->parse_conditions($incl);
	$incl = $this->parse_xml($incl);
	$incl = $this->fix_paths($incl);
	$this->base_path = $old_base_path;
	return $incl;
	}
	break;

	case 'plugin.include':
	$hook = $this->app->plugins->exec_hook("template_plugin_include", $attrib);
	return $hook['content'];

	// define a container block
	case 'container':
	if ($attrib['name'] && $attrib['id']) {
	$this->command('gui_container', $attrib['name'], $attrib['id']);
	// let plugins insert some content here
	$hook = $this->app->plugins->exec_hook("template_container", $attrib);
	return $hook['content'];
	}
	break;

	// return code for a specific application object
	case 'object':
	$object = strtolower($attrib['name']);
	$content = '';

	// we are calling a class/method
	if (($handler = $this->object_handlers[$object]) && is_array($handler)) {
	if ((is_object($handler[0]) && method_exists($handler[0], $handler[1])) \|\|
	(is_string($handler[0]) && class_exists($handler[0])))
	$content = call_user_func($handler, $attrib);
	}
	// execute object handler function
	else if (function_exists($handler)) {
	$content = call_user_func($handler, $attrib);
	}
	else if ($object == 'doctype') {
	$content = html::doctype($attrib['value']);
	}
	else if ($object == 'logo') {
	$attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));

	if ($logo = $this->config->get('skin_logo')) {
	if (is_array($logo)) {
	if ($template_logo = $logo[$this->template_name]) {
	$attrib['src'] = $template_logo;
	}
	elseif ($template_logo = $logo['*']) {
	$attrib['src'] = $template_logo;
	}
	}
	else {
	$attrib['src'] = $logo;
	}
	}

	$content = html::img($attrib);
	}
	else if ($object == 'productname') {
	$name = $this->config->get('product_name', 'Roundcube Webmail');
	$content = html::quote($name);
	}
	else if ($object == 'version') {
	$ver = (string)RCMAIL_VERSION;
	if (is_file(RCUBE_INSTALL_PATH . '.svn/entries')) {
	if (preg_match('/Revision:\s(\d+)/', @shell_exec('svn info'), $regs))
	$ver .= ' [SVN r'.$regs[1].']';
	}
	else if (is_file(RCUBE_INSTALL_PATH . '.git/index')) {
	if (preg_match('/Date:\s+([^\n]+)/', @shell_exec('git log -1'), $regs)) {
	if ($date = date('Ymd.Hi', strtotime($regs[1]))) {
	$ver .= ' [GIT '.$date.']';
	}
	}
	}
	$content = html::quote($ver);
	}
	else if ($object == 'steptitle') {
	$content = html::quote($this->get_pagetitle());
	}
	else if ($object == 'pagetitle') {
	if ($this->devel_mode && !empty($_SESSION['username']))
	$title = $_SESSION['username'].' :: ';
	else if ($prod_name = $this->config->get('product_name'))
	$title = $prod_name . ' :: ';
	else
	$title = '';
	$title .= $this->get_pagetitle();
	$content = html::quote($title);
	}

	// exec plugin hooks for this template object
	$hook = $this->app->plugins->exec_hook("template_object_$object", $attrib + array('content' => $content));
	return $hook['content'];

	// return code for a specified eval expression
	case 'exp':
	return html::quote($this->eval_expression($attrib['expression']));

	// return variable
	case 'var':
	$var = explode(':', $attrib['name']);
	$name = $var[1];
	$value = '';

	switch ($var[0]) {
	case 'env':
	$value = $this->env[$name];
	break;
	case 'config':
	$value = $this->config->get($name);
	if (is_array($value) && $value[$_SESSION['storage_host']]) {
	$value = $value[$_SESSION['storage_host']];
	}
	break;
	case 'request':
	$value = rcube_utils::get_input_value($name, rcube_utils::INPUT_GPC);
	break;
	case 'session':
	$value = $_SESSION[$name];
	break;
	case 'cookie':
	$value = htmlspecialchars($_COOKIE[$name]);
	break;
	case 'browser':
	$value = $this->browser->{$name};
	break;
	}

	if (is_array($value)) {
	$value = implode(', ', $value);
	}

	return html::quote($value);

	case 'form':
	return $this->form_tag($attrib);
	}
	return '';
	}

	/**
	* Include a specific file and return it's contents
	*
	* @param string File path
	* @return string Contents of the processed file
	*/
	protected function include_php($file)
	{
	ob_start();
	include $file;
	$out = ob_get_contents();
	ob_end_clean();

	return $out;
	}

	/**
	* Create and register a button
	*
	* @param array Named button attributes
	* @return string HTML button
	* @todo Remove all inline JS calls and use jQuery instead.
	* @todo Remove all sprintf()'s - they are pretty, but also slow.
	*/
	public function button($attrib)
	{
	static $s_button_count = 100;
	static $disabled_actions = null;

	// these commands can be called directly via url
	$a_static_commands = array('compose', 'list', 'preferences', 'folders', 'identities');

	if (!($attrib['command'] \|\| $attrib['name'] \|\| $attrib['href'])) {
	return '';
	}


	// try to find out the button type
	if ($attrib['type']) {
	$attrib['type'] = strtolower($attrib['type']);
	if ($pos = strpos($attrib['type'], '-menuitem')) {
	$attrib['type'] = substr($attrib['type'], 0, -9);
	$menuitem = true;
	}
	}
	else {
	$attrib['type'] = ($attrib['image'] \|\| $attrib['imagepas'] \|\| $attrib['imageact']) ? 'image' : 'link';
	}

	$command = $attrib['command'];

	if ($attrib['task']) {
	$element = $command = $attrib['task'] . '.' . $command;
	}
	else {
	$element = ($this->env['task'] ? $this->env['task'] . '.' : '') . $command;
	}

	if ($disabled_actions === null) {
	$disabled_actions = (array) $this->config->get('disabled_actions');
	}

	// remove buttons for disabled actions
	if (in_array($element, $disabled_actions)) {
	return '';
	}

	if (!$attrib['image']) {
	$attrib['image'] = $attrib['imagepas'] ? $attrib['imagepas'] : $attrib['imageact'];
	}

	if (!$attrib['id']) {
	$attrib['id'] = sprintf('rcmbtn%d', $s_button_count++);
	}
	// get localized text for labels and titles
	if ($attrib['title']) {
	$attrib['title'] = html::quote($this->app->gettext($attrib['title'], $attrib['domain']));
	}
	if ($attrib['label']) {
	$attrib['label'] = html::quote($this->app->gettext($attrib['label'], $attrib['domain']));
	}
	if ($attrib['alt']) {
	$attrib['alt'] = html::quote($this->app->gettext($attrib['alt'], $attrib['domain']));
	}

	// set accessibility attributes
	if (!$attrib['role']) {
	$attrib['role'] = 'button';
	}
	if (!empty($attrib['class']) && !empty($attrib['classact']) \|\| !empty($attrib['imagepas']) && !empty($attrib['imageact'])) {
	if (array_key_exists('tabindex', $attrib))
	$attrib['data-tabindex'] = $attrib['tabindex'];
	$attrib['tabindex'] = '-1'; // disable button by default
	$attrib['aria-disabled'] = 'true';
	}

	// set title to alt attribute for IE browsers
	if ($this->browser->ie && !$attrib['title'] && $attrib['alt']) {
	$attrib['title'] = $attrib['alt'];
	}

	// add empty alt attribute for XHTML compatibility
	if (!isset($attrib['alt'])) {
	$attrib['alt'] = '';
	}

	// register button in the system
	if ($attrib['command']) {
	$this->add_script(sprintf(
	"%s.register_button('%s', '%s', '%s', '%s', '%s', '%s');",
	self::JS_OBJECT_NAME,
	$command,
	$attrib['id'],
	$attrib['type'],
	$attrib['imageact'] ? $this->abs_url($attrib['imageact']) : $attrib['classact'],
	$attrib['imagesel'] ? $this->abs_url($attrib['imagesel']) : $attrib['classsel'],
	$attrib['imageover'] ? $this->abs_url($attrib['imageover']) : ''
	));

	// make valid href to specific buttons
	if (in_array($attrib['command'], rcmail::$main_tasks)) {
	$attrib['href'] = $this->app->url(array('task' => $attrib['command']));
	$attrib['onclick'] = sprintf("return %s.command('switch-task','%s',this,event)", self::JS_OBJECT_NAME, $attrib['command']);
	}
	else if ($attrib['task'] && in_array($attrib['task'], rcmail::$main_tasks)) {
	$attrib['href'] = $this->app->url(array('action' => $attrib['command'], 'task' => $attrib['task']));
	}
	else if (in_array($attrib['command'], $a_static_commands)) {
	$attrib['href'] = $this->app->url(array('action' => $attrib['command']));
	}
	else if (($attrib['command'] == 'permaurl' \|\| $attrib['command'] == 'extwin') && !empty($this->env['permaurl'])) {
	$attrib['href'] = $this->env['permaurl'];
	}
	}

	// overwrite attributes
	if (!$attrib['href']) {
	$attrib['href'] = '#';
	}
	if ($attrib['task']) {
	if ($attrib['classact'])
	$attrib['class'] = $attrib['classact'];
	}
	else if ($command && !$attrib['onclick']) {
	$attrib['onclick'] = sprintf(
	"return %s.command('%s','%s',this,event)",
	self::JS_OBJECT_NAME,
	$command,
	$attrib['prop']
	);
	}

	$out = '';

	// generate image tag
	if ($attrib['type'] == 'image') {
	$attrib_str = html::attrib_string(
	$attrib,
	array(
	'style', 'class', 'id', 'width', 'height', 'border', 'hspace',
	'vspace', 'align', 'alt', 'tabindex', 'title'
	)
	);
	$btn_content = sprintf('<img src="%s"%s />', $this->abs_url($attrib['image']), $attrib_str);
	if ($attrib['label']) {
	$btn_content .= ' '.$attrib['label'];
	}
	$link_attrib = array('href', 'onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'target');
	}
	else if ($attrib['type'] == 'link') {
	$btn_content = isset($attrib['content']) ? $attrib['content'] : ($attrib['label'] ? $attrib['label'] : $attrib['command']);
	$link_attrib = array_merge(html::$common_attrib, array('href', 'onclick', 'tabindex', 'target'));
	if ($attrib['innerclass'])
	$btn_content = html::span($attrib['innerclass'], $btn_content);
	}
	else if ($attrib['type'] == 'input') {
	$attrib['type'] = 'button';

	if ($attrib['label']) {
	$attrib['value'] = $attrib['label'];
	}
	if ($attrib['command']) {
	$attrib['disabled'] = 'disabled';
	}

	$out = html::tag('input', $attrib, null, array('type', 'value', 'onclick', 'id', 'class', 'style', 'tabindex', 'disabled'));
	}

	// generate html code for button
	if ($btn_content) {
	$attrib_str = html::attrib_string($attrib, $link_attrib);
	$out = sprintf('<a%s>%s</a>', $attrib_str, $btn_content);
	}

	if ($attrib['wrapper']) {
	$out = html::tag($attrib['wrapper'], null, $out);
	}

	if ($menuitem) {
	$class = $attrib['menuitem-class'] ? ' class="' . $attrib['menuitem-class'] . '"' : '';
	$out = '<li role="menuitem"' . $class . '>' . $out . '</li>';
	}

	return $out;
	}

	/**
	* Link an external script file
	*
	* @param string File URL
	* @param string Target position [head\|foot]
	*/
	public function include_script($file, $position='head')
	{
	if (!preg_match('\|^https?://\|i', $file) && $file[0] != '/') {
	$file = $this->file_mod($this->scripts_path . $file);
	}

	if (!is_array($this->script_files[$position])) {
	$this->script_files[$position] = array();
	}

	if (!in_array($file, $this->script_files[$position])) {
	$this->script_files[$position][] = $file;
	}
	}

	/**
	* Add inline javascript code
	*
	* @param string JS code snippet
	* @param string Target position [head\|head_top\|foot]
	*/
	public function add_script($script, $position='head')
	{
	if (!isset($this->scripts[$position])) {
	$this->scripts[$position] = "\n" . rtrim($script);
	}
	else {
	$this->scripts[$position] .= "\n" . rtrim($script);
	}
	}

	/**
	* Link an external css file
	*
	* @param string File URL
	*/
	public function include_css($file)
	{
	$this->css_files[] = $file;
	}

	/**
	* Add HTML code to the page header
	*
	* @param string $str HTML code
	*/
	public function add_header($str)
	{
	$this->header .= "\n" . $str;
	}

	/**
	* Add HTML code to the page footer
	* To be added right befor </body>
	*
	* @param string $str HTML code
	*/
	public function add_footer($str)
	{
	$this->footer .= "\n" . $str;
	}

	/**
	* Process template and write to stdOut
	*
	* @param string HTML template
	* @param string Base for absolute paths
	*/
	public function _write($templ = '', $base_path = '')
	{
	$output = trim($templ);

	if (empty($output)) {
	$output = html::doctype('html5') . "\n" . $this->default_template;
	$is_empty = true;
	}

	// set default page title
	if (empty($this->pagetitle)) {
	$this->pagetitle = 'Roundcube Mail';
	}

	// declare page language
	if (!empty($_SESSION['language'])) {
	$lang = substr($_SESSION['language'], 0, 2);
	$output = preg_replace('/<html/', '<html lang="' . html::quote($lang) . '"', $output, 1);
	if (!headers_sent()) {
	header('Content-Language: ' . $lang);
	}
	}

	// replace specialchars in content
	$page_title = html::quote($this->pagetitle);
	$page_header = '';
	$page_footer = '';

	// include meta tag with charset
	if (!empty($this->charset)) {
	if (!headers_sent()) {
	header('Content-Type: text/html; charset=' . $this->charset);
	}
	$page_header = '<meta http-equiv="content-type"';
	$page_header.= ' content="text/html; charset=';
	$page_header.= $this->charset . '" />'."\n";
	}

	// definition of the code to be placed in the document header and footer
	if (is_array($this->script_files['head'])) {
	foreach ($this->script_files['head'] as $file) {
	$page_header .= html::script($file);
	}
	}

	$head_script = $this->scripts['head_top'] . $this->scripts['head'];
	if (!empty($head_script)) {
	$page_header .= html::script(array(), $head_script);
	}

	if (!empty($this->header)) {
	$page_header .= $this->header;
	}

	// put docready commands into page footer
	if (!empty($this->scripts['docready'])) {
	$this->add_script('$(document).ready(function(){ ' . $this->scripts['docready'] . "\n});", 'foot');
	}

	if (is_array($this->script_files['foot'])) {
	foreach ($this->script_files['foot'] as $file) {
	$page_footer .= html::script($file);
	}
	}

	if (!empty($this->footer)) {
	$page_footer .= $this->footer . "\n";
	}

	if (!empty($this->scripts['foot'])) {
	$page_footer .= html::script(array(), $this->scripts['foot']);
	}

	// find page header
	if ($hpos = stripos($output, '</head>')) {
	$page_header .= "\n";
	}
	else {
	if (!is_numeric($hpos)) {
	$hpos = stripos($output, '<body');
	}
	if (!is_numeric($hpos) && ($hpos = stripos($output, '<html'))) {
	while ($output[$hpos] != '>') {
	$hpos++;
	}
	$hpos++;
	}
	$page_header = "<head>\n<title>$page_title</title>\n$page_header\n</head>\n";
	}

	// add page hader
	if ($hpos) {
	$output = substr_replace($output, $page_header, $hpos, 0);
	}
	else {
	$output = $page_header . $output;
	}

	// add page footer
	if (($fpos = strripos($output, '</body>')) \|\| ($fpos = strripos($output, '</html>'))) {
	$output = substr_replace($output, $page_footer."\n", $fpos, 0);
	}
	else {
	$output .= "\n".$page_footer;
	}

	// add css files in head, before scripts, for speed up with parallel downloads
	if (!empty($this->css_files) && !$is_empty
	&& (($pos = stripos($output, '<script ')) \|\| ($pos = stripos($output, '</head>')))
	) {
	$css = '';
	foreach ($this->css_files as $file) {
	$css .= html::tag('link', array('rel' => 'stylesheet',
	'type' => 'text/css', 'href' => $file, 'nl' => true));
	}
	$output = substr_replace($output, $css, $pos, 0);
	}

	$output = $this->parse_with_globals($this->fix_paths($output));

	+ if ($this->assets_path) {
	+ $output = $this->fix_assets_paths($output);
	+ }
	+
	// trigger hook with final HTML content to be sent
	$hook = $this->app->plugins->exec_hook("send_page", array('content' => $output));
	if (!$hook['abort']) {
	if ($this->charset != RCUBE_CHARSET) {
	echo rcube_charset::convert($hook['content'], RCUBE_CHARSET, $this->charset);
	}
	else {
	echo $hook['content'];
	}
	}
	}

	/**
	* Returns iframe object, registers some related env variables
	*
	* @param array $attrib HTML attributes
	* @param boolean $is_contentframe Register this iframe as the 'contentframe' gui object
	* @return string IFRAME element
	*/
	public function frame($attrib, $is_contentframe = false)
	{
	static $idcount = 0;

	if (!$attrib['id']) {
	$attrib['id'] = 'rcmframe' . ++$idcount;
	}

	$attrib['name'] = $attrib['id'];
	- $attrib['src'] = $attrib['src'] ? $this->abs_url($attrib['src'], true) : 'program/resources/blank.gif';
	+ $attrib['src'] = $attrib['src'] ? $this->abs_url($attrib['src'], true) : 'program/resources/blank.gif';

	// register as 'contentframe' object
	if ($is_contentframe \|\| $attrib['contentframe']) {
	$this->set_env('contentframe', $attrib['contentframe'] ? $attrib['contentframe'] : $attrib['name']);
	- $this->set_env('blankpage', $attrib['src']);
	+ $this->set_env('blankpage', $this->asset_url($attrib['src']));
	}

	return html::iframe($attrib);
	}


	/* *********** common functions delivering gui objects ************ */

	/**
	* Create a form tag with the necessary hidden fields
	*
	* @param array Named tag parameters
	* @return string HTML code for the form
	*/
	public function form_tag($attrib, $content = null)
	{
	if ($this->framed \|\| $this->env['framed']) {
	$hiddenfield = new html_hiddenfield(array('name' => '_framed', 'value' => '1'));
	$hidden = $hiddenfield->show();
	}
	if ($this->env['extwin']) {
	$hiddenfield = new html_hiddenfield(array('name' => '_extwin', 'value' => '1'));
	$hidden = $hiddenfield->show();
	}

	if (!$content)
	$attrib['noclose'] = true;

	return html::tag('form',
	$attrib + array('action' => $this->app->comm_path, 'method' => "get"),
	$hidden . $content,
	array('id','class','style','name','method','action','enctype','onsubmit'));
	}

	/**
	* Build a form tag with a unique request token
	*
	* @param array Named tag parameters including 'action' and 'task' values which will be put into hidden fields
	* @param string Form content
	* @return string HTML code for the form
	*/
	public function request_form($attrib, $content = '')
	{
	$hidden = new html_hiddenfield();
	if ($attrib['task']) {
	$hidden->add(array('name' => '_task', 'value' => $attrib['task']));
	}
	if ($attrib['action']) {
	$hidden->add(array('name' => '_action', 'value' => $attrib['action']));
	}

	unset($attrib['task'], $attrib['request']);
	$attrib['action'] = './';

	// we already have a <form> tag
	if ($attrib['form']) {
	if ($this->framed \|\| $this->env['framed'])
	$hidden->add(array('name' => '_framed', 'value' => '1'));
	return $hidden->show() . $content;
	}
	else
	return $this->form_tag($attrib, $hidden->show() . $content);
	}

	/**
	* GUI object 'username'
	* Showing IMAP username of the current session
	*
	* @param array Named tag parameters (currently not used)
	* @return string HTML code for the gui object
	*/
	public function current_username($attrib)
	{
	static $username;

	// alread fetched
	if (!empty($username)) {
	return $username;
	}

	// Current username is an e-mail address
	if (strpos($_SESSION['username'], '@')) {
	$username = $_SESSION['username'];
	}
	// get e-mail address from default identity
	else if ($sql_arr = $this->app->user->get_identity()) {
	$username = $sql_arr['email'];
	}
	else {
	$username = $this->app->user->get_username();
	}

	return rcube_utils::idn_to_utf8($username);
	}

	/**
	* GUI object 'loginform'
	* Returns code for the webmail login form
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	protected function login_form($attrib)
	{
	$default_host = $this->config->get('default_host');
	$autocomplete = (int) $this->config->get('login_autocomplete');

	$_SESSION['temp'] = true;

	// save original url
	$url = rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST);
	if (empty($url) && !preg_match('/_(task\|action)=logout/', $_SERVER['QUERY_STRING']))
	$url = $_SERVER['QUERY_STRING'];

	// Disable autocapitalization on iPad/iPhone (#1488609)
	$attrib['autocapitalize'] = 'off';

	// set atocomplete attribute
	$user_attrib = $autocomplete > 0 ? array() : array('autocomplete' => 'off');
	$host_attrib = $autocomplete > 0 ? array() : array('autocomplete' => 'off');
	$pass_attrib = $autocomplete > 1 ? array() : array('autocomplete' => 'off');

	$input_task = new html_hiddenfield(array('name' => '_task', 'value' => 'login'));
	$input_action = new html_hiddenfield(array('name' => '_action', 'value' => 'login'));
	$input_tzone = new html_hiddenfield(array('name' => '_timezone', 'id' => 'rcmlogintz', 'value' => '_default_'));
	$input_url = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => $url));
	$input_user = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser', 'required' => 'required')
	+ $attrib + $user_attrib);
	$input_pass = new html_passwordfield(array('name' => '_pass', 'id' => 'rcmloginpwd', 'required' => 'required')
	+ $attrib + $pass_attrib);
	$input_host = null;

	if (is_array($default_host) && count($default_host) > 1) {
	$input_host = new html_select(array('name' => '_host', 'id' => 'rcmloginhost'));

	foreach ($default_host as $key => $value) {
	if (!is_array($value)) {
	$input_host->add($value, (is_numeric($key) ? $value : $key));
	}
	else {
	$input_host = null;
	break;
	}
	}
	}
	else if (is_array($default_host) && ($host = key($default_host)) !== null) {
	$hide_host = true;
	$input_host = new html_hiddenfield(array(
	'name' => '_host', 'id' => 'rcmloginhost', 'value' => is_numeric($host) ? $default_host[$host] : $host) + $attrib);
	}
	else if (empty($default_host)) {
	$input_host = new html_inputfield(array('name' => '_host', 'id' => 'rcmloginhost')
	+ $attrib + $host_attrib);
	}

	$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
	$this->add_gui_object('loginform', $form_name);

	// create HTML table with two cols
	$table = new html_table(array('cols' => 2));

	$table->add('title', html::label('rcmloginuser', html::quote($this->app->gettext('username'))));
	$table->add('input', $input_user->show(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC)));

	$table->add('title', html::label('rcmloginpwd', html::quote($this->app->gettext('password'))));
	$table->add('input', $input_pass->show());

	// add host selection row
	if (is_object($input_host) && !$hide_host) {
	$table->add('title', html::label('rcmloginhost', html::quote($this->app->gettext('server'))));
	$table->add('input', $input_host->show(rcube_utils::get_input_value('_host', rcube_utils::INPUT_GPC)));
	}

	$out = $input_task->show();
	$out .= $input_action->show();
	$out .= $input_tzone->show();
	$out .= $input_url->show();
	$out .= $table->show();

	if ($hide_host) {
	$out .= $input_host->show();
	}

	if (rcube_utils::get_boolean($attrib['submit'])) {
	$submit = new html_inputfield(array('type' => 'submit', 'id' => 'rcmloginsubmit',
	'class' => 'button mainaction', 'value' => $this->app->gettext('login')));
	$out .= html::p('formbuttons', $submit->show());
	}

	// surround html output with a form tag
	if (empty($attrib['form'])) {
	$out = $this->form_tag(array('name' => $form_name, 'method' => 'post'), $out);
	}

	// include script for timezone detection
	$this->include_script('jstz.min.js');

	return $out;
	}

	/**
	* GUI object 'preloader'
	* Loads javascript code for images preloading
	*
	* @param array Named parameters
	* @return void
	*/
	protected function preloader($attrib)
	{
	$images = preg_split('/[\s\t\n,]+/', $attrib['images'], -1, PREG_SPLIT_NO_EMPTY);
	$images = array_map(array($this, 'abs_url'), $images);
	+ $images = array_map(array($this, 'asset_url'), $images);

	- if (empty($images) \|\| $this->app->task == 'logout')
	+ if (empty($images) \|\| $_REQUEST['_task'] == 'logout') {
	return;
	+ }

	$this->add_script('var images = ' . self::json_serialize($images) .';
	for (var i=0; i<images.length; i++) {
	img = new Image();
	img.src = images[i];
	}', 'docready');
	}

	/**
	* GUI object 'searchform'
	* Returns code for search function
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	protected function search_form($attrib)
	{
	// add some labels to client
	$this->add_label('searching');

	$attrib['name'] = '_q';

	if (empty($attrib['id'])) {
	$attrib['id'] = 'rcmqsearchbox';
	}
	if ($attrib['type'] == 'search' && !$this->browser->khtml) {
	unset($attrib['type'], $attrib['results']);
	}

	$input_q = new html_inputfield($attrib);
	$out = $input_q->show();

	$this->add_gui_object('qsearchbox', $attrib['id']);

	// add form tag around text field
	if (empty($attrib['form'])) {
	$out = $this->form_tag(array(
	'name' => "rcmqsearchform",
	'onsubmit' => self::JS_OBJECT_NAME . ".command('search'); return false",
	'style' => "display:inline"),
	$out);
	}

	return $out;
	}

	/**
	* Builder for GUI object 'message'
	*
	* @param array Named tag parameters
	* @return string HTML code for the gui object
	*/
	protected function message_container($attrib)
	{
	if (isset($attrib['id']) === false) {
	$attrib['id'] = 'rcmMessageContainer';
	}

	$this->add_gui_object('message', $attrib['id']);

	return html::div($attrib, '');
	}

	/**
	* GUI object 'charsetselector'
	*
	* @param array Named parameters for the select tag
	* @return string HTML code for the gui object
	*/
	public function charset_selector($attrib)
	{
	// pass the following attributes to the form class
	$field_attrib = array('name' => '_charset');
	foreach ($attrib as $attr => $value) {
	if (in_array($attr, array('id', 'name', 'class', 'style', 'size', 'tabindex'))) {
	$field_attrib[$attr] = $value;
	}
	}

	$charsets = array(
	'UTF-8' => 'UTF-8 ('.$this->app->gettext('unicode').')',
	'US-ASCII' => 'ASCII ('.$this->app->gettext('english').')',
	'ISO-8859-1' => 'ISO-8859-1 ('.$this->app->gettext('westerneuropean').')',
	'ISO-8859-2' => 'ISO-8859-2 ('.$this->app->gettext('easterneuropean').')',
	'ISO-8859-4' => 'ISO-8859-4 ('.$this->app->gettext('baltic').')',
	'ISO-8859-5' => 'ISO-8859-5 ('.$this->app->gettext('cyrillic').')',
	'ISO-8859-6' => 'ISO-8859-6 ('.$this->app->gettext('arabic').')',
	'ISO-8859-7' => 'ISO-8859-7 ('.$this->app->gettext('greek').')',
	'ISO-8859-8' => 'ISO-8859-8 ('.$this->app->gettext('hebrew').')',
	'ISO-8859-9' => 'ISO-8859-9 ('.$this->app->gettext('turkish').')',
	'ISO-8859-10' => 'ISO-8859-10 ('.$this->app->gettext('nordic').')',
	'ISO-8859-11' => 'ISO-8859-11 ('.$this->app->gettext('thai').')',
	'ISO-8859-13' => 'ISO-8859-13 ('.$this->app->gettext('baltic').')',
	'ISO-8859-14' => 'ISO-8859-14 ('.$this->app->gettext('celtic').')',
	'ISO-8859-15' => 'ISO-8859-15 ('.$this->app->gettext('westerneuropean').')',
	'ISO-8859-16' => 'ISO-8859-16 ('.$this->app->gettext('southeasterneuropean').')',
	'WINDOWS-1250' => 'Windows-1250 ('.$this->app->gettext('easterneuropean').')',
	'WINDOWS-1251' => 'Windows-1251 ('.$this->app->gettext('cyrillic').')',
	'WINDOWS-1252' => 'Windows-1252 ('.$this->app->gettext('westerneuropean').')',
	'WINDOWS-1253' => 'Windows-1253 ('.$this->app->gettext('greek').')',
	'WINDOWS-1254' => 'Windows-1254 ('.$this->app->gettext('turkish').')',
	'WINDOWS-1255' => 'Windows-1255 ('.$this->app->gettext('hebrew').')',
	'WINDOWS-1256' => 'Windows-1256 ('.$this->app->gettext('arabic').')',
	'WINDOWS-1257' => 'Windows-1257 ('.$this->app->gettext('baltic').')',
	'WINDOWS-1258' => 'Windows-1258 ('.$this->app->gettext('vietnamese').')',
	'ISO-2022-JP' => 'ISO-2022-JP ('.$this->app->gettext('japanese').')',
	'ISO-2022-KR' => 'ISO-2022-KR ('.$this->app->gettext('korean').')',
	'ISO-2022-CN' => 'ISO-2022-CN ('.$this->app->gettext('chinese').')',
	'EUC-JP' => 'EUC-JP ('.$this->app->gettext('japanese').')',
	'EUC-KR' => 'EUC-KR ('.$this->app->gettext('korean').')',
	'EUC-CN' => 'EUC-CN ('.$this->app->gettext('chinese').')',
	'BIG5' => 'BIG5 ('.$this->app->gettext('chinese').')',
	'GB2312' => 'GB2312 ('.$this->app->gettext('chinese').')',
	);

	if (!empty($_POST['_charset'])) {
	$set = $_POST['_charset'];
	}
	else if (!empty($attrib['selected'])) {
	$set = $attrib['selected'];
	}
	else {
	$set = $this->get_charset();
	}

	$set = strtoupper($set);
	if (!isset($charsets[$set])) {
	$charsets[$set] = $set;
	}

	$select = new html_select($field_attrib);
	$select->add(array_values($charsets), array_keys($charsets));

	return $select->show($set);
	}

	/**
	* Include content from config/about.<LANG>.html if available
	*/
	protected function about_content($attrib)
	{
	$content = '';
	$filenames = array(
	'about.' . $_SESSION['language'] . '.html',
	'about.' . substr($_SESSION['language'], 0, 2) . '.html',
	'about.html',
	);
	foreach ($filenames as $file) {
	$fn = RCUBE_CONFIG_DIR . $file;
	if (is_readable($fn)) {
	$content = file_get_contents($fn);
	$content = $this->parse_conditions($content);
	$content = $this->parse_xml($content);
	break;
	}
	}

	return $content;
	}

	}
	diff --git a/program/include/rcmail_output_json.php b/program/include/rcmail_output_json.php
	index fa35824db..91262acb3 100644
	--- a/program/include/rcmail_output_json.php
	+++ b/program/include/rcmail_output_json.php
	@@ -1,265 +1,270 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcmail_output_json.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-2012, 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. \|
	\| \|
	\| PURPOSE: \|
	\| Class to handle JSON (AJAX) output \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* View class to produce JSON responses
	*
	* @package Webmail
	* @subpackage View
	*/
	class rcmail_output_json extends rcmail_output
	{
	protected $texts = array();
	protected $commands = array();
	protected $callbacks = array();
	protected $message = null;

	public $type = 'js';
	public $ajax_call = true;


	/**
	* Issue command to set page title
	*
	* @param string $title New page title
	*/
	public function set_pagetitle($title)
	{
	if ($this->config->get('devel_mode') && !empty($_SESSION['username']))
	$name = $_SESSION['username'];
	else
	$name = $this->config->get('product_name');

	$this->command('set_pagetitle', empty($name) ? $title : $name.' :: '.$title);
	}


	/**
	* Register a template object handler
	*
	* @param string $obj Object name
	* @param string $func Function name to call
	*/
	public function add_handler($obj, $func)
	{
	// ignore
	}


	/**
	* Register a list of template object handlers
	*
	* @param array $arr Hash array with object=>handler pairs
	*/
	public function add_handlers($arr)
	{
	// ignore
	}


	/**
	* Call a client method
	*
	* @param string Method to call
	* @param ... Additional arguments
	*/
	public function command()
	{
	$cmd = func_get_args();

	if (strpos($cmd[0], 'plugin.') === 0)
	$this->callbacks[] = $cmd;
	else
	$this->commands[] = $cmd;
	}


	/**
	* Add a localized label to the client environment
	*/
	public function add_label()
	{
	$args = func_get_args();
	if (count($args) == 1 && is_array($args[0]))
	$args = $args[0];

	foreach ($args as $name) {
	$this->texts[$name] = $this->app->gettext($name);
	}
	}


	/**
	* Invoke display_message command
	*
	* @param string $message Message to display
	* @param string $type Message type [notice\|confirm\|error]
	* @param array $vars Key-value pairs to be replaced in localized text
	* @param boolean $override Override last set message
	* @param int $timeout Message displaying time in seconds
	* @uses self::command()
	*/
	public function show_message($message, $type='notice', $vars=null, $override=true, $timeout=0)
	{
	if ($override \|\| !$this->message) {
	if ($this->app->text_exists($message)) {
	if (!empty($vars)) {
	$vars = array_map(array('rcmail', 'Q'), $vars);
	}
	$msgtext = $this->app->gettext(array('name' => $message, 'vars' => $vars));
	}
	else
	$msgtext = $message;

	$this->message = $message;
	$this->command('display_message', $msgtext, $type, $timeout * 1000);
	}
	}


	/**
	* Delete all stored env variables and commands
	*/
	public function reset()
	{
	parent::reset();
	$this->texts = array();
	$this->commands = array();
	}


	/**
	* Redirect to a certain url
	*
	* @param mixed $p Either a string with the action or url parameters as key-value pairs
	* @param int $delay Delay in seconds
	* @see rcmail::url()
	*/
	public function redirect($p = array(), $delay = 1)
	{
	$location = $this->app->url($p);
	$this->remote_response(sprintf("window.setTimeout(function(){ %s.redirect('%s',true); }, %d);",
	self::JS_OBJECT_NAME, $location, $delay));
	exit;
	}


	/**
	* Send an AJAX response to the client.
	*/
	public function send()
	{
	$this->remote_response();
	exit;
	}


	/**
	* Show error page and terminate script execution
	*
	* @param int $code Error code
	* @param string $message Error message
	*/
	public function raise_error($code, $message)
	{
	+ if ($code == 403) {
	+ header('HTTP/1.1 403 Forbidden');
	+ die("Invalid Request");
	+ }
	+
	$this->show_message("Application Error ($code): $message", 'error');
	$this->remote_response();
	exit;
	}


	/**
	* Send an AJAX response with executable JS code
	*
	* @param string $add Additional JS code
	* @param boolean True if output buffer should be flushed
	* @return void
	* @deprecated
	*/
	protected function remote_response($add='')
	{
	static $s_header_sent = false;

	if (!$s_header_sent) {
	$s_header_sent = true;
	$this->nocacheing_headers();
	header('Content-Type: text/plain; charset=' . $this->get_charset());
	}

	// unset default env vars
	unset($this->env['task'], $this->env['action'], $this->env['comm_path']);

	$rcmail = rcmail::get_instance();
	$response['action'] = $rcmail->action;

	if ($unlock = rcube_utils::get_input_value('_unlock', rcube_utils::INPUT_GPC)) {
	$response['unlock'] = $unlock;
	}

	if (!empty($this->env))
	$response['env'] = $this->env;

	if (!empty($this->texts))
	$response['texts'] = $this->texts;

	// send function calls
	$response['exec'] = $this->get_js_commands() . $add;

	if (!empty($this->callbacks))
	$response['callbacks'] = $this->callbacks;

	// trigger generic hook where plugins can put additional content to the response
	$hook = $this->app->plugins->exec_hook("render_response", array('response' => $response));

	// save some memory
	$response = $hook['response'];
	unset($hook['response']);

	echo self::json_serialize($response);
	}


	/**
	* Return executable javascript code for all registered commands
	*
	* @return string $out
	*/
	protected function get_js_commands()
	{
	$out = '';

	foreach ($this->commands as $i => $args) {
	$method = array_shift($args);
	foreach ($args as $i => $arg) {
	$args[$i] = self::json_serialize($arg);
	}

	$out .= sprintf(
	"this.%s(%s);\n",
	preg_replace('/^parent\./', '', $method),
	implode(',', $args)
	);
	}

	return $out;
	}
	}
	diff --git a/program/js/app.js b/program/js/app.js
	index e0a6d26e3..4e65a9c6d 100644
	--- a/program/js/app.js
	+++ b/program/js/app.js
	@@ -1,8189 +1,8205 @@
	/**
	* Roundcube Webmail Client Script
	*
	* This file is part of the Roundcube Webmail client
	*
	* @licstart The following is the entire license notice for the
	* JavaScript code in this file.
	*
	* Copyright (C) 2005-2014, The Roundcube Dev Team
	* Copyright (C) 2011-2014, Kolab Systems AG
	*
	* The JavaScript code in this page is free software: you can
	* redistribute it and/or modify it under the terms of the GNU
	* General Public License (GNU GPL) as published by the Free Software
	* Foundation, either version 3 of the License, or (at your option)
	* any later version. The code is distributed WITHOUT ANY WARRANTY;
	* without even the implied warranty of MERCHANTABILITY or FITNESS
	* FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
	*
	* As additional permission under GNU GPL version 3 section 7, you
	* may distribute non-source (e.g., minimized or compacted) forms of
	* that code without the copy of the GNU GPL normally required by
	* section 4, provided you include this license notice and a URL
	* through which recipients can access the Corresponding Source.
	*
	* @licend The above is the entire license notice
	* for the JavaScript code in this file.
	*
	* @author Thomas Bruederli <roundcube@gmail.com>
	* @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
	* @author Charles McNulty <charles@charlesmcnulty.com>
	*
	* @requires jquery.js, common.js, list.js
	*/

	function rcube_webmail()
	{
	this.labels = {};
	this.buttons = {};
	this.buttons_sel = {};
	this.gui_objects = {};
	this.gui_containers = {};
	this.commands = {};
	this.command_handlers = {};
	this.onloads = [];
	this.messages = {};
	this.group2expand = {};
	this.http_request_jobs = {};
	this.menu_stack = [];

	// webmail client settings
	this.dblclick_time = 500;
	this.message_time = 5000;
	this.identifier_expr = /[^0-9a-z_-]/gi;

	// environment defaults
	this.env = {
	request_timeout: 180, // seconds
	draft_autosave: 0, // seconds
	comm_path: './',
	- blankpage: 'program/resources/blank.gif',
	recipients_separator: ',',
	recipients_delimiter: ', ',
	popup_width: 1150,
	popup_width_small: 900
	};

	// create protected reference to myself
	this.ref = 'rcmail';
	var ref = this;

	// set jQuery ajax options
	$.ajaxSetup({
	cache: false,
	timeout: this.env.request_timeout * 1000,
	error: function(request, status, err){ ref.http_error(request, status, err); },
	beforeSend: function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
	});

	// unload fix
	$(window).bind('beforeunload', function() { ref.unload = true; });

	// set environment variable(s)
	this.set_env = function(p, value)
	{
	if (p != null && typeof p === 'object' && !value)
	for (var n in p)
	this.env[n] = p[n];
	else
	this.env[p] = value;
	};

	// add a localized label to the client environment
	this.add_label = function(p, value)
	{
	if (typeof p == 'string')
	this.labels[p] = value;
	else if (typeof p == 'object')
	$.extend(this.labels, p);
	};

	// add a button to the button list
	this.register_button = function(command, id, type, act, sel, over)
	{
	var button_prop = {id:id, type:type};

	if (act) button_prop.act = act;
	if (sel) button_prop.sel = sel;
	if (over) button_prop.over = over;

	if (!this.buttons[command])
	this.buttons[command] = [];

	this.buttons[command].push(button_prop);

	if (this.loaded)
	init_button(command, button_prop);
	};

	// register a specific gui object
	this.gui_object = function(name, id)
	{
	this.gui_objects[name] = this.loaded ? rcube_find_object(id) : id;
	};

	// register a container object
	this.gui_container = function(name, id)
	{
	this.gui_containers[name] = id;
	};

	// add a GUI element (html node) to a specified container
	this.add_element = function(elm, container)
	{
	if (this.gui_containers[container] && this.gui_containers[container].jquery)
	this.gui_containers[container].append(elm);
	};

	// register an external handler for a certain command
	this.register_command = function(command, callback, enable)
	{
	this.command_handlers[command] = callback;

	if (enable)
	this.enable_command(command, true);
	};

	// execute the given script on load
	this.add_onload = function(f)
	{
	this.onloads.push(f);
	};

	// initialize webmail client
	this.init = function()
	{
	var n;
	this.task = this.env.task;

	// check browser
	if (this.env.server_error != 409 && (!bw.dom \|\| !bw.xmlhttp_test() \|\| (bw.mz && bw.vendver < 1.9) \|\| (bw.ie && bw.vendver < 7))) {
	this.goto_url('error', '_code=0x199');
	return;
	}

	+ if (!this.env.blankpage)
	+ this.env.blankpage = this.assets_path('program/resources/blank.gif');
	+
	// find all registered gui containers
	for (n in this.gui_containers)
	this.gui_containers[n] = $('#'+this.gui_containers[n]);

	// find all registered gui objects
	for (n in this.gui_objects)
	this.gui_objects[n] = rcube_find_object(this.gui_objects[n]);

	// clickjacking protection
	if (this.env.x_frame_options) {
	try {
	// bust frame if not allowed
	if (this.env.x_frame_options == 'deny' && top.location.href != self.location.href)
	top.location.href = self.location.href;
	else if (top.location.hostname != self.location.hostname)
	throw 1;
	} catch (e) {
	// possible clickjacking attack: disable all form elements
	$('form').each(function(){ ref.lock_form(this, true); });
	this.display_message("Blocked: possible clickjacking attack!", 'error');
	return;
	}
	}

	// init registered buttons
	this.init_buttons();

	// tell parent window that this frame is loaded
	if (this.is_framed()) {
	parent.rcmail.set_busy(false, null, parent.rcmail.env.frame_lock);
	parent.rcmail.env.frame_lock = null;
	}

	// enable general commands
	this.enable_command('close', 'logout', 'mail', 'addressbook', 'settings', 'save-pref',
	'compose', 'undo', 'about', 'switch-task', 'menu-open', 'menu-close', 'menu-save', true);

	// set active task button
	this.set_button(this.task, 'sel');

	if (this.env.permaurl)
	this.enable_command('permaurl', 'extwin', true);

	switch (this.task) {

	case 'mail':
	// enable mail commands
	this.enable_command('list', 'checkmail', 'add-contact', 'search', 'reset-search', 'collapse-folder', 'import-messages', true);

	if (this.gui_objects.messagelist) {
	this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {
	multiselect:true, multiexpand:true, draggable:true, keyboard:true,
	column_movable:this.env.col_movable, dblclick_time:this.dblclick_time
	});
	this.message_list
	.addEventListener('initrow', function(o) { ref.init_message_row(o); })
	.addEventListener('dblclick', function(o) { ref.msglist_dbl_click(o); })
	.addEventListener('click', function(o) { ref.msglist_click(o); })
	.addEventListener('keypress', function(o) { ref.msglist_keypress(o); })
	.addEventListener('select', function(o) { ref.msglist_select(o); })
	.addEventListener('dragstart', function(o) { ref.drag_start(o); })
	.addEventListener('dragmove', function(e) { ref.drag_move(e); })
	.addEventListener('dragend', function(e) { ref.drag_end(e); })
	.addEventListener('expandcollapse', function(o) { ref.msglist_expand(o); })
	.addEventListener('column_replace', function(o) { ref.msglist_set_coltypes(o); })
	.addEventListener('listupdate', function(o) { ref.triggerEvent('listupdate', o); })
	.init();

	// TODO: this should go into the list-widget code
	$(this.message_list.thead).on('click', 'a.sortcol', function(e){
	return ref.command('sort', $(this).attr('rel'), this);
	});

	this.enable_command('toggle_status', 'toggle_flag', 'sort', true);
	this.enable_command('set-listmode', this.env.threads && !this.is_multifolder_listing());

	// load messages
	this.command('list');

	$(this.gui_objects.qsearchbox).val(this.env.search_text).focusin(function() { ref.message_list.blur(); });
	}

	this.set_button_titles();

	this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list',
	'move', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource',
	'print', 'load-attachment', 'download-attachment', 'show-headers', 'hide-headers', 'download',
	'forward', 'forward-inline', 'forward-attachment', 'change-format'];

	if (this.env.action == 'show' \|\| this.env.action == 'preview') {
	this.enable_command(this.env.message_commands, this.env.uid);
	this.enable_command('reply-list', this.env.list_post);

	if (this.env.action == 'show') {
	this.http_request('pagenav', {_uid: this.env.uid, _mbox: this.env.mailbox, _search: this.env.search_request},
	this.display_message('', 'loading'));
	}

	if (this.env.blockedobjects) {
	if (this.gui_objects.remoteobjectsmsg)
	this.gui_objects.remoteobjectsmsg.style.display = 'block';
	this.enable_command('load-images', 'always-load', true);
	}

	// make preview/message frame visible
	if (this.env.action == 'preview' && this.is_framed()) {
	this.enable_command('compose', 'add-contact', false);
	parent.rcmail.show_contentframe(true);
	}
	}
	else if (this.env.action == 'compose') {
	this.env.address_group_stack = [];
	this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel',
	'toggle-editor', 'list-adresses', 'pushgroup', 'search', 'reset-search', 'extwin',
	'insert-response', 'save-response', 'menu-open', 'menu-close'];

	if (this.env.drafts_mailbox)
	this.env.compose_commands.push('savedraft')

	this.enable_command(this.env.compose_commands, 'identities', 'responses', true);

	// add more commands (not enabled)
	$.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']);

	if (window.googie) {
	this.env.editor_config.spellchecker = googie;
	this.env.editor_config.spellcheck_observer = function(s) { ref.spellcheck_state(); };

	this.env.compose_commands.push('spellcheck')
	this.enable_command('spellcheck', true);
	}

	// initialize HTML editor
	this.editor_init(this.env.editor_config, this.env.composebody);

	// init canned response functions
	if (this.gui_objects.responseslist) {
	$('a.insertresponse', this.gui_objects.responseslist)
	.attr('unselectable', 'on')
	.mousedown(function(e){ return rcube_event.cancel(e); })
	.bind('mouseup keypress', function(e){
	if (e.type == 'mouseup' \|\| rcube_event.get_keycode(e) == 13) {
	ref.command('insert-response', $(this).attr('rel'));
	$(document.body).trigger('mouseup'); // hides the menu
	return rcube_event.cancel(e);
	}
	});

	// avoid textarea loosing focus when hitting the save-response button/link
	$.each(this.buttons['save-response'] \|\| [], function (i, v) {
	$('#' + v.id).mousedown(function(e){ return rcube_event.cancel(e); })
	});
	}

	// init message compose form
	this.init_messageform();
	}
	else if (this.env.action == 'get')
	this.enable_command('download', 'print', true);
	// show printing dialog
	else if (this.env.action == 'print' && this.env.uid) {
	if (bw.safari)
	setTimeout('window.print()', 10);
	else
	window.print();
	}

	// get unread count for each mailbox
	if (this.gui_objects.mailboxlist) {
	this.env.unread_counts = {};
	this.gui_objects.folderlist = this.gui_objects.mailboxlist;
	this.http_request('getunread');
	}

	// init address book widget
	if (this.gui_objects.contactslist) {
	this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
	{ multiselect:true, draggable:false, keyboard:true });
	this.contact_list
	.addEventListener('initrow', function(o) { ref.triggerEvent('insertrow', { cid:o.uid, row:o }); })
	.addEventListener('select', function(o) { ref.compose_recipient_select(o); })
	.addEventListener('dblclick', function(o) { ref.compose_add_recipient(); })
	.addEventListener('keypress', function(o) {
	if (o.key_pressed == o.ENTER_KEY) {
	if (!ref.compose_add_recipient()) {
	// execute link action on <enter> if not a recipient entry
	if (o.last_selected && String(o.last_selected).charAt(0) == 'G') {
	$(o.rows[o.last_selected].obj).find('a').first().click();
	}
	}
	}
	})
	.init();

	// remember last focused address field
	$('#_to,#_cc,#_bcc').focus(function() { ref.env.focused_field = this; });
	}

	if (this.gui_objects.addressbookslist) {
	this.gui_objects.folderlist = this.gui_objects.addressbookslist;
	this.enable_command('list-adresses', true);
	}

	// ask user to send MDN
	if (this.env.mdn_request && this.env.uid) {
	var postact = 'sendmdn',
	postdata = {_uid: this.env.uid, _mbox: this.env.mailbox};
	if (!confirm(this.get_label('mdnrequest'))) {
	postdata._flag = 'mdnsent';
	postact = 'mark';
	}
	this.http_post(postact, postdata);
	}

	// detect browser capabilities
	if (!this.is_framed() && !this.env.extwin)
	this.browser_capabilities_check();

	break;

	case 'addressbook':
	this.env.address_group_stack = [];

	if (this.gui_objects.folderlist)
	this.env.contactfolders = $.extend($.extend({}, this.env.address_sources), this.env.contactgroups);

	this.enable_command('add', 'import', this.env.writable_source);
	this.enable_command('list', 'listgroup', 'pushgroup', 'popgroup', 'listsearch', 'search', 'reset-search', 'advanced-search', true);

	if (this.gui_objects.contactslist) {
	this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
	{multiselect:true, draggable:this.gui_objects.folderlist?true:false, keyboard:true});
	this.contact_list
	.addEventListener('initrow', function(o) { ref.triggerEvent('insertrow', { cid:o.uid, row:o }); })
	.addEventListener('keypress', function(o) { ref.contactlist_keypress(o); })
	.addEventListener('select', function(o) { ref.contactlist_select(o); })
	.addEventListener('dragstart', function(o) { ref.drag_start(o); })
	.addEventListener('dragmove', function(e) { ref.drag_move(e); })
	.addEventListener('dragend', function(e) { ref.drag_end(e); })
	.init();

	$(this.gui_objects.qsearchbox).focusin(function() { ref.contact_list.blur(); });

	this.update_group_commands();
	this.command('list');
	}

	if (this.gui_objects.savedsearchlist) {
	this.savedsearchlist = new rcube_treelist_widget(this.gui_objects.savedsearchlist, {
	id_prefix: 'rcmli',
	id_encode: this.html_identifier_encode,
	id_decode: this.html_identifier_decode
	});

	this.savedsearchlist.addEventListener('select', function(node) {
	ref.triggerEvent('selectfolder', { folder:node.id, prefix:'rcmli' }); });
	}

	this.set_page_buttons();

	if (this.env.cid) {
	this.enable_command('show', 'edit', true);
	// register handlers for group assignment via checkboxes
	if (this.gui_objects.editform) {
	$('input.groupmember').change(function() {
	ref.group_member_change(this.checked ? 'add' : 'del', ref.env.cid, ref.env.source, this.value);
	});
	}
	}

	if (this.gui_objects.editform) {
	this.enable_command('save', true);
	if (this.env.action == 'add' \|\| this.env.action == 'edit' \|\| this.env.action == 'search')
	this.init_contact_form();
	}

	break;

	case 'settings':
	this.enable_command('preferences', 'identities', 'responses', 'save', 'folders', true);

	if (this.env.action == 'identities') {
	this.enable_command('add', this.env.identities_level < 2);
	}
	else if (this.env.action == 'edit-identity' \|\| this.env.action == 'add-identity') {
	this.enable_command('save', 'edit', 'toggle-editor', true);
	this.enable_command('delete', this.env.identities_level < 2);

	// initialize HTML editor
	this.editor_init(this.env.editor_config, 'rcmfd_signature');
	}
	else if (this.env.action == 'folders') {
	this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', true);
	}
	else if (this.env.action == 'edit-folder' && this.gui_objects.editform) {
	this.enable_command('save', 'folder-size', true);
	parent.rcmail.env.exists = this.env.messagecount;
	parent.rcmail.enable_command('purge', this.env.messagecount);
	}
	else if (this.env.action == 'responses') {
	this.enable_command('add', true);
	}

	if (this.gui_objects.identitieslist) {
	this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist,
	{multiselect:false, draggable:false, keyboard:true});
	this.identity_list
	.addEventListener('select', function(o) { ref.identity_select(o); })
	.addEventListener('keypress', function(o) {
	if (o.key_pressed == o.ENTER_KEY) {
	ref.identity_select(o);
	}
	})
	.init()
	.focus();
	}
	else if (this.gui_objects.sectionslist) {
	this.sections_list = new rcube_list_widget(this.gui_objects.sectionslist, {multiselect:false, draggable:false, keyboard:true});
	this.sections_list
	.addEventListener('select', function(o) { ref.section_select(o); })
	.addEventListener('keypress', function(o) { if (o.key_pressed == o.ENTER_KEY) ref.section_select(o); })
	.init()
	.focus();
	}
	else if (this.gui_objects.subscriptionlist) {
	this.init_subscription_list();
	}
	else if (this.gui_objects.responseslist) {
	this.responses_list = new rcube_list_widget(this.gui_objects.responseslist, {multiselect:false, draggable:false, keyboard:true});
	this.responses_list
	.addEventListener('select', function(list) {
	var win, id = list.get_single_selection();
	ref.enable_command('delete', !!id && $.inArray(id, ref.env.readonly_responses) < 0);
	if (id && (win = ref.get_frame_window(ref.env.contentframe))) {
	ref.set_busy(true);
	ref.location_href({ _action:'edit-response', _key:id, _framed:1 }, win);
	}
	})
	.init()
	.focus();
	}

	break;

	case 'login':
	var input_user = $('#rcmloginuser');
	input_user.bind('keyup', function(e){ return ref.login_user_keyup(e); });

	if (input_user.val() == '')
	input_user.focus();
	else
	$('#rcmloginpwd').focus();

	// detect client timezone
	if (window.jstz) {
	var timezone = jstz.determine();
	if (timezone.name())
	$('#rcmlogintz').val(timezone.name());
	}
	else {
	$('#rcmlogintz').val(new Date().getStdTimezoneOffset() / -60);
	}

	// display 'loading' message on form submit, lock submit button
	$('form').submit(function () {
	$('input[type=submit]', this).prop('disabled', true);
	ref.clear_messages();
	ref.display_message('', 'loading');
	});

	this.enable_command('login', true);
	break;
	}

	// select first input field in an edit form
	if (this.gui_objects.editform)
	$("input,select,textarea", this.gui_objects.editform)
	.not(':hidden').not(':disabled').first().select().focus();

	// unset contentframe variable if preview_pane is enabled
	if (this.env.contentframe && !$('#' + this.env.contentframe).is(':visible'))
	this.env.contentframe = null;

	// prevent from form submit with Enter key in file input fields
	if (bw.ie)
	$('input[type=file]').keydown(function(e) { if (e.keyCode == '13') e.preventDefault(); });

	// flag object as complete
	this.loaded = true;
	this.env.lastrefresh = new Date();

	// show message
	if (this.pending_message)
	this.display_message.apply(this, this.pending_message);

	// init treelist widget
	if (this.gui_objects.folderlist && window.rcube_treelist_widget) {
	this.treelist = new rcube_treelist_widget(this.gui_objects.folderlist, {
	selectable: true,
	id_prefix: 'rcmli',
	parent_focus: true,
	id_encode: this.html_identifier_encode,
	id_decode: this.html_identifier_decode,
	check_droptarget: function(node) { return !node.virtual && ref.check_droptarget(node.id) }
	});

	this.treelist
	.addEventListener('collapse', function(node) { ref.folder_collapsed(node) })
	.addEventListener('expand', function(node) { ref.folder_collapsed(node) })
	.addEventListener('select', function(node) { ref.triggerEvent('selectfolder', { folder:node.id, prefix:'rcmli' }) });
	}

	// activate html5 file drop feature (if browser supports it and if configured)
	if (this.gui_objects.filedrop && this.env.filedrop && ((window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary) \|\| window.FormData)) {
	$(document.body).bind('dragover dragleave drop', function(e){ return ref.document_drag_hover(e, e.type == 'dragover'); });
	$(this.gui_objects.filedrop).addClass('droptarget')
	.bind('dragover dragleave', function(e){ return ref.file_drag_hover(e, e.type == 'dragover'); })
	.get(0).addEventListener('drop', function(e){ return ref.file_dropped(e); }, false);
	}

	// catch document (and iframe) mouse clicks
	var body_mouseup = function(e){ return ref.doc_mouse_up(e); };
	$(document.body)
	.bind('mouseup', body_mouseup)
	.bind('keydown', function(e){ return ref.doc_keypress(e); });

	$('iframe').load(function(e) {
	try { $(this.contentDocument \|\| this.contentWindow).on('mouseup', body_mouseup); }
	catch (e) {/* catch possible "Permission denied" error in IE */ }
	})
	.contents().on('mouseup', body_mouseup);

	// trigger init event hook
	this.triggerEvent('init', { task:this.task, action:this.env.action });

	// execute all foreign onload scripts
	// @deprecated
	for (n in this.onloads) {
	if (typeof this.onloads[n] === 'string')
	eval(this.onloads[n]);
	else if (typeof this.onloads[n] === 'function')
	this.onloads[n]();
	}

	// start keep-alive and refresh intervals
	this.start_refresh();
	this.start_keepalive();
	};

	this.log = function(msg)
	{
	if (window.console && console.log)
	console.log(msg);
	};

	/*********************************************************/
	/******* client command interface *******/
	/*********************************************************/

	// execute a specific command on the web client
	this.command = function(command, props, obj, event)
	{
	var ret, uid, cid, url, flag, aborted = false;

	if (obj && obj.blur && !(event && rcube_event.is_keyboard(event)))
	obj.blur();

	// do nothing if interface is locked by another command
	// with exception for searching reset and menu
	if (this.busy && !(command == 'reset-search' && this.last_command == 'search') && !command.match(/^menu-/))
	return false;

	// let the browser handle this click (shift/ctrl usually opens the link in a new window/tab)
	if ((obj && obj.href && String(obj.href).indexOf('#') < 0) && rcube_event.get_modifier(event)) {
	return true;
	}

	// command not supported or allowed
	if (!this.commands[command]) {
	// pass command to parent window
	if (this.is_framed())
	parent.rcmail.command(command, props);

	return false;
	}

	// check input before leaving compose step
	if (this.task == 'mail' && this.env.action == 'compose' && $.inArray(command, this.env.compose_commands) < 0 && !this.env.server_error) {
	if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
	return false;

	// remove copy from local storage if compose screen is left intentionally
	this.remove_compose_data(this.env.compose_id);
	this.compose_skip_unsavedcheck = true;
	}

	this.last_command = command;

	// process external commands
	if (typeof this.command_handlers[command] === 'function') {
	ret = this.command_handlers[command](props, obj, event);
	return ret !== undefined ? ret : (obj ? false : true);
	}
	else if (typeof this.command_handlers[command] === 'string') {
	ret = window[this.command_handlers[command]](props, obj, event);
	return ret !== undefined ? ret : (obj ? false : true);
	}

	// trigger plugin hooks
	this.triggerEvent('actionbefore', {props:props, action:command, originalEvent:event});
	ret = this.triggerEvent('before'+command, props \|\| event);
	if (ret !== undefined) {
	// abort if one of the handlers returned false
	if (ret === false)
	return false;
	else
	props = ret;
	}

	ret = undefined;

	// process internal command
	switch (command) {

	case 'login':
	if (this.gui_objects.loginform)
	this.gui_objects.loginform.submit();
	break;

	// commands to switch task
	case 'logout':
	case 'mail':
	case 'addressbook':
	case 'settings':
	this.switch_task(command);
	break;

	case 'about':
	this.redirect('?_task=settings&_action=about', false);
	break;

	case 'permaurl':
	if (obj && obj.href && obj.target)
	return true;
	else if (this.env.permaurl)
	parent.location.href = this.env.permaurl;
	break;

	case 'extwin':
	if (this.env.action == 'compose') {
	var form = this.gui_objects.messageform,
	win = this.open_window('');

	if (win) {
	this.save_compose_form_local();
	this.compose_skip_unsavedcheck = true;
	$("input[name='_action']", form).val('compose');
	form.action = this.url('mail/compose', { _id: this.env.compose_id, _extwin: 1 });
	form.target = win.name;
	form.submit();
	}
	}
	else {
	this.open_window(this.env.permaurl, true);
	}
	break;

	case 'change-format':
	url = this.env.permaurl + '&_format=' + props;

	if (this.env.action == 'preview')
	url = url.replace(/_action=show/, '_action=preview') + '&_framed=1';
	if (this.env.extwin)
	url += '&_extwin=1';

	location.href = url;
	break;

	case 'menu-open':
	if (props && props.menu == 'attachmentmenu') {
	var mimetype = this.env.attachments[props.id];
	this.enable_command('open-attachment', mimetype && this.env.mimetypes && $.inArray(mimetype, this.env.mimetypes) >= 0);
	}
	this.show_menu(props, props.show \|\| undefined, event);
	break;

	case 'menu-close':
	this.hide_menu(props, event);
	break;

	case 'menu-save':
	this.triggerEvent(command, {props:props, originalEvent:event});
	return false;

	case 'open':
	if (uid = this.get_single_uid()) {
	obj.href = this.url('show', {_mbox: this.get_message_mailbox(uid), _uid: uid});
	return true;
	}
	break;

	case 'close':
	if (this.env.extwin)
	window.close();
	break;

	case 'list':
	if (props && props != '') {
	this.reset_qsearch();
	}
	if (this.env.action == 'compose' && this.env.extwin) {
	window.close();
	}
	else if (this.task == 'mail') {
	this.list_mailbox(props);
	this.set_button_titles();
	}
	else if (this.task == 'addressbook')
	this.list_contacts(props);
	break;

	case 'set-listmode':
	this.set_list_options(null, undefined, undefined, props == 'threads' ? 1 : 0);
	break;

	case 'sort':
	var sort_order = this.env.sort_order,
	sort_col = !this.env.disabled_sort_col ? props : this.env.sort_col;

	if (!this.env.disabled_sort_order)
	sort_order = this.env.sort_col == sort_col && sort_order == 'ASC' ? 'DESC' : 'ASC';

	// set table header and update env
	this.set_list_sorting(sort_col, sort_order);

	// reload message list
	this.list_mailbox('', '', sort_col+'_'+sort_order);
	break;

	case 'nextpage':
	this.list_page('next');
	break;

	case 'lastpage':
	this.list_page('last');
	break;

	case 'previouspage':
	this.list_page('prev');
	break;

	case 'firstpage':
	this.list_page('first');
	break;

	case 'expunge':
	if (this.env.exists)
	this.expunge_mailbox(this.env.mailbox);
	break;

	case 'purge':
	case 'empty-mailbox':
	if (this.env.exists)
	this.purge_mailbox(this.env.mailbox);
	break;

	// common commands used in multiple tasks
	case 'show':
	if (this.task == 'mail') {
	uid = this.get_single_uid();
	if (uid && (!this.env.uid \|\| uid != this.env.uid)) {
	if (this.env.mailbox == this.env.drafts_mailbox)
	this.open_compose_step({ _draft_uid: uid, _mbox: this.env.mailbox });
	else
	this.show_message(uid);
	}
	}
	else if (this.task == 'addressbook') {
	cid = props ? props : this.get_single_cid();
	if (cid && !(this.env.action == 'show' && cid == this.env.cid))
	this.load_contact(cid, 'show');
	}
	break;

	case 'add':
	if (this.task == 'addressbook')
	this.load_contact(0, 'add');
	else if (this.task == 'settings' && this.env.action == 'responses') {
	var frame;
	if ((frame = this.get_frame_window(this.env.contentframe))) {
	this.set_busy(true);
	this.location_href({ _action:'add-response', _framed:1 }, frame);
	}
	}
	else if (this.task == 'settings') {
	this.identity_list.clear_selection();
	this.load_identity(0, 'add-identity');
	}
	break;

	case 'edit':
	if (this.task == 'addressbook' && (cid = this.get_single_cid()))
	this.load_contact(cid, 'edit');
	else if (this.task == 'settings' && props)
	this.load_identity(props, 'edit-identity');
	else if (this.task == 'mail' && (uid = this.get_single_uid())) {
	url = { _mbox: this.get_message_mailbox(uid) };
	url[this.env.mailbox == this.env.drafts_mailbox && props != 'new' ? '_draft_uid' : '_uid'] = uid;
	this.open_compose_step(url);
	}
	break;

	case 'save':
	var input, form = this.gui_objects.editform;
	if (form) {
	// adv. search
	if (this.env.action == 'search') {
	}
	// user prefs
	else if ((input = $("input[name='_pagesize']", form)) && input.length && isNaN(parseInt(input.val()))) {
	alert(this.get_label('nopagesizewarning'));
	input.focus();
	break;
	}
	// contacts/identities
	else {
	// reload form
	if (props == 'reload') {
	form.action += '?_reload=1';
	}
	else if (this.task == 'settings' && (this.env.identities_level % 2) == 0 &&
	(input = $("input[name='_email']", form)) && input.length && !rcube_check_email(input.val())
	) {
	alert(this.get_label('noemailwarning'));
	input.focus();
	break;
	}

	// clear empty input fields
	$('input.placeholder').each(function(){ if (this.value == this._placeholder) this.value = ''; });
	}

	// add selected source (on the list)
	if (parent.rcmail && parent.rcmail.env.source)
	form.action = this.add_url(form.action, '_orig_source', parent.rcmail.env.source);

	form.submit();
	}
	break;

	case 'delete':
	// mail task
	if (this.task == 'mail')
	this.delete_messages(event);
	// addressbook task
	else if (this.task == 'addressbook')
	this.delete_contacts();
	// settings: canned response
	else if (this.task == 'settings' && this.env.action == 'responses')
	this.delete_response();
	// settings: user identities
	else if (this.task == 'settings')
	this.delete_identity();
	break;

	// mail task commands
	case 'move':
	case 'moveto': // deprecated
	if (this.task == 'mail')
	this.move_messages(props, event);
	else if (this.task == 'addressbook')
	this.move_contacts(props);
	break;

	case 'copy':
	if (this.task == 'mail')
	this.copy_messages(props, event);
	else if (this.task == 'addressbook')
	this.copy_contacts(props);
	break;

	case 'mark':
	if (props)
	this.mark_message(props);
	break;

	case 'toggle_status':
	case 'toggle_flag':
	flag = command == 'toggle_flag' ? 'flagged' : 'read';

	if (uid = props) {
	// toggle flagged/unflagged
	if (flag == 'flagged') {
	if (this.message_list.rows[uid].flagged)
	flag = 'unflagged';
	}
	// toggle read/unread
	else if (this.message_list.rows[uid].deleted)
	flag = 'undelete';
	else if (!this.message_list.rows[uid].unread)
	flag = 'unread';

	this.mark_message(flag, uid);
	}

	break;

	case 'always-load':
	if (this.env.uid && this.env.sender) {
	this.add_contact(this.env.sender);
	setTimeout(function(){ ref.command('load-images'); }, 300);
	break;
	}

	case 'load-images':
	if (this.env.uid)
	this.show_message(this.env.uid, true, this.env.action=='preview');
	break;

	case 'load-attachment':
	case 'open-attachment':
	case 'download-attachment':
	var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props,
	mimetype = this.env.attachments[props];

	// open attachment in frame if it's of a supported mimetype
	if (command != 'download-attachment' && mimetype && this.env.mimetypes && $.inArray(mimetype, this.env.mimetypes) >= 0) {
	if (this.open_window(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1'))
	break;
	}

	this.goto_url('get', qstring+'&_download=1', false);
	break;

	case 'select-all':
	this.select_all_mode = props ? false : true;
	this.dummy_select = true; // prevent msg opening if there's only one msg on the list
	if (props == 'invert')
	this.message_list.invert_selection();
	else
	this.message_list.select_all(props == 'page' ? '' : props);
	this.dummy_select = null;
	break;

	case 'select-none':
	this.select_all_mode = false;
	this.message_list.clear_selection();
	break;

	case 'expand-all':
	this.env.autoexpand_threads = 1;
	this.message_list.expand_all();
	break;

	case 'expand-unread':
	this.env.autoexpand_threads = 2;
	this.message_list.collapse_all();
	this.expand_unread();
	break;

	case 'collapse-all':
	this.env.autoexpand_threads = 0;
	this.message_list.collapse_all();
	break;

	case 'nextmessage':
	if (this.env.next_uid)
	this.show_message(this.env.next_uid, false, this.env.action == 'preview');
	break;

	case 'lastmessage':
	if (this.env.last_uid)
	this.show_message(this.env.last_uid);
	break;

	case 'previousmessage':
	if (this.env.prev_uid)
	this.show_message(this.env.prev_uid, false, this.env.action == 'preview');
	break;

	case 'firstmessage':
	if (this.env.first_uid)
	this.show_message(this.env.first_uid);
	break;

	case 'compose':
	url = {};

	if (this.task == 'mail') {
	url._mbox = this.env.mailbox;
	if (props)
	url._to = props;
	// also send search request so we can go back to search result after message is sent
	if (this.env.search_request)
	url._search = this.env.search_request;
	}
	// modify url if we're in addressbook
	else if (this.task == 'addressbook') {
	// switch to mail compose step directly
	if (props && props.indexOf('@') > 0) {
	url._to = props;
	}
	else {
	var a_cids = [];
	// use contact id passed as command parameter
	if (props)
	a_cids.push(props);
	// get selected contacts
	else if (this.contact_list)
	a_cids = this.contact_list.get_selection();

	if (a_cids.length)
	this.http_post('mailto', { _cid: a_cids.join(','), _source: this.env.source }, true);
	else if (this.env.group)
	this.http_post('mailto', { _gid: this.env.group, _source: this.env.source }, true);

	break;
	}
	}
	else if (props && typeof props == 'string') {
	url._to = props;
	}
	else if (props && typeof props == 'object') {
	$.extend(url, props);
	}

	this.open_compose_step(url);
	break;

	case 'spellcheck':
	if (this.spellcheck_state()) {
	this.editor.spellcheck_stop();
	}
	else {
	this.editor.spellcheck_start();
	}
	break;

	case 'savedraft':
	// Reset the auto-save timer
	clearTimeout(this.save_timer);

	// compose form did not change (and draft wasn't saved already)
	if (this.env.draft_id && this.cmp_hash == this.compose_field_hash()) {
	this.auto_save_start();
	break;
	}

	this.submit_messageform(true);
	break;

	case 'send':
	if (!props.nocheck && !this.check_compose_input(command))
	break;

	// Reset the auto-save timer
	clearTimeout(this.save_timer);

	this.submit_messageform();
	break;

	case 'send-attachment':
	// Reset the auto-save timer
	clearTimeout(this.save_timer);

	if (!(flag = this.upload_file(props \|\| this.gui_objects.uploadform, 'upload'))) {
	if (flag !== false)
	alert(this.get_label('selectimportfile'));
	aborted = true;
	}
	break;

	case 'insert-sig':
	this.change_identity($("[name='_from']")[0], true);
	break;

	case 'list-adresses':
	this.list_contacts(props);
	this.enable_command('add-recipient', false);
	break;

	case 'add-recipient':
	this.compose_add_recipient(props);
	break;

	case 'reply-all':
	case 'reply-list':
	case 'reply':
	if (uid = this.get_single_uid()) {
	url = {_reply_uid: uid, _mbox: this.get_message_mailbox(uid)};
	if (command == 'reply-all')
	// do reply-list, when list is detected and popup menu wasn't used
	url._all = (!props && this.env.reply_all_mode == 1 && this.commands['reply-list'] ? 'list' : 'all');
	else if (command == 'reply-list')
	url._all = 'list';

	this.open_compose_step(url);
	}
	break;

	case 'forward-attachment':
	case 'forward-inline':
	case 'forward':
	var uids = this.env.uid ? [this.env.uid] : (this.message_list ? this.message_list.get_selection() : []);
	if (uids.length) {
	url = { _forward_uid: this.uids_to_list(uids), _mbox: this.env.mailbox, _search: this.env.search_request };
	if (command == 'forward-attachment' \|\| (!props && this.env.forward_attachment) \|\| uids.length > 1)
	url._attachment = 1;
	this.open_compose_step(url);
	}
	break;

	case 'print':
	if (this.env.action == 'get') {
	this.gui_objects.messagepartframe.contentWindow.print();
	}
	else if (uid = this.get_single_uid()) {
	url = '&_action=print&_uid='+uid+'&_mbox='+urlencode(this.get_message_mailbox(uid))+(this.env.safemode ? '&_safe=1' : '');
	if (this.open_window(this.env.comm_path + url, true, true)) {
	if (this.env.action != 'show')
	this.mark_message('read', uid);
	}
	}
	break;

	case 'viewsource':
	if (uid = this.get_single_uid())
	this.open_window(this.env.comm_path+'&_action=viewsource&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true, true);
	break;

	case 'download':
	if (this.env.action == 'get') {
	location.href = location.href.replace(/_frame=/, '_download=');
	}
	else if (uid = this.get_single_uid()) {
	this.goto_url('viewsource', { _uid: uid, _mbox: this.get_message_mailbox(uid), _save: 1 });
	}
	break;

	// quicksearch
	case 'search':
	if (!props && this.gui_objects.qsearchbox)
	props = this.gui_objects.qsearchbox.value;
	if (props) {
	this.qsearch(props);
	break;
	}

	// reset quicksearch
	case 'reset-search':
	var n, s = this.env.search_request \|\| this.env.qsearch;

	this.reset_qsearch();
	this.select_all_mode = false;

	if (s && this.env.action == 'compose') {
	if (this.contact_list)
	this.list_contacts_clear();
	}
	else if (s && this.env.mailbox) {
	this.list_mailbox(this.env.mailbox, 1);
	}
	else if (s && this.task == 'addressbook') {
	if (this.env.source == '') {
	for (n in this.env.address_sources) break;
	this.env.source = n;
	this.env.group = '';
	}
	this.list_contacts(this.env.source, this.env.group, 1);
	}
	break;

	case 'pushgroup':
	// add group ID to stack
	this.env.address_group_stack.push(props.id);
	if (obj && event)
	rcube_event.cancel(event);

	case 'listgroup':
	this.reset_qsearch();
	this.list_contacts(props.source, props.id);
	break;

	case 'popgroup':
	if (this.env.address_group_stack.length > 1) {
	this.env.address_group_stack.pop();
	this.reset_qsearch();
	this.list_contacts(props.source, this.env.address_group_stack[this.env.address_group_stack.length-1]);
	}
	break;

	case 'import-messages':
	var form = props \|\| this.gui_objects.importform,
	importlock = this.set_busy(true, 'importwait');

	$('input[name="_unlock"]', form).val(importlock);

	if (!(flag = this.upload_file(form, 'import'))) {
	this.set_busy(false, null, importlock);
	if (flag !== false)
	alert(this.get_label('selectimportfile'));
	aborted = true;
	}
	break;

	case 'import':
	if (this.env.action == 'import' && this.gui_objects.importform) {
	var file = document.getElementById('rcmimportfile');
	if (file && !file.value) {
	alert(this.get_label('selectimportfile'));
	aborted = true;
	break;
	}
	this.gui_objects.importform.submit();
	this.set_busy(true, 'importwait');
	this.lock_form(this.gui_objects.importform, true);
	}
	else
	this.goto_url('import', (this.env.source ? '_target='+urlencode(this.env.source)+'&' : ''));
	break;

	case 'export':
	if (this.contact_list.rowcount > 0) {
	this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _search: this.env.search_request });
	}
	break;

	case 'export-selected':
	if (this.contact_list.rowcount > 0) {
	this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _cid: this.contact_list.get_selection().join(',') });
	}
	break;

	case 'upload-photo':
	this.upload_contact_photo(props \|\| this.gui_objects.uploadform);
	break;

	case 'delete-photo':
	this.replace_contact_photo('-del-');
	break;

	// user settings commands
	case 'preferences':
	case 'identities':
	case 'responses':
	case 'folders':
	this.goto_url('settings/' + command);
	break;

	case 'undo':
	this.http_request('undo', '', this.display_message('', 'loading'));
	break;

	// unified command call (command name == function name)
	default:
	var func = command.replace(/-/g, '_');
	if (this[func] && typeof this[func] === 'function') {
	ret = this[func](props, obj, event);
	}
	break;
	}

	if (!aborted && this.triggerEvent('after'+command, props) === false)
	ret = false;
	this.triggerEvent('actionafter', { props:props, action:command, aborted:aborted });

	return ret === false ? false : obj ? false : true;
	};

	// set command(s) enabled or disabled
	this.enable_command = function()
	{
	var i, n, args = Array.prototype.slice.call(arguments),
	enable = args.pop(), cmd;

	for (n=0; n<args.length; n++) {
	cmd = args[n];
	// argument of type array
	if (typeof cmd === 'string') {
	this.commands[cmd] = enable;
	this.set_button(cmd, (enable ? 'act' : 'pas'));
	this.triggerEvent('enable-command', {command: cmd, status: enable});
	}
	// push array elements into commands array
	else {
	for (i in cmd)
	args.push(cmd[i]);
	}
	}
	};

	this.command_enabled = function(cmd)
	{
	return this.commands[cmd];
	};

	// lock/unlock interface
	this.set_busy = function(a, message, id)
	{
	if (a && message) {
	var msg = this.get_label(message);
	if (msg == message)
	msg = 'Loading...';

	id = this.display_message(msg, 'loading');
	}
	else if (!a && id) {
	this.hide_message(id);
	}

	this.busy = a;
	//document.body.style.cursor = a ? 'wait' : 'default';

	if (this.gui_objects.editform)
	this.lock_form(this.gui_objects.editform, a);

	return id;
	};

	// return a localized string
	this.get_label = function(name, domain)
	{
	if (domain && this.labels[domain+'.'+name])
	return this.labels[domain+'.'+name];
	else if (this.labels[name])
	return this.labels[name];
	else
	return name;
	};

	// alias for convenience reasons
	this.gettext = this.get_label;

	// switch to another application task
	this.switch_task = function(task)
	{
	if (this.task === task && task != 'mail')
	return;

	var url = this.get_task_url(task);

	if (task == 'mail')
	url += '&_mbox=INBOX';
	- else if (task == 'logout' && !this.env.server_error)
	+ else if (task == 'logout' && !this.env.server_error) {
	+ url += '&_token=' + this.env.request_token;
	this.clear_compose_data();
	+ }

	this.redirect(url);
	};

	this.get_task_url = function(task, url)
	{
	if (!url)
	url = this.env.comm_path;

	- return url.replace(/_task=[a-z0-9_-]+/i, '_task='+task);
	+ if (url.match(/[?&]_task=[a-zA-Z0-9_-]+/))
	+ return url.replace(/_task=[a-zA-Z0-9_-]+/, '_task=' + task);
	+ else
	+ return url.replace(/\?.*$/, '') + '?_task=' + task;
	};

	this.reload = function(delay)
	{
	if (this.is_framed())
	parent.rcmail.reload(delay);
	else if (delay)
	setTimeout(function() { ref.reload(); }, delay);
	else if (window.location)
	location.href = this.env.comm_path + (this.env.action ? '&_action='+this.env.action : '');
	};

	// Add variable to GET string, replace old value if exists
	this.add_url = function(url, name, value)
	{
	value = urlencode(value);

	if (/(\?.*)$/.test(url)) {
	var urldata = RegExp.$1,
	datax = RegExp('((\\?\|&)'+RegExp.escape(name)+'=[^&]*)');

	if (datax.test(urldata)) {
	urldata = urldata.replace(datax, RegExp.$2 + name + '=' + value);
	}
	else
	urldata += '&' + name + '=' + value

	return url.replace(/(\?.*)$/, urldata);
	}

	return url + '?' + name + '=' + value;
	};

	this.is_framed = function()
	{
	return this.env.framed && parent.rcmail && parent.rcmail != this && typeof parent.rcmail.command == 'function';
	};

	this.save_pref = function(prop)
	{
	var request = {_name: prop.name, _value: prop.value};

	if (prop.session)
	request._session = prop.session;
	if (prop.env)
	this.env[prop.env] = prop.value;

	this.http_post('save-pref', request);
	};

	this.html_identifier = function(str, encode)
	{
	return encode ? this.html_identifier_encode(str) : String(str).replace(this.identifier_expr, '_');
	};

	this.html_identifier_encode = function(str)
	{
	return Base64.encode(String(str)).replace(/=+$/, '').replace(/\+/g, '-').replace(/\//g, '_');
	};

	this.html_identifier_decode = function(str)
	{
	str = String(str).replace(/-/g, '+').replace(/_/g, '/');

	while (str.length % 4) str += '=';

	return Base64.decode(str);
	};


	/*********************************************************/
	/******* event handling methods *******/
	/*********************************************************/

	this.drag_menu = function(e, target)
	{
	var modkey = rcube_event.get_modifier(e),
	menu = this.gui_objects.dragmenu;

	if (menu && modkey == SHIFT_KEY && this.commands['copy']) {
	var pos = rcube_event.get_mouse_pos(e);
	this.env.drag_target = target;
	this.show_menu(this.gui_objects.dragmenu.id, true, e);
	$(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'});
	return true;
	}

	return false;
	};

	this.drag_menu_action = function(action)
	{
	var menu = this.gui_objects.dragmenu;
	if (menu) {
	$(menu).hide();
	}
	this.command(action, this.env.drag_target);
	this.env.drag_target = null;
	};

	this.drag_start = function(list)
	{
	this.drag_active = true;

	if (this.preview_timer)
	clearTimeout(this.preview_timer);
	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);

	// prepare treelist widget for dragging interactions
	if (this.treelist)
	this.treelist.drag_start();
	};

	this.drag_end = function(e)
	{
	var list, model;

	if (this.treelist)
	this.treelist.drag_end();

	// execute drag & drop action when mouse was released
	if (list = this.message_list)
	model = this.env.mailboxes;
	else if (list = this.contact_list)
	model = this.env.contactfolders;

	if (this.drag_active && model && this.env.last_folder_target) {
	var target = model[this.env.last_folder_target];
	list.draglayer.hide();

	if (this.contact_list) {
	if (!this.contacts_drag_menu(e, target))
	this.command('move', target);
	}
	else if (!this.drag_menu(e, target))
	this.command('move', target);
	}

	this.drag_active = false;
	this.env.last_folder_target = null;
	};

	this.drag_move = function(e)
	{
	if (this.gui_objects.folderlist) {
	var drag_target, oldclass,
	layerclass = 'draglayernormal',
	mouse = rcube_event.get_mouse_pos(e);

	if (this.contact_list && this.contact_list.draglayer)
	oldclass = this.contact_list.draglayer.attr('class');

	// mouse intersects a valid drop target on the treelist
	if (this.treelist && (drag_target = this.treelist.intersects(mouse, true))) {
	this.env.last_folder_target = drag_target;
	layerclass = 'draglayer' + (this.check_droptarget(drag_target) > 1 ? 'copy' : 'normal');
	}
	else {
	// Clear target, otherwise drag end will trigger move into last valid droptarget
	this.env.last_folder_target = null;
	}

	if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
	this.contact_list.draglayer.attr('class', layerclass);
	}
	};

	this.collapse_folder = function(name)
	{
	if (this.treelist)
	this.treelist.toggle(name);
	};

	this.folder_collapsed = function(node)
	{
	var prefname = this.env.task == 'addressbook' ? 'collapsed_abooks' : 'collapsed_folders';

	if (node.collapsed) {
	this.env[prefname] = this.env[prefname] + '&'+urlencode(node.id)+'&';

	// select the folder if one of its childs is currently selected
	// don't select if it's virtual (#1488346)
	if (!node.virtual && this.env.mailbox && this.env.mailbox.startsWith(name + this.env.delimiter))
	this.command('list', name);
	}
	else {
	var reg = new RegExp('&'+urlencode(node.id)+'&');
	this.env[prefname] = this.env[prefname].replace(reg, '');
	}

	if (!this.drag_active) {
	this.command('save-pref', { name: prefname, value: this.env[prefname] });

	if (this.env.unread_counts)
	this.set_unread_count_display(node.id, false);
	}
	};

	// global mouse-click handler to cleanup some UI elements
	this.doc_mouse_up = function(e)
	{
	var list, id, target = rcube_event.get_target(e);

	// ignore event if jquery UI dialog is open
	if ($(target).closest('.ui-dialog, .ui-widget-overlay').length)
	return;

	// remove focus from list widgets
	if (window.rcube_list_widget && rcube_list_widget._instances.length) {
	$.each(rcube_list_widget._instances, function(i,list){
	if (list && !rcube_mouse_is_over(e, list.list.parentNode))
	list.blur();
	});
	}

	// reset 'pressed' buttons
	if (this.buttons_sel) {
	for (id in this.buttons_sel)
	if (typeof id !== 'function')
	this.button_out(this.buttons_sel[id], id);
	this.buttons_sel = {};
	}

	// reset popup menus; delayed to have updated menu_stack data
	setTimeout(function(e){
	var obj, skip, config, id, i, parents = $(target).parents();
	for (i = ref.menu_stack.length - 1; i >= 0; i--) {
	id = ref.menu_stack[i];
	obj = $('#' + id);

	if (obj.is(':visible')
	&& target != obj.data('opener')
	&& target != obj.get(0) // check if scroll bar was clicked (#1489832)
	&& !parents.is(obj.data('opener'))
	&& id != skip
	&& (obj.attr('data-editable') != 'true' \|\| !$(target).parents('#' + id).length)
	&& (obj.attr('data-sticky') != 'true' \|\| !rcube_mouse_is_over(e, obj.get(0)))
	) {
	ref.hide_menu(id, e);
	}
	skip = obj.data('parent');
	}
	}, 10, e);
	};

	// global keypress event handler
	this.doc_keypress = function(e)
	{
	// Helper method to move focus to the next/prev active menu item
	var focus_menu_item = function(dir) {
	var obj, item, mod = dir < 0 ? 'prevAll' : 'nextAll', limit = dir < 0 ? 'last' : 'first';
	if (ref.focused_menu && (obj = $('#'+ref.focused_menu))) {
	item = obj.find(':focus').closest('li')[mod](':has(:not([aria-disabled=true]))').find('a,input')[limit]();
	if (!item.length)
	item = obj.find(':focus').closest('ul')[mod](':has(:not([aria-disabled=true]))').find('a,input')[limit]();
	return item.focus().length;
	}

	return 0;
	};

	var target = e.target \|\| {},
	keyCode = rcube_event.get_keycode(e);

	// save global reference for keyboard detection on click events in IE
	rcube_event._last_keyboard_event = e;

	if (e.keyCode != 27 && (!this.menu_keyboard_active \|\| target.nodeName == 'TEXTAREA' \|\| target.nodeName == 'SELECT')) {
	return true;
	}

	switch (keyCode) {
	case 38:
	case 40:
	case 63232: // "up", in safari keypress
	case 63233: // "down", in safari keypress
	focus_menu_item(keyCode == 38 \|\| keyCode == 63232 ? -1 : 1);
	return rcube_event.cancel(e);

	case 9: // tab
	if (this.focused_menu) {
	var mod = rcube_event.get_modifier(e);
	if (!focus_menu_item(mod == SHIFT_KEY ? -1 : 1)) {
	this.hide_menu(this.focused_menu, e);
	}
	}
	return rcube_event.cancel(e);

	case 27: // esc
	if (this.menu_stack.length)
	this.hide_menu(this.menu_stack[this.menu_stack.length-1], e);
	break;
	}

	return true;
	}

	this.msglist_select = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);
	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);

	var selected = list.get_single_selection();

	this.enable_command(this.env.message_commands, selected != null);
	if (selected) {
	// Hide certain command buttons when Drafts folder is selected
	if (this.env.mailbox == this.env.drafts_mailbox)
	this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-attachment', 'forward-inline', false);
	// Disable reply-list when List-Post header is not set
	else {
	var msg = this.env.messages[selected];
	if (!msg.ml)
	this.enable_command('reply-list', false);
	}
	}
	// Multi-message commands
	this.enable_command('delete', 'move', 'copy', 'mark', 'forward', 'forward-attachment', list.selection.length > 0);

	// reset all-pages-selection
	if (selected \|\| (list.selection.length && list.selection.length != list.rowcount))
	this.select_all_mode = false;

	// start timer for message preview (wait for double click)
	if (selected && this.env.contentframe && !list.multi_selecting && !this.dummy_select)
	this.preview_timer = setTimeout(function() { ref.msglist_get_preview(); }, this.dblclick_time);
	else if (this.env.contentframe)
	this.show_contentframe(false);
	};

	// This allow as to re-select selected message and display it in preview frame
	this.msglist_click = function(list)
	{
	if (list.multi_selecting \|\| !this.env.contentframe)
	return;

	if (list.get_single_selection())
	return;

	var win = this.get_frame_window(this.env.contentframe);

	if (win && win.location.href.indexOf(this.env.blankpage) >= 0) {
	if (this.preview_timer)
	clearTimeout(this.preview_timer);
	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);

	this.preview_timer = setTimeout(function() { ref.msglist_get_preview(); }, this.dblclick_time);
	}
	};

	this.msglist_dbl_click = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);
	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);

	var uid = list.get_single_selection();

	if (uid && (this.env.messages[uid].mbox \|\| this.env.mailbox) == this.env.drafts_mailbox)
	this.open_compose_step({ _draft_uid: uid, _mbox: this.env.mailbox });
	else if (uid)
	this.show_message(uid, false, false);
	};

	this.msglist_keypress = function(list)
	{
	if (list.modkey == CONTROL_KEY)
	return;

	if (list.key_pressed == list.ENTER_KEY)
	this.command('show');
	else if (list.key_pressed == list.DELETE_KEY \|\| list.key_pressed == list.BACKSPACE_KEY)
	this.command('delete');
	else if (list.key_pressed == 33)
	this.command('previouspage');
	else if (list.key_pressed == 34)
	this.command('nextpage');
	};

	this.msglist_get_preview = function()
	{
	var uid = this.get_single_uid();
	if (uid && this.env.contentframe && !this.drag_active)
	this.show_message(uid, false, true);
	else if (this.env.contentframe)
	this.show_contentframe(false);
	};

	this.msglist_expand = function(row)
	{
	if (this.env.messages[row.uid])
	this.env.messages[row.uid].expanded = row.expanded;
	$(row.obj)[row.expanded?'addClass':'removeClass']('expanded');
	};

	this.msglist_set_coltypes = function(list)
	{
	var i, found, name, cols = list.thead.rows[0].cells;

	this.env.listcols = [];

	for (i=0; i<cols.length; i++)
	if (cols[i].id && cols[i].id.startsWith('rcm')) {
	name = cols[i].id.slice(3);
	this.env.listcols.push(name);
	}

	if ((found = $.inArray('flag', this.env.listcols)) >= 0)
	this.env.flagged_col = found;

	if ((found = $.inArray('subject', this.env.listcols)) >= 0)
	this.env.subject_col = found;

	this.command('save-pref', { name: 'list_cols', value: this.env.listcols, session: 'list_attrib/columns' });
	};

	this.check_droptarget = function(id)
	{
	switch (this.task) {
	case 'mail':
	return (this.env.mailboxes[id]
	&& !this.env.mailboxes[id].virtual
	&& (this.env.mailboxes[id].id != this.env.mailbox \|\| this.is_multifolder_listing())) ? 1 : 0;

	case 'addressbook':
	var target;
	if (id != this.env.source && (target = this.env.contactfolders[id])) {
	// droptarget is a group
	if (target.type == 'group') {
	if (target.id != this.env.group && !this.env.contactfolders[target.source].readonly) {
	var is_other = this.env.selection_sources.length > 1 \|\| $.inArray(target.source, this.env.selection_sources) == -1;
	return !is_other \|\| this.commands.move ? 1 : 2;
	}
	}
	// droptarget is a (writable) addressbook and it's not the source
	else if (!target.readonly && (this.env.selection_sources.length > 1 \|\| $.inArray(id, this.env.selection_sources) == -1)) {
	return this.commands.move ? 1 : 2;
	}
	}
	}

	return 0;
	};

	// open popup window
	this.open_window = function(url, small, toolbar)
	{
	var wname = 'rcmextwin' + new Date().getTime();

	url += (url.match(/\?/) ? '&' : '?') + '_extwin=1';

	if (this.env.standard_windows)
	var extwin = window.open(url, wname);
	else {
	var win = this.is_framed() ? parent.window : window,
	page = $(win),
	page_width = page.width(),
	page_height = bw.mz ? $('body', win).height() : page.height(),
	w = Math.min(small ? this.env.popup_width_small : this.env.popup_width, page_width),
	h = page_height, // always use same height
	l = (win.screenLeft \|\| win.screenX) + 20,
	t = (win.screenTop \|\| win.screenY) + 20,
	extwin = window.open(url, wname,
	'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,location=no,scrollbars=yes'
	+(toolbar ? ',toolbar=yes,menubar=yes,status=yes' : ',toolbar=no,menubar=no,status=no'));
	}

	// detect popup blocker (#1489618)
	// don't care this might not work with all browsers
	if (!extwin \|\| extwin.closed) {
	this.display_message(this.get_label('windowopenerror'), 'warning');
	return;
	}

	// write loading... message to empty windows
	if (!url && extwin.document) {
	extwin.document.write('<html><body>' + this.get_label('loading') + '</body></html>');
	}

	// allow plugins to grab the window reference (#1489413)
	this.triggerEvent('openwindow', { url:url, handle:extwin });

	// focus window, delayed to bring to front
	setTimeout(function() { extwin && extwin.focus(); }, 10);

	return extwin;
	};


	/*********************************************************/
	/******* (message) list functionality *******/
	/*********************************************************/

	this.init_message_row = function(row)
	{
	var i, fn = {}, uid = row.uid,
	status_icon = (this.env.status_col != null ? 'status' : 'msg') + 'icn' + row.id;

	if (uid && this.env.messages[uid])
	$.extend(row, this.env.messages[uid]);

	// set eventhandler to status icon
	if (row.icon = document.getElementById(status_icon)) {
	fn.icon = function(e) { ref.command('toggle_status', uid); };
	}

	// save message icon position too
	if (this.env.status_col != null)
	row.msgicon = document.getElementById('msgicn'+row.id);
	else
	row.msgicon = row.icon;

	// set eventhandler to flag icon
	if (this.env.flagged_col != null && (row.flagicon = document.getElementById('flagicn'+row.id))) {
	fn.flagicon = function(e) { ref.command('toggle_flag', uid); };
	}

	// set event handler to thread expand/collapse icon
	if (!row.depth && row.has_children && (row.expando = document.getElementById('rcmexpando'+row.id))) {
	fn.expando = function(e) { ref.expand_message_row(e, uid); };
	}

	// attach events
	$.each(fn, function(i, f) {
	row[i].onclick = function(e) { f(e); return rcube_event.cancel(e); };
	if (bw.touch) {
	row[i].addEventListener('touchend', function(e) {
	if (e.changedTouches.length == 1) {
	f(e);
	return rcube_event.cancel(e);
	}
	}, false);
	}
	});

	this.triggerEvent('insertrow', { uid:uid, row:row });
	};

	// create a table row in the message list
	this.add_message_row = function(uid, cols, flags, attop)
	{
	if (!this.gui_objects.messagelist \|\| !this.message_list)
	return false;

	// Prevent from adding messages from different folder (#1487752)
	if (flags.mbox != this.env.mailbox && !flags.skip_mbox_check)
	return false;

	if (!this.env.messages[uid])
	this.env.messages[uid] = {};

	// merge flags over local message object
	$.extend(this.env.messages[uid], {
	deleted: flags.deleted?1:0,
	replied: flags.answered?1:0,
	unread: !flags.seen?1:0,
	forwarded: flags.forwarded?1:0,
	flagged: flags.flagged?1:0,
	has_children: flags.has_children?1:0,
	depth: flags.depth?flags.depth:0,
	unread_children: flags.unread_children?flags.unread_children:0,
	parent_uid: flags.parent_uid?flags.parent_uid:0,
	selected: this.select_all_mode \|\| this.message_list.in_selection(uid),
	ml: flags.ml?1:0,
	ctype: flags.ctype,
	mbox: flags.mbox,
	// flags from plugins
	flags: flags.extra_flags
	});

	var c, n, col, html, css_class, label, status_class = '', status_label = '',
	tree = '', expando = '',
	list = this.message_list,
	rows = list.rows,
	message = this.env.messages[uid],
	msg_id = this.html_identifier(uid,true),
	row_class = 'message'
	+ (!flags.seen ? ' unread' : '')
	+ (flags.deleted ? ' deleted' : '')
	+ (flags.flagged ? ' flagged' : '')
	+ (message.selected ? ' selected' : ''),
	row = { cols:[], style:{}, id:'rcmrow'+msg_id, uid:uid };

	// message status icons
	css_class = 'msgicon';
	if (this.env.status_col === null) {
	css_class += ' status';
	if (flags.deleted) {
	status_class += ' deleted';
	status_label += this.get_label('deleted') + ' ';
	}
	else if (!flags.seen) {
	status_class += ' unread';
	status_label += this.get_label('unread') + ' ';
	}
	else if (flags.unread_children > 0) {
	status_class += ' unreadchildren';
	}
	}
	if (flags.answered) {
	status_class += ' replied';
	status_label += this.get_label('replied') + ' ';
	}
	if (flags.forwarded) {
	status_class += ' forwarded';
	status_label += this.get_label('forwarded') + ' ';
	}

	// update selection
	if (message.selected && !list.in_selection(uid))
	list.selection.push(uid);

	// threads
	if (this.env.threading) {
	if (message.depth) {
	// This assumes that div width is hardcoded to 15px,
	tree += '<span id="rcmtab' + msg_id + '" class="branch" style="width:' + (message.depth * 15) + 'px;">  </span>';

	if ((rows[message.parent_uid] && rows[message.parent_uid].expanded === false)
	\|\| ((this.env.autoexpand_threads == 0 \|\| this.env.autoexpand_threads == 2) &&
	(!rows[message.parent_uid] \|\| !rows[message.parent_uid].expanded))
	) {
	row.style.display = 'none';
	message.expanded = false;
	}
	else
	message.expanded = true;

	row_class += ' thread expanded';
	}
	else if (message.has_children) {
	if (message.expanded === undefined && (this.env.autoexpand_threads == 1 \|\| (this.env.autoexpand_threads == 2 && message.unread_children))) {
	message.expanded = true;
	}

	expando = '<div id="rcmexpando' + row.id + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '">  </div>';
	row_class += ' thread' + (message.expanded? ' expanded' : '');
	}

	if (flags.unread_children && flags.seen && !message.expanded)
	row_class += ' unroot';
	}

	tree += '<span id="msgicn'+row.id+'" class="'+css_class+status_class+'" title="'+status_label+'"></span>';
	row.className = row_class;

	// build subject link
	if (cols.subject) {
	var action = flags.mbox == this.env.drafts_mailbox ? 'compose' : 'show',
	uid_param = flags.mbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid',
	query = { _mbox: flags.mbox };
	query[uid_param] = uid;
	cols.subject = '<a href="' + this.url(action, query) + '" onclick="return rcube_event.keyboard_only(event)"' +
	' onmouseover="rcube_webmail.long_subject_title(this,'+(message.depth+1)+')" tabindex="-1"><span>'+cols.subject+'</span></a>';
	}

	// add each submitted col
	for (n in this.env.listcols) {
	c = this.env.listcols[n];
	col = {className: String(c).toLowerCase(), events:{}};

	if (this.env.coltypes[c] && this.env.coltypes[c].hidden) {
	col.className += ' hidden';
	}

	if (c == 'flag') {
	css_class = (flags.flagged ? 'flagged' : 'unflagged');
	label = this.get_label(css_class);
	html = '<span id="flagicn'+row.id+'" class="'+css_class+'" title="'+label+'"></span>';
	}
	else if (c == 'attachment') {
	label = this.get_label('withattachment');
	if (flags.attachmentClass)
	html = '<span class="'+flags.attachmentClass+'" title="'+label+'"></span>';
	else if (/application\/\|multipart\/(m\|signed)/.test(flags.ctype))
	html = '<span class="attachment" title="'+label+'"></span>';
	else if (/multipart\/report/.test(flags.ctype))
	html = '<span class="report"></span>';
	else
	html = ' ';
	}
	else if (c == 'status') {
	label = '';
	if (flags.deleted) {
	css_class = 'deleted';
	label = this.get_label('deleted');
	}
	else if (!flags.seen) {
	css_class = 'unread';
	label = this.get_label('unread');
	}
	else if (flags.unread_children > 0) {
	css_class = 'unreadchildren';
	}
	else
	css_class = 'msgicon';
	html = '<span id="statusicn'+row.id+'" class="'+css_class+status_class+'" title="'+label+'"></span>';
	}
	else if (c == 'threads')
	html = expando;
	else if (c == 'subject') {
	if (bw.ie)
	col.events.mouseover = function() { rcube_webmail.long_subject_title_ex(this); };
	html = tree + cols[c];
	}
	else if (c == 'priority') {
	if (flags.prio > 0 && flags.prio < 6) {
	label = this.get_label('priority') + ' ' + flags.prio;
	html = '<span class="prio'+flags.prio+'" title="'+label+'"></span>';
	}
	else
	html = ' ';
	}
	else if (c == 'folder') {
	html = '<span onmouseover="rcube_webmail.long_subject_title(this)">' + cols[c] + '<span>';
	}
	else
	html = cols[c];

	col.innerHTML = html;
	row.cols.push(col);
	}

	list.insert_row(row, attop);

	// remove 'old' row
	if (attop && this.env.pagesize && list.rowcount > this.env.pagesize) {
	var uid = list.get_last_row();
	list.remove_row(uid);
	list.clear_selection(uid);
	}
	};

	this.set_list_sorting = function(sort_col, sort_order)
	{
	// set table header class
	$('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));
	if (sort_col)
	$('#rcm'+sort_col).addClass('sorted'+sort_order);

	this.env.sort_col = sort_col;
	this.env.sort_order = sort_order;
	};

	this.set_list_options = function(cols, sort_col, sort_order, threads)
	{
	var update, post_data = {};

	if (sort_col === undefined)
	sort_col = this.env.sort_col;
	if (!sort_order)
	sort_order = this.env.sort_order;

	if (this.env.sort_col != sort_col \|\| this.env.sort_order != sort_order) {
	update = 1;
	this.set_list_sorting(sort_col, sort_order);
	}

	if (this.env.threading != threads) {
	update = 1;
	post_data._threads = threads;
	}

	if (cols && cols.length) {
	// make sure new columns are added at the end of the list
	var i, idx, name, newcols = [], oldcols = this.env.listcols;
	for (i=0; i<oldcols.length; i++) {
	name = oldcols[i];
	idx = $.inArray(name, cols);
	if (idx != -1) {
	newcols.push(name);
	delete cols[idx];
	}
	}
	for (i=0; i<cols.length; i++)
	if (cols[i])
	newcols.push(cols[i]);

	if (newcols.join() != oldcols.join()) {
	update = 1;
	post_data._cols = newcols.join(',');
	}
	}

	if (update)
	this.list_mailbox('', '', sort_col+'_'+sort_order, post_data);
	};

	// when user double-clicks on a row
	this.show_message = function(id, safe, preview)
	{
	if (!id)
	return;

	var win, target = window,
	action = preview ? 'preview': 'show',
	url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.get_message_mailbox(id));

	if (preview && (win = this.get_frame_window(this.env.contentframe))) {
	target = win;
	url += '&_framed=1';
	}

	if (safe)
	url += '&_safe=1';

	// also send search request to get the right messages
	if (this.env.search_request)
	url += '&_search='+this.env.search_request;

	// add browser capabilities, so we can properly handle attachments
	url += '&_caps='+urlencode(this.browser_capabilities());

	if (this.env.extwin)
	url += '&_extwin=1';

	if (preview && String(target.location.href).indexOf(url) >= 0) {
	this.show_contentframe(true);
	}
	else {
	if (!preview && this.env.message_extwin && !this.env.extwin)
	this.open_window(this.env.comm_path+url, true);
	else
	this.location_href(this.env.comm_path+url, target, true);

	// mark as read and change mbox unread counter
	if (preview && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read > 0) {
	this.preview_read_timer = setTimeout(function() {
	ref.set_unread_message(id, ref.env.mailbox);
	ref.http_post('mark', {_uid: id, _flag: 'read', _quiet: 1});
	}, this.env.preview_pane_mark_read * 1000);
	}
	}
	};

	// update message status and unread counter after marking a message as read
	this.set_unread_message = function(id, folder)
	{
	var self = this;

	// find window with messages list
	if (!self.message_list)
	self = self.opener();

	if (!self && window.parent)
	self = parent.rcmail;

	if (!self \|\| !self.message_list)
	return;

	// this may fail in multifolder mode
	if (self.set_message(id, 'unread', false) === false)
	self.set_message(id + '-' + folder, 'unread', false);

	if (self.env.unread_counts[folder] > 0) {
	self.env.unread_counts[folder] -= 1;
	self.set_unread_count(folder, self.env.unread_counts[folder], folder == 'INBOX' && !self.is_multifolder_listing());
	}
	};

	this.show_contentframe = function(show)
	{
	var frame, win, name = this.env.contentframe;

	if (name && (frame = this.get_frame_element(name))) {
	if (!show && (win = this.get_frame_window(name))) {
	if (win.location.href.indexOf(this.env.blankpage) < 0) {
	if (win.stop)
	win.stop();
	else // IE
	win.document.execCommand('Stop');

	win.location.href = this.env.blankpage;
	}
	}
	else if (!bw.safari && !bw.konq)
	$(frame)[show ? 'show' : 'hide']();
	}

	if (!show && this.env.frame_lock)
	this.set_busy(false, null, this.env.frame_lock);
	};

	this.get_frame_element = function(id)
	{
	var frame;

	if (id && (frame = document.getElementById(id)))
	return frame;
	};

	this.get_frame_window = function(id)
	{
	var frame = this.get_frame_element(id);

	if (frame && frame.name && window.frames)
	return window.frames[frame.name];
	};

	this.lock_frame = function()
	{
	if (!this.env.frame_lock)
	(this.is_framed() ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
	};

	// list a specific page
	this.list_page = function(page)
	{
	if (page == 'next')
	page = this.env.current_page+1;
	else if (page == 'last')
	page = this.env.pagecount;
	else if (page == 'prev' && this.env.current_page > 1)
	page = this.env.current_page-1;
	else if (page == 'first' && this.env.current_page > 1)
	page = 1;

	if (page > 0 && page <= this.env.pagecount) {
	this.env.current_page = page;

	if (this.task == 'addressbook' \|\| this.contact_list)
	this.list_contacts(this.env.source, this.env.group, page);
	else if (this.task == 'mail')
	this.list_mailbox(this.env.mailbox, page);
	}
	};

	// sends request to check for recent messages
	this.checkmail = function()
	{
	var lock = this.set_busy(true, 'checkingmail'),
	params = this.check_recent_params();

	this.http_post('check-recent', params, lock);
	};

	// list messages of a specific mailbox using filter
	this.filter_mailbox = function(filter)
	{
	var lock = this.set_busy(true, 'searching');

	this.clear_message_list();

	// reset vars
	this.env.current_page = 1;
	this.env.search_filter = filter;
	this.http_request('search', this.search_params(false, filter), lock);
	};

	// reload the current message listing
	this.refresh_list = function()
	{
	this.list_mailbox(this.env.mailbox, this.env.current_page \|\| 1, null, { _clear:1 }, true);
	if (this.message_list)
	this.message_list.clear_selection();
	};

	// list messages of a specific mailbox
	this.list_mailbox = function(mbox, page, sort, url, update_only)
	{
	var win, target = window;

	if (typeof url != 'object')
	url = {};

	if (!mbox)
	mbox = this.env.mailbox ? this.env.mailbox : 'INBOX';

	// add sort to url if set
	if (sort)
	url._sort = sort;

	// also send search request to get the right messages
	if (this.env.search_request)
	url._search = this.env.search_request;

	// set page=1 if changeing to another mailbox
	if (this.env.mailbox != mbox) {
	page = 1;
	this.env.current_page = page;
	this.select_all_mode = false;
	}

	if (!update_only) {
	// unselect selected messages and clear the list and message data
	this.clear_message_list();

	if (mbox != this.env.mailbox \|\| (mbox == this.env.mailbox && !page && !sort))
	url._refresh = 1;

	this.select_folder(mbox, '', true);
	this.unmark_folder(mbox, 'recent', '', true);
	this.env.mailbox = mbox;
	}

	// load message list remotely
	if (this.gui_objects.messagelist) {
	this.list_mailbox_remote(mbox, page, url);
	return;
	}

	if (win = this.get_frame_window(this.env.contentframe)) {
	target = win;
	url._framed = 1;
	}

	if (this.env.uid)
	url._uid = this.env.uid;

	// load message list to target frame/window
	if (mbox) {
	this.set_busy(true, 'loading');
	url._mbox = mbox;
	if (page)
	url._page = page;
	this.location_href(url, target);
	}
	};

	this.clear_message_list = function()
	{
	this.env.messages = {};

	this.show_contentframe(false);
	if (this.message_list)
	this.message_list.clear(true);
	};

	// send remote request to load message list
	this.list_mailbox_remote = function(mbox, page, url)
	{
	var lock = this.set_busy(true, 'loading');

	if (typeof url != 'object')
	url = {};
	url._mbox = mbox;
	if (page)
	url._page = page;

	this.http_request('list', url, lock);
	this.update_state({ _mbox: mbox, _page: (page && page > 1 ? page : null) });
	};

	// removes messages that doesn't exists from list selection array
	this.update_selection = function()
	{
	var selected = this.message_list.selection,
	rows = this.message_list.rows,
	i, selection = [];

	for (i in selected)
	if (rows[selected[i]])
	selection.push(selected[i]);

	this.message_list.selection = selection;
	};

	// expand all threads with unread children
	this.expand_unread = function()
	{
	var r, tbody = this.message_list.tbody,
	new_row = tbody.firstChild;

	while (new_row) {
	if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) {
	this.message_list.expand_all(r);
	this.set_unread_children(r.uid);
	}

	new_row = new_row.nextSibling;
	}

	return false;
	};

	// thread expanding/collapsing handler
	this.expand_message_row = function(e, uid)
	{
	var row = this.message_list.rows[uid];

	// handle unread_children mark
	row.expanded = !row.expanded;
	this.set_unread_children(uid);
	row.expanded = !row.expanded;

	this.message_list.expand_row(e, uid);
	};

	// message list expanding
	this.expand_threads = function()
	{
	if (!this.env.threading \|\| !this.env.autoexpand_threads \|\| !this.message_list)
	return;

	switch (this.env.autoexpand_threads) {
	case 2: this.expand_unread(); break;
	case 1: this.message_list.expand_all(); break;
	}
	};

	// Initializes threads indicators/expanders after list update
	this.init_threads = function(roots, mbox)
	{
	// #1487752
	if (mbox && mbox != this.env.mailbox)
	return false;

	for (var n=0, len=roots.length; n<len; n++)
	this.add_tree_icons(roots[n]);
	this.expand_threads();
	};

	// adds threads tree icons to the list (or specified thread)
	this.add_tree_icons = function(root)
	{
	var i, l, r, n, len, pos, tmp = [], uid = [],
	row, rows = this.message_list.rows;

	if (root)
	row = rows[root] ? rows[root].obj : null;
	else
	row = this.message_list.tbody.firstChild;

	while (row) {
	if (row.nodeType == 1 && (r = rows[row.uid])) {
	if (r.depth) {
	for (i=tmp.length-1; i>=0; i--) {
	len = tmp[i].length;
	if (len > r.depth) {
	pos = len - r.depth;
	if (!(tmp[i][pos] & 2))
	tmp[i][pos] = tmp[i][pos] ? tmp[i][pos]+2 : 2;
	}
	else if (len == r.depth) {
	if (!(tmp[i][0] & 2))
	tmp[i][0] += 2;
	}
	if (r.depth > len)
	break;
	}

	tmp.push(new Array(r.depth));
	tmp[tmp.length-1][0] = 1;
	uid.push(r.uid);
	}
	else {
	if (tmp.length) {
	for (i in tmp) {
	this.set_tree_icons(uid[i], tmp[i]);
	}
	tmp = [];
	uid = [];
	}
	if (root && row != rows[root].obj)
	break;
	}
	}
	row = row.nextSibling;
	}

	if (tmp.length) {
	for (i in tmp) {
	this.set_tree_icons(uid[i], tmp[i]);
	}
	}
	};

	// adds tree icons to specified message row
	this.set_tree_icons = function(uid, tree)
	{
	var i, divs = [], html = '', len = tree.length;

	for (i=0; i<len; i++) {
	if (tree[i] > 2)
	divs.push({'class': 'l3', width: 15});
	else if (tree[i] > 1)
	divs.push({'class': 'l2', width: 15});
	else if (tree[i] > 0)
	divs.push({'class': 'l1', width: 15});
	// separator div
	else if (divs.length && !divs[divs.length-1]['class'])
	divs[divs.length-1].width += 15;
	else
	divs.push({'class': null, width: 15});
	}

	for (i=divs.length-1; i>=0; i--) {
	if (divs[i]['class'])
	html += '<div class="tree '+divs[i]['class']+'" />';
	else
	html += '<div style="width:'+divs[i].width+'px" />';
	}

	if (html)
	$('#rcmtab'+this.html_identifier(uid, true)).html(html);
	};

	// update parent in a thread
	this.update_thread_root = function(uid, flag)
	{
	if (!this.env.threading)
	return;

	var root = this.message_list.find_root(uid);

	if (uid == root)
	return;

	var p = this.message_list.rows[root];

	if (flag == 'read' && p.unread_children) {
	p.unread_children--;
	}
	else if (flag == 'unread' && p.has_children) {
	// unread_children may be undefined
	p.unread_children = p.unread_children ? p.unread_children + 1 : 1;
	}
	else {
	return;
	}

	this.set_message_icon(root);
	this.set_unread_children(root);
	};

	// update thread indicators for all messages in a thread below the specified message
	// return number of removed/added root level messages
	this.update_thread = function (uid)
	{
	if (!this.env.threading)
	return 0;

	var r, parent, count = 0,
	rows = this.message_list.rows,
	row = rows[uid],
	depth = rows[uid].depth,
	roots = [];

	if (!row.depth) // root message: decrease roots count
	count--;
	else if (row.unread) {
	// update unread_children for thread root
	parent = this.message_list.find_root(uid);
	rows[parent].unread_children--;
	this.set_unread_children(parent);
	}

	parent = row.parent_uid;

	// childrens
	row = row.obj.nextSibling;
	while (row) {
	if (row.nodeType == 1 && (r = rows[row.uid])) {
	if (!r.depth \|\| r.depth <= depth)
	break;

	r.depth--; // move left
	// reset width and clear the content of a tab, icons will be added later
	$('#rcmtab'+r.id).width(r.depth * 15).html('');
	if (!r.depth) { // a new root
	count++; // increase roots count
	r.parent_uid = 0;
	if (r.has_children) {
	// replace 'leaf' with 'collapsed'
	$('#'+r.id+' .leaf:first')
	.attr('id', 'rcmexpando' + r.id)
	.attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed'))
	.bind('mousedown', {uid: r.uid},
	function(e) { return ref.expand_message_row(e, e.data.uid); });

	r.unread_children = 0;
	roots.push(r);
	}
	// show if it was hidden
	if (r.obj.style.display == 'none')
	$(r.obj).show();
	}
	else {
	if (r.depth == depth)
	r.parent_uid = parent;
	if (r.unread && roots.length)
	roots[roots.length-1].unread_children++;
	}
	}
	row = row.nextSibling;
	}

	// update unread_children for roots
	for (r=0; r<roots.length; r++)
	this.set_unread_children(roots[r].uid);

	return count;
	};

	this.delete_excessive_thread_rows = function()
	{
	var rows = this.message_list.rows,
	tbody = this.message_list.tbody,
	row = tbody.firstChild,
	cnt = this.env.pagesize + 1;

	while (row) {
	if (row.nodeType == 1 && (r = rows[row.uid])) {
	if (!r.depth && cnt)
	cnt--;

	if (!cnt)
	this.message_list.remove_row(row.uid);
	}
	row = row.nextSibling;
	}
	};

	// set message icon
	this.set_message_icon = function(uid)
	{
	var css_class, label = '',
	row = this.message_list.rows[uid];

	if (!row)
	return false;

	if (row.icon) {
	css_class = 'msgicon';
	if (row.deleted) {
	css_class += ' deleted';
	label += this.get_label('deleted') + ' ';
	}
	else if (row.unread) {
	css_class += ' unread';
	label += this.get_label('unread') + ' ';
	}
	else if (row.unread_children)
	css_class += ' unreadchildren';
	if (row.msgicon == row.icon) {
	if (row.replied) {
	css_class += ' replied';
	label += this.get_label('replied') + ' ';
	}
	if (row.forwarded) {
	css_class += ' forwarded';
	label += this.get_label('forwarded') + ' ';
	}
	css_class += ' status';
	}

	$(row.icon).attr('class', css_class).attr('title', label);
	}

	if (row.msgicon && row.msgicon != row.icon) {
	label = '';
	css_class = 'msgicon';
	if (!row.unread && row.unread_children) {
	css_class += ' unreadchildren';
	}
	if (row.replied) {
	css_class += ' replied';
	label += this.get_label('replied') + ' ';
	}
	if (row.forwarded) {
	css_class += ' forwarded';
	label += this.get_label('forwarded') + ' ';
	}

	$(row.msgicon).attr('class', css_class).attr('title', label);
	}

	if (row.flagicon) {
	css_class = (row.flagged ? 'flagged' : 'unflagged');
	label = this.get_label(css_class);
	$(row.flagicon).attr('class', css_class)
	.attr('aria-label', label)
	.attr('title', label);
	}
	};

	// set message status
	this.set_message_status = function(uid, flag, status)
	{
	var row = this.message_list.rows[uid];

	if (!row)
	return false;

	if (flag == 'unread') {
	if (row.unread != status)
	this.update_thread_root(uid, status ? 'unread' : 'read');
	}

	if ($.inArray(flag, ['unread', 'deleted', 'replied', 'forwarded', 'flagged']) > -1)
	row[flag] = status;
	};

	// set message row status, class and icon
	this.set_message = function(uid, flag, status)
	{
	var row = this.message_list && this.message_list.rows[uid];

	if (!row)
	return false;

	if (flag)
	this.set_message_status(uid, flag, status);

	if ($.inArray(flag, ['unread', 'deleted', 'flagged']) > -1)
	$(row.obj)[row[flag] ? 'addClass' : 'removeClass'](flag);

	this.set_unread_children(uid);
	this.set_message_icon(uid);
	};

	// sets unroot (unread_children) class of parent row
	this.set_unread_children = function(uid)
	{
	var row = this.message_list.rows[uid];

	if (row.parent_uid)
	return;

	if (!row.unread && row.unread_children && !row.expanded)
	$(row.obj).addClass('unroot');
	else
	$(row.obj).removeClass('unroot');
	};

	// copy selected messages to the specified mailbox
	this.copy_messages = function(mbox, event)
	{
	if (mbox && typeof mbox === 'object')
	mbox = mbox.id;
	else if (!mbox)
	return this.folder_selector(event, function(folder) { ref.command('copy', folder); });

	// exit if current or no mailbox specified
	if (!mbox \|\| mbox == this.env.mailbox)
	return;

	var post_data = this.selection_post_data({_target_mbox: mbox});

	// exit if selection is empty
	if (!post_data._uid)
	return;

	// send request to server
	this.http_post('copy', post_data, this.display_message(this.get_label('copyingmessage'), 'loading'));
	};

	// move selected messages to the specified mailbox
	this.move_messages = function(mbox, event)
	{
	if (mbox && typeof mbox === 'object')
	mbox = mbox.id;
	else if (!mbox)
	return this.folder_selector(event, function(folder) { ref.command('move', folder); });

	// exit if current or no mailbox specified
	if (!mbox \|\| (mbox == this.env.mailbox && !this.is_multifolder_listing()))
	return;

	var lock = false, post_data = this.selection_post_data({_target_mbox: mbox});

	// exit if selection is empty
	if (!post_data._uid)
	return;

	// show wait message
	if (this.env.action == 'show')
	lock = this.set_busy(true, 'movingmessage');
	else
	this.show_contentframe(false);

	// Hide message command buttons until a message is selected
	this.enable_command(this.env.message_commands, false);

	this._with_selected_messages('move', post_data, lock);
	};

	// delete selected messages from the current mailbox
	this.delete_messages = function(event)
	{
	var list = this.message_list, trash = this.env.trash_mailbox;

	// if config is set to flag for deletion
	if (this.env.flag_for_deletion) {
	this.mark_message('delete');
	return false;
	}
	// if there isn't a defined trash mailbox or we are in it
	else if (!trash \|\| this.env.mailbox == trash)
	this.permanently_remove_messages();
	// we're in Junk folder and delete_junk is enabled
	else if (this.env.delete_junk && this.env.junk_mailbox && this.env.mailbox == this.env.junk_mailbox)
	this.permanently_remove_messages();
	// if there is a trash mailbox defined and we're not currently in it
	else {
	// if shift was pressed delete it immediately
	if ((list && list.modkey == SHIFT_KEY) \|\| (event && rcube_event.get_modifier(event) == SHIFT_KEY)) {
	if (confirm(this.get_label('deletemessagesconfirm')))
	this.permanently_remove_messages();
	}
	else
	this.move_messages(trash);
	}

	return true;
	};

	// delete the selected messages permanently
	this.permanently_remove_messages = function()
	{
	var post_data = this.selection_post_data();

	// exit if selection is empty
	if (!post_data._uid)
	return;

	this.show_contentframe(false);
	this._with_selected_messages('delete', post_data);
	};

	// Send a specific move/delete request with UIDs of all selected messages
	// @private
	this._with_selected_messages = function(action, post_data, lock)
	{
	var count = 0, msg,
	remove = (action == 'delete' \|\| !this.is_multifolder_listing());

	// update the list (remove rows, clear selection)
	if (this.message_list) {
	var n, id, root, roots = [],
	selection = this.message_list.get_selection();

	for (n=0, len=selection.length; n<len; n++) {
	id = selection[n];

	if (this.env.threading) {
	count += this.update_thread(id);
	root = this.message_list.find_root(id);
	if (root != id && $.inArray(root, roots) < 0) {
	roots.push(root);
	}
	}
	if (remove)
	this.message_list.remove_row(id, (this.env.display_next && n == selection.length-1));
	}
	// make sure there are no selected rows
	if (!this.env.display_next && remove)
	this.message_list.clear_selection();
	// update thread tree icons
	for (n=0, len=roots.length; n<len; n++) {
	this.add_tree_icons(roots[n]);
	}
	}

	if (count < 0)
	post_data._count = (count*-1);
	// remove threads from the end of the list
	else if (count > 0 && remove)
	this.delete_excessive_thread_rows();

	if (!remove)
	post_data._refresh = 1;

	if (!lock) {
	msg = action == 'move' ? 'movingmessage' : 'deletingmessage';
	lock = this.display_message(this.get_label(msg), 'loading');
	}

	// send request to server
	this.http_post(action, post_data, lock);
	};

	// build post data for message delete/move/copy/flag requests
	this.selection_post_data = function(data)
	{
	if (typeof(data) != 'object')
	data = {};

	data._mbox = this.env.mailbox;

	if (!data._uid) {
	var uids = this.env.uid ? [this.env.uid] : this.message_list.get_selection();
	data._uid = this.uids_to_list(uids);
	}

	if (this.env.action)
	data._from = this.env.action;

	// also send search request to get the right messages
	if (this.env.search_request)
	data._search = this.env.search_request;

	if (this.env.display_next && this.env.next_uid)
	data._next_uid = this.env.next_uid;

	return data;
	};

	// set a specific flag to one or more messages
	this.mark_message = function(flag, uid)
	{
	var a_uids = [], r_uids = [], len, n, id,
	list = this.message_list;

	if (uid)
	a_uids[0] = uid;
	else if (this.env.uid)
	a_uids[0] = this.env.uid;
	else if (list)
	a_uids = list.get_selection();

	if (!list)
	r_uids = a_uids;
	else {
	list.focus();
	for (n=0, len=a_uids.length; n<len; n++) {
	id = a_uids[n];
	if ((flag == 'read' && list.rows[id].unread)
	\|\| (flag == 'unread' && !list.rows[id].unread)
	\|\| (flag == 'delete' && !list.rows[id].deleted)
	\|\| (flag == 'undelete' && list.rows[id].deleted)
	\|\| (flag == 'flagged' && !list.rows[id].flagged)
	\|\| (flag == 'unflagged' && list.rows[id].flagged))
	{
	r_uids.push(id);
	}
	}
	}

	// nothing to do
	if (!r_uids.length && !this.select_all_mode)
	return;

	switch (flag) {
	case 'read':
	case 'unread':
	this.toggle_read_status(flag, r_uids);
	break;
	case 'delete':
	case 'undelete':
	this.toggle_delete_status(r_uids);
	break;
	case 'flagged':
	case 'unflagged':
	this.toggle_flagged_status(flag, a_uids);
	break;
	}
	};

	// set class to read/unread
	this.toggle_read_status = function(flag, a_uids)
	{
	var i, len = a_uids.length,
	post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: flag}),
	lock = this.display_message(this.get_label('markingmessage'), 'loading');

	// mark all message rows as read/unread
	for (i=0; i<len; i++)
	this.set_message(a_uids[i], 'unread', (flag == 'unread' ? true : false));

	this.http_post('mark', post_data, lock);
	};

	// set image to flagged or unflagged
	this.toggle_flagged_status = function(flag, a_uids)
	{
	var i, len = a_uids.length,
	post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: flag}),
	lock = this.display_message(this.get_label('markingmessage'), 'loading');

	// mark all message rows as flagged/unflagged
	for (i=0; i<len; i++)
	this.set_message(a_uids[i], 'flagged', (flag == 'flagged' ? true : false));

	this.http_post('mark', post_data, lock);
	};

	// mark all message rows as deleted/undeleted
	this.toggle_delete_status = function(a_uids)
	{
	var len = a_uids.length,
	i, uid, all_deleted = true,
	rows = this.message_list ? this.message_list.rows : {};

	if (len == 1) {
	if (!this.message_list \|\| (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
	this.flag_as_deleted(a_uids);
	else
	this.flag_as_undeleted(a_uids);

	return true;
	}

	for (i=0; i<len; i++) {
	uid = a_uids[i];
	if (rows[uid] && !rows[uid].deleted) {
	all_deleted = false;
	break;
	}
	}

	if (all_deleted)
	this.flag_as_undeleted(a_uids);
	else
	this.flag_as_deleted(a_uids);

	return true;
	};

	this.flag_as_undeleted = function(a_uids)
	{
	var i, len = a_uids.length,
	post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'undelete'}),
	lock = this.display_message(this.get_label('markingmessage'), 'loading');

	for (i=0; i<len; i++)
	this.set_message(a_uids[i], 'deleted', false);

	this.http_post('mark', post_data, lock);
	};

	this.flag_as_deleted = function(a_uids)
	{
	var r_uids = [],
	post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'delete'}),
	lock = this.display_message(this.get_label('markingmessage'), 'loading'),
	rows = this.message_list ? this.message_list.rows : {},
	count = 0;

	for (var i=0, len=a_uids.length; i<len; i++) {
	uid = a_uids[i];
	if (rows[uid]) {
	if (rows[uid].unread)
	r_uids[r_uids.length] = uid;

	if (this.env.skip_deleted) {
	count += this.update_thread(uid);
	this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1));
	}
	else
	this.set_message(uid, 'deleted', true);
	}
	}

	// make sure there are no selected rows
	if (this.env.skip_deleted && this.message_list) {
	if (!this.env.display_next)
	this.message_list.clear_selection();
	if (count < 0)
	post_data._count = (count*-1);
	else if (count > 0)
	// remove threads from the end of the list
	this.delete_excessive_thread_rows();
	}

	// set of messages to mark as seen
	if (r_uids.length)
	post_data._ruid = this.uids_to_list(r_uids);

	if (this.env.skip_deleted && this.env.display_next && this.env.next_uid)
	post_data._next_uid = this.env.next_uid;

	this.http_post('mark', post_data, lock);
	};

	// flag as read without mark request (called from backend)
	// argument should be a coma-separated list of uids
	this.flag_deleted_as_read = function(uids)
	{
	var uid, i, len,
	rows = this.message_list ? this.message_list.rows : {};

	if (typeof uids == 'string')
	uids = uids.split(',');

	for (i=0, len=uids.length; i<len; i++) {
	uid = uids[i];
	if (rows[uid])
	this.set_message(uid, 'unread', false);
	}
	};

	// Converts array of message UIDs to comma-separated list for use in URL
	// with select_all mode checking
	this.uids_to_list = function(uids)
	{
	return this.select_all_mode ? '*' : (uids.length <= 1 ? uids.join(',') : uids);
	};

	// Sets title of the delete button
	this.set_button_titles = function()
	{
	var label = 'deletemessage';

	if (!this.env.flag_for_deletion
	&& this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox
	&& (!this.env.delete_junk \|\| !this.env.junk_mailbox \|\| this.env.mailbox != this.env.junk_mailbox)
	)
	label = 'movemessagetotrash';

	this.set_alttext('delete', label);
	};

	/*********************************************************/
	/******* mailbox folders methods *******/
	/*********************************************************/

	this.expunge_mailbox = function(mbox)
	{
	var lock, post_data = {_mbox: mbox};

	// lock interface if it's the active mailbox
	if (mbox == this.env.mailbox) {
	lock = this.set_busy(true, 'loading');
	post_data._reload = 1;
	if (this.env.search_request)
	post_data._search = this.env.search_request;
	}

	// send request to server
	this.http_post('expunge', post_data, lock);
	};

	this.purge_mailbox = function(mbox)
	{
	var lock, post_data = {_mbox: mbox};

	if (!confirm(this.get_label('purgefolderconfirm')))
	return false;

	// lock interface if it's the active mailbox
	if (mbox == this.env.mailbox) {
	lock = this.set_busy(true, 'loading');
	post_data._reload = 1;
	}

	// send request to server
	this.http_post('purge', post_data, lock);
	};

	// test if purge command is allowed
	this.purge_mailbox_test = function()
	{
	return (this.env.exists && (
	this.env.mailbox == this.env.trash_mailbox
	\|\| this.env.mailbox == this.env.junk_mailbox
	\|\| this.env.mailbox.startsWith(this.env.trash_mailbox + this.env.delimiter)
	\|\| this.env.mailbox.startsWith(this.env.junk_mailbox + this.env.delimiter)
	));
	};


	/*********************************************************/
	/******* login form methods *******/
	/*********************************************************/

	// handler for keyboard events on the _user field
	this.login_user_keyup = function(e)
	{
	var key = rcube_event.get_keycode(e),
	passwd = $('#rcmloginpwd');

	// enter
	if (key == 13 && passwd.length && !passwd.val()) {
	passwd.focus();
	return rcube_event.cancel(e);
	}

	return true;
	};


	/*********************************************************/
	/******* message compose methods *******/
	/*********************************************************/

	this.open_compose_step = function(p)
	{
	var url = this.url('mail/compose', p);

	// open new compose window
	if (this.env.compose_extwin && !this.env.extwin) {
	this.open_window(url);
	}
	else {
	this.redirect(url);
	if (this.env.extwin)
	window.resizeTo(Math.max(this.env.popup_width, $(window).width()), $(window).height() + 24);
	}
	};

	// init message compose form: set focus and eventhandlers
	this.init_messageform = function()
	{
	if (!this.gui_objects.messageform)
	return false;

	var i, pos, input_from = $("[name='_from']"),
	input_to = $("[name='_to']"),
	input_subject = $("input[name='_subject']"),
	input_message = $("[name='_message']").get(0),
	html_mode = $("input[name='_is_html']").val() == '1',
	ac_fields = ['cc', 'bcc', 'replyto', 'followupto'],
	ac_props, opener_rc = this.opener();

	// close compose step in opener
	if (opener_rc && opener_rc.env.action == 'compose') {
	setTimeout(function(){
	if (opener.history.length > 1)
	opener.history.back();
	else
	opener_rc.redirect(opener_rc.get_task_url('mail'));
	}, 100);
	this.env.opened_extwin = true;
	}

	// configure parallel autocompletion
	if (this.env.autocomplete_threads > 0) {
	ac_props = {
	threads: this.env.autocomplete_threads,
	sources: this.env.autocomplete_sources
	};
	}

	// init live search events
	this.init_address_input_events(input_to, ac_props);
	for (i in ac_fields) {
	this.init_address_input_events($("[name='_"+ac_fields[i]+"']"), ac_props);
	}

	if (!html_mode) {
	pos = this.env.top_posting ? 0 : input_message.value.length;
	this.set_caret_pos(input_message, pos);

	// add signature according to selected identity
	// if we have HTML editor, signature is added in callback
	if (input_from.prop('type') == 'select-one') {
	this.change_identity(input_from[0]);
	}

	// scroll to the bottom of the textarea (#1490114)
	if (pos) {
	$(input_message).scrollTop(input_message.scrollHeight);
	}
	}

	// check for locally stored compose data
	if (this.env.save_localstorage)
	this.compose_restore_dialog(0, html_mode)

	if (input_to.val() == '')
	input_to.focus();
	else if (input_subject.val() == '')
	input_subject.focus();
	else if (input_message)
	input_message.focus();

	this.env.compose_focus_elem = document.activeElement;

	// get summary of all field values
	this.compose_field_hash(true);

	// start the auto-save timer
	this.auto_save_start();
	};

	this.compose_restore_dialog = function(j, html_mode)
	{
	var i, key, formdata, index = this.local_storage_get_item('compose.index', []);

	var show_next = function(i) {
	if (++i < index.length)
	ref.compose_restore_dialog(i, html_mode)
	}

	for (i = j \|\| 0; i < index.length; i++) {
	key = index[i];
	formdata = this.local_storage_get_item('compose.' + key, null, true);
	if (!formdata) {
	continue;
	}
	// restore saved copy of current compose_id
	if (formdata.changed && key == this.env.compose_id) {
	this.restore_compose_form(key, html_mode);
	break;
	}
	// skip records from 'other' drafts
	if (this.env.draft_id && formdata.draft_id && formdata.draft_id != this.env.draft_id) {
	continue;
	}
	// skip records on reply
	if (this.env.reply_msgid && formdata.reply_msgid != this.env.reply_msgid) {
	continue;
	}
	// show dialog asking to restore the message
	if (formdata.changed && formdata.session != this.env.session_id) {
	this.show_popup_dialog(
	this.get_label('restoresavedcomposedata')
	.replace('$date', new Date(formdata.changed).toLocaleString())
	.replace('$subject', formdata._subject)
	.replace(/\n/g, '<br/>'),
	this.get_label('restoremessage'),
	[{
	text: this.get_label('restore'),
	'class': 'mainaction',
	click: function(){
	ref.restore_compose_form(key, html_mode);
	ref.remove_compose_data(key); // remove old copy
	ref.save_compose_form_local(); // save under current compose_id
	$(this).dialog('close');
	}
	},
	{
	text: this.get_label('delete'),
	'class': 'delete',
	click: function(){
	ref.remove_compose_data(key);
	$(this).dialog('close');
	show_next(i);
	}
	},
	{
	text: this.get_label('ignore'),
	click: function(){
	$(this).dialog('close');
	show_next(i);
	}
	}]
	);
	break;
	}
	}
	}

	this.init_address_input_events = function(obj, props)
	{
	this.env.recipients_delimiter = this.env.recipients_separator + ' ';

	obj.keydown(function(e) { return ref.ksearch_keydown(e, this, props); })
	.attr({ 'autocomplete': 'off', 'aria-autocomplete': 'list', 'aria-expanded': 'false', 'role': 'combobox' });
	};

	this.submit_messageform = function(draft)
	{
	var form = this.gui_objects.messageform;

	if (!form)
	return;

	// all checks passed, send message
	var msgid = this.set_busy(true, draft ? 'savingmessage' : 'sendingmessage'),
	lang = this.spellcheck_lang(),
	files = [];

	// send files list
	$('li', this.gui_objects.attachmentlist).each(function() { files.push(this.id.replace(/^rcmfile/, '')); });
	$('input[name="_attachments"]', form).val(files.join());

	form.target = 'savetarget';
	form._draft.value = draft ? '1' : '';
	form.action = this.add_url(form.action, '_unlock', msgid);
	form.action = this.add_url(form.action, '_lang', lang);
	form.action = this.add_url(form.action, '_framed', 1);

	// register timer to notify about connection timeout
	this.submit_timer = setTimeout(function(){
	ref.set_busy(false, null, msgid);
	ref.display_message(ref.get_label('requesttimedout'), 'error');
	}, this.env.request_timeout * 1000);

	form.submit();
	};

	this.compose_recipient_select = function(list)
	{
	var id, n, recipients = 0;
	for (n=0; n < list.selection.length; n++) {
	id = list.selection[n];
	if (this.env.contactdata[id])
	recipients++;
	}
	this.enable_command('add-recipient', recipients);
	};

	this.compose_add_recipient = function(field)
	{
	// find last focused field name
	if (!field) {
	field = $(this.env.focused_field).filter(':visible');
	field = field.length ? field.attr('id').replace('_', '') : 'to';
	}

	var recipients = [], input = $('#_'+field), delim = this.env.recipients_delimiter;

	if (this.contact_list && this.contact_list.selection.length) {
	for (var id, n=0; n < this.contact_list.selection.length; n++) {
	id = this.contact_list.selection[n];
	if (id && this.env.contactdata[id]) {
	recipients.push(this.env.contactdata[id]);

	// group is added, expand it
	if (id.charAt(0) == 'E' && this.env.contactdata[id].indexOf('@') < 0 && input.length) {
	var gid = id.substr(1);
	this.group2expand[gid] = { name:this.env.contactdata[id], input:input.get(0) };
	this.http_request('group-expand', {_source: this.env.source, _gid: gid}, false);
	}
	}
	}
	}

	if (recipients.length && input.length) {
	var oldval = input.val(), rx = new RegExp(RegExp.escape(delim) + '\\s*$');
	if (oldval && !rx.test(oldval))
	oldval += delim + ' ';
	input.val(oldval + recipients.join(delim + ' ') + delim + ' ');
	this.triggerEvent('add-recipient', { field:field, recipients:recipients });
	}

	return recipients.length;
	};

	// checks the input fields before sending a message
	this.check_compose_input = function(cmd)
	{
	// check input fields
	var input_to = $("[name='_to']"),
	input_cc = $("[name='_cc']"),
	input_bcc = $("[name='_bcc']"),
	input_from = $("[name='_from']"),
	input_subject = $("[name='_subject']");

	// check sender (if have no identities)
	if (input_from.prop('type') == 'text' && !rcube_check_email(input_from.val(), true)) {
	alert(this.get_label('nosenderwarning'));
	input_from.focus();
	return false;
	}

	// check for empty recipient
	var recipients = input_to.val() ? input_to.val() : (input_cc.val() ? input_cc.val() : input_bcc.val());
	if (!rcube_check_email(recipients.replace(/^\s+/, '').replace(/[\s,;]+$/, ''), true)) {
	alert(this.get_label('norecipientwarning'));
	input_to.focus();
	return false;
	}

	// check if all files has been uploaded
	for (var key in this.env.attachments) {
	if (typeof this.env.attachments[key] === 'object' && !this.env.attachments[key].complete) {
	alert(this.get_label('notuploadedwarning'));
	return false;
	}
	}

	// display localized warning for missing subject
	if (input_subject.val() == '') {
	var buttons = {},
	myprompt = $('<div class="prompt">').html('<div class="message">' + this.get_label('nosubjectwarning') + '</div>')
	.appendTo(document.body),
	prompt_value = $('<input>').attr({type: 'text', size: 30}).val(this.get_label('nosubject'))
	.appendTo(myprompt),
	save_func = function() {
	input_subject.val(prompt_value.val());
	myprompt.dialog('close');
	ref.command(cmd, { nocheck:true }); // repeat command which triggered this
	};

	buttons[this.get_label('sendmessage')] = function() {
	save_func($(this));
	};
	buttons[this.get_label('cancel')] = function() {
	input_subject.focus();
	$(this).dialog('close');
	};

	myprompt.dialog({
	modal: true,
	resizable: false,
	buttons: buttons,
	close: function(event, ui) { $(this).remove(); }
	});

	prompt_value.select().keydown(function(e) {
	if (e.which == 13) save_func();
	});

	return false;
	}

	// check for empty body
	if (!this.editor.get_content() && !confirm(this.get_label('nobodywarning'))) {
	this.editor.focus();
	return false;
	}

	// move body from html editor to textarea (just to be sure, #1485860)
	this.editor.save();

	return true;
	};

	this.toggle_editor = function(props, obj, e)
	{
	// @todo: this should work also with many editors on page
	var result = this.editor.toggle(props.html, props.noconvert \|\| false);

	// satisfy the expectations of aftertoggle-editor event subscribers
	props.mode = props.html ? 'html' : 'plain';

	if (!result && e) {
	// fix selector value if operation failed
	props.mode = props.html ? 'plain' : 'html';
	$(e.target).filter('select').val(props.mode);
	}

	if (result) {
	// update internal format flag
	$("input[name='_is_html']").val(props.html ? 1 : 0);
	}

	return result;
	};

	this.insert_response = function(key)
	{
	var insert = this.env.textresponses[key] ? this.env.textresponses[key].text : null;

	if (!insert)
	return false;

	this.editor.replace(insert);
	};

	/**
	* Open the dialog to save a new canned response
	*/
	this.save_response = function()
	{
	// show dialog to enter a name and to modify the text to be saved
	var buttons = {}, text = this.editor.get_content({selection: true, format: 'text', nosig: true}),
	html = '<form class="propform">' +
	'<div class="prop block"><label>' + this.get_label('responsename') + '</label>' +
	'<input type="text" name="name" id="ffresponsename" size="40" /></div>' +
	'<div class="prop block"><label>' + this.get_label('responsetext') + '</label>' +
	'<textarea name="text" id="ffresponsetext" cols="40" rows="8"></textarea></div>' +
	'</form>';

	buttons[this.gettext('save')] = function(e) {
	var name = $('#ffresponsename').val(),
	text = $('#ffresponsetext').val();

	if (!text) {
	$('#ffresponsetext').select();
	return false;
	}
	if (!name)
	name = text.substring(0,40);

	var lock = ref.display_message(ref.get_label('savingresponse'), 'loading');
	ref.http_post('settings/responses', { _insert:1, _name:name, _text:text }, lock);
	$(this).dialog('close');
	};

	buttons[this.gettext('cancel')] = function() {
	$(this).dialog('close');
	};

	this.show_popup_dialog(html, this.gettext('newresponse'), buttons, {button_classes: ['mainaction']});

	$('#ffresponsetext').val(text);
	$('#ffresponsename').select();
	};

	this.add_response_item = function(response)
	{
	var key = response.key;
	this.env.textresponses[key] = response;

	// append to responses list
	if (this.gui_objects.responseslist) {
	var li = $('<li>').appendTo(this.gui_objects.responseslist);
	$('<a>').addClass('insertresponse active')
	.attr('href', '#')
	.attr('rel', key)
	.attr('tabindex', '0')
	.html(this.quote_html(response.name))
	.appendTo(li)
	.mousedown(function(e){
	return rcube_event.cancel(e);
	})
	.bind('mouseup keypress', function(e){
	if (e.type == 'mouseup' \|\| rcube_event.get_keycode(e) == 13) {
	ref.command('insert-response', $(this).attr('rel'));
	$(document.body).trigger('mouseup'); // hides the menu
	return rcube_event.cancel(e);
	}
	});
	}
	};

	this.edit_responses = function()
	{
	// TODO: implement inline editing of responses
	};

	this.delete_response = function(key)
	{
	if (!key && this.responses_list) {
	var selection = this.responses_list.get_selection();
	key = selection[0];
	}

	// submit delete request
	if (key && confirm(this.get_label('deleteresponseconfirm'))) {
	this.http_post('settings/delete-response', { _key: key }, false);
	}
	};

	// updates spellchecker buttons on state change
	this.spellcheck_state = function()
	{
	var active = this.editor.spellcheck_state();

	$.each(this.buttons.spellcheck \|\| [], function(i, v) {
	$('#' + v.id)[active ? 'addClass' : 'removeClass']('selected');
	});

	return active;
	};

	// get selected language
	this.spellcheck_lang = function()
	{
	return this.editor.get_language();
	};

	this.spellcheck_lang_set = function(lang)
	{
	this.editor.set_language(lang);
	};

	// resume spellchecking, highlight provided mispellings without new ajax request
	this.spellcheck_resume = function(data)
	{
	this.editor.spellcheck_resume(data);
	};

	this.set_draft_id = function(id)
	{
	var rc;

	if (id && id != this.env.draft_id) {
	if (rc = this.opener()) {
	// refresh the drafts folder in opener window
	if (rc.env.task == 'mail' && rc.env.action == '' && rc.env.mailbox == this.env.drafts_mailbox)
	rc.command('checkmail');
	}

	this.env.draft_id = id;
	$("input[name='_draft_saveid']").val(id);

	// reset history of hidden iframe used for saving draft (#1489643)
	// but don't do this on timer-triggered draft-autosaving (#1489789)
	if (window.frames['savetarget'] && window.frames['savetarget'].history && !this.draft_autosave_submit) {
	window.frames['savetarget'].history.back();
	}

	this.draft_autosave_submit = false;
	}

	// always remove local copy upon saving as draft
	this.remove_compose_data(this.env.compose_id);
	this.compose_skip_unsavedcheck = false;
	};

	this.auto_save_start = function()
	{
	if (this.env.draft_autosave) {
	this.draft_autosave_submit = false;
	this.save_timer = setTimeout(function(){
	ref.draft_autosave_submit = true; // set auto-saved flag (#1489789)
	ref.command("savedraft");
	}, this.env.draft_autosave * 1000);
	}

	// save compose form content to local storage every 5 seconds
	if (!this.local_save_timer && window.localStorage && this.env.save_localstorage) {
	// track typing activity and only save on changes
	this.compose_type_activity = this.compose_type_activity_last = 0;
	$(document).bind('keypress', function(e){ ref.compose_type_activity++; });

	this.local_save_timer = setInterval(function(){
	if (ref.compose_type_activity > ref.compose_type_activity_last) {
	ref.save_compose_form_local();
	ref.compose_type_activity_last = ref.compose_type_activity;
	}
	}, 5000);

	$(window).unload(function() {
	// remove copy from local storage if compose screen is left after warning
	if (!ref.env.server_error)
	ref.remove_compose_data(ref.env.compose_id);
	});
	}

	// check for unsaved changes before leaving the compose page
	if (!window.onbeforeunload) {
	window.onbeforeunload = function() {
	if (!ref.compose_skip_unsavedcheck && ref.cmp_hash != ref.compose_field_hash()) {
	return ref.get_label('notsentwarning');
	}
	};
	}

	// Unlock interface now that saving is complete
	this.busy = false;
	};

	this.compose_field_hash = function(save)
	{
	// check input fields
	var i, id, val, str = '', hash_fields = ['to', 'cc', 'bcc', 'subject'];

	for (i=0; i<hash_fields.length; i++)
	if (val = $('[name="_' + hash_fields[i] + '"]').val())
	str += val + ':';

	str += this.editor.get_content({refresh: false});

	if (this.env.attachments)
	for (id in this.env.attachments)
	str += id;

	if (save)
	this.cmp_hash = str;

	return str;
	};

	// store the contents of the compose form to localstorage
	this.save_compose_form_local = function()
	{
	// feature is disabled
	if (!this.env.save_localstorage)
	return;

	var formdata = { session:this.env.session_id, changed:new Date().getTime() },
	ed, empty = true;

	// get fresh content from editor
	this.editor.save();

	if (this.env.draft_id) {
	formdata.draft_id = this.env.draft_id;
	}
	if (this.env.reply_msgid) {
	formdata.reply_msgid = this.env.reply_msgid;
	}

	$('input, select, textarea', this.gui_objects.messageform).each(function(i, elem) {
	switch (elem.tagName.toLowerCase()) {
	case 'input':
	if (elem.type == 'button' \|\| elem.type == 'submit' \|\| (elem.type == 'hidden' && elem.name != '_is_html')) {
	break;
	}
	formdata[elem.name] = elem.type != 'checkbox' \|\| elem.checked ? $(elem).val() : '';

	if (formdata[elem.name] != '' && elem.type != 'hidden')
	empty = false;
	break;

	case 'select':
	formdata[elem.name] = $('option:checked', elem).val();
	break;

	default:
	formdata[elem.name] = $(elem).val();
	if (formdata[elem.name] != '')
	empty = false;
	}
	});

	if (!empty) {
	var index = this.local_storage_get_item('compose.index', []),
	key = this.env.compose_id;

	if ($.inArray(key, index) < 0) {
	index.push(key);
	}

	this.local_storage_set_item('compose.' + key, formdata, true);
	this.local_storage_set_item('compose.index', index);
	}
	};

	// write stored compose data back to form
	this.restore_compose_form = function(key, html_mode)
	{
	var ed, formdata = this.local_storage_get_item('compose.' + key, true);

	if (formdata && typeof formdata == 'object') {
	$.each(formdata, function(k, value) {
	if (k[0] == '_') {
	var elem = $("*[name='"+k+"']");
	if (elem[0] && elem[0].type == 'checkbox') {
	elem.prop('checked', value != '');
	}
	else {
	elem.val(value);
	}
	}
	});

	// initialize HTML editor
	if ((formdata._is_html == '1' && !html_mode) \|\| (formdata._is_html != '1' && html_mode)) {
	this.command('toggle-editor', {id: this.env.composebody, html: !html_mode, noconvert: true});
	}
	}
	};

	// remove stored compose data from localStorage
	this.remove_compose_data = function(key)
	{
	var index = this.local_storage_get_item('compose.index', []);

	if ($.inArray(key, index) >= 0) {
	this.local_storage_remove_item('compose.' + key);
	this.local_storage_set_item('compose.index', $.grep(index, function(val,i) { return val != key; }));
	}
	};

	// clear all stored compose data of this user
	this.clear_compose_data = function()
	{
	var i, index = this.local_storage_get_item('compose.index', []);

	for (i=0; i < index.length; i++) {
	this.local_storage_remove_item('compose.' + index[i]);
	}

	this.local_storage_remove_item('compose.index');
	};


	this.change_identity = function(obj, show_sig)
	{
	if (!obj \|\| !obj.options)
	return false;

	if (!show_sig)
	show_sig = this.env.show_sig;

	var id = obj.options[obj.selectedIndex].value,
	sig = this.env.identity,
	delim = this.env.recipients_separator,
	rx_delim = RegExp.escape(delim);

	// enable manual signature insert
	if (this.env.signatures && this.env.signatures[id]) {
	this.enable_command('insert-sig', true);
	this.env.compose_commands.push('insert-sig');
	}
	else
	this.enable_command('insert-sig', false);

	// first function execution
	if (!this.env.identities_initialized) {
	this.env.identities_initialized = true;
	if (this.env.show_sig_later)
	this.env.show_sig = true;
	if (this.env.opened_extwin)
	return;
	}

	// update reply-to/bcc fields with addresses defined in identities
	$.each(['replyto', 'bcc'], function() {
	var rx, key = this,
	old_val = sig && ref.env.identities[sig] ? ref.env.identities[sig][key] : '',
	new_val = id && ref.env.identities[id] ? ref.env.identities[id][key] : '',
	input = $('[name="_'+key+'"]'), input_val = input.val();

	// remove old address(es)
	if (old_val && input_val) {
	rx = new RegExp('\\s' + RegExp.escape(old_val) + '\\s');
	input_val = input_val.replace(rx, '');
	}

	// cleanup
	rx = new RegExp(rx_delim + '\\s*' + rx_delim, 'g');
	input_val = String(input_val).replace(rx, delim);
	rx = new RegExp('^[\\s' + rx_delim + ']+');
	input_val = input_val.replace(rx, '');

	// add new address(es)
	if (new_val && input_val.indexOf(new_val) == -1 && input_val.indexOf(new_val.replace(/"/g, '')) == -1) {
	if (input_val) {
	rx = new RegExp('[' + rx_delim + '\\s]+$')
	input_val = input_val.replace(rx, '') + delim + ' ';
	}

	input_val += new_val + delim + ' ';
	}

	if (old_val \|\| new_val)
	input.val(input_val).change();
	});

	this.editor.change_signature(id, show_sig);
	this.env.identity = id;
	this.triggerEvent('change_identity');
	return true;
	};

	// upload (attachment) file
	this.upload_file = function(form, action)
	{
	if (!form)
	return;

	// count files and size on capable browser
	var size = 0, numfiles = 0;

	$('input[type=file]', form).each(function(i, field) {
	var files = field.files ? field.files.length : (field.value ? 1 : 0);

	// check file size
	if (field.files) {
	for (var i=0; i < files; i++)
	size += field.files[i].size;
	}

	numfiles += files;
	});

	// create hidden iframe and post upload form
	if (numfiles) {
	if (this.env.max_filesize && this.env.filesizeerror && size > this.env.max_filesize) {
	this.display_message(this.env.filesizeerror, 'error');
	return false;
	}

	var frame_name = this.async_upload_form(form, action \|\| 'upload', function(e) {
	var d, content = '';
	try {
	if (this.contentDocument) {
	d = this.contentDocument;
	} else if (this.contentWindow) {
	d = this.contentWindow.document;
	}
	content = d.childNodes[1].innerHTML;
	} catch (err) {}

	if (!content.match(/add2attachment/) && (!bw.opera \|\| (ref.env.uploadframe && ref.env.uploadframe == e.data.ts))) {
	if (!content.match(/display_message/))
	ref.display_message(ref.get_label('fileuploaderror'), 'error');
	ref.remove_from_attachment_list(e.data.ts);
	}
	// Opera hack: handle double onload
	if (bw.opera)
	ref.env.uploadframe = e.data.ts;
	});

	// display upload indicator and cancel button
	var content = '<span>' + this.get_label('uploading' + (numfiles > 1 ? 'many' : '')) + '</span>',
	ts = frame_name.replace(/^rcmupload/, '');

	this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', frame:frame_name, complete:false });

	// upload progress support
	if (this.env.upload_progress_time) {
	this.upload_progress_start('upload', ts);
	}

	// set reference to the form object
	this.gui_objects.attachmentform = form;
	return true;
	}
	};

	// add file name to attachment list
	// called from upload page
	this.add2attachment_list = function(name, att, upload_id)
	{
	if (upload_id)
	this.triggerEvent('fileuploaded', {name: name, attachment: att, id: upload_id});

	if (!this.env.attachments)
	this.env.attachments = {};

	if (upload_id && this.env.attachments[upload_id])
	delete this.env.attachments[upload_id];

	this.env.attachments[name] = att;

	if (!this.gui_objects.attachmentlist)
	return false;

	if (!att.complete && this.env.loadingicon)
	att.html = '<img src="'+this.env.loadingicon+'" alt="" class="uploading" />' + att.html;

	if (!att.complete && att.frame)
	att.html = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+name+'\', \''+att.frame+'\');" href="#cancelupload" class="cancelupload">'
	+ (this.env.cancelicon ? '<img src="'+this.env.cancelicon+'" alt="'+this.get_label('cancel')+'" />' : this.get_label('cancel')) + '</a>' + att.html;

	var indicator, li = $('<li>');

	li.attr('id', name)
	.addClass(att.classname)
	.html(att.html)
	.on('mouseover', function() { rcube_webmail.long_subject_title_ex(this); });

	// replace indicator's li
	if (upload_id && (indicator = document.getElementById(upload_id))) {
	li.replaceAll(indicator);
	}
	else { // add new li
	li.appendTo(this.gui_objects.attachmentlist);
	}

	// set tabindex attribute
	var tabindex = $(this.gui_objects.attachmentlist).attr('data-tabindex') \|\| '0';
	li.find('a').attr('tabindex', tabindex);

	return true;
	};

	this.remove_from_attachment_list = function(name)
	{
	if (this.env.attachments) {
	delete this.env.attachments[name];
	$('#'+name).remove();
	}
	};

	this.remove_attachment = function(name)
	{
	if (name && this.env.attachments[name])
	this.http_post('remove-attachment', { _id:this.env.compose_id, _file:name });

	return true;
	};

	this.cancel_attachment_upload = function(name, frame_name)
	{
	if (!name \|\| !frame_name)
	return false;

	this.remove_from_attachment_list(name);
	$("iframe[name='"+frame_name+"']").remove();
	return false;
	};

	this.upload_progress_start = function(action, name)
	{
	setTimeout(function() { ref.http_request(action, {_progress: name}); },
	this.env.upload_progress_time * 1000);
	};

	this.upload_progress_update = function(param)
	{
	var elem = $('#'+param.name + ' > span');

	if (!elem.length \|\| !param.text)
	return;

	elem.text(param.text);

	if (!param.done)
	this.upload_progress_start(param.action, param.name);
	};

	// send remote request to add a new contact
	this.add_contact = function(value)
	{
	if (value)
	this.http_post('addcontact', {_address: value});

	return true;
	};

	// send remote request to search mail or contacts
	this.qsearch = function(value)
	{
	if (value != '') {
	var r, lock = this.set_busy(true, 'searching'),
	url = this.search_params(value),
	action = this.env.action == 'compose' && this.contact_list ? 'search-contacts' : 'search';

	if (this.message_list)
	this.clear_message_list();
	else if (this.contact_list)
	this.list_contacts_clear();

	if (this.env.source)
	url._source = this.env.source;
	if (this.env.group)
	url._gid = this.env.group;

	// reset vars
	this.env.current_page = 1;

	r = this.http_request(action, url, lock);

	this.env.qsearch = {lock: lock, request: r};
	this.enable_command('set-listmode', this.env.threads && (this.env.search_scope \|\| 'base') == 'base');

	return true;
	}

	return false;
	};

	this.continue_search = function(request_id)
	{
	var lock = this.set_busy(true, 'stillsearching');

	setTimeout(function() {
	var url = ref.search_params();
	url._continue = request_id;
	ref.env.qsearch = { lock: lock, request: ref.http_request('search', url, lock) };
	}, 100);
	};

	// build URL params for search
	this.search_params = function(search, filter)
	{
	var n, url = {}, mods_arr = [],
	mods = this.env.search_mods,
	scope = this.env.search_scope \|\| 'base',
	mbox = scope == 'all' ? '*' : this.env.mailbox;

	if (!filter && this.gui_objects.search_filter)
	filter = this.gui_objects.search_filter.value;

	if (!search && this.gui_objects.qsearchbox)
	search = this.gui_objects.qsearchbox.value;

	if (filter)
	url._filter = filter;

	if (search) {
	url._q = search;

	if (mods && this.message_list)
	mods = mods[mbox] \|\| mods['*'];

	if (mods) {
	for (n in mods)
	mods_arr.push(n);
	url._headers = mods_arr.join(',');
	}
	}

	if (scope)
	url._scope = scope;
	if (mbox && scope != 'all')
	url._mbox = mbox;

	return url;
	};

	// reset quick-search form
	this.reset_qsearch = function()
	{
	if (this.gui_objects.qsearchbox)
	this.gui_objects.qsearchbox.value = '';

	if (this.env.qsearch)
	this.abort_request(this.env.qsearch);

	this.env.qsearch = null;
	this.env.search_request = null;
	this.env.search_id = null;

	this.enable_command('set-listmode', this.env.threads);
	};

	this.set_searchscope = function(scope)
	{
	var old = this.env.search_scope;
	this.env.search_scope = scope;

	// re-send search query with new scope
	if (scope != old && this.env.search_request) {
	if (!this.qsearch(this.gui_objects.qsearchbox.value) && this.env.search_filter && this.env.search_filter != 'ALL')
	this.filter_mailbox(this.env.search_filter);
	if (scope != 'all')
	this.select_folder(this.env.mailbox, '', true);
	}
	};

	this.set_searchmods = function(mods)
	{
	var mbox = this.env.mailbox,
	scope = this.env.search_scope \|\| 'base';

	if (scope == 'all')
	mbox = '*';

	if (!this.env.search_mods)
	this.env.search_mods = {};

	if (mbox)
	this.env.search_mods[mbox] = mods;
	};

	this.is_multifolder_listing = function()
	{
	return this.env.multifolder_listing !== undefined ? this.env.multifolder_listing :
	(this.env.search_request && (this.env.search_scope \|\| 'base') != 'base');
	};

	this.sent_successfully = function(type, msg, folders)
	{
	this.display_message(msg, type);
	this.compose_skip_unsavedcheck = true;

	if (this.env.extwin) {
	this.lock_form(this.gui_objects.messageform);

	var rc = this.opener();
	if (rc) {
	rc.display_message(msg, type);
	// refresh the folder where sent message was saved or replied message comes from
	if (folders && rc.env.task == 'mail' && rc.env.action == '' && $.inArray(rc.env.mailbox, folders) >= 0) {
	rc.command('checkmail');
	}
	}

	setTimeout(function() { window.close(); }, 1000);
	}
	else {
	// before redirect we need to wait some time for Chrome (#1486177)
	setTimeout(function() { ref.list_mailbox(); }, 500);
	}
	};


	/*********************************************************/
	/******* keyboard live-search methods *******/
	/*********************************************************/

	// handler for keyboard events on address-fields
	this.ksearch_keydown = function(e, obj, props)
	{
	if (this.ksearch_timer)
	clearTimeout(this.ksearch_timer);

	var key = rcube_event.get_keycode(e),
	mod = rcube_event.get_modifier(e);

	switch (key) {
	case 38: // arrow up
	case 40: // arrow down
	if (!this.ksearch_visible())
	return;

	var dir = key == 38 ? 1 : 0,
	highlight = document.getElementById('rcmkSearchItem' + this.ksearch_selected);

	if (!highlight)
	highlight = this.ksearch_pane.__ul.firstChild;

	if (highlight)
	this.ksearch_select(dir ? highlight.previousSibling : highlight.nextSibling);

	return rcube_event.cancel(e);

	case 9: // tab
	if (mod == SHIFT_KEY \|\| !this.ksearch_visible()) {
	this.ksearch_hide();
	return;
	}

	case 13: // enter
	if (!this.ksearch_visible())
	return false;

	// insert selected address and hide ksearch pane
	this.insert_recipient(this.ksearch_selected);
	this.ksearch_hide();

	return rcube_event.cancel(e);

	case 27: // escape
	this.ksearch_hide();
	return;

	case 37: // left
	case 39: // right
	return;
	}

	// start timer
	this.ksearch_timer = setTimeout(function(){ ref.ksearch_get_results(props); }, 200);
	this.ksearch_input = obj;

	return true;
	};

	this.ksearch_visible = function()
	{
	return this.ksearch_selected !== null && this.ksearch_selected !== undefined && this.ksearch_value;
	};

	this.ksearch_select = function(node)
	{
	if (this.ksearch_pane && node) {
	this.ksearch_pane.find('li.selected').removeClass('selected').removeAttr('aria-selected');
	}

	if (node) {
	$(node).addClass('selected').attr('aria-selected', 'true');
	this.ksearch_selected = node._rcm_id;
	$(this.ksearch_input).attr('aria-activedescendant', 'rcmkSearchItem' + this.ksearch_selected);
	}
	};

	this.insert_recipient = function(id)
	{
	if (id === null \|\| !this.env.contacts[id] \|\| !this.ksearch_input)
	return;

	// get cursor pos
	var inp_value = this.ksearch_input.value,
	cpos = this.get_caret_pos(this.ksearch_input),
	p = inp_value.lastIndexOf(this.ksearch_value, cpos),
	trigger = false,
	insert = '',
	// replace search string with full address
	pre = inp_value.substring(0, p),
	end = inp_value.substring(p+this.ksearch_value.length, inp_value.length);

	this.ksearch_destroy();

	// insert all members of a group
	if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].type == 'group' && !this.env.contacts[id].email) {
	insert += this.env.contacts[id].name + this.env.recipients_delimiter;
	this.group2expand[this.env.contacts[id].id] = $.extend({ input: this.ksearch_input }, this.env.contacts[id]);
	this.http_request('mail/group-expand', {_source: this.env.contacts[id].source, _gid: this.env.contacts[id].id}, false);
	}
	else if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].name) {
	insert = this.env.contacts[id].name + this.env.recipients_delimiter;
	trigger = true;
	}
	else if (typeof this.env.contacts[id] === 'string') {
	insert = this.env.contacts[id] + this.env.recipients_delimiter;
	trigger = true;
	}

	this.ksearch_input.value = pre + insert + end;

	// set caret to insert pos
	this.set_caret_pos(this.ksearch_input, p + insert.length);

	if (trigger) {
	this.triggerEvent('autocomplete_insert', { field:this.ksearch_input, insert:insert, data:this.env.contacts[id] });
	this.compose_type_activity++;
	}
	};

	this.replace_group_recipients = function(id, recipients)
	{
	if (this.group2expand[id]) {
	this.group2expand[id].input.value = this.group2expand[id].input.value.replace(this.group2expand[id].name, recipients);
	this.triggerEvent('autocomplete_insert', { field:this.group2expand[id].input, insert:recipients });
	this.group2expand[id] = null;
	this.compose_type_activity++;
	}
	};

	// address search processor
	this.ksearch_get_results = function(props)
	{
	var inp_value = this.ksearch_input ? this.ksearch_input.value : null;

	if (inp_value === null)
	return;

	if (this.ksearch_pane && this.ksearch_pane.is(":visible"))
	this.ksearch_pane.hide();

	// get string from current cursor pos to last comma
	var cpos = this.get_caret_pos(this.ksearch_input),
	p = inp_value.lastIndexOf(this.env.recipients_separator, cpos-1),
	q = inp_value.substring(p+1, cpos),
	min = this.env.autocomplete_min_length,
	data = this.ksearch_data;

	// trim query string
	q = $.trim(q);

	// Don't (re-)search if the last results are still active
	if (q == this.ksearch_value)
	return;

	this.ksearch_destroy();

	if (q.length && q.length < min) {
	if (!this.ksearch_info) {
	this.ksearch_info = this.display_message(
	this.get_label('autocompletechars').replace('$min', min));
	}
	return;
	}

	var old_value = this.ksearch_value;
	this.ksearch_value = q;

	// ...string is empty
	if (!q.length)
	return;

	// ...new search value contains old one and previous search was not finished or its result was empty
	if (old_value && old_value.length && q.startsWith(old_value) && (!data \|\| data.num <= 0) && this.env.contacts && !this.env.contacts.length)
	return;

	var sources = props && props.sources ? props.sources : [''];
	var reqid = this.multi_thread_http_request({
	items: sources,
	threads: props && props.threads ? props.threads : 1,
	action: props && props.action ? props.action : 'mail/autocomplete',
	postdata: { _search:q, _source:'%s' },
	lock: this.display_message(this.get_label('searching'), 'loading')
	});

	this.ksearch_data = { id:reqid, sources:sources.slice(), num:sources.length };
	};

	this.ksearch_query_results = function(results, search, reqid)
	{
	// trigger multi-thread http response callback
	this.multi_thread_http_response(results, reqid);

	// search stopped in meantime?
	if (!this.ksearch_value)
	return;

	// ignore this outdated search response
	if (this.ksearch_input && search != this.ksearch_value)
	return;

	// display search results
	var i, id, len, ul, text, type, init,
	value = this.ksearch_value,
	maxlen = this.env.autocomplete_max ? this.env.autocomplete_max : 15;

	// create results pane if not present
	if (!this.ksearch_pane) {
	ul = $('<ul>');
	this.ksearch_pane = $('<div>').attr('id', 'rcmKSearchpane').attr('role', 'listbox')
	.css({ position:'absolute', 'z-index':30000 }).append(ul).appendTo(document.body);
	this.ksearch_pane.__ul = ul[0];
	}

	ul = this.ksearch_pane.__ul;

	// remove all search results or add to existing list if parallel search
	if (reqid && this.ksearch_pane.data('reqid') == reqid) {
	maxlen -= ul.childNodes.length;
	}
	else {
	this.ksearch_pane.data('reqid', reqid);
	init = 1;
	// reset content
	ul.innerHTML = '';
	this.env.contacts = [];
	// move the results pane right under the input box
	var pos = $(this.ksearch_input).offset();
	this.ksearch_pane.css({ left:pos.left+'px', top:(pos.top + this.ksearch_input.offsetHeight)+'px', display: 'none'});
	}

	// add each result line to list
	if (results && (len = results.length)) {
	for (i=0; i < len && maxlen > 0; i++) {
	text = typeof results[i] === 'object' ? (results[i].display \|\| results[i].name) : results[i];
	type = typeof results[i] === 'object' ? results[i].type : '';
	id = i + this.env.contacts.length;
	$('<li>').attr('id', 'rcmkSearchItem' + id)
	.attr('role', 'option')
	.html('<i class="icon"></i>' + this.quote_html(text.replace(new RegExp('('+RegExp.escape(value)+')', 'ig'), '##$1%%')).replace(/##([^%]+)%%/g, '<b>$1</b>'))
	.addClass(type \|\| '')
	.appendTo(ul)
	.mouseover(function() { ref.ksearch_select(this); })
	.mouseup(function() { ref.ksearch_click(this); })
	.get(0)._rcm_id = id;
	maxlen -= 1;
	}
	}

	if (ul.childNodes.length) {
	// set the right aria-* attributes to the input field
	$(this.ksearch_input)
	.attr('aria-haspopup', 'true')
	.attr('aria-expanded', 'true')
	.attr('aria-owns', 'rcmKSearchpane');

	this.ksearch_pane.show();

	// select the first
	if (!this.env.contacts.length) {
	this.ksearch_select($('li:first', ul).get(0));
	}
	}

	if (len)
	this.env.contacts = this.env.contacts.concat(results);

	if (this.ksearch_data.id == reqid)
	this.ksearch_data.num--;
	};

	this.ksearch_click = function(node)
	{
	if (this.ksearch_input)
	this.ksearch_input.focus();

	this.insert_recipient(node._rcm_id);
	this.ksearch_hide();
	};

	this.ksearch_blur = function()
	{
	if (this.ksearch_timer)
	clearTimeout(this.ksearch_timer);

	this.ksearch_input = null;
	this.ksearch_hide();
	};

	this.ksearch_hide = function()
	{
	this.ksearch_selected = null;
	this.ksearch_value = '';

	if (this.ksearch_pane)
	this.ksearch_pane.hide();

	$(this.ksearch_input)
	.attr('aria-haspopup', 'false')
	.attr('aria-expanded', 'false')
	.removeAttr('aria-activedescendant')
	.removeAttr('aria-owns');

	this.ksearch_destroy();
	};

	// Clears autocomplete data/requests
	this.ksearch_destroy = function()
	{
	if (this.ksearch_data)
	this.multi_thread_request_abort(this.ksearch_data.id);

	if (this.ksearch_info)
	this.hide_message(this.ksearch_info);

	if (this.ksearch_msg)
	this.hide_message(this.ksearch_msg);

	this.ksearch_data = null;
	this.ksearch_info = null;
	this.ksearch_msg = null;
	};


	/*********************************************************/
	/******* address book methods *******/
	/*********************************************************/

	this.contactlist_keypress = function(list)
	{
	if (list.key_pressed == list.DELETE_KEY)
	this.command('delete');
	};

	this.contactlist_select = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);

	var n, id, sid, contact, writable = false,
	source = this.env.source ? this.env.address_sources[this.env.source] : null;

	// we don't have dblclick handler here, so use 200 instead of this.dblclick_time
	if (this.env.contentframe && (id = list.get_single_selection()))
	this.preview_timer = setTimeout(function(){ ref.load_contact(id, 'show'); }, 200);
	else if (this.env.contentframe)
	this.show_contentframe(false);

	if (list.selection.length) {
	list.draggable = false;

	// no source = search result, we'll need to detect if any of
	// selected contacts are in writable addressbook to enable edit/delete
	// we'll also need to know sources used in selection for copy
	// and group-addmember operations (drag&drop)
	this.env.selection_sources = [];

	if (source) {
	this.env.selection_sources.push(this.env.source);
	}

	for (n in list.selection) {
	contact = list.data[list.selection[n]];
	if (!source) {
	sid = String(list.selection[n]).replace(/^[^-]+-/, '');
	if (sid && this.env.address_sources[sid]) {
	writable = writable \|\| (!this.env.address_sources[sid].readonly && !contact.readonly);
	this.env.selection_sources.push(sid);
	}
	}
	else {
	writable = writable \|\| (!source.readonly && !contact.readonly);
	}

	if (contact._type != 'group')
	list.draggable = true;
	}

	this.env.selection_sources = $.unique(this.env.selection_sources);
	}

	// if a group is currently selected, and there is at least one contact selected
	// thend we can enable the group-remove-selected command
	this.enable_command('group-remove-selected', this.env.group && list.selection.length > 0 && writable);
	this.enable_command('compose', this.env.group \|\| list.selection.length > 0);
	this.enable_command('export-selected', 'copy', list.selection.length > 0);
	this.enable_command('edit', id && writable);
	this.enable_command('delete', 'move', list.selection.length > 0 && writable);

	return false;
	};

	this.list_contacts = function(src, group, page)
	{
	var win, folder, url = {},
	refresh = src === undefined && group === undefined && page === undefined,
	target = window;

	if (!src)
	src = this.env.source;

	if (page && this.current_page == page && src == this.env.source && group == this.env.group)
	return false;

	if (src != this.env.source) {
	page = this.env.current_page = 1;
	this.reset_qsearch();
	}
	else if (!refresh && group != this.env.group)
	page = this.env.current_page = 1;

	if (this.env.search_id)
	folder = 'S'+this.env.search_id;
	else if (!this.env.search_request)
	folder = group ? 'G'+src+group : src;

	this.env.source = src;
	this.env.group = group;

	// truncate groups listing stack
	var index = $.inArray(this.env.group, this.env.address_group_stack);
	if (index < 0)
	this.env.address_group_stack = [];
	else
	this.env.address_group_stack = this.env.address_group_stack.slice(0,index);

	// make sure the current group is on top of the stack
	if (this.env.group) {
	this.env.address_group_stack.push(this.env.group);

	// mark the first group on the stack as selected in the directory list
	folder = 'G'+src+this.env.address_group_stack[0];
	}
	else if (this.gui_objects.addresslist_title) {
	$(this.gui_objects.addresslist_title).html(this.get_label('contacts'));
	}

	if (!this.env.search_id)
	this.select_folder(folder, '', true);

	// load contacts remotely
	if (this.gui_objects.contactslist) {
	this.list_contacts_remote(src, group, page);
	return;
	}

	if (win = this.get_frame_window(this.env.contentframe)) {
	target = win;
	url._framed = 1;
	}

	if (group)
	url._gid = group;
	if (page)
	url._page = page;
	if (src)
	url._source = src;

	// also send search request to get the correct listing
	if (this.env.search_request)
	url._search = this.env.search_request;

	this.set_busy(true, 'loading');
	this.location_href(url, target);
	};

	// send remote request to load contacts list
	this.list_contacts_remote = function(src, group, page)
	{
	// clear message list first
	this.list_contacts_clear();

	// send request to server
	var url = {}, lock = this.set_busy(true, 'loading');

	if (src)
	url._source = src;
	if (page)
	url._page = page;
	if (group)
	url._gid = group;

	this.env.source = src;
	this.env.group = group;

	// also send search request to get the right records
	if (this.env.search_request)
	url._search = this.env.search_request;

	this.http_request(this.env.task == 'mail' ? 'list-contacts' : 'list', url, lock);
	};

	this.list_contacts_clear = function()
	{
	this.contact_list.data = {};
	this.contact_list.clear(true);
	this.show_contentframe(false);
	this.enable_command('delete', 'move', 'copy', false);
	this.enable_command('compose', this.env.group ? true : false);
	};

	this.set_group_prop = function(prop)
	{
	if (this.gui_objects.addresslist_title) {
	var boxtitle = $(this.gui_objects.addresslist_title).html(''); // clear contents

	// add link to pop back to parent group
	if (this.env.address_group_stack.length > 1) {
	$('<a href="#list">...</a>')
	.attr('title', this.gettext('uponelevel'))
	.addClass('poplink')
	.appendTo(boxtitle)
	.click(function(e){ return ref.command('popgroup','',this); });
	boxtitle.append(' » ');
	}

	boxtitle.append($('<span>').text(prop.name));
	}

	this.triggerEvent('groupupdate', prop);
	};

	// load contact record
	this.load_contact = function(cid, action, framed)
	{
	var win, url = {}, target = window,
	rec = this.contact_list ? this.contact_list.data[cid] : null;

	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	this.show_contentframe(true);

	// load dummy content, unselect selected row(s)
	if (!cid)
	this.contact_list.clear_selection();

	this.enable_command('compose', rec && rec.email);
	this.enable_command('export-selected', rec && rec._type != 'group');
	}
	else if (framed)
	return false;

	if (action && (cid \|\| action == 'add') && !this.drag_active) {
	if (this.env.group)
	url._gid = this.env.group;

	if (this.env.search_request)
	url._search = this.env.search_request;

	url._action = action;
	url._source = this.env.source;
	url._cid = cid;

	this.location_href(url, target, true);
	}

	return true;
	};

	// add/delete member to/from the group
	this.group_member_change = function(what, cid, source, gid)
	{
	if (what != 'add')
	what = 'del';

	var label = this.get_label(what == 'add' ? 'addingmember' : 'removingmember'),
	lock = this.display_message(label, 'loading'),
	post_data = {_cid: cid, _source: source, _gid: gid};

	this.http_post('group-'+what+'members', post_data, lock);
	};

	this.contacts_drag_menu = function(e, to)
	{
	var dest = to.type == 'group' ? to.source : to.id,
	source = this.env.source;

	if (!this.env.address_sources[dest] \|\| this.env.address_sources[dest].readonly)
	return true;

	// search result may contain contacts from many sources, but if there is only one...
	if (source == '' && this.env.selection_sources.length == 1)
	source = this.env.selection_sources[0];

	if (to.type == 'group' && dest == source) {
	var cid = this.contact_list.get_selection().join(',');
	this.group_member_change('add', cid, dest, to.id);
	return true;
	}
	// move action is not possible, "redirect" to copy if menu wasn't requested
	else if (!this.commands.move && rcube_event.get_modifier(e) != SHIFT_KEY) {
	this.copy_contacts(to);
	return true;
	}

	return this.drag_menu(e, to);
	};

	// copy contact(s) to the specified target (group or directory)
	this.copy_contacts = function(to)
	{
	var dest = to.type == 'group' ? to.source : to.id,
	source = this.env.source,
	group = this.env.group ? this.env.group : '',
	cid = this.contact_list.get_selection().join(',');

	if (!cid \|\| !this.env.address_sources[dest] \|\| this.env.address_sources[dest].readonly)
	return;

	// search result may contain contacts from many sources, but if there is only one...
	if (source == '' && this.env.selection_sources.length == 1)
	source = this.env.selection_sources[0];

	// tagret is a group
	if (to.type == 'group') {
	if (dest == source)
	return;

	var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
	post_data = {_cid: cid, _source: this.env.source, _to: dest, _togid: to.id, _gid: group};

	this.http_post('copy', post_data, lock);
	}
	// target is an addressbook
	else if (to.id != source) {
	var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
	post_data = {_cid: cid, _source: this.env.source, _to: to.id, _gid: group};

	this.http_post('copy', post_data, lock);
	}
	};

	// move contact(s) to the specified target (group or directory)
	this.move_contacts = function(to)
	{
	var dest = to.type == 'group' ? to.source : to.id,
	source = this.env.source,
	group = this.env.group ? this.env.group : '';

	if (!this.env.address_sources[dest] \|\| this.env.address_sources[dest].readonly)
	return;

	// search result may contain contacts from many sources, but if there is only one...
	if (source == '' && this.env.selection_sources.length == 1)
	source = this.env.selection_sources[0];

	if (to.type == 'group') {
	if (dest == source)
	return;

	this._with_selected_contacts('move', {_to: dest, _togid: to.id});
	}
	// target is an addressbook
	else if (to.id != source)
	this._with_selected_contacts('move', {_to: to.id});
	};

	// delete contact(s)
	this.delete_contacts = function()
	{
	var undelete = this.env.source && this.env.address_sources[this.env.source].undelete;

	if (!undelete && !confirm(this.get_label('deletecontactconfirm')))
	return;

	return this._with_selected_contacts('delete');
	};

	this._with_selected_contacts = function(action, post_data)
	{
	var selection = this.contact_list ? this.contact_list.get_selection() : [];

	// exit if no contact specified or if selection is empty
	if (!selection.length && !this.env.cid)
	return;

	var n, a_cids = [],
	label = action == 'delete' ? 'contactdeleting' : 'movingcontact',
	lock = this.display_message(this.get_label(label), 'loading');

	if (this.env.cid)
	a_cids.push(this.env.cid);
	else {
	for (n=0; n<selection.length; n++) {
	id = selection[n];
	a_cids.push(id);
	this.contact_list.remove_row(id, (n == selection.length-1));
	}

	// hide content frame if we delete the currently displayed contact
	if (selection.length == 1)
	this.show_contentframe(false);
	}

	if (!post_data)
	post_data = {};

	post_data._source = this.env.source;
	post_data._from = this.env.action;
	post_data._cid = a_cids.join(',');

	if (this.env.group)
	post_data._gid = this.env.group;

	// also send search request to get the right records from the next page
	if (this.env.search_request)
	post_data._search = this.env.search_request;

	// send request to server
	this.http_post(action, post_data, lock)

	return true;
	};

	// update a contact record in the list
	this.update_contact_row = function(cid, cols_arr, newcid, source, data)
	{
	var list = this.contact_list;

	cid = this.html_identifier(cid);

	// when in searching mode, concat cid with the source name
	if (!list.rows[cid]) {
	cid = cid + '-' + source;
	if (newcid)
	newcid = newcid + '-' + source;
	}

	list.update_row(cid, cols_arr, newcid, true);
	list.data[cid] = data;
	};

	// add row to contacts list
	this.add_contact_row = function(cid, cols, classes, data)
	{
	if (!this.gui_objects.contactslist)
	return false;

	var c, col, list = this.contact_list,
	row = { cols:[] };

	row.id = 'rcmrow' + this.html_identifier(cid);
	row.className = 'contact ' + (classes \|\| '');

	if (list.in_selection(cid))
	row.className += ' selected';

	// add each submitted col
	for (c in cols) {
	col = {};
	col.className = String(c).toLowerCase();
	col.innerHTML = cols[c];
	row.cols.push(col);
	}

	// store data in list member
	list.data[cid] = data;
	list.insert_row(row);

	this.enable_command('export', list.rowcount > 0);
	};

	this.init_contact_form = function()
	{
	var col;

	if (this.env.coltypes) {
	this.set_photo_actions($('#ff_photo').val());
	for (col in this.env.coltypes)
	this.init_edit_field(col, null);
	}

	$('.contactfieldgroup .row a.deletebutton').click(function() {
	ref.delete_edit_field(this);
	return false;
	});

	$('select.addfieldmenu').change(function() {
	ref.insert_edit_field($(this).val(), $(this).attr('rel'), this);
	this.selectedIndex = 0;
	});

	// enable date pickers on date fields
	if ($.datepicker && this.env.date_format) {
	$.datepicker.setDefaults({
	dateFormat: this.env.date_format,
	changeMonth: true,
	changeYear: true,
	yearRange: '-100:+10',
	showOtherMonths: true,
	selectOtherMonths: true,
	onSelect: function(dateText) { $(this).focus().val(dateText) }
	});
	$('input.datepicker').datepicker();
	}

	// Submit search form on Enter
	if (this.env.action == 'search')
	$(this.gui_objects.editform).append($('<input type="submit">').hide())
	.submit(function() { $('input.mainaction').click(); return false; });
	};

	// group creation dialog
	this.group_create = function()
	{
	var input = $('<input>').attr('type', 'text'),
	content = $('<label>').text(this.get_label('namex')).append(input);

	this.show_popup_dialog(content, this.get_label('newgroup'),
	[{
	text: this.get_label('save'),
	'class': 'mainaction',
	click: function() {
	var name;

	if (name = input.val()) {
	ref.http_post('group-create', {_source: ref.env.source, _name: name},
	ref.set_busy(true, 'loading'));
	}

	$(this).dialog('close');
	}
	}]
	);
	};

	// group rename dialog
	this.group_rename = function()
	{
	if (!this.env.group)
	return;

	var group_name = this.env.contactgroups['G' + this.env.source + this.env.group].name,
	input = $('<input>').attr('type', 'text').val(group_name),
	content = $('<label>').text(this.get_label('namex')).append(input);

	this.show_popup_dialog(content, this.get_label('grouprename'),
	[{
	text: this.get_label('save'),
	'class': 'mainaction',
	click: function() {
	var name;

	if ((name = input.val()) && name != group_name) {
	ref.http_post('group-rename', {_source: ref.env.source, _gid: ref.env.group, _name: name},
	ref.set_busy(true, 'loading'));
	}

	$(this).dialog('close');
	}
	}],
	{open: function() { input.select(); }}
	);
	};

	this.group_delete = function()
	{
	if (this.env.group && confirm(this.get_label('deletegroupconfirm'))) {
	var lock = this.set_busy(true, 'groupdeleting');
	this.http_post('group-delete', {_source: this.env.source, _gid: this.env.group}, lock);
	}
	};

	// callback from server upon group-delete command
	this.remove_group_item = function(prop)
	{
	var key = 'G'+prop.source+prop.id;

	if (this.treelist.remove(key)) {
	this.triggerEvent('group_delete', { source:prop.source, id:prop.id });
	delete this.env.contactfolders[key];
	delete this.env.contactgroups[key];
	}

	this.list_contacts(prop.source, 0);
	};

	//remove selected contacts from current active group
	this.group_remove_selected = function()
	{
	this.http_post('group-delmembers', {_cid: this.contact_list.selection,
	_source: this.env.source, _gid: this.env.group});
	};

	//callback after deleting contact(s) from current group
	this.remove_group_contacts = function(props)
	{
	if (this.env.group !== undefined && (this.env.group === props.gid)) {
	var n, selection = this.contact_list.get_selection();
	for (n=0; n<selection.length; n++) {
	id = selection[n];
	this.contact_list.remove_row(id, (n == selection.length-1));
	}
	}
	};

	// callback for creating a new contact group
	this.insert_contact_group = function(prop)
	{
	prop.type = 'group';

	var key = 'G'+prop.source+prop.id,
	link = $('<a>').attr('href', '#')
	.attr('rel', prop.source+':'+prop.id)
	.click(function() { return ref.command('listgroup', prop, this); })
	.html(prop.name);

	this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
	this.treelist.insert({ id:key, html:link, classes:['contactgroup'] }, prop.source, 'contactgroup');

	this.triggerEvent('group_insert', { id:prop.id, source:prop.source, name:prop.name, li:this.treelist.get_item(key) });
	};

	// callback for renaming a contact group
	this.update_contact_group = function(prop)
	{
	var key = 'G'+prop.source+prop.id,
	newnode = {};

	// group ID has changed, replace link node and identifiers
	if (prop.newid) {
	var newkey = 'G'+prop.source+prop.newid,
	newprop = $.extend({}, prop);

	this.env.contactfolders[newkey] = this.env.contactfolders[key];
	this.env.contactfolders[newkey].id = prop.newid;
	this.env.group = prop.newid;

	delete this.env.contactfolders[key];
	delete this.env.contactgroups[key];

	newprop.id = prop.newid;
	newprop.type = 'group';

	newnode.id = newkey;
	newnode.html = $('<a>').attr('href', '#')
	.attr('rel', prop.source+':'+prop.newid)
	.click(function() { return ref.command('listgroup', newprop, this); })
	.html(prop.name);
	}
	// update displayed group name
	else {
	$(this.treelist.get_item(key)).children().first().html(prop.name);
	this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
	}

	// update list node and re-sort it
	this.treelist.update(key, newnode, true);

	this.triggerEvent('group_update', { id:prop.id, source:prop.source, name:prop.name, li:this.treelist.get_item(key), newid:prop.newid });
	};

	this.update_group_commands = function()
	{
	var source = this.env.source != '' ? this.env.address_sources[this.env.source] : null,
	supported = source && source.groups && !source.readonly;

	this.enable_command('group-create', supported);
	this.enable_command('group-rename', 'group-delete', supported && this.env.group);
	};

	this.init_edit_field = function(col, elem)
	{
	var label = this.env.coltypes[col].label;

	if (!elem)
	elem = $('.ff_' + col);

	if (label)
	elem.placeholder(label);
	};

	this.insert_edit_field = function(col, section, menu)
	{
	// just make pre-defined input field visible
	var elem = $('#ff_'+col);
	if (elem.length) {
	elem.show().focus();
	$(menu).children('option[value="'+col+'"]').prop('disabled', true);
	}
	else {
	var lastelem = $('.ff_'+col),
	appendcontainer = $('#contactsection'+section+' .contactcontroller'+col);

	if (!appendcontainer.length) {
	var sect = $('#contactsection'+section),
	lastgroup = $('.contactfieldgroup', sect).last();
	appendcontainer = $('<fieldset>').addClass('contactfieldgroup contactcontroller'+col);
	if (lastgroup.length)
	appendcontainer.insertAfter(lastgroup);
	else
	sect.prepend(appendcontainer);
	}

	if (appendcontainer.length && appendcontainer.get(0).nodeName == 'FIELDSET') {
	var input, colprop = this.env.coltypes[col],
	input_id = 'ff_' + col + (colprop.count \|\| 0),
	row = $('<div>').addClass('row'),
	cell = $('<div>').addClass('contactfieldcontent data'),
	label = $('<div>').addClass('contactfieldlabel label');

	if (colprop.subtypes_select)
	label.html(colprop.subtypes_select);
	else
	label.html('<label for="' + input_id + '">' + colprop.label + '</label>');

	var name_suffix = colprop.limit != 1 ? '[]' : '';

	if (colprop.type == 'text' \|\| colprop.type == 'date') {
	input = $('<input>')
	.addClass('ff_'+col)
	.attr({type: 'text', name: '_'+col+name_suffix, size: colprop.size, id: input_id})
	.appendTo(cell);

	this.init_edit_field(col, input);

	if (colprop.type == 'date' && $.datepicker)
	input.datepicker();
	}
	else if (colprop.type == 'textarea') {
	input = $('<textarea>')
	.addClass('ff_'+col)
	.attr({ name: '_'+col+name_suffix, cols:colprop.size, rows:colprop.rows, id: input_id })
	.appendTo(cell);

	this.init_edit_field(col, input);
	}
	else if (colprop.type == 'composite') {
	var i, childcol, cp, first, templ, cols = [], suffices = [];

	// read template for composite field order
	if ((templ = this.env[col+'_template'])) {
	for (i=0; i < templ.length; i++) {
	cols.push(templ[i][1]);
	suffices.push(templ[i][2]);
	}
	}
	else { // list fields according to appearance in colprop
	for (childcol in colprop.childs)
	cols.push(childcol);
	}

	for (i=0; i < cols.length; i++) {
	childcol = cols[i];
	cp = colprop.childs[childcol];
	input = $('<input>')
	.addClass('ff_'+childcol)
	.attr({ type: 'text', name: '_'+childcol+name_suffix, size: cp.size })
	.appendTo(cell);
	cell.append(suffices[i] \|\| " ");
	this.init_edit_field(childcol, input);
	if (!first) first = input;
	}
	input = first; // set focus to the first of this composite fields
	}
	else if (colprop.type == 'select') {
	input = $('<select>')
	.addClass('ff_'+col)
	.attr({ 'name': '_'+col+name_suffix, id: input_id })
	.appendTo(cell);

	var options = input.attr('options');
	options[options.length] = new Option('---', '');
	if (colprop.options)
	$.each(colprop.options, function(i, val){ options[options.length] = new Option(val, i); });
	}

	if (input) {
	var delbutton = $('<a href="#del"></a>')
	.addClass('contactfieldbutton deletebutton')
	.attr({title: this.get_label('delete'), rel: col})
	.html(this.env.delbutton)
	.click(function(){ ref.delete_edit_field(this); return false })
	.appendTo(cell);

	row.append(label).append(cell).appendTo(appendcontainer.show());
	input.first().focus();

	// disable option if limit reached
	if (!colprop.count) colprop.count = 0;
	if (++colprop.count == colprop.limit && colprop.limit)
	$(menu).children('option[value="'+col+'"]').prop('disabled', true);
	}
	}
	}
	};

	this.delete_edit_field = function(elem)
	{
	var col = $(elem).attr('rel'),
	colprop = this.env.coltypes[col],
	fieldset = $(elem).parents('fieldset.contactfieldgroup'),
	addmenu = fieldset.parent().find('select.addfieldmenu');

	// just clear input but don't hide the last field
	if (--colprop.count <= 0 && colprop.visible)
	$(elem).parent().children('input').val('').blur();
	else {
	$(elem).parents('div.row').remove();
	// hide entire fieldset if no more rows
	if (!fieldset.children('div.row').length)
	fieldset.hide();
	}

	// enable option in add-field selector or insert it if necessary
	if (addmenu.length) {
	var option = addmenu.children('option[value="'+col+'"]');
	if (option.length)
	option.prop('disabled', false);
	else
	option = $('<option>').attr('value', col).html(colprop.label).appendTo(addmenu);
	addmenu.show();
	}
	};

	this.upload_contact_photo = function(form)
	{
	if (form && form.elements._photo.value) {
	this.async_upload_form(form, 'upload-photo', function(e) {
	ref.set_busy(false, null, ref.file_upload_id);
	});

	// display upload indicator
	this.file_upload_id = this.set_busy(true, 'uploading');
	}
	};

	this.replace_contact_photo = function(id)
	{
	var img_src = id == '-del-' ? this.env.photo_placeholder :
	this.env.comm_path + '&_action=photo&_source=' + this.env.source + '&_cid=' + (this.env.cid \|\| 0) + '&_photo=' + id;

	this.set_photo_actions(id);
	$(this.gui_objects.contactphoto).children('img').attr('src', img_src);
	};

	this.photo_upload_end = function()
	{
	this.set_busy(false, null, this.file_upload_id);
	delete this.file_upload_id;
	};

	this.set_photo_actions = function(id)
	{
	var n, buttons = this.buttons['upload-photo'];
	for (n=0; buttons && n < buttons.length; n++)
	$('a#'+buttons[n].id).html(this.get_label(id == '-del-' ? 'addphoto' : 'replacephoto'));

	$('#ff_photo').val(id);
	this.enable_command('upload-photo', this.env.coltypes.photo ? true : false);
	this.enable_command('delete-photo', this.env.coltypes.photo && id != '-del-');
	};

	// load advanced search page
	this.advanced_search = function()
	{
	var win, url = {_form: 1, _action: 'search'}, target = window;

	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	this.contact_list.clear_selection();
	}

	this.location_href(url, target, true);

	return true;
	};

	// unselect directory/group
	this.unselect_directory = function()
	{
	this.select_folder('');
	this.enable_command('search-delete', false);
	};

	// callback for creating a new saved search record
	this.insert_saved_search = function(name, id)
	{
	var key = 'S'+id,
	link = $('<a>').attr('href', '#')
	.attr('rel', id)
	.click(function() { return ref.command('listsearch', id, this); })
	.html(name),
	prop = { name:name, id:id };

	this.savedsearchlist.insert({ id:key, html:link, classes:['contactsearch'] }, null, 'contactsearch');
	this.select_folder(key,'',true);
	this.enable_command('search-delete', true);
	this.env.search_id = id;

	this.triggerEvent('abook_search_insert', prop);
	};

	// creates a dialog for saved search
	this.search_create = function()
	{
	var input = $('<input>').attr('type', 'text'),
	content = $('<label>').text(this.get_label('namex')).append(input);

	this.show_popup_dialog(content, this.get_label('searchsave'),
	[{
	text: this.get_label('save'),
	'class': 'mainaction',
	click: function() {
	var name;

	if (name = input.val()) {
	ref.http_post('search-create', {_search: ref.env.search_request, _name: name},
	ref.set_busy(true, 'loading'));
	}

	$(this).dialog('close');
	}
	}]
	);
	};

	this.search_delete = function()
	{
	if (this.env.search_request) {
	var lock = this.set_busy(true, 'savedsearchdeleting');
	this.http_post('search-delete', {_sid: this.env.search_id}, lock);
	}
	};

	// callback from server upon search-delete command
	this.remove_search_item = function(id)
	{
	var li, key = 'S'+id;
	if (this.savedsearchlist.remove(key)) {
	this.triggerEvent('search_delete', { id:id, li:li });
	}

	this.env.search_id = null;
	this.env.search_request = null;
	this.list_contacts_clear();
	this.reset_qsearch();
	this.enable_command('search-delete', 'search-create', false);
	};

	this.listsearch = function(id)
	{
	var lock = this.set_busy(true, 'searching');

	if (this.contact_list) {
	this.list_contacts_clear();
	}

	this.reset_qsearch();

	if (this.savedsearchlist) {
	this.treelist.select('');
	this.savedsearchlist.select('S'+id);
	}
	else
	this.select_folder('S'+id, '', true);

	// reset vars
	this.env.current_page = 1;
	this.http_request('search', {_sid: id}, lock);
	};


	/*********************************************************/
	/******* user settings methods *******/
	/*********************************************************/

	// preferences section select and load options frame
	this.section_select = function(list)
	{
	var win, id = list.get_single_selection(), target = window,
	url = {_action: 'edit-prefs', _section: id};

	if (id) {
	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	}
	this.location_href(url, target, true);
	}

	return true;
	};

	this.identity_select = function(list)
	{
	var id;
	if (id = list.get_single_selection()) {
	this.enable_command('delete', list.rowcount > 1 && this.env.identities_level < 2);
	this.load_identity(id, 'edit-identity');
	}
	};

	// load identity record
	this.load_identity = function(id, action)
	{
	if (action == 'edit-identity' && (!id \|\| id == this.env.iid))
	return false;

	var win, target = window,
	url = {_action: action, _iid: id};

	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	}

	if (id \|\| action == 'add-identity') {
	this.location_href(url, target, true);
	}

	return true;
	};

	this.delete_identity = function(id)
	{
	// exit if no identity is specified or if selection is empty
	var selection = this.identity_list.get_selection();
	if (!(selection.length \|\| this.env.iid))
	return;

	if (!id)
	id = this.env.iid ? this.env.iid : selection[0];

	// submit request with appended token
	if (id && confirm(this.get_label('deleteidentityconfirm')))
	this.http_post('settings/delete-identity', { _iid: id }, true);
	};

	this.update_identity_row = function(id, name, add)
	{
	var list = this.identity_list,
	rid = this.html_identifier(id);

	if (add) {
	list.insert_row({ id:'rcmrow'+rid, cols:[ { className:'mail', innerHTML:name } ] });
	list.select(rid);
	}
	else {
	list.update_row(rid, [ name ]);
	}
	};

	this.update_response_row = function(response, oldkey)
	{
	var list = this.responses_list;

	if (list && oldkey) {
	list.update_row(oldkey, [ response.name ], response.key, true);
	}
	else if (list) {
	list.insert_row({ id:'rcmrow'+response.key, cols:[ { className:'name', innerHTML:response.name } ] });
	list.select(response.key);
	}
	};

	this.remove_response = function(key)
	{
	var frame;

	if (this.env.textresponses) {
	delete this.env.textresponses[key];
	}

	if (this.responses_list) {
	this.responses_list.remove_row(key);
	if (this.env.contentframe && (frame = this.get_frame_window(this.env.contentframe))) {
	frame.location.href = this.env.blankpage;
	}
	}

	this.enable_command('delete', false);
	};

	this.remove_identity = function(id)
	{
	var frame, list = this.identity_list,
	rid = this.html_identifier(id);

	if (list && id) {
	list.remove_row(rid);
	if (this.env.contentframe && (frame = this.get_frame_window(this.env.contentframe))) {
	frame.location.href = this.env.blankpage;
	}
	}

	this.enable_command('delete', false);
	};


	/*********************************************************/
	/******* folder manager methods *******/
	/*********************************************************/

	this.init_subscription_list = function()
	{
	var delim = RegExp.escape(this.env.delimiter);

	this.last_sub_rx = RegExp('['+delim+']?[^'+delim+']+$');

	this.subscription_list = new rcube_treelist_widget(this.gui_objects.subscriptionlist, {
	selectable: true,
	tabexit: false,
	parent_focus: true,
	id_prefix: 'rcmli',
	id_encode: this.html_identifier_encode,
	id_decode: this.html_identifier_decode,
	searchbox: '#foldersearch'
	});

	this.subscription_list
	.addEventListener('select', function(node) { ref.subscription_select(node.id); })
	.addEventListener('collapse', function(node) { ref.folder_collapsed(node) })
	.addEventListener('expand', function(node) { ref.folder_collapsed(node) })
	.addEventListener('search', function(p) { if (p.query) ref.subscription_select(); })
	.draggable({cancel: 'li.mailbox.root'})
	.droppable({
	// @todo: find better way, accept callback is executed for every folder
	// on the list when dragging starts (and stops), this is slow, but
	// I didn't find a method to check droptarget on over event
	accept: function(node) {
	var source_folder = ref.folder_id2name($(node).attr('id')),
	dest_folder = ref.folder_id2name(this.id),
	source = ref.env.subscriptionrows[source_folder],
	dest = ref.env.subscriptionrows[dest_folder];

	return source && !source[2]
	&& dest_folder != source_folder.replace(ref.last_sub_rx, '')
	&& !dest_folder.startsWith(source_folder + ref.env.delimiter);
	},
	drop: function(e, ui) {
	var source = ref.folder_id2name(ui.draggable.attr('id')),
	dest = ref.folder_id2name(this.id);

	ref.subscription_move_folder(source, dest);
	}
	});
	};

	this.folder_id2name = function(id)
	{
	return ref.html_identifier_decode(id.replace(/^rcmli/, ''));
	};

	this.subscription_select = function(id)
	{
	var folder;

	if (id && id != '*' && (folder = this.env.subscriptionrows[id])) {
	this.env.mailbox = id;
	this.show_folder(id);
	this.enable_command('delete-folder', !folder[2]);
	}
	else {
	this.env.mailbox = null;
	this.show_contentframe(false);
	this.enable_command('delete-folder', 'purge', false);
	}
	};

	this.subscription_move_folder = function(from, to)
	{
	if (from && to !== null && from != to && to != from.replace(this.last_sub_rx, '')) {
	var path = from.split(this.env.delimiter),
	basename = path.pop(),
	newname = to === '' \|\| to === '*' ? basename : to + this.env.delimiter + basename;

	if (newname != from) {
	this.http_post('rename-folder', {_folder_oldname: from, _folder_newname: newname},
	this.set_busy(true, 'foldermoving'));
	}
	}
	};

	// tell server to create and subscribe a new mailbox
	this.create_folder = function()
	{
	this.show_folder('', this.env.mailbox);
	};

	// delete a specific mailbox with all its messages
	this.delete_folder = function(name)
	{
	if (!name)
	name = this.env.mailbox;

	if (name && confirm(this.get_label('deletefolderconfirm'))) {
	this.http_post('delete-folder', {_mbox: name}, this.set_busy(true, 'folderdeleting'));
	}
	};

	// Add folder row to the table and initialize it
	this.add_folder_row = function (id, name, display_name, is_protected, subscribed, class_name, refrow, subfolders)
	{
	if (!this.gui_objects.subscriptionlist)
	return false;

	// reset searching
	if (this.subscription_list.is_search()) {
	this.subscription_select();
	this.subscription_list.reset_search();
	}

	// disable drag-n-drop temporarily
	this.subscription_list.draggable('destroy').droppable('destroy');

	var row, n, tmp, tmp_name, rowid, collator, pos, p, parent = '',
	folders = [], list = [], slist = [],
	list_element = $(this.gui_objects.subscriptionlist);
	row = refrow ? refrow : $($('li', list_element).get(1)).clone(true);

	if (!row.length) {
	// Refresh page if we don't have a table row to clone
	this.goto_url('folders');
	return false;
	}

	// set ID, reset css class
	row.attr({id: 'rcmli' + this.html_identifier_encode(id), 'class': class_name});

	if (!refrow \|\| !refrow.length) {
	// remove old data, subfolders and toggle
	$('ul,div.treetoggle', row).remove();
	row.removeData('filtered');
	}

	// set folder name
	$('a:first', row).text(display_name);

	// update subscription checkbox
	$('input[name="_subscribed[]"]:first', row).val(id)
	.prop({checked: subscribed ? true : false, disabled: is_protected ? true : false});

	// add to folder/row-ID map
	this.env.subscriptionrows[id] = [name, display_name, false];

	// copy folders data to an array for sorting
	$.each(this.env.subscriptionrows, function(k, v) { v[3] = k; folders.push(v); });

	try {
	// use collator if supported (FF29, IE11, Opera15, Chrome24)
	collator = new Intl.Collator(this.env.locale.replace('_', '-'));
	}
	catch (e) {};

	// sort folders
	folders.sort(function(a, b) {
	var i, f1, f2,
	path1 = a[0].split(ref.env.delimiter),
	path2 = b[0].split(ref.env.delimiter),
	len = path1.length;

	for (i=0; i<len; i++) {
	f1 = path1[i];
	f2 = path2[i];

	if (f1 !== f2) {
	if (f2 === undefined)
	return 1;
	if (collator)
	return collator.compare(f1, f2);
	else
	return f1 < f2 ? -1 : 1;
	}
	else if (i == len-1) {
	return -1
	}
	}
	});

	for (n in folders) {
	p = folders[n][3];
	// protected folder
	if (folders[n][2]) {
	tmp_name = p + this.env.delimiter;
	// prefix namespace cannot have subfolders (#1488349)
	if (tmp_name == this.env.prefix_ns)
	continue;
	slist.push(p);
	tmp = tmp_name;
	}
	// protected folder's child
	else if (tmp && p.startsWith(tmp))
	slist.push(p);
	// other
	else {
	list.push(p);
	tmp = null;
	}
	}

	// check if subfolder of a protected folder
	for (n=0; n<slist.length; n++) {
	if (id.startsWith(slist[n] + this.env.delimiter))
	rowid = slist[n];
	}

	// find folder position after sorting
	for (n=0; !rowid && n<list.length; n++) {
	if (n && list[n] == id)
	rowid = list[n-1];
	}

	// add row to the table
	if (rowid && (n = this.subscription_list.get_item(rowid, true))) {
	// find parent folder
	if (pos = id.lastIndexOf(this.env.delimiter)) {
	parent = id.substring(0, pos);
	parent = this.subscription_list.get_item(parent, true);

	// add required tree elements to the parent if not already there
	if (!$('div.treetoggle', parent).length) {
	$('<div> </div>').addClass('treetoggle collapsed').appendTo(parent);
	}
	if (!$('ul', parent).length) {
	$('<ul>').css('display', 'none').appendTo(parent);
	}
	}

	if (parent && n == parent) {
	$('ul:first', parent).append(row);
	}
	else {
	while (p = $(n).parent().parent().get(0)) {
	if (parent && p == parent)
	break;
	if (!$(p).is('li.mailbox'))
	break;
	n = p;
	}

	$(n).after(row);
	}
	}
	else {
	list_element.append(row);
	}

	// add subfolders
	$.extend(this.env.subscriptionrows, subfolders \|\| {});

	// update list widget
	this.subscription_list.reset(true);
	this.subscription_select();

	// expand parent
	if (parent) {
	this.subscription_list.expand(this.folder_id2name(parent.id));
	}

	row = row.show().get(0);
	if (row.scrollIntoView)
	row.scrollIntoView();

	return row;
	};

	// replace an existing table row with a new folder line (with subfolders)
	this.replace_folder_row = function(oldid, id, name, display_name, is_protected, class_name)
	{
	if (!this.gui_objects.subscriptionlist) {
	if (this.is_framed()) {
	// @FIXME: for some reason this 'parent' variable need to be prefixed with 'window.'
	return window.parent.rcmail.replace_folder_row(oldid, id, name, display_name, is_protected, class_name);
	}

	return false;
	}

	// reset searching
	if (this.subscription_list.is_search()) {
	this.subscription_select();
	this.subscription_list.reset_search();
	}

	var subfolders = {},
	row = this.subscription_list.get_item(oldid, true),
	parent = $(row).parent(),
	old_folder = this.env.subscriptionrows[oldid],
	prefix_len_id = oldid.length,
	prefix_len_name = old_folder[0].length,
	subscribed = $('input[name="_subscribed[]"]:first', row).prop('checked');

	// no renaming, only update class_name
	if (oldid == id) {
	$(row).attr('class', class_name \|\| '');
	return;
	}

	// update subfolders
	$('li', row).each(function() {
	var fname = ref.folder_id2name(this.id),
	folder = ref.env.subscriptionrows[fname],
	newid = id + fname.slice(prefix_len_id);

	this.id = 'rcmli' + ref.html_identifier_encode(newid);
	$('input[name="_subscribed[]"]:first', this).val(newid);
	folder[0] = name + folder[0].slice(prefix_len_name);

	subfolders[newid] = folder;
	delete ref.env.subscriptionrows[fname];
	});

	// get row off the list
	row = $(row).detach();

	delete this.env.subscriptionrows[oldid];

	// remove parent list/toggle elements if not needed
	if (parent.get(0) != this.gui_objects.subscriptionlist && !$('li', parent).length) {
	$('ul,div.treetoggle', parent.parent()).remove();
	}

	// move the existing table row
	this.add_folder_row(id, name, display_name, is_protected, subscribed, class_name, row, subfolders);
	};

	// remove the table row of a specific mailbox from the table
	this.remove_folder_row = function(folder)
	{
	// reset searching
	if (this.subscription_list.is_search()) {
	this.subscription_select();
	this.subscription_list.reset_search();
	}

	var list = [], row = this.subscription_list.get_item(folder, true);

	// get subfolders if any
	$('li', row).each(function() { list.push(ref.folder_id2name(this.id)); });

	// remove folder row (and subfolders)
	this.subscription_list.remove(folder);

	// update local list variable
	list.push(folder);
	$.each(list, function(i, v) { delete ref.env.subscriptionrows[v]; });
	};

	this.subscribe = function(folder)
	{
	if (folder) {
	var lock = this.display_message(this.get_label('foldersubscribing'), 'loading');
	this.http_post('subscribe', {_mbox: folder}, lock);
	}
	};

	this.unsubscribe = function(folder)
	{
	if (folder) {
	var lock = this.display_message(this.get_label('folderunsubscribing'), 'loading');
	this.http_post('unsubscribe', {_mbox: folder}, lock);
	}
	};

	// when user select a folder in manager
	this.show_folder = function(folder, path, force)
	{
	var win, target = window,
	url = '&_action=edit-folder&_mbox='+urlencode(folder);

	if (path)
	url += '&_path='+urlencode(path);

	if (win = this.get_frame_window(this.env.contentframe)) {
	target = win;
	url += '&_framed=1';
	}

	if (String(target.location.href).indexOf(url) >= 0 && !force)
	this.show_contentframe(true);
	else
	this.location_href(this.env.comm_path+url, target, true);
	};

	// disables subscription checkbox (for protected folder)
	this.disable_subscription = function(folder)
	{
	var row = this.subscription_list.get_item(folder, true);
	if (row)
	$('input[name="_subscribed[]"]:first', row).prop('disabled', true);
	};

	this.folder_size = function(folder)
	{
	var lock = this.set_busy(true, 'loading');
	this.http_post('folder-size', {_mbox: folder}, lock);
	};

	this.folder_size_update = function(size)
	{
	$('#folder-size').replaceWith(size);
	};

	// filter folders by namespace
	this.folder_filter = function(prefix)
	{
	this.subscription_list.reset_search();

	this.subscription_list.container.children('li').each(function() {
	var i, folder = ref.folder_id2name(this.id);
	// show all folders
	if (prefix == '---') {
	}
	// got namespace prefix
	else if (prefix) {
	if (folder !== prefix) {
	$(this).data('filtered', true).hide();
	return
	}
	}
	// no namespace prefix, filter out all other namespaces
	else {
	// first get all namespace roots
	for (i in ref.env.ns_roots) {
	if (folder === ref.env.ns_roots[i]) {
	$(this).data('filtered', true).hide();
	return;
	}
	}
	}

	$(this).removeData('filtered').show();
	});
	};

	/*********************************************************/
	/******* GUI functionality *******/
	/*********************************************************/

	var init_button = function(cmd, prop)
	{
	var elm = document.getElementById(prop.id);
	if (!elm)
	return;

	var preload = false;
	if (prop.type == 'image') {
	elm = elm.parentNode;
	preload = true;
	}

	elm._command = cmd;
	elm._id = prop.id;
	if (prop.sel) {
	elm.onmousedown = function(e) { return ref.button_sel(this._command, this._id); };
	elm.onmouseup = function(e) { return ref.button_out(this._command, this._id); };
	if (preload)
	new Image().src = prop.sel;
	}
	if (prop.over) {
	elm.onmouseover = function(e) { return ref.button_over(this._command, this._id); };
	elm.onmouseout = function(e) { return ref.button_out(this._command, this._id); };
	if (preload)
	new Image().src = prop.over;
	}
	};

	// set event handlers on registered buttons
	this.init_buttons = function()
	{
	for (var cmd in this.buttons) {
	if (typeof cmd !== 'string')
	continue;

	for (var i=0; i<this.buttons[cmd].length; i++) {
	init_button(cmd, this.buttons[cmd][i]);
	}
	}
	};

	// set button to a specific state
	this.set_button = function(command, state)
	{
	var n, button, obj, $obj, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	obj = document.getElementById(button.id);

	if (!obj \|\| button.status === state)
	continue;

	// get default/passive setting of the button
	if (button.type == 'image' && !button.status) {
	button.pas = obj._original_src ? obj._original_src : obj.src;
	// respect PNG fix on IE browsers
	if (obj.runtimeStyle && obj.runtimeStyle.filter && obj.runtimeStyle.filter.match(/src=['"]([^'"]+)['"]/))
	button.pas = RegExp.$1;
	}
	else if (!button.status)
	button.pas = String(obj.className);

	button.status = state;

	// set image according to button state
	if (button.type == 'image' && button[state]) {
	obj.src = button[state];
	}
	// set class name according to button state
	else if (button[state] !== undefined) {
	obj.className = button[state];
	}
	// disable/enable input buttons
	if (button.type == 'input') {
	obj.disabled = state == 'pas';
	}
	else if (button.type == 'uibutton') {
	button.status = state;
	$(obj).button('option', 'disabled', state == 'pas');
	}
	else {
	$obj = $(obj);
	$obj
	.attr('tabindex', state == 'pas' \|\| state == 'sel' ? '-1' : ($obj.attr('data-tabindex') \|\| '0'))
	.attr('aria-disabled', state == 'pas' \|\| state == 'sel' ? 'true' : 'false');
	}
	}
	};

	// display a specific alttext
	this.set_alttext = function(command, label)
	{
	var n, button, obj, link, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	obj = document.getElementById(button.id);

	if (button.type == 'image' && obj) {
	obj.setAttribute('alt', this.get_label(label));
	if ((link = obj.parentNode) && link.tagName.toLowerCase() == 'a')
	link.setAttribute('title', this.get_label(label));
	}
	else if (obj)
	obj.setAttribute('title', this.get_label(label));
	}
	};

	// mouse over button
	this.button_over = function(command, id)
	{
	this.button_event(command, id, 'over');
	};

	// mouse down on button
	this.button_sel = function(command, id)
	{
	this.button_event(command, id, 'sel');
	};

	// mouse out of button
	this.button_out = function(command, id)
	{
	this.button_event(command, id, 'act');
	};

	// event of button
	this.button_event = function(command, id, event)
	{
	var n, button, obj, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	if (button.id == id && button.status == 'act') {
	if (button[event] && (obj = document.getElementById(button.id))) {
	obj[button.type == 'image' ? 'src' : 'className'] = button[event];
	}

	if (event == 'sel') {
	this.buttons_sel[id] = command;
	}
	}
	}
	};

	// write to the document/window title
	this.set_pagetitle = function(title)
	{
	if (title && document.title)
	document.title = title;
	};

	// display a system message, list of types in common.css (below #message definition)
	this.display_message = function(msg, type, timeout, key)
	{
	// pass command to parent window
	if (this.is_framed())
	return parent.rcmail.display_message(msg, type, timeout);

	if (!this.gui_objects.message) {
	// save message in order to display after page loaded
	if (type != 'loading')
	this.pending_message = [msg, type, timeout, key];
	return 1;
	}

	if (!type)
	type = 'notice';

	if (!key)
	key = this.html_identifier(msg);

	var date = new Date(),
	id = type + date.getTime();

	if (!timeout) {
	switch (type) {
	case 'error':
	case 'warning':
	timeout = this.message_time * 2;
	break;

	case 'uploading':
	timeout = 0;
	break;

	default:
	timeout = this.message_time;
	}
	}

	if (type == 'loading') {
	key = 'loading';
	timeout = this.env.request_timeout * 1000;
	if (!msg)
	msg = this.get_label('loading');
	}

	// The same message is already displayed
	if (this.messages[key]) {
	// replace label
	if (this.messages[key].obj)
	this.messages[key].obj.html(msg);
	// store label in stack
	if (type == 'loading') {
	this.messages[key].labels.push({'id': id, 'msg': msg});
	}
	// add element and set timeout
	this.messages[key].elements.push(id);
	setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
	return id;
	}

	// create DOM object and display it
	var obj = $('<div>').addClass(type).html(msg).data('key', key),
	cont = $(this.gui_objects.message).append(obj).show();

	this.messages[key] = {'obj': obj, 'elements': [id]};

	if (type == 'loading') {
	this.messages[key].labels = [{'id': id, 'msg': msg}];
	}
	else if (type != 'uploading') {
	obj.click(function() { return ref.hide_message(obj); })
	.attr('role', 'alert');
	}

	this.triggerEvent('message', { message:msg, type:type, timeout:timeout, object:obj });

	if (timeout > 0)
	setTimeout(function() { ref.hide_message(id, type != 'loading'); }, timeout);

	return id;
	};

	// make a message to disapear
	this.hide_message = function(obj, fade)
	{
	// pass command to parent window
	if (this.is_framed())
	return parent.rcmail.hide_message(obj, fade);

	if (!this.gui_objects.message)
	return;

	var k, n, i, o, m = this.messages;

	// Hide message by object, don't use for 'loading'!
	if (typeof obj === 'object') {
	o = $(obj);
	k = o.data('key');
	this.hide_message_object(o, fade);
	if (m[k])
	delete m[k];
	}
	// Hide message by id
	else {
	for (k in m) {
	for (n in m[k].elements) {
	if (m[k] && m[k].elements[n] == obj) {
	m[k].elements.splice(n, 1);
	// hide DOM element if last instance is removed
	if (!m[k].elements.length) {
	this.hide_message_object(m[k].obj, fade);
	delete m[k];
	}
	// set pending action label for 'loading' message
	else if (k == 'loading') {
	for (i in m[k].labels) {
	if (m[k].labels[i].id == obj) {
	delete m[k].labels[i];
	}
	else {
	o = m[k].labels[i].msg;
	m[k].obj.html(o);
	}
	}
	}
	}
	}
	}
	}
	};

	// hide message object and remove from the DOM
	this.hide_message_object = function(o, fade)
	{
	if (fade)
	o.fadeOut(600, function() {$(this).remove(); });
	else
	o.hide().remove();
	};

	// remove all messages immediately
	this.clear_messages = function()
	{
	// pass command to parent window
	if (this.is_framed())
	return parent.rcmail.clear_messages();

	var k, n, m = this.messages;

	for (k in m)
	for (n in m[k].elements)
	if (m[k].obj)
	this.hide_message_object(m[k].obj);

	this.messages = {};
	};

	// display uploading message with progress indicator
	// data should contain: name, total, current, percent, text
	this.display_progress = function(data)
	{
	if (!data \|\| !data.name)
	return;

	var msg = this.messages['progress' + data.name];

	if (!data.label)
	data.label = this.get_label('uploadingmany');

	if (!msg) {
	if (!data.percent \|\| data.percent < 100)
	this.display_message(data.label, 'uploading', 0, 'progress' + data.name);
	return;
	}

	if (!data.total \|\| data.percent >= 100) {
	this.hide_message(msg.obj);
	return;
	}

	if (data.text)
	data.label += ' ' + data.text;

	msg.obj.text(data.label);
	};

	// open a jquery UI dialog with the given content
	this.show_popup_dialog = function(content, title, buttons, options)
	{
	// forward call to parent window
	if (this.is_framed()) {
	return parent.rcmail.show_popup_dialog(content, title, buttons, options);
	}

	var popup = $('<div class="popup">');

	if (typeof content == 'object')
	popup.append(content);
	else
	popup.html(content);

	popup.dialog($.extend({
	title: title,
	buttons: buttons,
	modal: true,
	resizable: true,
	width: 500,
	close: function(event, ui) { $(this).remove(); }
	}, options \|\| {}));

	// resize and center popup
	var win = $(window), w = win.width(), h = win.height(),
	width = popup.width(), height = popup.height();

	popup.dialog('option', {
	height: Math.min(h - 40, height + 75 + (buttons ? 50 : 0)),
	width: Math.min(w - 20, width + 36)
	});

	// assign special classes to dialog buttons
	$.each(options.button_classes \|\| [], function(i, v) {
	if (v) $($('.ui-dialog-buttonpane button.ui-button', popup.parent()).get(i)).addClass(v);
	});

	return popup;
	};

	// enable/disable buttons for page shifting
	this.set_page_buttons = function()
	{
	this.enable_command('nextpage', 'lastpage', this.env.pagecount > this.env.current_page);
	this.enable_command('previouspage', 'firstpage', this.env.current_page > 1);
	};

	// mark a mailbox as selected and set environment variable
	this.select_folder = function(name, prefix, encode)
	{
	if (this.savedsearchlist) {
	this.savedsearchlist.select('');
	}

	if (this.treelist) {
	this.treelist.select(name);
	}
	else if (this.gui_objects.folderlist) {
	$('li.selected', this.gui_objects.folderlist).removeClass('selected');
	$(this.get_folder_li(name, prefix, encode)).addClass('selected');

	// trigger event hook
	this.triggerEvent('selectfolder', { folder:name, prefix:prefix });
	}
	};

	// adds a class to selected folder
	this.mark_folder = function(name, class_name, prefix, encode)
	{
	$(this.get_folder_li(name, prefix, encode)).addClass(class_name);
	this.triggerEvent('markfolder', {folder: name, mark: class_name, status: true});
	};

	// adds a class to selected folder
	this.unmark_folder = function(name, class_name, prefix, encode)
	{
	$(this.get_folder_li(name, prefix, encode)).removeClass(class_name);
	this.triggerEvent('markfolder', {folder: name, mark: class_name, status: false});
	};

	// helper method to find a folder list item
	this.get_folder_li = function(name, prefix, encode)
	{
	if (!prefix)
	prefix = 'rcmli';

	if (this.gui_objects.folderlist) {
	name = this.html_identifier(name, encode);
	return document.getElementById(prefix+name);
	}
	};

	// for reordering column array (Konqueror workaround)
	// and for setting some message list global variables
	this.set_message_coltypes = function(listcols, repl, smart_col)
	{
	var list = this.message_list,
	thead = list ? list.thead : null,
	repl, cell, col, n, len, tr;

	this.env.listcols = listcols;

	// replace old column headers
	if (thead) {
	if (repl) {
	thead.innerHTML = '';
	tr = document.createElement('tr');

	for (c=0, len=repl.length; c < len; c++) {
	cell = document.createElement('th');
	cell.innerHTML = repl[c].html \|\| '';
	if (repl[c].id) cell.id = repl[c].id;
	if (repl[c].className) cell.className = repl[c].className;
	tr.appendChild(cell);
	}
	thead.appendChild(tr);
	}

	for (n=0, len=this.env.listcols.length; n<len; n++) {
	col = this.env.listcols[n];
	if ((cell = thead.rows[0].cells[n]) && (col == 'from' \|\| col == 'to' \|\| col == 'fromto')) {
	$(cell).attr('rel', col).find('span,a').text(this.get_label(col == 'fromto' ? smart_col : col));
	}
	}
	}

	this.env.subject_col = null;
	this.env.flagged_col = null;
	this.env.status_col = null;

	if (this.env.coltypes.folder)
	this.env.coltypes.folder.hidden = !(this.env.search_request \|\| this.env.search_id) \|\| this.env.search_scope == 'base';

	if ((n = $.inArray('subject', this.env.listcols)) >= 0) {
	this.env.subject_col = n;
	if (list)
	list.subject_col = n;
	}
	if ((n = $.inArray('flag', this.env.listcols)) >= 0)
	this.env.flagged_col = n;
	if ((n = $.inArray('status', this.env.listcols)) >= 0)
	this.env.status_col = n;

	if (list) {
	list.hide_column('folder', (this.env.coltypes.folder && this.env.coltypes.folder.hidden) \|\| $.inArray('folder', this.env.listcols) < 0);
	list.init_header();
	}
	};

	// replace content of row count display
	this.set_rowcount = function(text, mbox)
	{
	// #1487752
	if (mbox && mbox != this.env.mailbox)
	return false;

	$(this.gui_objects.countdisplay).html(text);

	// update page navigation buttons
	this.set_page_buttons();
	};

	// replace content of mailboxname display
	this.set_mailboxname = function(content)
	{
	if (this.gui_objects.mailboxname && content)
	this.gui_objects.mailboxname.innerHTML = content;
	};

	// replace content of quota display
	this.set_quota = function(content)
	{
	if (this.gui_objects.quotadisplay && content && content.type == 'text')
	$(this.gui_objects.quotadisplay).html(content.percent+'%').attr('title', content.title);

	this.triggerEvent('setquota', content);
	this.env.quota_content = content;
	};

	// update trash folder state
	this.set_trash_count = function(count)
	{
	this[(count ? 'un' : '') + 'mark_folder'](this.env.trash_mailbox, 'empty', '', true);
	};

	// update the mailboxlist
	this.set_unread_count = function(mbox, count, set_title, mark)
	{
	if (!this.gui_objects.mailboxlist)
	return false;

	this.env.unread_counts[mbox] = count;
	this.set_unread_count_display(mbox, set_title);

	if (mark)
	this.mark_folder(mbox, mark, '', true);
	else if (!count)
	this.unmark_folder(mbox, 'recent', '', true);
	};

	// update the mailbox count display
	this.set_unread_count_display = function(mbox, set_title)
	{
	var reg, link, text_obj, item, mycount, childcount, div;

	if (item = this.get_folder_li(mbox, '', true)) {
	mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
	link = $(item).children('a').eq(0);
	text_obj = link.children('span.unreadcount');
	if (!text_obj.length && mycount)
	text_obj = $('<span>').addClass('unreadcount').appendTo(link);
	reg = /\s+$[0-9]+$$/i;

	childcount = 0;
	if ((div = item.getElementsByTagName('div')[0]) &&
	div.className.match(/collapsed/)) {
	// add children's counters
	for (var k in this.env.unread_counts)
	if (k.startsWith(mbox + this.env.delimiter))
	childcount += this.env.unread_counts[k];
	}

	if (mycount && text_obj.length)
	text_obj.html(this.env.unreadwrap.replace(/%[sd]/, mycount));
	else if (text_obj.length)
	text_obj.remove();

	// set parent's display
	reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+$');
	if (mbox.match(reg))
	this.set_unread_count_display(mbox.replace(reg, ''), false);

	// set the right classes
	if ((mycount+childcount)>0)
	$(item).addClass('unread');
	else
	$(item).removeClass('unread');
	}

	// set unread count to window title
	reg = /^$[0-9]+$\s+/i;
	if (set_title && document.title) {
	var new_title = '',
	doc_title = String(document.title);

	if (mycount && doc_title.match(reg))
	new_title = doc_title.replace(reg, '('+mycount+') ');
	else if (mycount)
	new_title = '('+mycount+') '+doc_title;
	else
	new_title = doc_title.replace(reg, '');

	this.set_pagetitle(new_title);
	}
	};

	// display fetched raw headers
	this.set_headers = function(content)
	{
	if (this.gui_objects.all_headers_row && this.gui_objects.all_headers_box && content)
	$(this.gui_objects.all_headers_box).html(content).show();
	};

	// display all-headers row and fetch raw message headers
	this.show_headers = function(props, elem)
	{
	if (!this.gui_objects.all_headers_row \|\| !this.gui_objects.all_headers_box \|\| !this.env.uid)
	return;

	$(elem).removeClass('show-headers').addClass('hide-headers');
	$(this.gui_objects.all_headers_row).show();
	elem.onclick = function() { ref.command('hide-headers', '', elem); };

	// fetch headers only once
	if (!this.gui_objects.all_headers_box.innerHTML) {
	this.http_post('headers', {_uid: this.env.uid, _mbox: this.env.mailbox},
	this.display_message(this.get_label('loading'), 'loading')
	);
	}
	};

	// hide all-headers row
	this.hide_headers = function(props, elem)
	{
	if (!this.gui_objects.all_headers_row \|\| !this.gui_objects.all_headers_box)
	return;

	$(elem).removeClass('hide-headers').addClass('show-headers');
	$(this.gui_objects.all_headers_row).hide();
	elem.onclick = function() { ref.command('show-headers', '', elem); };
	};

	// create folder selector popup, position and display it
	this.folder_selector = function(event, callback)
	{
	var container = this.folder_selector_element;

	if (!container) {
	var rows = [],
	delim = this.env.delimiter,
	ul = $('<ul class="toolbarmenu">'),
	link = document.createElement('a');

	container = $('<div id="folder-selector" class="popupmenu"></div>');
	link.href = '#';
	link.className = 'icon';

	// loop over sorted folders list
	$.each(this.env.mailboxes_list, function() {
	var n = 0, s = 0,
	folder = ref.env.mailboxes[this],
	id = folder.id,
	a = $(link.cloneNode(false)),
	row = $('<li>');

	if (folder.virtual)
	a.addClass('virtual').attr('aria-disabled', 'true').attr('tabindex', '-1');
	else
	a.addClass('active').data('id', folder.id);

	if (folder['class'])
	a.addClass(folder['class']);

	// calculate/set indentation level
	while ((s = id.indexOf(delim, s)) >= 0) {
	n++; s++;
	}
	a.css('padding-left', n ? (n * 16) + 'px' : 0);

	// add folder name element
	a.append($('<span>').text(folder.name));

	row.append(a);
	rows.push(row);
	});

	ul.append(rows).appendTo(container);

	// temporarily show element to calculate its size
	container.css({left: '-1000px', top: '-1000px'})
	.appendTo($('body')).show();

	// set max-height if the list is long
	if (rows.length > 10)
	container.css('max-height', $('li', container)[0].offsetHeight * 10 + 9);

	// register delegate event handler for folder item clicks
	container.on('click', 'a.active', function(e){
	container.data('callback')($(this).data('id'));
	return false;
	});

	this.folder_selector_element = container;
	}

	container.data('callback', callback);

	// position menu on the screen
	this.show_menu('folder-selector', true, event);
	};


	/***********************************************/
	/******* popup menu functions *******/
	/***********************************************/

	// Show/hide a specific popup menu
	this.show_menu = function(prop, show, event)
	{
	var name = typeof prop == 'object' ? prop.menu : prop,
	obj = $('#'+name),
	ref = event && event.target ? $(event.target) : $(obj.attr('rel') \|\| '#'+name+'link'),
	keyboard = rcube_event.is_keyboard(event),
	align = obj.attr('data-align') \|\| '',
	stack = false;

	// find "real" button element
	if (ref.get(0).tagName != 'A' && ref.closest('a').length)
	ref = ref.closest('a');

	if (typeof prop == 'string')
	prop = { menu:name };

	// let plugins or skins provide the menu element
	if (!obj.length) {
	obj = this.triggerEvent('menu-get', { name:name, props:prop, originalEvent:event });
	}

	if (!obj \|\| !obj.length) {
	// just delegate the action to subscribers
	return this.triggerEvent(show === false ? 'menu-close' : 'menu-open', { name:name, props:prop, originalEvent:event });
	}

	// move element to top for proper absolute positioning
	obj.appendTo(document.body);

	if (typeof show == 'undefined')
	show = obj.is(':visible') ? false : true;

	if (show && ref.length) {
	var win = $(window),
	pos = ref.offset(),
	above = align.indexOf('bottom') >= 0;

	stack = ref.attr('role') == 'menuitem' \|\| ref.closest('[role=menuitem]').length > 0;

	ref.offsetWidth = ref.outerWidth();
	ref.offsetHeight = ref.outerHeight();
	if (!above && pos.top + ref.offsetHeight + obj.height() > win.height()) {
	above = true;
	}
	if (align.indexOf('right') >= 0) {
	pos.left = pos.left + ref.outerWidth() - obj.width();
	}
	else if (stack) {
	pos.left = pos.left + ref.offsetWidth - 5;
	pos.top -= ref.offsetHeight;
	}
	if (pos.left + obj.width() > win.width()) {
	pos.left = win.width() - obj.width() - 12;
	}
	pos.top = Math.max(0, pos.top + (above ? -obj.height() : ref.offsetHeight));
	obj.css({ left:pos.left+'px', top:pos.top+'px' });
	}

	// add menu to stack
	if (show) {
	// truncate stack down to the one containing the ref link
	for (var i = this.menu_stack.length - 1; stack && i >= 0; i--) {
	if (!$(ref).parents('#'+this.menu_stack[i]).length)
	this.hide_menu(this.menu_stack[i], event);
	}
	if (stack && this.menu_stack.length) {
	obj.data('parent', $.last(this.menu_stack));
	obj.css('z-index', ($('#'+$.last(this.menu_stack)).css('z-index') \|\| 0) + 1);
	}
	else if (!stack && this.menu_stack.length) {
	this.hide_menu(this.menu_stack[0], event);
	}

	obj.show().attr('aria-hidden', 'false').data('opener', ref.attr('aria-expanded', 'true').get(0));
	this.triggerEvent('menu-open', { name:name, obj:obj, props:prop, originalEvent:event });
	this.menu_stack.push(name);

	this.menu_keyboard_active = show && keyboard;
	if (this.menu_keyboard_active) {
	this.focused_menu = name;
	obj.find('a,input:not(:disabled)').not('[aria-disabled=true]').first().focus();
	}
	}
	else { // close menu
	this.hide_menu(name, event);
	}

	return show;
	};

	// hide the given popup menu (and it's childs)
	this.hide_menu = function(name, event)
	{
	if (!this.menu_stack.length) {
	// delegate to subscribers
	this.triggerEvent('menu-close', { name:name, props:{ menu:name }, originalEvent:event });
	return;
	}

	var obj, keyboard = rcube_event.is_keyboard(event);
	for (var j=this.menu_stack.length-1; j >= 0; j--) {
	obj = $('#' + this.menu_stack[j]).hide().attr('aria-hidden', 'true').data('parent', false);
	this.triggerEvent('menu-close', { name:this.menu_stack[j], obj:obj, props:{ menu:this.menu_stack[j] }, originalEvent:event });
	if (this.menu_stack[j] == name) {
	j = -1; // stop loop
	if (obj.data('opener')) {
	$(obj.data('opener')).attr('aria-expanded', 'false');
	if (keyboard)
	obj.data('opener').focus();
	}
	}
	this.menu_stack.pop();
	}

	// focus previous menu in stack
	if (this.menu_stack.length && keyboard) {
	this.menu_keyboard_active = true;
	this.focused_menu = $.last(this.menu_stack);
	if (!obj \|\| !obj.data('opener'))
	$('#'+this.focused_menu).find('a,input:not(:disabled)').not('[aria-disabled=true]').first().focus();
	}
	else {
	this.focused_menu = null;
	this.menu_keyboard_active = false;
	}
	}


	// position a menu element on the screen in relation to other object
	this.element_position = function(element, obj)
	{
	var obj = $(obj), win = $(window),
	width = obj.outerWidth(),
	height = obj.outerHeight(),
	menu_pos = obj.data('menu-pos'),
	win_height = win.height(),
	elem_height = $(element).height(),
	elem_width = $(element).width(),
	pos = obj.offset(),
	top = pos.top,
	left = pos.left + width;

	if (menu_pos == 'bottom') {
	top += height;
	left -= width;
	}
	else
	left -= 5;

	if (top + elem_height > win_height) {
	top -= elem_height - height;
	if (top < 0)
	top = Math.max(0, (win_height - elem_height) / 2);
	}

	if (left + elem_width > win.width())
	left -= elem_width + width;

	element.css({left: left + 'px', top: top + 'px'});
	};

	// initialize HTML editor
	this.editor_init = function(config, id)
	{
	this.editor = new rcube_text_editor(config, id);
	};


	/********************************************************/
	/******* html to text conversion functions *******/
	/********************************************************/

	this.html2plain = function(html, func)
	{
	return this.format_converter(html, 'html', func);
	};

	this.plain2html = function(plain, func)
	{
	return this.format_converter(plain, 'plain', func);
	};

	this.format_converter = function(text, format, func)
	{
	// warn the user (if converted content is not empty)
	if (!text
	\|\| (format == 'html' && !(text.replace(/<[^>]+>\| \|\xC2\xA0\|\s/g, '')).length)
	\|\| (format != 'html' && !(text.replace(/\xC2\xA0\|\s/g, '')).length)
	) {
	// without setTimeout() here, textarea is filled with initial (onload) content
	if (func)
	setTimeout(function() { func(''); }, 50);
	return true;
	}

	var confirmed = this.env.editor_warned \|\| confirm(this.get_label('editorwarning'));

	this.env.editor_warned = true;

	if (!confirmed)
	return false;

	var url = '?_task=utils&_action=' + (format == 'html' ? 'html2text' : 'text2html'),
	lock = this.set_busy(true, 'converting');

	this.log('HTTP POST: ' + url);

	$.ajax({ type: 'POST', url: url, data: text, contentType: 'application/octet-stream',
	error: function(o, status, err) { ref.http_error(o, status, err, lock); },
	success: function(data) {
	ref.set_busy(false, null, lock);
	if (func) func(data);
	}
	});

	return true;
	};


	/********************************************************/
	/******* remote request methods *******/
	/********************************************************/

	// compose a valid url with the given parameters
	this.url = function(action, query)
	{
	var querystring = typeof query === 'string' ? '&' + query : '';

	if (typeof action !== 'string')
	query = action;
	else if (!query \|\| typeof query !== 'object')
	query = {};

	if (action)
	query._action = action;
	else if (this.env.action)
	query._action = this.env.action;

	var base = this.env.comm_path, k, param = {};

	// overwrite task name
	if (action && action.match(/([a-z0-9_-]+)\/([a-z0-9-_.]+)/)) {
	query._action = RegExp.$2;
	base = base.replace(/\_task=[a-z0-9_-]+/, '_task='+RegExp.$1);
	}

	// remove undefined values
	for (k in query) {
	if (query[k] !== undefined && query[k] !== null)
	param[k] = query[k];
	}

	return base + (base.indexOf('?') > -1 ? '&' : '?') + $.param(param) + querystring;
	};

	this.redirect = function(url, lock)
	{
	if (lock \|\| lock === null)
	this.set_busy(true);

	if (this.is_framed()) {
	parent.rcmail.redirect(url, lock);
	}
	else {
	if (this.env.extwin) {
	if (typeof url == 'string')
	url += (url.indexOf('?') < 0 ? '?' : '&') + '_extwin=1';
	else
	url._extwin = 1;
	}
	this.location_href(url, window);
	}
	};

	this.goto_url = function(action, query, lock)
	{
	this.redirect(this.url(action, query), lock);
	};

	this.location_href = function(url, target, frame)
	{
	if (frame)
	this.lock_frame();

	if (typeof url == 'object')
	url = this.env.comm_path + '&' + $.param(url);

	// simulate real link click to force IE to send referer header
	if (bw.ie && target == window)
	$('<a>').attr('href', url).appendTo(document.body).get(0).click();
	else
	target.location.href = url;

	// reset keep-alive interval
	this.start_keepalive();
	};

	// update browser location to remember current view
	this.update_state = function(query)
	{
	if (window.history.replaceState)
	window.history.replaceState({}, document.title, rcmail.url('', query));
	};

	// send a http request to the server
	this.http_request = function(action, query, lock)
	{
	var url = this.url(action, query);

	// trigger plugin hook
	var result = this.triggerEvent('request'+action, query);

	if (result !== undefined) {
	// abort if one the handlers returned false
	if (result === false)
	return false;
	else
	url = this.url(action, result);
	}

	url += '&_remote=1';

	// send request
	this.log('HTTP GET: ' + url);

	// reset keep-alive interval
	this.start_keepalive();

	return $.ajax({
	type: 'GET', url: url, data: { _unlock:(lock?lock:0) }, dataType: 'json',
	success: function(data){ ref.http_response(data); },
	error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
	});
	};

	// send a http POST request to the server
	this.http_post = function(action, postdata, lock)
	{
	var url = this.url(action);

	if (postdata && typeof postdata === 'object') {
	postdata._remote = 1;
	postdata._unlock = (lock ? lock : 0);
	}
	else
	postdata += (postdata ? '&' : '') + '_remote=1' + (lock ? '&_unlock='+lock : '');

	// trigger plugin hook
	var result = this.triggerEvent('request'+action, postdata);
	if (result !== undefined) {
	// abort if one of the handlers returned false
	if (result === false)
	return false;
	else
	postdata = result;
	}

	// send request
	this.log('HTTP POST: ' + url);

	// reset keep-alive interval
	this.start_keepalive();

	return $.ajax({
	type: 'POST', url: url, data: postdata, dataType: 'json',
	success: function(data){ ref.http_response(data); },
	error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
	});
	};

	// aborts ajax request
	this.abort_request = function(r)
	{
	if (r.request)
	r.request.abort();
	if (r.lock)
	this.set_busy(false, null, r.lock);
	};

	// handle HTTP response
	this.http_response = function(response)
	{
	if (!response)
	return;

	if (response.unlock)
	this.set_busy(false);

	this.triggerEvent('responsebefore', {response: response});
	this.triggerEvent('responsebefore'+response.action, {response: response});

	// set env vars
	if (response.env)
	this.set_env(response.env);

	// we have labels to add
	if (typeof response.texts === 'object') {
	for (var name in response.texts)
	if (typeof response.texts[name] === 'string')
	this.add_label(name, response.texts[name]);
	}

	// if we get javascript code from server -> execute it
	if (response.exec) {
	this.log(response.exec);
	eval(response.exec);
	}

	// execute callback functions of plugins
	if (response.callbacks && response.callbacks.length) {
	for (var i=0; i < response.callbacks.length; i++)
	this.triggerEvent(response.callbacks[i][0], response.callbacks[i][1]);
	}

	// process the response data according to the sent action
	switch (response.action) {
	case 'delete':
	if (this.task == 'addressbook') {
	var sid, uid = this.contact_list.get_selection(), writable = false;

	if (uid && this.contact_list.rows[uid]) {
	// search results, get source ID from record ID
	if (this.env.source == '') {
	sid = String(uid).replace(/^[^-]+-/, '');
	writable = sid && this.env.address_sources[sid] && !this.env.address_sources[sid].readonly;
	}
	else {
	writable = !this.env.address_sources[this.env.source].readonly;
	}
	}
	this.enable_command('compose', (uid && this.contact_list.rows[uid]));
	this.enable_command('delete', 'edit', writable);
	this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
	this.enable_command('export-selected', false);
	}

	case 'move':
	if (this.env.action == 'show') {
	// re-enable commands on move/delete error
	this.enable_command(this.env.message_commands, true);
	if (!this.env.list_post)
	this.enable_command('reply-list', false);
	}
	else if (this.task == 'addressbook') {
	this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
	}

	case 'purge':
	case 'expunge':
	if (this.task == 'mail') {
	if (!this.env.exists) {
	// clear preview pane content
	if (this.env.contentframe)
	this.show_contentframe(false);
	// disable commands useless when mailbox is empty
	this.enable_command(this.env.message_commands, 'purge', 'expunge',
	'select-all', 'select-none', 'expand-all', 'expand-unread', 'collapse-all', false);
	}
	if (this.message_list)
	this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
	}
	break;

	case 'refresh':
	case 'check-recent':
	// update message flags
	$.each(this.env.recent_flags \|\| {}, function(uid, flags) {
	ref.set_message(uid, 'deleted', flags.deleted);
	ref.set_message(uid, 'replied', flags.answered);
	ref.set_message(uid, 'unread', !flags.seen);
	ref.set_message(uid, 'forwarded', flags.forwarded);
	ref.set_message(uid, 'flagged', flags.flagged);
	});
	delete this.env.recent_flags;

	case 'getunread':
	case 'search':
	this.env.qsearch = null;
	case 'list':
	if (this.task == 'mail') {
	var is_multifolder = this.is_multifolder_listing();
	this.enable_command('show', 'select-all', 'select-none', this.env.messagecount > 0);
	this.enable_command('expunge', this.env.exists && !is_multifolder);
	this.enable_command('purge', this.purge_mailbox_test() && !is_multifolder);
	this.enable_command('import-messages', !is_multifolder);
	this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount && !is_multifolder);

	if ((response.action == 'list' \|\| response.action == 'search') && this.message_list) {
	var list = this.message_list, uid = this.env.list_uid;

	// highlight message row when we're back from message page
	if (uid) {
	if (!list.rows[uid])
	uid += '-' + this.env.mailbox;
	if (list.rows[uid]) {
	list.select(uid);
	}
	delete this.env.list_uid;
	}

	this.enable_command('set-listmode', this.env.threads && !is_multifolder);
	if (list.rowcount > 0)
	list.focus();
	this.msglist_select(list);
	this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:list.rowcount });

	}
	}
	else if (this.task == 'addressbook') {
	this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));

	if (response.action == 'list' \|\| response.action == 'search') {
	this.enable_command('search-create', this.env.source == '');
	this.enable_command('search-delete', this.env.search_id);
	this.update_group_commands();
	if (this.contact_list.rowcount > 0)
	this.contact_list.focus();
	this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
	}
	}
	break;

	case 'list-contacts':
	case 'search-contacts':
	if (this.contact_list && this.contact_list.rowcount > 0)
	this.contact_list.focus();
	break;
	}

	if (response.unlock)
	this.hide_message(response.unlock);

	this.triggerEvent('responseafter', {response: response});
	this.triggerEvent('responseafter'+response.action, {response: response});

	// reset keep-alive interval
	this.start_keepalive();
	};

	// handle HTTP request errors
	this.http_error = function(request, status, err, lock, action)
	{
	var errmsg = request.statusText;

	this.set_busy(false, null, lock);
	request.abort();

	// don't display error message on page unload (#1488547)
	if (this.unload)
	return;

	if (request.status && errmsg)
	this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
	else if (status == 'timeout')
	this.display_message(this.get_label('requesttimedout'), 'error');
	else if (request.status == 0 && status != 'abort')
	this.display_message(this.get_label('connerror'), 'error');

	// redirect to url specified in location header if not empty
	var location_url = request.getResponseHeader("Location");
	if (location_url && this.env.action != 'compose') // don't redirect on compose screen, contents might get lost (#1488926)
	this.redirect(location_url);

	// 403 Forbidden response (CSRF prevention) - reload the page.
	// In case there's a new valid session it will be used, otherwise
	// login form will be presented (#1488960).
	if (request.status == 403) {
	(this.is_framed() ? parent : window).location.reload();
	return;
	}

	// re-send keep-alive requests after 30 seconds
	if (action == 'keep-alive')
	setTimeout(function(){ ref.keep_alive(); ref.start_keepalive(); }, 30000);
	};

	// handler for session errors detected on the server
	this.session_error = function(redirect_url)
	{
	this.env.server_error = 401;

	// save message in local storage and do not redirect
	if (this.env.action == 'compose') {
	this.save_compose_form_local();
	this.compose_skip_unsavedcheck = true;
	}
	else if (redirect_url) {
	setTimeout(function(){ ref.redirect(redirect_url, true); }, 2000);
	}
	};

	// callback when an iframe finished loading
	this.iframe_loaded = function(unlock)
	{
	this.set_busy(false, null, unlock);

	if (this.submit_timer)
	clearTimeout(this.submit_timer);
	};

	/**
	Send multi-threaded parallel HTTP requests to the server for a list if items.
	The string '%' in either a GET query or POST parameters will be replaced with the respective item value.
	This is the argument object expected: {
	items: ['foo','bar','gna'], // list of items to send requests for
	action: 'task/some-action', // Roudncube action to call
	query: { q:'%s' }, // GET query parameters
	postdata: { source:'%s' }, // POST data (sends a POST request if present)
	threads: 3, // max. number of concurrent requests
	onresponse: function(data){ }, // Callback function called for every response received from server
	whendone: function(alldata){ } // Callback function called when all requests have been sent
	}
	*/
	this.multi_thread_http_request = function(prop)
	{
	var i, item, reqid = new Date().getTime(),
	threads = prop.threads \|\| 1;

	prop.reqid = reqid;
	prop.running = 0;
	prop.requests = [];
	prop.result = [];
	prop._items = $.extend([], prop.items); // copy items

	if (!prop.lock)
	prop.lock = this.display_message(this.get_label('loading'), 'loading');

	// add the request arguments to the jobs pool
	this.http_request_jobs[reqid] = prop;

	// start n threads
	for (i=0; i < threads; i++) {
	item = prop._items.shift();
	if (item === undefined)
	break;

	prop.running++;
	prop.requests.push(this.multi_thread_send_request(prop, item));
	}

	return reqid;
	};

	// helper method to send an HTTP request with the given iterator value
	this.multi_thread_send_request = function(prop, item)
	{
	var k, postdata, query;

	// replace %s in post data
	if (prop.postdata) {
	postdata = {};
	for (k in prop.postdata) {
	postdata[k] = String(prop.postdata[k]).replace('%s', item);
	}
	postdata._reqid = prop.reqid;
	}
	// replace %s in query
	else if (typeof prop.query == 'string') {
	query = prop.query.replace('%s', item);
	query += '&_reqid=' + prop.reqid;
	}
	else if (typeof prop.query == 'object' && prop.query) {
	query = {};
	for (k in prop.query) {
	query[k] = String(prop.query[k]).replace('%s', item);
	}
	query._reqid = prop.reqid;
	}

	// send HTTP GET or POST request
	return postdata ? this.http_post(prop.action, postdata) : this.http_request(prop.action, query);
	};

	// callback function for multi-threaded http responses
	this.multi_thread_http_response = function(data, reqid)
	{
	var prop = this.http_request_jobs[reqid];
	if (!prop \|\| prop.running <= 0 \|\| prop.cancelled)
	return;

	prop.running--;

	// trigger response callback
	if (prop.onresponse && typeof prop.onresponse == 'function') {
	prop.onresponse(data);
	}

	prop.result = $.extend(prop.result, data);

	// send next request if prop.items is not yet empty
	var item = prop._items.shift();
	if (item !== undefined) {
	prop.running++;
	prop.requests.push(this.multi_thread_send_request(prop, item));
	}
	// trigger whendone callback and mark this request as done
	else if (prop.running == 0) {
	if (prop.whendone && typeof prop.whendone == 'function') {
	prop.whendone(prop.result);
	}

	this.set_busy(false, '', prop.lock);

	// remove from this.http_request_jobs pool
	delete this.http_request_jobs[reqid];
	}
	};

	// abort a running multi-thread request with the given identifier
	this.multi_thread_request_abort = function(reqid)
	{
	var prop = this.http_request_jobs[reqid];
	if (prop) {
	for (var i=0; prop.running > 0 && i < prop.requests.length; i++) {
	if (prop.requests[i].abort)
	prop.requests[i].abort();
	}

	prop.running = 0;
	prop.cancelled = true;
	this.set_busy(false, '', prop.lock);
	}
	};

	// post the given form to a hidden iframe
	this.async_upload_form = function(form, action, onload)
	{
	// create hidden iframe
	var ts = new Date().getTime(),
	frame_name = 'rcmupload' + ts,
	frame = this.async_upload_form_frame(frame_name);

	// upload progress support
	if (this.env.upload_progress_name) {
	var fname = this.env.upload_progress_name,
	field = $('input[name='+fname+']', form);

	if (!field.length) {
	field = $('<input>').attr({type: 'hidden', name: fname});
	field.prependTo(form);
	}

	field.val(ts);
	}

	// handle upload errors by parsing iframe content in onload
	frame.bind('load', {ts:ts}, onload);

	$(form).attr({
	target: frame_name,
	action: this.url(action, {_id: this.env.compose_id \|\| '', _uploadid: ts, _from: this.env.action}),
	method: 'POST'})
	.attr(form.encoding ? 'encoding' : 'enctype', 'multipart/form-data')
	.submit();

	return frame_name;
	};

	// create iframe element for files upload
	this.async_upload_form_frame = function(name)
	{
	return $('<iframe>').attr({name: name, style: 'border: none; width: 0; height: 0; visibility: hidden'})
	.appendTo(document.body);
	};

	// html5 file-drop API
	this.document_drag_hover = function(e, over)
	{
	e.preventDefault();
	$(this.gui_objects.filedrop)[(over?'addClass':'removeClass')]('active');
	};

	this.file_drag_hover = function(e, over)
	{
	e.preventDefault();
	e.stopPropagation();
	$(this.gui_objects.filedrop)[(over?'addClass':'removeClass')]('hover');
	};

	// handler when files are dropped to a designated area.
	// compose a multipart form data and submit it to the server
	this.file_dropped = function(e)
	{
	// abort event and reset UI
	this.file_drag_hover(e, false);

	// prepare multipart form data composition
	var files = e.target.files \|\| e.dataTransfer.files,
	formdata = window.FormData ? new FormData() : null,
	fieldname = (this.env.filedrop.fieldname \|\| '_file') + (this.env.filedrop.single ? '' : '[]'),
	boundary = '------multipartformboundary' + (new Date).getTime(),
	dashdash = '--', crlf = '\r\n',
	multipart = dashdash + boundary + crlf;

	if (!files \|\| !files.length)
	return;

	// inline function to submit the files to the server
	var submit_data = function() {
	var multiple = files.length > 1,
	ts = new Date().getTime(),
	content = '<span>' + (multiple ? ref.get_label('uploadingmany') : files[0].name) + '</span>';

	// add to attachments list
	if (!ref.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false }))
	ref.file_upload_id = ref.set_busy(true, 'uploading');

	// complete multipart content and post request
	multipart += dashdash + boundary + dashdash + crlf;

	$.ajax({
	type: 'POST',
	dataType: 'json',
	url: ref.url(ref.env.filedrop.action \|\| 'upload', {_id: ref.env.compose_id\|\|ref.env.cid\|\|'', _uploadid: ts, _remote: 1, _from: ref.env.action}),
	contentType: formdata ? false : 'multipart/form-data; boundary=' + boundary,
	processData: false,
	timeout: 0, // disable default timeout set in ajaxSetup()
	data: formdata \|\| multipart,
	headers: {'X-Roundcube-Request': ref.env.request_token},
	xhr: function() { var xhr = jQuery.ajaxSettings.xhr(); if (!formdata && xhr.sendAsBinary) xhr.send = xhr.sendAsBinary; return xhr; },
	success: function(data){ ref.http_response(data); },
	error: function(o, status, err) { ref.http_error(o, status, err, null, 'attachment'); }
	});
	};

	// get contents of all dropped files
	var last = this.env.filedrop.single ? 0 : files.length - 1;
	for (var j=0, i=0, f; j <= last && (f = files[i]); i++) {
	if (!f.name) f.name = f.fileName;
	if (!f.size) f.size = f.fileSize;
	if (!f.type) f.type = 'application/octet-stream';

	// file name contains non-ASCII characters, do UTF8-binary string conversion.
	if (!formdata && /[^\x20-\x7E]/.test(f.name))
	f.name_bin = unescape(encodeURIComponent(f.name));

	// filter by file type if requested
	if (this.env.filedrop.filter && !f.type.match(new RegExp(this.env.filedrop.filter))) {
	// TODO: show message to user
	continue;
	}

	// do it the easy way with FormData (FF 4+, Chrome 5+, Safari 5+)
	if (formdata) {
	formdata.append(fieldname, f);
	if (j == last)
	return submit_data();
	}
	// use FileReader supporetd by Firefox 3.6
	else if (window.FileReader) {
	var reader = new FileReader();

	// closure to pass file properties to async callback function
	reader.onload = (function(file, j) {
	return function(e) {
	multipart += 'Content-Disposition: form-data; name="' + fieldname + '"';
	multipart += '; filename="' + (f.name_bin \|\| file.name) + '"' + crlf;
	multipart += 'Content-Length: ' + file.size + crlf;
	multipart += 'Content-Type: ' + file.type + crlf + crlf;
	multipart += reader.result + crlf;
	multipart += dashdash + boundary + crlf;

	if (j == last) // we're done, submit the data
	return submit_data();
	}
	})(f,j);
	reader.readAsBinaryString(f);
	}
	// Firefox 3
	else if (f.getAsBinary) {
	multipart += 'Content-Disposition: form-data; name="' + fieldname + '"';
	multipart += '; filename="' + (f.name_bin \|\| f.name) + '"' + crlf;
	multipart += 'Content-Length: ' + f.size + crlf;
	multipart += 'Content-Type: ' + f.type + crlf + crlf;
	multipart += f.getAsBinary() + crlf;
	multipart += dashdash + boundary +crlf;

	if (j == last)
	return submit_data();
	}

	j++;
	}
	};

	// starts interval for keep-alive signal
	this.start_keepalive = function()
	{
	if (!this.env.session_lifetime \|\| this.env.framed \|\| this.env.extwin \|\| this.task == 'login' \|\| this.env.action == 'print')
	return;

	if (this._keepalive)
	clearInterval(this._keepalive);

	this._keepalive = setInterval(function(){ ref.keep_alive(); }, this.env.session_lifetime * 0.5 * 1000);
	};

	// starts interval for refresh signal
	this.start_refresh = function()
	{
	if (!this.env.refresh_interval \|\| this.env.framed \|\| this.env.extwin \|\| this.task == 'login' \|\| this.env.action == 'print')
	return;

	if (this._refresh)
	clearInterval(this._refresh);

	this._refresh = setInterval(function(){ ref.refresh(); }, this.env.refresh_interval * 1000);
	};

	// sends keep-alive signal
	this.keep_alive = function()
	{
	if (!this.busy)
	this.http_request('keep-alive');
	};

	// sends refresh signal
	this.refresh = function()
	{
	if (this.busy) {
	// try again after 10 seconds
	setTimeout(function(){ ref.refresh(); ref.start_refresh(); }, 10000);
	return;
	}

	var params = {}, lock = this.set_busy(true, 'refreshing');

	if (this.task == 'mail' && this.gui_objects.mailboxlist)
	params = this.check_recent_params();

	params._last = Math.floor(this.env.lastrefresh.getTime() / 1000);
	this.env.lastrefresh = new Date();

	// plugins should bind to 'requestrefresh' event to add own params
	this.http_post('refresh', params, lock);
	};

	// returns check-recent request parameters
	this.check_recent_params = function()
	{
	var params = {_mbox: this.env.mailbox};

	if (this.gui_objects.mailboxlist)
	params._folderlist = 1;
	if (this.gui_objects.quotadisplay)
	params._quota = 1;
	if (this.env.search_request)
	params._search = this.env.search_request;

	if (this.gui_objects.messagelist) {
	params._list = 1;

	// message uids for flag updates check
	params._uids = $.map(this.message_list.rows, function(row, uid) { return uid; }).join(',');
	}

	return params;
	};


	/********************************************************/
	/******* helper methods *******/
	/********************************************************/

	/**
	* Quote html entities
	*/
	this.quote_html = function(str)
	{
	return String(str).replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"');
	};

	// get window.opener.rcmail if available
	this.opener = function()
	{
	// catch Error: Permission denied to access property rcmail
	try {
	if (window.opener && !opener.closed && opener.rcmail)
	return opener.rcmail;
	}
	catch (e) {}
	};

	// check if we're in show mode or if we have a unique selection
	// and return the message uid
	this.get_single_uid = function()
	{
	var uid = this.env.uid \|\| (this.message_list ? this.message_list.get_single_selection() : null);
	var result = ref.triggerEvent('get_single_uid', { uid: uid });
	return result \|\| uid;
	};

	// same as above but for contacts
	this.get_single_cid = function()
	{
	var cid = this.env.cid \|\| (this.contact_list ? this.contact_list.get_single_selection() : null);
	var result = ref.triggerEvent('get_single_cid', { cid: cid });
	return result \|\| cid;
	};

	// get the IMP mailbox of the message with the given UID
	this.get_message_mailbox = function(uid)
	{
	var msg = this.env.messages ? this.env.messages[uid] : {};
	return msg.mbox \|\| this.env.mailbox;
	};

	// gets cursor position
	this.get_caret_pos = function(obj)
	{
	if (obj.selectionEnd !== undefined)
	return obj.selectionEnd;

	return obj.value.length;
	};

	// moves cursor to specified position
	this.set_caret_pos = function(obj, pos)
	{
	try {
	if (obj.setSelectionRange)
	obj.setSelectionRange(pos, pos);
	}
	catch(e) {} // catch Firefox exception if obj is hidden
	};

	// get selected text from an input field
	this.get_input_selection = function(obj)
	{
	var start = 0, end = 0, normalizedValue = '';

	if (typeof obj.selectionStart == "number" && typeof obj.selectionEnd == "number") {
	normalizedValue = obj.value;
	start = obj.selectionStart;
	end = obj.selectionEnd;
	}

	return {start: start, end: end, text: normalizedValue.substr(start, end-start)};
	};

	// disable/enable all fields of a form
	this.lock_form = function(form, lock)
	{
	if (!form \|\| !form.elements)
	return;

	var n, len, elm;

	if (lock)
	this.disabled_form_elements = [];

	for (n=0, len=form.elements.length; n<len; n++) {
	elm = form.elements[n];

	if (elm.type == 'hidden')
	continue;
	// remember which elem was disabled before lock
	if (lock && elm.disabled)
	this.disabled_form_elements.push(elm);
	else if (lock \|\| $.inArray(elm, this.disabled_form_elements) < 0)
	elm.disabled = lock;
	}
	};

	this.mailto_handler_uri = function()
	{
	return location.href.split('?')[0] + '?_task=mail&_action=compose&_to=%s';
	};

	this.register_protocol_handler = function(name)
	{
	try {
	window.navigator.registerProtocolHandler('mailto', this.mailto_handler_uri(), name);
	}
	catch(e) {
	this.display_message(String(e), 'error');
	}
	};

	this.check_protocol_handler = function(name, elem)
	{
	var nav = window.navigator;

	if (!nav \|\| (typeof nav.registerProtocolHandler != 'function')) {
	$(elem).addClass('disabled').click(function(){ return false; });
	}
	else if (typeof nav.isProtocolHandlerRegistered == 'function') {
	var status = nav.isProtocolHandlerRegistered('mailto', this.mailto_handler_uri());
	if (status)
	$(elem).parent().find('.mailtoprotohandler-status').html(status);
	}
	else {
	$(elem).click(function() { ref.register_protocol_handler(name); return false; });
	}
	};

	// Checks browser capabilities eg. PDF support, TIF support
	this.browser_capabilities_check = function()
	{
	if (!this.env.browser_capabilities)
	this.env.browser_capabilities = {};

	if (this.env.browser_capabilities.pdf === undefined)
	this.env.browser_capabilities.pdf = this.pdf_support_check();

	if (this.env.browser_capabilities.flash === undefined)
	this.env.browser_capabilities.flash = this.flash_support_check();

	if (this.env.browser_capabilities.tif === undefined)
	this.tif_support_check();
	};

	// Returns browser capabilities string
	this.browser_capabilities = function()
	{
	if (!this.env.browser_capabilities)
	return '';

	var n, ret = [];

	for (n in this.env.browser_capabilities)
	ret.push(n + '=' + this.env.browser_capabilities[n]);

	return ret.join();
	};

	this.tif_support_check = function()
	{
	var img = new Image();

	img.onload = function() { ref.env.browser_capabilities.tif = 1; };
	img.onerror = function() { ref.env.browser_capabilities.tif = 0; };
	- img.src = 'program/resources/blank.tif';
	+ img.src = this.assets_path('program/resources/blank.tif');
	};

	this.pdf_support_check = function()
	{
	var plugin = navigator.mimeTypes ? navigator.mimeTypes["application/pdf"] : {},
	plugins = navigator.plugins,
	len = plugins.length,
	regex = /Adobe Reader\|PDF\|Acrobat/i;

	if (plugin && plugin.enabledPlugin)
	return 1;

	if (window.ActiveXObject) {
	try {
	if (plugin = new ActiveXObject("AcroPDF.PDF"))
	return 1;
	}
	catch (e) {}
	try {
	if (plugin = new ActiveXObject("PDF.PdfCtrl"))
	return 1;
	}
	catch (e) {}
	}

	for (i=0; i<len; i++) {
	plugin = plugins[i];
	if (typeof plugin === 'String') {
	if (regex.test(plugin))
	return 1;
	}
	else if (plugin.name && regex.test(plugin.name))
	return 1;
	}

	return 0;
	};

	this.flash_support_check = function()
	{
	var plugin = navigator.mimeTypes ? navigator.mimeTypes["application/x-shockwave-flash"] : {};

	if (plugin && plugin.enabledPlugin)
	return 1;

	if (window.ActiveXObject) {
	try {
	if (plugin = new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))
	return 1;
	}
	catch (e) {}
	}

	return 0;
	};

	+ this.assets_path = function(path)
	+ {
	+ if (this.env.assets_path && !path.startsWith(this.env.assets_path)) {
	+ path = this.env.assets_path + path;
	+ }
	+
	+ return path;
	+ };
	+
	// Cookie setter
	this.set_cookie = function(name, value, expires)
	{
	setCookie(name, value, expires, this.env.cookie_path, this.env.cookie_domain, this.env.cookie_secure);
	};

	this.get_local_storage_prefix = function()
	{
	if (!this.local_storage_prefix)
	this.local_storage_prefix = 'roundcube.' + (this.env.user_id \|\| 'anonymous') + '.';

	return this.local_storage_prefix;
	};

	// wrapper for localStorage.getItem(key)
	this.local_storage_get_item = function(key, deflt, encrypted)
	{
	var item;

	// TODO: add encryption
	try {
	item = localStorage.getItem(this.get_local_storage_prefix() + key);
	}
	catch (e) { }

	return item !== null ? JSON.parse(item) : (deflt \|\| null);
	};

	// wrapper for localStorage.setItem(key, data)
	this.local_storage_set_item = function(key, data, encrypted)
	{
	// try/catch to handle no localStorage support, but also error
	// in Safari-in-private-browsing-mode where localStorage exists
	// but can't be used (#1489996)
	try {
	// TODO: add encryption
	localStorage.setItem(this.get_local_storage_prefix() + key, JSON.stringify(data));
	return true;
	}
	catch (e) {
	return false;
	}
	};

	// wrapper for localStorage.removeItem(key)
	this.local_storage_remove_item = function(key)
	{
	try {
	localStorage.removeItem(this.get_local_storage_prefix() + key);
	return true;
	}
	catch (e) {
	return false;
	}
	};
	} // end object rcube_webmail


	// some static methods
	rcube_webmail.long_subject_title = function(elem, indent)
	{
	if (!elem.title) {
	var $elem = $(elem);
	if ($elem.width() + (indent \|\| 0) * 15 > $elem.parent().width())
	elem.title = $elem.text();
	}
	};

	rcube_webmail.long_subject_title_ex = function(elem)
	{
	if (!elem.title) {
	var $elem = $(elem),
	txt = $.trim($elem.text()),
	tmp = $('<span>').text(txt)
	.css({'position': 'absolute', 'float': 'left', 'visibility': 'hidden',
	'font-size': $elem.css('font-size'), 'font-weight': $elem.css('font-weight')})
	.appendTo($('body')),
	w = tmp.width();

	tmp.remove();
	if (w + $('span.branch', $elem).width() * 15 > $elem.width())
	elem.title = txt;
	}
	};

	rcube_webmail.prototype.get_cookie = getCookie;

	// copy event engine prototype
	rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;
	rcube_webmail.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener;
	rcube_webmail.prototype.triggerEvent = rcube_event_engine.prototype.triggerEvent;
	diff --git a/program/js/editor.js b/program/js/editor.js
	index 3dac5f371..2fc3429ab 100644
	--- a/program/js/editor.js
	+++ b/program/js/editor.js
	@@ -1,785 +1,786 @@
	/**
	* Roundcube editor js library
	*
	* This file is part of the Roundcube Webmail client
	*
	* @licstart The following is the entire license notice for the
	* JavaScript code in this file.
	*
	* Copyright (c) 2006-2014, The Roundcube Dev Team
	*
	* The JavaScript code in this page is free software: you can
	* redistribute it and/or modify it under the terms of the GNU
	* General Public License (GNU GPL) as published by the Free Software
	* Foundation, either version 3 of the License, or (at your option)
	* any later version. The code is distributed WITHOUT ANY WARRANTY;
	* without even the implied warranty of MERCHANTABILITY or FITNESS
	* FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
	*
	* As additional permission under GNU GPL version 3 section 7, you
	* may distribute non-source (e.g., minimized or compacted) forms of
	* that code without the copy of the GNU GPL normally required by
	* section 4, provided you include this license notice and a URL
	* through which recipients can access the Corresponding Source.
	*
	* @licend The above is the entire license notice
	* for the JavaScript code in this file.
	*
	* @author Eric Stadtherr <estadtherr@gmail.com>
	* @author Aleksander Machniak <alec@alec.pl>
	*/

	/**
	* Roundcube Text Editor Widget class
	* @constructor
	*/
	function rcube_text_editor(config, id)
	{
	var ref = this,
	+ abs_url = location.href.replace(/[?#].*$/, '').replace(/\/$/, ''),
	conf = {
	selector: '#' + ($('#' + id).is('.mce_editor') ? id : 'fake-editor-id'),
	cache_suffix: 's=4010700',
	theme: 'modern',
	language: config.lang,
	- content_css: 'program/js/tinymce/roundcube/content.css',
	+ content_css: rcmail.assets_path('program/js/tinymce/roundcube/content.css'),
	menubar: false,
	statusbar: false,
	toolbar_items_size: 'small',
	extended_valid_elements: 'font[face\|size\|color\|style],span[id\|class\|align\|style]',
	relative_urls: false,
	remove_script_host: false,
	convert_urls: false, // #1486944
	image_description: false,
	paste_webkit_style: "color font-size font-family",
	paste_data_images: true,
	browser_spellcheck: true
	};

	// register spellchecker for plain text editor
	this.spellcheck_observer = function() {};
	if (config.spellchecker) {
	this.spellchecker = config.spellchecker;
	if (config.spellcheck_observer) {
	this.spellchecker.spelling_state_observer = this.spellcheck_observer = config.spellcheck_observer;
	}
	}

	// minimal editor
	if (config.mode == 'identity') {
	$.extend(conf, {
	plugins: 'autolink charmap code colorpicker hr image link paste tabfocus textcolor',
	toolbar: 'bold italic underline alignleft aligncenter alignright alignjustify'
	+ ' \| outdent indent charmap hr link unlink image code forecolor'
	+ ' \| fontselect fontsizeselect',
	file_browser_callback: function(name, url, type, win) { ref.file_browser_callback(name, url, type); },
	file_browser_callback_types: 'image'
	});
	}
	// full-featured editor
	else {
	$.extend(conf, {
	plugins: 'autolink charmap code colorpicker directionality emoticons link image media nonbreaking'
	+ ' paste table tabfocus textcolor searchreplace' + (config.spellcheck ? ' spellchecker' : ''),
	toolbar: 'bold italic underline \| alignleft aligncenter alignright alignjustify'
	+ ' \| bullist numlist outdent indent ltr rtl blockquote \| forecolor backcolor \| fontselect fontsizeselect'
	+ ' \| link unlink table \| emoticons charmap image media \| code searchreplace undo redo',
	- spellchecker_rpc_url: '../../../../../?_task=utils&_action=spell_html&_remote=1',
	+ spellchecker_rpc_url: abs_url + '/?_task=utils&_action=spell_html&_remote=1',
	spellchecker_language: rcmail.env.spell_lang,
	accessibility_focus: false,
	file_browser_callback: function(name, url, type, win) { ref.file_browser_callback(name, url, type); },
	// @todo: support more than image (types: file, image, media)
	file_browser_callback_types: 'image media'
	});
	}

	// support external configuration settings e.g. from skin
	if (window.rcmail_editor_settings)
	$.extend(conf, window.rcmail_editor_settings);

	conf.setup = function(ed) {
	ed.on('init', function(ed) { ref.init_callback(ed); });
	// add handler for spellcheck button state update
	ed.on('SpellcheckStart SpellcheckEnd', function(args) {
	ref.spellcheck_active = args.type == 'spellcheckstart';
	ref.spellcheck_observer();
	});
	ed.on('keypress', function() {
	rcmail.compose_type_activity++;
	});
	// secure spellchecker requests with Roundcube token
	tinymce.util.XHR.on('beforeSend', function(e) {
	e.xhr.setRequestHeader('X-Roundcube-Request', rcmail.env.request_token);
	});
	};

	// textarea identifier
	this.id = id;
	// reference to active editor (if in HTML mode)
	this.editor = null;

	tinymce.init(conf);

	// react to real individual tinyMCE editor init
	this.init_callback = function(event)
	{
	this.editor = event.target;

	if (rcmail.env.action != 'compose') {
	return;
	}

	var css = {},
	elem = rcube_find_object('_from'),
	fe = rcmail.env.compose_focus_elem;

	if (rcmail.env.default_font)
	css['font-family'] = rcmail.env.default_font;

	if (rcmail.env.default_font_size)
	css['font-size'] = rcmail.env.default_font_size;

	if (css['font-family'] \|\| css['font-size'])
	$(this.editor.getBody()).css(css);

	if (elem && elem.type == 'select-one') {
	// insert signature (only for the first time)
	if (!rcmail.env.identities_initialized)
	rcmail.change_identity(elem);

	// Focus previously focused element
	if (fe && fe.id != this.id) {
	// use setTimeout() for IE9 (#1488541)
	window.setTimeout(function() {
	window.focus(); // for WebKit (#1486674)
	fe.focus();
	}, 10);
	}
	}

	// set tabIndex and set focus to element that was focused before
	this.tabindex(fe && fe.id == this.id);
	// Trigger resize (needed for proper editor resizing in some browsers)
	window.setTimeout(function() { $(window).resize(); }, 100);
	};

	// set tabIndex on tinymce editor
	this.tabindex = function(focus)
	{
	if (rcmail.env.task == 'mail' && this.editor) {
	var textarea = this.editor.getElement(),
	node = this.editor.getContentAreaContainer().childNodes[0];

	if (textarea && node)
	node.tabIndex = textarea.tabIndex;
	if (focus)
	this.editor.getBody().focus();

	// find :prev and :next elements to get focus when tabbing away
	if (textarea.tabIndex > 0) {
	var x = null,
	editor = this.editor,
	tabfocus_elements = [':prev',':next'],
	el = tinymce.DOM.select('*[tabindex='+textarea.tabIndex+']:not(iframe)');
	tinymce.each(el, function(e, i) { if (e.id == editor.id) { x = i; return false; } });
	if (x !== null) {
	if (el[x-1] && el[x-1].id) {
	tabfocus_elements[0] = el[x-1].id;
	}
	if (el[x+1] && el[x+1].id) {
	tabfocus_elements[1] = el[x+1].id;
	}
	editor.settings.tabfocus_elements = tabfocus_elements.join(',');
	}
	}
	}
	};

	// switch html/plain mode
	this.toggle = function(ishtml, noconvert)
	{
	var curr, content, result,
	// these non-printable chars are not removed on text2html and html2text
	// we can use them as temp signature replacement
	sig_mark = "\u0002\u0003",
	input = $('#' + this.id),
	signature = rcmail.env.identity ? rcmail.env.signatures[rcmail.env.identity] : null,
	is_sig = signature && signature.text && signature.text.length > 1;

	// apply spellcheck changes if spell checker is active
	this.spellcheck_stop();

	if (ishtml) {
	content = input.val();

	// replace current text signature with temp mark
	if (is_sig)
	content = content.replace(signature.text, sig_mark);

	var init_editor = function(data) {
	// replace signature mark with html version of the signature
	if (is_sig)
	data = data.replace(sig_mark, '<div id="_rc_sig">' + signature.html + '</div>');

	input.val(data);
	tinymce.execCommand('mceAddEditor', false, ref.id);

	setTimeout(function() {
	if (ref.editor) {
	if (rcmail.env.default_font)
	$(ref.editor.getBody()).css('font-family', rcmail.env.default_font);
	// #1486593
	ref.tabindex(true);
	}
	}, 500);
	};

	// convert to html
	if (!noconvert) {
	result = rcmail.plain2html(content, init_editor);
	}
	else {
	init_editor(content);
	result = true;
	}
	}
	else if (this.editor) {
	if (is_sig) {
	// get current version of signature, we'll need it in
	// case of html2text conversion abort
	if (curr = this.editor.dom.get('_rc_sig'))
	curr = curr.innerHTML;

	// replace current signature with some non-printable characters
	// we use non-printable characters, because this replacement
	// is visible to the user
	// doing this after getContent() would be hard
	this.editor.dom.setHTML('_rc_sig', sig_mark);
	}

	// get html content
	content = this.editor.getContent();

	var init_plaintext = function(data) {
	tinymce.execCommand('mceRemoveEditor', false, ref.id);
	ref.editor = null;

	// replace signture mark with text version of the signature
	if (is_sig)
	data = data.replace(sig_mark, "\n" + signature.text);

	input.val(data).focus();
	};

	// convert html to text
	if (!noconvert) {
	result = rcmail.html2plain(content, init_plaintext);
	}
	else {
	init_plaintext(input.val());
	result = true;
	}

	// bring back current signature
	if (!result && curr)
	this.editor.dom.setHTML('_rc_sig', curr);
	}

	return result;
	};

	// start spellchecker
	this.spellcheck_start = function()
	{
	if (this.editor) {
	tinymce.execCommand('mceSpellCheck', true);
	this.spellcheck_observer();
	}
	else if (this.spellchecker && this.spellchecker.spellCheck) {
	this.spellchecker.spellCheck();
	}
	};

	// stop spellchecker
	this.spellcheck_stop = function()
	{
	var ed = this.editor;

	if (ed) {
	if (ed.plugins && ed.plugins.spellchecker && this.spellcheck_active) {
	ed.execCommand('mceSpellCheck', false);
	this.spellcheck_observer();
	}
	}
	else if (ed = this.spellchecker) {
	if (ed.state && ed.state != 'ready' && ed.state != 'no_error_found')
	$(ed.spell_span).trigger('click');
	}
	};

	// spellchecker state
	this.spellcheck_state = function()
	{
	var ed;

	if (this.editor)
	return this.spellcheck_active;
	else if ((ed = this.spellchecker) && ed.state)
	return ed.state != 'ready' && ed.state != 'no_error_found';
	};

	// resume spellchecking, highlight provided mispellings without a new ajax request
	this.spellcheck_resume = function(data)
	{
	var ed = this.editor;

	if (ed) {
	ed.plugins.spellchecker.markErrors(data);
	}
	else if (ed = this.spellchecker) {
	ed.prepare(false, true);
	ed.processData(data);
	}
	};

	// get selected (spellcheker) language
	this.get_language = function()
	{
	if (this.editor) {
	return this.editor.settings.spellchecker_language \|\| rcmail.env.spell_lang;
	}
	else if (this.spellchecker) {
	return GOOGIE_CUR_LANG;
	}
	};

	// set language for spellchecking
	this.set_language = function(lang)
	{
	var ed = this.editor;

	if (ed) {
	ed.settings.spellchecker_language = lang;
	}
	if (ed = this.spellchecker) {
	ed.setCurrentLanguage(lang);
	}
	};

	// replace selection with text snippet
	this.replace = function(text)
	{
	var ed = this.editor;

	// insert into tinymce editor
	if (ed) {
	ed.getWin().focus(); // correct focus in IE & Chrome
	ed.selection.setContent(rcmail.quote_html(text).replace(/\r?\n/g, '<br/>'), { format:'text' });
	}
	// replace selection in compose textarea
	else if (ed = rcube_find_object(this.id)) {
	var selection = $(ed).is(':focus') ? rcmail.get_input_selection(ed) : { start:0, end:0 },
	inp_value = ed.value;
	pre = inp_value.substring(0, selection.start),
	end = inp_value.substring(selection.end, inp_value.length);

	// insert response text
	ed.value = pre + text + end;

	// set caret after inserted text
	rcmail.set_caret_pos(ed, selection.start + text.length);
	ed.focus();
	}
	};

	// get selected text (if no selection returns all text) from the editor
	this.get_content = function(args)
	{
	var sigstart, ed = this.editor, text = '', strip = false,
	defaults = {refresh: true, selection: false, nosig: false, format: 'html'};

	args = $.extend(defaults, args);

	// apply spellcheck changes if spell checker is active
	if (args.refresh) {
	this.spellcheck_stop();
	}

	// get selected text from tinymce editor
	if (ed) {
	ed.getWin().focus(); // correct focus in IE & Chrome
	if (args.selection)
	text = ed.selection.getContent({format: args.format});

	if (!text) {
	text = ed.getContent({format: args.format});
	// @todo: strip signature in html mode
	strip = args.format == 'text';
	}
	}
	// get selected text from compose textarea
	else if (ed = rcube_find_object(this.id)) {
	if (args.selection && $(ed).is(':focus')) {
	text = rcmail.get_input_selection(ed).text;
	}

	if (!text) {
	text = ed.value;
	strip = true;
	}
	}

	// strip off signature
	// @todo: make this optional
	if (strip && args.nosig) {
	sigstart = text.indexOf('-- \n');
	if (sigstart > 0) {
	text = text.substring(0, sigstart);
	}
	}

	return text;
	};

	// change user signature text
	this.change_signature = function(id, show_sig)
	{
	var cursor_pos, p = -1,
	input_message = $('#' + this.id),
	message = input_message.val(),
	sig = rcmail.env.identity;

	if (!this.editor) { // plain text mode
	// remove the 'old' signature
	if (show_sig && sig && rcmail.env.signatures && rcmail.env.signatures[sig]) {
	sig = rcmail.env.signatures[sig].text;
	sig = sig.replace(/\r\n/g, '\n');

	p = rcmail.env.top_posting ? message.indexOf(sig) : message.lastIndexOf(sig);
	if (p >= 0)
	message = message.substring(0, p) + message.substring(p+sig.length, message.length);
	}
	// add the new signature string
	if (show_sig && rcmail.env.signatures && rcmail.env.signatures[id]) {
	sig = rcmail.env.signatures[id].text;
	sig = sig.replace(/\r\n/g, '\n');

	if (rcmail.env.top_posting) {
	if (p >= 0) { // in place of removed signature
	message = message.substring(0, p) + sig + message.substring(p, message.length);
	cursor_pos = p - 1;
	}
	else if (!message) { // empty message
	cursor_pos = 0;
	message = '\n\n' + sig;
	}
	else if (pos = rcmail.get_caret_pos(input_message.get(0))) { // at cursor position
	message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
	cursor_pos = pos;
	}
	else { // on top
	cursor_pos = 0;
	message = '\n\n' + sig + '\n\n' + message.replace(/^[\r\n]+/, '');
	}
	}
	else {
	message = message.replace(/[\r\n]+$/, '');
	cursor_pos = !rcmail.env.top_posting && message.length ? message.length+1 : 0;
	message += '\n\n' + sig;
	}
	}
	else
	cursor_pos = rcmail.env.top_posting ? 0 : message.length;

	input_message.val(message);

	// move cursor before the signature
	rcmail.set_caret_pos(input_message.get(0), cursor_pos);
	}
	else if (show_sig && rcmail.env.signatures) { // html
	var sigElem = this.editor.dom.get('_rc_sig');

	// Append the signature as a div within the body
	if (!sigElem) {
	var body = this.editor.getBody(),
	doc = this.editor.getDoc();

	sigElem = doc.createElement('div');
	sigElem.setAttribute('id', '_rc_sig');

	if (rcmail.env.top_posting) {
	// if no existing sig and top posting then insert at caret pos
	this.editor.getWin().focus(); // correct focus in IE & Chrome

	var node = this.editor.selection.getNode();
	if (node.nodeName == 'BODY') {
	// no real focus, insert at start
	body.insertBefore(sigElem, body.firstChild);
	body.insertBefore(doc.createElement('br'), body.firstChild);
	}
	else {
	body.insertBefore(sigElem, node.nextSibling);
	body.insertBefore(doc.createElement('br'), node.nextSibling);
	}
	}
	else {
	body.appendChild(sigElem);
	}
	}

	if (rcmail.env.signatures[id]) {
	sigElem.innerHTML = rcmail.env.signatures[id].html;
	}
	}
	};

	// trigger content save
	this.save = function()
	{
	if (this.editor) {
	this.editor.save();
	}
	};

	// focus the editing area
	this.focus = function()
	{
	(this.editor \|\| rcube_find_object(this.id)).focus();
	};

	// image selector
	this.file_browser_callback = function(field_name, url, type)
	{
	var i, elem, cancel, dialog, fn, list = [];

	// open image selector dialog
	dialog = this.editor.windowManager.open({
	title: rcmail.gettext('select' + type),
	width: 500,
	height: 300,
	html: '<div id="image-selector-list"><ul></ul></div>'
	+ '<div id="image-selector-form"><div id="image-upload-button" class="mce-widget mce-btn" role="button" tabindex="0"></div></div>',
	buttons: [{text: 'Cancel', onclick: function() { ref.file_browser_close(); }}]
	});

	rcmail.env.file_browser_field = field_name;
	rcmail.env.file_browser_type = type;

	// fill images list with available images
	for (i in rcmail.env.attachments) {
	if (elem = ref.file_browser_entry(i, rcmail.env.attachments[i])) {
	list.push(elem);
	}
	}

	if (list.length) {
	$('#image-selector-list > ul').append(list).find('li:first').focus();
	}

	// add hint about max file size (in dialog footer)
	$('div.mce-abs-end', dialog.getEl()).append($('<div class="hint">')
	.text($('div.hint', rcmail.gui_objects.uploadform).text()));

	// init upload button
	elem = $('#image-upload-button').append($('<span>').text(rcmail.gettext('add' + type)));
	cancel = elem.parents('.mce-panel').find('button:last').parent();

	// we need custom Tab key handlers, until we find out why
	// tabindex do not work here as expected
	elem.keydown(function(e) {
	if (e.which == 9) {
	// on Tab + Shift focus first file
	if (rcube_event.get_modifier(e) == SHIFT_KEY)
	$('#image-selector-list li:last').focus();
	// on Tab focus Cancel button
	else
	cancel.focus();

	return false;
	}
	});
	cancel.keydown(function(e) {
	if (e.which == 9) {
	// on Tab + Shift focus upload button
	if (rcube_event.get_modifier(e) == SHIFT_KEY)
	elem.focus();
	else
	$('#image-selector-list li:first').focus();

	return false;
	}
	});

	// enable (smart) upload button
	this.hack_file_input(elem, rcmail.gui_objects.uploadform);

	// enable drag-n-drop area
	if ((window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary) \|\| window.FormData) {
	if (!rcmail.env.filedrop) {
	rcmail.env.filedrop = {};
	}
	if (rcmail.gui_objects.filedrop) {
	rcmail.env.old_file_drop = rcmail.gui_objects.filedrop;
	}

	rcmail.gui_objects.filedrop = $('#image-selector-form');
	rcmail.gui_objects.filedrop.addClass('droptarget')
	.bind('dragover dragleave', function(e) {
	e.preventDefault();
	e.stopPropagation();
	$(this)[(e.type == 'dragover' ? 'addClass' : 'removeClass')]('hover');
	})
	.get(0).addEventListener('drop', function(e) { return rcmail.file_dropped(e); }, false);
	}

	// register handler for successful file upload
	if (!rcmail.env.file_dialog_event) {
	rcmail.env.file_dialog_event = true;
	rcmail.addEventListener('fileuploaded', function(attr) {
	var elem;
	if (elem = ref.file_browser_entry(attr.name, attr.attachment)) {
	$('#image-selector-list > ul').prepend(elem);
	elem.focus();
	}
	});
	}

	// @todo: upload progress indicator
	};

	// close file browser window
	this.file_browser_close = function(url)
	{
	var input = $('#' + rcmail.env.file_browser_field);

	if (url)
	input.val(url);

	this.editor.windowManager.close();

	input.focus();

	if (rcmail.env.old_file_drop)
	rcmail.gui_objects.filedrop = rcmail.env.old_file_drop;
	};

	// creates file browser entry
	this.file_browser_entry = function(file_id, file)
	{
	if (!file.complete \|\| !file.mimetype) {
	return;
	}

	if (rcmail.file_upload_id) {
	rcmail.set_busy(false, null, rcmail.file_upload_id);
	}

	var rx, img_src;

	switch (rcmail.env.file_browser_type) {
	case 'image':
	rx = /^image\//i;
	break;

	case 'media':
	rx = /^video\//i;
	img_src = 'program/js/tinymce/roundcube/video.png';
	break;

	default:
	return;
	}

	if (rx.test(file.mimetype)) {
	var path = rcmail.env.comm_path + '&_from=' + rcmail.env.action,
	action = rcmail.env.compose_id ? '&_id=' + rcmail.env.compose_id + '&_action=display-attachment' : '&_action=upload-display',
	href = path + action + '&_file=' + file_id,
	img = $('<img>').attr({title: file.name, src: img_src ? img_src : href + '&_thumbnail=1'});

	return $('<li>').attr({tabindex: 0})
	.data('url', href)
	.append($('<span class="img">').append(img))
	.append($('<span class="name">').text(file.name))
	.click(function() { ref.file_browser_close($(this).data('url')); })
	.keydown(function(e) {
	if (e.which == 13) {
	ref.file_browser_close($(this).data('url'));
	}
	// we need custom Tab key handlers, until we find out why
	// tabindex do not work here as expected
	else if (e.which == 9) {
	if (rcube_event.get_modifier(e) == SHIFT_KEY) {
	if (!$(this).prev().focus().length)
	$('#image-upload-button').parents('.mce-panel').find('button:last').parent().focus();
	}
	else {
	if (!$(this).next().focus().length)
	$('#image-upload-button').focus();
	}

	return false;
	}
	});
	}
	};

	// create smart files upload button
	this.hack_file_input = function(elem, clone_form)
	{
	var link = $(elem),
	file = $('<input>').attr('name', '_file[]'),
	form = $('<form>').attr({method: 'post', enctype: 'multipart/form-data'}),
	offset = link.offset();

	// clone existing upload form
	if (clone_form) {
	file.attr('name', $('input[type="file"]', clone_form).attr('name'));
	form.attr('action', $(clone_form).attr('action'))
	.append($('<input>').attr({type: 'hidden', name: '_token', value: rcmail.env.request_token}));
	}

	function move_file_input(e) {
	file.css({top: (e.pageY - offset.top - 10) + 'px', left: (e.pageX - offset.left - 10) + 'px'});
	}

	file.attr({type: 'file', multiple: 'multiple', size: 5, title: '', tabindex: -1})
	.change(function() { rcmail.upload_file(form, 'upload'); })
	.click(function() { setTimeout(function() { link.mouseleave(); }, 20); })
	// opacity:0 does the trick, display/visibility doesn't work
	.css({opacity: 0, cursor: 'pointer', position: 'relative', outline: 'none'})
	.appendTo(form);

	// In FF and IE we need to move the browser file-input's button under the cursor
	// Thanks to the size attribute above we know the length of the input field
	if (navigator.userAgent.match(/Firefox\|MSIE/))
	file.css({marginLeft: '-80px'});

	// Note: now, I observe problem with cursor style on FF < 4 only
	link.css({overflow: 'hidden', cursor: 'pointer'})
	.mouseenter(function() { this.__active = true; })
	// place button under the cursor
	.mousemove(function(e) {
	if (this.__active)
	move_file_input(e);
	// move the input away if button is disabled
	else
	$(this).mouseleave();
	})
	.mouseleave(function() {
	file.css({top: '-10000px', left: '-10000px'});
	this.__active = false;
	})
	.click(function(e) {
	// forward click if mouse-enter event was missed
	if (!this.__active) {
	this.__active = true;
	move_file_input(e);
	file.trigger(e);
	}
	})
	.keydown(function(e) {
	if (e.which == 13) file.trigger('click');
	})
	.mouseleave()
	.append(form);
	};
	}
	diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
	index 689823fcb..547e2b4ac 100644
	--- a/program/lib/Roundcube/rcube.php
	+++ b/program/lib/Roundcube/rcube.php
	@@ -1,1709 +1,1819 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-2014, The Roundcube Dev Team \|
	\| Copyright (C) 2011-2014, Kolab Systems AG \|
	\| \|
	\| 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. \|
	\| \|
	\| PURPOSE: \|
	\| Framework base class providing core functions and holding \|
	\| instances of all 'global' objects like db- and storage-connections \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Base class of the Roundcube Framework
	* implemented as singleton
	*
	* @package Framework
	* @subpackage Core
	*/
	class rcube
	{
	- const INIT_WITH_DB = 1;
	+ // Init options
	+ const INIT_WITH_DB = 1;
	const INIT_WITH_PLUGINS = 2;

	+ // Request status
	+ const REQUEST_VALID = 0;
	+ const REQUEST_ERROR_URL = 1;
	+ const REQUEST_ERROR_TOKEN = 2;
	+
	/**
	* Singleton instace of rcube
	*
	* @var rcube
	*/
	static protected $instance;

	/**
	* Stores instance of rcube_config.
	*
	* @var rcube_config
	*/
	public $config;

	/**
	* Instace of database class.
	*
	* @var rcube_db
	*/
	public $db;

	/**
	* Instace of Memcache class.
	*
	* @var Memcache
	*/
	public $memcache;

	/**
	* Instace of rcube_session class.
	*
	* @var rcube_session
	*/
	public $session;

	/**
	* Instance of rcube_smtp class.
	*
	* @var rcube_smtp
	*/
	public $smtp;

	/**
	* Instance of rcube_storage class.
	*
	* @var rcube_storage
	*/
	public $storage;

	/**
	* Instance of rcube_output class.
	*
	* @var rcube_output
	*/
	public $output;

	/**
	* Instance of rcube_plugin_api.
	*
	* @var rcube_plugin_api
	*/
	public $plugins;

	/**
	* Instance of rcube_user class.
	*
	* @var rcube_user
	*/
	public $user;

	+ /**
	+ * Request status
	+ *
	+ * @var int
	+ */
	+ public $request_status = 0;

	/* private/protected vars */
	protected $texts;
	protected $caches = array();
	protected $shutdown_functions = array();


	/**
	* This implements the 'singleton' design pattern
	*
	* @param integer Options to initialize with this instance. See rcube::INIT_WITH_* constants
	* @param string Environment name to run (e.g. live, dev, test)
	*
	* @return rcube The one and only instance
	*/
	static function get_instance($mode = 0, $env = '')
	{
	if (!self::$instance) {
	self::$instance = new rcube($env);
	self::$instance->init($mode);
	}

	return self::$instance;
	}


	/**
	* Private constructor
	*/
	protected function __construct($env = '')
	{
	// load configuration
	$this->config = new rcube_config($env);
	$this->plugins = new rcube_dummy_plugin_api;

	register_shutdown_function(array($this, 'shutdown'));
	}


	/**
	* Initial startup function
	*/
	protected function init($mode = 0)
	{
	// initialize syslog
	if ($this->config->get('log_driver') == 'syslog') {
	$syslog_id = $this->config->get('syslog_id', 'roundcube');
	$syslog_facility = $this->config->get('syslog_facility', LOG_USER);
	openlog($syslog_id, LOG_ODELAY, $syslog_facility);
	}

	// connect to database
	if ($mode & self::INIT_WITH_DB) {
	$this->get_dbh();
	}

	// create plugin API and load plugins
	if ($mode & self::INIT_WITH_PLUGINS) {
	$this->plugins = rcube_plugin_api::get_instance();
	}
	}


	/**
	* Get the current database connection
	*
	* @return rcube_db Database object
	*/
	public function get_dbh()
	{
	if (!$this->db) {
	$this->db = rcube_db::factory(
	$this->config->get('db_dsnw'),
	$this->config->get('db_dsnr'),
	$this->config->get('db_persistent')
	);

	$this->db->set_debug((bool)$this->config->get('sql_debug'));
	}

	return $this->db;
	}


	/**
	* Get global handle for memcache access
	*
	* @return object Memcache
	*/
	public function get_memcache()
	{
	if (!isset($this->memcache)) {
	// no memcache support in PHP
	if (!class_exists('Memcache')) {
	$this->memcache = false;
	return false;
	}

	$this->memcache = new Memcache;
	$this->mc_available = 0;

	// add all configured hosts to pool
	$pconnect = $this->config->get('memcache_pconnect', true);
	foreach ($this->config->get('memcache_hosts', array()) as $host) {
	if (substr($host, 0, 7) != 'unix://') {
	list($host, $port) = explode(':', $host);
	if (!$port) $port = 11211;
	}
	else {
	$port = 0;
	}

	$this->mc_available += intval($this->memcache->addServer(
	$host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure')));
	}

	// test connection and failover (will result in $this->mc_available == 0 on complete failure)
	$this->memcache->increment('__CONNECTIONTEST__', 1); // NOP if key doesn't exist

	if (!$this->mc_available) {
	$this->memcache = false;
	}
	}

	return $this->memcache;
	}


	/**
	* Callback for memcache failure
	*/
	public function memcache_failure($host, $port)
	{
	static $seen = array();

	// only report once
	if (!$seen["$host:$port"]++) {
	$this->mc_available--;
	self::raise_error(array(
	'code' => 604, 'type' => 'db',
	'line' => __LINE__, 'file' => __FILE__,
	'message' => "Memcache failure on host $host:$port"),
	true, false);
	}
	}


	/**
	* Initialize and get cache object
	*
	* @param string $name Cache identifier
	* @param string $type Cache type ('db', 'apc' or 'memcache')
	* @param string $ttl Expiration time for cache items
	* @param bool $packed Enables/disables data serialization
	*
	* @return rcube_cache Cache object
	*/
	public function get_cache($name, $type='db', $ttl=0, $packed=true)
	{
	if (!isset($this->caches[$name]) && ($userid = $this->get_user_id())) {
	$this->caches[$name] = new rcube_cache($type, $userid, $name, $ttl, $packed);
	}

	return $this->caches[$name];
	}


	/**
	* Initialize and get shared cache object
	*
	* @param string $name Cache identifier
	* @param bool $packed Enables/disables data serialization
	*
	* @return rcube_cache_shared Cache object
	*/
	public function get_cache_shared($name, $packed=true)
	{
	$shared_name = "shared_$name";

	if (!array_key_exists($shared_name, $this->caches)) {
	$opt = strtolower($name) . '_cache';
	$type = $this->config->get($opt);
	$ttl = $this->config->get($opt . '_ttl');

	if (!$type) {
	// cache is disabled
	return $this->caches[$shared_name] = null;
	}

	if ($ttl === null) {
	$ttl = $this->config->get('shared_cache_ttl', '10d');
	}

	$this->caches[$shared_name] = new rcube_cache_shared($type, $name, $ttl, $packed);
	}

	return $this->caches[$shared_name];
	}


	/**
	* Create SMTP object and connect to server
	*
	* @param boolean True if connection should be established
	*/
	public function smtp_init($connect = false)
	{
	$this->smtp = new rcube_smtp();

	if ($connect) {
	$this->smtp->connect();
	}
	}


	/**
	* Initialize and get storage object
	*
	* @return rcube_storage Storage object
	*/
	public function get_storage()
	{
	// already initialized
	if (!is_object($this->storage)) {
	$this->storage_init();
	}

	return $this->storage;
	}


	/**
	* Initialize storage object
	*/
	public function storage_init()
	{
	// already initialized
	if (is_object($this->storage)) {
	return;
	}

	$driver = $this->config->get('storage_driver', 'imap');
	$driver_class = "rcube_{$driver}";

	if (!class_exists($driver_class)) {
	self::raise_error(array(
	'code' => 700, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Storage driver class ($driver) not found!"),
	true, true);
	}

	// Initialize storage object
	$this->storage = new $driver_class;

	// for backward compat. (deprecated, will be removed)
	$this->imap = $this->storage;

	// set class options
	$options = array(
	'auth_type' => $this->config->get("{$driver}_auth_type", 'check'),
	'auth_cid' => $this->config->get("{$driver}_auth_cid"),
	'auth_pw' => $this->config->get("{$driver}_auth_pw"),
	'debug' => (bool) $this->config->get("{$driver}_debug"),
	'force_caps' => (bool) $this->config->get("{$driver}_force_caps"),
	'disabled_caps' => $this->config->get("{$driver}_disabled_caps"),
	'socket_options' => $this->config->get("{$driver}_conn_options"),
	'timeout' => (int) $this->config->get("{$driver}_timeout"),
	'skip_deleted' => (bool) $this->config->get('skip_deleted'),
	'driver' => $driver,
	);

	if (!empty($_SESSION['storage_host'])) {
	$options['host'] = $_SESSION['storage_host'];
	$options['user'] = $_SESSION['username'];
	$options['port'] = $_SESSION['storage_port'];
	$options['ssl'] = $_SESSION['storage_ssl'];
	$options['password'] = $this->decrypt($_SESSION['password']);
	$_SESSION[$driver.'_host'] = $_SESSION['storage_host'];
	}

	$options = $this->plugins->exec_hook("storage_init", $options);

	// for backward compat. (deprecated, to be removed)
	$options = $this->plugins->exec_hook("imap_init", $options);

	$this->storage->set_options($options);
	$this->set_storage_prop();

	// subscribe to 'storage_connected' hook for session logging
	if ($this->config->get('imap_log_session', false)) {
	$this->plugins->register_hook('storage_connected', array($this, 'storage_log_session'));
	}
	}

	/**
	* Set storage parameters.
	*/
	protected function set_storage_prop()
	{
	$storage = $this->get_storage();

	// set pagesize from config
	$pagesize = $this->config->get('mail_pagesize');
	if (!$pagesize) {
	$pagesize = $this->config->get('pagesize', 50);
	}

	$storage->set_pagesize($pagesize);
	$storage->set_charset($this->config->get('default_charset', RCUBE_CHARSET));

	// enable caching of mail data
	$driver = $this->config->get('storage_driver', 'imap');
	$storage_cache = $this->config->get("{$driver}_cache");
	$messages_cache = $this->config->get('messages_cache');
	// for backward compatybility
	if ($storage_cache === null && $messages_cache === null && $this->config->get('enable_caching')) {
	$storage_cache = 'db';
	$messages_cache = true;
	}

	if ($storage_cache) {
	$storage->set_caching($storage_cache);
	}
	if ($messages_cache) {
	$storage->set_messages_caching(true);
	}
	}


	/**
	* Set special folders type association.
	* This must be done AFTER connecting to the server!
	*/
	protected function set_special_folders()
	{
	$storage = $this->get_storage();
	$folders = $storage->get_special_folders(true);
	$prefs = array();

	// check SPECIAL-USE flags on IMAP folders
	foreach ($folders as $type => $folder) {
	$idx = $type . '_mbox';
	if ($folder !== $this->config->get($idx)) {
	$prefs[$idx] = $folder;
	}
	}

	// Some special folders differ, update user preferences
	if (!empty($prefs) && $this->user) {
	$this->user->save_prefs($prefs);
	}

	// create default folders (on login)
	if ($this->config->get('create_default_folders')) {
	$storage->create_default_folders();
	}
	}


	/**
	* Callback for IMAP connection events to log session identifiers
	*/
	public function storage_log_session($args)
	{
	if (!empty($args['session']) && session_id()) {
	$this->write_log('imap_session', $args['session']);
	}
	}

	/**
	* Create session object and start the session.
	*/
	public function session_init()
	{
	// session started (Installer?)
	if (session_id()) {
	return;
	}

	$sess_name = $this->config->get('session_name');
	$sess_domain = $this->config->get('session_domain');
	$sess_path = $this->config->get('session_path');
	$lifetime = $this->config->get('session_lifetime', 0) * 60;
	$is_secure = $this->config->get('use_https') \|\| rcube_utils::https_check();

	// set session domain
	if ($sess_domain) {
	ini_set('session.cookie_domain', $sess_domain);
	}
	// set session path
	if ($sess_path) {
	ini_set('session.cookie_path', $sess_path);
	}
	// set session garbage collecting time according to session_lifetime
	if ($lifetime) {
	ini_set('session.gc_maxlifetime', $lifetime * 2);
	}

	ini_set('session.cookie_secure', $is_secure);
	ini_set('session.name', $sess_name ? $sess_name : 'roundcube_sessid');
	ini_set('session.use_cookies', 1);
	ini_set('session.use_only_cookies', 1);
	ini_set('session.cookie_httponly', 1);

	// use database for storing session data
	$this->session = new rcube_session($this->get_dbh(), $this->config);

	$this->session->register_gc_handler(array($this, 'gc'));
	$this->session->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
	$this->session->set_ip_check($this->config->get('ip_check'));

	if ($this->config->get('session_auth_name')) {
	$this->session->set_cookiename($this->config->get('session_auth_name'));
	}

	// start PHP session (if not in CLI mode)
	if ($_SERVER['REMOTE_ADDR']) {
	$this->session->start();
	}
	}


	/**
	* Garbage collector - cache/temp cleaner
	*/
	public function gc()
	{
	rcube_cache::gc();
	rcube_cache_shared::gc();
	$this->get_storage()->cache_gc();

	$this->gc_temp();
	}


	/**
	* Garbage collector function for temp files.
	* Remove temp files older than two days
	*/
	public function gc_temp()
	{
	$tmp = unslashify($this->config->get('temp_dir'));

	// expire in 48 hours by default
	$temp_dir_ttl = $this->config->get('temp_dir_ttl', '48h');
	$temp_dir_ttl = get_offset_sec($temp_dir_ttl);
	if ($temp_dir_ttl < 6*3600)
	$temp_dir_ttl = 6*3600; // 6 hours sensible lower bound.

	$expire = time() - $temp_dir_ttl;

	if ($tmp && ($dir = opendir($tmp))) {
	while (($fname = readdir($dir)) !== false) {
	if ($fname[0] == '.') {
	continue;
	}

	if (@filemtime($tmp.'/'.$fname) < $expire) {
	@unlink($tmp.'/'.$fname);
	}
	}

	closedir($dir);
	}
	}


	/**
	* Runs garbage collector with probability based on
	* session settings. This is intended for environments
	* without a session.
	*/
	public function gc_run()
	{
	$probability = (int) ini_get('session.gc_probability');
	$divisor = (int) ini_get('session.gc_divisor');

	if ($divisor > 0 && $probability > 0) {
	$random = mt_rand(1, $divisor);
	if ($random <= $probability) {
	$this->gc();
	}
	}
	}


	/**
	* Get localized text in the desired language
	*
	* @param mixed $attrib Named parameters array or label name
	* @param string $domain Label domain (plugin) name
	*
	* @return string Localized text
	*/
	public function gettext($attrib, $domain=null)
	{
	// load localization files if not done yet
	if (empty($this->texts)) {
	$this->load_language();
	}

	// extract attributes
	if (is_string($attrib)) {
	$attrib = array('name' => $attrib);
	}

	$name = $attrib['name'] ? $attrib['name'] : '';

	// attrib contain text values: use them from now
	if (($setval = $attrib[strtolower($_SESSION['language'])]) \|\| ($setval = $attrib['en_us'])) {
	$this->texts[$name] = $setval;
	}

	// check for text with domain
	if ($domain && ($text = $this->texts[$domain.'.'.$name])) {
	}
	// text does not exist
	else if (!($text = $this->texts[$name])) {
	return "[$name]";
	}

	// replace vars in text
	if (is_array($attrib['vars'])) {
	foreach ($attrib['vars'] as $var_key => $var_value) {
	$text = str_replace($var_key[0]!='$' ? '$'.$var_key : $var_key, $var_value, $text);
	}
	}

	// format output
	if (($attrib['uppercase'] && strtolower($attrib['uppercase'] == 'first')) \|\| $attrib['ucfirst']) {
	return ucfirst($text);
	}
	else if ($attrib['uppercase']) {
	return mb_strtoupper($text);
	}
	else if ($attrib['lowercase']) {
	return mb_strtolower($text);
	}

	return strtr($text, array('\n' => "\n"));
	}


	/**
	* Check if the given text label exists
	*
	* @param string $name Label name
	* @param string $domain Label domain (plugin) name or '*' for all domains
	* @param string $ref_domain Sets domain name if label is found
	*
	* @return boolean True if text exists (either in the current language or in en_US)
	*/
	public function text_exists($name, $domain = null, &$ref_domain = null)
	{
	// load localization files if not done yet
	if (empty($this->texts)) {
	$this->load_language();
	}

	if (isset($this->texts[$name])) {
	$ref_domain = '';
	return true;
	}

	// any of loaded domains (plugins)
	if ($domain == '*') {
	foreach ($this->plugins->loaded_plugins() as $domain) {
	if (isset($this->texts[$domain.'.'.$name])) {
	$ref_domain = $domain;
	return true;
	}
	}
	}
	// specified domain
	else if ($domain) {
	$ref_domain = $domain;
	return isset($this->texts[$domain.'.'.$name]);
	}

	return false;
	}


	/**
	* Load a localization package
	*
	* @param string $lang Language ID
	* @param array $add Additional text labels/messages
	* @param array $merge Additional text labels/messages to merge
	*/
	public function load_language($lang = null, $add = array(), $merge = array())
	{
	$lang = $this->language_prop(($lang ? $lang : $_SESSION['language']));

	// load localized texts
	if (empty($this->texts) \|\| $lang != $_SESSION['language']) {
	$this->texts = array();

	// handle empty lines after closing PHP tag in localization files
	ob_start();

	// get english labels (these should be complete)
	@include(RCUBE_LOCALIZATION_DIR . 'en_US/labels.inc');
	@include(RCUBE_LOCALIZATION_DIR . 'en_US/messages.inc');

	if (is_array($labels))
	$this->texts = $labels;
	if (is_array($messages))
	$this->texts = array_merge($this->texts, $messages);

	// include user language files
	if ($lang != 'en' && $lang != 'en_US' && is_dir(RCUBE_LOCALIZATION_DIR . $lang)) {
	include_once(RCUBE_LOCALIZATION_DIR . $lang . '/labels.inc');
	include_once(RCUBE_LOCALIZATION_DIR . $lang . '/messages.inc');

	if (is_array($labels))
	$this->texts = array_merge($this->texts, $labels);
	if (is_array($messages))
	$this->texts = array_merge($this->texts, $messages);
	}

	ob_end_clean();

	$_SESSION['language'] = $lang;
	}

	// append additional texts (from plugin)
	if (is_array($add) && !empty($add)) {
	$this->texts += $add;
	}

	// merge additional texts (from plugin)
	if (is_array($merge) && !empty($merge)) {
	$this->texts = array_merge($this->texts, $merge);
	}
	}


	/**
	* Check the given string and return a valid language code
	*
	* @param string Language code
	*
	* @return string Valid language code
	*/
	protected function language_prop($lang)
	{
	static $rcube_languages, $rcube_language_aliases;

	// user HTTP_ACCEPT_LANGUAGE if no language is specified
	if (empty($lang) \|\| $lang == 'auto') {
	$accept_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
	$lang = $accept_langs[0];

	if (preg_match('/^([a-z]+)[_-]([a-z]+)$/i', $lang, $m)) {
	$lang = $m[1] . '_' . strtoupper($m[2]);
	}
	}

	if (empty($rcube_languages)) {
	@include(RCUBE_LOCALIZATION_DIR . 'index.inc');
	}

	// check if we have an alias for that language
	if (!isset($rcube_languages[$lang]) && isset($rcube_language_aliases[$lang])) {
	$lang = $rcube_language_aliases[$lang];
	}
	// try the first two chars
	else if (!isset($rcube_languages[$lang])) {
	$short = substr($lang, 0, 2);

	// check if we have an alias for the short language code
	if (!isset($rcube_languages[$short]) && isset($rcube_language_aliases[$short])) {
	$lang = $rcube_language_aliases[$short];
	}
	// expand 'nn' to 'nn_NN'
	else if (!isset($rcube_languages[$short])) {
	$lang = $short.'_'.strtoupper($short);
	}
	}

	if (!isset($rcube_languages[$lang]) \|\| !is_dir(RCUBE_LOCALIZATION_DIR . $lang)) {
	$lang = 'en_US';
	}

	return $lang;
	}


	/**
	* Read directory program/localization and return a list of available languages
	*
	* @return array List of available localizations
	*/
	public function list_languages()
	{
	static $sa_languages = array();

	if (!sizeof($sa_languages)) {
	@include(RCUBE_LOCALIZATION_DIR . 'index.inc');

	if ($dh = @opendir(RCUBE_LOCALIZATION_DIR)) {
	while (($name = readdir($dh)) !== false) {
	if ($name[0] == '.' \|\| !is_dir(RCUBE_LOCALIZATION_DIR . $name)) {
	continue;
	}

	if ($label = $rcube_languages[$name]) {
	$sa_languages[$name] = $label;
	}
	}
	closedir($dh);
	}
	}

	return $sa_languages;
	}


	/**
	* Encrypt using 3DES
	*
	* @param string $clear clear text input
	* @param string $key encryption key to retrieve from the configuration, defaults to 'des_key'
	* @param boolean $base64 whether or not to base64_encode() the result before returning
	*
	* @return string encrypted text
	*/
	public function encrypt($clear, $key = 'des_key', $base64 = true)
	{
	if (!$clear) {
	return '';
	}

	/*-
	* Add a single canary byte to the end of the clear text, which
	* will help find out how much of padding will need to be removed
	* upon decryption; see http://php.net/mcrypt_generic#68082
	*/
	$clear = pack("a*H2", $clear, "80");
	$ckey = $this->config->get_crypto_key($key);

	if (function_exists('openssl_encrypt')) {
	$method = 'DES-EDE3-CBC';
	$opts = defined('OPENSSL_RAW_DATA') ? OPENSSL_RAW_DATA : true;
	$iv = $this->create_iv(openssl_cipher_iv_length($method));
	$cipher = $iv . openssl_encrypt($clear, $method, $ckey, $opts, $iv);
	}
	else if (function_exists('mcrypt_module_open') &&
	($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, ""))
	) {
	$iv = $this->create_iv(mcrypt_enc_get_iv_size($td));
	mcrypt_generic_init($td, $ckey, $iv);
	$cipher = $iv . mcrypt_generic($td, $clear);
	mcrypt_generic_deinit($td);
	mcrypt_module_close($td);
	}
	else {
	@include_once 'des.inc';

	if (function_exists('des')) {
	$des_iv_size = 8;
	$iv = $this->create_iv($des_iv_size);
	$cipher = $iv . des($ckey, $clear, 1, 1, $iv);
	}
	else {
	self::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not perform encryption; make sure OpenSSL or Mcrypt or lib/des.inc is available"
	), true, true);
	}
	}

	return $base64 ? base64_encode($cipher) : $cipher;
	}


	/**
	* Decrypt 3DES-encrypted string
	*
	* @param string $cipher encrypted text
	* @param string $key encryption key to retrieve from the configuration, defaults to 'des_key'
	* @param boolean $base64 whether or not input is base64-encoded
	*
	* @return string decrypted text
	*/
	public function decrypt($cipher, $key = 'des_key', $base64 = true)
	{
	if (!$cipher) {
	return '';
	}

	$cipher = $base64 ? base64_decode($cipher) : $cipher;
	$ckey = $this->config->get_crypto_key($key);

	if (function_exists('openssl_decrypt')) {
	$method = 'DES-EDE3-CBC';
	$opts = defined('OPENSSL_RAW_DATA') ? OPENSSL_RAW_DATA : true;
	$iv_size = openssl_cipher_iv_length($method);
	$iv = substr($cipher, 0, $iv_size);

	// session corruption? (#1485970)
	if (strlen($iv) < $iv_size) {
	return '';
	}

	$cipher = substr($cipher, $iv_size);
	$clear = openssl_decrypt($cipher, $method, $ckey, $opts, $iv);
	}
	else if (function_exists('mcrypt_module_open') &&
	($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, ""))
	) {
	$iv_size = mcrypt_enc_get_iv_size($td);
	$iv = substr($cipher, 0, $iv_size);

	// session corruption? (#1485970)
	if (strlen($iv) < $iv_size) {
	return '';
	}

	$cipher = substr($cipher, $iv_size);
	mcrypt_generic_init($td, $ckey, $iv);
	$clear = mdecrypt_generic($td, $cipher);
	mcrypt_generic_deinit($td);
	mcrypt_module_close($td);
	}
	else {
	@include_once 'des.inc';

	if (function_exists('des')) {
	$des_iv_size = 8;
	$iv = substr($cipher, 0, $des_iv_size);
	$cipher = substr($cipher, $des_iv_size);
	$clear = des($ckey, $cipher, 0, 1, $iv);
	}
	else {
	self::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not perform decryption; make sure OpenSSL or Mcrypt or lib/des.inc is available"
	), true, true);
	}
	}

	/*-
	* Trim PHP's padding and the canary byte; see note in
	* rcube::encrypt() and http://php.net/mcrypt_generic#68082
	*/
	$clear = substr(rtrim($clear, "\0"), 0, -1);

	return $clear;
	}


	/**
	* Generates encryption initialization vector (IV)
	*
	* @param int Vector size
	*
	* @return string Vector string
	*/
	private function create_iv($size)
	{
	// mcrypt_create_iv() can be slow when system lacks entrophy
	// we'll generate IV vector manually
	$iv = '';
	for ($i = 0; $i < $size; $i++) {
	$iv .= chr(mt_rand(0, 255));
	}

	return $iv;
	}


	+ /**
	+ * Returns session token for secure URLs
	+ *
	+ * @param bool $generate Generate token if not exists in session yet
	+ *
	+ * @return string\|bool Token string, False when disabled
	+ */
	+ public function get_secure_url_token($generate = false)
	+ {
	+ if ($len = $this->config->get('use_secure_urls')) {
	+ if (empty($_SESSION['secure_token']) && $generate) {
	+ // generate x characters long token
	+ $length = $len > 1 ? $len : 16;
	+ $token = openssl_random_pseudo_bytes($length / 2);
	+ $token = bin2hex($token);
	+
	+ $plugin = $this->plugins->exec_hook('secure_token',
	+ array('value' => $token, 'length' => $length));
	+
	+ $_SESSION['secure_token'] = $plugin['value'];
	+ }
	+
	+ return $_SESSION['secure_token'];
	+ }
	+
	+ return false;
	+ }
	+
	+
	+ /**
	+ * Generate a unique token to be used in a form request
	+ *
	+ * @return string The request token
	+ */
	+ public function get_request_token()
	+ {
	+ $sess_id = $_COOKIE[ini_get('session.name')];
	+ if (!$sess_id) {
	+ $sess_id = session_id();
	+ }
	+
	+ $plugin = $this->plugins->exec_hook('request_token', array(
	+ 'value' => md5('RT' . $this->get_user_id() . $this->config->get('des_key') . $sess_id)));
	+
	+ return $plugin['value'];
	+ }
	+
	+
	+ /**
	+ * Check if the current request contains a valid token.
	+ * Empty requests aren't checked until use_secure_urls is set.
	+ *
	+ * @param int Request method
	+ *
	+ * @return boolean True if request token is valid false if not
	+ */
	+ public function check_request($mode = rcube_utils::INPUT_POST)
	+ {
	+ // check secure token in URL if enabled
	+ if ($token = $this->get_secure_url_token()) {
	+ foreach (explode('/', preg_replace('/[?#&].*$/', '', $_SERVER['REQUEST_URI'])) as $tok) {
	+ if ($tok == $token) {
	+ return true;
	+ }
	+ }
	+
	+ $this->request_status = self::REQUEST_ERROR_URL;
	+
	+ return false;
	+ }
	+
	+ $sess_tok = $this->get_request_token();
	+
	+ // ajax requests
	+ if (rcube_utils::request_header('X-Roundcube-Request') == $sess_tok) {
	+ return true;
	+ }
	+
	+ // skip empty requests
	+ if (($mode == rcube_utils::INPUT_POST && empty($_POST))
	+ \|\| ($mode == rcube_utils::INPUT_GET && empty($_GET))
	+ ) {
	+ return true;
	+ }
	+
	+ // default method of securing requests
	+ $token = rcube_utils::get_input_value('_token', $mode);
	+ $sess_id = $_COOKIE[ini_get('session.name')];
	+
	+ if (empty($sess_id) \|\| $token != $sess_tok) {
	+ $this->request_status = self::REQUEST_ERROR_TOKEN;
	+ return false;
	+ }
	+
	+ return true;
	+ }
	+
	+
	/**
	* Build a valid URL to this instance of Roundcube
	*
	* @param mixed Either a string with the action or url parameters as key-value pairs
	* @return string Valid application URL
	*/
	public function url($p)
	{
	// STUB: should be overloaded by the application
	return '';
	}


	/**
	* Function to be executed in script shutdown
	* Registered with register_shutdown_function()
	*/
	public function shutdown()
	{
	foreach ($this->shutdown_functions as $function) {
	call_user_func($function);
	}

	// write session data as soon as possible and before
	// closing database connection, don't do this before
	// registered shutdown functions, they may need the session
	// Note: this will run registered gc handlers (ie. cache gc)
	if ($_SERVER['REMOTE_ADDR'] && is_object($this->session)) {
	$this->session->write_close();
	}

	if (is_object($this->smtp)) {
	$this->smtp->disconnect();
	}

	foreach ($this->caches as $cache) {
	if (is_object($cache)) {
	$cache->close();
	}
	}

	if (is_object($this->storage)) {
	$this->storage->close();
	}
	}


	/**
	* Registers shutdown function to be executed on shutdown.
	* The functions will be executed before destroying any
	* objects like smtp, imap, session, etc.
	*
	* @param callback Function callback
	*/
	public function add_shutdown_function($function)
	{
	$this->shutdown_functions[] = $function;
	}


	/**
	* Quote a given string.
	* Shortcut function for rcube_utils::rep_specialchars_output()
	*
	* @return string HTML-quoted string
	*/
	public static function Q($str, $mode = 'strict', $newlines = true)
	{
	return rcube_utils::rep_specialchars_output($str, 'html', $mode, $newlines);
	}


	/**
	* Quote a given string for javascript output.
	* Shortcut function for rcube_utils::rep_specialchars_output()
	*
	* @return string JS-quoted string
	*/
	public static function JQ($str)
	{
	return rcube_utils::rep_specialchars_output($str, 'js');
	}


	/**
	* Construct shell command, execute it and return output as string.
	* Keywords {keyword} are replaced with arguments
	*
	* @param $cmd Format string with {keywords} to be replaced
	* @param $values (zero, one or more arrays can be passed)
	*
	* @return output of command. shell errors not detectable
	*/
	public static function exec(/* $cmd, $values1 = array(), ... */)
	{
	$args = func_get_args();
	$cmd = array_shift($args);
	$values = $replacements = array();

	// merge values into one array
	foreach ($args as $arg) {
	$values += (array)$arg;
	}

	preg_match_all('/({(-?)([a-z]\w*)})/', $cmd, $matches, PREG_SET_ORDER);
	foreach ($matches as $tags) {
	list(, $tag, $option, $key) = $tags;
	$parts = array();

	if ($option) {
	foreach ((array)$values["-$key"] as $key => $value) {
	if ($value === true \|\| $value === false \|\| $value === null) {
	$parts[] = $value ? $key : "";
	}
	else {
	foreach ((array)$value as $val) {
	$parts[] = "$key " . escapeshellarg($val);
	}
	}
	}
	}
	else {
	foreach ((array)$values[$key] as $value) {
	$parts[] = escapeshellarg($value);
	}
	}

	$replacements[$tag] = join(" ", $parts);
	}

	// use strtr behaviour of going through source string once
	$cmd = strtr($cmd, $replacements);

	return (string)shell_exec($cmd);
	}


	/**
	* Print or write debug messages
	*
	* @param mixed Debug message or data
	*/
	public static function console()
	{
	$args = func_get_args();

	if (class_exists('rcube', false)) {
	$rcube = self::get_instance();
	$plugin = $rcube->plugins->exec_hook('console', array('args' => $args));
	if ($plugin['abort']) {
	return;
	}
	$args = $plugin['args'];
	}

	$msg = array();
	foreach ($args as $arg) {
	$msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
	}

	self::write_log('console', join(";\n", $msg));
	}


	/**
	* Append a line to a logfile in the logs directory.
	* Date will be added automatically to the line.
	*
	* @param $name name of log file
	* @param line Line to append
	*/
	public static function write_log($name, $line)
	{
	if (!is_string($line)) {
	$line = var_export($line, true);
	}

	$date_format = $log_driver = $session_key = null;
	if (self::$instance) {
	$date_format = self::$instance->config->get('log_date_format');
	$log_driver = self::$instance->config->get('log_driver');
	$session_key = intval(self::$instance->config->get('log_session_id', 8));
	}

	if (empty($date_format)) {
	$date_format = 'd-M-Y H:i:s O';
	}

	$date = date($date_format);

	// trigger logging hook
	if (is_object(self::$instance) && is_object(self::$instance->plugins)) {
	$log = self::$instance->plugins->exec_hook('write_log', array('name' => $name, 'date' => $date, 'line' => $line));
	$name = $log['name'];
	$line = $log['line'];
	$date = $log['date'];
	if ($log['abort'])
	return true;
	}

	// add session ID to the log
	if ($session_key > 0 && ($sess = session_id())) {
	$line = '<' . substr($sess, 0, $session_key) . '> ' . $line;
	}

	if ($log_driver == 'syslog') {
	$prio = $name == 'errors' ? LOG_ERR : LOG_INFO;
	syslog($prio, $line);
	return true;
	}

	// log_driver == 'file' is assumed here

	$line = sprintf("[%s]: %s\n", $date, $line);
	$log_dir = null;

	// per-user logging is activated
	if (self::$instance && self::$instance->config->get('per_user_logging', false) && self::$instance->get_user_id()) {
	$log_dir = self::$instance->get_user_log_dir();
	if (empty($log_dir))
	return false;
	}
	else if (!empty($log['dir'])) {
	$log_dir = $log['dir'];
	}
	else if (self::$instance) {
	$log_dir = self::$instance->config->get('log_dir');
	}

	if (empty($log_dir)) {
	$log_dir = RCUBE_INSTALL_PATH . 'logs';
	}

	// try to open specific log file for writing
	$logfile = $log_dir.'/'.$name;

	if ($fp = @fopen($logfile, 'a')) {
	fwrite($fp, $line);
	fflush($fp);
	fclose($fp);
	return true;
	}

	trigger_error("Error writing to log file $logfile; Please check permissions", E_USER_WARNING);
	return false;
	}


	/**
	* Throw system error (and show error page).
	*
	* @param array Named parameters
	* - code: Error code (required)
	* - type: Error type [php\|db\|imap\|javascript] (required)
	* - message: Error message
	* - file: File where error occurred
	* - line: Line where error occurred
	* @param boolean True to log the error
	* @param boolean Terminate script execution
	*/
	public static function raise_error($arg = array(), $log = false, $terminate = false)
	{
	// handle PHP exceptions
	if (is_object($arg) && is_a($arg, 'Exception')) {
	$arg = array(
	'code' => $arg->getCode(),
	'line' => $arg->getLine(),
	'file' => $arg->getFile(),
	'message' => $arg->getMessage(),
	);
	}
	else if (is_string($arg)) {
	$arg = array('message' => $arg);
	}

	if (empty($arg['code'])) {
	$arg['code'] = 500;
	}

	// installer
	if (class_exists('rcmail_install', false)) {
	$rci = rcmail_install::get_instance();
	$rci->raise_error($arg);
	return;
	}

	$cli = php_sapi_name() == 'cli';

	if (($log \|\| $terminate) && !$cli && $arg['message']) {
	$arg['fatal'] = $terminate;
	self::log_bug($arg);
	}

	// terminate script
	if ($terminate) {
	// display error page
	if (is_object(self::$instance->output)) {
	self::$instance->output->raise_error($arg['code'], $arg['message']);
	}
	else if ($cli) {
	fwrite(STDERR, 'ERROR: ' . $arg['message']);
	}

	exit(1);
	}
	else if ($cli) {
	fwrite(STDERR, 'ERROR: ' . $arg['message']);
	}
	}


	/**
	* Report error according to configured debug_level
	*
	* @param array Named parameters
	* @see self::raise_error()
	*/
	public static function log_bug($arg_arr)
	{
	$program = strtoupper(!empty($arg_arr['type']) ? $arg_arr['type'] : 'php');
	$level = self::get_instance()->config->get('debug_level');

	// disable errors for ajax requests, write to log instead (#1487831)
	if (($level & 4) && !empty($_REQUEST['_remote'])) {
	$level = ($level ^ 4) \| 1;
	}

	// write error to local log file
	if (($level & 1) \|\| !empty($arg_arr['fatal'])) {
	if ($_SERVER['REQUEST_METHOD'] == 'POST') {
	$post_query = '?_task='.urlencode($_POST['_task']).'&_action='.urlencode($_POST['_action']);
	}
	else {
	$post_query = '';
	}

	$log_entry = sprintf("%s Error: %s%s (%s %s)",
	$program,
	$arg_arr['message'],
	$arg_arr['file'] ? sprintf(' in %s on line %d', $arg_arr['file'], $arg_arr['line']) : '',
	$_SERVER['REQUEST_METHOD'],
	$_SERVER['REQUEST_URI'] . $post_query);

	if (!self::write_log('errors', $log_entry)) {
	// send error to PHPs error handler if write_log didn't succeed
	trigger_error($arg_arr['message'], E_USER_WARNING);
	}
	}

	// report the bug to the global bug reporting system
	if ($level & 2) {
	// TODO: Send error via HTTP
	}

	// show error if debug_mode is on
	if ($level & 4) {
	print "<b>$program Error";

	if (!empty($arg_arr['file']) && !empty($arg_arr['line'])) {
	print " in $arg_arr[file] ($arg_arr[line])";
	}

	print ':</b> ';
	print nl2br($arg_arr['message']);
	print '<br />';
	flush();
	}
	}


	/**
	* Returns current time (with microseconds).
	*
	* @return float Current time in seconds since the Unix
	*/
	public static function timer()
	{
	return microtime(true);
	}


	/**
	* Logs time difference according to provided timer
	*
	* @param float $timer Timer (self::timer() result)
	* @param string $label Log line prefix
	* @param string $dest Log file name
	*
	* @see self::timer()
	*/
	public static function print_timer($timer, $label = 'Timer', $dest = 'console')
	{
	static $print_count = 0;

	$print_count++;
	$now = self::timer();
	$diff = $now - $timer;

	if (empty($label)) {
	$label = 'Timer '.$print_count;
	}

	self::write_log($dest, sprintf("%s: %0.4f sec", $label, $diff));
	}

	/**
	* Setter for system user object
	*
	* @param rcube_user Current user instance
	*/
	public function set_user($user)
	{
	if (is_object($user)) {
	$this->user = $user;

	// overwrite config with user preferences
	$this->config->set_user_prefs((array)$this->user->get_prefs());
	}
	}

	/**
	* Getter for logged user ID.
	*
	* @return mixed User identifier
	*/
	public function get_user_id()
	{
	if (is_object($this->user)) {
	return $this->user->ID;
	}
	else if (isset($_SESSION['user_id'])) {
	return $_SESSION['user_id'];
	}

	return null;
	}


	/**
	* Getter for logged user name.
	*
	* @return string User name
	*/
	public function get_user_name()
	{
	if (is_object($this->user)) {
	return $this->user->get_username();
	}
	else if (isset($_SESSION['username'])) {
	return $_SESSION['username'];
	}
	}


	/**
	* Getter for logged user email (derived from user name not identity).
	*
	* @return string User email address
	*/
	public function get_user_email()
	{
	if (is_object($this->user)) {
	return $this->user->get_username('mail');
	}
	}


	/**
	* Getter for logged user password.
	*
	* @return string User password
	*/
	public function get_user_password()
	{
	if ($this->password) {
	return $this->password;
	}
	else if ($_SESSION['password']) {
	return $this->decrypt($_SESSION['password']);
	}
	}

	/**
	* Get the per-user log directory
	*/
	protected function get_user_log_dir()
	{
	$log_dir = $this->config->get('log_dir', RCUBE_INSTALL_PATH . 'logs');
	$user_name = $this->get_user_name();
	$user_log_dir = $log_dir . '/' . $user_name;

	return !empty($user_name) && is_writable($user_log_dir) ? $user_log_dir : false;
	}

	/**
	* Getter for logged user language code.
	*
	* @return string User language code
	*/
	public function get_user_language()
	{
	if (is_object($this->user)) {
	return $this->user->language;
	}
	else if (isset($_SESSION['language'])) {
	return $_SESSION['language'];
	}
	}

	/**
	* Unique Message-ID generator.
	*
	* @return string Message-ID
	*/
	public function gen_message_id()
	{
	$local_part = md5(uniqid('rcube'.mt_rand(), true));
	$domain_part = $this->user->get_username('domain');

	// Try to find FQDN, some spamfilters doesn't like 'localhost' (#1486924)
	if (!preg_match('/\.[a-z]+$/i', $domain_part)) {
	foreach (array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']) as $host) {
	$host = preg_replace('/:[0-9]+$/', '', $host);
	if ($host && preg_match('/\.[a-z]+$/i', $host)) {
	$domain_part = $host;
	}
	}
	}

	return sprintf('<%s@%s>', $local_part, $domain_part);
	}

	/**
	* Send the given message using the configured method.
	*
	* @param object $message Reference to Mail_MIME object
	* @param string $from Sender address string
	* @param array $mailto Array of recipient address strings
	* @param array $error SMTP error array (reference)
	* @param string $body_file Location of file with saved message body (reference),
	* used when delay_file_io is enabled
	* @param array $options SMTP options (e.g. DSN request)
	*
	* @return boolean Send status.
	*/
	public function deliver_message(&$message, $from, $mailto, &$error, &$body_file = null, $options = null)
	{
	$plugin = $this->plugins->exec_hook('message_before_send', array(
	'message' => $message,
	'from' => $from,
	'mailto' => $mailto,
	'options' => $options,
	));

	if ($plugin['abort']) {
	if (!empty($plugin['error'])) {
	$error = $plugin['error'];
	}
	if (!empty($plugin['body_file'])) {
	$body_file = $plugin['body_file'];
	}

	return isset($plugin['result']) ? $plugin['result'] : false;
	}

	$from = $plugin['from'];
	$mailto = $plugin['mailto'];
	$options = $plugin['options'];
	$message = $plugin['message'];
	$headers = $message->headers();

	// send thru SMTP server using custom SMTP library
	if ($this->config->get('smtp_server')) {
	// generate list of recipients
	$a_recipients = (array) $mailto;

	if (strlen($headers['Cc']))
	$a_recipients[] = $headers['Cc'];
	if (strlen($headers['Bcc']))
	$a_recipients[] = $headers['Bcc'];

	// clean Bcc from header for recipients
	$send_headers = $headers;
	unset($send_headers['Bcc']);
	// here too, it because txtHeaders() below use $message->_headers not only $send_headers
	unset($message->_headers['Bcc']);

	$smtp_headers = $message->txtHeaders($send_headers, true);

	if ($message->getParam('delay_file_io')) {
	// use common temp dir
	$temp_dir = $this->config->get('temp_dir');
	$body_file = tempnam($temp_dir, 'rcmMsg');
	if (PEAR::isError($mime_result = $message->saveMessageBody($body_file))) {
	self::raise_error(array('code' => 650, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not create message: ".$mime_result->getMessage()),
	TRUE, FALSE);
	return false;
	}
	$msg_body = fopen($body_file, 'r');
	}
	else {
	$msg_body = $message->get();
	}

	// send message
	if (!is_object($this->smtp)) {
	$this->smtp_init(true);
	}

	$sent = $this->smtp->send_mail($from, $a_recipients, $smtp_headers, $msg_body, $options);
	$response = $this->smtp->get_response();
	$error = $this->smtp->get_error();

	// log error
	if (!$sent) {
	self::raise_error(array('code' => 800, 'type' => 'smtp',
	'line' => __LINE__, 'file' => __FILE__,
	'message' => "SMTP error: ".join("\n", $response)), TRUE, FALSE);
	}
	}
	// send mail using PHP's mail() function
	else {
	// unset some headers because they will be added by the mail() function
	$headers_enc = $message->headers($headers);
	$headers_php = $message->_headers;
	unset($headers_php['To'], $headers_php['Subject']);

	// reset stored headers and overwrite
	$message->_headers = array();
	$header_str = $message->txtHeaders($headers_php);

	// #1485779
	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
	if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) {
	$headers_enc['To'] = implode(', ', $m[1]);
	}
	}

	$msg_body = $message->get();

	if (PEAR::isError($msg_body)) {
	self::raise_error(array('code' => 650, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not create message: ".$msg_body->getMessage()),
	TRUE, FALSE);
	}
	else {
	$delim = $this->config->header_delimiter();
	$to = $headers_enc['To'];
	$subject = $headers_enc['Subject'];
	$header_str = rtrim($header_str);

	if ($delim != "\r\n") {
	$header_str = str_replace("\r\n", $delim, $header_str);
	$msg_body = str_replace("\r\n", $delim, $msg_body);
	$to = str_replace("\r\n", $delim, $to);
	$subject = str_replace("\r\n", $delim, $subject);
	}

	if (filter_var(ini_get('safe_mode'), FILTER_VALIDATE_BOOLEAN))
	$sent = mail($to, $subject, $msg_body, $header_str);
	else
	$sent = mail($to, $subject, $msg_body, $header_str, "-f$from");
	}
	}

	if ($sent) {
	$this->plugins->exec_hook('message_sent', array('headers' => $headers, 'body' => $msg_body));

	// remove MDN headers after sending
	unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);

	if ($this->config->get('smtp_log')) {
	// get all recipient addresses
	if (is_array($mailto)) {
	$mailto = implode(',', $mailto);
	}
	if ($headers['Cc']) {
	$mailto .= ',' . $headers['Cc'];
	}
	if ($headers['Bcc']) {
	$mailto .= ',' . $headers['Bcc'];
	}

	$mailto = rcube_mime::decode_address_list($mailto, null, false, null, true);

	self::write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s",
	$this->user->get_username(),
	rcube_utils::remote_addr(),
	implode(', ', $mailto),
	!empty($response) ? join('; ', $response) : ''));
	}
	}
	else {
	// allow plugins to catch sending errors with the same parameters as in 'message_before_send'
	$this->plugins->exec_hook('message_send_error', $plugin + array('error' => $error));
	}

	if (is_resource($msg_body)) {
	fclose($msg_body);
	}

	$message->_headers = array();
	$message->headers($headers);

	return $sent;
	}

	}


	/**
	* Lightweight plugin API class serving as a dummy if plugins are not enabled
	*
	* @package Framework
	* @subpackage Core
	*/
	class rcube_dummy_plugin_api
	{
	/**
	* Triggers a plugin hook.
	* @see rcube_plugin_api::exec_hook()
	*/
	public function exec_hook($hook, $args = array())
	{
	return $args;
	}
	}
	diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
	index f5b8e4eb5..9a23c59bb 100644
	--- a/program/steps/addressbook/delete.inc
	+++ b/program/steps/addressbook/delete.inc
	@@ -1,153 +1,154 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/delete.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-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. \|
	\| \|
	\| PURPOSE: \|
	\| Delete the submitted contacts (CIDs) from the users address book \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// process ajax requests only
	-if (!$OUTPUT->ajax_call)
	+if (!$OUTPUT->ajax_call) {
	return;
	+}

	-$cids = rcmail_get_cids();
	+$cids = rcmail_get_cids(null, rcube_utils::INPUT_POST);
	$delcnt = 0;

	// remove previous deletes
	$undo_time = $RCMAIL->config->get('undo_timeout', 0);
	$RCMAIL->session->remove('contact_undo');

	foreach ($cids as $source => $cid) {
	$CONTACTS = rcmail_contact_source($source);

	if ($CONTACTS->readonly) {
	// more sources? do nothing, probably we have search results from
	// more than one source, some of these sources can be readonly
	if (count($cids) == 1) {
	$OUTPUT->show_message('contactdelerror', 'error');
	$OUTPUT->command('list_contacts');
	$OUTPUT->send();
	}
	continue;
	}

	$plugin = $RCMAIL->plugins->exec_hook('contact_delete', array(
	'id' => $cid, 'source' => $source));

	$deleted = !$plugin['abort'] ? $CONTACTS->delete($cid, $undo_time < 1) : $plugin['result'];

	if (!$deleted) {
	if ($plugin['message']) {
	$error = $plugin['message'];
	}
	else if (($error = $CONTACTS->get_error()) && $error['message']) {
	$error = $error['message'];
	}
	else {
	$error = 'contactdelerror';
	}

	$source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
	$group = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GPC);

	$OUTPUT->show_message($error, 'error');
	$OUTPUT->command('list_contacts', $source, $group);
	$OUTPUT->send();
	}
	else {
	$delcnt += $deleted;

	// store deleted contacts IDs in session for undo action
	if ($undo_time > 0 && $CONTACTS->undelete) {
	$_SESSION['contact_undo']['data'][$source] = $cid;
	}
	}
	}

	if (!empty($_SESSION['contact_undo'])) {
	$_SESSION['contact_undo']['ts'] = time();
	$msg = html::span(null, $RCMAIL->gettext('contactdeleted'))
	. ' ' . html::a(array('onclick' => rcmail_output::JS_OBJECT_NAME.".command('undo', '', this)"), $RCMAIL->gettext('undo'));

	$OUTPUT->show_message($msg, 'confirmation', null, true, $undo_time);
	}
	else {
	$OUTPUT->show_message('contactdeleted', 'confirmation');
	}

	$page = isset($_SESSION['page']) ? $_SESSION['page'] : 1;

	// update saved search after data changed
	if (($records = rcmail_search_update(true)) !== false) {
	// create resultset object
	$count = count($records);
	$first = ($page-1) * $PAGE_SIZE;
	$result = new rcube_result_set($count, $first);
	$pages = ceil((count($records) + $delcnt) / $PAGE_SIZE);

	// last page and it's empty, display previous one
	if ($result->count && $result->count <= ($PAGE_SIZE * ($page - 1))) {
	$OUTPUT->command('list_page', 'prev');
	$rowcount = $RCMAIL->gettext('loading');
	}
	// get records from the next page to add to the list
	else if ($pages > 1 && $page < $pages) {
	// sort the records
	ksort($records, SORT_LOCALE_STRING);

	$first += $PAGE_SIZE;
	// create resultset object
	$res = new rcube_result_set($count, $first - $delcnt);

	if ($PAGE_SIZE < $count) {
	$records = array_slice($records, $first - $delcnt, $delcnt);
	}

	$res->records = array_values($records);
	$records = $res;
	}
	else {
	unset($records);
	}
	}
	else {
	// count contacts for this user
	$result = $CONTACTS->count();
	$pages = ceil(($result->count + $delcnt) / $PAGE_SIZE);

	// last page and it's empty, display previous one
	if ($result->count && $result->count <= ($PAGE_SIZE * ($page - 1))) {
	$OUTPUT->command('list_page', 'prev');
	$rowcount = $RCMAIL->gettext('loading');
	}
	// get records from the next page to add to the list
	else if ($pages > 1 && $page < $pages) {
	$CONTACTS->set_page($page);
	$records = $CONTACTS->list_records(null, -$delcnt);
	}
	}

	// update message count display
	$OUTPUT->set_env('pagecount', ceil($result->count / $PAGE_SIZE));
	$OUTPUT->command('set_rowcount', $rowcount ? $rowcount : rcmail_get_rowcount_text($result));

	// add new rows from next page (if any)
	if (!empty($records)) {
	rcmail_js_contacts_list($records);
	}

	// send response
	$OUTPUT->send();
	diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
	index 008d20174..c40b517dc 100644
	--- a/program/steps/addressbook/func.inc
	+++ b/program/steps/addressbook/func.inc
	@@ -1,942 +1,943 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-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. \|
	\| \|
	\| PURPOSE: \|
	\| Provide addressbook functionality and GUI objects \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$SEARCH_MODS_DEFAULT = array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1);

	// general definition of contact coltypes
	$CONTACT_COLTYPES = array(
	'name' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('name'), 'category' => 'main'),
	'firstname' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('firstname'), 'category' => 'main'),
	'surname' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('surname'), 'category' => 'main'),
	'email' => array('type' => 'text', 'size' => 40, 'maxlength' => 254, 'label' => $RCMAIL->gettext('email'), 'subtypes' => array('home','work','other'), 'category' => 'main'),
	'middlename' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('middlename'), 'category' => 'main'),
	'prefix' => array('type' => 'text', 'size' => 8, 'maxlength' => 20, 'limit' => 1, 'label' => $RCMAIL->gettext('nameprefix'), 'category' => 'main'),
	'suffix' => array('type' => 'text', 'size' => 8, 'maxlength' => 20, 'limit' => 1, 'label' => $RCMAIL->gettext('namesuffix'), 'category' => 'main'),
	'nickname' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('nickname'), 'category' => 'main'),
	'jobtitle' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('jobtitle'), 'category' => 'main'),
	'organization' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('organization'), 'category' => 'main'),
	'department' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('department'), 'category' => 'main'),
	'gender' => array('type' => 'select', 'limit' => 1, 'label' => $RCMAIL->gettext('gender'), 'options' => array('male' => $RCMAIL->gettext('male'), 'female' => $RCMAIL->gettext('female')), 'category' => 'personal'),
	'maidenname' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('maidenname'), 'category' => 'personal'),
	'phone' => array('type' => 'text', 'size' => 40, 'maxlength' => 20, 'label' => $RCMAIL->gettext('phone'), 'subtypes' => array('home','home2','work','work2','mobile','main','homefax','workfax','car','pager','video','assistant','other'), 'category' => 'main'),
	'address' => array('type' => 'composite', 'label' => $RCMAIL->gettext('address'), 'subtypes' => array('home','work','other'), 'childs' => array(
	'street' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('street'), 'category' => 'main'),
	'locality' => array('type' => 'text', 'size' => 28, 'maxlength' => 50, 'label' => $RCMAIL->gettext('locality'), 'category' => 'main'),
	'zipcode' => array('type' => 'text', 'size' => 8, 'maxlength' => 15, 'label' => $RCMAIL->gettext('zipcode'), 'category' => 'main'),
	'region' => array('type' => 'text', 'size' => 12, 'maxlength' => 50, 'label' => $RCMAIL->gettext('region'), 'category' => 'main'),
	'country' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('country'), 'category' => 'main'),
	), 'category' => 'main'),
	'birthday' => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => $RCMAIL->gettext('birthday'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
	'anniversary' => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => $RCMAIL->gettext('anniversary'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
	'website' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('website'), 'subtypes' => array('homepage','work','blog','profile','other'), 'category' => 'main'),
	'im' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('instantmessenger'), 'subtypes' => array('aim','icq','msn','yahoo','jabber','skype','other'), 'category' => 'main'),
	'notes' => array('type' => 'textarea', 'size' => 40, 'rows' => 15, 'maxlength' => 500, 'label' => $RCMAIL->gettext('notes'), 'limit' => 1),
	'photo' => array('type' => 'image', 'limit' => 1, 'category' => 'main'),
	'assistant' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('assistant'), 'category' => 'personal'),
	'manager' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('manager'), 'category' => 'personal'),
	'spouse' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('spouse'), 'category' => 'personal'),
	// TODO: define fields for vcards like GEO, KEY
	);

	$PAGE_SIZE = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));

	// Addressbook UI
	if (!$RCMAIL->action && !$OUTPUT->ajax_call) {
	// add list of address sources to client env
	$js_list = $RCMAIL->get_address_sources();

	// count all/writeable sources
	$writeable = 0;
	$count = 0;
	foreach ($js_list as $sid => $s) {
	$count++;
	if (!$s['readonly']) {
	$writeable++;
	}
	// unset hidden sources
	if ($s['hidden']) {
	unset($js_list[$sid]);
	}
	}

	$search_mods = $RCMAIL->config->get('addressbook_search_mods', $SEARCH_MODS_DEFAULT);
	$OUTPUT->set_env('search_mods', $search_mods);
	$OUTPUT->set_env('address_sources', $js_list);
	$OUTPUT->set_env('writable_source', $writeable);

	$OUTPUT->set_pagetitle($RCMAIL->gettext('addressbook'));
	$_SESSION['addressbooks_count'] = $count;
	$_SESSION['addressbooks_count_writeable'] = $writeable;

	// select address book
	$source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);

	// use first directory by default
	if (!strlen($source) \|\| !isset($js_list[$source])) {
	$source = $RCMAIL->config->get('default_addressbook');
	if (!strlen($source) \|\| !isset($js_list[$source])) {
	$source = strval(key($js_list));
	}
	}

	$CONTACTS = rcmail_contact_source($source, true);
	}

	// remove undo information...
	if ($undo = $_SESSION['contact_undo']) {
	// ...after timeout
	$undo_time = $RCMAIL->config->get('undo_timeout', 0);
	if ($undo['ts'] < time() - $undo_time)
	$RCMAIL->session->remove('contact_undo');
	}

	// register UI objects
	$OUTPUT->add_handlers(array(
	'directorylist' => 'rcmail_directory_list',
	'savedsearchlist' => 'rcmail_savedsearch_list',
	'addresslist' => 'rcmail_contacts_list',
	'addresslisttitle' => 'rcmail_contacts_list_title',
	'addressframe' => 'rcmail_contact_frame',
	'recordscountdisplay' => 'rcmail_rowcount_display',
	'searchform' => array($OUTPUT, 'search_form')
	));

	// register action aliases
	$RCMAIL->register_action_map(array(
	'add' => 'edit.inc',
	'group-create' => 'groups.inc',
	'group-rename' => 'groups.inc',
	'group-delete' => 'groups.inc',
	'group-addmembers' => 'groups.inc',
	'group-delmembers' => 'groups.inc',
	'search-create' => 'search.inc',
	'search-delete' => 'search.inc',
	));



	// instantiate a contacts object according to the given source
	function rcmail_contact_source($source=null, $init_env=false, $writable=false)
	{
	global $RCMAIL, $OUTPUT, $CONTACT_COLTYPES, $PAGE_SIZE;

	if (!strlen($source)) {
	$source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
	}

	// Get object
	$CONTACTS = $RCMAIL->get_address_book($source, $writable);
	$CONTACTS->set_pagesize($PAGE_SIZE);

	// set list properties and session vars
	if (!empty($_GET['_page']))
	$CONTACTS->set_page(($_SESSION['page'] = intval($_GET['_page'])));
	else
	$CONTACTS->set_page(isset($_SESSION['page']) ? $_SESSION['page'] : 1);

	if (!empty($_REQUEST['_gid']))
	$CONTACTS->set_group(rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GPC));

	if (!$init_env)
	return $CONTACTS;

	$OUTPUT->set_env('readonly', $CONTACTS->readonly);
	$OUTPUT->set_env('source', (string) $source);

	// reduce/extend $CONTACT_COLTYPES with specification from the current $CONTACT object
	if (is_array($CONTACTS->coltypes)) {
	// remove cols not listed by the backend class
	$contact_cols = $CONTACTS->coltypes[0] ? array_flip($CONTACTS->coltypes) : $CONTACTS->coltypes;
	$CONTACT_COLTYPES = array_intersect_key($CONTACT_COLTYPES, $contact_cols);
	// add associative coltypes definition
	if (!$CONTACTS->coltypes[0]) {
	foreach ($CONTACTS->coltypes as $col => $colprop) {
	if (is_array($colprop['childs'])) {
	foreach ($colprop['childs'] as $childcol => $childprop)
	$colprop['childs'][$childcol] = array_merge((array)$CONTACT_COLTYPES[$col]['childs'][$childcol], $childprop);
	}
	$CONTACT_COLTYPES[$col] = $CONTACT_COLTYPES[$col] ? array_merge($CONTACT_COLTYPES[$col], $colprop) : $colprop;
	}
	}
	}

	$OUTPUT->set_env('photocol', is_array($CONTACT_COLTYPES['photo']));

	return $CONTACTS;
	}


	function rcmail_set_sourcename($abook)
	{
	global $OUTPUT, $RCMAIL;

	// get address book name (for display)
	if ($abook && $_SESSION['addressbooks_count'] > 1) {
	$name = $abook->get_name();
	if (!$name) {
	$name = $RCMAIL->gettext('personaladrbook');
	}
	$OUTPUT->set_env('sourcename', html_entity_decode($name, ENT_COMPAT, 'UTF-8'));
	}
	}


	function rcmail_directory_list($attrib)
	{
	global $RCMAIL, $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmdirectorylist';

	$out = '';
	$jsdata = array();

	$line_templ = html::tag('li', array(
	'id' => 'rcmli%s', 'class' => '%s', 'noclose' => true),
	html::a(array('href' => '%s',
	'rel' => '%s',
	'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('list','%s',this)"), '%s'));

	$sources = (array) $OUTPUT->get_env('address_sources');
	reset($sources);

	// currently selected source
	$current = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);

	foreach ($sources as $j => $source) {
	$id = strval(strlen($source['id']) ? $source['id'] : $j);
	$js_id = rcube::JQ($id);

	// set class name(s)
	$class_name = 'addressbook';
	if ($current === $id)
	$class_name .= ' selected';
	if ($source['readonly'])
	$class_name .= ' readonly';
	if ($source['class_name'])
	$class_name .= ' ' . $source['class_name'];

	$name = !empty($source['name']) ? $source['name'] : $id;
	$out .= sprintf($line_templ,
	rcube_utils::html_identifier($id, true),
	$class_name,
	rcube::Q($RCMAIL->url(array('_source' => $id))),
	$source['id'],
	$js_id, $name);

	$groupdata = array('out' => $out, 'jsdata' => $jsdata, 'source' => $id);
	if ($source['groups'])
	$groupdata = rcmail_contact_groups($groupdata);
	$jsdata = $groupdata['jsdata'];
	$out = $groupdata['out'];
	$out .= '</li>';
	}

	$OUTPUT->set_env('contactgroups', $jsdata);
	$OUTPUT->set_env('collapsed_abooks', (string)$RCMAIL->config->get('collapsed_abooks',''));
	$OUTPUT->add_gui_object('folderlist', $attrib['id']);
	$OUTPUT->include_script('treelist.js');

	// add some labels to client
	$OUTPUT->add_label('deletegroupconfirm', 'groupdeleting', 'addingmember', 'removingmember',
	'newgroup', 'grouprename', 'searchsave', 'namex', 'save'
	);

	return html::tag('ul', $attrib, $out, html::$common_attrib);
	}


	function rcmail_savedsearch_list($attrib)
	{
	global $RCMAIL, $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmsavedsearchlist';

	$out = '';
	$line_templ = html::tag('li', array(
	'id' => 'rcmli%s', 'class' => '%s'),
	html::a(array('href' => '#', 'rel' => 'S%s',
	'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('listsearch', '%s', this)"), '%s'));

	// Saved searches
	$sources = $RCMAIL->user->list_searches(rcube_user::SEARCH_ADDRESSBOOK);
	foreach ($sources as $source) {
	$id = $source['id'];
	$js_id = rcube::JQ($id);

	// set class name(s)
	$classes = array('contactsearch');
	if (!empty($source['class_name']))
	$classes[] = $source['class_name'];

	$out .= sprintf($line_templ,
	rcube_utils::html_identifier('S'.$id, true),
	join(' ', $classes),
	$id,
	$js_id, (!empty($source['name']) ? rcube::Q($source['name']) : rcube::Q($id))
	);
	}

	$OUTPUT->add_gui_object('savedsearchlist', $attrib['id']);

	return html::tag('ul', $attrib, $out, html::$common_attrib);
	}


	function rcmail_contact_groups($args)
	{
	global $RCMAIL;

	$groups_html = '';
	$groups = $RCMAIL->get_address_book($args['source'])->list_groups();

	if (!empty($groups)) {
	$line_templ = html::tag('li', array(
	'id' => 'rcmli%s', 'class' => 'contactgroup'),
	html::a(array('href' => '#',
	'rel' => '%s:%s',
	'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('listgroup',{'source':'%s','id':'%s'},this)"), '%s'));

	// append collapse/expand toggle and open a new <ul>
	$is_collapsed = strpos($RCMAIL->config->get('collapsed_abooks',''), '&'.rawurlencode($args['source']).'&') !== false;
	$args['out'] .= html::div('treetoggle ' . ($is_collapsed ? 'collapsed' : 'expanded'), ' ');

	foreach ($groups as $group) {
	$groups_html .= sprintf($line_templ,
	rcube_utils::html_identifier('G' . $args['source'] . $group['ID'], true),
	$args['source'], $group['ID'],
	$args['source'], $group['ID'], rcube::Q($group['name'])
	);
	$args['jsdata']['G'.$args['source'].$group['ID']] = array(
	'source' => $args['source'], 'id' => $group['ID'],
	'name' => $group['name'], 'type' => 'group');
	}
	}

	$args['out'] .= html::tag('ul',
	array('class' => 'groups', 'style' => ($is_collapsed \|\| empty($groups) ? "display:none;" : null)),
	$groups_html);

	return $args;
	}


	// return the contacts list as HTML table
	function rcmail_contacts_list($attrib)
	{
	global $RCMAIL, $CONTACTS, $OUTPUT;

	// define list of cols to be displayed
	$a_show_cols = array('name','action');

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmAddressList';

	// create XHTML table
	$out = $RCMAIL->table_output($attrib, array(), $a_show_cols, $CONTACTS->primary_key);

	// set client env
	$OUTPUT->add_gui_object('contactslist', $attrib['id']);
	$OUTPUT->set_env('current_page', (int)$CONTACTS->list_page);
	$OUTPUT->include_script('list.js');

	// add some labels to client
	$OUTPUT->add_label('deletecontactconfirm', 'copyingcontact', 'movingcontact', 'contactdeleting');

	return $out;
	}


	function rcmail_js_contacts_list($result, $prefix='')
	{
	global $OUTPUT, $RCMAIL;

	if (empty($result) \|\| $result->count == 0)
	return;

	// define list of cols to be displayed
	$a_show_cols = array('name','action');

	while ($row = $result->next()) {
	$row['CID'] = $row['ID'];
	$row['email'] = reset(rcube_addressbook::get_col_values('email', $row, true));

	$source_id = $OUTPUT->get_env('source');
	$a_row_cols = array();
	$classes = array($row['_type'] ? $row['_type'] : 'person');

	// build contact ID with source ID
	if (isset($row['sourceid'])) {
	$row['ID'] = $row['ID'].'-'.$row['sourceid'];
	$source_id = $row['sourceid'];
	}

	// format each col
	foreach ($a_show_cols as $col) {
	$val = '';
	switch ($col) {
	case 'name':
	$val = rcube::Q(rcube_addressbook::compose_list_name($row));
	break;

	case 'action':
	if ($row['_type'] == 'group') {
	$val = html::a(array(
	'href' => '#list',
	'rel' => $row['ID'],
	'title' => $RCMAIL->gettext('listgroup'),
	'onclick' => sprintf("return %s.command('pushgroup',{'source':'%s','id':'%s'},this,event)", rcmail_output::JS_OBJECT_NAME, $source_id, $row['CID']),
	), '»');
	}
	else
	$val = '';
	break;

	default:
	$val = rcube::Q($row[$col]);
	break;
	}

	$a_row_cols[$col] = $val;
	}

	if ($row['readonly'])
	$classes[] = 'readonly';

	$OUTPUT->command($prefix.'add_contact_row', $row['ID'], $a_row_cols, join(' ', $classes), array_intersect_key($row, array('ID'=>1,'readonly'=>1,'_type'=>1,'email'=>1,'name'=>1)));
	}
	}


	function rcmail_contacts_list_title($attrib)
	{
	global $OUTPUT, $RCMAIL;

	$attrib += array('label' => 'contacts', 'id' => 'rcmabooklisttitle', 'tag' => 'span');
	unset($attrib['name']);

	$OUTPUT->add_gui_object('addresslist_title', $attrib['id']);
	$OUTPUT->add_label('contacts','uponelevel');

	return html::tag($attrib['tag'], $attrib, $RCMAIL->gettext($attrib['label']), html::$common_attrib);
	}


	// similar function as /steps/settings/identities.inc::rcmail_identity_frame()
	function rcmail_contact_frame($attrib)
	{
	global $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmcontactframe';

	return $OUTPUT->frame($attrib, true);
	}


	function rcmail_rowcount_display($attrib)
	{
	global $RCMAIL;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmcountdisplay';

	$RCMAIL->output->add_gui_object('countdisplay', $attrib['id']);

	if ($attrib['label'])
	$_SESSION['contactcountdisplay'] = $attrib['label'];

	return html::span($attrib, $RCMAIL->gettext('loading'));
	}


	function rcmail_get_rowcount_text($result=null)
	{
	global $RCMAIL, $CONTACTS, $PAGE_SIZE;

	// read nr of contacts
	if (!$result) {
	$result = $CONTACTS->get_result();
	}

	if ($result->count == 0)
	$out = $RCMAIL->gettext('nocontactsfound');
	else
	$out = $RCMAIL->gettext(array(
	'name' => $_SESSION['contactcountdisplay'] ? $_SESSION['contactcountdisplay'] : 'contactsfromto',
	'vars' => array(
	'from' => $result->first + 1,
	'to' => min($result->count, $result->first + $PAGE_SIZE),
	'count' => $result->count)
	));

	return $out;
	}


	function rcmail_get_type_label($type)
	{
	global $RCMAIL;

	$label = 'type'.$type;
	if ($RCMAIL->text_exists($label, '*', $domain))
	return $RCMAIL->gettext($label, $domain);
	else if (preg_match('/\w+(\d+)$/', $label, $m)
	&& ($label = preg_replace('/(\d+)$/', '', $label))
	&& $RCMAIL->text_exists($label, '*', $domain))
	return $RCMAIL->gettext($label, $domain) . ' ' . $m[1];

	return ucfirst($type);
	}


	function rcmail_contact_form($form, $record, $attrib = null)
	{
	global $RCMAIL;

	// Allow plugins to modify contact form content
	$plugin = $RCMAIL->plugins->exec_hook('contact_form', array(
	'form' => $form, 'record' => $record));

	$form = $plugin['form'];
	$record = $plugin['record'];
	$edit_mode = $RCMAIL->action != 'show';
	$del_button = $attrib['deleteicon'] ? html::img(array('src' => $RCMAIL->output->get_skin_file($attrib['deleteicon']), 'alt' => $RCMAIL->gettext('delete'))) : $RCMAIL->gettext('delete');
	unset($attrib['deleteicon']);
	$out = '';

	// get default coltypes
	$coltypes = $GLOBALS['CONTACT_COLTYPES'];
	$coltype_labels = array();

	foreach ($coltypes as $col => $prop) {
	if ($prop['subtypes']) {
	$subtype_names = array_map('rcmail_get_type_label', $prop['subtypes']);
	$select_subtype = new html_select(array('name' => '_subtype_'.$col.'[]', 'class' => 'contactselectsubtype', 'title' => $prop['label'] . ' ' . $RCMAIL->gettext('type')));
	$select_subtype->add($subtype_names, $prop['subtypes']);
	$coltypes[$col]['subtypes_select'] = $select_subtype->show();
	}
	if ($prop['childs']) {
	foreach ($prop['childs'] as $childcol => $cp)
	$coltype_labels[$childcol] = array('label' => $cp['label']);
	}
	}

	foreach ($form as $section => $fieldset) {
	// skip empty sections
	if (empty($fieldset['content']))
	continue;

	$select_add = new html_select(array('class' => 'addfieldmenu', 'rel' => $section));
	$select_add->add($RCMAIL->gettext('addfield'), '');

	// render head section with name fields (not a regular list of rows)
	if ($section == 'head') {
	$content = '';

	// unset display name if it is composed from name parts
	if ($record['name'] == rcube_addressbook::compose_display_name(array('name' => '') + (array)$record))
	unset($record['name']);

	// group fields
	$field_blocks = array(
	'names' => array('prefix','firstname','middlename','surname','suffix'),
	'displayname' => array('name'),
	'nickname' => array('nickname'),
	'organization' => array('organization'),
	'department' => array('department'),
	'jobtitle' => array('jobtitle'),
	);
	foreach ($field_blocks as $blockname => $colnames) {
	$fields = '';
	foreach ($colnames as $col) {
	// skip cols unknown to the backend
	if (!$coltypes[$col])
	continue;

	// only string values are expected here
	if (is_array($record[$col]))
	$record[$col] = join(' ', $record[$col]);

	if ($RCMAIL->action == 'show') {
	if (!empty($record[$col]))
	$fields .= html::span('namefield ' . $col, rcube::Q($record[$col])) . " ";
	}
	else {
	$colprop = (array)$fieldset['content'][$col] + (array)$coltypes[$col];
	$colprop['id'] = 'ff_'.$col;
	if (empty($record[$col]) && !$colprop['visible']) {
	$colprop['style'] = 'display:none';
	$select_add->add($colprop['label'], $col);
	}
	$fields .= rcube_output::get_edit_field($col, $record[$col], $colprop, $colprop['type']);
	}
	}
	$content .= html::div($blockname, $fields);
	}

	if ($edit_mode)
	$content .= html::p('addfield', $select_add->show(null));

	$out .= html::tag('fieldset', $attrib, (!empty($fieldset['name']) ? html::tag('legend', null, rcube::Q($fieldset['name'])) : '') . $content) ."\n";
	continue;
	}

	$content = '';
	if (is_array($fieldset['content'])) {
	foreach ($fieldset['content'] as $col => $colprop) {
	// remove subtype part of col name
	list($field, $subtype) = explode(':', $col);
	if (!$subtype) $subtype = 'home';
	$fullkey = $col.':'.$subtype;

	// skip cols unknown to the backend
	if (!$coltypes[$field])
	continue;

	// merge colprop with global coltype configuration
	$colprop += $coltypes[$field];
	$label = isset($colprop['label']) ? $colprop['label'] : $RCMAIL->gettext($col);

	// prepare subtype selector in edit mode
	if ($edit_mode && is_array($colprop['subtypes'])) {
	$subtype_names = array_map('rcmail_get_type_label', $colprop['subtypes']);
	$select_subtype = new html_select(array('name' => '_subtype_'.$col.'[]', 'class' => 'contactselectsubtype', 'title' => $colprop['label'] . ' ' . $RCMAIL->gettext('type')));
	$select_subtype->add($subtype_names, $colprop['subtypes']);
	}
	else
	$select_subtype = null;

	if (!empty($colprop['value'])) {
	$values = (array)$colprop['value'];
	}
	else {
	// iterate over possible subtypes and collect values with their subtype
	if (is_array($colprop['subtypes'])) {
	$values = $subtypes = array();
	foreach (rcube_addressbook::get_col_values($field, $record) as $st => $vals) {
	foreach((array)$vals as $value) {
	$i = count($values);
	$subtypes[$i] = $st;
	$values[$i] = $value;
	}
	// TODO: add $st to $select_subtype if missing ?
	}
	}
	else {
	$values = $record[$fullkey] ? $record[$fullkey] : $record[$field];
	$subtypes = null;
	}
	}

	// hack: create empty values array to force this field to be displayed
	if (empty($values) && $colprop['visible'])
	$values[] = '';

	if (!is_array($values)) {
	// $values can be an object, don't use (array)$values syntax
	$values = !empty($values) ? array($values) : array();
	}

	$rows = '';
	foreach ($values as $i => $val) {
	if ($subtypes[$i])
	$subtype = $subtypes[$i];

	$colprop['id'] = 'ff_' . $col . intval($coltypes[$field]['count']);

	// render composite field
	if ($colprop['type'] == 'composite') {
	$composite = array(); $j = 0;
	$template = $RCMAIL->config->get($col . '_template', '{'.join('} {', array_keys($colprop['childs'])).'}');
	foreach ($colprop['childs'] as $childcol => $cp) {
	if (!empty($val) && is_array($val)) {
	$childvalue = $val[$childcol] ? $val[$childcol] : $val[$j];
	}
	else {
	$childvalue = '';
	}

	if ($edit_mode) {
	if ($colprop['subtypes'] \|\| $colprop['limit'] != 1) $cp['array'] = true;
	$composite['{'.$childcol.'}'] = rcube_output::get_edit_field($childcol, $childvalue, $cp, $cp['type']) . " ";
	}
	else {
	$childval = $cp['render_func'] ? call_user_func($cp['render_func'], $childvalue, $childcol) : rcube::Q($childvalue);
	$composite['{'.$childcol.'}'] = html::span('data ' . $childcol, $childval) . " ";
	}
	$j++;
	}

	$coltypes[$field] += (array)$colprop;
	$coltypes[$field]['count']++;
	$val = preg_replace('/\{\w+\}/', '', strtr($template, $composite));
	}
	else if ($edit_mode) {
	// call callback to render/format value
	if ($colprop['render_func'])
	$val = call_user_func($colprop['render_func'], $val, $col);

	$coltypes[$field] = (array)$colprop + $coltypes[$field];

	if ($colprop['subtypes'] \|\| $colprop['limit'] != 1)
	$colprop['array'] = true;

	// load jquery UI datepicker for date fields
	if ($colprop['type'] == 'date') {
	$colprop['class'] .= ($colprop['class'] ? ' ' : '') . 'datepicker';
	if (!$colprop['render_func'])
	$val = rcmail_format_date_col($val);
	}

	$val = rcube_output::get_edit_field($col, $val, $colprop, $colprop['type']);
	$coltypes[$field]['count']++;
	}
	else if ($colprop['render_func'])
	$val = call_user_func($colprop['render_func'], $val, $col);
	else if (is_array($colprop['options']) && isset($colprop['options'][$val]))
	$val = $colprop['options'][$val];
	else
	$val = rcube::Q($val);

	// use subtype as label
	if ($colprop['subtypes'])
	$label = rcmail_get_type_label($subtype);

	// add delete button/link
	if ($edit_mode && !($colprop['visible'] && $colprop['limit'] == 1))
	$val .= html::a(array('href' => '#del', 'class' => 'contactfieldbutton deletebutton', 'title' => $RCMAIL->gettext('delete'), 'rel' => $col), $del_button);

	// display row with label
	if ($label) {
	$rows .= html::div('row',
	html::div('contactfieldlabel label', $select_subtype ? $select_subtype->show($subtype) : html::label($colprop['id'], rcube::Q($label))) .
	html::div('contactfieldcontent '.$colprop['type'], $val));
	}
	else // row without label
	$rows .= html::div('row', html::div('contactfield', $val));
	}

	// add option to the add-field menu
	if (!$colprop['limit'] \|\| $coltypes[$field]['count'] < $colprop['limit']) {
	$select_add->add($colprop['label'], $col);
	$select_add->_count++;
	}

	// wrap rows in fieldgroup container
	if ($rows) {
	$content .= html::tag('fieldset', array('class' => 'contactfieldgroup ' . ($colprop['subtypes'] ? 'contactfieldgroupmulti ' : '') . 'contactcontroller' . $col, 'style' => ($rows ? null : 'display:none')),
	($colprop['subtypes'] ? html::tag('legend', null, rcube::Q($colprop['label'])) : ' ') .
	$rows);
	}
	}

	if (!$content && (!$edit_mode \|\| !$select_add->_count))
	continue;

	// also render add-field selector
	if ($edit_mode)
	$content .= html::p('addfield', $select_add->show(null, array('style' => $select_add->_count ? null : 'display:none')));

	$content = html::div(array('id' => 'contactsection' . $section), $content);
	}
	else {
	$content = $fieldset['content'];
	}

	if ($content)
	$out .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($fieldset['name'])) . $content) ."\n";
	}

	if ($edit_mode) {
	$RCMAIL->output->set_env('coltypes', $coltypes + $coltype_labels);
	$RCMAIL->output->set_env('delbutton', $del_button);
	$RCMAIL->output->add_label('delete');
	}

	return $out;
	}


	function rcmail_contact_photo($attrib)
	{
	global $SOURCE_ID, $CONTACTS, $CONTACT_COLTYPES, $RCMAIL;

	if ($result = $CONTACTS->get_result())
	$record = $result->first();

	- $photo_img = $attrib['placeholder'] ? $RCMAIL->output->get_skin_file($attrib['placeholder']) : 'program/resources/blank.gif';
	+ $photo_img = $attrib['placeholder'] ? $RCMAIL->output->abs_url($attrib['placeholder'], true) : 'program/resources/blank.gif';
	if ($record['_type'] == 'group' && $attrib['placeholdergroup'])
	- $photo_img = $RCMAIL->output->get_skin_file($attrib['placeholdergroup']);
	+ $photo_img = $RCMAIL->output->abs_url($attrib['placeholdergroup'], true);
	+
	+ $RCMAIL->output->set_env('photo_placeholder', $RCMAIL->output->asset_url($photo_img));

	- $RCMAIL->output->set_env('photo_placeholder', $photo_img);
	unset($attrib['placeholder']);

	$plugin = $RCMAIL->plugins->exec_hook('contact_photo', array('record' => $record, 'data' => $record['photo']));

	// check if we have photo data from contact form
	if ($GLOBALS['EDIT_RECORD']) {
	$rec = $GLOBALS['EDIT_RECORD'];
	if ($rec['photo'] == '-del-') {
	$record['photo'] = '';
	}
	else if ($_SESSION['contacts']['files'][$rec['photo']]) {
	$record['photo'] = $file_id = $rec['photo'];
	}
	}

	if ($plugin['url'])
	$photo_img = $plugin['url'];
	else if (preg_match('!^https?://!i', $record['photo']))
	$photo_img = $record['photo'];
	else if ($record['photo']) {
	$url = array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $SOURCE_ID);
	if ($file_id) {
	$url['_photo'] = $ff_value = $file_id;
	}
	$photo_img = $RCMAIL->url($url);
	}
	else {
	$ff_value = '-del-'; // will disable delete-photo action
	}

	$content = html::div($attrib, html::img(array(
	'src' => $photo_img,
	'alt' => $RCMAIL->gettext('contactphoto'),
	'onerror' => 'this.src = rcmail.env.photo_placeholder',
	)));

	if ($CONTACT_COLTYPES['photo'] && ($RCMAIL->action == 'edit' \|\| $RCMAIL->action == 'add')) {
	$RCMAIL->output->add_gui_object('contactphoto', $attrib['id']);
	$hidden = new html_hiddenfield(array('name' => '_photo', 'id' => 'ff_photo', 'value' => $ff_value));
	$content .= $hidden->show();
	}

	return $content;
	}


	function rcmail_format_date_col($val)
	{
	global $RCMAIL;
	return $RCMAIL->format_date($val, $RCMAIL->config->get('date_format', 'Y-m-d'), false);
	}

	/**
	* Updates saved search after data changed
	*/
	function rcmail_search_update($return = false)
	{
	global $RCMAIL;

	if (($search_request = $_REQUEST['_search']) && isset($_SESSION['search'][$search_request])) {
	$search = (array)$_SESSION['search'][$search_request];
	$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
	$afields = $return ? $RCMAIL->config->get('contactlist_fields') : array('name', 'email');
	$records = array();

	foreach ($search as $s => $set) {
	$source = $RCMAIL->get_address_book($s);

	// reset page
	$source->set_page(1);
	$source->set_pagesize(9999);
	$source->set_search_set($set);

	// get records
	$result = $source->list_records($afields);

	if (!$result->count) {
	unset($search[$s]);
	continue;
	}

	if ($return) {
	while ($row = $result->next()) {
	$row['sourceid'] = $s;
	$key = rcube_addressbook::compose_contact_key($row, $sort_col);
	$records[$key] = $row;
	}
	unset($result);
	}

	$search[$s] = $source->get_search_set();
	}

	$_SESSION['search'][$search_request] = $search;

	return $records;
	}

	return false;
	}

	/**
	* Returns contact ID(s) and source(s) from GET/POST data
	*
	* @return array List of contact IDs per-source
	*/
	-function rcmail_get_cids($filter = null)
	+function rcmail_get_cids($filter = null, $request_type = rcube_utils::INPUT_GPC)
	{
	// contact ID (or comma-separated list of IDs) is provided in two
	// forms. If _source is an empty string then the ID is a string
	// containing contact ID and source name in form: <ID>-<SOURCE>

	- $cid = rcube_utils::get_input_value('_cid', rcube_utils::INPUT_GPC);
	+ $cid = rcube_utils::get_input_value('_cid', $request_type);
	$source = (string) rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);

	if (is_array($cid)) {
	return $cid;
	}

	if (!preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid)) {
	return array();
	}

	$cid = explode(',', $cid);
	$got_source = strlen($source);
	$result = array();

	// create per-source contact IDs array
	foreach ($cid as $id) {
	// extract source ID from contact ID (it's there in search mode)
	// see #1488959 and #1488862 for reference
	if (!$got_source) {
	if ($sep = strrpos($id, '-')) {
	$contact_id = substr($id, 0, $sep);
	$source_id = (string) substr($id, $sep+1);
	if (strlen($source_id)) {
	$result[$source_id][] = $contact_id;
	}
	}
	}
	else {
	if (substr($id, -($got_source+1)) === "-$source") {
	$id = substr($id, 0, -($got_source+1));
	}
	$result[$source][] = $id;
	}
	}

	return $filter !== null ? $result[$filter] : $result;
	}
	diff --git a/program/steps/addressbook/photo.inc b/program/steps/addressbook/photo.inc
	index 30d09ffcc..962ca3126 100644
	--- a/program/steps/addressbook/photo.inc
	+++ b/program/steps/addressbook/photo.inc
	@@ -1,95 +1,101 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/photo.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-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. \|
	\| \|
	\| PURPOSE: \|
	\| Show contact photo \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	// Get contact ID and source ID from request
	$cids = rcmail_get_cids();
	$source = key($cids);
	$cid = $cids ? array_shift($cids[$source]) : null;

	// read the referenced file
	if (($file_id = rcube_utils::get_input_value('_photo', rcube_utils::INPUT_GPC)) && ($tempfile = $_SESSION['contacts']['files'][$file_id])) {
	$tempfile = $RCMAIL->plugins->exec_hook('attachment_display', $tempfile);
	if ($tempfile['status']) {
	if ($tempfile['data'])
	$data = $tempfile['data'];
	else if ($tempfile['path'])
	$data = file_get_contents($tempfile['path']);
	}
	}
	else {
	// by email, search for contact first
	if ($email = rcube_utils::get_input_value('_email', rcube_utils::INPUT_GPC)) {
	foreach ($RCMAIL->get_address_sources() as $s) {
	$abook = $RCMAIL->get_address_book($s['id']);
	$result = $abook->search(array('email'), $email, 1, true, true, 'photo');
	while ($result && ($record = $result->iterate())) {
	if ($record['photo'])
	break 2;
	}
	}
	}

	// by contact id
	if (!$record && $cid) {
	// Initialize addressbook source
	$CONTACTS = rcmail_contact_source($source, true);
	$SOURCE_ID = $source;
	// read contact record
	$record = $CONTACTS->get_record($cid, true);
	}

	if ($record['photo']) {
	$data = is_array($record['photo']) ? $record['photo'][0] : $record['photo'];
	if (!preg_match('![^a-z0-9/=+-]!i', $data))
	$data = base64_decode($data, true);
	}
	}

	// let plugins do fancy things with contact photos
	$plugin = $RCMAIL->plugins->exec_hook('contact_photo',
	array('record' => $record, 'email' => $email, 'data' => $data));

	// redirect to url provided by a plugin
	if ($plugin['url']) {
	$RCMAIL->output->redirect($plugin['url']);
	}

	$data = $plugin['data'];

	// detect if photo data is an URL
	if (strlen($data) < 1024 && filter_var($data, FILTER_VALIDATE_URL)) {
	$RCMAIL->output->redirect($data);
	}

	// deliver alt image
	if (!$data && ($alt_img = rcube_utils::get_input_value('_alt', rcube_utils::INPUT_GPC)) && is_file($alt_img)) {
	$data = file_get_contents($alt_img);
	}

	// cache for one day if requested by email
	if (!$cid && $email) {
	$RCMAIL->output->future_expire_header(86400);
	}

	-header('Content-Type: ' . rcube_mime::image_content_type($data));
	-echo $data ? $data : file_get_contents('program/resources/blank.gif');
	+if ($data) {
	+ header('Content-Type: ' . rcube_mime::image_content_type($data));
	+ echo $data;
	+}
	+else {
	+ header('Content-Type: image/gif');
	+ echo base64_decode(rcmail_output::BLANK_GIF);
	+}
	exit;
	diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
	index 5492f390d..fd25cf402 100644
	--- a/program/steps/mail/compose.inc
	+++ b/program/steps/mail/compose.inc
	@@ -1,1890 +1,1890 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/compose.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-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. \|
	\| \|
	\| PURPOSE: \|
	\| Compose a new mail message with all headers and attachments \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// define constants for message compose mode
	define('RCUBE_COMPOSE_REPLY', 'reply');
	define('RCUBE_COMPOSE_FORWARD', 'forward');
	define('RCUBE_COMPOSE_DRAFT', 'draft');
	define('RCUBE_COMPOSE_EDIT', 'edit');

	$MESSAGE_FORM = null;
	$COMPOSE_ID = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GET);
	$COMPOSE = null;

	if ($COMPOSE_ID && $_SESSION['compose_data_'.$COMPOSE_ID])
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];

	// give replicated session storage some time to synchronize
	$retries = 0;
	while ($COMPOSE_ID && !is_array($COMPOSE) && $RCMAIL->db->is_replicated() && $retries++ < 5) {
	usleep(500000);
	$RCMAIL->session->reload();
	if ($_SESSION['compose_data_'.$COMPOSE_ID]) {
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];
	}
	}

	// Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or
	// if a compose-ID is given (i.e. when the compose step is opened in a new window/tab).
	if (!is_array($COMPOSE)) {
	// Infinite redirect prevention in case of broken session (#1487028)
	if ($COMPOSE_ID) {
	rcube::raise_error(array('code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid compose ID"), true, true);
	}

	$COMPOSE_ID = uniqid(mt_rand());
	$_SESSION['compose_data_'.$COMPOSE_ID] = array(
	'id' => $COMPOSE_ID,
	'param' => rcube_utils::request2param(rcube_utils::INPUT_GET, 'task\|action', true),
	'mailbox' => $RCMAIL->storage->get_folder(),
	);
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];

	rcmail_process_compose_params($COMPOSE);

	// check if folder for saving sent messages exists and is subscribed (#1486802)
	if ($sent_folder = $COMPOSE['param']['sent_mbox']) {
	rcmail_check_sent_folder($sent_folder, true);
	}

	// redirect to a unique URL with all parameters stored in session
	$OUTPUT->redirect(array(
	'_action' => 'compose',
	'_id' => $COMPOSE['id'],
	'_search' => $_REQUEST['_search'],
	));
	}


	// add some labels to client
	$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'cancel',
	'nobodywarning', 'notsentwarning', 'notuploadedwarning', 'savingmessage', 'sendingmessage',
	'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'uploadingmany',
	'fileuploaderror', 'sendmessage', 'newresponse', 'responsename', 'responsetext', 'save',
	'savingresponse', 'restoresavedcomposedata', 'restoremessage', 'delete', 'restore', 'ignore',
	'selectimportfile');

	$OUTPUT->set_pagetitle($RCMAIL->gettext('compose'));

	$OUTPUT->set_env('compose_id', $COMPOSE['id']);
	$OUTPUT->set_env('session_id', session_id());
	$OUTPUT->set_env('mailbox', $RCMAIL->storage->get_folder());
	$OUTPUT->set_env('top_posting', intval($RCMAIL->config->get('reply_mode')) > 0);
	$OUTPUT->set_env('recipients_separator', trim($RCMAIL->config->get('recipients_separator', ',')));
	$OUTPUT->set_env('save_localstorage', (bool)$RCMAIL->config->get('compose_save_localstorage'));

	$drafts_mbox = $RCMAIL->config->get('drafts_mbox');
	$config_show_sig = $RCMAIL->config->get('show_sig', 1);

	// add config parameters to client script
	if (strlen($drafts_mbox)) {
	$OUTPUT->set_env('drafts_mailbox', $drafts_mbox);
	$OUTPUT->set_env('draft_autosave', $RCMAIL->config->get('draft_autosave'));
	}

	// default font for HTML editor
	$font = rcmail::font_defs($RCMAIL->config->get('default_font'));
	if ($font && !is_array($font)) {
	$OUTPUT->set_env('default_font', $font);
	}

	// default font size for HTML editor
	if ($font_size = $RCMAIL->config->get('default_font_size')) {
	$OUTPUT->set_env('default_font_size', $font_size);
	}

	// get reference message and set compose mode
	if ($msg_uid = $COMPOSE['param']['draft_uid']) {
	$compose_mode = RCUBE_COMPOSE_DRAFT;
	$OUTPUT->set_env('draft_id', $msg_uid);
	$RCMAIL->storage->set_folder($drafts_mbox);
	}
	else if ($msg_uid = $COMPOSE['param']['reply_uid']) {
	$compose_mode = RCUBE_COMPOSE_REPLY;
	}
	else if ($msg_uid = $COMPOSE['param']['forward_uid']) {
	$compose_mode = RCUBE_COMPOSE_FORWARD;
	$COMPOSE['forward_uid'] = $msg_uid;
	$COMPOSE['as_attachment'] = !empty($COMPOSE['param']['attachment']);
	}
	else if ($msg_uid = $COMPOSE['param']['uid']) {
	$compose_mode = RCUBE_COMPOSE_EDIT;
	}

	if ($compose_mode) {
	$COMPOSE['mode'] = $compose_mode;
	$OUTPUT->set_env('compose_mode', $compose_mode);
	}

	if ($compose_mode == RCUBE_COMPOSE_EDIT \|\| $compose_mode == RCUBE_COMPOSE_DRAFT) {
	// don't add signature in draft/edit mode, we'll also not remove the old-one
	// but only on page display, later we should be able to change identity/sig (#1489229)
	if ($config_show_sig == 1 \|\| $config_show_sig == 2) {
	$OUTPUT->set_env('show_sig_later', true);
	}
	}
	else if ($config_show_sig == 1)
	$OUTPUT->set_env('show_sig', true);
	else if ($config_show_sig == 2 && empty($compose_mode))
	$OUTPUT->set_env('show_sig', true);
	else if ($config_show_sig == 3 && ($compose_mode == RCUBE_COMPOSE_REPLY \|\| $compose_mode == RCUBE_COMPOSE_FORWARD))
	$OUTPUT->set_env('show_sig', true);

	// set line length for body wrapping
	$LINE_LENGTH = $RCMAIL->config->get('line_length', 72);

	if (!empty($msg_uid) && empty($COMPOSE['as_attachment'])) {
	$mbox_name = $RCMAIL->storage->get_folder();

	// set format before rcube_message construction
	// use the same format as for the message view
	if (isset($_SESSION['msg_formats'][$mbox_name.':'.$msg_uid])) {
	$RCMAIL->config->set('prefer_html', $_SESSION['msg_formats'][$mbox_name.':'.$msg_uid]);
	}
	else {
	$prefer_html = $RCMAIL->config->get('prefer_html') \|\| $RCMAIL->config->get('htmleditor')
	\|\| $compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT;

	$RCMAIL->config->set('prefer_html', $prefer_html);
	}

	$MESSAGE = new rcube_message($msg_uid);

	// make sure message is marked as read
	if ($MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN'])) {
	$RCMAIL->storage->set_flag($msg_uid, 'SEEN');
	}

	if (!empty($MESSAGE->headers->charset)) {
	$RCMAIL->storage->set_charset($MESSAGE->headers->charset);
	}

	if (!$MESSAGE->headers) {
	// error
	}
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD \|\| $compose_mode == RCUBE_COMPOSE_REPLY) {
	if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	$COMPOSE['reply_uid'] = $msg_uid;

	if (!empty($COMPOSE['param']['all'])) {
	$MESSAGE->reply_all = $COMPOSE['param']['all'];
	}
	}
	else {
	$COMPOSE['forward_uid'] = $msg_uid;
	}

	$COMPOSE['reply_msgid'] = $MESSAGE->headers->messageID;
	$COMPOSE['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID);

	// Save the sent message in the same folder of the message being replied to
	if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $COMPOSE['mailbox'])
	&& rcmail_check_sent_folder($sent_folder, false)
	) {
	$COMPOSE['param']['sent_mbox'] = $sent_folder;
	}
	}
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT) {
	if ($compose_mode == RCUBE_COMPOSE_DRAFT) {
	if ($draft_info = $MESSAGE->headers->get('x-draft-info')) {
	// get reply_uid/forward_uid to flag the original message when sending
	$info = rcmail_draftinfo_decode($draft_info);

	if ($info['type'] == 'reply')
	$COMPOSE['reply_uid'] = $info['uid'];
	else if ($info['type'] == 'forward')
	$COMPOSE['forward_uid'] = $info['uid'];

	$COMPOSE['mailbox'] = $info['folder'];

	// Save the sent message in the same folder of the message being replied to
	if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $info['folder'])
	&& rcmail_check_sent_folder($sent_folder, false)
	) {
	$COMPOSE['param']['sent_mbox'] = $sent_folder;
	}
	}

	$COMPOSE['param']['message-id'] = $MESSAGE->headers->get('message-id');

	// use message UID as draft_id
	$OUTPUT->set_env('draft_id', $msg_uid);
	}

	if ($in_reply_to = $MESSAGE->headers->get('in-reply-to')) {
	$COMPOSE['reply_msgid'] = '<' . $in_reply_to . '>';
	}

	$COMPOSE['references'] = $MESSAGE->headers->references;
	}
	}
	else {
	$MESSAGE = new stdClass();

	// apply mailto: URL parameters
	if (!empty($COMPOSE['param']['in-reply-to'])) {
	$COMPOSE['reply_msgid'] = '<' . $COMPOSE['param']['in-reply-to'] . '>';
	}

	if (!empty($COMPOSE['param']['references'])) {
	$COMPOSE['references'] = $COMPOSE['param']['references'];
	}
	}

	if (!empty($COMPOSE['reply_msgid'])) {
	$OUTPUT->set_env('reply_msgid', $COMPOSE['reply_msgid']);
	}

	$MESSAGE->compose = array();

	// get user's identities
	$MESSAGE->identities = $RCMAIL->user->list_identities(null, true);

	// Set From field value
	if (!empty($_POST['_from'])) {
	$MESSAGE->compose['from'] = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);
	}
	else if (!empty($COMPOSE['param']['from'])) {
	$MESSAGE->compose['from'] = $COMPOSE['param']['from'];
	}
	else if (count($MESSAGE->identities)) {
	$ident = rcmail_identity_select($MESSAGE, $MESSAGE->identities, $compose_mode);

	$MESSAGE->compose['from_email'] = $ident['email'];
	$MESSAGE->compose['from'] = $ident['identity_id'];
	}

	// Set other headers
	$a_recipients = array();
	$parts = array('to', 'cc', 'bcc', 'replyto', 'followupto');
	$separator = trim($RCMAIL->config->get('recipients_separator', ',')) . ' ';
	$from_email = @mb_strtolower($MESSAGE->compose['from_email']);

	foreach ($parts as $header) {
	$fvalue = '';
	$decode_header = true;
	$charset = $MESSAGE->headers->charset;

	// we have a set of recipients stored is session
	if ($header == 'to' && ($mailto_id = $COMPOSE['param']['mailto'])
	&& $_SESSION['mailto'][$mailto_id]
	) {
	$fvalue = urldecode($_SESSION['mailto'][$mailto_id]);
	$decode_header = false;
	$charset = $RCMAIL->output->charset;

	// make session to not grow up too much
	unset($_SESSION['mailto'][$mailto_id]);
	$COMPOSE['param']['to'] = $fvalue;
	}
	else if (!empty($_POST['_'.$header])) {
	$fvalue = rcube_utils::get_input_value('_'.$header, rcube_utils::INPUT_POST, TRUE);
	$charset = $RCMAIL->output->charset;
	}
	else if (!empty($COMPOSE['param'][$header])) {
	$fvalue = $COMPOSE['param'][$header];
	$charset = $RCMAIL->output->charset;
	}
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	// get recipent address(es) out of the message headers
	if ($header == 'to') {
	$mailfollowup = $MESSAGE->headers->others['mail-followup-to'];
	$mailreplyto = $MESSAGE->headers->others['mail-reply-to'];

	// Reply to mailing list...
	if ($MESSAGE->reply_all == 'list' && $mailfollowup)
	$fvalue = $mailfollowup;
	else if ($MESSAGE->reply_all == 'list'
	&& preg_match('/<mailto:([^>]+)>/i', $MESSAGE->headers->others['list-post'], $m))
	$fvalue = $m[1];
	// Reply to...
	else if ($MESSAGE->reply_all && $mailfollowup)
	$fvalue = $mailfollowup;
	else if ($mailreplyto)
	$fvalue = $mailreplyto;
	else if (!empty($MESSAGE->headers->replyto))
	$fvalue = $MESSAGE->headers->replyto;
	else if (!empty($MESSAGE->headers->from))
	$fvalue = $MESSAGE->headers->from;

	// Reply to message sent by yourself (#1487074, #1489230)
	if (!empty($ident) && in_array($ident['ident'], array($fvalue, $MESSAGE->headers->from))) {
	$fvalue = $MESSAGE->headers->to;
	}
	}
	// add recipient of original message if reply to all
	else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') {
	if ($v = $MESSAGE->headers->to)
	$fvalue .= $v;
	if ($v = $MESSAGE->headers->cc)
	$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
	// Use Sender header (#1489011)
	if (($v = $MESSAGE->headers->get('Sender', false)) && strpos($v, '-bounces@') === false)
	$fvalue .= (!empty($fvalue) ? $separator : '') . $v;

	// When To: and Reply-To: are the same we add From: address to the list (#1489037)
	if ($v = $MESSAGE->headers->from) {
	$from = rcube_mime::decode_address_list($v, null, false, $charset, true);
	$to = rcube_mime::decode_address_list($MESSAGE->headers->to, null, false, $charset, true);
	$replyto = rcube_mime::decode_address_list($MESSAGE->headers->replyto, null, false, $charset, true);

	if (count($replyto) && !count(array_diff($to, $replyto)) && count(array_diff($from, $to))) {
	$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
	}
	}
	}
	}
	else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
	// get drafted headers
	if ($header=='to' && !empty($MESSAGE->headers->to))
	$fvalue = $MESSAGE->get_header('to', true);
	else if ($header=='cc' && !empty($MESSAGE->headers->cc))
	$fvalue = $MESSAGE->get_header('cc', true);
	else if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
	$fvalue = $MESSAGE->get_header('bcc', true);
	else if ($header=='replyto' && !empty($MESSAGE->headers->others['mail-reply-to']))
	$fvalue = $MESSAGE->get_header('mail-reply-to');
	else if ($header=='replyto' && !empty($MESSAGE->headers->replyto))
	$fvalue = $MESSAGE->get_header('reply-to');
	else if ($header=='followupto' && !empty($MESSAGE->headers->others['mail-followup-to']))
	$fvalue = $MESSAGE->get_header('mail-followup-to');
	}

	// split recipients and put them back together in a unique way
	if (!empty($fvalue) && in_array($header, array('to', 'cc', 'bcc'))) {
	$to_addresses = rcube_mime::decode_address_list($fvalue, null, $decode_header, $charset);
	$fvalue = array();

	foreach ($to_addresses as $addr_part) {
	if (empty($addr_part['mailto'])) {
	continue;
	}

	// According to RFC5321 local part of email address is case-sensitive
	// however, here it is better to compare addresses in case-insensitive manner
	$mailto = format_email(rcube_utils::idn_to_utf8($addr_part['mailto']));
	$mailto_lc = mb_strtolower($addr_part['mailto']);

	if (($header == 'to' \|\| $compose_mode != RCUBE_COMPOSE_REPLY \|\| $mailto_lc != $from_email)
	&& !in_array($mailto_lc, $a_recipients)
	) {
	if ($addr_part['name'] && $mailto != $addr_part['name']) {
	$mailto = format_email_recipient($mailto, $addr_part['name']);
	}

	$fvalue[] = $mailto;
	$a_recipients[] = $mailto_lc;
	}
	}

	$fvalue = implode($separator, $fvalue);
	}

	$MESSAGE->compose[$header] = $fvalue;
	}
	unset($a_recipients);

	// process $MESSAGE body/attachments, set $MESSAGE_BODY/$HTML_MODE vars and some session data
	$MESSAGE_BODY = rcmail_prepare_message_body();


	// register UI objects
	$OUTPUT->add_handlers(array(
	'composeheaders' => 'rcmail_compose_headers',
	'composesubject' => 'rcmail_compose_subject',
	'composebody' => 'rcmail_compose_body',
	'composeattachmentlist' => 'rcmail_compose_attachment_list',
	'composeattachmentform' => 'rcmail_compose_attachment_form',
	'composeattachment' => 'rcmail_compose_attachment_field',
	'filedroparea' => 'compose_file_drop_area',
	'priorityselector' => 'rcmail_priority_selector',
	'editorselector' => 'rcmail_editor_selector',
	'receiptcheckbox' => 'rcmail_receipt_checkbox',
	'dsncheckbox' => 'rcmail_dsn_checkbox',
	'storetarget' => 'rcmail_store_target_selection',
	'addressbooks' => 'rcmail_addressbook_list',
	'addresslist' => 'rcmail_contacts_list',
	'responseslist' => 'rcmail_compose_responses_list',
	));

	$OUTPUT->send('compose');


	/**** compose mode functions ******/

	// process compose request parameters
	function rcmail_process_compose_params(&$COMPOSE)
	{
	if ($COMPOSE['param']['to']) {
	$mailto = explode('?', $COMPOSE['param']['to'], 2);

	// #1486037: remove "mailto:" prefix
	$COMPOSE['param']['to'] = preg_replace('/^mailto:/i', '', $mailto[0]);

	// Supported case-insensitive tokens in mailto URL
	$url_tokens = array('to', 'cc', 'bcc', 'reply-to', 'in-reply-to', 'references', 'subject', 'body');

	if (!empty($mailto[1])) {
	parse_str($mailto[1], $query);
	foreach ($query as $f => $val) {
	if (($key = array_search(strtolower($f), $url_tokens)) !== false) {
	$f = $url_tokens[$key];
	}

	// merge mailto: addresses with addresses from 'to' parameter
	if ($f == 'to' && !empty($COMPOSE['param']['to'])) {
	$to_addresses = rcube_mime::decode_address_list($COMPOSE['param']['to'], null, true, null, true);
	$add_addresses = rcube_mime::decode_address_list($val, null, true);

	foreach ($add_addresses as $addr) {
	if (!in_array($addr['mailto'], $to_addresses)) {
	$to_addresses[] = $addr['mailto'];
	$COMPOSE['param']['to'] = (!empty($to_addresses) ? ', ' : '') . $addr['string'];
	}
	}
	}
	else {
	$COMPOSE['param'][$f] = $val;
	}
	}
	}
	}

	// resolve _forward_uid=* to an absolute list of messages from a search result
	if ($COMPOSE['param']['forward_uid'] == '*' && is_object($_SESSION['search'][1])) {
	$COMPOSE['param']['forward_uid'] = $_SESSION['search'][1]->get();
	}

	// clean HTML message body which can be submitted by URL
	if (!empty($COMPOSE['param']['body'])) {
	$COMPOSE['param']['body'] = rcmail_wash_html($COMPOSE['param']['body'], array('safe' => false, 'inline_html' => true), array());
	}

	$RCMAIL = rcmail::get_instance();

	// select folder where to save the sent message
	$COMPOSE['param']['sent_mbox'] = $RCMAIL->config->get('sent_mbox');

	// pipe compose parameters thru plugins
	$plugin = $RCMAIL->plugins->exec_hook('message_compose', $COMPOSE);
	$COMPOSE['param'] = array_merge($COMPOSE['param'], $plugin['param']);

	// add attachments listed by message_compose hook
	if (is_array($plugin['attachments'])) {
	foreach ($plugin['attachments'] as $attach) {
	// we have structured data
	if (is_array($attach)) {
	$attachment = $attach + array('group' => $COMPOSE_ID);
	}
	// only a file path is given
	else {
	$filename = basename($attach);
	$attachment = array(
	'group' => $COMPOSE_ID,
	'name' => $filename,
	'mimetype' => rcube_mime::file_content_type($attach, $filename),
	'path' => $attach,
	);
	}

	// save attachment if valid
	if (($attachment['data'] && $attachment['name']) \|\| ($attachment['path'] && file_exists($attachment['path']))) {
	$attachment = rcmail::get_instance()->plugins->exec_hook('attachment_save', $attachment);
	}

	if ($attachment['status'] && !$attachment['abort']) {
	unset($attachment['data'], $attachment['status'], $attachment['abort']);
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	}
	}
	}
	}

	function rcmail_compose_headers($attrib)
	{
	global $RCMAIL, $MESSAGE;

	list($form_start,) = get_form_tags($attrib);

	$out = '';
	$part = strtolower($attrib['part']);

	switch ($part) {
	case 'from':
	return $form_start . rcmail_compose_header_from($attrib);

	case 'to':
	case 'cc':
	case 'bcc':
	$fname = '_' . $part;
	$header = $param = $part;

	$allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex');
	$field_type = 'html_textarea';
	break;

	case 'replyto':
	case 'reply-to':
	$fname = '_replyto';
	$param = 'replyto';
	$header = 'reply-to';

	case 'followupto':
	case 'followup-to':
	if (!$fname) {
	$fname = '_followupto';
	$param = 'followupto';
	$header = 'mail-followup-to';
	}

	$allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
	$field_type = 'html_inputfield';
	break;
	}

	if ($fname && $field_type) {
	// pass the following attributes to the form class
	$field_attrib = array('name' => $fname, 'spellcheck' => 'false');
	foreach ($attrib as $attr => $value) {
	if (in_array($attr, $allow_attrib)) {
	$field_attrib[$attr] = $value;
	}
	}

	// create teaxtarea object
	$input = new $field_type($field_attrib);
	$out = $input->show($MESSAGE->compose[$param]);
	}

	if ($form_start) {
	$out = $form_start . $out;
	}

	// configure autocompletion
	$RCMAIL->autocomplete_init();

	return $out;
	}


	function rcmail_compose_header_from($attrib)
	{
	global $MESSAGE, $OUTPUT, $RCMAIL, $COMPOSE, $compose_mode;

	// pass the following attributes to the form class
	$field_attrib = array('name' => '_from');
	foreach ($attrib as $attr => $value) {
	if (in_array($attr, array('id', 'class', 'style', 'size', 'tabindex'))) {
	$field_attrib[$attr] = $value;
	}
	}

	if (count($MESSAGE->identities)) {
	$a_signatures = array();
	$identities = array();
	$separator = intval($RCMAIL->config->get('reply_mode')) > 0
	&& ($compose_mode == RCUBE_COMPOSE_REPLY \|\| $compose_mode == RCUBE_COMPOSE_FORWARD) ? '---' : '-- ';

	$field_attrib['onchange'] = rcmail_output::JS_OBJECT_NAME.".change_identity(this)";
	$select_from = new html_select($field_attrib);

	// create SELECT element
	foreach ($MESSAGE->identities as $sql_arr) {
	$identity_id = $sql_arr['identity_id'];
	$select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $identity_id);

	// add signature to array
	if (!empty($sql_arr['signature']) && empty($COMPOSE['param']['nosig'])) {
	$text = $html = $sql_arr['signature'];

	if ($sql_arr['html_signature']) {
	$h2t = new rcube_html2text($sql_arr['signature'], false, true);
	$text = trim($h2t->get_text());
	}
	else {
	$html = htmlentities($html, ENT_NOQUOTES, RCUBE_CHARSET);
	}

	if (!preg_match('/^--[ -]\r?\n/m', $text)) {
	$text = $separator . "\n" . $text;
	$html = $separator . "<br>" . $html;
	}

	if (!$sql_arr['html_signature']) {
	$t2h = new rcube_text2html($sql_arr['signature'], false);
	$html = $t2h->get_html();
	}

	$a_signatures[$identity_id]['text'] = $text;
	$a_signatures[$identity_id]['html'] = $html;
	}

	// add bcc and reply-to
	if (!empty($sql_arr['reply-to'])) {
	$identities[$identity_id]['replyto'] = $sql_arr['reply-to'];
	}
	if (!empty($sql_arr['bcc'])) {
	$identities[$identity_id]['bcc'] = $sql_arr['bcc'];
	}
	}

	$out = $select_from->show($MESSAGE->compose['from']);

	// add signatures to client
	$OUTPUT->set_env('signatures', $a_signatures);
	$OUTPUT->set_env('identities', $identities);
	}
	// no identities, display text input field
	else {
	$field_attrib['class'] = 'from_address';
	$input_from = new html_inputfield($field_attrib);
	$out = $input_from->show($MESSAGE->compose['from']);
	}

	return $out;
	}


	function rcmail_compose_editor_mode()
	{
	global $RCMAIL, $compose_mode;
	static $useHtml;

	if ($useHtml !== null) {
	return $useHtml;
	}

	$html_editor = intval($RCMAIL->config->get('htmleditor'));

	if (isset($_POST['_is_html'])) {
	$useHtml = !empty($_POST['_is_html']);
	}
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT) {
	$useHtml = rcmail_message_is_html();
	}
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	$useHtml = ($html_editor == 1 \|\| ($html_editor >= 2 && rcmail_message_is_html()));
	}
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
	$useHtml = ($html_editor == 1 \|\| ($html_editor == 3 && rcmail_message_is_html()));
	}
	else {
	$useHtml = ($html_editor == 1);
	}

	return $useHtml;
	}

	function rcmail_message_is_html()
	{
	global $RCMAIL, $MESSAGE;

	return $RCMAIL->config->get('prefer_html') && ($MESSAGE instanceof rcube_message) && $MESSAGE->has_html_part(true);
	}

	function rcmail_prepare_message_body()
	{
	global $RCMAIL, $MESSAGE, $COMPOSE, $compose_mode, $HTML_MODE;

	// use posted message body
	if (!empty($_POST['_message'])) {
	$body = rcube_utils::get_input_value('_message', rcube_utils::INPUT_POST, true);
	$isHtml = (bool) rcube_utils::get_input_value('_is_html', rcube_utils::INPUT_POST);
	}
	else if ($COMPOSE['param']['body']) {
	$body = $COMPOSE['param']['body'];
	$isHtml = (bool) $COMPOSE['param']['html'];
	}
	// forward as attachment
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $COMPOSE['as_attachment']) {
	$isHtml = rcmail_compose_editor_mode();
	$body = '';

	rcmail_write_forward_attachments();
	}
	// reply/edit/draft/forward
	else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY \|\| intval($RCMAIL->config->get('reply_mode')) != -1)) {
	$isHtml = rcmail_compose_editor_mode();
	$messages = array();

	if (!empty($MESSAGE->parts)) {
	// collect IDs of message/rfc822 parts
	if ($compose_mode == RCUBE_COMPOSE_EDIT \|\| $compose_mode == RCUBE_COMPOSE_DRAFT) {
	foreach ($MESSAGE->attachments as $part) {
	if ($part->mimetype == 'message/rfc822') {
	$messages[] = $part->mime_id;
	}
	}
	}

	foreach ($MESSAGE->parts as $part) {
	// skip no-content and attachment parts (#1488557)
	if ($part->type != 'content' \|\| !$part->size \|\| $MESSAGE->is_attachment($part)) {
	continue;
	}

	// skip all content parts inside the message/rfc822 part in DRAFT/EDIT mode
	foreach ($messages as $mimeid) {
	if (strpos($part->mime_id, $mimeid . '.') === 0) {
	continue 2;
	}
	}

	if ($part_body = rcmail_compose_part_body($part, $isHtml)) {
	$body .= ($body ? ($isHtml ? '<br/>' : "\n") : '') . $part_body;
	}
	}
	}
	else {
	$body = rcmail_compose_part_body($MESSAGE, $isHtml);
	}

	// compose reply-body
	if ($compose_mode == RCUBE_COMPOSE_REPLY)
	$body = rcmail_create_reply_body($body, $isHtml);
	// forward message body inline
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
	$body = rcmail_create_forward_body($body, $isHtml);
	// load draft message body
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT)
	$body = rcmail_create_draft_body($body, $isHtml);
	}
	else { // new message
	$isHtml = rcmail_compose_editor_mode();
	}

	$plugin = $RCMAIL->plugins->exec_hook('message_compose_body',
	array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode));

	$body = $plugin['body'];
	unset($plugin);

	// add blocked.gif attachment (#1486516)
	if ($isHtml && preg_match('#<img src="\./program/resources/blocked\.gif"#', $body)) {
	if ($attachment = rcmail_save_image('program/resources/blocked.gif', 'image/gif')) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
	$body = preg_replace('#\./program/resources/blocked\.gif#', $url, $body);
	}
	}

	$HTML_MODE = $isHtml;

	return $body;
	}

	function rcmail_compose_part_body($part, $isHtml = false)
	{
	global $RCMAIL, $MESSAGE, $LINE_LENGTH, $compose_mode;

	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	if (!rcube_utils::mem_check($part->size * 10)) {
	return '';
	}

	// fetch part if not available
	$body = $MESSAGE->get_part_body($part->mime_id, true);

	// message is cached but not exists (#1485443), or other error
	if ($body === false) {
	return '';
	}

	if ($isHtml) {
	if ($part->ctype_secondary == 'html') {
	}
	else if ($part->ctype_secondary == 'enriched') {
	$body = rcube_enriched::to_html($body);
	}
	else {
	// try to remove the signature
	if ($compose_mode != RCUBE_COMPOSE_DRAFT && $compose_mode != RCUBE_COMPOSE_EDIT) {
	if ($RCMAIL->config->get('strip_existing_sig', true)) {
	$body = rcmail_remove_signature($body);
	}
	}

	// add HTML formatting
	$body = rcmail_plain_body($body, $part->ctype_parameters['format'] == 'flowed');
	}
	}
	else {
	if ($part->ctype_secondary == 'enriched') {
	$body = rcube_enriched::to_html($body);
	$part->ctype_secondary = 'html';
	}

	if ($part->ctype_secondary == 'html') {
	// use html part if it has been used for message (pre)viewing
	// decrease line length for quoting
	$len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
	$txt = new rcube_html2text($body, false, true, $len);
	$body = $txt->get_text();
	}
	else {
	if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
	$body = rcube_mime::unfold_flowed($body);
	}

	// try to remove the signature
	if ($compose_mode != RCUBE_COMPOSE_DRAFT && $compose_mode != RCUBE_COMPOSE_EDIT) {
	if ($RCMAIL->config->get('strip_existing_sig', true)) {
	$body = rcmail_remove_signature($body);
	}
	}
	}
	}

	return $body;
	}

	function rcmail_compose_body($attrib)
	{
	global $RCMAIL, $OUTPUT, $HTML_MODE, $MESSAGE_BODY;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	if (empty($attrib['id']))
	$attrib['id'] = 'rcmComposeBody';

	$attrib['name'] = '_message';

	$isHtml = $HTML_MODE;

	$out = $form_start ? "$form_start\n" : '';

	$saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $RCMAIL->output->get_env('draft_id')));
	$out .= $saveid->show();

	$drafttoggle = new html_hiddenfield(array('name' => '_draft', 'value' => 'yes'));
	$out .= $drafttoggle->show();

	$msgtype = new html_hiddenfield(array('name' => '_is_html', 'value' => ($isHtml ? "1" : "0")));
	$out .= $msgtype->show();

	$framed = new html_hiddenfield(array('name' => '_framed', 'value' => '1'));
	$out .= $framed->show();

	// If desired, set this textarea to be editable by TinyMCE
	if ($isHtml) {
	$MESSAGE_BODY = htmlentities($MESSAGE_BODY, ENT_NOQUOTES, RCUBE_CHARSET);
	$attrib['class'] = 'mce_editor';
	$attrib['is_escaped'] = true;
	$textarea = new html_textarea($attrib);
	$out .= $textarea->show($MESSAGE_BODY);
	}
	else {
	$textarea = new html_textarea($attrib);
	$out .= $textarea->show('');

	// quote plain text, inject into textarea
	$table = get_html_translation_table(HTML_SPECIALCHARS);
	$MESSAGE_BODY = strtr($MESSAGE_BODY, $table);
	$out = substr($out, 0, -11) . $MESSAGE_BODY . '</textarea>';
	}

	$out .= $form_end ? "\n$form_end" : '';

	$OUTPUT->set_env('composebody', $attrib['id']);

	// include HTML editor
	$RCMAIL->html_editor();

	// Set language list
	if ($RCMAIL->config->get('enable_spellcheck')) {
	$engine = new rcube_spellchecker();
	$dictionary = (bool) $RCMAIL->config->get('spellcheck_dictionary');
	$spellcheck_langs = $engine->languages();
	$lang = $_SESSION['language'];

	// if not found in the list, try with two-letter code
	if (!$spellcheck_langs[$lang]) {
	$lang = strtolower(substr($lang, 0, 2));
	}

	if (!$spellcheck_langs[$lang]) {
	$lang = 'en';
	}

	$OUTPUT->set_env('spell_langs', $spellcheck_langs);
	$OUTPUT->set_env('spell_lang', $lang);

	$editor_lang_set = array();
	foreach ($spellcheck_langs as $key => $name) {
	$editor_lang_set[] = ($key == $lang ? '+' : '') . rcube::JQ($name).'='.rcube::JQ($key);
	}

	// include GoogieSpell
	$OUTPUT->include_script('googiespell.js');
	$OUTPUT->add_script(sprintf(
	"var googie = new GoogieSpell('%s/images/googiespell/','%s&lang=', %s);\n".
	"googie.lang_chck_spell = \"%s\";\n".
	"googie.lang_rsm_edt = \"%s\";\n".
	"googie.lang_close = \"%s\";\n".
	"googie.lang_revert = \"%s\";\n".
	"googie.lang_no_error_found = \"%s\";\n".
	"googie.lang_learn_word = \"%s\";\n".
	"googie.setLanguages(%s);\n".
	"googie.setCurrentLanguage('%s');\n".
	"googie.setDecoration(false);\n".
	"googie.decorateTextarea('%s');\n",
	- $RCMAIL->output->get_skin_path(),
	+ $RCMAIL->output->asset_url($RCMAIL->output->get_skin_path()),
	$RCMAIL->url(array('_task' => 'utils', '_action' => 'spell', '_remote' => 1)),
	!empty($dictionary) ? 'true' : 'false',
	rcube::JQ(rcube::Q($RCMAIL->gettext('checkspelling'))),
	rcube::JQ(rcube::Q($RCMAIL->gettext('resumeediting'))),
	rcube::JQ(rcube::Q($RCMAIL->gettext('close'))),
	rcube::JQ(rcube::Q($RCMAIL->gettext('revertto'))),
	rcube::JQ(rcube::Q($RCMAIL->gettext('nospellerrors'))),
	rcube::JQ(rcube::Q($RCMAIL->gettext('addtodict'))),
	rcube_output::json_serialize($spellcheck_langs),
	$lang,
	$attrib['id']), 'foot');

	$OUTPUT->add_label('checking');
	$OUTPUT->set_env('spellcheck_langs', join(',', $editor_lang_set));
	}

	$out .= "\n".'<iframe name="savetarget" src="program/resources/blank.gif" style="width:0;height:0;border:none;visibility:hidden;" aria-hidden="true"></iframe>';

	return $out;
	}


	function rcmail_create_reply_body($body, $bodyIsHtml)
	{
	global $RCMAIL, $MESSAGE, $LINE_LENGTH;

	// build reply prefix
	$from = array_pop(rcube_mime::decode_address_list($MESSAGE->get_header('from'), 1, false, $MESSAGE->headers->charset));
	$prefix = $RCMAIL->gettext(array(
	'name' => 'mailreplyintro',
	'vars' => array(
	'date' => $RCMAIL->format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long')),
	'sender' => $from['name'] ? $from['name'] : rcube_utils::idn_to_utf8($from['mailto']),
	)
	));

	$reply_mode = intval($RCMAIL->config->get('reply_mode'));

	if (!$bodyIsHtml) {
	$body = preg_replace('/\r?\n/', "\n", $body);
	$body = trim($body, "\n");

	// soft-wrap and quote message text
	$body = rcmail_wrap_and_quote($body, $LINE_LENGTH);

	$prefix .= "\n";

	if ($reply_mode > 0) { // top-posting
	$prefix = "\n\n\n" . $prefix;
	$suffix = '';
	}
	else {
	$suffix = "\n";
	}
	}
	else {
	// save inline images to files
	$cid_map = rcmail_write_inline_attachments($MESSAGE);
	// set is_safe flag (we need this for html body washing)
	rcmail_check_safe($MESSAGE);
	// clean up html tags
	$body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map);

	// build reply (quote content)
	$prefix = '<p>' . rcube::Q($prefix) . "</p>\n";
	$prefix .= '<blockquote>';

	if ($reply_mode > 0) { // top-posting
	$prefix = '<br>' . $prefix;
	$suffix = '</blockquote>';
	}
	else {
	$suffix = '</blockquote><p></p>';
	}
	}

	return $prefix . $body . $suffix;
	}


	function rcmail_create_forward_body($body, $bodyIsHtml)
	{
	global $RCMAIL, $MESSAGE, $COMPOSE;

	// add attachments
	if (!isset($COMPOSE['forward_attachments']) && is_array($MESSAGE->mime_parts)) {
	$cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);
	}

	$date = $RCMAIL->format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long'));

	if (!$bodyIsHtml) {
	$prefix = "\n\n\n-------- " . $RCMAIL->gettext('originalmessage') . " --------\n";
	$prefix .= $RCMAIL->gettext('subject') . ': ' . $MESSAGE->subject . "\n";
	$prefix .= $RCMAIL->gettext('date') . ': ' . $date . "\n";
	$prefix .= $RCMAIL->gettext('from') . ': ' . $MESSAGE->get_header('from') . "\n";
	$prefix .= $RCMAIL->gettext('to') . ': ' . $MESSAGE->get_header('to') . "\n";

	if ($cc = $MESSAGE->headers->get('cc')) {
	$prefix .= $RCMAIL->gettext('cc') . ': ' . $cc . "\n";
	}
	if (($replyto = $MESSAGE->headers->get('reply-to')) && $replyto != $MESSAGE->get_header('from')) {
	$prefix .= $RCMAIL->gettext('replyto') . ': ' . $replyto . "\n";
	}

	$prefix .= "\n";
	$body = trim($body, "\r\n");
	}
	else {
	// set is_safe flag (we need this for html body washing)
	rcmail_check_safe($MESSAGE);

	// clean up html tags
	$body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map);

	$prefix = sprintf(
	"<br /><p>-------- " . $RCMAIL->gettext('originalmessage') . " --------</p>" .
	"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	$RCMAIL->gettext('subject'), rcube::Q($MESSAGE->subject),
	$RCMAIL->gettext('date'), rcube::Q($date),
	$RCMAIL->gettext('from'), rcube::Q($MESSAGE->get_header('from'), 'replace'),
	$RCMAIL->gettext('to'), rcube::Q($MESSAGE->get_header('to'), 'replace'));

	if ($cc = $MESSAGE->headers->get('cc'))
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	$RCMAIL->gettext('cc'), rcube::Q($cc, 'replace'));

	if (($replyto = $MESSAGE->headers->get('reply-to')) && $replyto != $MESSAGE->get_header('from'))
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	$RCMAIL->gettext('replyto'), rcube::Q($replyto, 'replace'));

	$prefix .= "</tbody></table><br>";
	}

	return $prefix . $body;
	}


	function rcmail_create_draft_body($body, $bodyIsHtml)
	{
	global $MESSAGE, $COMPOSE;

	// add attachments
	// sizeof($MESSAGE->mime_parts can be 1 - e.g. attachment, but no text!
	if (empty($COMPOSE['forward_attachments'])
	&& is_array($MESSAGE->mime_parts)
	&& count($MESSAGE->mime_parts) > 0
	) {
	$cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);
	}

	// clean up HTML tags - XSS prevention (#1489251)
	if ($bodyIsHtml) {
	$body = rcmail_wash_html($body, array('safe' => 1), $cid_map);

	// remove comments (produced by washtml)
	$body = preg_replace('/<!--[^>]+-->/', '', $body);

	// replace cid with href in inline images links
	if (!empty($cid_map)) {
	$body = str_replace(array_keys($cid_map), array_values($cid_map), $body);
	}
	}

	return $body;
	}


	function rcmail_remove_signature($body)
	{
	global $RCMAIL;

	$body = str_replace("\r\n", "\n", $body);
	$len = strlen($body);
	$sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15);

	while (($sp = strrpos($body, "-- \n", $sp ? -$len+$sp-1 : 0)) !== false) {
	if ($sp == 0 \|\| $body[$sp-1] == "\n") {
	// do not touch blocks with more that X lines
	if (substr_count($body, "\n", $sp) < $sig_max_lines) {
	$body = substr($body, 0, max(0, $sp-1));
	}
	break;
	}
	}

	return $body;
	}


	function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
	{
	global $RCMAIL, $COMPOSE, $compose_mode;

	$loaded_attachments = array();
	foreach ((array)$COMPOSE['attachments'] as $attachment) {
	$loaded_attachments[$attachment['name'] . $attachment['mimetype']] = $attachment;
	}

	$cid_map = array();
	$messages = array();

	foreach ((array)$message->mime_parts as $pid => $part) {
	if ($part->disposition == 'attachment' \|\| ($part->disposition == 'inline' && $bodyIsHtml) \|\| $part->filename) {
	// skip parts that aren't valid attachments
	if ($part->ctype_primary == 'multipart' \|\| $part->mimetype == 'application/ms-tnef') {
	continue;
	}

	// skip message attachments in reply mode
	if ($part->ctype_primary == 'message' && $compose_mode == RCUBE_COMPOSE_REPLY) {
	continue;
	}

	// skip inline images when forwarding in text mode
	if ($part->content_id && $part->disposition == 'inline' && !$bodyIsHtml && $compose_mode == RCUBE_COMPOSE_FORWARD) {
	continue;
	}

	// skip message/rfc822 attachments on forwards (#1489214)
	// Thunderbird when forwarding in inline mode displays such attachments
	// and skips any attachments from inside of such part, this however
	// skipped e.g. images used in HTML body or other attachments. So,
	// better to skip .eml attachments but not their content (included files).
	if ($part->mimetype == 'message/rfc822') {
	if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
	continue;
	}
	$messages[] = $part->mime_id;
	}
	else if ($compose_mode != RCUBE_COMPOSE_FORWARD) {
	// skip attachments included in message/rfc822 attachment (#1486487)
	foreach ($messages as $mimeid) {
	if (strpos($part->mime_id, $mimeid . '.') === 0) {
	continue 2;
	}
	}
	}

	if (($attachment = $loaded_attachments[rcmail_attachment_name($part) . $part->mimetype])
	\|\| ($attachment = rcmail_save_attachment($message, $pid))
	) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;

	if ($bodyIsHtml && ($part->content_id \|\| $part->content_location)) {
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);

	if ($part->content_id)
	$cid_map['cid:'.$part->content_id] = $url;
	else
	$cid_map[$part->content_location] = $url;
	}
	}
	}
	}

	$COMPOSE['forward_attachments'] = true;

	return $cid_map;
	}


	function rcmail_write_inline_attachments(&$message)
	{
	global $RCMAIL, $COMPOSE;

	$cid_map = array();
	foreach ((array)$message->mime_parts as $pid => $part) {
	if (($part->content_id \|\| $part->content_location) && $part->filename) {
	if ($attachment = rcmail_save_attachment($message, $pid)) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);

	if ($part->content_id)
	$cid_map['cid:'.$part->content_id] = $url;
	else
	$cid_map[$part->content_location] = $url;
	}
	}
	}

	return $cid_map;
	}

	// Creates attachment(s) from the forwarded message(s)
	function rcmail_write_forward_attachments()
	{
	global $RCMAIL, $COMPOSE, $MESSAGE;

	$storage = $RCMAIL->get_storage();
	$names = array();
	$refs = array();

	$loaded_attachments = array();
	foreach ((array)$COMPOSE['attachments'] as $attachment) {
	$loaded_attachments[$attachment['name'] . $attachment['mimetype']] = $attachment;
	}

	if ($COMPOSE['forward_uid'] == '*') {
	$index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order());
	$COMPOSE['forward_uid'] = $index->get();
	}
	else if (!is_array($COMPOSE['forward_uid']) && strpos($COMPOSE['forward_uid'], ':')) {
	$COMPOSE['forward_uid'] = rcube_imap_generic::uncompressMessageSet($COMPOSE['forward_uid']);
	}
	else if (is_string($COMPOSE['forward_uid'])) {
	$COMPOSE['forward_uid'] = explode(',', $COMPOSE['forward_uid']);
	}

	foreach ((array)$COMPOSE['forward_uid'] as $uid) {
	$message = new rcube_message($uid);

	if (empty($message->headers)) {
	continue;
	}

	if (!empty($message->headers->charset)) {
	$storage->set_charset($message->headers->charset);
	}

	if (empty($MESSAGE->subject)) {
	$MESSAGE->subject = $message->subject;
	}

	// generate (unique) attachment name
	$name = strlen($message->subject) ? mb_substr($message->subject, 0, 64) : 'message_rfc822';
	if (!empty($names[$name])) {
	$names[$name]++;
	$name .= '_' . $names[$name];
	}
	$names[$name] = 1;
	$name .= '.eml';

	$data = $path = null;

	if (!empty($loaded_attachments[$name . 'message/rfc822'])) {
	continue;
	}

	// don't load too big attachments into memory
	if (!rcube_utils::mem_check($message->size)) {
	$temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
	$path = tempnam($temp_dir, 'rcmAttmnt');
	if ($fp = fopen($path, 'w')) {
	$storage->get_raw_body($message->uid, $fp);
	fclose($fp);
	}
	else {
	return false;
	}
	}
	else {
	$data = $storage->get_raw_body($message->uid);
	}

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => $name,
	'mimetype' => 'message/rfc822',
	'data' => $data,
	'path' => $path,
	'size' => $path ? filesize($path) : strlen($data),
	);

	$attachment = $RCMAIL->plugins->exec_hook('attachment_save', $attachment);

	if ($attachment['status']) {
	unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	}
	else if ($path) {
	@unlink($path);
	}

	if ($message->headers->messageID) {
	$refs[] = $message->headers->messageID;
	}
	}

	// set In-Reply-To and References headers
	if (count($refs) == 1) {
	$COMPOSE['reply_msgid'] = $refs[0];
	}
	if (!empty($refs)) {
	$COMPOSE['references'] = implode(' ', $refs);
	}
	}


	function rcmail_save_attachment(&$message, $pid)
	{
	global $COMPOSE;

	$rcmail = rcmail::get_instance();
	$part = $message->mime_parts[$pid];
	$data = $path = null;

	// don't load too big attachments into memory
	if (!rcube_utils::mem_check($part->size)) {
	$temp_dir = unslashify($rcmail->config->get('temp_dir'));
	$path = tempnam($temp_dir, 'rcmAttmnt');

	if ($fp = fopen($path, 'w')) {
	$message->get_part_body($pid, false, 0, $fp);
	fclose($fp);
	}
	else {
	return false;
	}
	}
	else {
	$data = $message->get_part_body($pid);
	}

	$mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
	$filename = rcmail_attachment_name($part);

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => $filename,
	'mimetype' => $mimetype,
	'content_id' => $part->content_id,
	'data' => $data,
	'path' => $path,
	'size' => $path ? filesize($path) : strlen($data),
	'charset' => $part->charset,
	);

	$attachment = $rcmail->plugins->exec_hook('attachment_save', $attachment);

	if ($attachment['status']) {
	unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
	return $attachment;
	}
	else if ($path) {
	@unlink($path);
	}

	return false;
	}

	function rcmail_save_image($path, $mimetype='')
	{
	global $COMPOSE;

	// handle attachments in memory
	$data = file_get_contents($path);
	$name = rcmail_basename($path);

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => $name,
	'mimetype' => $mimetype ? $mimetype : rcube_mime::file_content_type($path, $name),
	'data' => $data,
	'size' => strlen($data),
	);

	$attachment = rcmail::get_instance()->plugins->exec_hook('attachment_save', $attachment);

	if ($attachment['status']) {
	unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
	return $attachment;
	}

	return false;
	}

	function rcmail_basename($filename)
	{
	// basename() is not unicode safe and locale dependent
	if (stristr(PHP_OS, 'win') \|\| stristr(PHP_OS, 'netware')) {
	return preg_replace('/^.*[\\\\\\/]/', '', $filename);
	}
	else {
	return preg_replace('/^.*[\/]/', '', $filename);
	}
	}

	function rcmail_compose_subject($attrib)
	{
	global $MESSAGE, $COMPOSE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_subject';
	$attrib['spellcheck'] = 'true';

	$textfield = new html_inputfield($attrib);
	$subject = '';

	// use subject from post
	if (isset($_POST['_subject'])) {
	$subject = rcube_utils::get_input_value('_subject', rcube_utils::INPUT_POST, TRUE);
	}
	else if (!empty($COMPOSE['param']['subject'])) {
	$subject = $COMPOSE['param']['subject'];
	}
	// create a reply-subject
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	if (preg_match('/^re:/i', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Re: '.$MESSAGE->subject;

	// replace (was: ...) (#1489375)
	$subject = preg_replace('/\s$[wW]as:[^$]+\)\s$/', '', $subject);
	}
	// create a forward-subject
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
	if (preg_match('/^fwd:/i', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Fwd: '.$MESSAGE->subject;
	}
	// creeate a draft-subject
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT) {
	$subject = $MESSAGE->subject;
	}

	$out = $form_start ? "$form_start\n" : '';
	$out .= $textfield->show($subject);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_compose_attachment_list($attrib)
	{
	global $RCMAIL, $OUTPUT, $COMPOSE;

	// add ID if not given
	if (!$attrib['id'])
	$attrib['id'] = 'rcmAttachmentList';

	$out = "\n";
	$jslist = array();
	$button = '';
	$skin_path = $RCMAIL->config->get('skin_path');

	if (is_array($COMPOSE['attachments'])) {
	if ($attrib['deleteicon']) {
	$button = html::img(array(
	'src' => $skin_path . $attrib['deleteicon'],
	'alt' => $RCMAIL->gettext('delete')
	));
	}
	else if (rcube_utils::get_boolean($attrib['textbuttons'])) {
	$button = rcube::Q($RCMAIL->gettext('delete'));
	}

	foreach ($COMPOSE['attachments'] as $id => $a_prop) {
	if (empty($a_prop)) {
	continue;
	}

	$out .= html::tag('li', array(
	'id' => 'rcmfile'.$id,
	'class' => rcube_utils::file2class($a_prop['mimetype'], $a_prop['name']),
	'onmouseover' => "rcube_webmail.long_subject_title_ex(this, 0)",
	),
	html::a(array(
	'href' => "#delete",
	'title' => $RCMAIL->gettext('delete'),
	'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", rcmail_output::JS_OBJECT_NAME, $id),
	'class' => 'delete',
	'tabindex' => $attrib['tabindex'] ?: '0',
	'aria-label' => $RCMAIL->gettext('delete') . ' ' . $a_prop['name'],
	),
	$button
	) . rcube::Q($a_prop['name'])
	);

	$jslist['rcmfile'.$id] = array(
	'name' => $a_prop['name'],
	'complete' => true,
	'mimetype' => $a_prop['mimetype']
	);
	}
	}

	if ($attrib['deleteicon'])
	$COMPOSE['deleteicon'] = $skin_path . $attrib['deleteicon'];
	else if (rcube_utils::get_boolean($attrib['textbuttons']))
	$COMPOSE['textbuttons'] = true;
	if ($attrib['cancelicon'])
	$OUTPUT->set_env('cancelicon', $skin_path . $attrib['cancelicon']);
	if ($attrib['loadingicon'])
	$OUTPUT->set_env('loadingicon', $skin_path . $attrib['loadingicon']);

	$OUTPUT->set_env('attachments', $jslist);
	$OUTPUT->add_gui_object('attachmentlist', $attrib['id']);

	// put tabindex value into data-tabindex attribute
	if (isset($attrib['tabindex'])) {
	$attrib['data-tabindex'] = $attrib['tabindex'];
	unset($attrib['tabindex']);
	}

	return html::tag('ul', $attrib, $out, html::$common_attrib);
	}


	function rcmail_compose_attachment_form($attrib)
	{
	global $OUTPUT, $RCMAIL;

	// set defaults
	$attrib += array('id' => 'rcmUploadbox', 'buttons' => 'yes');

	// Get filesize, enable upload progress bar
	$max_filesize = $RCMAIL->upload_init();

	$button = new html_inputfield(array('type' => 'button'));
	$content = html::div(null, rcmail_compose_attachment_field())
	. html::div('hint', $RCMAIL->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))));

	if (rcube_utils::get_boolean($attrib['buttons'])) {
	$content .= html::div('buttons',
	$button->show($RCMAIL->gettext('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
	$button->show($RCMAIL->gettext('upload'), array('class' => 'button mainaction', 'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
	);
	}

	$out = html::div($attrib, $OUTPUT->form_tag(array(
	'id' => $attrib['id'] . 'Frm',
	'name' => 'uploadform',
	'method' => 'post',
	'enctype' => 'multipart/form-data'
	), $content
	));

	$OUTPUT->add_gui_object('uploadform', $attrib['id'] . 'Frm');

	return $out;
	}


	function rcmail_compose_attachment_field($attrib = array())
	{
	$attrib['type'] = 'file';
	$attrib['name'] = '_attachments[]';
	$attrib['multiple'] = 'multiple';

	$field = new html_inputfield($attrib);

	return $field->show();
	}


	function rcmail_priority_selector($attrib)
	{
	global $RCMAIL, $MESSAGE;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_priority';
	$prio_list = array(
	$RCMAIL->gettext('lowest') => 5,
	$RCMAIL->gettext('low') => 4,
	$RCMAIL->gettext('normal') => 0,
	$RCMAIL->gettext('high') => 2,
	$RCMAIL->gettext('highest') => 1,
	);

	$selector = new html_select($attrib);
	$selector->add(array_keys($prio_list), array_values($prio_list));

	if (isset($_POST['_priority']))
	$sel = $_POST['_priority'];
	else if (isset($MESSAGE->headers->priority) && intval($MESSAGE->headers->priority) != 3)
	$sel = $MESSAGE->headers->priority;
	else
	$sel = 0;

	$out = $form_start ? "$form_start\n" : '';
	$out .= $selector->show((int) $sel);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_receipt_checkbox($attrib)
	{
	global $RCMAIL, $MESSAGE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	if (!isset($attrib['id']))
	$attrib['id'] = 'receipt';

	$attrib['name'] = '_receipt';
	$attrib['value'] = '1';

	$checkbox = new html_checkbox($attrib);

	if (isset($_POST['_receipt']))
	$mdn_default = $_POST['_receipt'];
	else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
	$mdn_default = (bool) $MESSAGE->headers->mdn_to;
	else
	$mdn_default = $RCMAIL->config->get('mdn_default');

	$out = $form_start ? "$form_start\n" : '';
	$out .= $checkbox->show($mdn_default);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_dsn_checkbox($attrib)
	{
	global $RCMAIL;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	if (!isset($attrib['id']))
	$attrib['id'] = 'dsn';

	$attrib['name'] = '_dsn';
	$attrib['value'] = '1';

	$checkbox = new html_checkbox($attrib);

	if (isset($_POST['_dsn']))
	$dsn_value = (int) $_POST['_dsn'];
	else
	$dsn_value = $RCMAIL->config->get('dsn_default');

	$out = $form_start ? "$form_start\n" : '';
	$out .= $checkbox->show($dsn_value);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_editor_selector($attrib)
	{
	global $RCMAIL;

	// determine whether HTML or plain text should be checked
	$useHtml = rcmail_compose_editor_mode();

	if (empty($attrib['editorid']))
	$attrib['editorid'] = 'rcmComposeBody';

	if (empty($attrib['name']))
	$attrib['name'] = 'editorSelect';

	$attrib['onchange'] = "return rcmail.command('toggle-editor', {id: '".$attrib['editorid']."', html: this.value == 'html'}, '', event)";

	$select = new html_select($attrib);

	$select->add(rcube::Q($RCMAIL->gettext('htmltoggle')), 'html');
	$select->add(rcube::Q($RCMAIL->gettext('plaintoggle')), 'plain');

	return $select->show($useHtml ? 'html' : 'plain');
	}


	function rcmail_store_target_selection($attrib)
	{
	global $COMPOSE, $RCMAIL;

	$attrib['name'] = '_store_target';
	$select = $RCMAIL->folder_selector(array_merge($attrib, array(
	'noselection' => '- ' . $RCMAIL->gettext('dontsave') . ' -',
	'folder_filter' => 'mail',
	'folder_rights' => 'w',
	)));

	return $select->show(isset($_POST['_store_target']) ? $_POST['_store_target'] : $COMPOSE['param']['sent_mbox'], $attrib);
	}


	function rcmail_check_sent_folder($folder, $create=false)
	{
	global $RCMAIL;

	// we'll not save the message, so it doesn't matter
	if ($RCMAIL->config->get('no_save_sent_messages')) {
	return true;
	}

	if ($RCMAIL->storage->folder_exists($folder, true)) {
	return true;
	}

	// folder may exist but isn't subscribed (#1485241)
	if ($create) {
	if (!$RCMAIL->storage->folder_exists($folder))
	return $RCMAIL->storage->create_folder($folder, true);
	else
	return $RCMAIL->storage->subscribe($folder);
	}

	return false;
	}


	function get_form_tags($attrib)
	{
	global $RCMAIL, $MESSAGE_FORM, $COMPOSE;

	$form_start = '';
	if (!$MESSAGE_FORM) {
	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
	$hiddenfields->add(array('name' => '_action', 'value' => 'send'));
	$hiddenfields->add(array('name' => '_id', 'value' => $COMPOSE['id']));
	$hiddenfields->add(array('name' => '_attachments'));

	$form_start = empty($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
	$form_start .= $hiddenfields->show();
	}

	$form_end = ($MESSAGE_FORM && !strlen($attrib['form'])) ? '</form>' : '';
	$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';

	if (!$MESSAGE_FORM)
	$RCMAIL->output->add_gui_object('messageform', $form_name);

	$MESSAGE_FORM = $form_name;

	return array($form_start, $form_end);
	}


	function rcmail_addressbook_list($attrib = array())
	{
	global $RCMAIL, $OUTPUT;

	$attrib += array('id' => 'rcmdirectorylist');

	$out = '';
	$line_templ = html::tag('li', array(
	'id' => 'rcmli%s', 'class' => '%s'),
	html::a(array('href' => '#list',
	'rel' => '%s',
	'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('list-adresses','%s',this)"), '%s'));

	foreach ($RCMAIL->get_address_sources(false, true) as $j => $source) {
	$id = strval(strlen($source['id']) ? $source['id'] : $j);
	$js_id = rcube::JQ($id);

	// set class name(s)
	$class_name = 'addressbook';
	if ($source['class_name'])
	$class_name .= ' ' . $source['class_name'];

	$out .= sprintf($line_templ,
	rcube_utils::html_identifier($id,true),
	$class_name,
	$source['id'],
	$js_id, (!empty($source['name']) ? $source['name'] : $id));
	}

	$OUTPUT->add_gui_object('addressbookslist', $attrib['id']);

	return html::tag('ul', $attrib, $out, html::$common_attrib);
	}

	// return the contacts list as HTML table
	function rcmail_contacts_list($attrib = array())
	{
	global $RCMAIL, $OUTPUT;

	$attrib += array('id' => 'rcmAddressList');

	// set client env
	$OUTPUT->add_gui_object('contactslist', $attrib['id']);
	$OUTPUT->set_env('pagecount', 0);
	$OUTPUT->set_env('current_page', 0);
	$OUTPUT->include_script('list.js');

	return $RCMAIL->table_output($attrib, array(), array('name'), 'ID');
	}


	/**
	* Register a certain container as active area to drop files onto
	*/
	function compose_file_drop_area($attrib)
	{
	global $OUTPUT;

	if ($attrib['id']) {
	$OUTPUT->add_gui_object('filedrop', $attrib['id']);
	$OUTPUT->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
	}
	}


	/**
	*
	*/
	function rcmail_compose_responses_list($attrib)
	{
	global $RCMAIL, $OUTPUT;

	$attrib += array('id' => 'rcmresponseslist', 'tagname' => 'ul', 'cols' => 1);

	$jsenv = array();
	$list = new html_table($attrib);
	foreach ($RCMAIL->get_compose_responses(true) as $response) {
	$key = $response['key'];
	$item = html::a(array(
	'href' => '#'.urlencode($response['name']),
	'class' => rtrim('insertresponse ' . $attrib['itemclass']),
	'unselectable' => 'on',
	'tabindex' => '0',
	'rel' => $key,
	), rcube::Q($response['name']));

	$jsenv[$key] = $response;
	$list->add(array(), $item);
	}

	// set client env
	$OUTPUT->set_env('textresponses', $jsenv);
	$OUTPUT->add_gui_object('responseslist', $attrib['id']);

	return $list->show();
	}
	diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
	index 5adc97900..d9233a923 100644
	--- a/program/steps/mail/show.inc
	+++ b/program/steps/mail/show.inc
	@@ -1,361 +1,361 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/show.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-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. \|
	\| \|
	\| PURPOSE: \|
	\| Display a mail message similar as a usual mail application does \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$PRINT_MODE = $RCMAIL->action == 'print' ? TRUE : FALSE;

	// Read browser capabilities and store them in session
	if ($caps = rcube_utils::get_input_value('_caps', rcube_utils::INPUT_GET)) {
	$browser_caps = array();
	foreach (explode(',', $caps) as $cap) {
	$cap = explode('=', $cap);
	$browser_caps[$cap[0]] = $cap[1];
	}
	$_SESSION['browser_caps'] = $browser_caps;
	}

	$uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
	$mbox_name = $RCMAIL->storage->get_folder();

	// similar code as in program/steps/mail/get.inc
	if ($uid) {
	// set message format (need to be done before rcube_message construction)
	if (!empty($_GET['_format'])) {
	$prefer_html = $_GET['_format'] == 'html';
	$RCMAIL->config->set('prefer_html', $prefer_html);
	$_SESSION['msg_formats'][$mbox_name.':'.$uid] = $prefer_html;
	}
	else if (isset($_SESSION['msg_formats'][$mbox_name.':'.$uid])) {
	$RCMAIL->config->set('prefer_html', $_SESSION['msg_formats'][$mbox_name.':'.$uid]);
	}

	$MESSAGE = new rcube_message($uid);

	// if message not found (wrong UID)...
	if (empty($MESSAGE->headers)) {
	rcmail_message_error($uid);
	}


	// show images?
	rcmail_check_safe($MESSAGE);

	// set message charset as default
	if (!empty($MESSAGE->headers->charset)) {
	$RCMAIL->storage->set_charset($MESSAGE->headers->charset);
	}

	$OUTPUT->set_pagetitle(abbreviate_string($MESSAGE->subject, 128, '...', true));

	// set message environment
	$OUTPUT->set_env('uid', $MESSAGE->uid);
	$OUTPUT->set_env('safemode', $MESSAGE->is_safe);
	$OUTPUT->set_env('sender', $MESSAGE->sender['string']);
	$OUTPUT->set_env('mailbox', $mbox_name);
	$OUTPUT->set_env('permaurl', $RCMAIL->url(array('_action' => 'show', '_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));

	if ($MESSAGE->headers->get('list-post', false)) {
	$OUTPUT->set_env('list_post', true);
	}

	// set environment
	$OUTPUT->set_env('delimiter', $RCMAIL->storage->get_hierarchy_delimiter());

	// set configuration
	$RCMAIL->set_env_config(array('delete_junk', 'flag_for_deletion', 'read_when_deleted',
	'skip_deleted', 'display_next', 'forward_attachment'));

	// set special folders
	foreach (array('drafts', 'trash', 'junk') as $mbox) {
	if ($folder = $RCMAIL->config->get($mbox . '_mbox')) {
	$OUTPUT->set_env($mbox . '_mailbox', $folder);
	}
	}

	// mimetypes supported by the browser (default settings)
	$mimetypes = (array)$RCMAIL->config->get('client_mimetypes');

	// Remove unsupported types, which makes that attachment which cannot be
	// displayed in a browser will be downloaded directly without displaying an overlay page
	if (empty($_SESSION['browser_caps']['pdf']) && ($key = array_search('application/pdf', $mimetypes)) !== false) {
	unset($mimetypes[$key]);
	}
	if (empty($_SESSION['browser_caps']['flash']) && ($key = array_search('application/x-shockwave-flash', $mimetypes)) !== false) {
	unset($mimetypes[$key]);
	}
	if (empty($_SESSION['browser_caps']['tif']) && ($key = array_search('image/tiff', $mimetypes)) !== false) {
	// we can convert tiff to jpeg
	if (!rcube_image::is_convertable('image/tiff')) {
	unset($mimetypes[$key]);
	}
	}

	$OUTPUT->set_env('mimetypes', array_values($mimetypes));

	if ($MESSAGE->has_html_part()) {
	$prefer_html = $RCMAIL->config->get('prefer_html');
	$OUTPUT->set_env('optional_format', $prefer_html ? 'text' : 'html');
	}

	if (!$OUTPUT->ajax_call) {
	$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
	'movingmessage', 'deletingmessage', 'markingmessage', 'replyall', 'replylist');
	}

	// check for unset disposition notification
	if ($MESSAGE->headers->mdn_to
	&& empty($MESSAGE->headers->flags['MDNSENT'])
	&& empty($MESSAGE->headers->flags['SEEN'])
	&& ($RCMAIL->storage->check_permflag('MDNSENT') \|\| $RCMAIL->storage->check_permflag('*'))
	&& $mbox_name != $RCMAIL->config->get('drafts_mbox')
	&& $mbox_name != $RCMAIL->config->get('sent_mbox')
	) {
	$mdn_cfg = intval($RCMAIL->config->get('mdn_requests'));

	if ($mdn_cfg == 1 \|\| (($mdn_cfg == 3 \|\| $mdn_cfg == 4) && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
	// Send MDN
	if (rcmail_send_mdn($MESSAGE, $smtp_error))
	$OUTPUT->show_message('receiptsent', 'confirmation');
	else if ($smtp_error)
	$OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
	else
	$OUTPUT->show_message('errorsendingreceipt', 'error');
	}
	else if ($mdn_cfg != 2 && $mdn_cfg != 4) {
	// Ask user
	$OUTPUT->add_label('mdnrequest');
	$OUTPUT->set_env('mdn_request', true);
	}
	}

	if (empty($MESSAGE->headers->flags['SEEN'])
	&& ($RCMAIL->action == 'show' \|\| ($RCMAIL->action == 'preview' && intval($RCMAIL->config->get('preview_pane_mark_read')) == 0))
	) {
	$RCMAIL->output->command('set_unread_message', $MESSAGE->uid, $mbox_name);
	$RCMAIL->plugins->exec_hook('message_read', array(
	'uid' => $MESSAGE->uid,
	'mailbox' => $mbox_name,
	'message' => $MESSAGE,
	));

	$set_seen_flag = true;
	}
	}


	$OUTPUT->add_handlers(array(
	'messageattachments' => 'rcmail_message_attachments',
	'mailboxname' => 'rcmail_mailbox_name_display',
	'messageobjects' => 'rcmail_message_objects',
	'contactphoto' => 'rcmail_message_contactphoto',
	));


	if ($RCMAIL->action == 'print' && $OUTPUT->template_exists('messageprint'))
	$OUTPUT->send('messageprint', false);
	else if ($RCMAIL->action == 'preview' && $OUTPUT->template_exists('messagepreview'))
	$OUTPUT->send('messagepreview', false);
	else
	$OUTPUT->send('message', false);


	// mark message as read
	if (!empty($set_seen_flag)) {
	if ($RCMAIL->storage->set_flag($MESSAGE->uid, 'SEEN', $mbox_name)) {
	if ($count = rcmail_get_unseen_count($mbox_name)) {
	rcmail_set_unseen_count($mbox_name, $count - 1);
	}
	}
	}

	exit;



	function rcmail_message_attachments($attrib)
	{
	global $PRINT_MODE, $MESSAGE, $RCMAIL;

	$out = $ol = '';
	$attachments = array();

	if (sizeof($MESSAGE->attachments)) {
	foreach ($MESSAGE->attachments as $attach_prop) {
	$filename = rcmail_attachment_name($attach_prop, true);
	$size = '';

	if ($PRINT_MODE) {
	$size = $RCMAIL->message_part_size($attach_prop);
	$ol .= html::tag('li', null, rcube::Q(sprintf("%s (%s)", $filename, $size)));
	}
	else {
	if ($attrib['maxlength'] && mb_strlen($filename) > $attrib['maxlength']) {
	$title = $filename;
	$filename = abbreviate_string($filename, $attrib['maxlength']);
	}
	else {
	$title = '';
	}

	if ($attach_prop->size) {
	$size = ' ' . html::span('attachment-size', '(' . $RCMAIL->show_bytes($attach_prop->size) . ')');
	}

	$mimetype = rcmail_fix_mimetype($attach_prop->mimetype);
	$class = rcube_utils::file2class($mimetype, $filename);
	$id = 'attach' . $attach_prop->mime_id;
	$link = html::a(array(
	'href' => $MESSAGE->get_part_url($attach_prop->mime_id, false),
	'onclick' => sprintf('return %s.command(\'load-attachment\',\'%s\',this)',
	rcmail_output::JS_OBJECT_NAME, $attach_prop->mime_id),
	'onmouseover' => $title ? '' : 'rcube_webmail.long_subject_title_ex(this, 0)',
	'title' => rcube::Q($title),
	), rcube::Q($filename) . $size);

	$ol .= html::tag('li', array('class' => $class, 'id' => $id), $link);

	$attachments[$attach_prop->mime_id] = $mimetype;
	}
	}

	$out = html::tag('ul', $attrib, $ol, html::$common_attrib);

	$RCMAIL->output->set_env('attachments', $attachments);
	}

	return $out;
	}

	function rcmail_remote_objects_msg()
	{
	global $MESSAGE, $RCMAIL;

	$attrib['id'] = 'remote-objects-message';
	$attrib['class'] = 'notice';
	$attrib['style'] = 'display: none';

	$msg = rcube::Q($RCMAIL->gettext('blockedimages')) . ' ';
	$msg .= html::a(array(
	'href' => "#loadimages",
	'onclick' => rcmail_output::JS_OBJECT_NAME.".command('load-images')"
	),
	rcube::Q($RCMAIL->gettext('showimages')));

	// add link to save sender in addressbook and reload message
	if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('show_images') == 1) {
	$msg .= ' ' . html::a(array(
	'href' => "#alwaysload",
	'onclick' => rcmail_output::JS_OBJECT_NAME.".command('always-load')",
	'style' => "white-space:nowrap"
	),
	rcube::Q($RCMAIL->gettext(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto'])))));
	}

	$RCMAIL->output->add_gui_object('remoteobjectsmsg', $attrib['id']);

	return html::div($attrib, $msg);
	}

	function rcmail_message_buttons()
	{
	global $RCMAIL, $MESSAGE;

	$delim = $RCMAIL->storage->get_hierarchy_delimiter();
	$dbox = $RCMAIL->config->get('drafts_mbox');

	// the message is not a draft
	if ($MESSAGE->folder != $dbox && strpos($MESSAGE->folder, $dbox.$delim) !== 0) {
	return '';
	}

	$attrib['id'] = 'message-buttons';
	$attrib['class'] = 'notice';

	$msg = rcube::Q($RCMAIL->gettext('isdraft')) . ' ';
	$msg .= html::a(array(
	'href' => "#edit",
	'onclick' => rcmail_output::JS_OBJECT_NAME.".command('edit')"
	),
	rcube::Q($RCMAIL->gettext('edit')));

	return html::div($attrib, $msg);
	}

	function rcmail_message_objects($attrib)
	{
	global $RCMAIL, $MESSAGE;

	if (!$attrib['id'])
	$attrib['id'] = 'message-objects';

	$content = array(
	rcmail_message_buttons(),
	rcmail_remote_objects_msg(),
	);

	$plugin = $RCMAIL->plugins->exec_hook('message_objects',
	array('content' => $content, 'message' => $MESSAGE));

	$content = implode("\n", $plugin['content']);

	return html::div($attrib, $content);
	}

	function rcmail_contact_exists($email)
	{
	global $RCMAIL;

	if ($email) {
	// @TODO: search in all address books?
	$CONTACTS = $RCMAIL->get_address_book(-1, true);

	if (is_object($CONTACTS)) {
	$existing = $CONTACTS->search('email', $email, true, false);
	if ($existing->count) {
	return true;
	}
	}
	}

	return false;
	}

	function rcmail_message_contactphoto($attrib)
	{
	global $RCMAIL, $MESSAGE;

	- $placeholder = $attrib['placeholder'] ? $RCMAIL->config->get('skin_path') . $attrib['placeholder'] : null;
	+ $placeholder = $attrib['placeholder'] ? $RCMAIL->output->abs_url($attrib['placeholder'], true) : null;
	+ $placeholder = $RCMAIL->output->asset_url($placeholder ? $placeholder : 'program/resources/blank.gif');

	if ($MESSAGE->sender) {
	$photo_img = $RCMAIL->url(array(
	'_task' => 'addressbook',
	'_action' => 'photo',
	'_email' => $MESSAGE->sender['mailto'],
	- '_alt' => $placeholder,
	));

	- $attrib['onerror'] = "this.src = '" . ($placeholder ? $placeholder : 'program/resources/blank.gif') . "'";
	+ $attrib['onerror'] = "this.src = '$placeholder'";
	}
	else {
	- $photo_img = $placeholder ? $placeholder : 'program/resources/blank.gif';
	+ $photo_img = $placeholder;
	}

	return html::img(array('src' => $photo_img, 'alt' => $RCMAIL->gettext('contactphoto')) + $attrib);
	}
	diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
	index f700e4f77..486e679c9 100644
	--- a/program/steps/settings/func.inc
	+++ b/program/steps/settings/func.inc
	@@ -1,1394 +1,1400 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-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. \|
	\| \|
	\| PURPOSE: \|
	\| Provide functionality for user's settings & preferences \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	if (!$OUTPUT->ajax_call) {
	$OUTPUT->set_pagetitle($RCMAIL->gettext('preferences'));
	}

	// register UI objects
	$OUTPUT->add_handlers(array(
	'settingstabs' => 'rcmail_settings_tabs',
	'prefsframe' => 'rcmail_preferences_frame',
	'sectionslist' => 'rcmail_sections_list',
	'identitieslist' => 'rcmail_identities_list',
	));

	// register action aliases
	$RCMAIL->register_action_map(array(
	'folders' => 'folders.inc',
	'rename-folder' => 'folders.inc',
	'delete-folder' => 'folders.inc',
	'subscribe' => 'folders.inc',
	'unsubscribe' => 'folders.inc',
	'purge' => 'folders.inc',
	'folder-size' => 'folders.inc',
	'add-identity' => 'edit_identity.inc',
	'add-response' => 'edit_response.inc',
	'save-response' => 'edit_response.inc',
	'delete-response' => 'responses.inc',
	'delete-identity' => 'identities.inc',
	'upload-display' => 'upload.inc',
	));


	// similar function as /steps/settings/identities.inc::rcmail_identity_frame()
	function rcmail_preferences_frame($attrib)
	{
	global $OUTPUT;

	if (!$attrib['id']) {
	$attrib['id'] = 'rcmprefsframe';
	}

	return $OUTPUT->frame($attrib, true);
	}


	function rcmail_sections_list($attrib)
	{
	global $RCMAIL;

	// add id to message list table if not specified
	if (!strlen($attrib['id'])) {
	$attrib['id'] = 'rcmsectionslist';
	}

	list($list, $cols) = rcmail_user_prefs();

	// create XHTML table
	$out = $RCMAIL->table_output($attrib, $list, $cols, 'id');

	// set client env
	$RCMAIL->output->add_gui_object('sectionslist', $attrib['id']);
	$RCMAIL->output->include_script('list.js');

	return $out;
	}


	function rcmail_identities_list($attrib)
	{
	global $OUTPUT, $RCMAIL;

	// add id to message list table if not specified
	if (!strlen($attrib['id'])) {
	$attrib['id'] = 'rcmIdentitiesList';
	}

	// get identities list and define 'mail' column
	$list = $RCMAIL->user->list_emails();
	foreach ($list as $idx => $row) {
	$list[$idx]['mail'] = trim($row['name'] . ' <' . rcube_utils::idn_to_utf8($row['email']) . '>');
	}

	// get all identites from DB and define list of cols to be displayed
	$plugin = $RCMAIL->plugins->exec_hook('identities_list', array(
	'list' => $list,
	'cols' => array('mail')
	));

	// @TODO: use <UL> instead of <TABLE> for identities list
	// create XHTML table
	$out = $RCMAIL->table_output($attrib, $plugin['list'], $plugin['cols'], 'identity_id');

	// set client env
	$OUTPUT->add_gui_object('identitieslist', $attrib['id']);

	return $out;
	}


	// similar function as in /steps/addressbook/edit.inc
	function get_form_tags($attrib, $action, $id = null, $hidden = null)
	{
	global $EDIT_FORM, $RCMAIL;

	$form_start = $form_end = '';

	if (empty($EDIT_FORM)) {
	$request_key = $action . (isset($id) ? '.'.$id : '');
	$form_start = $RCMAIL->output->request_form(array(
	'name' => 'form',
	'method' => 'post',
	'task' => $RCMAIL->task,
	'action' => $action,
	'request' => $request_key,
	'noclose' => true
	) + $attrib);

	if (is_array($hidden)) {
	$hiddenfields = new html_hiddenfield($hidden);
	$form_start .= $hiddenfields->show();
	}

	$form_end = !strlen($attrib['form']) ? '</form>' : '';

	$EDIT_FORM = !empty($attrib['form']) ? $attrib['form'] : 'form';
	$RCMAIL->output->add_gui_object('editform', $EDIT_FORM);
	}

	return array($form_start, $form_end);
	}


	function rcmail_user_prefs($current = null)
	{
	global $RCMAIL;

	$sections['general'] = array('id' => 'general', 'section' => $RCMAIL->gettext('uisettings'));
	$sections['mailbox'] = array('id' => 'mailbox', 'section' => $RCMAIL->gettext('mailboxview'));
	$sections['mailview'] = array('id' => 'mailview','section' => $RCMAIL->gettext('messagesdisplaying'));
	$sections['compose'] = array('id' => 'compose', 'section' => $RCMAIL->gettext('messagescomposition'));
	$sections['addressbook'] = array('id' => 'addressbook','section' => $RCMAIL->gettext('addressbook'));
	$sections['folders'] = array('id' => 'folders', 'section' => $RCMAIL->gettext('specialfolders'));
	$sections['server'] = array('id' => 'server', 'section' => $RCMAIL->gettext('serversettings'));

	// hook + define list cols
	$plugin = $RCMAIL->plugins->exec_hook('preferences_sections_list',
	array('list' => $sections, 'cols' => array('section')));

	$sections = $plugin['list'];
	$config = $RCMAIL->config->all();
	$no_override = array_flip((array)$RCMAIL->config->get('dont_override'));

	foreach ($sections as $idx => $sect) {
	if ($current && $sect['id'] != $current) {
	continue;
	}

	$blocks = array();

	switch ($sect['id']) {

	// general
	case 'general':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'skin' => array('name' => rcube::Q($RCMAIL->gettext('skin'))),
	'browser' => array('name' => rcube::Q($RCMAIL->gettext('browseroptions'))),
	'advanced'=> array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	// language selection
	if (!isset($no_override['language'])) {
	if (!$current) {
	continue 2;
	}

	$a_lang = $RCMAIL->list_languages();
	asort($a_lang);

	$field_id = 'rcmfd_lang';
	$select = new html_select(array('name' => '_language', 'id' => $field_id));
	$select->add(array_values($a_lang), array_keys($a_lang));

	$blocks['main']['options']['language'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('language'))),
	'content' => $select->show($RCMAIL->user->language),
	);
	}

	// timezone selection
	if (!isset($no_override['timezone'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_timezone';
	$select = new html_select(array('name' => '_timezone', 'id' => $field_id));
	$select->add($RCMAIL->gettext('autodetect'), 'auto');

	$zones = array();
	foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
	try {
	$tz = new DateTimeZone($tzs);
	$date = new DateTime('2012-12-21', $tz);
	$offset = $date->format('Z') + 45000;
	$sortkey = sprintf('%06d.%s', $offset, $tzs);
	$zones[$sortkey] = array($tzs, $date->format('P'));
	}
	catch (Exception $e) {}
	}

	ksort($zones);

	foreach ($zones as $zone) {
	list($tzs, $offset) = $zone;
	$select->add('(GMT ' . $offset . ') ' . strtr($tzs, '_', ' '), $tzs);
	}

	$blocks['main']['options']['timezone'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('timezone'))),
	'content' => $select->show((string)$config['timezone']),
	);
	}

	// date/time formatting
	if (!isset($no_override['time_format'])) {
	if (!$current) {
	continue 2;
	}

	$reftime = mktime(7,30,0);
	$defaults = array('G:i', 'H:i', 'g:i a', 'h:i A');
	$formats = (array)$RCMAIL->config->get('time_formats', $defaults);
	$field_id = 'rcmfd_time_format';
	$select = new html_select(array('name' => '_time_format', 'id' => $field_id));

	foreach ($formats as $choice) {
	$select->add(date($choice, $reftime), $choice);
	}

	$blocks['main']['options']['time_format'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('timeformat'))),
	'content' => $select->show($RCMAIL->config->get('time_format')),
	);
	}

	if (!isset($no_override['date_format'])) {
	if (!$current) {
	continue 2;
	}

	$refdate = mktime(12,30,0,7,24);
	$defaults = array('Y-m-d','d-m-Y','Y/m/d','m/d/Y','d/m/Y','d.m.Y','j.n.Y');
	$formats = (array)$RCMAIL->config->get('date_formats', $defaults);
	$field_id = 'rcmfd_date_format';
	$select = new html_select(array('name' => '_date_format', 'id' => $field_id));

	foreach ($formats as $choice) {
	$select->add(date($choice, $refdate), $choice);
	}

	$blocks['main']['options']['date_format'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('dateformat'))),
	'content' => $select->show($config['date_format']),
	);
	}

	// Show checkbox for toggling 'pretty dates'
	if (!isset($no_override['prettydate'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_prettydate';
	$input = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['prettydate'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('prettydate'))),
	'content' => $input->show($config['prettydate']?1:0),
	);
	}

	if (!isset($no_override['refresh_interval'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_refresh_interval';
	$select = new html_select(array('name' => '_refresh_interval', 'id' => $field_id));

	$select->add($RCMAIL->gettext('never'), 0);
	foreach (array(1, 3, 5, 10, 15, 30, 60) as $min) {
	if (!$config['min_refresh_interval'] \|\| $config['min_refresh_interval'] <= $min * 60) {
	$label = $RCMAIL->gettext(array('name' => 'everynminutes', 'vars' => array('n' => $min)));
	$select->add($label, $min);
	}
	}

	$blocks['main']['options']['refresh_interval'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('refreshinterval'))),
	'content' => $select->show($config['refresh_interval']/60),
	);
	}

	// show drop-down for available skins
	if (!isset($no_override['skin'])) {
	if (!$current) {
	continue 2;
	}

	$skins = rcmail_get_skins();

	if (count($skins) > 1) {
	$field_id = 'rcmfd_skin';
	$input = new html_radiobutton(array('name'=>'_skin'));

	foreach ($skins as $skin) {
	- $thumbnail = "./skins/$skin/thumbnail.png";
	- if (!is_file($thumbnail))
	- $thumbnail = './program/resources/blank.gif';
	-
	+ $thumbnail = "skins/$skin/thumbnail.png";
	$skinname = ucfirst($skin);
	$author_link = $license_link = '';
	- $meta = @json_decode(@file_get_contents("./skins/$skin/meta.json"), true);
	+ $meta = @json_decode(@file_get_contents(INSTALL_PATH . "skins/$skin/meta.json"), true);

	if (is_array($meta) && $meta['name']) {
	$skinname = $meta['name'];
	$author_link = $meta['url'] ? html::a(array('href' => $meta['url'], 'target' => '_blank'), rcube::Q($meta['author'])) : rcube::Q($meta['author']);
	$license_link = $meta['license-url'] ? html::a(array('href' => $meta['license-url'], 'target' => '_blank', 'tabindex' => '-1'), rcube::Q($meta['license'])) : rcube::Q($meta['license']);
	}

	+ $img = html::img(array(
	+ 'src' => $thumbnail,
	+ 'class' => 'skinthumbnail',
	+ 'alt' => $skin,
	+ 'width' => 64,
	+ 'height' => 64,
	+ 'onerror' => "this.src = rcmail.assets_path('program/resources/blank.gif')",
	+ ));
	+
	$skinnames[] = mb_strtolower($skinname);
	$blocks['skin']['options'][$skin]['content'] = html::label(array('class' => 'skinselection'),
	html::span('skinitem', $input->show($config['skin'], array('value' => $skin, 'id' => $field_id.$skin))) .
	- html::span('skinitem', html::img(array('src' => $thumbnail, 'class' => 'skinthumbnail', 'alt' => $skin, 'width' => 64, 'height' => 64))) .
	+ html::span('skinitem', $img) .
	html::span('skinitem', html::span('skinname', rcube::Q($skinname)) . html::br() .
	html::span('skinauthor', $author_link ? 'by ' . $author_link : '') . html::br() .
	html::span('skinlicense', $license_link ? $RCMAIL->gettext('license').': ' . $license_link : ''))
	);
	}
	array_multisort($blocks['skin']['options'], SORT_ASC, SORT_STRING, $skinnames);
	}
	}

	// standard_windows option decides if new windows should be
	// opened as popups or standard windows (which can be handled by browsers as tabs)
	if (!isset($no_override['standard_windows'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_standard_windows';
	$checkbox = new html_checkbox(array('name' => '_standard_windows', 'id' => $field_id, 'value' => 1));

	$blocks['browser']['options']['standard_windows'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('standardwindows'))),
	'content' => $checkbox->show($config['standard_windows']?1:0),
	);
	}

	if ($current) {
	$product_name = $RCMAIL->config->get('product_name', 'Roundcube Webmail');
	$RCMAIL->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');",
	rcmail_output::JS_OBJECT_NAME, rcube::JQ($product_name)), 'docready');
	}

	$blocks['browser']['options']['mailtoprotohandler'] = array(
	'content' => html::a(array(
	'href' => '#',
	'id' => 'mailtoprotohandler'
	),
	rcube::Q($RCMAIL->gettext('mailtoprotohandler'))) .
	html::span('mailtoprotohandler-status', ''),
	);

	break;

	// Mailbox view (mail screen)
	case 'mailbox':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'new_message' => array('name' => rcube::Q($RCMAIL->gettext('newmessage'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	// show config parameter for preview pane
	if (!isset($no_override['preview_pane'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_preview';
	$input = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1,
	'onchange' => "$('#rcmfd_preview_pane_mark_read').prop('disabled', !this.checked)"));

	$blocks['main']['options']['preview_pane'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('previewpane'))),
	'content' => $input->show($config['preview_pane']?1:0),
	);
	}

	// show config parameter for preview pane auto mark as read delay
	if (!isset($no_override['preview_pane_mark_read'])) {
	if (!$current) {
	continue 2;
	}

	// apply default if config option is not set at all
	$config['preview_pane_mark_read'] = $RCMAIL->config->get('preview_pane_mark_read', 0);

	$field_id = 'rcmfd_preview_pane_mark_read';
	$select = new html_select(array('name' => '_preview_pane_mark_read', 'id' => $field_id,
	'disabled' => $config['preview_pane']?0:1));

	$select->add($RCMAIL->gettext('never'), '-1');
	$select->add($RCMAIL->gettext('immediately'), 0);

	foreach (array(5, 10, 20, 30) as $sec) {
	$label = $RCMAIL->gettext(array('name' => 'afternseconds', 'vars' => array('n' => $sec)));
	$select->add($label, $sec);
	}

	$blocks['main']['options']['preview_pane_mark_read'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('previewpanemarkread'))),
	'content' => $select->show(intval($config['preview_pane_mark_read'])),
	);
	}

	if (!isset($no_override['mdn_requests'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_mdn_requests';
	$select = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
	$select->add($RCMAIL->gettext('askuser'), 0);
	$select->add($RCMAIL->gettext('autosend'), 1);
	$select->add($RCMAIL->gettext('autosendknown'), 3);
	$select->add($RCMAIL->gettext('autosendknownignore'), 4);
	$select->add($RCMAIL->gettext('ignorerequest'), 2);

	$blocks['main']['options']['mdn_requests'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('mdnrequests'))),
	'content' => $select->show($config['mdn_requests']),
	);
	}

	if (!isset($no_override['autoexpand_threads'])) {
	if (!$current) {
	continue 2;
	}

	$storage = $RCMAIL->get_storage();
	$supported = $storage->get_capability('THREAD');

	if ($supported) {
	$field_id = 'rcmfd_autoexpand_threads';
	$select = new html_select(array('name' => '_autoexpand_threads', 'id' => $field_id));
	$select->add($RCMAIL->gettext('never'), 0);
	$select->add($RCMAIL->gettext('do_expand'), 1);
	$select->add($RCMAIL->gettext('expand_only_unread'), 2);

	$blocks['main']['options']['autoexpand_threads'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('autoexpand_threads'))),
	'content' => $select->show($config['autoexpand_threads']),
	);
	}
	}

	// show page size selection
	if (!isset($no_override['mail_pagesize'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_mail_pagesize';
	$input = new html_inputfield(array('name' => '_mail_pagesize', 'id' => $field_id, 'size' => 5));
	$size = intval($config['mail_pagesize'] ? $config['mail_pagesize'] : $config['pagesize']);

	$blocks['main']['options']['pagesize'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('pagesize'))),
	'content' => $input->show($size ? $size : 50),
	);
	}

	if (!isset($no_override['check_all_folders'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_check_all_folders';
	$input = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));

	$blocks['new_message']['options']['check_all_folders'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('checkallfolders'))),
	'content' => $input->show($config['check_all_folders']?1:0),
	);
	}
	break;

	// Message viewing
	case 'mailview':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	// show checkbox to open message view in new window
	if (!isset($no_override['message_extwin'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_message_extwin';
	$input = new html_checkbox(array('name' => '_message_extwin', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['message_extwin'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('showinextwin'))),
	'content' => $input->show($config['message_extwin']?1:0),
	);
	}

	// show checkbox to show email instead of name
	if (!isset($no_override['message_show_email'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_message_show_email';
	$input = new html_checkbox(array('name' => '_message_show_email', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['message_show_email'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('showemail'))),
	'content' => $input->show($config['message_show_email']?1:0),
	);
	}

	// show checkbox for HTML/plaintext messages
	if (!isset($no_override['prefer_html'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_htmlmsg';
	$input = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
	'onchange' => "$('#rcmfd_show_images').prop('disabled', !this.checked).val(0)"));

	$blocks['main']['options']['prefer_html'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('preferhtml'))),
	'content' => $input->show($config['prefer_html']?1:0),
	);
	}

	if (!isset($no_override['default_charset'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_default_charset';

	$blocks['advanced']['options']['default_charset'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('defaultcharset'))),
	'content' => $RCMAIL->output->charset_selector(array(
	'id' => $field_id, 'name' => '_default_charset', 'selected' => $config['default_charset']
	)));
	}

	if (!isset($no_override['show_images'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_show_images';
	$input = new html_select(array('name' => '_show_images', 'id' => $field_id,
	'disabled' => !$config['prefer_html']));

	$input->add($RCMAIL->gettext('never'), 0);
	$input->add($RCMAIL->gettext('fromknownsenders'), 1);
	$input->add($RCMAIL->gettext('always'), 2);

	$blocks['main']['options']['show_images'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('showremoteimages'))),
	'content' => $input->show($config['prefer_html'] ? $config['show_images'] : 0),
	);
	}

	if (!isset($no_override['inline_images'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_inline_images';
	$input = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['inline_images'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('showinlineimages'))),
	'content' => $input->show($config['inline_images']?1:0),
	);
	}

	// "display after delete" checkbox
	if (!isset($no_override['display_next'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_displaynext';
	$input = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['display_next'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('displaynext'))),
	'content' => $input->show($config['display_next']?1:0),
	);
	}
	break;

	// Mail composition
	case 'compose':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'sig' => array('name' => rcube::Q($RCMAIL->gettext('signatureoptions'))),
	'spellcheck' => array('name' => rcube::Q($RCMAIL->gettext('spellcheckoptions'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	// show checkbox to compose messages in a new window
	if (!isset($no_override['compose_extwin'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfdcompose_extwin';
	$input = new html_checkbox(array('name' => '_compose_extwin', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['compose_extwin'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('composeextwin'))),
	'content' => $input->show($config['compose_extwin']?1:0),
	);
	}

	if (!isset($no_override['htmleditor'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_htmleditor';
	$select = new html_select(array('name' => '_htmleditor', 'id' => $field_id));

	$select->add($RCMAIL->gettext('never'), 0);
	$select->add($RCMAIL->gettext('always'), 1);
	$select->add($RCMAIL->gettext('htmlonreply'), 2);
	$select->add($RCMAIL->gettext('htmlonreplyandforward'), 3);

	$blocks['main']['options']['htmleditor'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('htmleditor'))),
	'content' => $select->show(intval($config['htmleditor'])),
	);
	}

	if (!isset($no_override['draft_autosave'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_autosave';
	$select = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));

	$select->add($RCMAIL->gettext('never'), 0);
	foreach (array(1, 3, 5, 10) as $i => $min) {
	$label = $RCMAIL->gettext(array('name' => 'everynminutes', 'vars' => array('n' => $min)));
	$select->add($label, $min*60);
	}

	$blocks['main']['options']['draft_autosave'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('autosavedraft'))),
	'content' => $select->show($config['draft_autosave']),
	);
	}

	if (!isset($no_override['mime_param_folding'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_param_folding';
	$select = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));

	$select->add($RCMAIL->gettext('2231folding'), 0);
	$select->add($RCMAIL->gettext('miscfolding'), 1);
	$select->add($RCMAIL->gettext('2047folding'), 2);

	$blocks['advanced']['options']['mime_param_folding'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('mimeparamfolding'))),
	'content' => $select->show($config['mime_param_folding']),
	);
	}

	if (!isset($no_override['force_7bit'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_force_7bit';
	$input = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));

	$blocks['advanced']['options']['force_7bit'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('force7bit'))),
	'content' => $input->show($config['force_7bit']?1:0),
	);
	}

	if (!isset($no_override['mdn_default'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_mdn_default';
	$input = new html_checkbox(array('name' => '_mdn_default', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['mdn_default'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('reqmdn'))),
	'content' => $input->show($config['mdn_default']?1:0),
	);
	}

	if (!isset($no_override['dsn_default'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_dsn_default';
	$input = new html_checkbox(array('name' => '_dsn_default', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['dsn_default'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('reqdsn'))),
	'content' => $input->show($config['dsn_default']?1:0),
	);
	}

	if (!isset($no_override['reply_same_folder'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_reply_same_folder';
	$input = new html_checkbox(array('name' => '_reply_same_folder', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['reply_same_folder'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('replysamefolder'))),
	'content' => $input->show($config['reply_same_folder']?1:0),
	);
	}

	if (!isset($no_override['reply_mode'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_reply_mode';
	$select = new html_select(array('name' => '_reply_mode', 'id' => $field_id));

	$select->add($RCMAIL->gettext('replyempty'), -1);
	$select->add($RCMAIL->gettext('replybottomposting'), 0);
	$select->add($RCMAIL->gettext('replytopposting'), 1);

	$blocks['main']['options']['reply_mode'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('whenreplying'))),
	'content' => $select->show(intval($config['reply_mode'])),
	);
	}

	if (!isset($no_override['spellcheck_before_send']) && $config['enable_spellcheck']) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_spellcheck_before_send';
	$input = new html_checkbox(array('name' => '_spellcheck_before_send', 'id' => $field_id, 'value' => 1));

	$blocks['spellcheck']['options']['spellcheck_before_send'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('spellcheckbeforesend'))),
	'content' => $input->show($config['spellcheck_before_send']?1:0),
	);
	}

	if ($config['enable_spellcheck']) {
	if (!$current) {
	continue 2;
	}

	foreach (array('syms', 'nums', 'caps') as $key) {
	$key = 'spellcheck_ignore_'.$key;
	if (!isset($no_override[$key])) {
	$input = new html_checkbox(array('name' => '_'.$key, 'id' => 'rcmfd_'.$key, 'value' => 1));

	$blocks['spellcheck']['options'][$key] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext(str_replace('_', '', $key)))),
	'content' => $input->show($config[$key]?1:0),
	);
	}
	}
	}

	if (!isset($no_override['show_sig'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_show_sig';
	$select = new html_select(array('name' => '_show_sig', 'id' => $field_id));

	$select->add($RCMAIL->gettext('never'), 0);
	$select->add($RCMAIL->gettext('always'), 1);
	$select->add($RCMAIL->gettext('newmessageonly'), 2);
	$select->add($RCMAIL->gettext('replyandforwardonly'), 3);

	$blocks['sig']['options']['show_sig'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('autoaddsignature'))),
	'content' => $select->show($RCMAIL->config->get('show_sig', 1)),
	);
	}

	if (!isset($no_override['strip_existing_sig'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_strip_existing_sig';
	$input = new html_checkbox(array('name' => '_strip_existing_sig', 'id' => $field_id, 'value' => 1));

	$blocks['sig']['options']['strip_existing_sig'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('replyremovesignature'))),
	'content' => $input->show($config['strip_existing_sig']?1:0),
	);
	}

	if (!isset($no_override['forward_attachment'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_forward_attachment';
	$select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id));

	$select->add($RCMAIL->gettext('inline'), 0);
	$select->add($RCMAIL->gettext('asattachment'), 1);

	$blocks['main']['options']['forward_attachment'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('forwardmode'))),
	'content' => $select->show(intval($config['forward_attachment'])),
	);
	}

	if (!isset($no_override['default_font']) \|\| !isset($no_override['default_font_size'])) {
	if (!$current) {
	continue 2;
	}

	// Default font size
	$field_id = 'rcmfd_default_font_size';
	$select_default_font_size = new html_select(array('name' => '_default_font_size', 'id' => $field_id));

	$fontsizes = array('', '8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
	foreach ($fontsizes as $size) {
	$select_default_font_size->add($size, $size);
	}

	// Default font
	$field_id = 'rcmfd_default_font';
	$select_default_font = new html_select(array('name' => '_default_font', 'id' => $field_id));
	$select_default_font->add('', '');

	$fonts = rcmail::font_defs();
	foreach (array_keys($fonts) as $fname) {
	$select_default_font->add($fname, $fname);
	}

	$blocks['main']['options']['default_font'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('defaultfont'))),
	'content' => $select_default_font->show($RCMAIL->config->get('default_font', 1)) .
	$select_default_font_size->show($RCMAIL->config->get('default_font_size', 1))
	);
	}

	if (!isset($no_override['reply_all_mode'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_reply_all_mode';
	$select = new html_select(array('name' => '_reply_all_mode', 'id' => $field_id));

	$select->add($RCMAIL->gettext('replyalldefault'), 0);
	$select->add($RCMAIL->gettext('replyalllist'), 1);

	$blocks['main']['options']['reply_all_mode'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('replyallmode'))),
	'content' => $select->show(intval($config['reply_all_mode'])),
	);
	}

	if (!isset($no_override['compose_save_localstorage'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_compose_save_localstorage';
	$input = new html_checkbox(array('name' => '_compose_save_localstorage', 'id' => $field_id, 'value' => 1));

	$blocks['advanced']['options']['compose_save_localstorage'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('savelocalstorage'))),
	'content' => $input->show($config['compose_save_localstorage']?1:0),
	);
	}

	break;

	// Addressbook config
	case 'addressbook':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	if (!isset($no_override['default_addressbook'])
	&& (!$current \|\| ($books = $RCMAIL->get_address_sources(true, true)))
	) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_default_addressbook';
	$select = new html_select(array('name' => '_default_addressbook', 'id' => $field_id));

	foreach ($books as $book) {
	$select->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
	}

	$blocks['main']['options']['default_addressbook'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('defaultabook'))),
	'content' => $select->show($config['default_addressbook']),
	);
	}

	// show addressbook listing mode selection
	if (!isset($no_override['addressbook_name_listing'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_addressbook_name_listing';
	$select = new html_select(array('name' => '_addressbook_name_listing', 'id' => $field_id));

	$select->add($RCMAIL->gettext('name'), 0);
	$select->add($RCMAIL->gettext('firstname') . ' ' . $RCMAIL->gettext('surname'), 1);
	$select->add($RCMAIL->gettext('surname') . ' ' . $RCMAIL->gettext('firstname'), 2);
	$select->add($RCMAIL->gettext('surname') . ', ' . $RCMAIL->gettext('firstname'), 3);

	$blocks['main']['options']['list_name_listing'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('listnamedisplay'))),
	'content' => $select->show($config['addressbook_name_listing']),
	);
	}

	// show addressbook sort column
	if (!isset($no_override['addressbook_sort_col'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_addressbook_sort_col';
	$select = new html_select(array('name' => '_addressbook_sort_col', 'id' => $field_id));

	$select->add($RCMAIL->gettext('name'), 'name');
	$select->add($RCMAIL->gettext('firstname'), 'firstname');
	$select->add($RCMAIL->gettext('surname'), 'surname');

	$blocks['main']['options']['sort_col'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('listsorting'))),
	'content' => $select->show($config['addressbook_sort_col']),
	);
	}

	// show addressbook page size selection
	if (!isset($no_override['addressbook_pagesize'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_addressbook_pagesize';
	$input = new html_inputfield(array('name' => '_addressbook_pagesize', 'id' => $field_id, 'size' => 5));
	$size = intval($config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize']);

	$blocks['main']['options']['pagesize'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('pagesize'))),
	'content' => $input->show($size ? $size : 50),
	);
	}

	if (!isset($no_override['autocomplete_single'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_autocomplete_single';
	$checkbox = new html_checkbox(array('name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['autocomplete_single'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('autocompletesingle'))),
	'content' => $checkbox->show($config['autocomplete_single']?1:0),
	);
	}
	break;

	// Special IMAP folders
	case 'folders':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	if (!isset($no_override['show_real_foldernames'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'show_real_foldernames';
	$input = new html_checkbox(array('name' => '_show_real_foldernames', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['show_real_foldernames'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('show_real_foldernames'))),
	'content' => $input->show($config['show_real_foldernames']?1:0),
	);
	}

	// Configure special folders
	$set = array('drafts_mbox', 'sent_mbox', 'junk_mbox', 'trash_mbox');
	if ($current && count(array_intersect($no_override, $set)) < 4) {
	$select = $RCMAIL->folder_selector(array(
	'noselection' => '---',
	'realnames' => true,
	'maxlength' => 30,
	'folder_filter' => 'mail',
	'folder_rights' => 'w',
	));

	// #1486114, #1488279, #1489219
	$onchange = "if ($(this).val() == 'INBOX') $(this).val('')";
	}

	if (!isset($no_override['drafts_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['drafts_mbox'] = array(
	'title' => rcube::Q($RCMAIL->gettext('drafts')),
	'content' => $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox", 'onchange' => $onchange)),
	);
	}

	if (!isset($no_override['sent_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['sent_mbox'] = array(
	'title' => rcube::Q($RCMAIL->gettext('sent')),
	'content' => $select->show($config['sent_mbox'], array('name' => "_sent_mbox", 'onchange' => '')),
	);
	}

	if (!isset($no_override['junk_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['junk_mbox'] = array(
	'title' => rcube::Q($RCMAIL->gettext('junk')),
	'content' => $select->show($config['junk_mbox'], array('name' => "_junk_mbox", 'onchange' => $onchange)),
	);
	}

	if (!isset($no_override['trash_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['trash_mbox'] = array(
	'title' => rcube::Q($RCMAIL->gettext('trash')),
	'content' => $select->show($config['trash_mbox'], array('name' => "_trash_mbox", 'onchange' => $onchange)),
	);
	}
	break;

	// Server settings
	case 'server':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'maintenance' => array('name' => rcube::Q($RCMAIL->gettext('maintenance'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	if (!isset($no_override['read_when_deleted'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_read_deleted';
	$input = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['read_when_deleted'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('readwhendeleted'))),
	'content' => $input->show($config['read_when_deleted']?1:0),
	);
	}

	if (!isset($no_override['flag_for_deletion'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_flag_for_deletion';
	$input = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['flag_for_deletion'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('flagfordeletion'))),
	'content' => $input->show($config['flag_for_deletion']?1:0),
	);
	}

	// don't show deleted messages
	if (!isset($no_override['skip_deleted'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_skip_deleted';
	$input = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['skip_deleted'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('skipdeleted'))),
	'content' => $input->show($config['skip_deleted']?1:0),
	);
	}

	if (!isset($no_override['delete_always'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_delete_always';
	$input = new html_checkbox(array('name' => '_delete_always', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['delete_always'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('deletealways'))),
	'content' => $input->show($config['delete_always']?1:0),
	);
	}

	if (!isset($no_override['delete_junk'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_delete_junk';
	$input = new html_checkbox(array('name' => '_delete_junk', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['delete_junk'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('deletejunk'))),
	'content' => $input->show($config['delete_junk']?1:0),
	);
	}

	// Trash purging on logout
	if (!isset($no_override['logout_purge'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_logout_purge';
	$input = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));

	$blocks['maintenance']['options']['logout_purge'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('logoutclear'))),
	'content' => $input->show($config['logout_purge']?1:0),
	);
	}

	// INBOX compacting on logout
	if (!isset($no_override['logout_expunge'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_logout_expunge';
	$input = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));

	$blocks['maintenance']['options']['logout_expunge'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('logoutcompact'))),
	'content' => $input->show($config['logout_expunge']?1:0),
	);
	}
	}

	$found = false;
	$data = $RCMAIL->plugins->exec_hook('preferences_list',
	array('section' => $sect['id'], 'blocks' => $blocks, 'current' => $current));

	$advanced_prefs = (array) $RCMAIL->config->get('advanced_prefs');

	// create output
	foreach ($data['blocks'] as $key => $block) {
	if (!empty($block['content']) \|\| !empty($block['options'])) {
	$found = true;
	}
	// move some options to the 'advanced' block as configured by admin
	if ($key != 'advanced') {
	foreach ($advanced_prefs as $opt) {
	if ($block['options'][$opt]) {
	$data['blocks']['advanced']['options'][$opt] = $block['options'][$opt];
	unset($data['blocks'][$key]['options'][$opt]);
	}
	}
	}
	}

	// move 'advanced' block to the end of the list
	if (!empty($data['blocks']['advanced'])) {
	$adv = $data['blocks']['advanced'];
	unset($data['blocks']['advanced']);
	$data['blocks']['advanced'] = $adv;
	}

	if (!$found)
	unset($sections[$idx]);
	else
	$sections[$idx]['blocks'] = $data['blocks'];
	}

	$data = $RCMAIL->plugins->exec_hook('preferences_section_header',
	array('section' => $sect['id'], 'header' => '', 'current' => $current));

	if(!empty($data['header'])) {
	$sections[$idx]['header'] = $data['header'];
	}

	return array($sections, $plugin['cols']);
	}


	function rcmail_get_skins()
	{
	$path = RCUBE_INSTALL_PATH . 'skins';
	$skins = array();
	$dir = opendir($path);

	if (!$dir) {
	return false;
	}

	while (($file = readdir($dir)) !== false) {
	$filename = $path.'/'.$file;
	if (!preg_match('/^\./', $file) && is_dir($filename) && is_readable($filename)) {
	$skins[] = $file;
	}
	}

	closedir($dir);

	return $skins;
	}


	function rcmail_folder_options($mailbox)
	{
	global $RCMAIL;

	$options = $RCMAIL->get_storage()->folder_info($mailbox);
	$options['protected'] = $options['is_root'] \|\| ($options['special'] && $RCMAIL->config->get('protect_default_folders'));

	return $options;
	}

	/**
	* Updates (or creates) folder row in the subscriptions table
	*
	* @param string $name Folder name
	* @param string $oldname Old folder name (for update)
	* @param bool $subscribe Checks subscription checkbox
	* @param string $class CSS class name for folder row
	*/
	function rcmail_update_folder_row($name, $oldname=null, $subscribe=false, $class_name=null)
	{
	global $RCMAIL, $OUTPUT;

	$protect_folders = $RCMAIL->config->get('protect_default_folders');
	$storage = $RCMAIL->get_storage();
	$delimiter = $storage->get_hierarchy_delimiter();

	$name_utf8 = rcube_charset::convert($name, 'UTF7-IMAP');
	$protected = $protect_folders && $storage->is_special_folder($name);
	$foldersplit = explode($delimiter, $storage->mod_folder($name));
	$level = count($foldersplit) - 1;
	$display_name = $protected ? $RCMAIL->localize_foldername($name) : rcube_charset::convert($foldersplit[$level], 'UTF7-IMAP');
	$class_name = trim($class_name . ' mailbox');

	if ($oldname === null) {
	$OUTPUT->command('add_folder_row', $name, $name_utf8, $display_name, $protected, $subscribe,
	$class_name);
	}
	else {
	$OUTPUT->command('replace_folder_row', $oldname, $name, $name_utf8, $display_name, $protected, $class_name);
	}
	}

	/**
	* Render the list of settings sections (AKA tabs)
	*/
	function rcmail_settings_tabs($attrib)
	{
	global $RCMAIL, $OUTPUT;

	// add default attributes
	$attrib += array('tagname' => 'span', 'idprefix' => 'settingstab', 'selclass' => 'selected');

	$default_actions = array(
	array('command' => 'preferences', 'type' => 'link', 'label' => 'preferences', 'title' => 'editpreferences'),
	array('command' => 'folders', 'type' => 'link', 'label' => 'folders', 'title' => 'managefolders'),
	array('command' => 'identities', 'type' => 'link', 'label' => 'identities', 'title' => 'manageidentities'),
	array('command' => 'responses', 'type' => 'link', 'label' => 'responses', 'title' => 'manageresponses'),
	);

	// get all identites from DB and define list of cols to be displayed
	$plugin = $RCMAIL->plugins->exec_hook('settings_actions', array(
	'actions' => $default_actions,
	'attrib' => $attrib,
	));

	$attrib = $plugin['attrib'];
	$tagname = $attrib['tagname'];
	$tabs = array();

	foreach ($plugin['actions'] as $action) {
	if (!$action['command'] && !$action['href'] && $action['action']) {
	$action['href'] = $RCMAIL->url(array('_action' => $action['action']));
	}

	$button = $OUTPUT->button($action);
	$attr = $attrib;

	$cmd = $action['action'] ? $action['action'] : $action['command'];
	$id = $action['id'] ? $action['id'] : $cmd;

	if (!empty($id)) {
	$attr['id'] = preg_replace('/[^a-z0-9]/i', '', $attrib['idprefix'] . $id);
	}

	$classnames = array($attrib['class']);
	if (!empty($action['class'])) {
	$classnames[] = $action['class'];
	}
	else if (!empty($cmd)) {
	$classnames[] = $cmd;
	}
	if ($RCMAIL->action == $cmd) {
	$classnames[] = $attrib['selclass'];
	}

	$attr['class'] = join(' ', $classnames);
	$tabs[] = html::tag($tagname, $attr, $button, html::$common_attrib);
	}

	return join('', $tabs);
	}
	diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc
	index ec0d038f4..6bbc57fda 100644
	--- a/program/steps/utils/error.inc
	+++ b/program/steps/utils/error.inc
	@@ -1,141 +1,149 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/utils/error.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-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. \|
	\| \|
	\| PURPOSE: \|
	\| Display error message page \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$rcmail = rcmail::get_instance();

	// browser is not compatible with this application
	if ($ERROR_CODE == 409) {
	$user_agent = htmlentities($_SERVER['HTTP_USER_AGENT']);
	$__error_title = 'Your browser does not suit the requirements for this application';
	$__error_text = <<<EOF
	<i>Supported browsers:</i><br />
	»  Microsoft Internet Explorer 7+<br />
	»  Mozilla Firefox 3+<br />
	»  Chrome 10+<br />
	»  Safari 4+<br />
	»  Opera 8+<br />
	<br />
	»  JavaScript enabled<br />
	»  Support for XMLHTTPRequest<br />

	<p><i>Your configuration:</i><br />
	$user_agent</p>
	EOF;
	}

	// authorization error
	else if ($ERROR_CODE == 401) {
	$__error_title = "AUTHORIZATION FAILED";
	$__error_text = "Could not verify that you are authorized to access this service!<br />\n"
	. "Please contact your server-administrator.";
	}

	// forbidden due to request check
	else if ($ERROR_CODE == 403) {
	+ if ($_SERVER['REQUEST_METHOD'] == 'GET' && $rcmail->request_status == rcube::REQUEST_ERROR_URL) {
	+ parse_str($_SERVER['QUERY_STRING'], $url);
	+ $url = $rcmail->url($url, true, false, true);
	+ $add = "<br /><a href=\"$url\">Click here to try again.<a/>";
	+ }
	+ else {
	+ $add = "Please contact your server-administrator.";
	+ }
	+
	$__error_title = "REQUEST CHECK FAILED";
	- $__error_text = "Access to this service was denied due to failing security checks!<br />\n"
	- . "Please contact your server-administrator.";
	+ $__error_text = "Access to this service was denied due to failing security checks!<br />\n$add";
	}

	// failed request (wrong step in URL)
	else if ($ERROR_CODE == 404) {
	$request_url = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
	$__error_title = "REQUEST FAILED/FILE NOT FOUND";
	$__error_text = <<<EOF
	The requested page was not found!<br />
	Please contact your server-administrator.

	<p><i>Failed request:</i><br />
	http://$request_url</p>
	EOF;
	}

	// database connection error
	else if ($ERROR_CODE == 601) {
	$__error_title = "CONFIGURATION ERROR";
	$__error_text = nl2br($ERROR_MESSAGE) . "<br />Please read the INSTALL instructions!";
	}

	// database connection error
	else if ($ERROR_CODE == 603) {
	$__error_title = "DATABASE ERROR: CONNECTION FAILED!";
	$__error_text = "Unable to connect to the database!<br />Please contact your server-administrator.";
	}

	// system error
	else {
	$__error_title = "SERVICE CURRENTLY NOT AVAILABLE!";
	$__error_text = "Please contact your server-administrator.";

	if (($rcmail->config->get('debug_level') & 4) && $ERROR_MESSAGE) {
	$__error_text = $ERROR_MESSAGE;
	}
	else {
	$__error_text = sprintf('Error No. [%s]', $ERROR_CODE);
	}
	}

	$HTTP_ERR_CODE = $ERROR_CODE && $ERROR_CODE < 600 ? $ERROR_CODE : 500;

	// Ajax request
	if ($rcmail->output && $rcmail->output->type == 'js') {
	header("HTTP/1.0 $HTTP_ERR_CODE $__error_title");
	die;
	}

	// compose page content
	$__page_content = <<<EOF
	<div>
	<h3 class="error-title">$__error_title</h3>
	<p class="error-text">$__error_text</p>
	</div>
	EOF;

	if ($rcmail->output && $rcmail->output->template_exists('error')) {
	$rcmail->output->reset();
	$rcmail->output->set_env('server_error', $ERROR_CODE);
	$rcmail->output->set_env('comm_path', $rcmail->comm_path);
	$rcmail->output->send('error');
	}

	$__skin = $rcmail->config->get('skin', 'default');
	$__productname = $rcmail->config->get('product_name', 'Roundcube Webmail');

	// print system error page
	print <<<EOF
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml"><head>
	<title>$__productname :: ERROR</title>
	<link rel="stylesheet" type="text/css" href="skins/$__skin/common.css" />
	</head>
	<body>

	<table border="0" cellsapcing="0" cellpadding="0" width="100%" height="80%"><tr><td align="center">

	$__page_content

	</td></tr></table>

	</body>
	</html>
	EOF;

	exit;

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 2:04 AM (10 h, 25 m)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 6e/ea/29bec8ad0e96688f734872763d28
Default Alt Text: (1 MB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions