No OneTemporary
Actions

Size

496 KB

Referenced Files

None

Subscribers

None

View Options

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

	diff --git a/CHANGELOG.md b/CHANGELOG.md
	index 305b8de5c..6b2b96e10 100644
	--- a/CHANGELOG.md
	+++ b/CHANGELOG.md
	@@ -1,3173 +1,3174 @@
	# Changelog Roundcube Webmail

	## Unreleased

	- Upgrade to TinyMCE 5.8.0
	- SMTP XCLIENT support (#7893, #6411)
	- Add IDN homograph attack (spoofing) detection [CVE-2019-15237] (#6891)
	- Add configuration options for subject prefixes (#7929, #4981)
	- Warn the user about a potential data leak on mail bounce or forward (#7993)
	- Make the Empty action available for every non-empty folder, not only Trash (#7948)
	+- Remove (incorrect) use of Return-Receipt-To header (#8069)
	- Plugin API: Allow modification of 'error' argument in 'message_send_error' hook (#7914)
	- OAuth: add plugin hooks `oauth_login` and `oauth_refresh_token` for oauth events (#8028, #8040)
	- Debug_logger: Fix the main plugin functionality and documentation (#8041)
	- Enigma: Fix bug where signature verification could fail for non-ascii bodies (#7919)
	- Enigma: Fix invalid expiration dates of PGP keys on a 32bit system (#7531)
	- Enigma: Display an information that public and private keys are stored on the server (#7941)
	- Managesieve: Fix removing nested rules in scripts (#8011)
	- Managesieve: Support XOAUTH2, requires Net_Sieve 1.4.5 (#7925)
	- New_user_dialog: Use the 'identity_update' hook (#8023)
	- Password: Fix broken 'hmail' driver (#7966)
	- Password: Set password_minimum_length to 8 by default (#8003)
	- Vcard_attachments: Improve handling of multiple contacts (#7027)
	- Fix invalid search fields after search scope change (#6919)
	- Fix so "Always allow from..." button appears also when allow_images=3 (#7961)
	- Fix Elastic's pretty select scroll position in Chrome (#7964)
	- Fix bug where invalid non-unicode characters in JSON output could make the UI unresponsive (#7955)
	- Fix PHP 8 fatal error when allowing images in an email (#7968)
	- Fix so session expiration is more precise and do not depend on the garbage collector (#7576)
	- Fix bug where imap_conn_options settings were ignored (#7912)
	- Fix bug causing some HTML message content to be not centered in Elastic skin (#7911)
	- Fix bug when sending an email and recipient's email address contains a trailing dot (#7899)
	- Fix bug where the list page wasn't reset when changing a folder on mail view page (#7932)
	- Fix so selecting the same folder to reset search resets also the page number (#7125)
	- Fix login page rendering after oauth failure (#7812,#7923)
	- Fix bug where assigning users to groups via menu (not drag'n'drop) could fail in Elastic theme (#7973)
	- Fix HTML5 parser issue with a messy HTML code from Outlook (#7356)
	- Fix handling of multiple link references with the same index in plain text message (#8021)
	- Fix various actions on folders with angle brackets in name (#8037)
	- Fix inconsistent fowarding actions statuses on drafts (#8039)
	- Fix bug where `start` and `reversed` attributes of `ol` tag were ignored (#8059)

	## Release 1.5-beta

	- Require PHP >= 5.5
	- Support PHP 8.0 (#7625)
	- Require php-intl
	- Remove use of Net_IDNA2 package
	- Require GuzzleHttp\Client
	- Upgrade to TinyMCE 5.5.1
	- Upgrade to jQuery 3.5.1 (#7464)
	- Update build tools (#7800, #7804, #7497):
	- jsshrink.sh: Replace google-closure-compiler with UglifyJS
	- cssshrink.sh: Replace yuicompressor with csso
	- require lessc >= 2.5.2 (and add support for v4) with less-plugin-clean-css for Less files compilation
	- Automatically collected recipients and trusted senders (#6904)
	- Added configurable Collected Recipients addressbook source (#4971)
	- Added configurable Trusted Senders addressbook source (#5046)
	- Added 'contact_exists' hook
	- Added separate "trusted senders" options for show_images and mdn_request preferences (#7614)
	- Contact form mode: private/business (#7630)
	- OAuth/XOauth support (#7425, #6933)
	- Cache refactoring (#6312)
	- Added special value 'email' to login_username_filter, it changes also logon input type (#7179)
	- Allow array in smtp_host config (#7296)
	- Support proxy for server-side HTTP requests (#7658)
	- By default do not set the User-Agent header (#7731)
	- Add possibility to (re-)define field mapping on contacts import from a CSV file (#7045, #6668)
	- Move "On request for return receipt" from "Mailbox View" to "Displaying Messages" (#7614)
	- Support RFC8438: IMAP STATUS=SIZE - for faster folder size calculation (#7269)
	- MySQL: Use utf8mb4 charset and utf8mb4_unicode_ci collation (#6535, #7113)
	- Allow NULL in users.preferences column in postgres and sqlite db, the same as for other engines (#7767)
	- Support for language codes up to 16 chars long (e.g. es-419) in database schema (#6851)
	- Relaxed domain name validation for extended TLDs support (#5588)
	- Allow opening application/octet-stream attachments according to filename extension (#6821)
	- Added support for INSERT OR REPLACE queries (#6771)
	- Allow skins to define which layout options they support (#7235)
	- Extract RFC2231 attachment name from message headers (#6729, #6783)
	- Add support for SameSite cookie attribute via session_samesite option (req PHP >= 7.3.0) (#6772)
	- Change folders sorting so shared/other users namespaces are listed last (#5012)
	- Display a warning and do not try to open empty attachments (#7332)
	- Return 204 rather than 404 on missing contact photo (#7777)
	- Add 'reconnect' plugin to retry IMAP connection (#7844)
	- Plugin API: Added 'message' argument to 'message_compose_body' hook
	- Plugin API: Added 'preferences' parameter to 'user_create' hook (#7692)
	- Elastic: Dark mode (#6709)
	- Elastic: Display email size on the list of messages (#7162)
	- Elastic: Replace properties sidebar with a dialog on the attachment preview page (#7635)
	- Elastic: Minimize forms/colors blink on page load
	- Elastic: Improve mail header "detailed mode" (#7224)
	- Elastic: Moving single recipients between recipient inputs with drag-n-drop (#5069)
	- Elastic: Display a special icon for other users and shared namespace roots (#5012)
	- Elastic: Support space-separated email addresses in recipient input (#6529, #6457)
	- Elastic: Remember list checkbox selection state (#7148)
	- Elastic: Add "Open in new window" in mail compose (#7260)
	- Elastic: Make custom less files optional (#7497)
	- Elastic: Prevent from opening mail preview in a new window on touch devices using double tap (#7732)
	- Templates: Add support for expressions in object attributes (#7237)
	- Templates: Add support for nested if conditions (#6818)
	- Templates: Make [space][slash] ending of condition objects optional (#6954)
	- Mailvelope: Fix size of iframe for PGP-inlined mail (#7348)
	- Mailvelope: Add config option to use Main Keyring (#7348, #7157)
	- Mailvelope: Add config option to set the size for new keys (#7348)
	- Mailvelope: Always ask before discarding email currently being composed (#7348)
	- Mailvelope: Fix unnecessary warning to re-add attachments when restoring a draft (#7348)
	- Archive: Added options to split archive by year or year+month and folder (#7216)
	- Enigma: Support ECC key generation - when using GnuPG >= 2.1.7 (#6853)
	- Managesieve: Add support for 'spamtest' extension - RFC3685 (#6950)
	- Managesieve: Allow display name with email address in vacation :from field (#6760)
	- Managesieve: Improve UX on custom header input (#7207)
	- Managesieve: Fix bug where activation of forward/vacation rule could activate a wrong script (#7423)
	- Managesieve: Fix bug where forward/vacation rule could end up being duplicated (#7349)
	- new_user_identity: Fix missing password for user-specific LDAP operations (#7667)
	- Password: Added 'pwned' password strength driver (#7274)
	- Password: Added Mail-in-a-Box (miab) driver (#7824)
	- Password: Added TinyCP driver (#7510)
	- Password: Added httpapi driver to connect to generic HTTP/HTTPS APIs (#7439)
	- Password: Added dovecot_passwdfile driver (#5786)
	- Password: Removed old 'cpanel' driver, 'cpanel_webmail' driver renamed to 'cpanel' (#7780)
	- Fix handling of address groups in email headers by ignoring their names (#7663)
	- Fix so message flags are updated on refresh also for multifolder search results (#7774)
	- Fix so IMAP ID command is send only after authentication (#7517)
	- Fix bug where it wasn't possible to save Spanish (Latin America) locale preference (#7784)
	- Fix mail search error on invalid search_mods definition (#7789)
	- Fix error when dealing with message/rfc822 attachments using Gmail IMAP (#6854)
	- Fix ISO-2022-JP-MS encoding issues (#7091)
	- Fix so messages in threads with no root aren't displayed separately (#4999)
	- Fix so anchor tags without href attribute are not modified (#7413)
	- Fix invalid IMAP SEARCH command in some rare case on messages cache synchronization (#7895)
	- Fix so allowing remote resources does not add an entry to browser history (#6620)

	## Release 1.4.11

	- Display a nice error informing about no PHP8 support
	- Elastic: Fix compatibility with Less v3 and v4 (#7813)
	- Fix bug with managesieve_domains in Settings > Forwarding form (#7849)
	- Fix errors in MSSQL database update scripts (#7853)
	- Security: Fix cross-site scripting (XSS) via HTML messages with malicious CSS content

	## Release 1.4.10

	- Fix extra angle brackets in In-Reply-To header derived from mailto: params (#7655)
	- Fix folder list issue whan special folder is a subfolder (#7647)
	- Fix Elastic's folder subscription toggle in search result (#7653)
	- Fix state of subscription toggle on folders list after changing folder state from the search result (#7653)
	- Security: Fix cross-site scripting (XSS) via HTML or Plain text messages with malicious content [CVE-2020-35730]

	## Release 1.4.9

	- Fix HTML editor in latest Chrome 85.0.4183.102, update to TinyMCE 4.9.11 (#7615)
	- Add missing localization for some label/legend elements in userinfo plugin (#7478)
	- Fix importing birthday dates from Gmail vCards (BDAY:YYYYMMDD)
	- Fix restoring Cc/Bcc fields from local storage (#7554)
	- Fix jstz.min.js installation, bump version to 1.0.7
	- Fix link to closure compiler in bin/jsshrink.sh script (#7567)
	- Fix incorrect PDO::lastInsertId() use in sqlsrv driver (#7564)
	- Fix bug where some parts of a message could have been missing in a reply/forward body (#7568)
	- Fix empty space on mail printouts in Chrome (#7604)
	- Fix empty output from HTML5 parser when content contains XML tag (#7624)
	- Fix scroll jump on key press in plain text mode of the HTML editor (#7622)
	- Fix so autocompletion list does not hide on scroll inside it (#7592)

	## Release 1.4.8

	- Fix support for an error as a string in message_before_send hook (#7475)
	- Elastic: Fix redundant scrollbar in plain text editor on mail reply (#7500)
	- Elastic: Fix deleted and replied+forwarded icons on messages list (#7503)
	- Managesieve: Fix too-small input field in Elastic when using custom headers (#7498)
	- Managesieve: Allow angle brackets in out-of-office message body (#7518)
	- Fix bug in conversion of email addresses to mailto links in plain text messages (#7526)
	- Fix format=flowed formatting on plain text part derived from the HTML content (#7504)
	- Fix incorrect rewriting of internal links in HTML content (#7512)
	- Fix handling links without defined protocol (#7454)
	- Fix paging of search results on IMAP servers with no SORT capability (#7462)
	- Fix detecting special folders on servers with both SPECIAL-USE and LIST-STATUS (#7525)
	- Security: Fix cross-site scripting (XSS) via HTML messages with malicious svg content [CVE-2020-16145]
	- Security: Fix cross-site scripting (XSS) via HTML messages with malicious math content
	- Security: Fix potential XSS issue in HTML editor of the identity signature input (#7507)

	## Release 1.4.7

	- Fix bug where subfolders of special folders could have been duplicated on folder list
	- Increase maximum size of contact jobtitle and department fields to 128 characters
	- Fix missing newline after the logged line when writing to stdout (#7418)
	- Elastic: Fix context menu (paste) on the recipient input (#7431)
	- Fix problem with forwarding inline images attached to messages with no HTML part (#7414)
	- Fix problem with handling attached images with same name when using database_attachments/redundant_attachments (#7455)
	- Security: Fix cross-site scripting (XSS) via HTML messages with malicious svg/namespace [CVE-2020-15562]

	## Release 1.4.6

	- Installer: Fix regression in SMTP test section (#7417)

	## Release 1.4.5

	- Fix bug in extracting required plugins from composer.json that led to spurious error in log (#7364)
	- Fix so the database setup description is compatible with MySQL 8 (#7340)
	- Markasjunk: Fix regression in jsevent driver (#7361)
	- Fix missing flag indication on collapsed thread in Larry and Elastic (#7366)
	- Fix default keyservers (use keys.openpgp.org), add note about CORS (#7373, #7367)
	- Password: Fix issue with Modoboa driver (#7372)
	- Mailvelope: Use sender's address to find pubkeys to check signatures (#7348)
	- Mailvelope: Fix Encrypt button hidden in Elastic (#7353)
	- Fix PHP warning: count(): Parameter must be an array or an object... in ID command handler (#7392)
	- Fix error when user-configured skin does not exist anymore (#7271)
	- Elastic: Fix aspect ratio of a contact photo in mail preview (#7339)
	- Fix bug where PDF attachments marked as inline could have not been attached on mail forward (#7382)
	- Security: Fix a couple of XSS issues in Installer (#7406)
	- Security: Fix XSS issue in template object 'username' (#7406)
	- Security: Better fix for CVE-2020-12641
	- Security: Fix cross-site scripting (XSS) via malicious XML attachment

	## Release 1.4.4

	- Fix bug where attachments with Content-Id were attached to the message on reply (#7122)
	- Fix identity selection on reply when both sender and recipient addresses are included in identities (#7211)
	- Elastic: Fix text selection with Shift+PageUp and Shift+PageDown in plain text editor when using Chrome (#7230)
	- Elastic: Fix recipient input bug when using click to select a contact from autocomplete list (#7231)
	- Elastic: Fix color of a folder with recent messages (#7281)
	- Elastic: Restrict logo size in print view (#7275)
	- Fix invalid Content-Type for messages with only html part and inline images - Mail_Mime-1.10.7 (#7261)
	- Fix missing contact display name in QR Code data (#7257)
	- Fix so button label in Select image/media dialogs is "Close" not "Cancel" (#7246)
	- Fix regression in testing database schema on MSSQL (#7227)
	- Fix cursor position after inserting a group to a recipient input using autocompletion (#7267)
	- Fix string literals handling in IMAP STATUS (and various other) responses (#7290)
	- Fix bug where multiple images in a message were replaced by the first one on forward/reply/edit (#7293)
	- Fix handling keyservers configured with protocol prefix (#7295)
	- Markasjunk: Fix marking as spam/ham on moving messages with Move menu (#7189)
	- Markasjunk: Fix bug where moving to Junk was failing on messages selected with Select > All (#7206)
	- Fix so imap error message is displayed to the user on folder create/update (#7245)
	- Fix bug where a special folder couldn't be created if a special-use flag is not supported (#7147)
	- Mailvelope: Fix bug where recipients with name were not handled properly in mail compose (#7312)
	- Fix characters encoding in group rename input after group creation/rename (#7330)
	- Fix bug where some message/rfc822 parts could not be attached on forward (#7323)
	- Make install-jsdeps.sh script working without the 'file' program installed (#7325)
	- Fix performance issue of parsing big HTML messages by disabling HTML5 parser for these (#7331)
	- Fix so Print button for PDF attachments works on Firefox >= 75 (#5125)
	- Security: Fix XSS issue in handling of CDATA in HTML messages [CVE-2020-12625]
	- Security: Fix remote code execution via crafted 'im_convert_path' or 'im_identify_path' settings [CVE-2020-12641]
	- Security: Fix local file inclusion (and code execution) via crafted 'plugins' option [CVE-2020-12640]
	- Security: Fix CSRF bypass that could be used to log out an authenticated user [CVE-2020-12626] (#7302)

	## Release 1.4.3

	- Enigma: Fix so key list selection is reset when opening key creation form (#7154)
	- Enigma: Fix so using list checkbox selection does not load the key preview frame
	- Enigma: Fix generation of key pairs for identities with IDN domains (#7181)
	- Enigma: Display IDN domains of key users and identities in UTF8
	- Enigma: Fix bug where "Send unencrypted" button didn't work in Elastic skin (#7205)
	- Managesieve: Fix bug where it wasn't possible to save flag actions (#7188)
	- Markasjunk: Fix bug where marking as spam/ham didn't work on moving messages with drag-and-drop (#7137)
	- Password: Make chpass-wrapper.py Python 3 compatible (#7135)
	- Elastic: Fix disappearing sidebar in mail compose after clicking Mail button
	- Elastic: Fix incorrect aria-disabled attribute on Mail taskmenu button in mail compose
	- Elastic: Fix bug where it was possible to switch editor mode when 'htmleditor' was in 'dont_override' (#7143)
	- Elastic: Fix text selection in recipient inputs (#7129)
	- Elastic: Fix missing Close button in "more recipients" dialog
	- Elastic: Fix non-working folder subscription checkbox for newly added folders (#7174)
	- Fix regression where "Open in new window" action didn't work (#7155)
	- Fix PHP Warning: array_filter() expects parameter 1 to be array, null given in subscriptions_option plugin (#7165)
	- Fix unexpected error message when mail refresh involves folder auto-unsubscribe (#6923)
	- Fix recipient duplicates in print-view when the recipient list has been expanded (#7169)
	- Fix bug where files in skins/ directory were listed on skins list (#7180)
	- Fix bug where message parts with no Content-Disposition header and no name were not listed on attachments list (#7117)
	- Fix display issues with mail subject that contains line-breaks (#7191)
	- Fix invalid Content-Transfer-Encoding on multipart messages - Mail_Mime fix (#7170)
	- Fix regression where using an absolute path to SQLite database file on Windows didn't work (#7196)
	- Fix using unix:///path/to/socket.file in memcached driver (#7210)

	## Release 1.4.2

	- Add support for PHPUnit 6 and 7 (#6870)
	- Plugin API: Make actionbefore, before<action>, actionafter and after<action> events working with plugin actions (#7106)
	- Managesieve: Replace "Filter disabled" with "Filter enabled" (#7028)
	- Managesieve: Fix so modifier type select wasn't hidden after hiding modifier select on header change
	- Managesieve: Fix filter selection after removing a first filter (#7079)
	- Markasjunk: Fix marking more than one message as spam/ham with email_learn driver (#7121)
	- Password: Fix kpasswd and smb drivers' double-escaping bug (#7092)
	- Enigma: Add script to import keys from filesystem to the db storage (for multihost)
	- Installer: Fix DB Write test on SQLite database ("database is locked" error) (#7064)
	- Installer: Fix so SQLite DSN with a relative path to the database file works in Installer
	- Elastic: Fix contrast of warning toasts (#7058)
	- Elastic: Simple search in pretty selects (#7072)
	- Elastic: Fix hidden list widget on mobile/tablet when selecting folder while search menu is open (#7120)
	- Fix so type attribute on script tags is not used on HTML5 pages (#6975)
	- Fix unread count after purge on a folder that is not currently selected (#7051)
	- Fix bug where Enter key didn't work on messages list in "List" layout (#7052)
	- Fix bug where deleting a saved search in addressbook caused display issue on sources/groups list (#7061)
	- Fix bug where a new saved search added after removing all searches wasn't added to the list (#7061)
	- Fix bug where a new contact group added after removing all groups from addressbook wasn't added to the list
	- Fix bug where Ctype extension wasn't required in Installer and INSTALL file (#7049)
	- Fix so install-jsdeps.sh removes Bootstrap's sourceMappingURL (#7035)
	- Fix so use of Ctrl+A does not scroll the list (#7020)
	- Fix/remove useless keyup event handler on username input in logon form (#6970)
	- Fix bug where cancelling switching from HTML to plain text didn't set the flag properly (#7077)
	- Fix bug where HTML reply could add an empty line with extra indentation above the original message (#7088)
	- Fix matching multiple X-Forwarded-For addresses with 'proxy_whitelist' (#7107)
	- Fix so displayed maximum attachment size depends also on 'max_message_size' (#7105)
	- Fix bug where 'skins_allowed' option didn't enforce user skin preference (#7080)
	- Fix so contact's organization field accepts up to 128 characters (it was 50)
	- Fix bug where listing tables in PostgreSQL database with db_prefix didn't work (#7093)
	- Fix bug where 'text' attribute on body tag was ignored when displaying HTML message (#7109)
	- Fix bug where next message wasn't displayed after delete in List mode (#7096)
	- Fix so number of contacts in a group is not limited to 200 when redirecting to mail composer from Contacts (#6972)
	- Fix malformed characters in HTML message with charset meta tag not in head (#7116)

	## Release 1.4.1

	- Elastic: Change HTML editor widget to improve form flow (#6992)
	- Elastic: Fix position of mobile floating action button (#7038)
	- Managesieve: Fix locked UI after opening filter frame (#7007)
	- Fix PHP warning: "array_merge(): Expected parameter 2 to be an array, null given in sendmail.inc (#7003)
	- Fix bug where cache keys could exceed length limit specified in db schema (#7004)
	- Fix invalid Signature button state after escaping Mailvelope mode (#7015)
	- Fix so 401 error is returned only on failed logon requests (#7010)
	- Fix db_prefix handling in queries with `TRUNCATE TABLE <name>` and `UNIQUE <name>` (#7013)
	- Fix so update.sh script warns about changed defaults (#7011)
	- Fix tables listing routine when DSN contained a database with unsupported suffix (#7034)
	- Fix so Elastic is also a default in jqueryui plugin (#7039)
	- Fix bug where the Installer would not warn about required schema upgrade (#7042)

	## Release 1.4.0

	- Elastic: Resizable columns (#6929)
	- Elastic: Fix position and style of auto-complete dropdown on small screens (#6951)
	- Elastic: Fix initial focus on recipients input in mail compose screen
	- Elastic: Fix inserting responses at cursor position (#6971)
	- Elastic: Fix unread filter icon and search state on folder change (#6978)
	- Elastic: Fix regression where Encrypt button wasn't displayed in mail compose toolbar (#6982)
	- Elastic: Fix regression where recipient input didn't update internal input state (#6988)
	- Enigma: Fix bug where signing option was set to disabled after saving a draft in Elastic skin (#6515)
	- Redis: Improve error handling and phpredis 5.X support (#6888)
	- Archive: Fix bug where next email was not displayed after Archive button use (#6965)
	- Archive: Fix missing Archive icon in folder selector popup in Elastic
	- Fix bug where cache keys were not case-sensitive on MySQL/MSSQL (#6942)
	- Fix so an error is logged when encryption fails (#6948)
	- Fix bug where inline images could have been ignored if Content-Id header contained redundant spaces (#6980)
	- Fix and document skin_logo setup (#6981)

	## Release 1.4-rc2

	- Update to jQuery 3.4.1
	- Clarified 'address_book_type' option behavior (#6680)
	- Added cookie mismatch detection, display an error message informing the user to clear cookies
	- Renamed 'log_session' option to 'session_debug'
	- Removed 'delete_always' option (#6782)
	- Don't log full session identifiers in userlogins log (#6625)
	- Support $HasAttachment/$HasNoAttachment keywords (#6201)
	- Support PECL memcached extension as a session and cache storage driver (experimental)
	- Switch to IDNA2008 variant (#6806)
	- installto.sh: Add possibility to run the update even on the up-to-date installation (#6533)
	- Plugin API: Add 'render_folder_selector' hook
	- Added 'keyservers' option to define list of HKP servers for Enigma/Mailvelope (#6326)
	- Added flag to disable server certificate validation via Mysql DSN argument (#6848)
	- Select all records on the current list page with CTRL + A (#6813)
	- Use Left/Right Arrow keys to faster move over threaded messages list (#6399)
	- Changes in `display_next` setting (#6795):
	- Move it to Preferences > User Interface > Main Options
	- Make it apply to Contacts interface too
	- Make it apply only if deleting/moving a previewed message/contact
	- Redis: Support connection to unix socket
	- Put charset meta specification before a title tag, add page title automatically (#6811)
	- Elastic: Various internal refactorings
	- Elastic: Add Prev/Next buttons on message page toolbar (#6648)
	- Elastic: Close search options on Enter key press in quick-search input (#6660)
	- Elastic: Changed some icons (#6852)
	- Elastic: Changed read/unread icons (#6636)
	- Elastic: Changed "Move to..." icon (#6637)
	- Elastic: Add hide/show for advanced preferences (#6632)
	- Elastic: Add default icon on Settings/Preferences lists for external plugins (#6814)
	- Elastic: Add indicator for popover menu items that open a submenu (#6868)
	- Elastic: Move compose attachments/options to the right side (#6839)
	- Elastic: Add border/background to attachments list widget (#6842)
	- Elastic: Add "Show unread messages" button to the search bar (#6587)
	- Elastic: Fix bug where toolbar disappears on attachment menu use in Chrome (#6677)
	- Elastic: Fix folders list scrolling on touch devices (#6706)
	- Elastic: Fix non-working pretty selects in Chrome browser (#6705)
	- Elastic: Fix issue with absolute positioned mail content (#6739)
	- Elastic: Fix bug where some menu actions could cause a browser popup warning
	- Elastic: Fix handling mailto: URL parameters in contact menu (#6751)
	- Elastic: Fix keyboard navigation in some menus, e.g. the contact menu
	- Elastic: Fix visual issue with long buttons in .boxwarning (#6797)
	- Elastic: Fix handling new-line in text pasted to a recipient input
	- Elastic: Fix so search is not reset when returning from the message preview page (#6847)
	- Larry: Fix regression where menu actions didn't work with keyboard (#6740)
	- ACL: Display user/group names (from ldap) instead of acl identifier
	- Password: Added ldap_exop driver (#4992)
	- Password: Added support for SSHA512 password algorithm (#6805)
	- Managesieve: Fix bug where global includes were requested for vacation (#6716)
	- Managesieve: Use RFC-compliant line endings, CRLF instead of LF (#6686)
	- Managesieve: Fix so "Create filter" option does not show up when Filters menu is disabled (#6723)
	- Enigma: For verified signatures, display the user id associated with the sender address (#5958)
	- Enigma: Fix bug where revoked users/keys were not greyed out in key info
	- Enigma: Fix error message when trying to encrypt with a revoked key (#6607)
	- Enigma: Fix "decryption oracle" bug [CVE-2019-10740] (#6638)
	- Enigma: Fix bug where signature verification could have been skipped for some message structures (#6838)
	- Fix language selection for spellchecker in html mode (#6915)
	- Fix css styles leak from replied/forwarded message to the rest of the composed text (#6831)
	- Fix invalid path to "add contact" icon when using assets_path setting
	- Fix invalid path to blocked.gif when using assets_path setting (#6752)
	- Fix so advanced search dialog is not automatically displayed on searchonly addressbooks (#6679)
	- Fix so an error is logged when more than one attachment plugin has been enabled, initialize the first one (#6735)
	- Fix bug where flag change could have been passed to a preview frame when not expected
	- Fix bug in HTML parser that could cause missing text fragments when there was no head/body tag (#6713)
	- Fix bug where HTML messages with a xml:namespace tag were not rendered (#6697)
	- Fix TinyMCE download location (#6694)
	- Fix so "Open in new window" consistently displays "external window" interface (#6659)
	- Fix bug where next row wasn't selected after deleting a collapsed thread (#6655)
	- Fix bug where external content (e.g. mail body) was passed to templates parsing code (#6640)
	- Fix bug where attachment preview didn't work with x_frame_options=deny (#6688)
	- Fix so bin/install-jsdeps.sh returns error code on error (#6704)
	- Fix bug where bmp images couldn't be displayed on some systems (#6728)
	- Fix bug in parsing vCard data using PHP 7.3 due to an invalid regexp (#6744)
	- Fix bug where bold/strong text was converted to upper-case on html-to-text conversion (6758)
	- Fix bug in rcube_utils::parse_hosts() where %t, %d, %z could return only tld (#6746)
	- Fix bug where Next/Prev button in mail view didn't work with multi-folder search result (#6793)
	- Fix bug where selection of columns on messages list wasn't working
	- Fix bug in converting multi-page Tiff images to Jpeg (#6824)
	- Fix bug where handling multiple messages from multi-folder search result could not work (#6845)
	- Fix bug where unread count wasn't updated after moving multi-folder result (#6846)
	- Fix wrong messages order after returning to a multi-folder search result (#6836)
	- Fix some PHP 7.4 compat. issues (#6884, #6866)
	- Fix bug where it was possible to bypass the position:fixed CSS check in received messages (#6898)
	- Fix bug where some strict remote URIs in url() style were unintentionally blocked (#6899)
	- Fix bug where it was possible to bypass the CSS jail in HTML messages using :root pseudo-class (#6897)
	- Fix bug where it was possible to bypass href URI check with data:application/xhtml+xml URIs (#6896)

	## Release 1.4-rc1

	- Changed 'password_charset' default to 'UTF-8' (#6522)
	- Add skins_allowed option (#6483)
	- SMTP GSSAPI support via krb_authentication plugin (#6417)
	- Avoid Referer leaking by using Referrer-Policy:same-origin header (#6385)
	- Removed 'referer_check' option (#6440)
	- Use constant prefix for temp file names, don't remove temp files from other apps (#6511)
	- Ignore 'Sender' header on Reply-All action (#6506)
	- deluser.sh: Add option to delete users who have not logged in for more than X days (#6340)
	- HTML5 Upload Progress - as a replacement for the old server-side solution (#6177)
	- Update to TinyMCE 4.8.2
	- Update to jQuery-MiniColors 2.3.4
	- Prevent from using deprecated timezone names from jsTimezoneDetect
	- Force session.gc_probability=1 when using custom session handlers (#6560)
	- Support simple field labels (e.g. LetterHub examples) in csv imports (#6541)
	- Add cache busters also to images used by templates (#6610)
	- Plugin API: Added 'raise_error' hook (#6199)
	- Plugin API: Added 'common_headers' hook (#6385)
	- Plugin API: Added 'ldap_connected' hook
	- Enigma: Update to OpenPGPjs 4.2.1 - fixes user name encoding issues in key generation (#6524)
	- Enigma: Fixed multi-host synchronization of private and deleted keys and pubring.kbx file
	- Managesieve: Added support for 'editheader' extension - RFC5293 (#5954)
	- Managesieve: Fix bug where custom header or variable could be lost on form submission (#6594)
	- Markasjunk: Integrate markasjunk2 features into markasjunk - marking as non-junk + learning engine (#6504)
	- Password: Added 'modoboa' driver (#6361)
	- Password: Fix bug where password_dovecotpw_with_method setting could be ignored (#6436)
	- Password: Fix bug where new users could skip forced password change (#6434)
	- Password: Allow drivers to override default password comparisons (eg new is not same as current) (#6473)
	- Password: Allow drivers to override default strength checks (eg allow for 'not the same as last x passwords') (#246)
	- Password: Allow drivers to define password strength rules displayed to the user
	- Password: Allow separate password saving and strength drivers for use of strength checking services (#5040)
	- Password: Add zxcvbn driver for checking password strength (#6479)
	- Password: Disallow control characters in passwords
	- Password: Add support for Plesk >= 17.8 (#6526)
	- Elastic: Improved datepicker displayed always in parent window
	- Elastic: On touch devices display attachment icons on messages list (#6296)
	- Elastic: Make menu button inactive if all subactions are inactive (#6444)
	- Elastic: On mobile/tablet jump to the list on folder selection (#6415)
	- Elastic: Various improvements on mail compose screen (#6413)
	- Elastic: Support new-line char as a separator for pasted recipients (#6460)
	- Elastic: Improved UX of search dialogs (#6416)
	- Elastic: Fix unwanted thread expanding when selecting a collapsed thread in non-mobile mode (#6445)
	- Elastic: Fix too small height of mailvelope mail preview frame (#6600)
	- Elastic: Add "status bar" for mobile in mail composer
	- Elastic: Add selection options on contacts list (#6595)
	- Elastic: Fix unintentional layout preference overwrite (#6613)
	- Elastic: Fix bug where Enigma options in mail compose could sometimes be ignored (#6515)
	- Log errors caused by low pcre.backtrack_limit when sending a mail message (#6433)
	- Fix regression where drafts were not deleted after sending the message (#6756)
	- Fix so max_message_size limit is checked also when forwarding messages as attachments (#6580)
	- Fix so performance stats are logged to the main console log also when per_user_logging=true
	- Fix malformed message saved into Sent folder when using big attachments and low memory limit (#6498)
	- Fix incorrect IMAP SASL GSSAPI negotiation (#6308)
	- Fix so unicode in local part of the email address is also supported in recipient inputs (#6490)
	- Fix bug where autocomplete list could be displayed out of screen (#6469)
	- Fix style/navigation on error page depending on authentication state (#6362)
	- Fix so invalid smtp_helo_host is never used, fallback to localhost (#6408)
	- Fix custom logo size in Elastic (#6424)
	- Fix listing the same attachment multiple times on forwarded messages
	- Fix bug where a message/rfc822 part without a filename wasn't listed on the attachments list (#6494)
	- Fix inconsistent offset for various time zones - always display Standard Time offset (#6531)
	- Fix dummy Message-Id when resuming a draft without Message-Id header (#6548)
	- Fix handling of empty entries in vCard import (#6564)
	- Fix bug in parsing some IMAP command responses that include unsolicited replies (#6577)
	- Fix PHP 7.2 compatibility in debug_logger plugin (#6586)
	- Fix so ANY record is not used for email domain validation, use A, MX, CNAME, AAAA instead (#6581)
	- Fix so mime_content_type check in Installer uses files that should always be available (i.e. from program/resources) (#6599)
	- Fix missing CSRF token on a link to download too-big message part (#6621)
	- Fix bug when aborting dragging with ESC key didn't stop the move action (#6623)

	## Release 1.4-beta

	- Added new skin with mobile support - the Elastic
	- Support Redis cache
	- Email Resent (Bounce) feature (#4985)
	- Improved Mailvelope integration
	- Added private key listing and generating to identity settings
	- Enable encrypt & sign option if Mailvelope supports it
	- Allow contacts without an email address (#5079)
	- Support SMTPUTF8 and relax email address validation to support unicode in local part (#5120)
	- Support for IMAP folders that cannot contain both folders and messages (#5057)
	- Update to jQuery-3.3.1
	- Update to jQuery-minicolors 2.2.6
	- Update to TinyMCE 4.7.13
	- Remove sample PHP configuration from .htaccess and .user.ini files (#5850)
	- Extend skin_logo setting to allow per skin logos (#6272)
	- Use Masterminds/HTML5 parser for better HTML5 support (#5761)
	- Add More actions button in Contacts toolbar with Copy/Move actions (#6081)
	- Display an error when clicking disabled link to register protocol handler (#6079)
	- Add option trusted_host_patterns (#6009, #5752)
	- Support additional connect parameters in PostgreSQL database wrapper
	- Use UI dialogs instead of confirm() and alert() where possible
	- Display value of the SMTP message size limit in the error message (#6032)
	- Show message flagged status in message view (#5080)
	- Skip redundant INSERT query on successful logon when using PHP7
	- Replace display_version with display_product_version (#5904)
	- Extend disabled_actions config so it accepts also button names (#5903)
	- Handle remote stylesheets the same as remote images, ask the user to allow them (#5994)
	- Add Message-ID to the sendmail log (#5871)
	- Add option to hide folders in share/other-user namespace or outside of the personal namespace root (#5073)
	- Archive: Fix archiving by sender address on cyrus-imap
	- Archive: Style Archive folder also on folder selector and folder manager lists
	- Archive: Add Thunderbird compatible Month option (#5623)
	- Archive: Create archive folder automatically if it's configured, but does not exist (#6076)
	- Enigma: Add button to send mail unencrypted if no key was found (#5913)
	- Enigma: Add options to set PGP cipher/digest algorithms (#5645)
	- Enigma: Multi-host support
	- Managesieve: Add ability to disable filter sets and other actions (#5496, #5898)
	- Managesieve: Add option managesieve_forward to enable settings dialog for simple forwarding (#6021)
	- Managesieve: Support filter action with custom IMAP flags (#6011)
	- Managesieve: Support 'mime' extension tests - RFC5703 (#5832)
	- Managesieve: Support GSSAPI authentication with krb_authentication plugin (#5779)
	- Managesieve: Support enabling the plugin for specified hosts only (#6292)
	- Password: Support host variables in password_db_dsn option (#5955)
	- Password: Automatic virtualmin domain setting, removed password_virtualmin_format option (#5759)
	- Password: Added password_username_format option (#5766)
	- subscriptions_option: show \\Noselect folders greyed out (#5621)
	- zipdownload: Added option to define size limit for multiple messages download (#5696)
	- vcard_attachments: Add possibility to send contact vCard from Contacts toolbar (#6080)
	- Changed defaults for smtp_user (%u), smtp_pass (%p) and smtp_port (587)
	- Composer: Fix certificate validation errors by using packagist only (#5148)
	- Add --get and --extract arguments and CACHEDIR env-variable support to install-jsdeps.sh (#5882)
	- Support _filter and _scope as GET arguments for opening mail UI (#5825)
	- Various improvements for templating engine and skin behaviours
	- Support conditional include
	- Support for 'link' objects
	- Support including files with path relative to templates directory
	- Use <button> instead of <input> for submit button on logon screen
	- Support skin localization (#5853)
	- Reset onerror on images if placeholder does not exist to prevent from requests storm
	- Unified and simplified code for loading content frame for responses and identities
	- Display contact import and advanced search in popup dialogs
	- Display a dialog for mail import with supported format description and upload size hint
	- Make possible to set (some) config options from a skin
	- Added optional checkbox selection for the list widget
	- Make 'compose' command always enabled
	- Add .log suffix to all log file names, add option log_file_ext to control this (#313)
	- Return "401 Unauthorized" status when login fails (#5663)
	- Support both comma and semicolon as recipient separator, drop recipients_separator option (#5092)
	- Plugin API: Added 'show_bytes' hook (#5001)
	- Add option to not indent quoted text on top-posting reply (#5105)
	- Removed global $CONFIG variable
	- Removed debug_level setting
	- Support AUTHENTICATE LOGIN for IMAP connections (#5563)
	- Support LDAP GSSAPI authentication (#5703)
	- Localized timezone selector (#4983)
	- Use 7bit encoding for ISO-2022-* charsets in sent mail (#5640)
	- Handle inline images also inside multipart/mixed messages (#5905)
	- Allow style tags in HTML editor on composed/reply messages (#5751)
	- Use Github API as a fallback to fetch js dependencies to workaround throttling issues (#6248)
	- Show confirm dialog when moving folders using drag and drop (#6119)
	- Fix bug where new_user_dialog email check could have been circumvented by deleting / abandoning session (#5929)
	- Fix skin extending for assets (#5115)
	- Fix handling of forwarded messages inside of a TNEF message (#5632)
	- Fix bug where attachment size wasn't visible when the filename was too long (#6033)
	- Fix checking table columns when there's more schemas/databases in postgres/mysql (#6047)
	- Fix css conflicts in user interface and e-mail content (#5891)
	- Fix duplicated signature when using Back button in Chrome (#5809)
	- Fix touch event issue on messages list in IE/Edge (#5781)
	- Fix so links over images are not removed in plain text signatures converted from HTML (#4473)
	- Fix various issues when downloading files with names containing non-ascii chars, use RFC 2231 (#5772)

	## Release 1.3.8

	- Fix PHP warnings on dummy QUOTA responses in Courier-IMAP 4.17.1 (#6374)
	- Fix so fallback from BINARY to BODY FETCH is used also on [PARSE] errors in dovecot 2.3 (#6383)
	- Enigma: Fix deleting keys with authentication subkeys (#6381)
	- Fix invalid regular expressions that throw warnings on PHP 7.3 (#6398)
	- Fix so Classic skin splitter does not escape out of window (#6397)
	- Fix XSS issue in handling invalid style tag content [CVE-2018-19206] (#6410)
	- Fix compatibility with MySQL 8 - error on 'system' table use
	- Managesieve: Fix bug where show_real_foldernames setting wasn't respected (#6422)
	- New_user_identity: Fix %fu/%u vars substitution in user specific LDAP params (#6419)
	- Fix support for "allow-from <uri>" in "x_frame_options" config option (#6449)
	- Fix bug where valid content between HTML comments could have been skipped in some cases (#6464)
	- Fix multiple VCard field search (#6466)
	- Fix session issue on long running requests (#6470)

	## Release 1.3.7

	- Fix PHP Warning: Use of undefined constant IDNA_DEFAULT on systems without php-intl (#6244)
	- Fix bug where some parts of quota information could have been ignored (#6280)
	- Fix bug where some escape sequences in html styles could bypass security checks
	- Fix bug where some forbidden characters on Cyrus-IMAP were not prevented from use in folder names
	- Fix bug where only attachments with the same name would be ignored on zip download (#6301)
	- Fix bug where unicode contact names could have been broken/emptied or caused DB errors (#6299)
	- Fix bug where after "mark all folders as read" action message counters were not reset (#6307)
	- Enigma: [EFAIL] Don't decrypt PGP messages with no MDC protection (#6289)
	- Fix bug where some HTML comments could have been malformed by HTML parser (#6333)

	## Release 1.3.6

	- Fix parsing date strings (e.g. from a Date: mail header) with comments (#6216)
	- Fix PHP 7.2: count(): Parameter must be an array in enchant-based spellchecker (#6234)
	- Fix possible IMAP command injection and type juggling vulnerabilities (#6229)
	- Enigma: Fix key selection for signing
	- Enigma: Enable keypair generation on Internet Explorer 11
	- Fix check_request() bypass in places using get_uids() [CVE-2018-9846] (#6238)
	- Fix bug where usernames without domain part could be malformed or converted to lower-case on logon (#6224)

	## Release 1.3.5

	- Managesieve: Fix bug where text: syntax was forced for strings longer than 1024 characters (#6143)
	- Managesieve: Fix missing Save button in Edit Filter Set page of Classic skin (#6154)
	- Fix duplicated labels in Test SMTP Config section (#6166)
	- Fix PHP Warning: exif_read_data(...): Illegal IFD size (#6169)
	- Enigma: Fix key generation in Safari by upgrade to OpenPGP 2.6.2 (#6149)
	- Fix security issue in remote content blocking on HTML image and style tags (#6178)
	- Added 9pt and 11pt to the list of font sizes in HTML editor
	- Fix handling encoding of HTML tags in "inline" JSON output (#6207)
	- Fix bug where some unix timestamps were not handled correctly by rcube_utils::anytodatetime() (#6212)

	## Release 1.3.4

	- Fix bug where contacts search could skip some records (#6130)
	- Fix possible information leak - add more strict sql error check on user creation (#6125)
	- Fix a couple of warnings on PHP 7.2 (#6098)
	- Fix broken long filenames when using imap4d server - workaround server bug (#6048)
	- Fix so temp_dir misconfiguration prints an error to the log (#6045)
	- Fix untagged COPYUID responses handling - again (#5982)
	- Fix PHP warning "idn_to_utf8(): INTL_IDNA_VARIANT_2003 is deprecated" with PHP 7.2 (#6075)
	- Fix bug where Archive folder wasn't auto-created on login with create_default_folders=true
	- Fix performance issue when parsing malformed and long Date header (#6087)
	- Fix syntax error in mssql.initial.sql (#6097)
	- Fix bug where contacts export by selection returned no more than 10 entries (#6103)
	- Fix searching contacts by address in LDAP source (#6084)
	- Fix X-Frame-Options:ALLOW-FROM support, remove custom click-jacking protection (#6057)

	## Release 1.3.3

	- Fix decoding of mailto: links with + character in HTML messages (#6020)
	- Fix false reporting of failed upgrade in installto.sh (#6019)
	- Fix file disclosure vulnerability caused by insufficient input validation [CVE-2017-16651] (#6026)
	- Fix mangled non-ASCII characters in links in HTML messages (#6028)

	## Release 1.3.2

	- Fix bug where pink image was used instead of a thumbnail when image resize fails (#5933)
	- Fix so files size/count limit is verified (client-side) also on drag-n-drop uploads (#5940)
	- Fix invalid template loading on a message error in preview frame (#5941)
	- Fix bug where HTML messages could have been rendered empty on some systems (#5957)
	- Fix wording of "Mark previewed messages as read" to "Mark messages as read" (#5952)
	- Enigma: Fix decryption of messages encoded with non-ascii charset (#5962)
	- Fix missing cursor in HTML editor on mail reply (#5969)
	- Fix (again) bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
	- Fix bug where mail search could return empty result on servers without SORT capability (#5973)
	- Fix bug where assets_path wasn't added to some watermark frames
	- Fix so untagged COPYUID responses are also supported according to RFC6851 (#5982)
	- Fix issue caused by non-default session.cookie_lifetime setting (#5961)
	- Fix Edge encoding bug when pasting text into the HTML editor, update to TinyMCE 4.5.8 (#5885)
	- Fix handling of unknown Content-Disposition type (#6002)
	- Fix truncated folder name on messages list in multi-folder mode, for folders with non-ascii characters (#6004)
	- Fix bug where removing the last subfolder did not hide toggle button on its parent record (#6007)
	- Fix bug where ghost messages could be added to the list after fast delete (#5941)

	## Release 1.3.1

	- Add Preferences > Mailbox View > Main Options > Layout (#5829)
	- Password: Fix compatibility with PHP 7+ in cpanel_webmail driver (#5820)
	- Managesieve: Fix parsing dot-staffed lines in multiline text (#5838)
	- Managesieve: Fix AM/PM suffix in vacation time selectors
	- Managesieve: Fix bug where 'exists' operator was reset to 'contains' (#5899)
	- Remove non-printable characters from filenames on download/display (#5880)
	- Fix decoding non-ascii attachment names from TNEF attachments (#5646, #5799)
	- Fix uninitialized string offset in rcube_utils::bin2ascii() and make sure rcube_utils::random_bytes() result has always requested length (#5788)
	- Fix bug where HTML messages with @media styles could modify style of page body (#5811)
	- Fix style issue on selected and unfocused message that is part of a thread (#5798)
	- Fix bug where a.button style from managesieve plugin could impact other elements (#5800)
	- Fix position of selected icon for (Mailvelope) Encrypt button
	- Fix fatal error when using DMY- or MDY-based date format in PostgreSQL (#5808)
	- Fix bug where errors were not printed when using bin/update.sh (#5834)
	- Fix PHP 7.2 warnings on count() use (#5845)
	- Fix bug where Chrome could not upload the same file that was selected before (#5854)
	- Fix duplicate messages on the list after deleting messages on the next to the last page (#5862)
	- Fix bug where messages count was not updated after delete when imap_cache is set (#5872)
	- Fix potential XSS vulnerability with malformed HTML message markup
	- Fix sending message with "Too many public recipients" dialog buttons (#5924)
	- Bring back double-click behavior on the message list which was removed in 1.3.0 (#5823)
	- Enigma: Fix decrypting an encrypted+signed message when signature verification fails (#5914)

	## Release 1.3.0

	- Update to TinyMCE 4.5.7
	- Fix bug where invalid recipients could be silently discarded (#5739)
	- Fix conflict with _gid cookie of Google Analytics (#5748)
	- Print error from CLI scripts when system/exec function is disabled (#5744)
	- Fix bug where comment notation within style tag would cause the whole style to be ignored (#5747)
	- Fix bug where it wasn't possible to scroll folders list in Edge (#5750)
	- Fix folders list sorting on Windows - if php-intl is available (#5732)
	- Fix addressbook searching by gender (#5757)
	- Fix prevention from using % and * characters in folder name (#5762)
	- Fix POST parameter reflection in default_charset selector (#5768)
	- Enigma: Fix compatibility with assets_dir
	- Managesieve: Skip redundant LISTSCRIPTS command
	- Fix SQL syntax error on MariaDB 10.2 (#5774)
	- Fix bug where zipdownload ignored files with the same name (#5777)
	- Fix bug where it wasn't possible to set timezone to auto-detected value (#5782)

	## Release 1.3-rc

	- "Flattened" the larry theme: fresher look by removing shadows and gradients
	- Support logging to php://stdout (#5721)
	- Add support for DelSp=Yes in format=flowed messages (#5702)
	- Update to jQuery 3.2.1
	- Update to TinyMCE 4.5.6
	- Plugin API: Call message_part_structure hook for sub-parts of multipart/alternative message (#5678)
	- Enigma: Always use detached signatures (#5624)
	- Enigma: Fix handling of messages with nested PGP encrypted parts (#5634)
	- Minimize unwanted message loading in preview frame on drag (#5616)
	- Fix failing database schema check in all engines except mysql (#5730)
	- Fix autocomplete popup closing with click outside the input, don't handle Tab key as Enter (#5606)
	- Fix jsdeps.json synchronization on update, warn about missing requirements of install-jsdeps.sh (#5598)
	- Fix missing thread expand icon on search result in widescreen mode (#5613)
	- Fix bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
	- Fix bug where external content in src attribute of input/video tags was not secured (#5583)
	- Fix PHP error on update of a contact with multiple email addresses when using PHP 7.1 (#5587)
	- Fix bug where mail content frame couldn't be reset in some corner cases (#5608)
	- Fix bug where some classic skin images were not displayed in IE/Edge (#5614)
	- Fix bug where signature couldn't be added above the quote in Firefox 51 (#5628)
	- Fix regression where groups with email address were resolved to its members' addresses
	- Fix update of group name in the contacts list header on group rename (#5648)
	- Add rewrite rule to disable access to /vendor/bin folder in .htaccess (#5630)
	- Fix bug where it was too easy accidentally move a folder when using the subscription checkbox (#5655)
	- Managesieve: Fix parser issue with empty lines between comments (#5657)
	- Managesieve: Fix possible defect in handling \r\n in scripts (#5685)
	- Fix/rephrase "unsaved changes" warning when cancelling a draft (#5610)
	- Fix XSS issue in handling of a style tag inside of an svg element [CVE-2017-6820]
	- Fix bug where settings/upload.inc could not be used by plugins (#5694)
	- Fix regression in LDAP fuzzy search where it always used prefix search instead (#5713)
	- Fix bug where namespace prefix could not be truncated on folders list if show_real_foldernames=true (#5695)
	- Fix undesired effects when postgres database uses different timezone than PHP host (#5708)
	- Installer: Fix DB schema initialization on MS SQL Server
	- Fix bug where base_dn setting was ignored inside group_filters (#5720)
	- Password: Fix security issue in virtualmin and sasl drivers [CVE-2017-8114]

	## Release 1.3-beta

	- Nicely handle contact deletion on contact edit (#5522)
	- vcard_attachments: Add possibility to attach contact vCard to composed message (#4997)
	- Preserve message internal/received date on import in mbox format (#5559)
	- Zipdownload: Fix date format in mbox "From line"
	- Possibility to display QR code for contacts data (#5030)
	- Added identicon plugin
	- Widescreen layout aka three column view (#5093)
	- Unify automatic marking as \Seen in preview pane, full-page and extwin views (#5071)
	- Disable double-click on the list when preview pane is on (#5199)
	- Support hostname and hostname:port in force_https option (#5511)
	- Support ALLOW-FROM in x_frame_options (#5122)
	- Allow to omit a subject when sending an email (#5068)
	- Warn about too many disclosed recipients in composed email [max_disclosed_recipients] (#5132)
	- identity_select: Support Received header (#5085)
	- Plugin API: Added get_compose_responses hook (#5457)
	- Display error when trying to upload more files than specified in max_file_uploads (#5483)
	- Add missing sql upgrade file for 'ip' column resize in session table (#5465)
	- Do not show inline images of unsupported mimetype (#5463)
	- Password: Added replacement variables support in password_pop_host (#5539)
	- Password: Don't store passwords in temp files when using dovecotpw (#5531)
	- Password: Added LDAP PPolicy driver (#5364)
	- Password: Added cpanel_webmail driver (#5549)
	- Password: Added possibility to nicely redirect from other plugins on password expiration (#5468)
	- Implement separate action to mark all messages in a folder as \Seen (#5006)
	- Implement marking as \Seen in all folders or in a folder and its subfolders (#5076)
	- Archive: Don't reload messages list when it's not needed (#5225)
	- Archive: Add option to automatically mark archived messages as \Seen (#5142)
	- Improve randomness of password salts and random hashes (#5266)
	- Password/cPanel: Add support for hash authentication and reseller accounts (#5252)
	- Support host-specific imap_conn_options/smtp_conn_options/managesieve_conn_options (#5136)
	- Center and scale images in attachment preview frame (#5421)
	- Added max_message_size option enforced when attaching files to a composed message (#4993)
	- Added Search button in quick search menus (#5312)
	- Implement "one click" attachment/messages/photo upload (#5024)
	- Squirrelmail_usercopy: Add option to define character set of data files
	- Removed useless 'created' column from 'session' table (#5389)
	- Dropped legacy browsers support (#5167)
	- Removed legacy_browser plugin
	- Removed hacks for IE < 10
	- Update to jQuery 3.1.1 and jQuery-UI 1.12.0
	- compile .min.js files with ECMASCRIPT5 option
	- Require PHP >= 5.4
	- Add possibility to preview and download attachments in mail compose (#5053)
	- Add possibility to rename attachments in mail compose (#4996)
	- Remove backward compatibility "layer" of bc.php (#4902)
	- Support WEBP images in mail messages (#5362)
	- Support MathML in HTML message preview (#5182)
	- Rename Addressbook to Contacts (#5233)
	- Remove PHP mail() support, smtp_server is required now (#5340)
	- Display full message subject in onmouseover on truncated subject in mail view (#5346)
	- Enigma: Support GnuPG 2.1 (#5313)
	- Enigma: Support key generation for multiple identities (#5383)
	- Enigma: Import keys from key-server(s) (#5286)
	- Enigma: Search missing public keys on a key-server in mail compose (#5286)
	- Enigma: Delete user keys when using deluser.sh script
	- Enigma: Fix redundant list-secret-keys/list-public-keys calls on signing/encryption
	- Enigma: Implement PGP encryption and signing in one go (#5302)
	- Enigma: Display signature verification status for encrypted+signed messages (#5302)
	- Display different attachment icon on encrypted messages
	- Display different confirmation text when moving messages to Trash (#5220)
	- Indicate that a collapsed thread has flagged children (#5013)
	- Implemented message/rfc822 attachment preview
	- Update to jsTimezoneDetect 1.0.6
	- Managesieve: Add (optional) RAW script editor (#5414)
	- Managesieve: Add option to automatically set vacation :from address (#5428)
	- Managesieve: Support 'string' test from variables extension [RFC 5229] (#5248)
	- Managesieve: Support 'duplicate' extension [RFC 7352]
	- Managesieve: Unhide advanced rule controls if there are inputs with errors
	- Managesieve: Display warning message when filter form contains errors
	- Control search engine crawlers via X-Robots-Tag header instead of <meta> and robots.txt (#5098)
	- Fixed redundancy in sql caching system and compatibility with Galera Cluster (#5439)
	- Removed redundant 'created' column from cache and cache_shared tables
	- Removed use of redundant data records
	- Added missing primary keys (dictionary, cache, cache_shared tables)
	- Fix so templating system does not mess with external (e.g. email) content (#5499)
	- Fix redundant keep-alive/refresh after session error on compose page (#5500)
	- Managesieve: Fix handling of scripts with nested rules (#5540)
	- Fix variable substitution in ldap host for some use-cases, e.g. new_user_identity (#5544)
	- Enigma: Fix PHP fatal error when decrypting a message with invalid signature (#5555)
	- Fix adding images to new identity signatures
	- Fix rsync error handling in installto.sh script (#5562)
	- Fix some advanced search issues with multiple addressbooks (#5572)
	- Fix so group/addressbook selection is retained on page refresh

	## Release 1.2.3

	- Searching in both contacts and groups when LDAP addressbook with group_filters option is used
	- Fix vulnerability in handling of mail()'s 5th argument
	- Fix To: header encoding in mail sent with mail() method (#5475)
	- Fix flickering of header topline in min-mode (#5426)
	- Fix bug where folders list would scroll to top when clicking on subscription checkbox (#5447)
	- Fix decoding of GB2312/GBK text when iconv is not installed (#5448)
	- Fix regression where creation of default folders wasn't functioning without prefix (#5460)
	- Enigma: Fix bug where last records on keys list were hidden (#5461)
	- Enigma: Fix key search with keyword containing non-ascii characters (#5459)
	- Fix bug where deleting folders with subfolders could fail in some cases (#5466)
	- Fix bug where IMAP password could be exposed via error message (#5472)
	- Fix bug where it wasn't possible to store more that 2MB objects in memcache/apc,
	Added memcache_max_allowed_packet and apc_max_allowed_packet settings (#5452)
	- Fix "Illegal string offset" warning in rcube::log_bug() on PHP 7.1 (#5508)
	- Fix storing "empty" values in rcube_cache/rcube_cache_shared (#5519)
	- Fix missing content check when image resize fails on attachment thumbnail generation (#5485)
	- Fix displaying attached images with wrong Content-Type specified (#5527)

	## Release 1.2.2

	- Enigma: Add possibility to configure gpg-agent binary location (enigma_pgp_agent)
	- Enigma: Fix signature verification with some IMAP servers, e.g. Gmail, DBMail (#5371)
	- Enigma: Make recipient key searches case-insensitive (#5434)
	- Fix regression in resizing JPEG images with Imagick (#5376)
	- Managesieve: Fix parsing of vacation date-time with non-default date_format (#5372)
	- Use SymLinksIfOwnerMatch in .htaccess instead of FollowSymLinks disabled on some hosts for security reasons (#5370)
	- Wash position:fixed style in HTML mail for better security (#5264)
	- Fix bug where memcache_debug didn't work for session operations
	- Fix bug where Message-ID domain part was tied to username instead of current identity (#5385)
	- Fix bug where blocked.gif couldn't be attached to reply/forward with insecure content
	- Fix E_DEPRECATED warning when using Auth_SASL::factory() (#5401)
	- Fix bug where names of downloaded files could be malformed when derived from the message subject (#5404)
	- Fix so "All" messages selection is reset on search reset (#5413)
	- Fix bug where folder creation could fail if personal namespace contained more than one entry (#5403)
	- Fix error causing empty INBOX listing in Firefox when using an URL with user:password specified (#5400)
	- Fix PHP warning when handling shared namespace with empty prefix (#5420)
	- Fix so folders list is scrolled to the selected folder on page load (#5424)
	- Fix so when moving to Trash we make sure the folder exists (#5192)
	- Fix displaying size of attachments with zero size
	- Fix so "Action disabled" error uses more appropriate 404 code (#5440)

	## Release 1.2.1

	- Update TinyMCE to version 4.3.13 (#5309)
	- Fix bug where errors could have been not logged when per_user_logging=true
	- Fix bug where message list columns could be in wrong order after column drag-n-drop and list sorting
	- Fix so minified publickey.js (with cache-buster) is used when available (#5254)
	- Fix (replace) application/x-tar file extension test as it might not exist in nginx config (#5253)
	- Fix PHP warning when password_hosts is set, but is not an array (#5260)
	- Fix redundant keep-alive requests when session_lifetime is greater than ~20000 (#5273)
	- Fix so subfolders of INBOX can be set as Archive (#5274)
	- Fix bug where multi-folder search could choose a wrong folder in "this and subfolders" scope (#5282)
	- Fix bug where multi-folder search didn't work for unsubscribed INBOX (#5259)
	- Fix bug where "no body" alert could be displayed when sending mailvelope email
	- Enigma: Fix keys import from inside of an encrypted message (#5285)
	- Enigma: Fix malformed signed messages with force_7bit=true (#5292)
	- Enigma: Add possibility to configure gpg binary location (enigma_pgp_binary)
	- Enigma: Add possibility to export private keys (#5321)
	- Fix searching by email address in contacts with multiple addresses (#5291)
	- Fix handling of --delete argument in moduserprefs.sh script (#5296)
	- Workaround PHP issue by calling closelog() on script shutdown when using log_driver=syslog (#5289)
	- Fix so upgrade script makes sure program/lib directory does not contain old libraries (#5287)
	- Fix subscription checkbox state on error in folder subscribe/unsubscribe action (#5243)
	- Fix bug where microsecond format in logged date didn't work in some cases
	- Fix conflict in new_user_dialog and password_force_new_user settings (#5275)
	- Don't create multipart/alternative messages with empty text/plain part (#5283)
	- Use contact_search_name format in popup on results in compose contacts search
	- Fix handling of 'mailto' and 'error' arguments in message_before_send hook (#5347)
	- Fix missing localization of HTML editor when assets_dir != INSTALL_PATH
	- Fix handling of blockquote tags with mixed case on html2text conversion (#5363)
	- Fix javascript errors in IE on page with iframe that points to another domain

	## Release 1.2.0

	- Enigma: Added enigma_debug option
	- Fix message list multi-select/deselect issue (#5219)
	- Fix bug where getting HTML editor content could steal focus from other form controls (#5223)
	- Fix bug where contact search menu fields where always unchecked in Larry skin
	- Fix autoloading of 'html' class
	- Fix bug where Encrypt button appears when switching editor to HTML (#5235)
	- Fix XSS issue in href attribute on area tag (#5240)

	## Release 1.2-rc

	- Managesieve: Refactored script parser to be 100x faster
	- Enigma: added option to force users to use signing/encryption
	- Enigma: Added option to attach public keys to sent mail (#5152)
	- Enigma: Handle messages with text before an encrypted block (#5149)
	- Enigma: Handle encrypted/signed content inside message/rfc822 attachments
	- Enigma: Fix missing html/plain switch on multipart/signed messages (#4963)
	- Enigma: Disable format=flowed for signed plain text messages (#4960)
	- Enigma: Fix handling of encrypted + signed messages (#4950)
	- Enigma: Fix invalid boundary use in signed messages structure
	- Enable use of TLSv1.1 and TLSv1.2 for IMAP (#4955)
	- Save copy of original .htaccess file when using installto.sh script (#4947)
	- Fix regression where some message attachments could be missing on edit/forward (#4939)
	- Fix regression in displaying contents of message/rfc822 parts (#4937)
	- Fix handling of message/rfc822 attachments on replies and forwards (#4938)
	- Fix PDF support detection in Firefox > 19 (#4941)
	- Fix path traversal vulnerability in setting a skin [CVE-2015-8770] (#4945)
	- Fix so drag-n-drop of text (e.g. recipient addresses) on compose page actually works (#4944)
	- Fix .htaccess rewrite rules to not block .well-known URIs (#4943)
	- Fix mail view scaling on iOS (#4915)
	- Fix PHP7 warning "session_start(): Session callback expects true/false return value" (#4948)
	- Fix XSS issue in SVG images handling [CVE-2015-8864, CVE-2016-4068] (#4949)
	- Fix missing language name in "Add to Dictionary" request in HTML mode (#4951)
	- Fix (again) security issue in DBMail driver of password plugin [CVE-2015-2181] (#4958)
	- Fix bug where Archive/Junk buttons were not active after page jump with select=all mode (#4961)
	- Fix bug in long recipients list parsing for cases where recipient name contained @-char (#4964)
	- Plugin API: Added addressbook_export hook
	- Fix additional_message_headers plugin compatibility with Mail_Mime >= 1.9 (#4966)
	- Hide DSN option in Preferences when smtp_server is not used (#4967)
	- Fix handling of body parameter in mail compose request
	- Protect download urls against CSRF using unique request tokens [CVE-2016-4069] (#4957)
	- newmail_notifier: Refactor desktop notifications
	- Fix so contactlist_fields option can be set via config file
	- Fix so SPECIAL-USE assignments are forced only until user sets special folders (#4782)
	- Fix performance in reverting order of THREAD result
	- Fix converting mail addresses with @www. into mailto links (#5197)

	## Release 1.2-beta

	- Update TinyMCE to version 4.2
	- Added support for Redis session handler
	- Removed some deprecated methods: https://github.com/roundcube/roundcubemail/commit/454b0b1c
	- Remove backward compatibility "layer" of bc.php (#4902)
	- Add possibility to define date format in write operations for ldap attributes (#3956)
	- Display attachment size in compose (#1329)
	- Added possibility to drag-n-drop attachments from mail preview to compose window
	- Implemented mail messages searching with predefined date interval
	- PGP encryption support via Mailvelope integration
	- PGP encryption support via Enigma plugin
	- PHP7 compatibility fixes (#4836)
	- Security: Added brute-force attack prevention via login rate limit (#4922)
	- Security: Added options to validate username/password on logon (#4884)
	- Security: Improve randomness of security tokens (#4899)
	- Security: Use random security tokens instead of hashes based on encryption key (#4829)
	- Security: Improved encrypt/decrypt methods with option to choose the cipher_method (#4492)
	- Make optional adding of standard signature separator - sig_separator (#3276)
	- Optimize folder_size() on Cyrus IMAP by using special folder annotation (#4894)
	- Make optional hiding of folders with name starting with a dot - imap_skip_hidden_folders (#4870)
	- Add option to enable HTML editor always, except when replying to plain text messages (#4352)
	- Emoticons: Added option to switch on/off emoticons in compose editor (#2076)
	- Emoticons: Added option to switch on/off emoticons in plain text messages
	- Emoticons: All emoticons-related functionality is handled by the plugin now
	- Installer: Add button to save generated config file in system temp directory (#3553)
	- Remove common subject prefixes Re:, Re[x]:, Re-x: on reply (#4882)
	- Added GSSAPI/Kerberos authentication plugin - krb_authentication
	- Password: Allow temporarily disabling the plugin functionality with a notice
	- Require Mbstring and OpenSSL extensions (#5166)
	- Add --config and --type options to moduserprefs.sh script (#4651)
	- Implemented memcache_debug and apc_debug options
	- Installer: Remove system() function use (#4695)
	- Password plugin: Added 'kpasswd' driver by Peter Allgeyer
	- Add initdb.sh to create database from initial.sql script with prefix support (#4722)
	- Plugin API: Added disabled_plugins an disabled_buttons options in html_editor hook
	- Plugin API: Added html2text hook
	- Plugin API: Added message_part_body hook
	- Plugin API: Added message_ready hook
	- Plugin API: Add special onload() method to execute plugin actions before startup (session and GUI initialization)
	- Implemented UI element to jump to specified page of the messages list (#1677)
	- Fix searching of contacts to allow remote images for known senders (#4886)
	- Fix bug where clicking date column with 'arrival' sorting would switch to sorting by 'date' (#4690)
	- Fix bug where message content could overlap attachments list in Larry skin (#4876)
	- Fix so microseconds macro (u) in log_date_format works (#4855)
	- Fix so unrecognized TNEF attachments are displayed on the list of attachments (#5138)
	- Fix so database_attachments::cleanup() does not remove attachments from other sessions (#4907)
	- Fix responses list update issue after response name change (#4917)
	- Fix bug where message preview was unintentionally reset on check-recent action (#4921)
	- Fix bug where HTML messages with invalid/excessive css styles couldn't be displayed (#4905)
	- Fix redundant blank lines when using HTML and top posting (#4927)
	- Fix redundant blank lines on start of text after html to text conversion (#4928)
	- Fix HTML sanitizer to skip `<!-- node type X -->` in output (#4932)
	- Fix invalid LDAP query in ACL user autocompletion (#4934)

	## Release 1.1.3

	- Fix closing of nested menus (#4854)
	- Fix so E_DEPRECATED errors from PEAR libs are ignored by error_reporting change (#4770)
	- Fix compatibility with PHP 5.3 in rcube_ldap class (#4842)
	- Get rid of Mail_mimeDecode package dependency (#4836)
	- Fix "Importing..." message does not hide on error (#4840)
	- Fix Compose action in addressbook for results from multiple addressbooks (#4834)
	- Fix bug where some messages in multi-folder search couldn't be viewed/printed/downloaded (#4843)
	- Fix unintentional messages list page change on page switch in compose addressbook (#4844)
	- Fix race-condition in saving user preferences and loading plugin config (#4845)
	- Fix so plain text signature field uses monospace font (#4848)
	- Fix so links with href == content aren't added to links list on html to text conversion (#4847)
	- Fix handling of non-break spaces in html to text conversion (#4849)
	- Fix self-reply detection issues (#4852)
	- Fix multi-folder search result sorting by arrival date (#4858)
	- Fix so *-request@ addresses in Sender: header are also ignored on reply-all (#4860)
	- Update to TinyMCE 4.1.10 (#5164)
	- Fix draft removal after a message is sent and storing sent message is disabled (#4869)
	- Fix so imap folder attribute comparisons are case-insensitive (#4868)
	- Fix bug where new messages weren't added to the list in search mode
	- Fix wrong positioning of message list header on page scroll in Webkit browsers (#4646)
	- Fix some javascript errors in rare situations (#4853)
	- Fix error when using back button after sending an email (#4628)
	- Fix removing signature when switching to identity with an empty sig in HTML mode (#4872)
	- Disable links list generation on html-to-text conversion of identities or composed message (#4850)
	- Fix "washing" of style elements wrapped into many lines
	- Fix so input field (e.g. search box) does not loose focus on list load (#4862)
	- Fix so css of one html part does not apply to other text parts on message display (#4887)
	- Fix XSS issue in drag-n-drop file uploads [CVE-2015-8105] (#4900)
	- Fix handling of plus character in mailto: links (#4891)
	- Fix so adding CC/BCC recipients from the sidebar unhides compose form fields in Classic skin (#4874)
	- Fix so gc.sh script removes also expired sessions from sql database (#4893)
	- Fix support for Mozilla-based browsers, e.g. Pale Moon (#4895)
	- Fix various issues with Turkish (and similar) locales (#4896)
	- Fix so In-Reply-To header is set also for MDN receipts (#4897)
	- Fix missing HTTP_X_FORWARDED_FOR address in generated Received header
	- Fix issue where Content-Length of some attachments could be set to wrong value causing browser errors (#4877)

	## Release 1.1.2

	- Add new plugin hook 'identity_create_after' providing the ID of the inserted identity (#4807)
	- Add option to place signature at bottom of the quoted text even in top-posting mode [sig_below]
	- Fix handling of %-encoded entities in mailto: URLs (#4799)
	- Fix zipped messages downloads after selecting all messages in a folder (#4797)
	- Fix vpopmaild driver of password plugin
	- Fix PHP warning: Non-static method PEAR::setErrorHandling() should not be called statically (#4798)
	- Fix tables listing routine on mysql and postgres so it skips system or other database tables and views (#4796)
	- Fix message list header in classic skin on window resize in Internet Explorer (#4732)
	- Fix so text/calendar parts are listed as attachments even if not marked as such (#4795)
	- Fix lack of signature separator for plain text signatures in html mode (#4802)
	- Fix font artifact in Google Chrome on Windows (#4803)
	- Fix bug where forced extwin page reload could exit from the extwin mode (#4801)
	- Fix bug where some unrelated attachments in multipart/related message were not listed (#4805)
	- Fix mouseup event handling when dragging a list record (#4808)
	- Fix bug where preview_pane setting wasn't always saved into user preferences (#4809)
	- Fix bug where messages count was not updated after message move/delete with skip_deleted=false (#4814)
	- Fix security issue in contact photo handling (#4817)
	- Fix possible memcache/apc cache data consistency issues (#4820)
	- Fix bug where imap_conn_options were ignored in IMAP connection test (#4822)
	- Fix bug where some files could have "executable" extension when stored in temp folder (#4815)
	- Fix attached file path unsetting in database_attachments plugin (#4823)
	- Fix issues when using moduserprefs.sh without --user argument (#4825)
	- Fix potential info disclosure issue by protecting directory access (#4816)
	- Fix blank image in html_signature when saving identity changes (#4833)
	- Installer: Use openssl_random_pseudo_bytes() (if available) to generate des_key (#4827)
	- Fix XSS vulnerability in _mbox argument handling (#4837)

	## Release 1.1.1

	- ACL: Allow other plugins to adjust the list of permissions and groups to edit
	- Add possibility to print contact information (of a single contact)
	- Add possibility to configure max_allowed_packet value for all database engines (#4772)
	- Improved handling of storage errors after message is sent
	- Update to TinyMCE 4.1.9
	- Unified request* event arguments handling, added support for _unlock and _action parameters
	- Security: Generate random hash for the per-user local storage prefix (#4768)
	- Fix refreshing of drafts list when sending a message which was saved in meantime (#4745)
	- Fix saving/sending emoticon images when assets_dir is set
	- Fix PHP fatal error when visiting Vacation interface and there's no sieve script yet (#4778)
	- Fix setting max packet size for DB caches and check packet size also in shared cache
	- Fix needless security warning on BMP attachments display (#4771)
	- Fix handling of some improper constructs in format=flowed text as per the RFC3676[4.5] (#4773)
	- Fix performance of rcube_db_mysql::get_variable()
	- Fix missing or not up-to-date CATEGORIES entry in vCard export (#4766)
	- Fix fatal errors on systems without mbstring extension or mb_regex_encoding() function (#4769)
	- Fix cursor position on reply below the quote in HTML mode (#4759)
	- Fix so "over quota" errors are displayed also in message compose page
	- Fix duplicate entries suppression in autocomplete result (#4776)
	- Fix "Non-static method PEAR::isError() should not be called statically" errors (#4770)
	- Fix parsing invalid HTML messages with BOM after `<!DOCTYPE>` (#4777)
	- Fix duplicate entry on timezones list in rcube_config::timezone_name_from_abbr() (#4779)
	- Fix so localized folder name is displayed in multi-folder search result (#4750)
	- Fix javascript error after creating a folder which is a subfolder of another one (#4781)
	- Fix bug where subject of sent/saved message was removed if mbstring wasn't installed (#4780)
	- Fix missing vcard_attachment icon on messages list (#4783)
	- Fix storing signatures with big images in MySQL database (#4785)
	- Fix Opera browser detection in javascript (#4786)
	- Fix so search filter, scope and fields are reset on folder change
	- Fix rows count when messages search fails (#4760)
	- Fix bug where spellchecking in HTML editor do not work after switching editor type more than once (#4789)
	- Fix bug where TinyMCE area height was too small on slow network connection (#4788)
	- Fix backtick character handling in sql queries (#4790)
	- Fix redirect URL for attachments loaded in an iframe when behind a proxy (#4724)
	- Fix menu container references to point to the actual `<ul>` element (#4791)
	- Fix javascripts errors in IE8 - lack of Event.which, focusing a hidden element (#4793)

	## Release 1.1.0

	- Make SMTP error log more verbose - include server response and error code
	- Fix download options menu (added by zipdownload plugin) in classic skin (#4740)
	- Fix blocked.gif image usage with assets_dir set
	- Fix bug where max_group_members was ignored when adding a new contact (#4733)
	- Hide MDN and DSN options in compose if disabled by admin (#4735)
	- Fix checks based on window.ActiveXObject in IE > 10
	- Fix XSS issue in style attribute handling [CVE-2015-1433] (#4739)
	- Fix bug where Drafts list wasn't updated on draft-save action in new window (#4737)
	- Fix so "set as default" option is hidden if identities_level > 1 (#4738)
	- Fix bug where search was reset after returning from compose visited for reply
	- Fix javascript error in "IE 8.0/Tablet PC" browser (#4730)
	- Fix bug where Reply-To address was ignored on reply to messages sent by self (#4742)
	- Fix bug where empty fieldmap config entries caused empty results of ldap search (#4741)
	- Fix bug where drafts list wasn't refreshed after draft message was sent from another window (#4745)
	- Fix keyboard navigation and css in datepicker widget across many Firefox versions
	- Fix false warning when opening attached text/plain files (#4748)
	- Fix bug where signature could have been inserted twice after plain-to-html switch (#4746)
	- Fix security issue in DBMail driver of password plugin (#4757)
	- Enable FollowSymLinks option in .htaccess file which is required by rewrite rules (#4754)
	- Fix so JSON.parse() errors on localStorage items are ignored (#4752)

	## Release 1.1-rc

	- Update jQuery to version 2.1.3
	- Allow to override any config option through env variables
	- 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
	- Sync vendor folder if exists in source package (#4700)
	- Avoid useless reloading list when resetting search with active filter (#4654)
	- Fix invalid folder selection if clicked while busy (#4709)
	- Fix import of multiple contact email addresses from Outlook-csv format (#4714)
	- Fix drag-n-drop to folders expanded while dragging (#4708)
	- Fix import of multiple contact groups from Google-csv format (#4710)
	- Fix import of contacts with multiple email addresses from Google-csv format (#4719)
	- Fix bugs where CSRF attacks were still possible on some requests [CVE-2014-9587]
	- Fix some rcube_utils::anytodatetime() corner cases with timezone mismatches (#4712)
	- Improve move-to and contact-export button in classic skin (#4713)
	- Fix wrong icon for download button in classic skin
	- Fix bug where sent message was saved in Sent folder even if disabled by user (#4729)

	## Release 1.1-beta

	- Fix skin path handling in plugin context (#4111)
	- Prevent memory exhaustion on image resizing with GD on Windows (#4580)
	- Add plugin hook for database table name lookups as requested in #4538
	- 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 (#4631)
	- Added config option/user preference to disable saving messages in localStorage (#4606)
	- Added config option 'imap_log_session' to enable Roundcube <-> IMAP session ID logging
	- Added config option 'log_session_id' to control the length of the session identifier in logs
	- Implemented 'storage_connected' API hook after successful IMAP login (#4638)
	- Integrate Net_LDAP3 and rcube_ldap_generic classes
	- Add option (disabled_actions) to disable UI elements/actions (#4478)
	- Support password encryption using openssl extension (#4614)
	- Create/rename groups in UI dialogs (#4592)
	- Added 'contact_search_name' option to define autocompletion entry format
	- Display quota information for current folder not INBOX only (#3442)
	- Support images in HTML signatures (#3917)
	- Display full quota information in popup (#2103, #2746)
	- Mail compose: Selecting contact inserts recipient to previously focused input - to/cc/bcc accordingly (#4487)
	- Close "no subject" prompt with Enter key (#4463)
	- Password: Add option to force new users to change their password (#2963)
	- Improve support for screen readers and assistive technology using WCAG 2.0 and WAI ARIA standards
	- Enable basic keyboard navigation throughout the UI (#3333)
	- Select/scroll to previously selected message when returning from message page (#4146)
	- Display a warning if popup window was blocked (#4472)
	- Remove (was: ...) from message subject on reply (#4359)
	- Update to TinyMCE 4.1 (#4168)
	- Enable autolink plugin in TinyMCE (#4029)
	- Support image operations with Imagick extension (#4498)
	- Support upload progress with session.upload_progress and PECL uploadprogress module (#3934)
	- Make identity name field optional (#4435)
	- Utility script to remove user records from the local database
	- Plugin API: Added message_saved hook (#4503)
	- Plugin API: Added imap_search_before hook
	- Support messages import from zip archives
	- Zipdownload: Added mbox format support (#2354)
	- Drop support for IE6, move IE7/IE8 support to legacy_browser plugin
	- Update to jQuery-2.1.1
	- Search across multiple folders (#1676)
	- Improve UI integration of ACL settings
	- Drop support for PHP < 5.3.7
	- Set In-Reply-To and References for forwarded messages (#4465)
	- Removed redundant default_folders config option (#4500)
	- Implemented IMAP SPECIAL-USE extension support [RFC6154] (#3326)
	- Optimize some framed pages content for better performance (#4517)
	- Improve text messages display and conversion to HTML (#4091)
	- Don't remove links when html signature is converted to text (#4473)
	- Fix page title when using search filter (#4636)
	- Fix mbox files import
	- Fix some character sets detection (#4694)
	- Fix so attachment charset is set in headers of forward/draft message (#4676)
	- Fix bug where wrong charset could be used for text attachment preview page (#4674)

	## Release 1.0.5

	- Fix wrong icon for download button in classic skin
	- Fix checks based on window.ActiveXObject in IE > 10
	- Fix XSS issue in style attribute handling (#4739)
	- Fix bug where Drafts list wasn't updated on draft-save action in new window (#4737)
	- Fix so "set as default" option is hidden if identities_level > 1 (#4738)
	- Fix javascript error in "IE 8.0/Tablet PC" browser (#4730)
	- Fix bug where empty fieldmap config entries caused empty results of ldap search (#4741)
	- Fix bug where sent message was saved in Sent folder even if disabled by user (#4729)

	## Release 1.0.4

	- Disable TinyMCE contextmenu plugin as there are more cons than pros in using it (#4684)
	- Fix bug where show_real_foldernames setting wasn't honored on compose page (#4705)
	- Fix issue where Archive folder wasn't protected in Folder Manager (#4706)
	- Fix compatibility with PHP 5.2. in rcube_imap_generic (#4682)
	- Fix setting flags on servers with no PERMANENTFLAGS response (#4667)
	- Fix regression in SHA password generation in ldap driver of password plugin (#4670)
	- Fix displaying of HTML messages with absolutely positioned elements in Larry skin (#4672)
	- Fix font style display issue in HTML messages with styled <span> elements (#4671)
	- Fix download of attachments that are part of TNEF message (#4668)
	- Fix handling of uuencoded messages if messages_cache is enabled (#4675)
	- Fix handling of base64-encoded attachments with extra spaces (#4678)
	- Fix handling of UNKNOWN-CTE response, try do decode content client-side (#4650)
	- Fix bug where creating subfolders in shared folders wasn't possible without ACL extension (#4680)
	- Fix reply scrolling issue with text mode and start message below the quote (#4681)
	- Fix possible issues in skin/skin_path config handling (#4689)
	- Fix lack of delimiter for recipient addresses in smtp_log (#4703)
	- Fix generation of Blowfish-based password hashes (#4721)
	- Fix bugs where CSRF attacks were still possible on some requests [CVE-2014-9587]

	## Release 1.0.3

	- Initialize HTML editor before restoring a message from localStorage (#4631)
	- Add 'sig_max_lines' config option to default config file (#5162)
	- Add config option to specify IMAP connection socket parameters - imap_conn_options (#4589)
	- Add option to set default message list mode - default_list_mode (#3157)
	- Enable contextmenu plugin for TinyMCE editor (#3062)
	- Fix insert-signature command in external compose window if opened from inline compose screen (#4663)
	- Fix some mime-type to extension mapping checks in Installer (#4610)
	- Fix errors when using localStorage in Safari's private browsing mode (#4619)
	- Fix bug where $Forwarded flag was being set even if server didn't support it (#4621)
	- Fix various iCloud vCard issues, added fallback for external photos (#4617)
	- Fix invalid Content-Type header when send_format_flowed=false (#4616)
	- Fix errors when adding/updating contacts in active search (#4630)
	- Fix incorrect thumbnail rotation with GD and exif orientation data (#4641)
	- Fix contacts list update after adding/deleting/moving a contact (#4640, #4644)
	- Fix handling of email addresses with quoted domain part (#4647)
	- Fix comm_path update on task switch (#4648)
	- Fix error in MSSQL update script 2013061000.sql (#4658)
	- Fix validation of email addresses with IDNA domains (#4661)

	## Release 1.0.2

	- Fix storing unsaved drafts in localStorage (#4529)
	- Add configurable LDAP_OPT_DEREF option (#4546)
	- Fix so when switching editor mode original version of signature is used (#4032)
	- Fix unintentional draft autosave request if autosave is disabled (#4550)
	- Fix malformed References: header in send/saved mail (#4552)
	- Fix handling unicode characters in links (#4555)
	- Fix incorrect handling of HTML comments in messages sanitization code (#4558)
	- Fix so current page is reset on list-mode change (#4561)
	- Fix so responses menu hides on click in classic skin (#4566)
	- Fix unintentional line-height style modification in HTML messages (#4567)
	- Fix broken normalize_string(), add support for ISO-8859-2 (#4568)
	- Support csv contacts import in German localization (#4570)
	- Fix so message list and counters are updated when a message is opened in new window (#4569)
	- Fix malformed recipient name when composing a message by clicking on mailto link (#4583)
	- Fix list reload after sending message in another window (#4576)
	- Fix so address format errors are ignored when saving a draft (#4594)
	- Fix incorrect label translation in return receipt (#4598)
	- Fix security issue in delete-response action - allow only ajax request
	- Fix Delete button state after deleting identity/response (#4603)
	- Fix bug where contacts with no email address were listed on compose addressbook (#4602)
	- Fix images import from various vCard formats (#4604)
	- Fix sorting messages by size on servers without SORT capability (#4608)

	## Release 1.0.1

	- Support 'error' and 'body_file' return attribs in 'message_before_send' hook (#4467)
	- Apply user-specific replacements to group's base_dn property (#4512)
	- Fix missing email address when importing contacts from outlook csv (#4535)
	- Fix bug where "With attachment" option in search filter wasn't selected after return from mail view (#4508)
	- Fix "washing" of unicode style attributes (#4510)
	- Fix unintentional redirect from compose page in Webkit browsers (#4516)
	- Fix messages index cache update under some conditions (e.g. proxy) (#4505)
	- Fix lack of translation of special folders in some configurations (#4520)
	- Fix XSS issue in plain text spellchecker (#4524)
	- Fix invalid page title for some folders (1489804)
	- Fix redundant alert message on over-size uploads (#4528)
	- Fix next message display after removing a message (#4521)
	- Fix missing Mail-Followup-To header in sent mail (#4534)
	- Fix error when spell-checking an empty text (#4536)
	- Avoid popupmenus being closed when scrollbar is clicked (#4537)
	- Add proxy_whitelist configuration option (#4496)
	- Fix identities_level=4 handling in new_user_dialog plugin (#4540)
	- Fix various db_prefix issues (#4539)
	- Fix too small length of users.preferences column data type on MySQL
	- Fix redundant warning when switching from html to text in empty editor (#4530)
	- Fix invalid host validation on login (#4541)
	- Fix IMAP connection test in installer so it is aware of imap_auth_type (#4502)

	## Release 1.0.0

	- Added toolbar button to move message in message view
	- Fix style of disabled protocol handler link on IE (#4460)
	- Fix message import dialog when no file is selected (#4488)
	- Fix opening compose screen in new window after saving as draft (#4479)
	- Fix directories check in Installer on Windows (#4462)
	- Fix issue when default_addressbook option is set to integer value (#4379)
	- Fix Opera > 15 detection (#4455)
	- Fix security issue in DomainFactory driver of Password plugin
	- Fix invalid X-Draft-Info on forwarded message draft (#4464)
	- Fix regression in handling of 'attachments' result in message_compose hook (#4474)
	- Fix issue where msgexport.sh printed the message to STDOUT instead of a file (#4476)
	- Fix fatal error in database_attachments plugin under some conditions (#4495)

	## Release 1.0-rc

	- Small CSS fix with message notice boxes in Larry skin (#4429)
	- Include groups in contacts search on mail compose (#4186)
	- Add mime-type mapping for .7z files (#4436)
	- Invoke update scripts with php to circumvent execution restrictions (#4330)
	- Fix drag & drop message/contact moving on touch device (#4395)
	- Fix canned responses in HTML mode (#4446)
	- Check/create default folders on every login not only the first (#4391)
	- 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 (#4438)
	- Remove expand/collapse with plus/minus keys (on numeric keypad) (#4437)
	- Fix issue where filesystem path was added to all-attachments (zip) file (#4433)
	- Fix case-sensitivity of email addresses handling on compose (#1899)
	- Don't alter Message-ID of a draft when sending (#4381)
	- Fix issue where deprecated syntax for HTML lists was not handled properly (#3975)
	- Display different icons when Trash folder is empty or full (#2108)
	- Remember last position of more headers switch (#3660)
	- Fix so message flags modified by another client are applied on the list on refresh (#1639)
	- Fix broken text/* attachments when forwarding/editing a message (#4393)
	- Improved minified files handling, added css minification (#3041)
	- Fix handling of X-Forwarded-For header with multiple addresses (#4424)
	- Fix border issue on folders list in classic skin (#4419)
	- Implemented menu actions to copy/move messages, added folder-selector widget (#863)
	- Fix security rules in .htaccess preventing access to base URL without the ending slash (#4422)
	- Fix regression where only first new folder was placed in correct place on the list (#4418)
	- Fix issue where children of selected and collapsed thread were skipped on various actions (#4410)
	- Fix issue where groups were not deleted when "Replace entire addressbook" option on contacts import was used (#4388)
	- Fix unreliable mimetype tests in Installer (#4408)
	- Fix performance of listing writeable folders (#4406)

	## Release 1.0-beta

	- Fix handling of invalid closing tags in HTML messages (#4403)
	- Set real content-type for file downloads (#4400)
	- Update TinyMCE to version 3.5.10 (#4401)
	- Fix keyboard navigation in list widgets (#4367)
	- Allow plugins to grab the reference of opened windows (#4383)
	- Larry skin: Improved status message display for better visibility (#4115)
	- Fix Internet Explorer 11 detection (#4397)
	- Fix date column width to fit the widest possible date format (#4354)
	- Move certain user preference options to a collapsed "advanced" block (#4015)
	- Add file type icons for PowerPoint and Open Office presentations (#4269)
	- Fix operations on folders with trailing spaces in name (#4387)
	- Improve identity selection based on From: header (#4360)
	- Fix issue where mails with inline images of the same name contained only the first image multiple times (#4378)
	- Use left/right arrow keys to collapse/expand thread and spacebar to select a row, change Ctrl key behavior (#4367)
	- Fix an issue where using arrow keys to go up a list can result in selected message being under headers (#4375)
	- Fix an issue where Home/End keys don't focus list row properly, don't scrollTo properly (#4370)
	- Add an option to disable smart Reply-List behaviour - reply_all_mode (#3953)
	- Fix an issue where pressing minus key on contacts list was hiding list records (#4368)
	- Fix an issue where shift + arrow-up key wasn't selecting all messages in collapsed thread (#4371)
	- Added icon for priority column in messages list header (#4275)
	- New feature "Canned Responses" to save and recall boilerplate text snippets
	- Fix HTML part detection when encapsulated inside multipart/signed (#4357)
	- 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 (#4351)
	- Use DOMDocument LIBXML_PARSEHUGE and LIBXML_COMPACT options if possible (#4316)
	- 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] (#4337)
	- After message is sent refresh messages list of replied message folder (#4282)
	- Add option force specified domain in user login - username_domain_forced (#4290)
	- Add option to import Vcards with group assignments
	- Save groups membership in Vcard export (#3801)
	- Workaround broken PHP function timezone_name_from_abbr (#4289)
	- Make cached message size limit configurable - messages_cache_threshold (#4326)
	- Log also failed logins to userlogins log
	- Add temp_dir_ttl configuration option (#4318)
	- Allow setting INBOX as Sent folder (#4264)
	- Fix replacement variables in user-specific base_dn in some LDAP requests (#4299)
	- Fix image scaling issues when image has only one dimension smaller than the limit (#4296)
	- Fix issue where uploaded photo was lost when contact form did not validate (#4296)
	- Move identity selection based on non-standard headers into (new) identity_select plugin (#3835)
	- Fix downloading binary files with (wrong) text/* content-type (#4292)
	- Respect HTTP_X_FORWARDED_FOR and HTTP_X_REAL_IP variables for session IP check
	- Simplified configuration by merging it into one file + defaults (#3156)
	- Make message list header stay on top when scrolling (#353)
	- Add support for 'enchant' spellcheck engine
	- Check filetype detection in installer and update script (#4252)
	- Fix folder names truncation in Classic skin (#4265)
	- Make possible to disable some (broken) IMAP extensions with imap_disable_caps option (#4245)
	- Contacts drag-n-drop default action is to move contacts (#3962)
	- Added possibility to choose to move or copy contacts from drag-n-drop menu (#3962)
	- Fix Close link and remove About link on error pages (#4201)
	- Improved/unified attachment preview screen, added print button
	- Fix lack of space between searchfilter and quicksearchbar in Larry skin (#4233)
	- Cache LDAP's user_specific search and use vlv for better performance (#4247)
	- 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 (#2401)
	- Fix thread cache synchronization/validation (#4150)
	- 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 (#4229)
	- Fix date format issues on MS SQL Server (#4078)
	- 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 (#4228)
	- Improved handling of Reply-To/Bcc addresses of identity in compose form (#4142)
	- 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 (#4092)
	- Fix SMTP connection using IPv6 address in smtp_server option (#4147)
	- 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 (#3952)
	- Support CSV import from Atmail (#4161)
	- Add db_prefix configuration option in place of db_table_/db_sequence_ options
	- Make possible to use db_prefix for schema initialization in Installer (#4175)
	- Fix updatedb.sh script so it recognizes also table prefix for external DDL files
	- Fix parsing invalid date string (#4155)
	- Add "with attachment" option to messages list filter (#1795)
	- Call resize handler in intervals to prevent lags and double onresize calls in Chrome (#4137)
	- Add rel="noreferrer" for links in displayed messages (#4976)
	- Add ability to toggle between HTML and text while viewing a message (#3005)
	- Remove "HTML message" from attachments list while viewing a message in text mode (#3005)
	- Support IMAP MOVE extension [RFC 6851]
	- Add attachment menu with Open and Download options (#4116)
	- Display user-friendly message on IMAP "over quota" errors (#914)
	- Extended archive plugin with user-configurable options to store messages into subfolders
	- Fix export of selected contacts from search result (#4070)
	- 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 (#4363)
	- Fix default spell-check configuration after Google suspended their spell service
	- Fix vulnerability in handling _session argument of utils/save-prefs [CVE-2013-6172] (#4362)
	- Fix iframe onload for upload errors handling (#4361)
	- Fix address matching in Return-Path header on identity selection (#4358)
	- Fix text wrapping issue with long unwrappable lines (#4356)
	- Fixed issues where HTML comments inside style tag would hang Internet Explorer
	- Hide Delivery Status Notification option when smtp_server is unset (#4339)
	- Display full attachment name using title attribute when name is too long to display (#4328)
	- Fix attachment icon issue when rare font/language is used (#4334)
	- Fix expanded thread root message styling after refreshing messages list (#4335)
	- Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#4327)
	- Fix error_reporting directive check (#4331)
	- Fix de_DE localization of "About" label in Help plugin (#4333)

	## Release 0.9.4

	- Make identities matching case insensitive (#1881)
	- Fix issue where too big message data was stored in cache causing sql errors (#4325)
	- Fix iframe scrollbars on webkit desktop browsers (#4319)
	- Fix issue where legacy config was overridden by default config (#4305)
	- Fix newmail_notifier issue where favicon wasn't changed back to default (#4324)
	- Fix setting of Junk and NonJunk flags by markasjunk plugin (#4303)
	- Fix lack of Reply-To address in header of forwarded message body (#4314)
	- Fix bugs when invoking contact creation form when read-only addressbook is selected (#4313)
	- Fix identity selection on reply (#4308)
	- Fix so additional headers are added to all messages sent (#4302)
	- Fix display issue after moving folder in Folder Manager (#4310)
	- Fix handling of non-default date formats (#4311)
	- Fix unquoted path in PREG expression on Windows (#4307)
	- Fix wrong close tag in /template/mail.html (#4312)

	## Release 0.9.3

	- Fix setting refresh_interval to "Never" in Preferences (#4304)
	- Fixed iframe scrolling on touch devices
	- Optimized message list for touch devices
	- Fix purge action in folder manager (#4300)
	- Fix base URL resolving on attribute values with no quotes (#4297)
	- Fix wrong handling of links with '\|' character (#4298)
	- Fix colorspace issue on image conversion using ImageMagick (#4294)
	- Fix XSS vulnerability when editing a message "as new" or draft [CVE-2013-5645] (#4283)
	- Fix XSS vulnerability when saving HTML signatures [CVE-2013-5645] (#4283)
	- Fix rewrite rule in .htaccess (#4278)
	- Fix detecting Turkish language in ISO-8859-9 encoding (#4284)
	- Fix identity-selection using Return-Path headers (#4279)
	- Fix parsing of links with ... in URL (#4251)
	- Fix compose priority selector when opening in new window (#4286)
	- Fix bug where signature wasn't changed on identity selection when editing a draft (#4272)
	- Fix IMAP SETMETADATA parameters quoting (#4274)
	- Fix "could not load message" error on valid empty message body (#4271)
	- Fix handling of message/rfc822 attachments on message forward and edit (#4262)
	- Fix parsing of square bracket characters in IMAP response strings (#4267)
	- Don't clear References and in-Reply-To when a message is "edited as new" (#4263)
	- Fix messages list sorting with THREAD=REFS
	- Remove deprecated (in PHP 5.5) PREG /e modifier usage (#4239)
	- Fix empty messages list when register_globals is enabled (#4232)
	- Fix so valid and set date.timezone is not required by installer checks (#4242)
	- Canonize boolean ini_get() results (#4249)
	- Fix so install do not fail when one of DB driver checks fails but other drivers exist (#4240)
	- Fix so exported vCard specifies encoding in v3-compatible format (#4244)

	## Release 0.9.2

	- Fix image thumbnails display in print mode (#4220)
	- Fix height of message headers block (#4200)
	- Fix timeout issue on drag&drop uploads (#4238)
	- 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 (#4236)
	- Fix error when there's no writeable addressbook source (#4235)
	- Fix zipdownload plugin issue with filenames charset (#4231)
	- Fix so non-inline images aren't skipped on forward (#4230)
	- Fix "null" instead of empty string on messages list in IE10 (#4227)
	- Fix legacy options handling
	- Fix so bounces addresses in Sender headers are skipped on Reply-All (#4140)
	- Fix bug where serialized strings were truncated in PDO::quote() (#4226)
	- Fix displaying messages with invalid self-closing HTML tags (#4223)
	- Fix PHP warning when responding to a message with many Return-Path headers (#4222)
	- Fix unintentional compose window resize (#4206)
	- Fix performance regression in text wrapping function (#4219)
	- Fix connection to postgres db using unix socket (#4218)
	- Fix handling of comma when adding contact from contacts widget (#4199)
	- Fix bug where a message was opened in both preview pane and new window on double-click (#4212)
	- Fix fatal error when xdebug.max_nesting_level was exceeded in rcube_washtml (#4202)
	- Fix PHP warning in html_table::set_row_attribs() in PHP 5.4 (#4194)
	- Fix invalid option selected in default_font selector when font is unset (#4204)
	- Fix displaying contact with ID divisible by 100 in sql addressbook (#4211)
	- Fix browser warnings on PDF plugin detection (#4209)
	- Fix fatal error when parsing UUencoded messages (#4210)

	## Release 0.9.1

	- Better German labels for from/to to avoid conflicts with 'sender' (#4188)
	- Fix problem where security warning was displayed for valid images with image/jpg type (#4196)
	- Fix handling of invalid email addresses in headers (#4193)
	- Fix IMAP connection issue with default_socket_timeout < 0 and imap_timeout < 0 (#4191)
	- Fix various PHP code bugs found using static analysis (#4190)
	- Fix backslash character handling on vCard import (#4189)
	- Fix csv import from Thunderbird with French localization (#4170)
	- Fix messages list focus issue in Opera and Webkit (#4169)
	- Fix Reply-To header handling in Reply-All action (#4157)
	- Fix so Sender: address is added to Cc: field on reply to all (#4140)
	- Fix so addressbook_search_mode works also for group search (#4183)
	- Fix removal of a contact from a group in LDAP addressbook (#4185)
	- Include SQL query in the log on SQL error (#4172)
	- Fix handling untagged responses in IMAP FETCH - "could not load message" error (#4180)
	- Fix very small window size in Chrome (#4087)
	- Fix list page reset when viewing a message in Larry skin (#4182)
	- Fix min_refresh_interval handling on preferences save (#4179)
	- Fix PDF support detection for Firefox PDF.js (#4113)
	- Fix possible collision in generated thumbnail cache key (#4177)
	- Fix exit code on bootstrap errors in CLI mode (#4160)
	- Fix error handling in CLI mode, use STDERR and non-empty exit code (#5161)
	- Fix error when using check_referer=true
	- Fix incorrect handling of some specific links (#4171)
	- Fix incorrect handling of leading spaces in text wrapping
	- Fix unintentional messages list jumps on click in Internet Explorer (#4167)
	- Fix list of required configuration options (#4166)
	- Fix DB error when creating a new contact and a group is selected (#4164)
	- Fix handling of deprecated boolean value of reply_mode option (#4165)

	## Release 0.9.0

	- Fix display of HTML entities in protected folder name (#4159)
	- Set minimal permissions to temp files (#4131)
	- Improve content check for embedded images without filename (#4151)
	- Fix handling of invalid characters in message headers and output (#4153)
	- Fix selecting collapsed rows on select-all (#4156)
	- Avoid race-conditions with concurrent attachment uploads (#3739)
	- Fix possible header duplicates when using additional headers (#4154)
	- Fix session issues with use_https=true (#4125)
	- Fix blockquote width in sent mail (#4152)
	- Fix keyboard events on list widgets in Internet Explorer (#4148)

	## Release 0.9-rc2

	- Fix security issue in save-pref command
	- Remove sig_above configuration option, use reply_mode only (#4135)
	- Refresh current folder in opener window after draft save or message sent (#4132)
	- Fix saving draft just after entering compose window (#4141)
	- Fix javascript error in IE9 when loading form with placeholders into an iframe (#4138)
	- Fix handling of some conditional comment tags in HTML message (#4136)
	- Fix so forward as attachment works if additional attachment is added by message_compose hook (#4134)
	- Better handling of session errors in ajax requests (#4105)
	- Fix HTML part detection for some specific message structures (#4130)
	- Don't show fake address - phishing prevention (#4120)
	- Fix forward as attachment bug with editormode != 1 (#4129)
	- Fix LIMIT/OFFSET queries handling on MS SQL Server (#4123)
	- Fix so task name can really contain all from a-z0-9_- characters (#4095)
	- Fix javascript errors when working in a page opened with target="_blank"
	- Mention SQLite database format change in UPGRADING file (#4122)
	- Increase maxlength to 254 chars for email input fields in addressbook (#4126)
	- Fix thumbnail size when GD extension is used for image resize (#4124)
	- Display notice that message is encrypted also for application/pkcs7-mime messages (#3815)

	## Release 0.9-rc

	- Fix plain text spellchecker incorrect highlighting in non-ASCII text (#4114)
	- Add workaround for invalid message charset detection by IMAP servers (#4112)
	- Fix NUL characters in content-type of ms-tnef attachment (#4108)
	- Fix regression in handling LDAP contact identifiers (#4104)
	- Updated translations from Transifex
	- Fix buggy error template in a frame (#4092)
	- Add addressbook widget on compose page in classic skin
	- Add search box to compose address book widget (#3710)
	- Fix login in case when default_host is an array with one element (#4085)
	- 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 (#3843)
	- Also block remote images in HTML part view (#4013)
	- Improved database schema upgrade procedure, added updatedb.sh script
	- Force autocommit mode in mysql database driver (#4068)

	## Release 0.9-beta

	- Fix searching by date in address book (#4058)
	- Improve charset detection by prioritizing charset according to user language (#2032)
	- Fix handling of escaped separator in vCard file (#4064)
	- Add option to use envelope From address for MDN responses (#4052)
	- Add possibility to search in message body only (#3977)
	- Support "multipart/relative" as an alias for "multipart/related" type (#4057)
	- Display PGP/MIME signature attachments as "Digital Signature" (#3845)
	- Workaround UW-IMAP bug where hierarchy separator is added to the shared folder name (#4051)
	- Fix version comparisons with -stable suffix (#4050)
	- Add unsupported alternative parts to attachments list (#4046)
	- Add Compose button on message view page (#3959)
	- Display 'Sender' header in message preview
	- Plugin API: Added message_before_send hook
	- Fix contact copy/add-to-group operations on search result (#4042)
	- Use matching identity in MDN response (#4043)
	- Fix handling of signatures on draft edit (#3996)
	- Fix so compacting of non-empty folder is possible also when messages list is empty (#4039)
	- Allow forwarding of multiple emails (#2941)
	- Fix big memory consumption of DB layer (#4037)
	- Fix broken message/part bodies when FETCH response contains more untagged lines (#4020)
	- Fix empty email on identities list after identity update (#4018)
	- Add new identities_level: (4) one identity with possibility to edit only signature
	- Use Delivered-To and Envelope-To headers for identity selection (#4024, #3835)
	- Fix XSS vulnerability using Flash files (#4014)
	- Always save drafts with format=flowed in order to keep original line wraps (#3997)
	- Select default_addressbook on the list in Address Book (#3624)
	- Fix so mobile phone has TYPE=CELL in exported vCard (#4004)
	- Support contacts import from CSV file (#2605)
	- Improved keep-alive action. Now the interval is based on session_lifetime (#3799)
	- Added cross-task 'refresh' request for system state updates (#3799)
	- 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 (#1886)
	- Better client-side timezone detection using the jsTimezoneDetect library (#3947)
	- Add option to disable saving sent mail in Sent folder - no_save_sent_messages (#3923)
	- Fix handling dont_override with message_sort_col and message_sort_order settings (#3970)
	- Fix handling of URLs with asterisk characters (#3969)
	- Remove automatic to-lowercase conversion of usernames (#3941)
	- Plugin API: Add 'email_list' argument for identities data in user_create hook
	- Integrated zipdownload plugin to download all attachments (#617)
	- Fix HTML special characters handling in message list/header display (#3812)
	- List related text/html part as attachment in plain text mode (#3918)
	- Use IMAP BINARY (RFC3516) extension to fetch message/part bodies
	- Fix folder creation under public namespace root (#3910)
	- Fix so "Edit as new" on draft creates a new message (#3924)
	- Fix invalid error message on deleting mail from read only folder (#3929)
	- Replace data URIs of images (pasted in HTML editor) with inline attachments (#3795)
	- Remove (too big) min-width on mail screen
	- Added template object 'frame'
	- Add option to enable HTML editor on forwarding (#3807)
	- Add option to not include original message on reply, rename option top_posting to reply_mode (#1615)
	- 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 (#3668)
	- Removed PEAR::MDB2 package
	- Removed users.alias column, added option ('user_aliases')
	to use email address from identities as username (#3851)
	- Removed redundant cache.cache_id column (#3817)
	- Fix order of attachments in sent mail (#3740)
	- Fix Shift + delete button does not permanently delete messages (#3598)
	- Add Content-Length for attachments where possible (#1880)
	- Fix attachment sizes in message print page and attachment preview page (#3805)
	- Add mail attachments using drag & drop on HTML5 enabled browsers
	- Add workaround for invalid BODYSTRUCTURE response - parse message with Mail_mimeDecode package (#1966)
	- Display Tiff as Jpeg in browsers without Tiff support (#3757)
	- Don't display Pdf/Tiff/Flash attachments inline without browser support (#3757, #3394)
	- Add is_escaped attribute for html_select and html_textarea (#3782)
	- Fix issue where draft auto-save wasn't executed after some inactivity time
	- Add vCard import from multiple files at once (#3458)
	- 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 (#4060)
	- Fix unwanted horizontal scrollbar in message preview header (#4044)
	- Add workaround for IE<=8 bug where Content-Disposition:inline was ignored (#4028)
	- Fix XSS vulnerability in vbscript: and data:text links handling [CVE-2012-6121] (#4033)
	- Fix absolute positioning in HTML messages (#4007)
	- Fix cache (in)validation after setting \Deleted flag
	- Fix keyboard events on messages list in opera browser (#4011)
	- Fix selection of collapsed thread rows (#3978)
	- Fix wrapping of quoted text with format=flowed (#3561)

	## Release 0.8.4

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

	## Release 0.8.3

	- Fix AREA links handling (#3992)
	- Fix possible HTTP DoS on error in keep-alive requests (#3983)
	- Fix compatibility with MDB2 2.5.0b4 (#3982)
	- Fix a bug where saving a message in INBOX wasn't possible
	- Fix HTML part detection in messages with attachments (#3976)
	- Fix bug where wrong words were highlighted on spell-before-send check
	- Fix scrolling quirk in email preview frame using Opera 12 (#3973)
	- Fix displaying of multipart/alternative messages with empty parts (#3961)
	- Fix threaded list sorting on PHP < 5.2.9 (#3960)
	- Fix Warning: htmlspecialchars(): charset `RCMAIL_CHARSET` not supported warning in Installer (#3958)

	## Release 0.8.2

	- Fix XSS vulnerability from HTTP User-Agent header (#3954)
	- Force fonts in compose fields to be all the same (#3926)
	- Fix handling vCard entries with TEL;TYPE=CELL (#3949)
	- Fix error where session wasn't updated after folder rename/delete (#3928)
	- Fix PLAIN authentication for some IMAP servers (#3916)
	- Fix encoding vCard file when contains PHOTO;ENCODING=b (#3922)
	- Fix focus issue in IE when selecting message row (#3881)
	- Add full headers view in message preview window (#3823)
	- Fix message display page issues - unified with message preview (#3856, #3895)
	- Fix displaying all headers when they contain malformed characters (#3911)
	- Fix decoding of HTML messages with UTF-16 charset specified (#3902)
	- Fix quota capability detection so it can be overwritten by a plugin (#3903)
	- Fix identity selection on reply (#3516)
	- Fix Larry's messages list filter in IE (#3890)
	- Fix more IE issues by disabling Compat. mode with X-UA-Compatible meta tag (#3886)
	- Fix setting locales under Solaris - use additional .UTF-8 suffix (#3887)
	- Fix email address validation for addresses with IP address in domain part
	- Fix Larry skin issues in IE7 compat. mode (#3879)
	- 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 (#3859)
	- Fix lower-casing email address on replies (#3863)
	- Fix line separator in exported messages (#3866)
	- Fix XSS issue where plain signatures wasn't secured in HTML mode [CVE-2012-4668] (#3875)
	- Fix XSS issue where href="javascript:" wasn't secured [CVE-2012-3508] (#3875)
	- Fix impossible to create message with empty plain text part (#3873)
	- Fix stripped apostrophes when replying in plain text to HTML message (#3869)
	- Fix inactive Save search option after advanced search (#3870)
	- Fix Remove from group option is active for contact search result (#3871)
	- Disable autocapitalization in login form on iPad/iPhone (#3872)
	- Fix focus on the list when list row is clicked (#3865)
	- Added separate From and To columns apart from smart From/To column (#2970)
	- Fix fallback to Larry skin when configured skin isn't available (#3857)
	- Fix (workaround) delete operations with some versions of memcache (#3858)
	- 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 (#3848)
	- Enable TinyMCE inlinepopups plugin
	- Update to TinyMCE 3.5.6
	- Correctly escape localized labels in javascript variable (#3842)
	- Update Net_SMTP/Auth_SASL packages to fix Digest-MD5/Cram-MD5 authentication (#3846)
	- Don't add attachments content into reply/forward/draft message body (#3837)
	- Fix 'no connection' errors on page unloads (#3832)
	- Plugin API: Add 'unauthenticated' hook (#3545)
	- Show explicit error message when provided hostname is invalid (#3834)
	- Fix wrong compose screen elements focus in IE9 (#3826)
	- Fix fatal error when date.timezone isn't set (#3831)
	- Update to TinyMCE 3.5.4.1
	- Better icons with distinct shapes for priority columns (#3706)
	- Show dedicated icon for multipart/report messages (#3813)
	- Properly hide text of icon links/buttons (#3820)
	- Fix handling of unitless CSS size values in HTML message (#3821)
	- Fix removing contact photo using LDAP addressbook (#3737)
	- Fix storing X-ANNIVERSARY date in vCard format (#3816)
	- Update to Mail_Mime-1.8.5 (#3810)
	- Fix XSS vulnerability in message subject handling using Larry skin [CVE-2012-3507] (#3809)
	- Fix handling of links with various URI schemes e.g. "skype:" (#3521)
	- 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 (#3803)
	- Fix errors with enabled PHP magic_quotes_sybase option (#3798)
	- Fix SQL query for contacts listing on MS SQL Server (#3797)
	- Fix window.resize handler on IE8 and Opera (#3758)
	- Don't let error message popups cover the login form (#3794)
	- Update to TinyMCE 3.5.2
	- Don't show errors when moving contacts into groups they are already in (#3788)
	- Make folders with unread messages in subfolders bold again (#2892)
	- Abbreviate long attachment file names with ellipsis (#3793)
	- Fix html2text conversion of strong\|b\|a\|th\|h tags when used in upper case
	- Add listcontrols template container in Larry skin (#3792)
	- Fix host autoselection when default_host is an array (#3790)
	- Move messages forwarding mode setting into Preferences
	- Fix HTML entities handling in HTML editor (#3780)
	- Fix listing shared folders on Courier IMAP (#3767)

	## Release 0.8-rc

	- Added new translations in Belarusian, Interlingua and Malayalam
	- Flipped compose options arrow (#3772)
	- Fix handling of large uuencode attachments (#3771)
	- Fix handling of "usemap" attribute (#3770)
	- Fix handling of some HTML tags e.g. IMG (#3769)
	- Use similar language as a fallback for plugin localization (#3726)
	- Fix issue where signature wasn't re-added on draft compose (#3659)
	- Update to TinyMCE 3.5 (#3762)
	- 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 (#3755)
	- Fix redirect to mail/compose on re-login (#3585)
	- Add IE8 hack for messages list issue (#3317)
	- Fix handling errors on draft auto-save
	- Fix importing vCard photo with ENCODING param specified (#3746)
	- Support multiple name/email pairs for Bcc and Reply-To identity settings (#3752)
	- Set flexible width to login form fields (#3735)
	- Fix re-draw bug on list columns change in IE8 (#3318)
	- Allow mass-removal of addresses from a group (#3259)
	- Fix removing all contacts on import to LDAP addressbook
	- Fix so "Back" from compose/show doesn't reset search request (#3594)
	- Add option to delete messages instead of moving to Trash when in Junk folder (#2805)
	- Fix invisible cursor when replying to a html message (#3100)
	- Reset IP stored in session when destroying session data (#3485)
	- Fix bug where memory_limit = -1 wasn't handled properly
	- Support LDAP RFC2256's country object class read/write (#3535)
	- Upgraded to jQuery 1.7.2
	- Image resize with GD extension (#3712)
	- Fix lack of warning when switching task in compose window (#3725)
	- Fix bug where it wasn't possible to enter ( or & characters in autocomplete fields
	- Request all needed fields from address book backends (#3721)
	- Unified (single) spellchecker button
	- Scroll long lists on drag&drop (#2249)
	- Copy all skins in installto script (#3705)

	## Release 0.8-beta

	- Upgraded to jQuery 1.7.1 (#3673) and jQuery UI 1.8.18
	- Add Russian to the spellchecker languages list (#3542)
	- Remember custom skin selection after logout (#3688)
	- Make sure About tab is always the last tab (#3609)
	- Fix issue with folder creation under INBOX. namespace (#3683)
	- Added mailto: protocol handler registration link in User Preferences (#2729)
	- Handle identity details box with an iframe (#3066)
	- Fix issue where some text from original message was missing on reply (#3675)
	- Fix autoselect_host() for login (#3639)
	- 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 (#1973)
	- Add separate pagesize setting for mail messages and contacts (#3617)
	- Deprecate $DB, $USER, $IMAP global variables, Use $RCMAIL instead
	- Add option to set default font for HTML message (#894)
	- Fix issues with big memory allocation of IMAP results
	- Prevent from memory_limit exceeding when trying to parse big messages bodies (#3164)
	- Add possibility to add SASL mechanisms for SMTP in smtp_connect hook (#3399)
	- Mark (with different color) folders with recent messages (#2479)
	- Added About tab in Settings
	- TinyMCE updated to 3.4.6

	## Release 0.7.2

	- Fix encoding of attachment with comma in name (#3717)
	- Fix handling of % character in IMAP protocol (#3711)
	- Fix duplicate names handling in addressbook searches (#3704)
	- Fix displaying of HTML messages from Disqus (#3702)
	- Disable E_STRICT warnings on PHP 5.4
	- Prevent from folder selection on virtual folder collapsing (#3681)
	- 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 (#3664)
	- Add lost translation label in de_DE (#3654)
	- Fix drafts update issues when edited from preview pane (#3653)
	- Fix wrong variable name in rcube_ldap.php (#3643)
	- 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 (#3642)


	## Release 0.7.1

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

	## Release 0.7

	- Make Roundcube render the Email Standards Project Acid Test correctly
	- Replace prompt() with jQuery UI dialog (#1603)
	- Fix navigation in messages search results
	- Improved handling of some malformed values encoded with quoted-printable (#3590)
	- Add possibility to do LDAP bind before searching for bind DN
	- Fix handling of empty <U> tags in HTML messages (#3584)
	- Add content filter for embedded attachments to protect from XSS on IE [CVE-2012-1253] (#3372)
	- Use strpos() instead of strstr() when possible (#3581)
	- Fix handling HTML entities when converting HTML to text (#3582)
	- Fix fit_string_to_size() renders browser and ui unresponsive (#3577)
	- Fix handling of invalid characters in request (#3536)
	- Fix merging some configuration options in update.sh script (#2181)
	- Fix so TEXT key will remove all HEADER keys in IMAP SEARCH (#3578)
	- Fix handling contact photo url with https:// prefix (#3575)
	- Fix possible infinite redirect on attachment preview (#3572)
	- Improved clickjacking protection for browsers which don't support X-Frame-Options headers
	- Fixed bug where similar folder names were highlighted wrong (#3345)
	- Fixed bug in handling link with '!' character in it (#3569)
	- Fixed bug where session ID's length was limited to 40 characters (#3570)
	- 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 (#1604)
	- Fix regression in setting recipient to self when replying to a Sent message (#3101)
	- Fix listing of folders in hidden namespaces (#2895)
	- Don't consider \Noselect flag when building folders tree (#3448)
	- Fix sorting autocomplete results (#3504)
	- Add option to set session name (#2630)
	- 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 (#3312)
	- Add option to define matching method for addressbook search (#2720, #3378)
	- Make email recipients separator configurable
	- Fix so folders with \Noinferiors attribute aren't listed in parent selector
	- Fix handling of curly brackets in URLs (#3555)
	- Fix handling of dates (birthday/anniversary) in contact data (#3552)
	- Fix error on opening searched LDAP contact (#3550)
	- Fix redundant line break in flowed format (#3551)
	- Fix IDN address validation issue (#3544)
	- Fix JS error when dst_active checkbox doesn't exist (#3540)
	- Autocomplete LDAP records when adding contacts from mail (#3498)
	- Plugin API: added 'ready' hook (#3492)
	- Ignore DSN request when it isn't supported by SMTP server (#3300)
	- Make sure LDAP name fields aren't arrays (#3523)
	- Fixed imap test to non-default port when using ssl (#3532)
	- Force all files to be overwritten when updating (#3531)
	- Fix issue where it wasn't possible to change list view mode in folder manager for INBOX (#3522)
	- Fix namespace handling in special folders settings (#3527)
	- Disable time limit for CLI scripts (#3524)
	- Fix misleading display when changing editor type (#3519)
	- Add loading indicator on contact delete
	- Fix bug where after delete message rows can be added to the list of another folder (#3263)
	- 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 (#3503)
	- Make date/time format user configurable; drop 'date_today' config option
	- Fix setting title for truncated subject in IE (#3141)
	- Fix displaying multipart/alternative messages with only one part (#3400)
	- 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 (#3462)
	- 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 (#2884)
	- Localize forwarded message header (#3487)

	## Release 0.6

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

	## Release 0.6-rc

	- Send X-Frame-Options headers to protect from clickjacking (#3079)
	- Fallback to mail_domain in LDAP variable replacements; added 'host' to 'user_create' hook arguments (#3464)
	- Fixed wrong vCard type parameter mobile (#3496)
	- Fixed vCard WORKFAX issue (#3476)
	- Add vCard's Profile URL support (#3491)
	- jQuery 1.6.3
	- Fix imap_cache setting to values other than 'db' (#3489)
	- Fix handling of attachments inside message/rfc822 parts (#3466)
	- Make list of mimetypes that open in preview window configurable (#3175)
	- 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 (#3434)
	- Add option to hide selected LDAP addressbook on the list
	- Add client-side checking of uploaded files size
	- Add newlines between organization, department, jobtitle (#3468)
	- Recalculate date when replying to a message and localize the cite header (#3212)
	- Fix handling of email addresses with quoted local part (#3401)
	- Fix EOL character in vCard exports (#3357)
	- Added optional "multithreading" autocomplete feature
	- Plugin API: Added 'config_get' hook
	- Fixed new_user_identity plugin to work with updated rcube_ldap class (#3443)
	- 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 (#3258)
	- Add optional textual upload progress indicator (#2330)
	- Fix parsing URLs containing commas (#3425)
	- Added vertical splitter for books/groups list in addressbook (#3389)
	- 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 (#3406)
	- Added addressbook advanced search
	- Add popup with basic fields selection for addressbook search
	- Case-insensitive matching in autocompletion (#3398)
	- Added option to force spellchecking before sending a message (#1862)
	- Fix handling of "<" character in contact data, search fields and folder names (#3349)
	- Fix saving "<" character in identity name and organization fields (#3349)
	- 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 performance of folder manager operations
	- Fix default_port option handling in Installer when config.inc.php file exists (#3390)
	- 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 (#3380)
	- Add forward-as-attachment feature
	- jQuery-1.6.2 (#5158, #3154)
	- Improve display name composition when saving contacts (#3153)
	- Fix problems with subfolders of INBOX folder on some IMAP servers (#3247)
	- Fix handling of folders that doesn't belong to any namespace (#3184)
	- Enable multiselection for attachments uploading in capable browsers (#2266)
	- Add possibility to change HTML editor configuration by skin
	- Fix a bug where selecting too many contacts would produce too large URI request (#3369)
	- Improve performance by including files with absolute path (#3337)
	- Move folder name truncation to client/skin (#1822)
	- Added plugin hook for request token creation
	- Replace LDAP vars in group queries (#3329)
	- Fix vcard folding with unicode characters (#3353)
	- Keep all submitted data if contact form validation fails (#3350)
	- Handle unicode strings in rcube_addressbook::normalize_string() (#3351)
	- Fix handling of debug_level=4 in ajax requests (#3327)
	- Enable TinyMCE's contextmenu (#3062)
	- 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 (#3306)
	- Better display of vcard import results (#1861)
	- 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 (#2810)
	- Replying to a sent message puts the old recipient as the new recipient (#3101)
	- 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] (#3469)

	## Release 0.5.3

	- Fix identities "reply-to" and "bcc" fields have a bogus value when left empty (#3405)
	- Fix issue which cases IMAP disconnection when encrypt() method was used (#3374)
	- 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 (#3376)
	- Fix relative URLs handling according to a <base> in HTML (#3368)
	- Fix handling of top-level domains with more than 5 chars or unicode chars (#3366)
	- Fix usage of non-standard HTTP error codes (#3297)
	- Fix PHP warning on mistaken in_array() usage (#3375)

	## Release 0.5.2

	- TinyMCE 3.4.2 now compatible with IE9
	- PEAR::Net_SMTP 1.5.2, fixed timeout issue (#3332)
	- 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 (#3348)
	- Improve space-stuffing handling in format=flowed messages (#3346)
	- Fix bug where some dates would produce SQL error in MySQL (#3342)
	- Added workaround for some IMAP server with broken STATUS response (#3344)
	- Fix bug where default_charset was not used for text messages (#3328)
	- Stateless request tokens. No keep-alive necessary on login page (#3325)
	- 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 (#2516)
	- Fix some emails are not shown using Cyrus IMAP (#3316)
	- Fix handling of mime-encoded words with non-integral number of octets in a word (#3301)
	- Fix parsing links with non-printable characters inside (#3305)
	- Fixed de_CH Localization bugs (#3279)
	- Add variable for 'Today' label in date_today option (#2394)
	- Fix dont_override setting does not override existing user preferences (#3205)
	- 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 (#3281)

	## Release 0.5.1

	- Fix handling of attachments with invalid content type (#3275)
	- Add workaround for DBMail's bug http://www.dbmail.org/mantis/view.php?id=881 (#3274)
	- 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 (#3251)
	- Fix ICANN example addresses doesn't validate (#3253)
	- 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 (#3261)
	- Fix IDNA support when IDN/INTL modules are in use (#3253)
	- Fix handling of invalid HTML comments in messages (#3269)
	- Fix parsing FETCH response for very long headers (#3264)
	- Fix add/remove columns in message list when message_sort_order isn't set (#3262)
	- Check mime headers before attempt to parse them (#3256)
	- Quote header values in show_additional_headers plugin (#3255)
	- Fix settings UI on IE 6 (#3246)
	- Remove double borders in folder listing (#3236)
	- Separate full message headers UI element from headers table (#3238)
	- Add part MIME ID to message_part_* hooks (#3241)
	- Improve parsing of MS Outlook vCards (#3239)
	- 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. (#3210)
	- Show full mail subject as title when hovering a cut subject link (#3141)
	- Fix randomly disappearing folders list in IE (#3231)
	- Fix list column add/removal in IE (#3230)
	- Fix login redirect issues (#3221)
	- Require PHP 5.2.1 or greater
	- Fix %h/%z variables in username_domain option (#3228)
	- Workaround for setting charset in case of malformed bodystructure response (#3227)
	- Fix impossible to subscribe to protected folders (#3199)
	- Fix setting timezone in Preferences (#3232)

	## Release 0.5

	- Fix double-login/session issue (#3124)
	- Wrap HTML parts with <html><body> and add Doctype declaration (#3119)
	- Make rcube_autoload silently skip unknown classes (#3128)
	- Fix charset detection in vcards with encoded values (#1934)
	- Better CSS cursors for splitters (#2954)
	- Show the same message only once (#3186)
	- Fix namespaces handling (#3192)
	- Add handling of multifolder METADATA/ANNOTATION responses
	- Fix handling of INBOX when personal namespace prefix is non-empty (#3200)
	- Fix handling square brackets in links (#3209)
	- Add description of 'use_https' option in main.inc.php.dist file

	## Release 0.5-RC

	- Plugin API: Add 'pass' argument in 'authenticate' hook (#3147)
	- Fix attachments of type message/rfc822 are not listed on attachments list
	- Add 'login_lc' config option for case-insensitive authentication (#3131)
	- Fix window is blur'ed in IE when selecting a message (#3161)
	- Fix cursor position on compose form in Webkit browsers (#2796)
	- Fix setting charset of attachment filenames (#3136)
	- Allow setting autocomplete attribute for all inputs separately (#3158)
	- New Folder Manager UI
	- Fix invalid Request when creating a folder (#3165)
	- Add folder size and quota indicator in folder manager (#2112)
	- Add possibility to move a subfolder into root folder (#2890)
	- 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 (#1657)
	- Improve performance of folder rename and delete actions
	- Better support for READ-ONLY and NOPERM responses handling (#3108)
	- Add confirmation message on purge/expunge command response
	- Fix handling of untagged responses for AUTHENTICATE command (#3171)
	- Add username and IP address to log message on unsuccessful login (#3176)
	- Improved Mail-Followup-To and Mail-Reply-To headers handling
	- Fix charset conversion for text attachments without charset specification (#3181)

	## Release 0.5-BETA

	- Make session data storage more robust against garbage session data (#3148)
	- Config option for autocomplete on login screen
	- Allow plugin templates to include local files (#3146)
	- List groups in address detail view and allow to subscribe/unsubscribe from there (#2862)
	- Messages caching: performance improvements, fixed syncing, fixes related with #2857
	- Add link to identities in compose window (#2843)
	- Add Internationalized Domain Name (IDNA) support (#729)
	- Add option to automatically send read notifications for known senders (#2199)
	- Add option to "Return receipt" will be always checked (#2571)
	- Fix HTML to plain text conversion doesn't handle citation blocks (#2992)
	- Use custom sorting when SORT is disabled by IMAP admin (#3020)
	- Allow setting some washtml options from plugin (#2727)
	- Add option do bind for an individual LDAP address book (#3048)
	- Change reply prefix to display email address only if sender name doesn't exist (#2709)
	- Plugin API: improved 'abort' flag handling, added 'result' item in some hooks (#2988)
	- Fix mailto optional params in plain text messages aren't handled (#3071)
	- Add Reply-to-List feature (#977)
	- Add Mail-Followup-To/Mail-Reply-To support (#1937)
	- Fix confirmation message isn't displayed after sending mail on Chrome (#2437)
	- Fix keyboard doesn't work with autocomplete list with Chrome (#3073)
	- Improve tabs to fixed width and add tabs in identities info (#3030)
	- 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 (#2164)
	- Use empty envelope sender address for message disposition notifications (RFC 2298.3)
	- Support SMTP Delivery Status Notifications - RFC 3461 (#2409)
	- Use css sprite image for messages list
	- Add (different) attachment icon for messages of type multipart/report (#2426)
	- Prevent from inserting empty link when composing HTML message (#3007)
	- Add caching support in id2uid and uid2id functions (#3065)
	- Add SASL proxy authentication for SMTP (#2811)
	- Improve displaying of UI messages (#3033)
	- Fix double e-mail filed in identity form (#3088)
	- Display IMAP errors for LIST/THREAD/SEARCH commands (#2981)
	- Add LITERAL+ (IMAP4 non-synchronizing literals) support (RFC 2088)
	- Add separate column for message status icon (#2788)
	- 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 (#3097)
	- Fix handling of attachments when Content-Disposition is not inline nor attachment (#3086)
	- Improve performance of unseen messages counting (#3090)
	- 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 (#2808)
	- Add support for AUTH=DIGEST-MD5 in IMAP (RFC 2831)
	- Fix parent folder with unread subfolder not bold when message is open (#3104)
	- 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 (#2474)
	- Fix handling of URLs with tilde (~) or semicolon (;) character (#3110, #3111)
	- 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 (#3116)
	- Add option to place replies in the folder of the message being replied to (#2248)
	- Add missing confirmation/error messages on contact/group/message actions (#2935)
	- Add 'loading' message on message move/copy/delete/mark actions
	- Improve responsiveness of messages displaying (#3039)
	- Add option for minimum length of autocomplete's string (#2625)
	- Fix operations on messages in unsubscribed folder (#3126)
	- Add support for shared folders (#525)
	- Fix handling of folders with name "0" (#3133)
	- 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 (#3137)
	- Fix error in MSSQL DDL scripts (#3130)
	- Lock submit button in onsubmit event on login page (#3078)
	- Don't set attachment's charset in Content-type header (#3136)
	- Fix handling of message bodies (quoted-printable encoded) with NULL characters (#2448)
	- 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 (#3067)
	- 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 (#3069)
	- Fix handling of Thunderbird's vCards (#3070)

	## Release 0.4.1

	- Fix space-stuffing in format=flowed messages (#3064)
	- Fix msgexport.sh now using the new imap wrapper
	- Avoid displaying password on shell (#3010)
	- Only lower-case user name if first login attempt failed (#2600)
	- Make alias setting in squirrelmail_usercopy plugin configurable (patch by pommi, #3056)
	- Prevent from saving a non-existing skin path in user prefs (#3004)
	- Improve handling of single-part messages with bogus BODYSTRUCTURE (#2976)
	- Fix path to SQL files when using pgsql/mysqli/sqlsrv drivers (#2979)
	- Fix upgrade script for SQLite (#2980)
	- Fixes in SQL init script + added update script for MSSQL database
	- Remove redundant date in syslog messages (#3008)
	- Fix contacts list page controls when a group is selected (#3009)
	- Fix SMTP test in Installer (#3014)
	- Fix "Select all" causes message to be opened in folder with exactly one message (#2987)
	- Fix Tab key doesn't work in HTML editor in Google Chrome (#2995)
	- Fix TinyMCE uses zh_CN when zh_TW locale is set (#2998)
	- Fix TinyMCE buttons are hidden in Opera (#2993)
	- Fix JS error on IE when trying to send HTML message with enabled spellchecker (#3006)
	- Display inline images with known extensions and non-image content-type (#3002)
	- Fix "Threaded" checkbox after subfolder creation (#2997)
	- Fix timezone string in sent mail (#3021)
	- Show disabled checkboxes for protected folders instead of dots (#1898)
	- Added fieldsets in Identity form, added 'identity_form' hook
	- Re-added 'Close' button in upload form (#2999, #2917)
	- Fix handling of charsets with LATIN-* label
	- Fix messages background image handling in some cases (#3043)
	- Fix format=flowed handling (#3042)
	- Fix when IMAP connection fails in 'get' action session shouldn't be destroyed (#3046)
	- Fix list_cols is not updated after column dragging (#3050)
	- Support %z variable in host configuration options (#3054)

	## Release 0.4

	- Fix disappearing upload form disappears when user selects a file on Safari (#2917)
	- Don't replace error messages with loading info (#2534)
	- Fix JS errors on compose mode switch (#2952)
	- Fix message structure parsing when it lacks optional fields (#2960)
	- Include all recipients in sendmail log
	- Support HTTP_X_FORWARDED_PROTO header for HTTPS detecting (#2950)
	- Fix default IMAP port configuration (#2948)
	- Create Sent folder when starting to compose a new message (#2900)
	- Fix handling of messages with Content-Type: application/* and no filename (#840)
	- Improved compose screen: resizable body and attachments list, vertical splitter, options menu
	- Fix RC forgets search results (#722)
	- TinyMCE 3.3.7
	- Improve parsing of styled empty tags in HTML messages (#2908)
	- Add %dc variable support in base_dn/bind_dn config (#2881)
	- Add button to hide/unhide the preview pane (#955)
	- Fix no-cache headers on https to prevent content caching by proxies (#2897)
	- Fix attachment filenames broken with TNEF decoder using long filenames (#2894)
	- Use user's timezone in Date header, not server's timezone (#2393)
	- Add option to set separate footer for HTML messages (#2784)
	- Add real SMTP error description to displayed error messages (#2233)
	- Fix some IMAP errors handling when opening the message (#1848)
	- Fix related parts aren't displayed when got mimetype other than image/* (#2629)
	- Multiple identity and database support for squirrelmail_usercopy plugin (#2686)
	- Support dynamic hostname (%d/%n) variables in configuration options (#1843)
	- Add 'messages_list' hook (#2504)
	- Add request* event triggers in http_post/http_request (#2340)
	- Fix use RFC-compliant line-delimiter when saving messages on IMAP (#2828)
	- Add 'imap_timeout' option (#2869)
	- Fix forwarding of messages with winmail attachments
	- Fix handling of uuencoded attachments in message body (#2163)
	- Added list_mailboxes hook in rcube_imap::list_unsubscribed() (#2791)
	- Fix wrong message on file upload error (#2839)
	- Add support for data URI scheme [RFC2397] (#2851)
	- 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 (#1052), fixes word wrapping issues (#2703)
	- Fix duplicated attachments when forwarding a message (#2670)
	- Fix message/rfc822 attachments containing only attachments are not parsed properly (#2854)
	- Fix %00 character in winmail.dat attachments names (#2850)
	- Fix handling errors of folder deletion (#2821)
	- Parse untagged CAPABILITY response for LOGIN command (#2853)
	- 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 (#2802)
	- Fix check-recent action issues and performance (#2690)
	- Fix messages order after checking for recent (#1249)
	- Fix autocomplete shows entries without email (#2640)
	- Fix listupdate event doesn't trigger on search response (#2824)
	- Fix select_all_mode value after selecting a message (#2834)
	- Set focus to editor on reply in HTML mode (#2768)
	- Fix composing in HTML jumps cursor to body instead of recipients (#2796)
	- Allow columns order change per user - drag&drop (#2124)
	- Add References header in read receipt (#2801)
	- Fix database constraint violation when opening a message (#2814)
	- Add 'loading' message while login is in progress (#2790)
	- Fix quota_zero_as_unlimited (#2786)
	- Fix folder subscription checking (#2804)
	- Fix INBOX appears (sometimes) twice in mailbox list (#2794)
	- Fix listing of attachments of some types e.g. "x-epoc/x-sisx-app" (#2779)
	- Fix DB Schema checking when some db_table_* options are not set (#2780)

	## Release 0.4-beta

	- Add sizelimit and timelimit variables in LDAP config (#2704)
	- Hide IMAP host dropdown when single host is defined (#2553)
	- Add images pre-loading on login page (#623)
	- Add HTTP_X_REAL_IP and HTTP_X_FORWARDED_FOR to successful logins log (#2634)
	- Fix setting spellcheck languages with extended codes (#2747)
	- Fix messages list scrolling in FF3.6 (#2657)
	- Fix quicksearch input focus (#2770)
	- Always set changed date when flagging a DB record as deleted + provide a cleanup script
	- Fix address book/group selection (#2760)
	- Assign newly created contacts to the active group (#2764)
	- Added option not to mark messages as read when viewed in preview pane (#1513)
	- Allow plugins modify the Sent folder when composing (#2708)
	- Added optional (max_recipients) support to restrict total number of recipients per message (#1167)
	- Re-organize editor buttons, add blockquote and search buttons
	- Make possible to write inside or after a quoted html message (#1878)
	- Fix bugs on unexpected IMAP connection close (#2449, #2507)
	- 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 (#2627)
	- Added possibility to select all messages in a folder (#1312)
	- Added 'imap_force_caps' option for after-login CAPABILITY checking (#2087)
	- Password: Support dovecotpw encryption
	- TinyMCE 3.3.1
	- Implemented messages copying using drag&drop + SHIFT (#863)
	- Improved performance of folders operations (#2689)
	- Fix blocked.gif attachment is not attached to the message (#2685)
	- Managesieve: import from Horde-INGO
	- Managesieve: support for more than one match (#2362)
	- Managesieve: support for selectively disabling rules within a single sieve script (#2198)
	- 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 (#2413)
	- Options virtuser_* replaced with virtuser_* plugins
	- Plugin API: Implemented 'email2user' and 'user2email' hooks
	- Fix forwarding message omits CC header (#2538)
	- Add 'default_charset' option to user preferences (#1855)
	- 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 (#2533)
	- Fix deleting all messages from last list page (#2528)
	- Flag original messages when sending a draft (#2458)
	- Changed signature separator when top-posting (#2555)
	- Let the admin define defaults for search modifiers (#2211)
	- Fix long e-mail addresses validation (#2641)
	- Remember search modifiers in user prefs (#2411)
	- Added force_7bit option to force MIME encoding of plain/text messages (#2679)
	- Use case sensitive check when checking for default folders (#2567)
	- Fix checking for new mail: now checks unseen count of inbox (#2123)
	- Improve performance by avoiding unnecessary updates to the session table (#2552)
	- Fix invalid <font> tags which cause HTML message rendering problems (#2687)
	- Fix CVE-2010-0464: Disable DNS prefetching (#2639)
	- Fix Received headers to behave better with SpamAssassin (#2682)
	- Password: Make passwords encoding consistent with core, add 'password_charset' global option (#2658)
	- Fix adding contacts SQL error on mysql (#2645)
	- Squirrelmail_usercopy: support reply-to field (#2678)
	- Fix IE spellcheck suggestion popup issue (#2656)
	- Fix email address auto-completion shows regexp pattern (#2498)
	- Fix merging of configuration parameters: user prefs always survive (#2584)
	- Fix quota indicator value after folder purge/expunge (#2671)
	- Fix external mailto links support for use as protocol handler (#2328)
	- Fix attachment excessive memory use, support messages of any size (#1245)
	- Fix setting task name according to auth state
	- Password: fix vpopmaild driver (#2662)
	- Add workaround for MySQL bug [http://bugs.mysql.com/bug.php?id=46293] (#2659)
	- Fix quoted text wrapping when replying to an HTML email in plain text (#897)
	- Fix handling of extended mailto links (with params) (#2573)
	- Fix sorting by date of messages without date header on servers without SORT (#2521)
	- Fix inconsistency when not using default table names (#2652)
	- Fix folder rename/delete buttons do not appear on creation of first folder (#2653)
	- Fix character set conversion fails on systems where iconv doesn't accept //IGNORE (#2590)
	- 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 (#2602)
	- Use jQuery-1.4
	- Removed problematic browser-caching of messages
	- Fix incompatibility with suhosin.executor.disable_emodifier (#2549)
	- Use PLAIN auth when CRAM fails and imap_auth_type='check' (#2587)
	- Fix removal of <title> tag from HTML messages (#2629)
	- Fix 'force_https' to specified port when URL contains a port number (#2612)
	- Fix to-text converting of HTML entities inside b/strong/th/hX tags (#2621)
	- Bug in spellchecker suggestions when server charset != UTF8 (#2607)
	- Managesieve: Fix requires generation for multiple actions (#2603)
	- Fix LDAP problem with special characters in RDN (#2548)
	- Improved handling of message parts of type message/rfc822
	- Plugin API: added 'quota' hook
	- Fix parsing conditional comments in HTML messages (#2569)
	- Use built-in json_encode() for proper JSON format in AJAX replies
	- Allow setting only selected params in 'message_compose' hook (#2543)
	- Plugin API: added 'message_compose_body' hook (#2520)
	- Fix counters of all folders are checked in 'getunread' action with check_all_folders disabled (#2399)
	- Fix displaying alternative parts in messages of type message/rfc822 (#2488)
	- Fix possible messages exposure when using Roundcube behind a proxy (#2516)
	- Fix unicode para and line separators in javascript response (#2542)
	- Additional_message_headers: allow unsetting headers, support plugin's config file (#2505)
	- Fix displaying of hidden directories in skins list (#2535)
	- Fix open_basedir restriction error when reading skins list (#2537)
	- Fix pasting from Office apps into html editor (#2508)
	- Fix empty <a> tags parsing (#2509)
	- Don't cut off attachment names when using non-RFC2231 encoding (#1912)
	- Allow inserting signatures above replied message body (#991)
	- Managesieve 2.0: multi-script support
	- Fix imap_auth_type regression (#2502)

	## Release 0.3.1

	- Specify toolbar container in compose template (#2489)
	- Fix $_SERVER['HTTPS'] check for SSL forcing on IIS (#2486)
	- Avoid unnecessary page loads for selected tab (#2324)
	- Fix quota indicator issues by content generation on client-size (#2454, #2470)
	- Don't display disabled sections in Settings (#2380)
	- Added server-side e-mail address validation with 'email_dns_check' option (#2175)
	- Fix login page loading into an iframe when session expires (#2253)
	- Allow setting port number in 'force_https' option (#2373)
	- Option 'force_https' replaced by 'force_https' plugin
	- Fix IE issue with non-UTF-8 characters in AJAX response (#2422)
	- Partially fixed "empty body" issue by showing raw body of malformed message (#2427)
	- Fix importing/sending to email address with whitespace (#2467)
	- Added XIMSS (CommuniGate) driver for Password plugin
	- Fix newly attached files are not saved in drafts w/o editing any text (#2457)
	- Added attachment upload indicator with parallel upload (#2344)
	- Use default_charset for bodies of messages without charset definition (#2446)
	- Password: added cPanel driver
	- Fix return to first page from e-mail screen (#2385)
	- Fix handling HTML comments in HTML messages (#2448)
	- Fix folder/messagelist controls alignment - icons used (#2356)
	- Fix LDAP addressbook shows 'Contact not found' error sometimes (#2438)
	- Fix cache status checking + improve cache operations performance (#2384)
	- Prevent from setting INBOX as any of special folders (#2390)
	- Fix regular expression for e-mail address (#2417)
	- Fix Received header format
	- Implemented sorting by message index - added 'index_sort' option (#2240)
	- Fix dl() use in installer (#2415)
	- Added 'ldap_debug' option
	- Fix "Empty startup greeting" bug (#2369)
	- Fix setting user name in 'new_user_identity' plugin (#2405)
	- Fix incorrect count of new messages in folder list when using multiple IMAP clients (#2289)
	- Fix all folders checking for new messages with disabled caching (#2399)
	- Support skins in 'archive' and 'markasjunk' plugins
	- Added 'html_editor' hook (#2353)
	- Fix DB constraint violation when populating messages cache (#2338)
	- Password: added password strength options (#2348)
	- Fix LDAP partial result warning (#1928)
	- Fix delete in message view deletes permanently with flag_for_deletion=true (#2382)
	- Use faster/secure mt_rand() (#2376)
	- Fix roundcube hangs on empty inbox with bincimapd (#2375)
	- Fix wrong headers for IE on servers without $_SERVER['HTTPS'] (#2232)
	- Force IE style headers for attachments in non-HTTPS session, 'use_https' option (#2023)
	- Check 'post_max_size' for upload max filesize (#2372)
	- Password Plugin: Fix %d inserts username instead of domain (#2371)
	- Fix rcube_mdb2::affected_rows() (#2366)

	## Release 0.3-stable

	- Fix gn and givenName should be synonymous in LDAP addressbook (#2208)
	- Add mail_domain to LDAP email entries without @ sign (#1652)
	- Fix saving empty values in LDAP contact data (#2113)
	- Fix LDAP contact update when RDN field is changed (#2119)
	- Fix LDAP attributes case sensitivity problems (#2155)
	- Fix LDAP addressbook browsing when only one directory is used (#2314)
	- Fix endless loop on error response for APPEND command (#2346)
	- Don't require date.timezone setting in installer (#2284)
	- Fix date sorting problem with Courier IMAP server (#2351)
	- Unselect pressed buttons on mouse up (#2283)
	- Don't set php_value error_log in .htaccess but mention in INSTALL (#2230)
	- Fix too small status/flag/attachment columns in Safari 4 (#2349)
	- Fix selection disabling while dragging splitter in webkit browsers (#2342)
	- Added 'new_messages' plugin hook (#2298)
	- Added 'logout_after' plugin hook (#2333)
	- Added 'message_compose' hook
	- Added 'imap_connect' hook (#2256)
	- Fix vcard_attachments plugin (#2326)
	- Updated PEAR::Auth_SASL to 1.0.3 version
	- Use sequence names only with PostgreSQL (#2310)
	- Re-designed User Preferences interface
	- Fix MS SQL DDL (#2312)
	- Fix rcube_mdb2.php: call to setCharset not implemented in mssql driver (#2311)
	- Added 'display_next' option
	- Fix rcube_mdb2::unixtimestamp for MS SQL (#2308)
	- Fix HTML washing to respect character encoding
	- Fix endless loop in iil_C_Login() with Courier IMAP (#2303)
	- Fix #messagemenu display on IE (#2299)
	- Speedup UI by using sprites for (toolbar) buttons
	- Fix charset names with X- prefix handling
	- Fix displaying of HTML messages with unknown/malformed tags (#2296)

	## Release 0.3-RC1

	- Fix import of vCard entries with params (#1857)
	- Fix HTML messages output with empty block elements (#2271)
	- 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 (#2268)
	- Performance improvements by use UID commands (#2046)
	- Fix HTML editor tabIndex setting (#2269)
	- Added 'imap_debug' and 'smtp_debug' options
	- Support strftime's format modifiers in date_* options (#1354)
	- Support %h variable in 'smtp_server' option (#2101)
	- Show SMTP errors in browser (#2233)
	- Allow WBR tag in HTML message (#2259)
	- Use spl_autoload_register() instead of __autoload (#2250)
	- Add hook for identities listing (#2257)
	- Trigger hook 'smtp_connect' when opening an SMTP connection (#2255)
	- Added config option to enforce HTTPS connections
	- Fix non-unicode characters caching in unicode database (#1209)
	- Performance improvements of messages caching
	- Fix empty Date header issue (#2229)
	- Open collapsed folders during drag & drop (#2221)
	- Fixed link text replacements (#2120)
	- Also trigger 'insertrow' events on page load (#2151)
	- No link on subject in IE browsers (#1438)
	- Fixed filename encoding according to RFC2231 (#2192)
	- Added message Edit feature (#727, #1101)
	- Fix message Etag generation for counter issues (#1996)
	- Fix messages searching on MailEnable IMAP (#2097)
	- Fixed many 'skip_deleted' issues (#2006)
	- 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 (#2205)
	- Added possibility to invert messages selection
	- After move/delete from 'show' action display next message instead of messages list (#2203)
	- Fixed problem with double quote at the end of folder name (#2200)
	- Speedup UI by using CSS sprites and etags/expires/deflate in Apache config (#1397,#2128)
	- Support UID EXPUNGE: remove only moved/deleted messages
	- Add drag cancelling with ESC key (#1036)
	- Support initial identity name from virtuser_query (#807)
	- Added message menu, removed Print and Source buttons
	- Added possibility to save message as .eml file (#2178)
	- Added 1 minute interval in autosave options (#2173)
	- Support UTF-7 encoding in messages (#2156)
	- Better support for malformed character names (#2093)

	## 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 (#2122)
	- Support UUencode content encoding (#2163)
	- Minimize chance of race condition in session handling (#1260)
	- Fix session handling on non-session SQL query error (#2078)
	- Fix html editor mode setting when reopening draft message (#2158)
	- Added quick search box menu (#1010)
	- Fix wrong column sort order icons (#2149)
	- Updated TinyMCE to 3.2.3 version
	- Fix attachment names encoding when charset isn't specified in attachment part (#1483)
	- Fix message normal priority problem (#2146)
	- Fix autocomplete spinning wheel does not disappear (#2132)
	- Added log_date_format option (#2060)
	- Fix text wrapping in HTML editor after switching from plain text to HTML (#1917)
	- Fix auto-complete function hangs with plus sign (#2141)
	- Fix AJAX requests errors handler (#1503)
	- Speed up message list displaying on IE
	- Fix read/write database recognition (#2137)

	## Release 0.2.2

	- Fix quicksearchbox look in Chrome and Konqueror (#1380)
	- Fix UTF-8 byte-order mark removing (#1911)
	- Fix folders subscriptions on Konqueror (#1380)
	- Fix debug console on Konqueror and Safari
	- Fix messagelist focus issue when modifying status of selected messages (#2134)
	- Support STARTTLS in IMAP connection (#1714)
	- Fix DEL key problem in search boxes (#1923)
	- Support several e-mail addresses per user from virtuser_file (#2036)
	- Fix drag&drop with scrolling on IE (#2117)
	- Fix adding signature separator in html mode (#1768)
	- Fix opening attachment marks message as read (#2131)
	- Fix 'temp_dir' does not support relative path under Windows (#1157)
	- Fix "Initialize Database" button missing from installer (#2130)
	- Fix compose window doesn't fit 1024x768 window (#1807)
	- Fix service not available error when pressing back from compose dialog (#1942)
	- Fix using mail() on Windows (#2111)
	- Fix word wrapping in message-part's <PRE>s for printing (#2118)
	- Fix incorrect word wrapping in outgoing plaintext multibyte messages (#2062)
	- Fix double footer in HTML message with embedded images
	- Fix TNEF implementation bug (#2107)
	- Fix incorrect row id parsing for LDAP contacts list (#2116)
	- Fix 'mode' parameter in sqlite DSN (#2106)

	## Release 0.2.1

	- Use US-ASCII as failover when Unicode searching fails (#2097)
	- Fix errors handling in IMAP command continuations (#2097)
	- Fix FETCH result parsing for servers returning flags at the end of result (#2098)
	- Fix datetime columns defaults in mysql's DDL (#2012)
	- Fix attaching more than nine inline images (#2094)
	- Support 'UNICODE-1-1-UTF-7' alias for UTF-7 encoding (#2093)
	- Fix mime-type detection using a hard-coded map (#1735)
	- Don't return empty string if charset conversion failed (#2092)
	- Disable concurrent autocomplete query results display (#2082)
	- Fix new lines stripped from message footer (#2088)
	- Fix IE problem with mouse click autocomplete (#2080)
	- Fix html body washing on reply/forward + fix attachments handling (#2034)
	- Fix multiple recipients input parsing (#2077)
	- Fix replying to message with html attachment (#2034)
	- Use default_charset for messages without specified charset (#2027, #1484961)
	- Support non-standard "GMT-XXXX" literal in date header (#2074)
	- Added TNEF support to decode MS Outlook attachments (winmail.dat)
	- Fix "value continuation" MIME headers by adding required semicolon (#2073)
	- Fix pressing select all/unread multiple times (#2069)
	- Fix selecting all unread does not honor new messages (#2070)
	- Fix some base64 encoded attachments handling (#2071)
	- Support NGINX as IMAP backend: better BAD response handling (#2066)
	- Performance fix: don't fetch attachment parts headers twice to parse filename
	- Fix checking for recent messages on various IMAP servers (#2055)
	- Performance fix: Don't fetch quota and recent messages in "message view" mode
	- Fix displaying of alternative-inside-alternative messages (#2061)
	- Fix MDNSent flag checking, use arbitrary keywords (asterisk) flag (#2059)
	- Fix creation of folders with '&' sign in name
	- Fix parsing of email addresses without angle brackets (#2048)
	- Save spellcheck corrections when switching from plain to html editor (and spellchecking is on)
	- Fix large search results on server without SORT capability (#2031)
	- Get rid of preg_replace() with eval modifier and create_function usage (#2042)
	- 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 (#1116)
	- Secure vcard export by getting rid of preg's 'e' modifier use (#2045)
	- Fix authentication when submitting form with existing session (#2037)
	- Allow absolute URLs to images in HTML messages/sigs (#2029)
	- Fix message body which contains both inline attachments and emotions
	- Fix SQL query execution errors handling in rcube_mdb2 class (#1907)
	- Fix address names with '@' sign handling (#2022)
	- Improve messages display performance
	- Fix messages searching with 'to:' modifier

	## Release 0.2-STABLE

	- Fix mark popup in IE 7 (#1785)
	- Fix line-break issue when copy & paste in Firefox (#1832)
	- Fix autocomplete "unknown server error" (#2008)
	- Fix STARTTLS before AUTH in SMTP connection (#1415)
	- Support multiple quota values in QUOTAROOT response (#1999)
	- Only abbreviate file name for IE < 7 browsers (#1548)
	- Performance: allow setting imap root dir and delimiter before connect (#1628)
	- Fix sorting of folders with more than 2 levels (#1953)
	- Fix search results page jumps in LDAP addressbook (#1689)
	- Fix empty line before the signature in IE (#1769)
	- Fix horizontal scrollbar in preview pane on IE (#1228)
	- Add Robots meta tag in login page and installer (#1385)
	- Added 'show_images' option, removed 'addrbook_show_images' (#1977)
	- Option to check for new mails in all folders (#1053)
	- Don't set client busy when checking for new messages (#1706)
	- Allow UTF-8 folder names in config (#1960)
	- Add junk_mbox option configuration in installer (#1960)
	- Do serverside addressbook queries for autocompletion (#1925)
	- Allow setting attachment col position in 'list_cols' option
	- Allow override 'list_cols' via skin (#1958)
	- Fix 'cache' table cleanup on session destroy (#1913)
	- Increase speed of session destroy and garbage clean up
	- Fix session timeout when DB server got clock skew (#1890)
	- Fix handling of some malformed messages (#1099)
	- Speed up raw message body handling
	- Better HTML entities conversion in html2text (#1916)
	- Fix big memory consumption and speed up searching on servers without SORT capability
	- Fix setting locale to tr_TR, ku and az_AZ (#1872)
	- Use SORT for searching on servers with SORT capability
	- Added message status filter
	- Fix empty file sending (#1801)
	- Improved searching with many criteria (calling one SEARCH command)
	- Fix HTML editor initialization on IE (#1731)
	- Add warning when switching editor mode from html to plain (#1888)
	- Make identities list scrollable (#1930)
	- Fix problem with numeric folder names (#1922)
	- Added BYE response simple support to prevent from endless loops in imap.inc (#777)
	- Fix unread message unintentionally marked as read if read_when_deleted=true (#1819)
	- Remove port number from SERVER_NAME in smtp_helo_host (#1915)
	- Don't send disposition notification receipts for messages marked as 'read' (#1918)
	- Added 'keep_alive' and 'min_keep_alive' options (#1777)
	- Added option 'identities_level', removed 'multiple_identities'
	- Allow deleting identities when multiple_identities=false (#1840)
	- Added option focus_on_new_message (#1789)
	- Fix html2text class autoloading on Windows (#1904)
	- Fix html signature formatting when identity save error occurred (#1833)
	- Add feedback and set busy when moving folder (#1897)
	- Fix 'Empty' link visibility for some languages e.g. Slovak (#1889)
	- Fix messages count bar overlapping (#1703)
	- Fix adding signature in drafts compose mode (#1884)
	- Fix iil_C_Sort() to support very long and/or divided responses (#1713)
	- Fix matching case sensitivity when setting identity on reply (#1881)
	- Prefer default identity on reply
	- Fix imap searching on ISMail server (#1870)
	- Add css class for flagged messages (#1868)
	- Write username instead of id in sendmail log (#1879)
	- Fix htmlspecialchars() use for PHP version < 5.2.3 (#1877)
	- Fix js keywords escaping in json_serialize() for IE/Opera (#1874)
	- Added bin/killcache.php script (#1839)
	- Add support for SJIS, GB2312, BIG5 in rc_detect_encoding()
	- Fix vCard file encoding detection for non-UTF-8 strings (#1820)
	- Add 'skip_deleted' option in User Preferences (#1850)
	- Minimize "inline" javascript scripts use (#1838)
	- Fix css class setting for folders with names matching defined classes names (#1772)
	- Fix race conditions when changing mailbox
	- Fix spellchecking when switching to html editor (#1779)
	- Fix compose window width/height (#1807)
	- Allow calling msgimport.sh/msgexport.sh from any directory (#1837)
	- Localized filesize units (#1760)
	- Better handling of "no identity" and "no email in identity" situations (#1592)
	- Added 'mime_param_folding' option with possibility to choose long/non-ascii attachment names encoding e.g. to be readable in MS Outlook/OE (#1743)
	- Added "advanced options" feature in User Preferences
	- Fix unread counter when displaying cached massage in preview panel (#1720)
	- Fix htmleditor spellchecking on MS Windows (#1808)
	- Fix problem with non-ascii attachment names in Mail_mime (#1700, #1576)
	- Fix language autodetection (#1812)
	- Fix button label in folders management (#1816)
	- Fix collapsed folder not indicating unread msgs count of all subfolders (#1814)
	- Fix handling of apostrophes in filenames decoded according to rfc2231

	## Release 0.2-BETA

	- Made config files location configurable (#1664)
	- Reduced memory footprint when forwarding attachments (#1764)
	- Allow and use spellcheck attribute for input/textarea fields (#1545)
	- Added icons for forwarded/forwarded+replied messages (#1691)
	- Added Reply-To to forwarded emails (#1739)
	- Display progress message for folders create/delete/rename (#1774)
	- Smart Tags and NOBR tag support in html messages (#1780, #1748)
	- Redesign of the identities settings (#836)
	- Add config option to disable creation/deletion of identities (#1139)
	- Added 'sendmail_delay' option to restrict messages sending interval (#1135)
	- Added vertical splitter for folders list resizing
	- Added possibility to view all headers in message view
	- Fixed splitter drag/resize on Opera (#1626)
	- Fixed quota img height/width setting from template (#1396)
	- Refactor drag & drop functionality. Don't rely on browser events anymore (#1108)
	- Insert "virtual" folders in subscription list (#1333)
	- Added link to open message in new window
	- Enable export of address book contacts as vCard
	- Add feature to import contacts from vcard files (#395)
	- Respect Content-Location headers in multipart/related messages according to RFC2110 (#1464)
	- Allowed max. attachment size now indicated in compose screen (#1523)
	- Also capture backspace key in list mode (#1186)
	- Allow application/pgp parts to be displayed (#1309)
	- Correctly handle options in mailto-links (#1671)
	- Immediately save sort_col/sort_order in user prefs (#1698)
	- Truncate very long (above 50 characters) attachment filenames when displaying
	- Allow to auto-detect client language if none set (#1095)
	- 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 (#1738)
	- Mark form buttons that provide the most obvious operation (mainaction)
	- Added option 'quota_zero_as_unlimited' (#1206)
	- Added PRE handling in html2text class (#1301)
	- Added folder hierarchy collapsing
	- Added options to use syslog instead of log file (#1389)
	- Added Logging & Debugging section in Installer
	- Fix In-Reply-To and References headers when composing saved draft message (#1718)
	- Fix html message charset conversion for charsets with underline (#1717)
	- Fix buttons status after contacts deletion (#1675)
	- Fix escaping of To: and From: fields when building message body for reply or forward in the HTML editor (#1432)
	- Use current mailbox name in template (#1690)
	- Better fix for skipping untagged responses (#1694)
	- Added pspell support patch by Kris Steinhoff (#781)
	- Enable spellchecker for HTML editor (#1589)
	- Respect spellcheck_uri in tinyMCE spellchecker (#941)
	- Case insensitive contacts searching using PostgreSQL (#1692)
	- Make default imap folders configurable for each user (#1558)
	- Save outgoing mail to selectable folder (#1324581)
	- Fix hiding of mark menu when clicking th button again (#1463)
	- Use long date format in print mode (#1643)
	- Updated TinyMCE to version 3.1.0.1
	- Re-enable autocomplete attribute for login form (#1661)
	- Check PERMANENTFLAGS before saving $MDNSent flag (#1478, #1485163)
	- Added flag column on messages list (#1220)
	- Patched Mail/MimePart.php (http://pear.php.net/bugs/bug.php?id=14232)
	- Allow trash/junk subfolders to be purged (#1568)
	- Store compose parameters in session and redirect to a unique URL
	- Fixed CRAM-MD5 authentication (#1364)
	- Fixed forwarding messages with one HTML attachment (#1103)
	- Fixed encoding of message/rfc822 attachments and image/pjpeg handling (#1439)
	- 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 (#1204)
	- User preferences grouped in more fieldsets
	- Fix corrupted MIME headers of messages in Sent folder (#1587)
	- Fixed bug in MDB2 package: http://pear.php.net/bugs/bug.php?id=14124
	- Use keypress instead of keydown to select list's row (#1362)
	- Don't call expunge and don't remove message row after message move if flag_for_deletion is set to true (#1505)

	## Release 0.2-ALPHA

	- Added option to disable autocompletion from selected LDAP address books (#1445)
	- TLS support in LDAP connections: 'use_tls' property (#1581)
	- Fixed removing messages from search set after deleting them (#1583)
	- imap.inc: Fixed iil_C_FetchStructureString() to handle many
	literal strings in response (#1483)
	- Support for subfolders in default/protected folders (#1250)
	- Disallowed delimiter in folder name (#1351)
	- Support " and \ in folder names
	- Escape \ in login (#1214)
	- Better HTML sanitization with the DOM-based washtml script (#1276)
	- Fixed sorting of folders with non-ascii characters
	- Fixed Mysql DDL for default identities creation (#1554)
	- In Preferences added possibility to configure 'read_when_deleted',
	'mdn_requests', 'flag_for_deletion' options
	- Made IMAP auth type configurable (#683)
	- Fixed empty values with FROM_UNIXTIME() in rcube_mdb2 (#1540)
	- Fixed attachment list on IE 6/7 (#1355)
	- Fixed JavaScript in compose.html that shows cc/bcc fields if populated
	- Make password input fields of type password in installer (#1417)
	- Don't attempt to delete cache entries if enable_caching is FALSE (#1537)
	- Optimized messages sorting on servers without sort capability (#1535)
	- Corrected message headers decoding when charset isn't specified and improved
	support for native languages (#1536, #1534)
	- Expanded LDAP configuration options to support LDAP server writes.
	- Installer: encode special characters in DB username/password (#1529)
	- Fixed management of folders with national characters in names (#1526, #1504)
	- Fixed identities saving when using MDB2 pgsql driver (#1525)
	- Fixed BCC header reset (#1501)
	- Improved messages list performance - patch from Justin Heesemann
	- Append skin_path to images location only when it starts with '/' sign (#1398)
	- Fix IMAP response in message body when message has no body (#1479)
	- Fixed non-RFC dates formatting (#1429)
	- Fixed typo in set_charset() (#1498)
	- Decode entities when inserting HTML signature to plain text message (#1497)
	- HTML editing is now working with PHP5 updates and TinyMCE v3.0.6
	- Fixed signature loading on Windows (#1169)
	- Added language support to HTML editing (#1401)
	- Fixed remove signature when replying (#446)
	- Fixed problem with line with a space at the end (#1440)
	- Fixed `<!DOCTYPE>` tag filtering (#1066)
	- Fixed <?xml> tag filtering (#1075)
	- Added sections (fieldset+label) in Settings interface
	- Mark as read in one action with message preview (#1486)
	- Deleted redundant quota reads (#1486)
	- Added options for empty trash and expunge inbox on logout (#707)
	- 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 (#1461)
	- Remove hard-coded image size in skin templates (#1423)
	- Database schema improvements (dropped unnecessary indexes)
	- Fixed creating a new folder with a comma in its name (#1263)
	- Fixed sorting of messages when default mailbox is empty (#1020)
	- Improve message previewpane - less loading (#1019)
	- Fixed login form autocompletion (#1378)
	- Fixed virtuser_query option for mdb2 backend (#1409)
	- Fixed attachment restoring from Drafts when message body was empty (#1144)
	- Fixed usage of ob_gzhandler (#1390)
	- Fixed message part window in IE6 (#1211)
	- Fixed decoding of mime-encoded strings (#938)
	- Fixed some iconv/mb_string problems (#1202)
	- Correctly quote mailbox name when using in URL (#1016)
	- Fixed "headers already sent" errors (#1399)

	## Release 0.1-STABLE

	- Added interactive installer script
	- Fix folder adding/renaming inspired by #1349
	- Localize folder name in page title (#1338)
	- Fix code using wrong variable name (#818)
	- Allow to send mail with BCC recipients only
	- condense TinyMCE toolbar down to one line, removing table buttons (#1306)
	- Add function to mark the selected messages as read/unread (#641)
	- Also do charset decoding as suggested in RFC 2231 (fix #1022)
	- Show message count in folder list and hint when creating a subfolder
	- Distinguish ssl and tls for imap connections (#1252)
	- Added some charset aliases to fix typical mis-labelling (#1185)
	- Remember decision to display images for a certain message during session (#1310)
	- Truncate attachment filenames to 55 characters due to an IE bug (#1313)
	- Make sending of read receipts configurable
	- Respect config when localize folder names (#1280)
	- Also respect receipt and priority settings when re-opening a draft message
	- Remember search results (closes #722), 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 (#1179)
	- Implement Message-Disposition-Notification (Receipts)
	- Fix overriding of session vars when register_globals is on (#1255)
	- Fix bug with case-sensitive folder names (#973)
	- 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 (#925)
	- Switch to/from when searching in Sent folder (#1177)
	- Correctly read the References header (#1236)
	- Unset old cookie before sending a new value (#1232)
	- Correctly decode attachments when downloading them (#1235 and #1484642)
	- Suppress IE errors when clearing attachments form (#1043)
	- Log error when login fails due to auto_create_user turned off
	- Filter linked/imported CSS files (closes #844)
	- Improve message compose screen (closes #1060)
	- Select next row after removing one from list (#1063)

	## Release 0.1-RC2

	- Enable drag-&-dropping of folders to a new parent and allow to create subfolders (#637)
	- Suppress IE errors when clearing attachments form (#1043)
	- Set preferences field in user table to NULL (#1062)
	- Log error when login fails due to auto_create_user turned off
	- Filter linked/imported CSS files (closes #844)
	- Improve message compose screen (closes #1060)
	- Select next row after removing one from list (#1063)
	- Make smtp HELO/EHLO hostname configurable (#851)
	- IPv6 Compatibility (#1023), Patch #1484373
	- Unlock interface when message sending fails (#1188)
	- Eval PHP code in template includes (if configured)
	- Show message when folder is empty. Mo more static text in table (#1068)
	- Only display unread count in page title when new messages arrived
	- Fixed wrong delete button tooltip (#785)
	- Fixed charset encoding bug (#1091)
	- Applied patch for LDAP version (#1175)
	- Improved XHTML validation
	- Fix message list selection (#1174)
	- Better fix lowercased usernames (#1120)
	- Update pngbehavior Script as suggested in #1134
	- 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 (#1074)
	- Add alternative for getallheaders() (fix #1146)
	- Identify mailboxes case-sensitive
	- Sort mailbox list case-insensitive (closes #1032)
	- Fix display of multipart messages from Apple Mail (closes #823)
	- 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 #1089)
	- Added //IGNORE to iconv call (patch #1086, closes #821)
	- Check if mbstring supports charset (#1003 and #1004)
	- Prefer iconv over mbstring (as suggested in #1004)
	- Check filesize of template includes (#1079)
	- Fixed bug with buttons not dimming/enabling properly after switching folders
	- Fixed compose window becoming unresponsive after saving a draft (#1132)
	- Re-enabled "Back" button in compose window now that bug #1132 is fixed
	- Fixed unresponsive interface issue when downloading attachments (#1138)
	- 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 (#1140)
	- Fix status message bug #1114 with regard to #1041
	- Fix address adding bug reported by David Koblas
	- Applied socket error patch by Thomas Mangin
	- Pass-by-reference workaround for PHP5 in sendmail.inc
	- Fixed buggy imap_root settings (closes #1056)
	- Prevent default events on subject links (#1071)
	- Use HTTP-POST requests for actions that change state

	## Release 0.1-RC1

	- Use global filters and bind username/ for Ldap searches (#909)
	- Hide quota display if imap server does not support it
	- Hide address groups if no LDAP servers configured
	- Add link to message subjects (closes #982)
	- Better SQL query for contact listing/search (closes #1051)
	- Fixed marking as read in preview pane (closes #1048)
	- CSS hack to display attachments correctly in IE6
	- Wrap message body text (closes #901)
	- LDAP access is back in address book (closes #864)
	- Added search function for contacts
	- New Template parsing and output encoding
	- Fixed bugs #884 and #793
	- Fixed message moving procedure (closes #1013)
	- Fixed display of multiple attachments (closes #647)
	- Fixed check for new messages (closes #1015)
	- List attachments without filename
	- New session authentication: Change sessid cookie when login, authentication with sessauth cookie is now configurable.
	Should close bugs #774 and #1484299
	- Correctly translate mailbox names (closes #993)
	- Quote e-mail address links (closes #1007)
	- 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 #838)
	- Also use user_id for unique key in messages table (closes #857)
	- Hide contacts drop down on blur (closes #946)
	- 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 #943)
	- Fixed bug in Postgres DB handling (closes #852)
	- Fixed bug of invalid calls to fetchRow() in rcube_db.inc (closes #996)
	- Fixed array_merge bug (closes #997)
	- Fixed flag for deletion in list view (closes #987)
	- Finally support semicolons as recipient separator (closes ##976)
	- Fixed message headers (subject) encoding
	- check if safe mode is on or not (closes #990)
	- Show "no subject" in message list if subject is missing (closes #971)
	- Solved page caching of message preview (closes #905)
	- Only use gzip compression if configured (closes #967)
	- Fixed priority selector issue (#903)
	- Fixed some CSS issues in default skin (closes #951 and #911)
	- Prevent from double quoting of numeric HTML character references (closes #978)
	- Fixed display of HTML message attachments (closes #927)
	- Applied patch for preview caching (closes #933)
	- Added error handling for attachment uploads
	- Use multibyte safe string functions where necessary (closes #798)
	- 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 #890)
	- Show remote images when opening HTML message part as attachment
	- Improve memory usage when sending mail (closes #871)
	- Mark messages as read once the preview is loaded (closes #1484132)
	- Include smtp final response in log (closes #862)
	- Corrected date string in sent message header (closes #887)
	- Correctly choose "To" column in sent and draft mailboxes (closes #769)
	- Changed tooltips for message browse buttons (closes #757)
	- Fixed signature delimiter character to be standard (Bug #830)
	- Fixed XSS vulnerability (Bug #877)
	- Remove newlines from mail headers (Bug #827)
	- Selection issues when moving/deleting (Bug #837)
	- Applied patch of Clement Moulin for imap host auto-selection
	- ISO-encode IMAP password for plaintext login (Bugs #792 & #723)
	- Fixed folder name encoding in subscription list (Bug #879)
	- Fixed JS errors in identity list (Bug #885)
	- Translate foldernames in folder form (closes #879)
	- 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 #817)
	- Enable contact editing right after creation (Bug #644)
	- Correct UTF-7 to UTF-8 conversion if mbstring is not available
	- Fixed IMAP fetch of message body (Bug #819)
	- Fixed safe_mode problems (Bug #539)
	- Fixed wrong header encoding (Bug #1483976)
	- Made automatic draft saving configurable
	- Fixed JS bug when renaming folders (Bug #799)
	- 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 #616)
	- Fixed saving of contact into MySQL from LDAP query results (Ticket #681)
	- Fixed folder renaming: unsubscribe before rename (Bug #750)
	- Finalized new message parsing (+ caching)
	- Fixed wrong usage of mbstring (Bug #645)
	- Set default spelling language (Ticket #764)
	- Added support for Nox Spell Server
	- Re-built message parsing (Bug #422)
	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/program/actions/mail/show.php b/program/actions/mail/show.php
	index e7d0b6a18..38f16efc1 100644
	--- a/program/actions/mail/show.php
	+++ b/program/actions/mail/show.php
	@@ -1,900 +1,909 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| \|
	\| Copyright (C) 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> \|
	+-----------------------------------------------------------------------+
	*/

	class rcmail_action_mail_show extends rcmail_action_mail_index
	{
	protected static $MESSAGE;
	protected static $CLIENT_MIMETYPES = [];

	/**
	* Request handler.
	*
	* @param array $args Arguments from the previous step(s)
	*/
	public function run($args = [])
	{
	$rcmail = rcmail::get_instance();

	self::$PRINT_MODE = $rcmail->action == 'print';

	// Read browser capabilities and store them in session
	if ($caps = rcube_utils::get_input_value('_caps', rcube_utils::INPUT_GET)) {
	$browser_caps = [];
	foreach (explode(',', $caps) as $cap) {
	$cap = explode('=', $cap);
	$browser_caps[$cap[0]] = $cap[1];
	}

	$_SESSION['browser_caps'] = $browser_caps;
	}

	$msg_id = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
	$uid = preg_replace('/\.[0-9.]+$/', '', $msg_id);
	$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($msg_id, $mbox_name, !empty($_GET['_safe']));

	self::$MESSAGE = $MESSAGE;

	// if message not found (wrong UID)...
	if (empty($MESSAGE->headers)) {
	self::message_error();
	}

	self::$CLIENT_MIMETYPES = self::supported_mimetypes();

	// show images?
	self::check_safe($MESSAGE);

	// set message charset as default
	if (!empty($MESSAGE->headers->charset)) {
	$rcmail->storage->set_charset($MESSAGE->headers->charset);
	}

	if (!isset($_SESSION['writeable_abook'])) {
	$_SESSION['writeable_abook'] = $rcmail->get_address_sources(true) ? true : false;
	}

	$rcmail->output->set_pagetitle(abbreviate_string($MESSAGE->subject, 128, '...', true));

	// set environment
	$rcmail->output->set_env('uid', $msg_id);
	$rcmail->output->set_env('safemode', $MESSAGE->is_safe);
	$rcmail->output->set_env('message_context', $MESSAGE->context);
	$rcmail->output->set_env('message_flags', array_keys(array_change_key_case((array) $MESSAGE->headers->flags)));
	$rcmail->output->set_env('sender', !empty($MESSAGE->sender) ? $MESSAGE->sender['string'] : '');
	$rcmail->output->set_env('mailbox', $mbox_name);
	$rcmail->output->set_env('username', $rcmail->get_user_name());
	$rcmail->output->set_env('permaurl', $rcmail->url(['_action' => 'show', '_uid' => $msg_id, '_mbox' => $mbox_name]));
	$rcmail->output->set_env('has_writeable_addressbook', $_SESSION['writeable_abook']);
	$rcmail->output->set_env('delimiter', $rcmail->storage->get_hierarchy_delimiter());
	$rcmail->output->set_env('mimetypes', self::$CLIENT_MIMETYPES);

	if ($MESSAGE->headers->get('list-post', false)) {
	$rcmail->output->set_env('list_post', true);
	}

	// set configuration
	self::set_env_config(['delete_junk', 'flag_for_deletion', 'read_when_deleted',
	'skip_deleted', 'display_next', 'forward_attachment', 'mailvelope_main_keyring']);

	// set special folders
	foreach (['drafts', 'trash', 'junk'] as $mbox) {
	if ($folder = $rcmail->config->get($mbox . '_mbox')) {
	$rcmail->output->set_env($mbox . '_mailbox', $folder);
	}
	}

	if ($MESSAGE->has_html_part()) {
	$prefer_html = $rcmail->config->get('prefer_html');
	$rcmail->output->set_env('optional_format', $prefer_html ? 'text' : 'html');
	}

	$rcmail->output->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
	'movingmessage', 'deletingmessage', 'markingmessage', 'replyall', 'replylist',
	'bounce', 'bouncemsg', 'sendingmessage');

	// check for unset disposition notification
	self::mdn_request_handler($MESSAGE);

	if (empty($MESSAGE->headers->flags['SEEN']) && $MESSAGE->context === null) {
	$v = intval($rcmail->config->get('mail_read_time'));
	if ($v > 0) {
	$rcmail->output->set_env('mail_read_time', $v);
	}
	else if ($v == 0) {
	$rcmail->output->command('set_unread_message', $MESSAGE->uid, $mbox_name);
	$rcmail->plugins->exec_hook('message_read', [
	'uid' => $MESSAGE->uid,
	'mailbox' => $mbox_name,
	'message' => $MESSAGE,
	]);

	$set_seen_flag = true;
	}
	}
	}

	$rcmail->output->add_handlers([
	'mailboxname' => [$this, 'mailbox_name_display'],
	'messageattachments' => [$this, 'message_attachments'],
	'messageobjects' => [$this, 'message_objects'],
	'messagesummary' => [$this, 'message_summary'],
	'messageheaders' => [$this, 'message_headers'],
	'messagefullheaders' => [$this, 'message_full_headers'],
	'messagebody' => [$this, 'message_body'],
	'contactphoto' => [$this, 'message_contactphoto'],
	]);

	if ($rcmail->action == 'print' && $rcmail->output->template_exists('messageprint')) {
	$rcmail->output->send('messageprint', false);
	}
	else if ($rcmail->action == 'preview' && $rcmail->output->template_exists('messagepreview')) {
	$rcmail->output->send('messagepreview', false);
	}
	else {
	$rcmail->output->send('message', false);
	}

	// mark message as read
	if (!empty($set_seen_flag)) {
	if ($rcmail->storage->set_flag(self::$MESSAGE->uid, 'SEEN', $mbox_name)) {
	if ($count = self::get_unseen_count($mbox_name)) {
	self::set_unseen_count($mbox_name, $count - 1);
	}
	}
	}

	exit;
	}

	public static function message_attachments($attrib)
	{
	if (empty(self::$MESSAGE->attachments)) {
	return '';
	}

	$rcmail = rcmail::get_instance();
	$out =
	$ol = '';
	$attachments = [];

	foreach (self::$MESSAGE->attachments as $attach_prop) {
	$filename = self::attachment_name($attach_prop, true);
	$filesize = self::message_part_size($attach_prop);
	$mimetype = rcube_mime::fix_mimetype($attach_prop->mimetype);
	$class = rcube_utils::file2class($mimetype, $filename);
	$id = 'attach' . $attach_prop->mime_id;

	if ($mimetype == 'application/octet-stream' && ($type = rcube_mime::file_ext_type($filename))) {
	$mimetype = $type;
	}

	if (!empty($attrib['maxlength']) && mb_strlen($filename) > $attrib['maxlength']) {
	$title = $filename;
	$filename = abbreviate_string($filename, $attrib['maxlength']);
	}
	else {
	$title = '';
	}

	$item = html::span('attachment-name', rcube::Q($filename))
	. html::span('attachment-size', '(' . rcube::Q($filesize) . ')');

	$li_class = $class;

	if (!self::$PRINT_MODE) {
	$link_attrs = [
	'href' => self::$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' => $title,
	'class' => 'filename',
	];

	if ($mimetype != 'message/rfc822' && empty($attach_prop->size)) {
	$li_class .= ' no-menu';
	$link_attrs['onclick'] = sprintf('%s.alert_dialog(%s.get_label(\'emptyattachment\')); return false',
	rcmail_output::JS_OBJECT_NAME, rcmail_output::JS_OBJECT_NAME);
	$rcmail->output->add_label('emptyattachment');
	}

	$item = html::a($link_attrs, $item);
	$attachments[$attach_prop->mime_id] = $mimetype;
	}

	$ol .= html::tag('li', ['class' => $li_class, 'id' => $id], $item);
	}

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

	$rcmail->output->set_env('attachments', $attachments);
	$rcmail->output->add_gui_object('attachments', $attrib['id']);

	return $out;
	}

	public static function remote_objects_msg()
	{
	$rcmail = rcmail::get_instance();

	$attrib['id'] = 'remote-objects-message';
	$attrib['class'] = 'notice';
	$attrib['style'] = 'display: none';

	$msg = html::span(null, rcube::Q($rcmail->gettext('blockedresources')));

	$buttons = html::a([
	'href' => "#loadremote",
	'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('load-remote')"
	],
	rcube::Q($rcmail->gettext('allow'))
	);

	// add link to save sender in addressbook and reload message
	$show_images = $rcmail->config->get('show_images');
	if (!empty(self::$MESSAGE->sender['mailto']) && ($show_images == 1 \|\| $show_images == 3)) {
	$buttons .= ' ' . html::a([
	'href' => "#loadremotealways",
	'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('load-remote', true)",
	'style' => "white-space:nowrap"
	],
	rcube::Q($rcmail->gettext(['name' => 'alwaysallow', 'vars' => ['sender' => self::$MESSAGE->sender['mailto']]]))
	);
	}

	$rcmail->output->add_gui_object('remoteobjectsmsg', $attrib['id']);

	return html::div($attrib, $msg . ' ' . html::span('boxbuttons', $buttons));
	}

	/**
	* Display a warning whenever a suspicious email address has been found in the message.
	*
	* @return string HTML content of the warning element
	*/
	public static function suspicious_content_warning()
	{
	if (empty(self::$SUSPICIOUS_EMAIL)) {
	return '';
	}

	$rcmail = rcmail::get_instance();

	$attrib = [
	'id' => 'suspicious-content-message',
	'class' => 'notice',
	];

	$msg = html::span(null, rcube::Q($rcmail->gettext('suspiciousemail')));

	return html::div($attrib, $msg);
	}

	public static function message_buttons()
	{
	$rcmail = rcmail::get_instance();
	$delim = $rcmail->storage->get_hierarchy_delimiter();
	$dbox = $rcmail->config->get('drafts_mbox');

	// the message is not a draft
	if (self::$MESSAGE->context
	\|\| (self::$MESSAGE->folder != $dbox && strpos(self::$MESSAGE->folder, $dbox.$delim) !== 0)
	) {
	return '';
	}

	$attrib['id'] = 'message-buttons';
	$attrib['class'] = 'information notice';

	$msg = html::span(null, rcube::Q($rcmail->gettext('isdraft')))
	. ' '
	. html::a([
	'href' => "#edit",
	'onclick' => rcmail_output::JS_OBJECT_NAME.".command('edit')"
	],
	rcube::Q($rcmail->gettext('edit'))
	);

	return html::div($attrib, $msg);
	}

	public static function message_objects($attrib)
	{
	if (empty($attrib['id'])) {
	$attrib['id'] = 'message-objects';
	}

	$rcmail = rcmail::get_instance();
	$content = [
	self::message_buttons(),
	self::remote_objects_msg(),
	self::suspicious_content_warning(),
	];

	$plugin = $rcmail->plugins->exec_hook('message_objects',
	['content' => $content, 'message' => self::$MESSAGE]);

	$content = implode("\n", $plugin['content']);

	return html::div($attrib, $content);
	}

	public static function message_contactphoto($attrib)
	{
	$rcmail = rcmail::get_instance();
	$error_handler = false;
	$placeholder = 'data:image/gif;base64,' . rcmail_output::BLANK_GIF;

	if (!empty($attrib['placeholder'])) {
	$placeholder = $rcmail->output->abs_url($attrib['placeholder'], true);
	$placeholder = $rcmail->output->asset_url($placeholder);

	// set error handler on <img>
	$error_handler = true;
	$attrib['onerror'] = "this.onerror = null; this.src = '$placeholder';";
	}

	if (self::$MESSAGE->sender) {
	$photo_img = $rcmail->url([
	'_task' => 'addressbook',
	'_action' => 'photo',
	'_email' => self::$MESSAGE->sender['mailto'],
	'_error' => $error_handler ? 1 : null,
	]);
	}
	else {
	$photo_img = $placeholder;
	}

	return html::img(['src' => $photo_img, 'alt' => $rcmail->gettext('contactphoto')] + $attrib);
	}

	/**
	* Returns table with message headers
	*/
	public static function message_headers($attrib, $headers = null)
	{
	static $sa_attrib;

	// keep header table attrib
	if (is_array($attrib) && !$sa_attrib && empty($attrib['valueof'])) {
	$sa_attrib = $attrib;
	}
	else if (!is_array($attrib) && is_array($sa_attrib)) {
	$attrib = $sa_attrib;
	}

	if (!isset(self::$MESSAGE)) {
	return false;
	}

	$rcmail = rcmail::get_instance();

	// get associative array of headers object
	if (!$headers) {
	$headers_obj = self::$MESSAGE->headers;
	$headers = get_object_vars(self::$MESSAGE->headers);
	}
	else if (is_object($headers)) {
	$headers_obj = $headers;
	$headers = get_object_vars($headers_obj);
	}
	else {
	$headers_obj = rcube_message_header::from_array($headers);
	}

	// show these headers
	$standard_headers = ['subject', 'from', 'sender', 'to', 'cc', 'bcc', 'replyto',
	'mail-reply-to', 'mail-followup-to', 'date', 'priority'];
	$exclude_headers = !empty($attrib['exclude']) ? explode(',', $attrib['exclude']) : [];
	$output_headers = [];

	$attr_max = isset($attrib['max']) ? $attrib['max'] : null;
	$attr_addicon = isset($attrib['addicon']) ? $attrib['addicon'] : null;
	$charset = !empty($headers['charset']) ? $headers['charset'] : null;

	foreach ($standard_headers as $hkey) {
	$value = null;
	if (!empty($headers[$hkey])) {
	$value = $headers[$hkey];
	}
	else if (!empty($headers['others'][$hkey])) {
	$value = $headers['others'][$hkey];
	}
	else if (empty($attrib['valueof'])) {
	continue;
	}

	if (in_array($hkey, $exclude_headers)) {
	continue;
	}

	$ishtml = false;
	$header_title = $rcmail->gettext(preg_replace('/(^mail-\|-)/', '', $hkey));

	if ($hkey == 'date') {
	$header_value = $rcmail->format_date($value,
	self::$PRINT_MODE ? $rcmail->config->get('date_long', 'x') : null);
	}
	else if ($hkey == 'priority') {
	if ($value) {
	$header_value = html::span('prio' . $value, rcube::Q(self::localized_priority($value)));
	$ishtml = true;
	}
	else {
	continue;
	}
	}
	else if ($hkey == 'replyto') {
	if ($headers['replyto'] != $headers['from']) {
	$header_value = self::address_string($value, $attr_max, true, $attr_addicon, $charset, $header_title);
	$ishtml = true;
	}
	else {
	continue;
	}
	}
	else if ($hkey == 'mail-reply-to') {
	if ($value
	&& (!isset($headers['mail-replyto']) \|\| $headers['mail-replyto'] != $headers['replyto'])
	&& $headers['replyto'] != $headers['from']
	) {
	$header_value = self::address_string($value, $attr_max, true, $attr_addicon, $charset, $header_title);
	$ishtml = true;
	}
	else {
	continue;
	}
	}
	else if ($hkey == 'sender') {
	if ($value && (!isset($headers['sender']) \|\| $headers['sender'] != $headers['from'])) {
	$header_value = self::address_string($value, $attr_max, true, $attr_addicon, $charset, $header_title);
	$ishtml = true;
	}
	else {
	continue;
	}
	}
	else if ($hkey == 'mail-followup-to') {
	$header_value = self::address_string($value, $attr_max, true, $attr_addicon, $charset, $header_title);
	$ishtml = true;
	}
	else if (in_array($hkey, ['from', 'to', 'cc', 'bcc'])) {
	$header_value = self::address_string($value, $attr_max, true, $attr_addicon, $charset, $header_title);
	$ishtml = true;
	}
	else if ($hkey == 'subject' && empty($value)) {
	$header_value = $rcmail->gettext('nosubject');
	}
	else {
	$value = is_array($value) ? implode(' ', $value) : $value;
	$header_value = trim(rcube_mime::decode_header($value, $charset));
	}

	if (empty($header_value)) {
	continue;
	}

	$output_headers[$hkey] = [
	'title' => $header_title,
	'value' => $header_value,
	'raw' => $value,
	'html' => $ishtml,
	];
	}

	$plugin = $rcmail->plugins->exec_hook('message_headers_output', [
	'output' => $output_headers,
	'headers' => $headers_obj,
	'exclude' => $exclude_headers, // readonly
	'folder' => self::$MESSAGE->folder, // readonly
	'uid' => self::$MESSAGE->uid, // readonly
	]);

	// single header value is requested
	if (!empty($attrib['valueof'])) {
	if (empty($plugin['output'][$attrib['valueof']])) {
	return '';
	}

	$row = $plugin['output'][$attrib['valueof']];
	return !empty($row['html']) ? $row['value'] : rcube::SQ($row['value']);
	}

	// compose html table
	$table = new html_table(['cols' => 2]);

	foreach ($plugin['output'] as $hkey => $row) {
	$val = $row['html'] ? $row['value'] : rcube::SQ($row['value']);

	$table->add(['class' => 'header-title'], rcube::SQ($row['title']));
	$table->add(['class' => 'header ' . $hkey], $val);
	}

	return $table->show($attrib);
	}

	/**
	* Returns element with "From\|To <sender\|recipient> on <date>"
	*/
	public static function message_summary($attrib)
	{
	if (!isset(self::$MESSAGE) \|\| empty(self::$MESSAGE->headers)) {
	return;
	}

	$rcmail = rcmail::get_instance();
	$header = self::$MESSAGE->context ? 'from' : self::message_list_smart_column_name();
	$label = 'shortheader' . $header;
	$date = $rcmail->format_date(self::$MESSAGE->headers->date, $rcmail->config->get('date_long', 'x'));
	$user = self::$MESSAGE->headers->$header;

	if (!$user && $header == 'to' && !empty(self::$MESSAGE->headers->cc)) {
	$user = self::$MESSAGE->headers->cc;
	}
	if (!$user && $header == 'to' && !empty(self::$MESSAGE->headers->bcc)) {
	$user = self::$MESSAGE->headers->bcc;
	}

	$vars[$header] = self::address_string($user, 1, true, $attrib['addicon'], self::$MESSAGE->headers->charset);
	$vars['date'] = html::span('text-nowrap', $date);

	if (empty($user)) {
	$label = 'shortheaderdate';
	}

	$out = html::span(null, $rcmail->gettext(['name' => $label, 'vars' => $vars]));

	return html::div($attrib, $out);
	}

	/**
	* Convert Priority header value into a localized string
	*/
	public static function localized_priority($value)
	{
	$labels_map = [
	'1' => 'highest',
	'2' => 'high',
	'3' => 'normal',
	'4' => 'low',
	'5' => 'lowest',
	];

	if ($value && !empty($labels_map[$value])) {
	return rcmail::get_instance()->gettext($labels_map[$value]);
	}

	return '';
	}

	/**
	* Returns block to show full message headers
	*/
	public static function message_full_headers($attrib)
	{
	$rcmail = rcmail::get_instance();

	$html = html::div(['id' => "all-headers", 'class' => "all", 'style' => 'display:none'],
	html::div(['id' => 'headers-source'], ''));

	$html .= html::div([
	'class' => "more-headers show-headers",
	'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('show-headers','',this)",
	'title' => $rcmail->gettext('togglefullheaders')
	], '');

	$rcmail->output->add_gui_object('all_headers_row', 'all-headers');
	$rcmail->output->add_gui_object('all_headers_box', 'headers-source');

	return html::div($attrib, $html);
	}

	/**
	* Handler for the 'messagebody' GUI object
	*
	* @param array $attrib Named parameters
	*
	* @return string HTML content showing the message body
	*/
	public static function message_body($attrib)
	{
	if (!is_array(self::$MESSAGE->parts) && empty(self::$MESSAGE->body)) {
	return '';
	}

	if (empty($attrib['id'])) {
	$attrib['id'] = 'rcmailMsgBody';
	}

	$rcmail = rcmail::get_instance();
	$safe_mode = self::$MESSAGE->is_safe \|\| !empty($_GET['_safe']);
	$out = '';
	$part_no = 0;

	$header_attrib = [];
	foreach ($attrib as $attr => $value) {
	if (preg_match('/^headertable([a-z]+)$/i', $attr, $regs)) {
	$header_attrib[$regs[1]] = $value;
	}
	}

	if (!empty(self::$MESSAGE->parts)) {
	foreach (self::$MESSAGE->parts as $part) {
	if ($part->type == 'headers') {
	$out .= html::div('message-partheaders', self::message_headers(count($header_attrib) ? $header_attrib : null, $part->headers));
	}
	else if ($part->type == 'content') {
	// unsupported (e.g. encrypted)
	if (!empty($part->realtype)) {
	if ($part->realtype == 'multipart/encrypted' \|\| $part->realtype == 'application/pkcs7-mime') {
	if (
	!empty($_SESSION['browser_caps']['pgpmime'])
	&& ($pgp_mime_part = self::$MESSAGE->get_multipart_encrypted_part())
	) {
	$out .= html::span('part-notice', $rcmail->gettext('externalmessagedecryption'));
	$rcmail->output->set_env('pgp_mime_part', $pgp_mime_part->mime_id);
	$rcmail->output->set_env('pgp_mime_container', '#' . $attrib['id']);
	$rcmail->output->add_label('loadingdata');
	}

	if (!self::$MESSAGE->encrypted_part) {
	$out .= html::span('part-notice', $rcmail->gettext('encryptedmessage'));
	}
	}
	continue;
	}
	else if (!$part->size) {
	continue;
	}
	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	else if (!rcube_utils::mem_check($part->size * 10)) {
	$out .= self::part_too_big_message(self::$MESSAGE, $part->mime_id);
	continue;
	}

	// fetch part body
	$body = self::$MESSAGE->get_part_body($part->mime_id, true);

	// message is cached but not exists (#1485443), or other error
	if ($body === false) {
	// Don't bail out if it is only one-of-many part of the message (#6854)
	if (strlen($out)) {
	$out .= html::span('part-notice', $rcmail->gettext('messageopenerror'));
	continue;
	}

	self::message_error();
	}

	$plugin = $rcmail->plugins->exec_hook('message_body_prefix',
	['part' => $part, 'prefix' => '', 'message' => self::$MESSAGE]);

	// Set attributes of the part container
	$container_class = $part->ctype_secondary == 'html' ? 'message-htmlpart' : 'message-part';
	$container_id = $container_class . (++$part_no);
	$container_attrib = ['class' => $container_class, 'id' => $container_id];

	$body_args = [
	'safe' => $safe_mode,
	'plain' => !$rcmail->config->get('prefer_html'),
	'css_prefix' => 'v' . $part_no,
	'body_class' => 'rcmBody',
	'container_id' => $container_id,
	'container_attrib' => $container_attrib,
	];

	// Parse the part content for display
	$body = self::print_body($body, $part, $body_args);

	// check if the message body is PGP encrypted
	if (strpos($body, '-----BEGIN PGP MESSAGE-----') !== false) {
	$rcmail->output->set_env('is_pgp_content', '#' . $container_id);
	}

	if ($part->ctype_secondary == 'html') {
	$body = self::html4inline($body, $body_args);
	}

	$out .= html::div($body_args['container_attrib'], $plugin['prefix'] . $body);
	}
	}
	}
	else {
	// 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(strlen(self::$MESSAGE->body) * 10)) {
	$out .= self::part_too_big_message(self::$MESSAGE, 0);
	}
	else {
	$plugin = $rcmail->plugins->exec_hook('message_body_prefix',
	['part' => self::$MESSAGE, 'prefix' => '']);

	$out .= html::div('message-part',
	$plugin['prefix'] . self::plain_body(self::$MESSAGE->body));
	}
	}

	// list images after mail body
	if ($rcmail->config->get('inline_images', true) && !empty(self::$MESSAGE->attachments)) {
	$thumbnail_size = $rcmail->config->get('image_thumbnail_size', 240);
	$show_label = rcube::Q($rcmail->gettext('showattachment'));
	$download_label = rcube::Q($rcmail->gettext('download'));

	foreach (self::$MESSAGE->attachments as $attach_prop) {
	// skip inline images
	if (!empty($attach_prop->content_id) && $attach_prop->disposition == 'inline') {
	continue;
	}

	// Content-Type: image/*...
	if ($mimetype = self::part_image_type($attach_prop)) {
	// display thumbnails
	if ($thumbnail_size) {
	$supported = in_array($mimetype, self::$CLIENT_MIMETYPES);
	$show_link_attr = [
	'href' => self::$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
	)
	];
	$download_link_attr = [
	'href' => $show_link_attr['href'] . '&_download=1',
	];
	$show_link = html::a($show_link_attr + ['class' => 'open'], $show_label);
	$download_link = html::a($download_link_attr + ['class' => 'download'], $download_label);

	$out .= html::p(['class' => 'image-attachment', 'style' => $supported ? '' : 'display:none'],
	html::a($show_link_attr + ['class' => 'image-link', 'style' => sprintf('width:%dpx', $thumbnail_size)],
	html::img([
	'class' => 'image-thumbnail',
	'src' => self::$MESSAGE->get_part_url($attach_prop->mime_id, 'image') . '&_thumb=1',
	'title' => $attach_prop->filename,
	'alt' => $attach_prop->filename,
	'style' => sprintf('max-width:%dpx; max-height:%dpx', $thumbnail_size, $thumbnail_size),
	'onload' => $supported ? '' : '$(this).parents(\'p.image-attachment\').show()',
	])
	) .
	html::span('image-filename', rcube::Q($attach_prop->filename)) .
	html::span('image-filesize', rcube::Q(self::message_part_size($attach_prop))) .
	html::span('attachment-links', ($supported ? $show_link . ' ' : '') . $download_link) .
	html::br(['style' => 'clear:both'])
	);
	}
	else {
	$out .= html::tag('fieldset', 'image-attachment',
	html::tag('legend', 'image-filename', rcube::Q($attach_prop->filename)) .
	html::p(['align' => 'center'],
	html::img([
	'src' => self::$MESSAGE->get_part_url($attach_prop->mime_id, 'image'),
	'title' => $attach_prop->filename,
	'alt' => $attach_prop->filename,
	])
	)
	);
	}
	}
	}
	}

	// tell client that there are blocked remote objects
	if (self::$REMOTE_OBJECTS && !$safe_mode) {
	$rcmail->output->set_env('blockedobjects', true);
	}

	$rcmail->output->add_gui_object('messagebody', $attrib['id']);

	return html::div($attrib, $out);
	}

	/**
	* Returns a HTML notice element for too big message parts
	*/
	public static function part_too_big_message($MESSAGE, $part_id)
	{
	$rcmail = rcmail::get_instance();
	$token = $rcmail->get_request_token();
	$url = $rcmail->url([
	'task' => 'mail',
	'action' => 'get',
	'download' => 1,
	'uid' => $MESSAGE->uid,
	'part' => $part_id,
	'mbox' => $MESSAGE->folder,
	'token' => $token,
	]);

	return html::span('part-notice', $rcmail->gettext('messagetoobig') . ' ' . html::a($url, $rcmail->gettext('download')));
	}

	/**
	* Handle disposition notification requests
	*/
	public static function mdn_request_handler($message)
	{
	$rcmail = rcmail::get_instance();
	-
	+rcube::console($message->headers->mdn_to);
	+
	+rcube::console($message->context === null,
	+ !empty($message->sender['mailto']),
	+ empty($message->headers->flags['MDNSENT']),
	+ empty($message->headers->flags['SEEN']),
	+ ($rcmail->storage->check_permflag('MDNSENT') \|\| $rcmail->storage->check_permflag('*')),
	+ $message->folder != $rcmail->config->get('drafts_mbox'),
	+ $message->folder != $rcmail->config->get('sent_mbox')
	+);
	if ($message->headers->mdn_to
	&& $message->context === null
	&& !empty($message->sender['mailto'])
	&& empty($message->headers->flags['MDNSENT'])
	&& empty($message->headers->flags['SEEN'])
	&& ($rcmail->storage->check_permflag('MDNSENT') \|\| $rcmail->storage->check_permflag('*'))
	&& $message->folder != $rcmail->config->get('drafts_mbox')
	&& $message->folder != $rcmail->config->get('sent_mbox')
	) {
	$mdn_cfg = intval($rcmail->config->get('mdn_requests'));
	$exists = $mdn_cfg == 1;
	-
	+rcube::console('>>>>>>>>>>>>');
	// Check sender existence in contacts
	// 3 and 4 = my contacts, 5 and 6 = trusted senders
	if ($mdn_cfg == 3 \|\| $mdn_cfg == 4 \|\| $mdn_cfg == 5 \|\| $mdn_cfg == 6) {
	$type = rcube_addressbook::TYPE_TRUSTED_SENDER;

	if ($mdn_cfg == 3 \|\| $mdn_cfg == 4) {
	$type \|= rcube_addressbook::TYPE_WRITEABLE \| rcube_addressbook::TYPE_RECIPIENT;
	}

	if ($rcmail->contact_exists($message->sender['mailto'], $type)) {
	$exists = 1;
	}
	}

	if ($exists) {
	// Send MDN
	if (rcmail_action_mail_sendmdn::send_mdn($message, $smtp_error)) {
	$rcmail->output->show_message('receiptsent', 'confirmation');
	}
	else if ($smtp_error && is_string($smtp_error)) {
	$rcmail->output->show_message($smtp_error, 'error');
	}
	else if ($smtp_error && !empty($smtp_error['label'])) {
	$rcmail->output->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
	}
	else {
	$rcmail->output->show_message('errorsendingreceipt', 'error');
	}
	}
	else if ($mdn_cfg != 2 && $mdn_cfg != 4 && $mdn_cfg != 6) {
	// Ask the user
	$rcmail->output->add_label('sendreceipt', 'mdnrequest', 'send', 'sendalwaysto', 'ignore');
	$rcmail->output->set_env('mdn_request_save', $mdn_cfg == 3 \|\| $mdn_cfg == 5 ? $mdn_cfg : 0);
	$rcmail->output->set_env('mdn_request_sender', $message->sender);
	$rcmail->output->set_env('mdn_request', true);
	}
	}
	}
	}
	diff --git a/program/include/rcmail_sendmail.php b/program/include/rcmail_sendmail.php
	index 11b412298..f8ef90672 100644
	--- a/program/include/rcmail_sendmail.php
	+++ b/program/include/rcmail_sendmail.php
	@@ -1,1707 +1,1706 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| \|
	\| Copyright (C) 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: \|
	\| Common code for generating and saving/sending mail message \|
	\| with support for common user interface elements \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	/**
	* Common code for generating and saving/sending mail message
	* with support for common user interface elements.
	*
	* @package Webmail
	*/
	class rcmail_sendmail
	{
	public $data = [];
	public $options = [];

	protected $parse_data = [];
	protected $message_form;
	protected $rcmail;

	// define constants for message compose mode
	const MODE_NONE = 'none';
	const MODE_REPLY = 'reply';
	const MODE_FORWARD = 'forward';
	const MODE_DRAFT = 'draft';
	const MODE_EDIT = 'edit';


	/**
	* Object constructor
	*
	* @param array $data Compose data
	* @param array $options Operation options:
	* savedraft (bool) - Enable save-draft mode
	* sendmail (bool) - Enable send-mail mode
	* saveonly (bool) - Enable save-only mode
	* message (object) - Message object to get some data from
	* error_handler (callback) - Error handler
	*/
	public function __construct($data = [], $options = [])
	{
	$this->rcmail = rcube::get_instance();
	$this->data = (array) $data;
	$this->options = (array) $options;

	$this->options['sendmail_delay'] = (int) $this->rcmail->config->get('sendmail_delay');

	if (empty($options['error_handler'])) {
	$this->options['error_handler'] = function() { return false; };
	}

	if (empty($this->data['mode'])) {
	$this->data['mode'] = self::MODE_NONE;
	}

	if (!empty($this->options['message'])) {
	$this->compose_init($this->options['message']);
	}
	}

	/**
	* Collect input data for message headers
	*
	* @return array Message headers
	*/
	public function headers_input()
	{
	if (!empty($this->options['sendmail']) && $this->options['sendmail_delay']) {
	$last_time = $this->rcmail->config->get('last_message_time');
	$wait_sec = time() - $this->options['sendmail_delay'] - intval($last_time);

	if ($wait_sec < 0) {
	return $this->options['error_handler']('senttooquickly', 'error', ['sec' => $wait_sec * -1]);
	}
	}

	// set default charset
	if (empty($this->options['charset'])) {
	$charset = rcube_utils::get_input_value('_charset', rcube_utils::INPUT_POST) ?: $this->rcmail->output->get_charset();
	$this->options['charset'] = $charset;
	}

	$charset = $this->options['charset'];

	$this->parse_data = [];

	$mailto = $this->email_input_format(rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST, true, $charset), true);
	$mailcc = $this->email_input_format(rcube_utils::get_input_value('_cc', rcube_utils::INPUT_POST, true, $charset), true);
	$mailbcc = $this->email_input_format(rcube_utils::get_input_value('_bcc', rcube_utils::INPUT_POST, true, $charset), true);

	if (!empty($this->parse_data['INVALID_EMAIL']) && empty($this->options['savedraft'])) {
	return $this->options['error_handler']('emailformaterror', 'error', ['email' => $this->parse_data['INVALID_EMAIL']]);
	}

	if (($max_recipients = (int) $this->rcmail->config->get('max_recipients')) > 0) {
	if ($this->parse_data['RECIPIENT_COUNT'] > $max_recipients) {
	return $this->options['error_handler']('toomanyrecipients', 'error', ['max' => $max_recipients]);
	}
	}

	if (empty($mailto) && !empty($mailcc)) {
	$mailto = $mailcc;
	$mailcc = null;
	}
	else if (empty($mailto)) {
	$mailto = 'undisclosed-recipients:;';
	}

	$dont_override = (array) $this->rcmail->config->get('dont_override');
	$mdn_enabled = in_array('mdn_default', $dont_override) ? $this->rcmail->config->get('mdn_default') : !empty($_POST['_mdn']);
	$dsn_enabled = in_array('dsn_default', $dont_override) ? $this->rcmail->config->get('dsn_default') : !empty($_POST['_dsn']);
	$subject = rcube_utils::get_input_value('_subject', rcube_utils::INPUT_POST, true, $charset);
	$from = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST, true, $charset);
	$replyto = rcube_utils::get_input_value('_replyto', rcube_utils::INPUT_POST, true, $charset);
	$followupto = rcube_utils::get_input_value('_followupto', rcube_utils::INPUT_POST, true, $charset);
	$from_string = '';

	// Get sender name and address from identity...
	if (is_numeric($from)) {
	if (is_array($identity_arr = $this->get_identity($from))) {
	if ($identity_arr['mailto']) {
	$from = $identity_arr['mailto'];
	}
	if ($identity_arr['string']) {
	$from_string = $identity_arr['string'];
	}
	}
	else {
	$from = null;
	}
	}
	// ... if there is no identity record, this might be a custom from
	else if (($from_string = $this->email_input_format($from))
	&& preg_match('/(\S+@\S+)/', $from_string, $m)
	) {
	$from = trim($m[1], '<>');
	}
	// ... otherwise it's empty or invalid
	else {
	$from = null;
	}

	// check 'From' address (identity may be incomplete)
	if (empty($this->options['savedraft']) && empty($this->options['saveonly']) && empty($from)) {
	return $this->options['error_handler']('nofromaddress', 'error');
	}

	if (!$from_string && $from) {
	$from_string = $from;
	}

	$from_string = rcube_charset::convert($from_string, RCUBE_CHARSET, $charset);

	if (!empty($this->data['param']['message-id'])) {
	$message_id = $this->data['param']['message-id'];
	}
	else {
	$message_id = $this->rcmail->gen_message_id($from);
	}

	$this->options['dsn_enabled'] = $dsn_enabled;
	$this->options['from'] = $from;
	$this->options['mailto'] = $mailto;

	// compose headers array
	$headers = [
	'Received' => $this->header_received(),
	'Date' => $this->rcmail->user_date(),
	'From' => $from_string,
	'To' => $mailto,
	'Cc' => $mailcc,
	'Bcc' => $mailbcc,
	'Subject' => trim($subject),
	'Reply-To' => $this->email_input_format($replyto),
	'Mail-Reply-To' => $this->email_input_format($replyto),
	'Mail-Followup-To' => $this->email_input_format($followupto),
	'In-Reply-To' => isset($this->data['reply_msgid']) ? $this->data['reply_msgid'] : null,
	'References' => isset($this->data['references']) ? $this->data['references'] : null,
	'User-Agent' => $this->rcmail->config->get('useragent'),
	'Message-ID' => $message_id,
	'X-Sender' => $from,
	];

	if (!empty($identity_arr['organization'])) {
	$headers['Organization'] = $identity_arr['organization'];
	}

	if ($mdn_enabled) {
	- $headers['Return-Receipt-To'] = $from_string;
	$headers['Disposition-Notification-To'] = $from_string;
	}

	if (!empty($_POST['_priority'])) {
	$priority = intval($_POST['_priority']);
	$a_priorities = [1 => 'highest', 2 => 'high', 4 => 'low', 5 => 'lowest'];

	if (!empty($a_priorities[$priority])) {
	$headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($a_priorities[$priority]));
	}
	}

	// remember reply/forward UIDs in special headers
	if (!empty($this->options['savedraft'])) {
	// Note: We ignore <UID>.<PART> forwards/replies here
	if (
	!empty($this->data['reply_uid'])
	&& ($uid = $this->data['reply_uid'])
	&& !preg_match('/^\d+\.[0-9.]+$/', $uid)
	) {
	$headers['X-Draft-Info'] = $this->draftinfo_encode([
	'type' => 'reply',
	'uid' => $uid,
	'folder' => $this->data['mailbox']
	]);
	}
	else if (
	!empty($this->data['forward_uid'])
	&& ($uid = rcube_imap_generic::compressMessageSet($this->data['forward_uid']))
	&& !preg_match('/^\d+[0-9.]+$/', $uid)
	) {
	$headers['X-Draft-Info'] = $this->draftinfo_encode([
	'type' => 'forward',
	'uid' => $uid,
	'folder' => $this->data['mailbox']
	]);
	}
	}

	return array_filter($headers);
	}

	/**
	* Set charset and transfer encoding on the message
	*
	* @param Mail_mime $message Message object
	* @param bool $flowed Enable format=flowed
	*/
	public function set_message_encoding($message, $flowed = false)
	{
	$text_charset = $this->options['charset'];
	$transfer_encoding = '7bit';
	$head_encoding = 'quoted-printable';

	// choose encodings for plain/text body and message headers
	if (preg_match('/ISO-2022/i', $text_charset)) {
	$head_encoding = 'base64'; // RFC1468
	}
	else if (preg_match('/[^\x00-\x7F]/', $message->getTXTBody())) {
	$transfer_encoding = $this->rcmail->config->get('force_7bit') ? 'quoted-printable' : '8bit';
	}
	else if ($this->options['charset'] == 'UTF-8') {
	$text_charset = 'US-ASCII';
	}

	if ($flowed) {
	$text_charset .= ";\r\n format=flowed";
	}

	// encoding settings for mail composing
	$message->setParam('text_encoding', $transfer_encoding);
	$message->setParam('html_encoding', 'quoted-printable');
	$message->setParam('head_encoding', $head_encoding);
	$message->setParam('head_charset', $this->options['charset']);
	$message->setParam('html_charset', $this->options['charset']);
	$message->setParam('text_charset', $text_charset);
	}

	/**
	* Create a message to be saved/sent
	*
	* @param array $headers Message headers
	* @param string $body Message body
	* @param bool $isHtml The body is HTML or not
	* @param array $attachments Optional message attachments array
	*
	* @return Mail_mime Message object
	*/
	public function create_message($headers, $body, $isHtml = false, $attachments = [])
	{
	$charset = $this->options['charset'];
	$flowed = !empty($this->options['savedraft']) \|\| $this->rcmail->config->get('send_format_flowed', true);

	// create PEAR::Mail_mime instance
	$MAIL_MIME = new Mail_mime("\r\n");

	// Check if we have enough memory to handle the message in it
	// It's faster than using files, so we'll do this if we only can
	if (is_array($attachments)) {
	$memory = 0;
	foreach ($attachments as $attachment) {
	$memory += $attachment['size'];
	}

	// Yeah, Net_SMTP needs up to 12x more memory, 1.33 is for base64
	if (!rcube_utils::mem_check($memory * 1.33 * 12)) {
	$MAIL_MIME->setParam('delay_file_io', true);
	}
	}

	$plugin = $this->rcmail->plugins->exec_hook('message_outgoing_body', [
	'body' => $body,
	'type' => $isHtml ? 'html' : 'plain',
	'message' => $MAIL_MIME
	]);

	// For HTML-formatted messages, construct the MIME message with both
	// the HTML part and the plain-text part
	if ($isHtml) {
	$MAIL_MIME->setHTMLBody($plugin['body']);

	$plain_body = $this->rcmail->html2text($plugin['body'], ['width' => 0, 'charset' => $charset]);
	$plain_body = $this->format_plain_body($plain_body, $flowed);

	// There's no sense to use multipart/alternative if the text/plain
	// part would be blank. Completely blank text/plain part may confuse
	// some mail clients (#5283)
	if (strlen(trim($plain_body)) > 0) {
	$plugin = $this->rcmail->plugins->exec_hook('message_outgoing_body', [
	'body' => $plain_body,
	'type' => 'alternative',
	'message' => $MAIL_MIME
	]);

	// add a plain text version of the e-mail as an alternative part.
	$MAIL_MIME->setTXTBody($plugin['body']);
	}

	// Extract image Data URIs into message attachments (#1488502)
	$this->extract_inline_images($MAIL_MIME, $this->options['from']);
	}
	else {
	$body = $this->format_plain_body($plugin['body'], $flowed);

	$MAIL_MIME->setTXTBody($body, false, true);
	}

	// encoding settings for mail composing
	$this->set_message_encoding($MAIL_MIME, $flowed);

	// pass headers to message object
	$MAIL_MIME->headers($headers);

	return $MAIL_MIME;
	}

	/**
	* Prepare plain text content for the message (format=flowed and wrapping)
	*
	* @param string $body Plain text message body
	* @param bool $flowed Enable format=flowed formatting
	*
	* @return string Formatted content
	*/
	protected function format_plain_body($body, $flowed = false)
	{
	// set line length for body wrapping
	$line_length = $this->rcmail->config->get('line_length', 72);
	$charset = $this->options['charset'];

	if ($flowed) {
	$body = rcube_mime::format_flowed($body, min($line_length + 2, 79), $charset);
	}
	else {
	$body = rcube_mime::wordwrap($body, $line_length, "\r\n", false, $charset);
	}

	$body = wordwrap($body, 998, "\r\n", true);

	// make sure all line endings are CRLF (#1486712)
	$body = preg_replace('/\r?\n/', "\r\n", $body);

	return $body;
	}

	/**
	* Message delivery, and setting Replied/Forwarded flag on success
	*
	* @param Mail_mime $message Message object
	* @param bool $disconnect Close SMTP connection after delivery
	*
	* @return bool True on success, False on failure
	*/
	public function deliver_message($message, $disconnect = true)
	{
	// Handle Delivery Status Notification request
	$smtp_opts = ['dsn' => $this->options['dsn_enabled']];
	$smtp_error = null;
	$mailbody_file = null;

	$sent = $this->rcmail->deliver_message($message,
	$this->options['from'],
	$this->options['mailto'],
	$smtp_error, $mailbody_file, $smtp_opts, $disconnect
	);

	// return to compose page if sending failed
	if (!$sent) {
	// remove temp file
	if ($mailbody_file) {
	unlink($mailbody_file);
	}

	if ($smtp_error && is_string($smtp_error)) {
	$this->options['error_handler']($smtp_error, 'error');
	}
	else if ($smtp_error && !empty($smtp_error['label'])) {
	$this->options['error_handler']($smtp_error['label'], 'error', $smtp_error['vars']);
	}
	else {
	$this->options['error_handler']('sendingfailed', 'error');
	}

	return false;
	}

	$message->mailbody_file = $mailbody_file;

	// save message sent time
	if ($this->options['sendmail_delay']) {
	$this->rcmail->user->save_prefs(['last_message_time' => time()]);
	}

	// Collect recipients' addresses
	$this->collect_recipients($message);

	// set replied/forwarded flag
	if (!empty($this->data['reply_uid'])) {
	foreach (rcmail::get_uids($this->data['reply_uid'], $this->data['mailbox']) as $mbox => $uids) {
	// skip <UID>.<PART> replies
	if (!preg_match('/^\d+\.[0-9.]+$/', implode(',', (array) $uids))) {
	$this->rcmail->storage->set_flag($uids, 'ANSWERED', $mbox);
	}
	}
	}
	else if (!empty($this->data['forward_uid'])) {
	foreach (rcmail::get_uids($this->data['forward_uid'], $this->data['mailbox']) as $mbox => $uids) {
	// skip <UID>.<PART> forwards
	if (!preg_match('/^\d+\.[0-9.]+$/', implode(',', (array) $uids))) {
	$this->rcmail->storage->set_flag($uids, 'FORWARDED', $mbox);
	}
	}
	}

	return true;
	}

	/**
	* Save the message into Drafts folder (in savedraft mode)
	* or in Sent mailbox if specified/configured
	*
	* @param Mail_mime $message Message object
	*
	* @return mixed Operation status
	*/
	public function save_message($message)
	{
	$store_folder = false;
	$store_target = null;
	$saved = false;

	// Determine which folder to save message
	if (!empty($this->options['savedraft'])) {
	$store_target = $this->rcmail->config->get('drafts_mbox');
	}
	else if (!$this->rcmail->config->get('no_save_sent_messages')) {
	if (isset($_POST['_store_target'])) {
	$store_target = rcube_utils::get_input_value('_store_target', rcube_utils::INPUT_POST, true);
	}
	else {
	$store_target = $this->rcmail->config->get('sent_mbox');
	}
	}

	if ($store_target) {
	$storage = $this->rcmail->get_storage();

	// check if folder is subscribed
	if ($storage->folder_exists($store_target, true)) {
	$store_folder = true;
	}
	// folder may be existing but not subscribed (#1485241)
	else if (!$storage->folder_exists($store_target)) {
	$store_folder = $storage->create_folder($store_target, true);
	}
	else if ($storage->subscribe($store_target)) {
	$store_folder = true;
	}

	// append message to sent box
	if ($store_folder) {
	// message body in file
	if (!empty($message->mailbody_file) \|\| $message->getParam('delay_file_io')) {
	$headers = $message->txtHeaders();

	// file already created
	if (!empty($message->mailbody_file)) {
	$msg = $message->mailbody_file;
	}
	else {
	$message->mailbody_file = rcube_utils::temp_filename('msg');
	$msg = $message->saveMessageBody($message->mailbody_file);

	if (!is_a($msg, 'PEAR_Error')) {
	$msg = $message->mailbody_file;
	}
	}
	}
	else {
	$msg = $message->getMessage();
	$headers = '';
	}

	if (is_a($msg, 'PEAR_Error')) {
	rcube::raise_error([
	'code' => 650, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not create message: ".$msg->getMessage()],
	true, false);
	}
	else {
	$is_file = !empty($message->mailbody_file);
	$saved = $storage->save_message($store_target, $msg, $headers, $is_file, ['SEEN']);
	}
	}

	// raise error if saving failed
	if (!$saved) {
	rcube::raise_error(['code' => 800, 'type' => 'imap',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not save message in $store_target"], true, false);
	}
	}

	if (!empty($message->mailbody_file)) {
	unlink($message->mailbody_file);
	unset($message->mailbody_file);
	}

	$this->options['store_target'] = $store_target;
	$this->options['store_folder'] = $store_folder;

	return $saved;
	}

	/**
	* If enabled, returns Received header content to be prepended
	* to message headers
	*
	* @return string\|null Received header content
	*/
	public function header_received()
	{
	if ($this->rcmail->config->get('http_received_header')) {
	$nldlm = "\r\n\t";
	$http_header = 'from ';

	// FROM/VIA
	if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
	$hosts = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR'], 2);
	$http_header .= $this->received_host($hosts[0]) . $nldlm . ' via ';
	}

	$http_header .= $this->received_host($_SERVER['REMOTE_ADDR']);

	// BY
	$http_header .= $nldlm . 'by ' . rcube_utils::server_name('HTTP_HOST');

	// WITH
	$http_header .= $nldlm . 'with HTTP (' . $_SERVER['SERVER_PROTOCOL']
	. ' ' . $_SERVER['REQUEST_METHOD'] . '); ' . date('r');

	return wordwrap($http_header, 69, $nldlm);
	}
	}

	/**
	* Converts host address into host spec. for Received header
	*/
	protected function received_host($host)
	{
	$hostname = gethostbyaddr($host);
	$result = $this->encrypt_host($hostname);

	if ($host != $hostname) {
	$result .= ' (' . $this->encrypt_host($host) . ')';
	}

	return $result;
	}

	/**
	* Encrypt host IP or hostname for Received header
	*/
	protected function encrypt_host($host)
	{
	if ($this->rcmail->config->get('http_received_header_encrypt')) {
	return $this->rcmail->encrypt($host);
	}

	if (!preg_match('/[^0-9:.]/', $host)) {
	return "[$host]";
	}

	return $host;
	}

	/**
	* Returns user identity record
	*
	* @param int $id Identity ID
	*
	* @return array\|false User identity data, False if there's no such identity
	*/
	public function get_identity($id)
	{
	if ($sql_arr = $this->rcmail->user->get_identity($id)) {
	$out = $sql_arr;

	if (!empty($this->options['charset']) && $this->options['charset'] != RCUBE_CHARSET) {
	foreach ($out as $k => $v) {
	$out[$k] = rcube_charset::convert($v, RCUBE_CHARSET, $this->options['charset']);
	}
	}

	$out['mailto'] = $sql_arr['email'];
	$out['string'] = format_email_recipient($sql_arr['email'], $sql_arr['name']);

	return $out;
	}

	return false;
	}

	/**
	* Extract image attachments from HTML message (data URIs)
	*
	* @param Mail_mime $message Message object
	* @param string $from Sender email address
	*/
	public static function extract_inline_images($message, $from)
	{
	$body = $message->getHTMLBody();
	$offset = 0;
	$list = [];
	$domain = 'localhost';
	$regexp = '#img[^>]+src=[\'"](data:([^;]*);base64,([a-z0-9+/=\r\n]+))([\'"])#i';

	if (preg_match_all($regexp, $body, $matches, PREG_OFFSET_CAPTURE)) {
	// get domain for the Content-ID, must be the same as in Mail_Mime::get()
	if (preg_match('#@([0-9a-zA-Z\-\.]+)#', $from, $m)) {
	$domain = $m[1];
	}

	foreach ($matches[1] as $idx => $m) {
	$data = preg_replace('/\r\n/', '', $matches[3][$idx][0]);
	$data = base64_decode($data);

	if (empty($data)) {
	continue;
	}

	$hash = md5($data) . '@' . $domain;
	$mime_type = $matches[2][$idx][0];
	$name = $list[$hash];

	if (empty($mime_type)) {
	$mime_type = rcube_mime::image_content_type($data);
	}

	// add the image to the MIME message
	if (!$name) {
	$ext = preg_replace('#^[^/]+/#', '', $mime_type);
	$name = substr($hash, 0, 8) . '.' . $ext;
	$list[$hash] = $name;

	$message->addHTMLImage($data, $mime_type, $name, false, $hash);
	}

	$body = substr_replace($body, $name, $m[1] + $offset, strlen($m[0]));
	$offset += strlen($name) - strlen($m[0]);
	}
	}

	$message->setHTMLBody($body);
	}

	/**
	* Parse and cleanup email address input (and count addresses)
	*
	* @param string $mailto Address input
	* @param bool $count Do count recipients (count saved in $this->parse_data['RECIPIENT_COUNT'])
	* @param bool $check Validate addresses (errors saved in $this->parse_data['INVALID_EMAIL'])
	*
	* @return string Canonical recipients string (comma separated)
	*/
	public function email_input_format($mailto, $count = false, $check = true)
	{
	if (!isset($this->parse_data['RECIPIENT_COUNT'])) {
	$this->parse_data['RECIPIENT_COUNT'] = 0;
	}

	if (empty($mailto)) {
	return '';
	}

	// convert to UTF-8 to preserve \x2c(,) and \x3b(;) used in ISO-2022-JP;
	$charset = $this->options['charset'];
	if ($charset != RCUBE_CHARSET) {
	$mailto = rcube_charset::convert($mailto, $charset, RCUBE_CHARSET);
	}
	if (preg_match('/ISO-2022/i', $charset)) {
	$use_base64 = true;
	}

	// simplified email regexp, supporting quoted local part
	$email_regexp = '(\S+\|("[^"]+"))@\S+';

	$delim = ',;';
	$regexp = ["/[$delim]\s[\r\n]+/", '/[\r\n]+/', "/[$delim]\s\$/m", '/;/', '/(\S{1})(<'.$email_regexp.'>)/U'];
	$replace = [', ', ', ', '', ',', '\\1 \\2'];

	// replace new lines and strip ending ', ', make address input more valid
	$mailto = trim(preg_replace($regexp, $replace, $mailto));
	$items = rcube_utils::explode_quoted_string("[$delim]", $mailto);
	$result = [];

	foreach ($items as $item) {
	$item = trim($item);
	// address in brackets without name (do nothing)
	if (preg_match('/^<'.$email_regexp.'>$/', $item)) {
	$item = rcube_utils::idn_to_ascii(trim($item, '<>'));
	$result[] = $item;
	}
	// address without brackets and without name (add brackets)
	else if (preg_match('/^'.$email_regexp.'$/', $item)) {
	// Remove trailing non-letter characters (#7899)
	$item = preg_replace('/[^a-zA-Z]$/', '', $item);
	$item = rcube_utils::idn_to_ascii($item);
	$result[] = $item;
	}
	// address with name (handle name)
	else if (preg_match('/<'.$email_regexp.'>$/', $item, $matches)) {
	$address = $matches[0];
	$name = trim(str_replace($address, '', $item));
	if ($name[0] == '"' && $name[strlen($name)-1] == '"') {
	$name = substr($name, 1, -1);
	}

	// encode "name" field
	if (!empty($use_base64)) {
	$name = rcube_charset::convert($name, RCUBE_CHARSET, $charset);
	$name = Mail_mimePart::encodeMB($name, $charset, 'base64');
	}
	else {
	$name = stripcslashes($name);
	}

	$address = rcube_utils::idn_to_ascii(trim($address, '<>'));
	$result[] = format_email_recipient($address, $name);
	$item = $address;
	}

	// check address format
	$item = trim($item, '<>');
	if ($item && $check && !rcube_utils::check_email($item)) {
	$this->parse_data['INVALID_EMAIL'] = $item;
	return;
	}
	}

	if ($count) {
	$this->parse_data['RECIPIENT_COUNT'] += count($result);
	}

	return implode(', ', $result);
	}

	/**
	* Returns configured generic message footer
	*
	* @param bool $isHtml Return HTML or Plain text version of the footer?
	*
	* @return string\|null Footer content
	*/
	public function generic_message_footer($isHtml)
	{
	if ($isHtml && ($file = $this->rcmail->config->get('generic_message_footer_html'))) {
	$html_footer = true;
	}
	else {
	$file = $this->rcmail->config->get('generic_message_footer');
	$html_footer = false;
	}

	if ($file && realpath($file)) {
	// sanity check
	if (!preg_match('/\.(php\|ini\|conf)$/', $file) && strpos($file, '/etc/') === false) {
	$footer = file_get_contents($file);
	if ($isHtml && !$html_footer) {
	$t2h = new rcube_text2html($footer, false);
	$footer = $t2h->get_html();
	}

	if (!empty($this->options['charset']) && $this->options['charset'] != RCUBE_CHARSET) {
	$footer = rcube_charset::convert($footer, RCUBE_CHARSET, $this->options['charset']);
	}

	return $footer;
	}
	}
	}

	/**
	* Encode data array into a string for use in X-Draft-Info header
	*
	* @param array $data Data array
	*
	* @return string Decoded data as a string
	*/
	public static function draftinfo_encode($data)
	{
	$parts = [];

	foreach ($data as $key => $val) {
	$encode = $key == 'folder' \|\| strpos($val, ';') !== false;
	$parts[] = $key . '=' . ($encode ? 'B::' . base64_encode($val) : $val);
	}

	return implode('; ', $parts);
	}

	/**
	* Decode X-Draft-Info header value into an array
	*
	* @param string $str Encoded data string (see self::draftinfo_encode())
	*
	* @return array Decoded data
	*/
	public static function draftinfo_decode($str)
	{
	$info = [];

	foreach (preg_split('/;\s+/', $str) as $part) {
	list($key, $val) = explode('=', $part, 2);
	if (strpos($val, 'B::') === 0) {
	$val = base64_decode(substr($val, 3));
	}
	else if ($key == 'folder') {
	$val = base64_decode($val);
	}

	$info[$key] = $val;
	}

	return $info;
	}

	/**
	* Header (From, To, Cc, etc.) input object for templates
	*/
	public function headers_output($attrib)
	{
	list($form_start,) = $this->form_tags($attrib);

	$out = '';
	$part = strtolower($attrib['part']);
	$fname = null;
	$field_type = null;
	$allow_attrib = [];
	$param = $part;

	switch ($part) {
	case 'from':
	return $form_start . $this->compose_header_from($attrib);

	case 'to':
	case 'cc':
	case 'bcc':
	$fname = '_' . $part;

	$allow_attrib = ['id', 'class', 'style', 'cols', 'rows', 'tabindex'];
	$field_type = 'html_textarea';
	break;

	case 'replyto':
	case 'reply-to':
	$fname = '_replyto';
	$param = 'replyto';

	case 'followupto':
	case 'followup-to':
	if (!$fname) {
	$fname = '_followupto';
	$param = 'followupto';
	}

	$allow_attrib = ['id', 'class', 'style', 'size', 'tabindex'];
	$field_type = 'html_inputfield';
	break;
	}

	if ($fname && $field_type) {
	// pass the following attributes to the form class
	$field_attrib = ['name' => $fname, 'spellcheck' => 'false'];
	foreach ($attrib as $attr => $value) {
	if (stripos($attr, 'data-') === 0 \|\| in_array($attr, $allow_attrib)) {
	$field_attrib[$attr] = $value;
	}
	}

	$mode = isset($this->data['mode']) ? $this->data['mode'] : null;

	// create textarea object
	$input = new $field_type($field_attrib);
	$out = $input->show($this->compose_header_value($param, $mode));
	}

	if ($form_start) {
	$out = $form_start . $out;
	}

	// configure autocompletion
	rcmail_action::autocomplete_init();

	return $out;
	}

	/**
	* Returns From header input element
	*/
	protected function compose_header_from($attrib)
	{
	// pass the following attributes to the form class
	$field_attrib = ['name' => '_from'];
	foreach ($attrib as $attr => $value) {
	if (in_array($attr, ['id', 'class', 'style', 'size', 'tabindex'])) {
	$field_attrib[$attr] = $value;
	}
	}

	if (!empty($this->options['message']->identities)) {
	$a_signatures = [];
	$identities = [];
	$top_posting = intval($this->rcmail->config->get('reply_mode')) > 0
	&& !$this->rcmail->config->get('sig_below')
	&& ($this->data['mode'] == self::MODE_REPLY \|\| $this->data['mode'] == self::MODE_FORWARD);

	$separator = $top_posting ? '---' : '-- ';
	$add_separator = (bool) $this->rcmail->config->get('sig_separator');

	$field_attrib['onchange'] = rcmail_output::JS_OBJECT_NAME . ".change_identity(this)";
	$select_from = new html_select($field_attrib);

	// create SELECT element
	foreach ($this->options['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($this->data['param']['nosig'])) {
	$text = $html = $sql_arr['signature'];

	if ($sql_arr['html_signature']) {
	$text = $this->rcmail->html2text($html, ['links' => false]);
	$text = trim($text, "\r\n");
	}
	else {
	$t2h = new rcube_text2html($text, false);
	$html = $t2h->get_html();
	}

	if ($add_separator && !preg_match('/^--[ -]\r?\n/m', $text)) {
	$text = $separator . "\n" . ltrim($text, "\r\n");
	$html = $separator . "<br>" . $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'];
	}

	$identities[$identity_id]['email'] = $sql_arr['email'];
	}

	$out = $select_from->show($this->options['message']->compose['from']);

	// add signatures to client
	$this->rcmail->output->set_env('signatures', $a_signatures);
	$this->rcmail->output->set_env('identities', $identities);
	}
	// no identities, display text input field
	else {
	$from = isset($this->options['message']->compose['from']) ? $this->options['message']->compose['from'] : null;
	$field_attrib['class'] = 'from_address';
	$input_from = new html_inputfield($field_attrib);
	$out = $input_from->show($from);
	}

	return $out;
	}

	/**
	* Set the value of specified header depending on compose mode
	*/
	protected function compose_header_value($header, $mode)
	{
	$fvalue = '';
	$decode_header = true;
	$message = $this->options['message'];
	$charset = !empty($message->headers) ? $message->headers->charset : RCUBE_CHARSET;
	$separator = ', ';

	// we have a set of recipients stored is session
	if (
	$header == 'to'
	&& !empty($this->data['param']['mailto'])
	&& ($mailto_id = $this->data['param']['mailto'])
	&& !empty($_SESSION['mailto'][$mailto_id])
	) {
	$fvalue = urldecode($_SESSION['mailto'][$mailto_id]);
	$decode_header = false;
	$charset = $this->rcmail->output->charset;

	// make session to not grow up too much
	$this->rcmail->session->remove("mailto.$mailto_id");
	}
	else if (!empty($_POST['_' . $header])) {
	$fvalue = rcube_utils::get_input_value('_' . $header, rcube_utils::INPUT_POST, true);
	$charset = $this->rcmail->output->charset;
	}
	else if (!empty($this->data['param'][$header])) {
	$fvalue = $this->data['param'][$header];
	$charset = $this->rcmail->output->charset;
	}
	else if ($mode == self::MODE_REPLY) {
	// get recipient address(es) out of the message headers
	if ($header == 'to') {
	$mailfollowup = isset($message->headers->others['mail-followup-to']) ? $message->headers->others['mail-followup-to'] : [];
	$mailreplyto = isset($message->headers->others['mail-reply-to']) ? $message->headers->others['mail-reply-to'] : [];
	$reply_all = isset($message->reply_all) ? $message->reply_all : null;

	// Reply to mailing list...
	if ($reply_all == 'list' && $mailfollowup) {
	$fvalue = $mailfollowup;
	}
	else if ($reply_all == 'list'
	&& preg_match('/<mailto:([^>]+)>/i', $message->headers->others['list-post'], $m)
	) {
	$fvalue = $m[1];
	}
	// Reply to...
	else if ($reply_all && $mailfollowup) {
	$fvalue = $mailfollowup;
	}
	else if ($mailreplyto) {
	$fvalue = $mailreplyto;
	}
	else if (!empty($message->headers->replyto)) {
	$fvalue = $message->headers->replyto;
	$replyto = true;
	}
	else if (!empty($message->headers->from)) {
	$fvalue = $message->headers->from;
	}

	// Reply to message sent by yourself (#1487074, #1489230, #1490439)
	// Reply-To address need to be unset (#1490233)
	if (!empty($message->compose['ident']) && empty($replyto)) {
	foreach ([$fvalue, $message->get_header('from')] as $sender) {
	$senders = rcube_mime::decode_address_list($sender, null, false, $charset, true);

	if (in_array($message->compose['ident']['email_ascii'], $senders)) {
	$fvalue = $message->headers->to;
	break;
	}
	}
	}
	}
	// 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;
	}

	// Deliberately ignore 'Sender' header (#6506)

	// When To: and Reply-To: are the same we add From: address to the list (#1489037)
	if ($v = $message->headers->from) {
	$to = $message->headers->to;
	$replyto = $message->headers->replyto;
	$from = rcube_mime::decode_address_list($v, null, false, $charset, true);
	$to = rcube_mime::decode_address_list($to, null, false, $charset, true);
	$replyto = rcube_mime::decode_address_list($replyto, null, false, $charset, true);

	if (!empty($replyto) && !count(array_diff($to, $replyto)) && count(array_diff($from, $to))) {
	$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
	}
	}
	}
	}
	else if (in_array($mode, [self::MODE_DRAFT, self::MODE_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, ['to', 'cc', 'bcc'])) {
	$from_email = @mb_strtolower($message->compose['ident']['email']);
	$to_addresses = rcube_mime::decode_address_list($fvalue, null, $decode_header, $charset);
	$fvalue = [];

	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' \|\| $mode != self::MODE_REPLY \|\| $mailto_lc != $from_email)
	&& (empty($message->recipients) \|\| !in_array($mailto_lc, (array) $message->recipients))
	) {
	if ($addr_part['name'] && $mailto != $addr_part['name']) {
	$mailto = format_email_recipient($mailto, $addr_part['name']);
	}

	$fvalue[] = $mailto;
	$message->recipients[] = $mailto_lc;
	}
	}

	$fvalue = implode($separator, $fvalue);
	}

	return $fvalue;
	}

	/**
	* Creates reply subject by removing common subject
	* prefixes/suffixes from the original message subject
	*
	* @param string $subject Subject string
	*
	* @return string Modified subject string
	*/
	public static function reply_subject($subject)
	{
	$subject = trim($subject);

	// Add config options for subject prefixes (#7929)
	$subject = rcube_utils::remove_subject_prefix($subject, 'reply');
	$subject = rcmail::get_instance()->config->get('response_prefix', 'Re:') . ' ' . $subject;

	return trim($subject);
	}

	/**
	* Subject input object for templates
	*
	* @param array $attrib Object attributes
	*
	* @return string HTML content
	*/
	public function compose_subject($attrib)
	{
	list($form_start, $form_end) = $this->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($this->data['param']['subject'])) {
	$subject = $this->data['param']['subject'];
	}
	// create a reply-subject
	else if ($this->data['mode'] == self::MODE_REPLY) {
	$subject = self::reply_subject($this->options['message']->subject);
	}
	// create a forward-subject
	else if ($this->data['mode'] == self::MODE_FORWARD) {
	// Add config options for subject prefixes (#7929)
	$subject = rcube_utils::remove_subject_prefix($this->options['message']->subject, 'forward');
	$subject = trim($this->rcmail->config->get('forward_prefix', 'Fwd:') . ' ' . $subject);
	}
	// create a draft-subject
	else if ($this->data['mode'] == self::MODE_DRAFT \|\| $this->data['mode'] == self::MODE_EDIT) {
	$subject = $this->options['message']->subject;
	}

	$out = $form_start ? "$form_start\n" : '';
	$out .= $textfield->show($subject);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}

	/**
	* Returns compose form tag (if not used already)
	*
	* @param array $attrib Form attributes
	*/
	public function form_tags($attrib)
	{
	if (isset($attrib['noform']) && rcube_utils::get_boolean((string) $attrib['noform'])) {
	return ['', ''];
	}

	$form_start = '';
	if (!$this->message_form) {
	$hiddenfields = new html_hiddenfield(['name' => '_task', 'value' => $this->rcmail->task]);
	$hiddenfields->add(['name' => '_action', 'value' => 'send']);
	$hiddenfields->add(['name' => '_id', 'value' => isset($this->data['id']) ? $this->data['id'] : '']);
	$hiddenfields->add(['name' => '_attachments']);

	if (empty($attrib['form'])) {
	$form_attr = [
	'name' => 'form',
	'method' => 'post',
	'class' => !empty($attrib['class']) ? $attrib['class'] : '',
	];
	$form_start = $this->rcmail->output->form_tag($form_attr);
	}

	$form_start .= $hiddenfields->show();
	}

	$form_end = ($this->message_form && empty($attrib['form'])) ? '</form>' : '';
	$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';

	if (!$this->message_form) {
	$this->rcmail->output->add_gui_object('messageform', $form_name);
	}

	$this->message_form = $form_name;

	return [$form_start, $form_end];
	}

	/**
	* Returns compose form "head"
	*/
	public function form_head($attrib)
	{
	list($form_start,) = $this->form_tags($attrib);

	return $form_start;
	}

	/**
	* Folder selector object for templates
	*
	* @param array $attrib Object attributes
	*
	* @return string HTML content
	*/
	public function folder_selector($attrib)
	{
	if (isset($_POST['_store_target'])) {
	$mbox = $_POST['_store_target'];
	}
	else {
	$mbox = isset($this->data['param']['sent_mbox']) ? $this->data['param']['sent_mbox'] : null;
	}

	$params = [
	'noselection' => '- ' . $this->rcmail->gettext('dontsave') . ' -',
	'folder_filter' => 'mail',
	'folder_rights' => 'w',
	];

	$attrib['name'] = '_store_target';
	$select = rcmail_action::folder_selector(array_merge($attrib, $params));

	return $select->show($mbox, $attrib);
	}

	/**
	* Mail Disposition Notification checkbox object for templates
	*
	* @param array $attrib Object attributes
	*
	* @return string HTML content
	*/
	public function mdn_checkbox($attrib)
	{
	list($form_start, $form_end) = $this->form_tags($attrib);
	unset($attrib['form']);

	if (empty($attrib['id'])) {
	$attrib['id'] = 'receipt';
	}

	$attrib['name'] = '_mdn';
	$attrib['value'] = '1';

	$checkbox = new html_checkbox($attrib);

	if (isset($_POST['_mdn'])) {
	$mdn_default = $_POST['_mdn'];
	}
	else if (in_array($this->data['mode'], [self::MODE_DRAFT, self::MODE_EDIT])) {
	$mdn_default = (bool) $this->options['message']->headers->mdn_to;
	}
	else {
	$mdn_default = $this->rcmail->config->get('mdn_default');
	}

	$out = $form_start ? "$form_start\n" : '';
	$out .= $checkbox->show($mdn_default);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}

	/**
	* Delivery Status Notification checkbox object for templates
	*
	* @param array $attrib Object attributes
	*
	* @return string HTML content
	*/
	public function dsn_checkbox($attrib)
	{
	list($form_start, $form_end) = $this->form_tags($attrib);
	unset($attrib['form']);

	if (empty($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 = $this->rcmail->config->get('dsn_default');
	}

	$out = $form_start ? "$form_start\n" : '';
	$out .= $checkbox->show($dsn_value);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}

	/**
	* Priority selector object for templates
	*
	* @param array $attrib Object attributes
	*
	* @return string HTML content
	*/
	public function priority_selector($attrib)
	{
	list($form_start, $form_end) = $this->form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_priority';
	$prio_list = [
	$this->rcmail->gettext('lowest') => 5,
	$this->rcmail->gettext('low') => 4,
	$this->rcmail->gettext('normal') => 0,
	$this->rcmail->gettext('high') => 2,
	$this->rcmail->gettext('highest') => 1,
	];

	$selector = new html_select($attrib);
	$selector->add(array_keys($prio_list), array_values($prio_list));

	if (isset($_POST['_priority'])) {
	$sel = (int) $_POST['_priority'];
	}
	else if (isset($this->options['message']->headers->priority)
	&& intval($this->options['message']->headers->priority) != 3
	) {
	$sel = (int) $this->options['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;
	}

	/**
	* Helper to create Sent folder if it does not exists
	*
	* @param string $folder Folder name to check
	* @param bool $create Create if does not exist
	*
	* @return bool True if the folder exists, False otherwise
	*/
	public static function check_sent_folder($folder, $create = false)
	{
	$rcmail = rcmail::get_instance();

	// 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;
	}

	/**
	* Initialize mail compose UI elements
	*/
	protected function compose_init($message)
	{
	$message->compose = [];

	// get user's identities
	$message->identities = $this->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($this->data['param']['from'])) {
	$message->compose['from'] = $this->data['param']['from'];
	}
	else if (!empty($message->identities)) {
	$ident = self::identity_select($message, $message->identities, $this->data['mode']);

	$message->compose['from'] = $ident['identity_id'];
	$message->compose['ident'] = $ident;
	}

	$this->rcmail->output->add_handlers([
	'storetarget' => [$this, 'folder_selector'],
	'composeheaders' => [$this, 'headers_output'],
	'composesubject' => [$this, 'compose_subject'],
	'priorityselector' => [$this, 'priority_selector'],
	'mdncheckbox' => [$this, 'mdn_checkbox'],
	'dsncheckbox' => [$this, 'dsn_checkbox'],
	'composeformhead' => [$this, 'form_head'],
	]);

	// add some labels to client
	$this->rcmail->output->add_label('nosubject', 'nosenderwarning', 'norecipientwarning',
	'nosubjectwarning', 'cancel', 'nobodywarning', 'notsentwarning', 'savingmessage',
	'sendingmessage', 'searching', 'disclosedrecipwarning', 'disclosedreciptitle',
	'bccinstead', 'nosubjecttitle', 'sendmessage');

	$this->rcmail->output->set_env('max_disclosed_recipients', (int) $this->rcmail->config->get('max_disclosed_recipients', 5));
	}

	/**
	* Detect recipient identity from specified message
	*
	* @param rcube_message $message Message object
	* @param array $identities User identities (if NULL all user identities will be used)
	* @param string $mode Composing mode (see self::MODE_*)
	*
	* @return array Selected user identity (or the default identity) data
	*/
	public static function identity_select($message, $identities = null, $mode = null)
	{
	$a_recipients = [];
	$a_names = [];

	if ($identities === null) {
	$identities = rcmail::get_instance()->user->list_identities(null, true);
	}

	if (!$mode) {
	$mode = self::MODE_REPLY;
	}

	// extract all recipients of the reply-message
	if (!empty($message->headers)) {
	$charset = $message->headers->charset;

	if (in_array($mode, [self::MODE_REPLY, self::MODE_FORWARD])) {
	$a_to = rcube_mime::decode_address_list($message->headers->to, null, true, $charset);
	foreach ($a_to as $addr) {
	if (!empty($addr['mailto'])) {
	$a_recipients[] = strtolower($addr['mailto']);
	$a_names[] = $addr['name'];
	}
	}

	if (!empty($message->headers->cc)) {
	$a_cc = rcube_mime::decode_address_list($message->headers->cc, null, true, $charset);
	foreach ($a_cc as $addr) {
	if (!empty($addr['mailto'])) {
	$a_recipients[] = strtolower($addr['mailto']);
	$a_names[] = $addr['name'];
	}
	}
	}
	}

	// decode From: address
	if (!empty($message->headers)) {
	$from = array_first(rcube_mime::decode_address_list($message->headers->from, null, true, $charset));
	$from['mailto'] = isset($from['mailto']) ? strtolower($from['mailto']) : '';
	}
	}

	if (empty($from)) {
	$from = ['mailto' => ''];
	}

	$from_idx = null;
	$found_idx = ['to' => null, 'from' => null];
	$check_from = in_array($mode, [self::MODE_DRAFT, self::MODE_EDIT, self::MODE_REPLY]);

	// Select identity
	foreach ($identities as $idx => $ident) {
	// use From: header when in edit/draft or reply-to-self
	if ($check_from && $from['mailto'] == strtolower($ident['email_ascii'])) {
	// remember first matching identity address
	if ($found_idx['from'] === null) {
	$found_idx['from'] = $idx;
	}
	// match identity name
	if ($from['name'] && $ident['name'] && $from['name'] == $ident['name']) {
	$from_idx = $idx;
	break;
	}
	}

	// use replied/forwarded message recipients
	if (($found = array_search(strtolower($ident['email_ascii']), $a_recipients)) !== false) {
	// remember first matching identity address
	if ($found_idx['to'] === null) {
	$found_idx['to'] = $idx;
	}
	// match identity name
	if ($a_names[$found] && $ident['name'] && $a_names[$found] == $ident['name']) {
	$from_idx = $idx;
	break;
	}
	}
	}

	// If matching by name+address didn't find any matches,
	// get first found identity (address) if any
	if ($from_idx === null) {
	$from_idx = $found_idx['to'] !== null ? $found_idx['to'] : $found_idx['from'];
	}

	// Try Return-Path
	if ($from_idx === null && !empty($message->headers->others['return-path'])) {
	$return_path = $message->headers->others['return-path'];
	$return_path = array_map('strtolower', (array) $return_path);

	foreach ($identities as $idx => $ident) {
	// Return-Path header contains an email address, but on some mailing list
	// it can be e.g. <pear-dev-return-55250-local=domain.tld@lists.php.net>
	// where local@domain.tld is the address we're looking for (#1489241)
	$ident1 = strtolower($ident['email_ascii']);
	$ident2 = str_replace('@', '=', $ident1);
	$ident1 = '<' . $ident1 . '>';
	$ident2 = '-' . $ident2 . '@';

	foreach ($return_path as $path) {
	if ($path == $ident1 \|\| stripos($path, $ident2)) {
	$from_idx = $idx;
	break 2;
	}
	}
	}
	}

	// See identity_select plugin for example usage of this hook
	$plugin = rcmail::get_instance()->plugins->exec_hook('identity_select', [
	'message' => $message,
	'identities' => $identities,
	'selected' => $from_idx
	]);

	$selected = $plugin['selected'];

	// default identity is always first on the list
	if ($selected === null) {
	$selected = 0;
	}

	return isset($identities[$selected]) ? $identities[$selected] : null;
	}

	/**
	* Collect message recipients' addresses
	*
	* @param Mail_Mime $message The email message
	*/
	public static function collect_recipients($message)
	{
	$rcmail = rcube::get_instance();

	// Find the addressbook source
	$collected_recipients = $rcmail->config->get('collected_recipients');

	if (!strlen($collected_recipients)) {
	return;
	}

	$source = $rcmail->get_address_book($collected_recipients);

	if (!$source) {
	return;
	}

	$headers = $message->headers();

	// extract recipients
	$recipients = (array) $headers['To'];

	if (!empty($headers['Cc'])) {
	$recipients[] = $headers['Cc'];
	}

	if (!empty($headers['Bcc'])) {
	$recipients[] = $headers['Bcc'];
	}

	$addresses = rcube_mime::decode_address_list($recipients);
	$type = rcube_addressbook::TYPE_DEFAULT \| rcube_addressbook::TYPE_RECIPIENT;

	foreach ($addresses as $address) {
	$contact = [
	'name' => $address['name'],
	'email' => $address['mailto'],
	];

	if (!$rcmail->contact_exists($contact['email'], $type)) {
	$rcmail->contact_create($contact, $source);
	}
	}
	}
	}
	diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
	index e17ea35ab..b0dc4145d 100644
	--- a/program/lib/Roundcube/rcube.php
	+++ b/program/lib/Roundcube/rcube.php
	@@ -1,1842 +1,1842 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| \|
	\| Copyright (C) The Roundcube Dev Team \|
	\| Copyright (C) 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
	{
	// 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;

	const DEBUG_LINE_LENGTH = 4096;

	/** @var rcube_config Stores instance of rcube_config */
	public $config;

	/** @var rcube_db Instance of database class */
	public $db;

	/** @var Memcache Instance of Memcache class */
	public $memcache;

	/** @var Memcached Instance of Memcached class */
	public $memcached;

	/** @var Redis Instance of Redis class */
	public $redis;

	/** @var rcube_session Instance of rcube_session class */
	public $session;

	/** @var rcube_smtp Instance of rcube_smtp class */
	public $smtp;

	/** @var rcube_storage Instance of rcube_storage class */
	public $storage;

	/** @var rcube_output Instance of rcube_output class */
	public $output;

	/** @var rcube_plugin_api Instance of rcube_plugin_api */
	public $plugins;

	/** @var rcube_user Instance of rcube_user class */
	public $user;

	/** @var int Request status */
	public $request_status = 0;

	/** @var array Localization */
	protected $texts;

	/** @var rcube_cache[] Initialized cache objects */
	protected $caches = [];

	/** @var array Registered shutdown functions */
	protected $shutdown_functions = [];

	/** @var rcube Singleton instance of rcube */
	static protected $instance;


	/**
	* This implements the 'singleton' design pattern
	*
	* @param int $mode Options to initialize with this instance. See rcube::INIT_WITH_* constants
	* @param string $env 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
	*
	* @param string $env Environment name to run (e.g. live, dev, test)
	*/
	protected function __construct($env = '')
	{
	// load configuration
	$this->config = new rcube_config($env);
	$this->plugins = new rcube_dummy_plugin_api;

	register_shutdown_function([$this, 'shutdown']);
	}

	/**
	* Initial startup function
	*
	* @param int $mode Options to initialize with this instance. See rcube::INIT_WITH_* constants
	*/
	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 Memcache The memcache engine
	*/
	public function get_memcache()
	{
	if (!isset($this->memcache)) {
	$this->memcache = rcube_cache_memcache::engine();
	}

	return $this->memcache;
	}

	/**
	* Get global handle for memcached access
	*
	* @return Memcached The memcached engine
	*/
	public function get_memcached()
	{
	if (!isset($this->memcached)) {
	$this->memcached = rcube_cache_memcached::engine();
	}

	return $this->memcached;
	}

	/**
	* Get global handle for redis access
	*
	* @return Redis The redis engine
	*/
	public function get_redis()
	{
	if (!isset($this->redis)) {
	$this->redis = rcube_cache_redis::engine();
	}

	return $this->redis;
	}

	/**
	* Initialize and get user cache object
	*
	* @param string $name Cache identifier
	* @param string $type Cache type ('db', 'apc', 'memcache', 'redis')
	* @param string $ttl Expiration time for cache items
	* @param bool $packed Enables/disables data serialization
	* @param bool $indexed Use indexed cache
	*
	* @return rcube_cache\|null User cache object
	*/
	public function get_cache($name, $type = 'db', $ttl = 0, $packed = true, $indexed = false)
	{
	if (!isset($this->caches[$name]) && ($userid = $this->get_user_id())) {
	$this->caches[$name] = rcube_cache::factory($type, $userid, $name, $ttl, $packed, $indexed);
	}

	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] = rcube_cache::factory($type, null, $name, $ttl, $packed);
	}

	return $this->caches[$shared_name];
	}

	/**
	* Initialize HTTP client
	*
	* @param array $options Configuration options
	*
	* @return \GuzzleHttp\Client HTTP client
	*/
	public function get_http_client($options = [])
	{
	return new \GuzzleHttp\Client($options + $this->config->get('http_client'));
	}

	/**
	* Create SMTP object and connect to server
	*
	* @param boolean $connect 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([
	'code' => 700, '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 = [
	'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['language'] = $_SESSION['language'];
	$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', [$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 compatibility
	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 = [];

	// 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
	*
	* @param array $args Callback arguments
	*/
	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()
	{
	// Ignore in CLI mode or when session started (Installer?)
	if (empty($_SERVER['REMOTE_ADDR']) \|\| session_id()) {
	return;
	}

	$storage = $this->config->get('session_storage', 'db');
	$sess_name = $this->config->get('session_name');
	$sess_domain = $this->config->get('session_domain');
	$sess_path = $this->config->get('session_path');
	$sess_samesite = $this->config->get('session_samesite');
	$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 samesite attribute
	// requires PHP >= 7.3.0, see https://wiki.php.net/rfc/same-site-cookie for more info
	if (version_compare(PHP_VERSION, '7.3.0', '>=') && $sess_samesite) {
	ini_set('session.cookie_samesite', $sess_samesite);
	}
	// set session garbage collecting time according to session_lifetime
	if ($lifetime) {
	ini_set('session.gc_maxlifetime', $lifetime * 2);
	}

	// set session cookie lifetime so it never expires (#5961)
	ini_set('session.cookie_lifetime', 0);
	ini_set('session.cookie_secure', $is_secure);
	ini_set('session.name', $sess_name ?: 'roundcube_sessid');
	ini_set('session.use_cookies', 1);
	ini_set('session.use_only_cookies', 1);
	ini_set('session.cookie_httponly', 1);

	// Make sure session garbage collector is enabled when using custom handlers (#6560)
	// Note: Use session.gc_divisor to control accuracy
	if ($storage != 'php' && !ini_get('session.gc_probability')) {
	ini_set('session.gc_probability', 1);
	}

	// Start the session
	$this->session = rcube_session::factory($this->config);
	$this->session->register_gc_handler([$this, 'gc']);
	$this->session->start();
	}

	/**
	* Garbage collector - cache/temp cleaner
	*/
	public function gc()
	{
	rcube_cache::gc();
	$this->get_storage()->cache_gc();
	$this->gc_temp();
	}

	/**
	* Garbage collector function for temp files.
	* Removes temporary files older than temp_dir_ttl.
	*/
	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 (strpos($fname, RCUBE_TEMP_FILE_PREFIX) !== 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 = ['name' => $attrib];
	}

	$name = (string) $attrib['name'];

	// attrib contain text values: use them from now
	$slang = !empty($_SESSION['language']) ? strtolower($_SESSION['language']) : 'en_us';
	if (isset($attrib[$slang])) {
	$this->texts[$name] = $attrib[$slang];
	}
	else if ($slang != 'en_us' && isset($attrib['en_us'])) {
	$this->texts[$name] = $attrib['en_us'];
	}

	// check for text with domain
	if ($domain && isset($this->texts["$domain.$name"])) {
	$text = $this->texts["$domain.$name"];
	}
	else if (isset($this->texts[$name])) {
	$text = $this->texts[$name];
	}

	// text does not exist
	if (!isset($text)) {
	return "[$name]";
	}

	// replace vars in text
	if (!empty($attrib['vars']) && 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);
	}
	}

	// replace \n with real line break
	$text = strtr($text, ['\n' => "\n"]);

	// case folding
	if ((!empty($attrib['uppercase']) && strtolower($attrib['uppercase']) == 'first') \|\| !empty($attrib['ucfirst'])) {
	$case_mode = MB_CASE_TITLE;
	}
	else if (!empty($attrib['uppercase'])) {
	$case_mode = MB_CASE_UPPER;
	}
	else if (!empty($attrib['lowercase'])) {
	$case_mode = MB_CASE_LOWER;
	}

	if (isset($case_mode)) {
	$text = mb_convert_case($text, $case_mode);
	}

	return $text;
	}

	/**
	* 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 bool 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 && isset($this->texts[$domain.'.'.$name])) {
	$ref_domain = $domain;
	return true;
	}

	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 = [], $merge = [])
	{
	$sess_lang = !empty($_SESSION['language']) ? $_SESSION['language'] : 'en_US';
	$lang = $this->language_prop($lang ?: $sess_lang);

	// load localized texts
	if (empty($this->texts) \|\| $lang != $sess_lang) {
	// get english labels (these should be complete)
	$files = [
	RCUBE_LOCALIZATION_DIR . 'en_US/labels.inc',
	RCUBE_LOCALIZATION_DIR . 'en_US/messages.inc',
	];

	// include user language files
	if ($lang != 'en' && $lang != 'en_US' && is_dir(RCUBE_LOCALIZATION_DIR . $lang)) {
	$files[] = RCUBE_LOCALIZATION_DIR . $lang . '/labels.inc';
	$files[] = RCUBE_LOCALIZATION_DIR . $lang . '/messages.inc';
	}

	$this->texts = [];

	foreach ($files as $file) {
	$this->texts = self::read_localization_file($file, $this->texts);
	}

	$_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);
	}
	}

	/**
	* Read localized texts from an additional location (plugins, skins).
	* Then you can use the result as 2nd arg to load_language().
	*
	* @param string $dir Directory to search in
	* @param string\|null $lang Language code to read
	*
	* @return array Localization labels/messages
	*/
	public function read_localization($dir, $lang = null)
	{
	if ($lang == null) {
	$lang = $_SESSION['language'];
	}
	$langs = array_unique(['en_US', $lang]);
	$locdir = slashify($dir);
	$texts = [];

	// Language aliases used to find localization in similar lang, see below
	$aliases = [
	'de_CH' => 'de_DE',
	'es_AR' => 'es_ES',
	'fa_AF' => 'fa_IR',
	'nl_BE' => 'nl_NL',
	'pt_BR' => 'pt_PT',
	'zh_CN' => 'zh_TW',
	];

	foreach ($langs as $lng) {
	$fpath = $locdir . $lng . '.inc';
	$_texts = self::read_localization_file($fpath);

	if (!empty($_texts)) {
	$texts = array_merge($texts, $_texts);
	}
	// Fallback to a localization in similar language (#1488401)
	else if ($lng != 'en_US') {
	$alias = null;
	if (!empty($aliases[$lng])) {
	$alias = $aliases[$lng];
	}
	else if ($key = array_search($lng, $aliases)) {
	$alias = $key;
	}

	if (!empty($alias)) {
	$fpath = $locdir . $alias . '.inc';
	$texts = self::read_localization_file($fpath, $texts);
	}
	}
	}

	return $texts;
	}


	/**
	* Load localization file
	*
	* @param string $file File location
	* @param array $texts Additional texts to merge with
	*
	* @return array Localization labels/messages
	*/
	public static function read_localization_file($file, $texts = [])
	{
	if (is_file($file) && is_readable($file)) {
	$labels = [];
	$messages = [];

	// use buffering to handle empty lines/spaces after closing PHP tag
	ob_start();
	include $file;
	ob_end_clean();

	if (!empty($labels)) {
	$texts = array_merge($texts, $labels);
	}

	if (!empty($messages)) {
	$texts = array_merge($texts, $messages);
	}
	}

	return $texts;
	}

	/**
	* Check the given string and return a valid language code
	*
	* @param string $lang 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') && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
	$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 = [];

	if (!count($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 (isset($rcube_languages[$name])) {
	$sa_languages[$name] = $rcube_languages[$name];
	}
	}

	closedir($dh);
	}
	}

	return $sa_languages;
	}

	/**
	* Encrypt a string
	*
	* @param string $clear Clear text input
	* @param string $key Encryption key to retrieve from the configuration, defaults to 'des_key'
	* @param bool $base64 Whether or not to base64_encode() the result before returning
	*
	* @return string\|false Encrypted text, false on error
	*/
	public function encrypt($clear, $key = 'des_key', $base64 = true)
	{
	if (!is_string($clear) \|\| !strlen($clear)) {
	return '';
	}

	$ckey = $this->config->get_crypto_key($key);
	$method = $this->config->get_crypto_method();
	$opts = defined('OPENSSL_RAW_DATA') ? OPENSSL_RAW_DATA : true;
	$iv = rcube_utils::random_bytes(openssl_cipher_iv_length($method), true);
	$cipher = openssl_encrypt($clear, $method, $ckey, $opts, $iv);

	if ($cipher === false) {
	self::raise_error([
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Failed to encrypt data with configured cipher method: $method!"
	], true, false);

	return false;
	}

	$cipher = $iv . $cipher;

	return $base64 ? base64_encode($cipher) : $cipher;
	}

	/**
	* Decrypt a string
	*
	* @param string $cipher Encrypted text
	* @param string $key Encryption key to retrieve from the configuration, defaults to 'des_key'
	* @param bool $base64 Whether or not input is base64-encoded
	*
	* @return string\|false Decrypted text, false on error
	*/
	public function decrypt($cipher, $key = 'des_key', $base64 = true)
	{
	if (strlen($cipher) == 0) {
	return false;
	}

	if ($base64) {
	$cipher = base64_decode($cipher);
	if ($cipher === false) {
	return false;
	}
	}

	$ckey = $this->config->get_crypto_key($key);
	$method = $this->config->get_crypto_method();
	$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 false;
	}

	$cipher = substr($cipher, $iv_size);
	$clear = openssl_decrypt($cipher, $method, $ckey, $opts, $iv);

	return $clear;
	}

	/**
	* 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 = rcube_utils::random_bytes($length);

	$plugin = $this->plugins->exec_hook('secure_token', ['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()
	{
	if (empty($_SESSION['request_token'])) {
	$plugin = $this->plugins->exec_hook('request_token', ['value' => rcube_utils::random_bytes(32)]);

	$_SESSION['request_token'] = $plugin['value'];
	}

	return $_SESSION['request_token'];
	}

	/**
	* Check if the current request contains a valid token.
	* Empty requests aren't checked until use_secure_urls is set.
	*
	* @param int $mode Request method
	*
	* @return bool 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);

	if (empty($_COOKIE[ini_get('session.name')]) \|\| $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 $p 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 (!empty($_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();
	}

	if ($this->config->get('log_driver') == 'syslog') {
	closelog();
	}
	}

	/**
	* 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 Function callback
	*/
	public function add_shutdown_function($function)
	{
	$this->shutdown_functions[] = $function;
	}

	/**
	* When you're going to sleep the script execution for a longer time
	* it is good to close all external connections (sql, memcache, redis, SMTP, IMAP).
	*
	* No action is required on wake up, all connections will be
	* re-established automatically.
	*/
	public function sleep()
	{
	foreach ($this->caches as $cache) {
	if (is_object($cache)) {
	$cache->close();
	}
	}

	if ($this->storage) {
	$this->storage->close();
	}

	if ($this->db) {
	$this->db->closeConnection();
	}

	if ($this->memcache) {
	$this->memcache->close();
	}

	if ($this->memcached) {
	$this->memcached->quit();
	}

	if ($this->smtp) {
	$this->smtp->disconnect();
	}

	if ($this->redis) {
	$this->redis->close();
	}
	}

	/**
	* Quote a given string.
	* Shortcut function for rcube_utils::rep_specialchars_output()
	*
	* @param string $str A string to quote
	* @param string $mode Replace mode for tags: show\|remove\|strict
	* @param bool $newlines Convert newlines
	*
	* @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()
	*
	* @param string $str A string to quote
	*
	* @return string JS-quoted string
	*/
	public static function JQ($str)
	{
	return rcube_utils::rep_specialchars_output($str, 'js');
	}

	/**
	* Quote a given string, remove new-line characters, use strict mode.
	* Shortcut function for rcube_utils::rep_specialchars_output()
	*
	* @param string $str A string to quote
	*
	* @return string HTML-quoted string
	*/
	public static function SQ($str)
	{
	return rcube_utils::rep_specialchars_output($str, 'html', 'strict', false);
	}

	/**
	* Construct shell command, execute it and return output as string.
	* Keywords {keyword} are replaced with arguments
	*
	* @param string $cmd Format string with {keywords} to be replaced
	* @param mixed $values,... (zero, one or more arrays can be passed)
	*
	* @return string Output of command. Shell errors not detectable
	*/
	public static function exec(/* $cmd, $values1 = [], ... */)
	{
	$args = func_get_args();
	$cmd = array_shift($args);
	$values = $replacements = [];

	// 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 = [];

	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] = implode(' ', $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', ['args' => $args]);
	if ($plugin['abort']) {
	return;
	}

	$args = $plugin['args'];
	}

	$msg = [];
	foreach ($args as $arg) {
	$msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
	}

	self::write_log('console', implode(";\n", $msg));
	}

	/**
	* Append a line to a logfile in the logs directory.
	* Date will be added automatically to the line.
	*
	* @param string $name Name of the log file
	* @param mixed $line Line to append
	*
	* @return bool True on success, False on failure
	*/
	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));
	}

	$date = rcube_utils::date_format($date_format);

	// trigger logging hook
	if (is_object(self::$instance) && is_object(self::$instance->plugins)) {
	$log = self::$instance->plugins->exec_hook('write_log',
	['name' => $name, 'date' => $date, 'line' => $line]
	);

	$name = $log['name'];
	$line = $log['line'];
	$date = $log['date'];

	if (!empty($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;
	return syslog($prio, $line);
	}

	// write message with file name when configured to log to STDOUT
	if ($log_driver == 'stdout') {
	$stdout = "php://stdout";
	$line = "$name: $line\n";
	return file_put_contents($stdout, $line, FILE_APPEND) !== false;
	}

	// log_driver == 'file' is assumed here

	$line = sprintf("[%s]: %s\n", $date, $line);

	// per-user logging is activated
	if (self::$instance && self::$instance->config->get('per_user_logging')
	&& self::$instance->get_user_id()
	&& !in_array($name, ['userlogins', 'sendmail'])
	) {
	$log_dir = self::$instance->get_user_log_dir();
	if (empty($log_dir) && $name !== 'errors') {
	return false;
	}
	}

	if (empty($log_dir)) {
	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';
	}

	if (self::$instance) {
	$name .= self::$instance->config->get('log_file_ext', '.log');
	}
	else {
	$name .= '.log';
	}

	return file_put_contents("$log_dir/$name", $line, FILE_APPEND) !== false;
	}

	/**
	* Throw system error (and show error page).
	*
	* @param array $arg Named parameters
	* - code: Error code (required)
	* - type: Error type [php\|db\|imap\|javascript]
	* - message: Error message
	* - file: File where error occurred
	* - line: Line where error occurred
	* @param bool $log True to log the error
	* @param bool $terminate Terminate script execution
	*/
	public static function raise_error($arg = [], $log = false, $terminate = false)
	{
	// handle PHP exceptions
	if ($arg instanceof Exception) {
	$arg = [
	'code' => $arg->getCode(),
	'line' => $arg->getLine(),
	'file' => $arg->getFile(),
	'message' => $arg->getMessage(),
	];
	}
	else if ($arg instanceof PEAR_Error) {
	$info = $arg->getUserInfo();
	$arg = [
	'code' => $arg->getCode(),
	'message' => $arg->getMessage() . ($info ? ': ' . $info : ''),
	];
	}
	else if (is_string($arg)) {
	$arg = ['message' => $arg];
	}

	if (empty($arg['code'])) {
	$arg['code'] = 500;
	}

	$cli = php_sapi_name() == 'cli';

	$arg['cli'] = $cli;
	$arg['log'] = $log;
	$arg['terminate'] = $terminate;

	// send error to external error tracking tool
	if (self::$instance) {
	$arg = self::$instance->plugins->exec_hook('raise_error', $arg);
	}

	// installer
	if (!$cli && class_exists('rcmail_install', false)) {
	$rci = rcmail_install::get_instance();
	$rci->raise_error($arg);
	return;
	}

	if (($log \|\| $terminate) && !$cli && $arg['message']) {
	$arg['fatal'] = $terminate;
	self::log_bug($arg);
	}

	if ($cli) {
	fwrite(STDERR, 'ERROR: ' . trim($arg['message']) . "\n");
	}
	else if ($terminate && is_object(self::$instance->output)) {
	self::$instance->output->raise_error($arg['code'], $arg['message']);
	}
	else if ($terminate) {
	header("HTTP/1.0 500 Internal Error");
	}

	// terminate script
	if ($terminate) {
	if (defined('ROUNDCUBE_TEST_MODE') && ROUNDCUBE_TEST_MODE) {
	throw new Exception('Error raised');
	}
	exit(1);
	}
	}

	/**
	* Log an error
	*
	* @param array $arg_arr Named parameters
	* @see self::raise_error()
	*/
	public static function log_bug($arg_arr)
	{
	$program = !empty($arg_arr['type']) ? strtoupper($arg_arr['type']) : 'PHP';
	$uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';

	// write error to local log file
	if ($_SERVER['REQUEST_METHOD'] == 'POST') {
	$post_query = [];
	foreach (['_task', '_action'] as $arg) {
	if (isset($_POST[$arg]) && !isset($_GET[$arg])) {
	$post_query[$arg] = $_POST[$arg];
	}
	}

	if (!empty($post_query)) {
	$uri .= (strpos($uri, '?') != false ? '&' : '?')
	. http_build_query($post_query, '', '&');
	}
	}

	$log_entry = sprintf("%s Error: %s%s (%s %s)",
	$program,
	$arg_arr['message'],
	!empty($arg_arr['file']) ? sprintf(' in %s on line %d', $arg_arr['file'], $arg_arr['line']) : '',
	$_SERVER['REQUEST_METHOD'],
	$uri
	);

	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);
	}
	}

	/**
	* Write debug info to the log
	*
	* @param string $engine Engine type - file name (memcache, apc, redis)
	* @param string $data Data string to log
	* @param bool $result Operation result
	*/
	public static function debug($engine, $data, $result = null)
	{
	static $debug_counter;

	$line = '[' . (++$debug_counter[$engine]) . '] ' . $data;

	if (($len = strlen($line)) > self::DEBUG_LINE_LENGTH) {
	$diff = $len - self::DEBUG_LINE_LENGTH;
	$line = substr($line, 0, self::DEBUG_LINE_LENGTH) . "... [truncated $diff bytes]";
	}

	if ($result !== null) {
	$line .= ' [' . ($result ? 'TRUE' : 'FALSE') . ']';
	}

	self::write_log($engine, $line);
	}

	/**
	* 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'];
	}
	}

	/**
	* 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 (!empty($this->user_email)) {
	return $this->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 (!empty($this->password)) {
	return $this->password;
	}

	if (isset($_SESSION['password'])) {
	return $this->decrypt($_SESSION['password']);
	}
	}

	/**
	* Get the per-user log directory
	*
	* @return string\|false Per-user log directory if it exists and is writable, False otherwise
	*/
	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.
	*
	* @param string $sender Optional sender e-mail address
	*
	* @return string Message-ID
	*/
	public function gen_message_id($sender = null)
	{
	$local_part = md5(uniqid('rcube'.mt_rand(), true));
	$domain_part = '';

	if ($sender && preg_match('/@([^\s]+\.[a-z0-9-]+)/', $sender, $m)) {
	$domain_part = $m[1];
	}
	else {
	$domain_part = $this->user->get_username('domain');
	}

	// Try to find FQDN, some spamfilters doesn't like 'localhost' (#1486924)
	if (!preg_match('/\.[a-z0-9-]+$/i', $domain_part)) {
	foreach ([$_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;
	break;
	}
	}
	}

	return sprintf('<%s@%s>', $local_part, $domain_part);
	}

	/**
	* Send the given message using the configured method.
	*
	* @param Mail_Mime &$message Reference to Mail_MIME object
	* @param string $from Sender address string
	* @param array\|string $mailto Either a comma-separated list of recipients (RFC822 compliant),
	* or an array of recipients, each RFC822 valid
	* @param array\|string &$error SMTP error array or (deprecated) string
	* @param string &$body_file Location of file with saved message body,
	* used when delay_file_io is enabled
	* @param array $options SMTP options (e.g. DSN request)
	* @param bool $disconnect Close SMTP connection ASAP
	*
	* @return bool Send status.
	*/
	public function deliver_message(&$message, $from, $mailto, &$error,
	&$body_file = null, $options = null, $disconnect = false)
	{
	$plugin = $this->plugins->exec_hook('message_before_send', [
	'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();

	// generate list of recipients
	$a_recipients = (array) $mailto;

	if (!empty($headers['Cc'])) {
	$a_recipients[] = $headers['Cc'];
	}
	if (!empty($headers['Bcc'])) {
	$a_recipients[] = $headers['Bcc'];
	}

	// remove Bcc header and get the whole head of the message as string
	$smtp_headers = $message->txtHeaders(['Bcc' => null], true);

	if ($message->getParam('delay_file_io')) {
	// use common temp dir
	$body_file = rcube_utils::temp_filename('msg');
	$mime_result = $message->saveMessageBody($body_file);

	if (is_a($mime_result, 'PEAR_Error')) {
	self::raise_error([
	'code' => 650, '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();
	}

	// initialize SMTP connection
	if (!is_object($this->smtp)) {
	$this->smtp_init(true);
	}

	// send message
	$sent = $this->smtp->send_mail($from, $a_recipients, $smtp_headers, $msg_body, $options);
	$response = $this->smtp->get_response();
	$error = $this->smtp->get_error();

	if (!$sent) {
	self::raise_error([
	'code' => 800, 'type' => 'smtp',
	'line' => __LINE__, 'file' => __FILE__,
	'message' => implode("\n", $response)
	], true, false);

	// allow plugins to catch sending errors with the same parameters as in 'message_before_send'
	$plugin = $this->plugins->exec_hook('message_send_error', $plugin + ['error' => $error]);
	$error = $plugin['error'];
	}
	else {
	$this->plugins->exec_hook('message_sent', ['headers' => $headers, 'body' => $msg_body, 'message' => $message]);

	- // remove MDN headers after sending
	+ // remove MDN/DSN headers after sending
	unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);

	if ($this->config->get('smtp_log')) {
	// get all recipient addresses
	$mailto = implode(',', $a_recipients);
	$mailto = rcube_mime::decode_address_list($mailto, null, false, null, true);

	self::write_log('sendmail', sprintf("User %s [%s]; Message %s for %s; %s",
	$this->user->get_username(),
	rcube_utils::remote_addr(),
	$headers['Message-ID'],
	implode(', ', $mailto),
	!empty($response) ? implode('; ', $response) : '')
	);
	}
	}

	if (is_resource($msg_body)) {
	fclose($msg_body);
	}

	if ($disconnect) {
	$this->smtp->disconnect();
	}

	// Add Bcc header back
	if (!empty($headers['Bcc'])) {
	$message->headers(['Bcc' => $headers['Bcc']], true);
	}

	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.
	*
	* @param string $hook Hook name
	* @param array $args Hook arguments
	*
	* @return array Hook arguments
	* @see rcube_plugin_api::exec_hook()
	*/
	public function exec_hook($hook, $args = [])
	{
	return $args;
	}
	}
	diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
	index c530f523c..a5b220427 100644
	--- a/program/lib/Roundcube/rcube_imap_generic.php
	+++ b/program/lib/Roundcube/rcube_imap_generic.php
	@@ -1,4174 +1,4173 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| \|
	\| Copyright (C) The Roundcube Dev Team \|
	\| Copyright (C) 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: \|
	\| Provide alternative IMAP library that doesn't rely on the standard \|
	\| C-Client based version. This allows to function regardless \|
	\| of whether or not the PHP build it's running on has IMAP \|
	\| functionality built-in. \|
	\| \|
	\| Based on Iloha IMAP Library. See http://ilohamail.org/ for details \|
	+-----------------------------------------------------------------------+
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	\| Author: Ryo Chijiiwa <Ryo@IlohaMail.org> \|
	+-----------------------------------------------------------------------+
	*/

	/**
	* PHP based wrapper class to connect to an IMAP server
	*
	* @package Framework
	* @subpackage Storage
	*/
	class rcube_imap_generic
	{
	public $error;
	public $errornum;
	public $result;
	public $resultcode;
	public $selected;
	public $data = [];
	public $flags = [
	'SEEN' => '\\Seen',
	'DELETED' => '\\Deleted',
	'ANSWERED' => '\\Answered',
	'DRAFT' => '\\Draft',
	'FLAGGED' => '\\Flagged',
	'FORWARDED' => '$Forwarded',
	'MDNSENT' => '$MDNSent',
	'' => '\\',
	];

	protected $fp;
	protected $host;
	protected $user;
	protected $cmd_tag;
	protected $cmd_num = 0;
	protected $resourceid;
	protected $extensions_enabled;
	protected $prefs = [];
	protected $logged = false;
	protected $capability = [];
	protected $capability_read = false;
	protected $debug = false;
	protected $debug_handler = false;

	const ERROR_OK = 0;
	const ERROR_NO = -1;
	const ERROR_BAD = -2;
	const ERROR_BYE = -3;
	const ERROR_UNKNOWN = -4;
	const ERROR_COMMAND = -5;
	const ERROR_READONLY = -6;

	const COMMAND_NORESPONSE = 1;
	const COMMAND_CAPABILITY = 2;
	const COMMAND_LASTLINE = 4;
	const COMMAND_ANONYMIZED = 8;

	const DEBUG_LINE_LENGTH = 4098; // 4KB + 2B for \r\n


	/**
	* Send simple (one line) command to the connection stream
	*
	* @param string $string Command string
	* @param bool $endln True if CRLF need to be added at the end of command
	* @param bool $anonymized Don't write the given data to log but a placeholder
	*
	* @param int Number of bytes sent, False on error
	*/
	protected function putLine($string, $endln = true, $anonymized = false)
	{
	if (!$this->fp) {
	return false;
	}

	if ($this->debug) {
	// anonymize the sent command for logging
	$cut = $endln ? 2 : 0;
	if ($anonymized && preg_match('/^(A\d+ (?:[A-Z]+ )+)(.+)/', $string, $m)) {
	$log = $m[1] . sprintf('****** [%d]', strlen($m[2]) - $cut);
	}
	else if ($anonymized) {
	$log = sprintf('****** [%d]', strlen($string) - $cut);
	}
	else {
	$log = rtrim($string);
	}

	$this->debug('C: ' . $log);
	}

	if ($endln) {
	$string .= "\r\n";
	}

	$res = fwrite($this->fp, $string);

	if ($res === false) {
	$this->closeSocket();
	}

	return $res;
	}

	/**
	* Send command to the connection stream with Command Continuation
	* Requests (RFC3501 7.5) and LITERAL+ (RFC2088) support
	*
	* @param string $string Command string
	* @param bool $endln True if CRLF need to be added at the end of command
	* @param bool $anonymized Don't write the given data to log but a placeholder
	*
	* @return int\|bool Number of bytes sent, False on error
	*/
	protected function putLineC($string, $endln = true, $anonymized = false)
	{
	if (!$this->fp) {
	return false;
	}

	if ($endln) {
	$string .= "\r\n";
	}

	$res = 0;
	if ($parts = preg_split('/(\{[0-9]+\}\r\n)/m', $string, -1, PREG_SPLIT_DELIM_CAPTURE)) {
	for ($i = 0, $cnt = count($parts); $i < $cnt; $i++) {
	if ($i + 1 < $cnt && preg_match('/^\{([0-9]+)\}\r\n$/', $parts[$i+1], $matches)) {
	// LITERAL+ support
	if (!empty($this->prefs['literal+'])) {
	$parts[$i+1] = sprintf("{%d+}\r\n", $matches[1]);
	}

	$bytes = $this->putLine($parts[$i].$parts[$i+1], false, $anonymized);
	if ($bytes === false) {
	return false;
	}

	$res += $bytes;

	// don't wait if server supports LITERAL+ capability
	if (empty($this->prefs['literal+'])) {
	$line = $this->readLine(1000);
	// handle error in command
	if (!isset($line[0]) \|\| $line[0] != '+') {
	return false;
	}
	}

	$i++;
	}
	else {
	$bytes = $this->putLine($parts[$i], false, $anonymized);
	if ($bytes === false) {
	return false;
	}

	$res += $bytes;
	}
	}
	}

	return $res;
	}

	/**
	* Reads line from the connection stream
	*
	* @param int $size Buffer size
	*
	* @return string Line of text response
	*/
	protected function readLine($size = 1024)
	{
	$line = '';

	if (!$size) {
	$size = 1024;
	}

	do {
	if ($this->eof()) {
	return $line ?: null;
	}

	$buffer = fgets($this->fp, $size);

	if ($buffer === false) {
	$this->closeSocket();
	break;
	}

	if ($this->debug) {
	$this->debug('S: '. rtrim($buffer));
	}

	$line .= $buffer;
	}
	while (substr($buffer, -1) != "\n");

	return $line;
	}

	/**
	* Reads a line of data from the connection stream including all
	* string continuation literals.
	*
	* @param int $size Buffer size
	*
	* @return string Line of text response
	*/
	protected function readFullLine($size = 1024)
	{
	$line = $this->readLine($size);

	// include all string literals untile the real end of "line"
	while (preg_match('/\{([0-9]+)\}\r\n$/', $line, $m)) {
	$bytes = $m[1];
	$out = '';

	while (strlen($out) < $bytes) {
	$out = $this->readBytes($bytes);
	if ($out === null) {
	break;
	}

	$line .= $out;
	}

	$line .= $this->readLine($size);
	}

	return $line;
	}

	/**
	* Reads more data from the connection stream when provided
	* data contain string literal
	*
	* @param string $line Response text
	* @param bool $escape Enables escaping
	*
	* @return string Line of text response
	*/
	protected function multLine($line, $escape = false)
	{
	$line = rtrim($line);
	if (preg_match('/\{([0-9]+)\}$/', $line, $m)) {
	$out = '';
	$str = substr($line, 0, -strlen($m[0]));
	$bytes = $m[1];

	while (strlen($out) < $bytes) {
	$line = $this->readBytes($bytes);
	if ($line === null) {
	break;
	}

	$out .= $line;
	}

	$line = $str . ($escape ? $this->escape($out) : $out);
	}

	return $line;
	}

	/**
	* Reads specified number of bytes from the connection stream
	*
	* @param int $bytes Number of bytes to get
	*
	* @return string Response text
	*/
	protected function readBytes($bytes)
	{
	$data = '';
	$len = 0;

	while ($len < $bytes && !$this->eof()) {
	$d = fread($this->fp, $bytes-$len);
	if ($this->debug) {
	$this->debug('S: '. $d);
	}
	$data .= $d;
	$data_len = strlen($data);
	if ($len == $data_len) {
	break; // nothing was read -> exit to avoid apache lockups
	}
	$len = $data_len;
	}

	return $data;
	}

	/**
	* Reads complete response to the IMAP command
	*
	* @param array $untagged Will be filled with untagged response lines
	*
	* @return string Response text
	*/
	protected function readReply(&$untagged = null)
	{
	while (true) {
	$line = trim($this->readLine(1024));
	// store untagged response lines
	if (isset($line[0]) && $line[0] == '*') {
	$untagged[] = $line;
	}
	else {
	break;
	}
	}

	if ($untagged) {
	$untagged = implode("\n", $untagged);
	}

	return $line;
	}

	/**
	* Response parser.
	*
	* @param string $string Response text
	* @param string $err_prefix Error message prefix
	*
	* @return int Response status
	*/
	protected function parseResult($string, $err_prefix = '')
	{
	if (preg_match('/^[a-z0-9]+ (OK\|NO\|BAD\|BYE)(.)$/i', trim($string), $matches)) {
	$res = strtoupper($matches[1]);
	$str = trim($matches[2]);

	if ($res == 'OK') {
	$this->errornum = self::ERROR_OK;
	}
	else if ($res == 'NO') {
	$this->errornum = self::ERROR_NO;
	}
	else if ($res == 'BAD') {
	$this->errornum = self::ERROR_BAD;
	}
	else if ($res == 'BYE') {
	$this->closeSocket();
	$this->errornum = self::ERROR_BYE;
	}

	if ($str) {
	$str = trim($str);
	// get response string and code (RFC5530)
	if (preg_match("/^\[([a-z-]+)\]/i", $str, $m)) {
	$this->resultcode = strtoupper($m[1]);
	$str = trim(substr($str, strlen($m[1]) + 2));
	}
	else {
	$this->resultcode = null;
	// parse response for [APPENDUID 1204196876 3456]
	if (preg_match("/^\[APPENDUID [0-9]+ ([0-9]+)\]/i", $str, $m)) {
	$this->data['APPENDUID'] = $m[1];
	}
	// parse response for [COPYUID 1204196876 3456:3457 123:124]
	else if (preg_match("/^\[COPYUID [0-9]+ ([0-9,:]+) ([0-9,:]+)\]/i", $str, $m)) {
	$this->data['COPYUID'] = [$m[1], $m[2]];
	}
	}

	$this->result = $str;

	if ($this->errornum != self::ERROR_OK) {
	$this->error = $err_prefix ? $err_prefix.$str : $str;
	}
	}

	return $this->errornum;
	}

	return self::ERROR_UNKNOWN;
	}

	/**
	* Checks connection stream state.
	*
	* @return bool True if connection is closed
	*/
	protected function eof()
	{
	if (!is_resource($this->fp)) {
	return true;
	}

	// If a connection opened by fsockopen() wasn't closed
	// by the server, feof() will hang.
	$start = microtime(true);

	if (feof($this->fp) \|\|
	($this->prefs['timeout'] && (microtime(true) - $start > $this->prefs['timeout']))
	) {
	$this->closeSocket();
	return true;
	}

	return false;
	}

	/**
	* Closes connection stream.
	*/
	protected function closeSocket()
	{
	if ($this->fp) {
	fclose($this->fp);
	$this->fp = null;
	}
	}

	/**
	* Error code/message setter.
	*/
	protected function setError($code, $msg = '')
	{
	$this->errornum = $code;
	$this->error = $msg;

	return $code;
	}

	/**
	* Checks response status.
	* Checks if command response line starts with specified prefix (or * BYE/BAD)
	*
	* @param string $string Response text
	* @param string $match Prefix to match with (case-sensitive)
	* @param bool $error Enables BYE/BAD checking
	* @param bool $nonempty Enables empty response checking
	*
	* @return bool True any check is true or connection is closed.
	*/
	protected function startsWith($string, $match, $error = false, $nonempty = false)
	{
	if (!$this->fp) {
	return true;
	}

	if (strncmp($string, $match, strlen($match)) == 0) {
	return true;
	}

	if ($error && preg_match('/^\* (BYE\|BAD) /i', $string, $m)) {
	if (strtoupper($m[1]) == 'BYE') {
	$this->closeSocket();
	}
	return true;
	}

	if ($nonempty && !strlen($string)) {
	return true;
	}

	return false;
	}

	/**
	* Capabilities checker
	*/
	protected function hasCapability($name)
	{
	if (empty($this->capability) \|\| empty($name)) {
	return false;
	}

	if (in_array($name, $this->capability)) {
	return true;
	}
	else if (strpos($name, '=')) {
	return false;
	}

	$result = [];
	foreach ($this->capability as $cap) {
	$entry = explode('=', $cap);
	if ($entry[0] == $name) {
	$result[] = $entry[1];
	}
	}

	return $result ?: false;
	}

	/**
	* Capabilities checker
	*
	* @param string $name Capability name
	*
	* @return mixed Capability values array for key=value pairs, true/false for others
	*/
	public function getCapability($name)
	{
	$result = $this->hasCapability($name);

	if (!empty($result)) {
	return $result;
	}
	else if ($this->capability_read) {
	return false;
	}

	// get capabilities (only once) because initial
	// optional CAPABILITY response may differ
	$result = $this->execute('CAPABILITY');

	if ($result[0] == self::ERROR_OK) {
	$this->parseCapability($result[1]);
	}

	$this->capability_read = true;

	return $this->hasCapability($name);
	}

	/**
	* Clears detected server capabilities
	*/
	public function clearCapability()
	{
	$this->capability = [];
	$this->capability_read = false;
	}

	/**
	* DIGEST-MD5/CRAM-MD5/PLAIN Authentication
	*
	* @param string $user Username
	* @param string $pass Password
	* @param string $type Authentication type (PLAIN/CRAM-MD5/DIGEST-MD5)
	*
	* @return resource Connection resource on success, error code on error
	*/
	protected function authenticate($user, $pass, $type = 'PLAIN')
	{
	if ($type == 'CRAM-MD5' \|\| $type == 'DIGEST-MD5') {
	if ($type == 'DIGEST-MD5' && !class_exists('Auth_SASL')) {
	return $this->setError(self::ERROR_BYE,
	"The Auth_SASL package is required for DIGEST-MD5 authentication");
	}

	$this->putLine($this->nextTag() . " AUTHENTICATE $type");
	$line = trim($this->readReply());

	if ($line[0] == '+') {
	$challenge = substr($line, 2);
	}
	else {
	return $this->parseResult($line);
	}

	if ($type == 'CRAM-MD5') {
	// RFC2195: CRAM-MD5
	$ipad = '';
	$opad = '';
	$xor = function($str1, $str2) {
	$result = '';
	$size = strlen($str1);
	for ($i=0; $i<$size; $i++) {
	$result .= chr(ord($str1[$i]) ^ ord($str2[$i]));
	}
	return $result;
	};

	// initialize ipad, opad
	for ($i=0; $i<64; $i++) {
	$ipad .= chr(0x36);
	$opad .= chr(0x5C);
	}

	// pad $pass so it's 64 bytes
	$pass = str_pad($pass, 64, chr(0));

	// generate hash
	$hash = md5($xor($pass, $opad) . pack("H*",
	md5($xor($pass, $ipad) . base64_decode($challenge))));
	$reply = base64_encode($user . ' ' . $hash);

	// send result
	$this->putLine($reply, true, true);
	}
	else {
	// RFC2831: DIGEST-MD5
	// proxy authorization
	if (!empty($this->prefs['auth_cid'])) {
	$authc = $this->prefs['auth_cid'];
	$pass = $this->prefs['auth_pw'];
	}
	else {
	$authc = $user;
	$user = '';
	}

	$auth_sasl = new Auth_SASL;
	$auth_sasl = $auth_sasl->factory('digestmd5');
	$reply = base64_encode($auth_sasl->getResponse($authc, $pass,
	base64_decode($challenge), $this->host, 'imap', $user));

	// send result
	$this->putLine($reply, true, true);
	$line = trim($this->readReply());

	if ($line[0] != '+') {
	return $this->parseResult($line);
	}

	// check response
	$challenge = substr($line, 2);
	$challenge = base64_decode($challenge);
	if (strpos($challenge, 'rspauth=') === false) {
	return $this->setError(self::ERROR_BAD,
	"Unexpected response from server to DIGEST-MD5 response");
	}

	$this->putLine('');
	}

	$line = $this->readReply();
	$result = $this->parseResult($line);
	}
	else if ($type == 'GSSAPI') {
	if (!extension_loaded('krb5')) {
	return $this->setError(self::ERROR_BYE,
	"The krb5 extension is required for GSSAPI authentication");
	}

	if (empty($this->prefs['gssapi_cn'])) {
	return $this->setError(self::ERROR_BYE,
	"The gssapi_cn parameter is required for GSSAPI authentication");
	}

	if (empty($this->prefs['gssapi_context'])) {
	return $this->setError(self::ERROR_BYE,
	"The gssapi_context parameter is required for GSSAPI authentication");
	}

	putenv('KRB5CCNAME=' . $this->prefs['gssapi_cn']);

	try {
	$ccache = new KRB5CCache();
	$ccache->open($this->prefs['gssapi_cn']);
	$gssapicontext = new GSSAPIContext();
	$gssapicontext->acquireCredentials($ccache);

	$token = '';
	$success = $gssapicontext->initSecContext($this->prefs['gssapi_context'], null, null, null, $token);
	$token = base64_encode($token);
	}
	catch (Exception $e) {
	trigger_error($e->getMessage(), E_USER_WARNING);
	return $this->setError(self::ERROR_BYE, "GSSAPI authentication failed");
	}

	$this->putLine($this->nextTag() . " AUTHENTICATE GSSAPI " . $token);
	$line = trim($this->readReply());

	if ($line[0] != '+') {
	return $this->parseResult($line);
	}

	try {
	$itoken = base64_decode(substr($line, 2));

	if (!$gssapicontext->unwrap($itoken, $itoken)) {
	throw new Exception("GSSAPI SASL input token unwrap failed");
	}

	if (strlen($itoken) < 4) {
	throw new Exception("GSSAPI SASL input token invalid");
	}

	// Integrity/encryption layers are not supported. The first bit
	// indicates that the server supports "no security layers".
	// 0x00 should not occur, but support broken implementations.
	$server_layers = ord($itoken[0]);
	if ($server_layers && ($server_layers & 0x1) != 0x1) {
	throw new Exception("Server requires GSSAPI SASL integrity/encryption");
	}

	// Construct output token. 0x01 in the first octet = SASL layer "none",
	// zero in the following three octets = no data follows.
	// See https://github.com/cyrusimap/cyrus-sasl/blob/e41cfb986c1b1935770de554872247453fdbb079/plugins/gssapi.c#L1284
	if (!$gssapicontext->wrap(pack("CCCC", 0x1, 0, 0, 0), $otoken, true)) {
	throw new Exception("GSSAPI SASL output token wrap failed");
	}
	}
	catch (Exception $e) {
	trigger_error($e->getMessage(), E_USER_WARNING);
	return $this->setError(self::ERROR_BYE, "GSSAPI authentication failed");
	}

	$this->putLine(base64_encode($otoken));

	$line = $this->readReply();
	$result = $this->parseResult($line);
	}
	else if ($type == 'PLAIN') {
	// proxy authorization
	if (!empty($this->prefs['auth_cid'])) {
	$authc = $this->prefs['auth_cid'];
	$pass = $this->prefs['auth_pw'];
	}
	else {
	$authc = $user;
	$user = '';
	}

	$reply = base64_encode($user . chr(0) . $authc . chr(0) . $pass);

	// RFC 4959 (SASL-IR): save one round trip
	if ($this->getCapability('SASL-IR')) {
	list($result, $line) = $this->execute("AUTHENTICATE PLAIN", [$reply],
	self::COMMAND_LASTLINE \| self::COMMAND_CAPABILITY \| self::COMMAND_ANONYMIZED);
	}
	else {
	$this->putLine($this->nextTag() . " AUTHENTICATE PLAIN");
	$line = trim($this->readReply());

	if ($line[0] != '+') {
	return $this->parseResult($line);
	}

	// send result, get reply and process it
	$this->putLine($reply, true, true);
	$line = $this->readReply();
	$result = $this->parseResult($line);
	}
	}
	else if ($type == 'LOGIN') {
	$this->putLine($this->nextTag() . " AUTHENTICATE LOGIN");

	$line = trim($this->readReply());
	if ($line[0] != '+') {
	return $this->parseResult($line);
	}

	$this->putLine(base64_encode($user), true, true);

	$line = trim($this->readReply());
	if ($line[0] != '+') {
	return $this->parseResult($line);
	}

	// send result, get reply and process it
	$this->putLine(base64_encode($pass), true, true);

	$line = $this->readReply();
	$result = $this->parseResult($line);
	}
	else if ($type == 'XOAUTH2') {
	$auth = base64_encode("user=$user\1auth=$pass\1\1");
	$this->putLine($this->nextTag() . " AUTHENTICATE XOAUTH2 $auth", true, true);

	$line = trim($this->readReply());

	if ($line[0] == '+') {
	// send empty line
	$this->putLine('', true, true);
	$line = $this->readReply();
	}

	$result = $this->parseResult($line);
	}
	else {
	$line = 'not supported';
	$result = self::ERROR_UNKNOWN;
	}

	if ($result === self::ERROR_OK) {
	// optional CAPABILITY response
	if ($line && preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
	$this->parseCapability($matches[1], true);
	}

	return $this->fp;
	}

	return $this->setError($result, "AUTHENTICATE $type: $line");
	}

	/**
	* LOGIN Authentication
	*
	* @param string $user Username
	* @param string $pass Password
	*
	* @return resource Connection resource on success, error code on error
	*/
	protected function login($user, $password)
	{
	// Prevent from sending credentials in plain text when connection is not secure
	if ($this->getCapability('LOGINDISABLED')) {
	return $this->setError(self::ERROR_BAD, "Login disabled by IMAP server");
	}

	list($code, $response) = $this->execute('LOGIN', [$this->escape($user), $this->escape($password)],
	self::COMMAND_CAPABILITY \| self::COMMAND_ANONYMIZED);

	// re-set capabilities list if untagged CAPABILITY response provided
	if (preg_match('/\* CAPABILITY (.+)/i', $response, $matches)) {
	$this->parseCapability($matches[1], true);
	}

	if ($code == self::ERROR_OK) {
	return $this->fp;
	}

	return $code;
	}

	/**
	* Detects hierarchy delimiter
	*
	* @return string The delimiter
	*/
	public function getHierarchyDelimiter()
	{
	if (!empty($this->prefs['delimiter'])) {
	return $this->prefs['delimiter'];
	}

	// try (LIST "" ""), should return delimiter (RFC2060 Sec 6.3.8)
	list($code, $response) = $this->execute('LIST', [$this->escape(''), $this->escape('')]);

	if ($code == self::ERROR_OK) {
	$args = $this->tokenizeResponse($response, 4);
	$delimiter = $args[3];

	if (strlen($delimiter) > 0) {
	return ($this->prefs['delimiter'] = $delimiter);
	}
	}
	}

	/**
	* NAMESPACE handler (RFC 2342)
	*
	* @return array Namespace data hash (personal, other, shared)
	*/
	public function getNamespace()
	{
	if (array_key_exists('namespace', $this->prefs)) {
	return $this->prefs['namespace'];
	}

	if (!$this->getCapability('NAMESPACE')) {
	return self::ERROR_BAD;
	}

	list($code, $response) = $this->execute('NAMESPACE');

	if ($code == self::ERROR_OK && preg_match('/^\* NAMESPACE /', $response)) {
	$response = substr($response, 11);
	$data = $this->tokenizeResponse($response);
	}

	if (!isset($data) \|\| !is_array($data)) {
	return $code;
	}

	$this->prefs['namespace'] = [
	'personal' => $data[0],
	'other' => $data[1],
	'shared' => $data[2],
	];

	return $this->prefs['namespace'];
	}

	/**
	* Connects to IMAP server and authenticates.
	*
	* @param string $host Server hostname or IP
	* @param string $user User name
	* @param string $password Password
	* @param array $options Connection and class options
	*
	* @return bool True on success, False on failure
	*/
	public function connect($host, $user, $password, $options = [])
	{
	// configure
	$this->set_prefs($options);

	$this->host = $host;
	$this->user = $user;
	$this->logged = false;
	$this->selected = null;

	// check input
	if (empty($host)) {
	$this->setError(self::ERROR_BAD, "Empty host");
	return false;
	}

	if (empty($user)) {
	$this->setError(self::ERROR_NO, "Empty user");
	return false;
	}

	if (empty($password) && empty($options['gssapi_cn'])) {
	$this->setError(self::ERROR_NO, "Empty password");
	return false;
	}

	// Connect
	if (!$this->_connect($host)) {
	return false;
	}

	// Send pre authentication ID info (#7860)
	if (!empty($this->prefs['preauth_ident']) && $this->getCapability('ID')) {
	$this->data['ID'] = $this->id($this->prefs['preauth_ident']);
	}

	$auth_method = $this->prefs['auth_type'];
	$auth_methods = [];
	$result = null;

	// check for supported auth methods
	if (!$auth_method \|\| $auth_method == 'CHECK') {
	if ($auth_caps = $this->getCapability('AUTH')) {
	$auth_methods = $auth_caps;
	}

	// Use best (for security) supported authentication method
	$all_methods = ['DIGEST-MD5', 'CRAM-MD5', 'CRAM_MD5', 'PLAIN', 'LOGIN'];

	if (!empty($this->prefs['gssapi_cn'])) {
	array_unshift($all_methods, 'GSSAPI');
	}

	foreach ($all_methods as $auth_method) {
	if (in_array($auth_method, $auth_methods)) {
	break;
	}
	}

	// Prefer LOGIN over AUTHENTICATE LOGIN for performance reasons
	if ($auth_method == 'LOGIN' && !$this->getCapability('LOGINDISABLED')) {
	$auth_method = 'IMAP';
	}
	}

	// pre-login capabilities can be not complete
	$this->capability_read = false;

	// Authenticate
	switch ($auth_method) {
	case 'CRAM_MD5':
	$auth_method = 'CRAM-MD5';
	case 'CRAM-MD5':
	case 'DIGEST-MD5':
	case 'GSSAPI':
	case 'PLAIN':
	case 'LOGIN':
	case 'XOAUTH2':
	$result = $this->authenticate($user, $password, $auth_method);
	break;

	case 'IMAP':
	$result = $this->login($user, $password);
	break;

	default:
	$this->setError(self::ERROR_BAD, "Configuration error. Unknown auth method: $auth_method");
	}

	// Connected and authenticated
	if (is_resource($result)) {
	if (!empty($this->prefs['force_caps'])) {
	$this->clearCapability();
	}

	$this->logged = true;

	// Send ID info after authentication to ensure reliable result (#7517)
	if (!empty($this->prefs['ident']) && $this->getCapability('ID')) {
	$this->data['ID'] = $this->id($this->prefs['ident']);
	}

	return true;
	}

	$this->closeConnection();

	return false;
	}

	/**
	* Connects to IMAP server.
	*
	* @param string $host Server hostname or IP
	*
	* @return bool True on success, False on failure
	*/
	protected function _connect($host)
	{
	// initialize connection
	$this->error = '';
	$this->errornum = self::ERROR_OK;

	if (empty($this->prefs['port'])) {
	$this->prefs['port'] = 143;
	}

	// check for SSL
	if (!empty($this->prefs['ssl_mode']) && $this->prefs['ssl_mode'] != 'tls') {
	$host = $this->prefs['ssl_mode'] . '://' . $host;
	}

	if (empty($this->prefs['timeout']) \|\| $this->prefs['timeout'] < 0) {
	$this->prefs['timeout'] = max(0, intval(ini_get('default_socket_timeout')));
	}

	if ($this->debug) {
	// set connection identifier for debug output
	$this->resourceid = strtoupper(substr(md5(microtime() . $host . $this->user), 0, 4));

	$_host = ($this->prefs['ssl_mode'] == 'tls' ? 'tls://' : '') . $host . ':' . $this->prefs['port'];
	$this->debug("Connecting to $_host...");
	}

	if (!empty($this->prefs['socket_options'])) {
	$context = stream_context_create($this->prefs['socket_options']);
	$this->fp = stream_socket_client($host . ':' . $this->prefs['port'], $errno, $errstr,
	$this->prefs['timeout'], STREAM_CLIENT_CONNECT, $context);
	}
	else {
	$this->fp = @fsockopen($host, $this->prefs['port'], $errno, $errstr, $this->prefs['timeout']);
	}

	if (!$this->fp) {
	$this->setError(self::ERROR_BAD, sprintf("Could not connect to %s:%d: %s",
	$host, $this->prefs['port'], $errstr ?: "Unknown reason"));

	return false;
	}

	if ($this->prefs['timeout'] > 0) {
	stream_set_timeout($this->fp, $this->prefs['timeout']);
	}

	$line = trim(fgets($this->fp, 8192));

	if ($this->debug && $line) {
	$this->debug('S: '. $line);
	}

	// Connected to wrong port or connection error?
	if (!preg_match('/^\* (OK\|PREAUTH)/i', $line)) {
	if ($line)
	$error = sprintf("Wrong startup greeting (%s:%d): %s", $host, $this->prefs['port'], $line);
	else
	$error = sprintf("Empty startup greeting (%s:%d)", $host, $this->prefs['port']);

	$this->setError(self::ERROR_BAD, $error);
	$this->closeConnection();
	return false;
	}

	$this->data['GREETING'] = trim(preg_replace('/\[[^\]]+\]\s*/', '', $line));

	// RFC3501 [7.1] optional CAPABILITY response
	if (preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
	$this->parseCapability($matches[1], true);
	}

	// TLS connection
	if (isset($this->prefs['ssl_mode']) && $this->prefs['ssl_mode'] == 'tls' && $this->getCapability('STARTTLS')) {
	$res = $this->execute('STARTTLS');

	if (empty($res) \|\| $res[0] != self::ERROR_OK) {
	$this->closeConnection();
	return false;
	}

	if (isset($this->prefs['socket_options']['ssl']['crypto_method'])) {
	$crypto_method = $this->prefs['socket_options']['ssl']['crypto_method'];
	}
	else {
	// There is no flag to enable all TLS methods. Net_SMTP
	// handles enabling TLS similarly.
	$crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT
	\| @STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT
	\| @STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
	}

	if (!stream_socket_enable_crypto($this->fp, true, $crypto_method)) {
	$this->setError(self::ERROR_BAD, "Unable to negotiate TLS");
	$this->closeConnection();
	return false;
	}

	// Now we're secure, capabilities need to be reread
	$this->clearCapability();
	}

	return true;
	}

	/**
	* Initializes environment
	*/
	protected function set_prefs($prefs)
	{
	// set preferences
	if (is_array($prefs)) {
	$this->prefs = $prefs;
	}

	// set auth method
	if (!empty($this->prefs['auth_type'])) {
	$this->prefs['auth_type'] = strtoupper($this->prefs['auth_type']);
	}
	else {
	$this->prefs['auth_type'] = 'CHECK';
	}

	// disabled capabilities
	if (!empty($this->prefs['disabled_caps'])) {
	$this->prefs['disabled_caps'] = array_map('strtoupper', (array)$this->prefs['disabled_caps']);
	}

	// additional message flags
	if (!empty($this->prefs['message_flags'])) {
	$this->flags = array_merge($this->flags, $this->prefs['message_flags']);
	unset($this->prefs['message_flags']);
	}
	}

	/**
	* Checks connection status
	*
	* @return bool True if connection is active and user is logged in, False otherwise.
	*/
	public function connected()
	{
	return $this->fp && $this->logged;
	}

	/**
	* Closes connection with logout.
	*/
	public function closeConnection()
	{
	if ($this->logged && $this->putLine($this->nextTag() . ' LOGOUT')) {
	$this->readReply();
	}

	$this->closeSocket();
	}

	/**
	* Executes SELECT command (if mailbox is already not in selected state)
	*
	* @param string $mailbox Mailbox name
	* @param array $qresync_data QRESYNC data (RFC5162)
	*
	* @return bool True on success, false on error
	*/
	public function select($mailbox, $qresync_data = null)
	{
	if (!strlen($mailbox)) {
	return false;
	}

	if ($this->selected === $mailbox) {
	return true;
	}

	$params = [$this->escape($mailbox)];

	// QRESYNC data items
	// 0. the last known UIDVALIDITY,
	// 1. the last known modification sequence,
	// 2. the optional set of known UIDs, and
	// 3. an optional parenthesized list of known sequence ranges and their
	// corresponding UIDs.
	if (!empty($qresync_data)) {
	if (!empty($qresync_data[2])) {
	$qresync_data[2] = self::compressMessageSet($qresync_data[2]);
	}

	$params[] = ['QRESYNC', $qresync_data];
	}

	list($code, $response) = $this->execute('SELECT', $params);

	if ($code == self::ERROR_OK) {
	$this->clear_mailbox_cache();

	$response = explode("\r\n", $response);
	foreach ($response as $line) {
	if (preg_match('/^\* OK \[/i', $line)) {
	$pos = strcspn($line, ' ]', 6);
	$token = strtoupper(substr($line, 6, $pos));
	$pos += 7;

	switch ($token) {
	case 'UIDNEXT':
	case 'UIDVALIDITY':
	case 'UNSEEN':
	if ($len = strspn($line, '0123456789', $pos)) {
	$this->data[$token] = (int) substr($line, $pos, $len);
	}
	break;

	case 'HIGHESTMODSEQ':
	if ($len = strspn($line, '0123456789', $pos)) {
	$this->data[$token] = (string) substr($line, $pos, $len);
	}
	break;

	case 'NOMODSEQ':
	$this->data[$token] = true;
	break;

	case 'PERMANENTFLAGS':
	$start = strpos($line, '(', $pos);
	$end = strrpos($line, ')');
	if ($start && $end) {
	$flags = substr($line, $start + 1, $end - $start - 1);
	$this->data[$token] = explode(' ', $flags);
	}
	break;
	}
	}
	else if (preg_match('/^\* ([0-9]+) (EXISTS\|RECENT\|FETCH)/i', $line, $match)) {
	$token = strtoupper($match[2]);
	switch ($token) {
	case 'EXISTS':
	case 'RECENT':
	$this->data[$token] = (int) $match[1];
	break;

	case 'FETCH':
	// QRESYNC FETCH response (RFC5162)
	$line = substr($line, strlen($match[0]));
	$fetch_data = $this->tokenizeResponse($line, 1);
	$data = ['id' => $match[1]];

	for ($i=0, $size=count($fetch_data); $i<$size; $i+=2) {
	$data[strtolower($fetch_data[$i])] = $fetch_data[$i+1];
	}

	$this->data['QRESYNC'][$data['uid']] = $data;
	break;
	}
	}
	// QRESYNC VANISHED response (RFC5162)
	else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) {
	$line = substr($line, strlen($match[0]));
	$v_data = $this->tokenizeResponse($line, 1);

	$this->data['VANISHED'] = $v_data;
	}
	}

	$this->data['READ-WRITE'] = $this->resultcode != 'READ-ONLY';
	$this->selected = $mailbox;

	return true;
	}

	return false;
	}

	/**
	* Executes STATUS command
	*
	* @param string $mailbox Mailbox name
	* @param array $items Additional requested item names. By default
	* MESSAGES and UNSEEN are requested. Other defined
	* in RFC3501: UIDNEXT, UIDVALIDITY, RECENT
	*
	* @return array Status item-value hash
	* @since 0.5-beta
	*/
	public function status($mailbox, $items = [])
	{
	if (!strlen($mailbox)) {
	return false;
	}

	if (!in_array('MESSAGES', $items)) {
	$items[] = 'MESSAGES';
	}
	if (!in_array('UNSEEN', $items)) {
	$items[] = 'UNSEEN';
	}

	list($code, $response) = $this->execute('STATUS',
	[$this->escape($mailbox), '(' . implode(' ', $items) . ')'], 0, '/^\* STATUS /i');

	if ($code == self::ERROR_OK && $response) {
	$result = [];
	$response = substr($response, 9); // remove prefix "* STATUS "

	list($mbox, $items) = $this->tokenizeResponse($response, 2);

	// Fix for #1487859. Some buggy server returns not quoted
	// folder name with spaces. Let's try to handle this situation
	if (!is_array($items) && ($pos = strpos($response, '(')) !== false) {
	$response = substr($response, $pos);
	$items = $this->tokenizeResponse($response, 1);
	}

	if (!is_array($items)) {
	return $result;
	}

	for ($i=0, $len=count($items); $i<$len; $i += 2) {
	$result[$items[$i]] = $items[$i+1];
	}

	$this->data['STATUS:'.$mailbox] = $result;

	return $result;
	}

	return false;
	}

	/**
	* Executes EXPUNGE command
	*
	* @param string $mailbox Mailbox name
	* @param string\|array $messages Message UIDs to expunge
	*
	* @return bool True on success, False on error
	*/
	public function expunge($mailbox, $messages = null)
	{
	if (!$this->select($mailbox)) {
	return false;
	}

	if (empty($this->data['READ-WRITE'])) {
	$this->setError(self::ERROR_READONLY, "Mailbox is read-only");
	return false;
	}

	// Clear internal status cache
	$this->clear_status_cache($mailbox);

	if (!empty($messages) && $messages != '*' && $this->hasCapability('UIDPLUS')) {
	$messages = self::compressMessageSet($messages);
	$result = $this->execute('UID EXPUNGE', [$messages], self::COMMAND_NORESPONSE);
	}
	else {
	$result = $this->execute('EXPUNGE', null, self::COMMAND_NORESPONSE);
	}

	if ($result == self::ERROR_OK) {
	$this->selected = null; // state has changed, need to reselect
	return true;
	}

	return false;
	}

	/**
	* Executes CLOSE command
	*
	* @return bool True on success, False on error
	* @since 0.5
	*/
	public function close()
	{
	$result = $this->execute('CLOSE', null, self::COMMAND_NORESPONSE);

	if ($result == self::ERROR_OK) {
	$this->selected = null;
	return true;
	}

	return false;
	}

	/**
	* Folder subscription (SUBSCRIBE)
	*
	* @param string $mailbox Mailbox name
	*
	* @return bool True on success, False on error
	*/
	public function subscribe($mailbox)
	{
	$result = $this->execute('SUBSCRIBE', [$this->escape($mailbox)], self::COMMAND_NORESPONSE);

	return $result == self::ERROR_OK;
	}

	/**
	* Folder unsubscription (UNSUBSCRIBE)
	*
	* @param string $mailbox Mailbox name
	*
	* @return bool True on success, False on error
	*/
	public function unsubscribe($mailbox)
	{
	$result = $this->execute('UNSUBSCRIBE', [$this->escape($mailbox)], self::COMMAND_NORESPONSE);

	return $result == self::ERROR_OK;
	}

	/**
	* Folder creation (CREATE)
	*
	* @param string $mailbox Mailbox name
	* @param array $types Optional folder types (RFC 6154)
	*
	* @return bool True on success, False on error
	*/
	public function createFolder($mailbox, $types = null)
	{
	$args = [$this->escape($mailbox)];

	// RFC 6154: CREATE-SPECIAL-USE
	if (!empty($types) && $this->getCapability('CREATE-SPECIAL-USE')) {
	$args[] = '(USE (' . implode(' ', $types) . '))';
	}

	$result = $this->execute('CREATE', $args, self::COMMAND_NORESPONSE);

	return $result == self::ERROR_OK;
	}

	/**
	* Folder renaming (RENAME)
	*
	* @param string $mailbox Mailbox name
	*
	* @return bool True on success, False on error
	*/
	public function renameFolder($from, $to)
	{
	$result = $this->execute('RENAME', [$this->escape($from), $this->escape($to)], self::COMMAND_NORESPONSE);

	return $result == self::ERROR_OK;
	}

	/**
	* Executes DELETE command
	*
	* @param string $mailbox Mailbox name
	*
	* @return bool True on success, False on error
	*/
	public function deleteFolder($mailbox)
	{
	$result = $this->execute('DELETE', [$this->escape($mailbox)], self::COMMAND_NORESPONSE);

	return $result == self::ERROR_OK;
	}

	/**
	* Removes all messages in a folder
	*
	* @param string $mailbox Mailbox name
	*
	* @return bool True on success, False on error
	*/
	public function clearFolder($mailbox)
	{
	if ($this->countMessages($mailbox) > 0) {
	$res = $this->flag($mailbox, '1:*', 'DELETED');
	}
	else {
	return true;
	}

	if (!empty($res)) {
	if ($this->selected === $mailbox) {
	$res = $this->close();
	}
	else {
	$res = $this->expunge($mailbox);
	}

	return $res;
	}

	return false;
	}

	/**
	* Returns list of mailboxes
	*
	* @param string $ref Reference name
	* @param string $mailbox Mailbox name
	* @param array $return_opts (see self::_listMailboxes)
	* @param array $select_opts (see self::_listMailboxes)
	*
	* @return array\|bool List of mailboxes or hash of options if STATUS/MYRIGHTS response
	* is requested, False on error.
	*/
	public function listMailboxes($ref, $mailbox, $return_opts = [], $select_opts = [])
	{
	return $this->_listMailboxes($ref, $mailbox, false, $return_opts, $select_opts);
	}

	/**
	* Returns list of subscribed mailboxes
	*
	* @param string $ref Reference name
	* @param string $mailbox Mailbox name
	* @param array $return_opts (see self::_listMailboxes)
	*
	* @return array\|bool List of mailboxes or hash of options if STATUS/MYRIGHTS response
	* is requested, False on error.
	*/
	public function listSubscribed($ref, $mailbox, $return_opts = [])
	{
	return $this->_listMailboxes($ref, $mailbox, true, $return_opts, null);
	}

	/**
	* IMAP LIST/LSUB command
	*
	* @param string $ref Reference name
	* @param string $mailbox Mailbox name
	* @param bool $subscribed Enables returning subscribed mailboxes only
	* @param array $return_opts List of RETURN options (RFC5819: LIST-STATUS, RFC5258: LIST-EXTENDED)
	* Possible: MESSAGES, RECENT, UIDNEXT, UIDVALIDITY, UNSEEN,
	* MYRIGHTS, SUBSCRIBED, CHILDREN
	* @param array $select_opts List of selection options (RFC5258: LIST-EXTENDED)
	* Possible: SUBSCRIBED, RECURSIVEMATCH, REMOTE,
	* SPECIAL-USE (RFC6154)
	*
	* @return array\|bool List of mailboxes or hash of options if STATUS/MYRIGHTS response
	* is requested, False on error.
	*/
	protected function _listMailboxes($ref, $mailbox, $subscribed = false, $return_opts = [], $select_opts = [])
	{
	if (!strlen($mailbox)) {
	$mailbox = '*';
	}

	$lstatus = false;
	$args = [];
	$rets = [];

	if (!empty($select_opts) && $this->getCapability('LIST-EXTENDED')) {
	$select_opts = (array) $select_opts;

	$args[] = '(' . implode(' ', $select_opts) . ')';
	}

	$args[] = $this->escape($ref);
	$args[] = $this->escape($mailbox);

	if (!empty($return_opts) && $this->getCapability('LIST-EXTENDED')) {
	$ext_opts = ['SUBSCRIBED', 'CHILDREN'];
	$rets = array_intersect($return_opts, $ext_opts);
	$return_opts = array_diff($return_opts, $rets);
	}

	if (!empty($return_opts) && $this->getCapability('LIST-STATUS')) {
	$lstatus = true;
	$status_opts = ['MESSAGES', 'RECENT', 'UIDNEXT', 'UIDVALIDITY', 'UNSEEN', 'SIZE'];
	$opts = array_diff($return_opts, $status_opts);
	$status_opts = array_diff($return_opts, $opts);

	if (!empty($status_opts)) {
	$rets[] = 'STATUS (' . implode(' ', $status_opts) . ')';
	}

	if (!empty($opts)) {
	$rets = array_merge($rets, $opts);
	}
	}

	if (!empty($rets)) {
	$args[] = 'RETURN (' . implode(' ', $rets) . ')';
	}

	list($code, $response) = $this->execute($subscribed ? 'LSUB' : 'LIST', $args);

	if ($code == self::ERROR_OK) {
	$folders = [];
	$last = 0;
	$pos = 0;
	$response .= "\r\n";

	while ($pos = strpos($response, "\r\n", $pos+1)) {
	// literal string, not real end-of-command-line
	if ($response[$pos-1] == '}') {
	continue;
	}

	$line = substr($response, $last, $pos - $last);
	$last = $pos + 2;

	if (!preg_match('/^\* (LIST\|LSUB\|STATUS\|MYRIGHTS) /i', $line, $m)) {
	continue;
	}

	$cmd = strtoupper($m[1]);
	$line = substr($line, strlen($m[0]));

	// * LIST (<options>) <delimiter> <mailbox>
	if ($cmd == 'LIST' \|\| $cmd == 'LSUB') {
	list($opts, $delim, $mailbox) = $this->tokenizeResponse($line, 3);

	// Remove redundant separator at the end of folder name, UW-IMAP bug? (#1488879)
	if ($delim) {
	$mailbox = rtrim($mailbox, $delim);
	}

	// Add to result array
	if (!$lstatus) {
	$folders[] = $mailbox;
	}
	else {
	$folders[$mailbox] = [];
	}

	// store folder options
	if ($cmd == 'LIST') {
	// Add to options array
	if (empty($this->data['LIST'][$mailbox])) {
	$this->data['LIST'][$mailbox] = $opts;
	}
	else if (!empty($opts)) {
	$this->data['LIST'][$mailbox] = array_unique(array_merge(
	$this->data['LIST'][$mailbox], $opts));
	}
	}
	}
	else if ($lstatus) {
	// * STATUS <mailbox> (<result>)
	if ($cmd == 'STATUS') {
	list($mailbox, $status) = $this->tokenizeResponse($line, 2);

	for ($i=0, $len=count($status); $i<$len; $i += 2) {
	list($name, $value) = $this->tokenizeResponse($status, 2);
	$folders[$mailbox][$name] = $value;
	}
	}
	// * MYRIGHTS <mailbox> <acl>
	else if ($cmd == 'MYRIGHTS') {
	list($mailbox, $acl) = $this->tokenizeResponse($line, 2);
	$folders[$mailbox]['MYRIGHTS'] = $acl;
	}
	}
	}

	return $folders;
	}

	return false;
	}

	/**
	* Returns count of all messages in a folder
	*
	* @param string $mailbox Mailbox name
	*
	* @return int Number of messages, False on error
	*/
	public function countMessages($mailbox)
	{
	if ($this->selected === $mailbox && isset($this->data['EXISTS'])) {
	return $this->data['EXISTS'];
	}

	// Check internal cache
	if (!empty($this->data['STATUS:'.$mailbox])) {
	$cache = $this->data['STATUS:'.$mailbox];
	if (isset($cache['MESSAGES'])) {
	return (int) $cache['MESSAGES'];
	}
	}

	// Try STATUS (should be faster than SELECT)
	$counts = $this->status($mailbox);
	if (is_array($counts)) {
	return (int) $counts['MESSAGES'];
	}

	return false;
	}

	/**
	* Returns count of messages with \Recent flag in a folder
	*
	* @param string $mailbox Mailbox name
	*
	* @return int Number of messages, False on error
	*/
	public function countRecent($mailbox)
	{
	if ($this->selected === $mailbox && isset($this->data['RECENT'])) {
	return $this->data['RECENT'];
	}

	// Check internal cache
	$cache = $this->data['STATUS:'.$mailbox];
	if (!empty($cache) && isset($cache['RECENT'])) {
	return (int) $cache['RECENT'];
	}

	// Try STATUS (should be faster than SELECT)
	$counts = $this->status($mailbox, ['RECENT']);
	if (is_array($counts)) {
	return (int) $counts['RECENT'];
	}

	return false;
	}

	/**
	* Returns count of messages without \Seen flag in a specified folder
	*
	* @param string $mailbox Mailbox name
	*
	* @return int Number of messages, False on error
	*/
	public function countUnseen($mailbox)
	{
	// Check internal cache
	if (!empty($this->data['STATUS:'.$mailbox])) {
	$cache = $this->data['STATUS:'.$mailbox];
	if (isset($cache['UNSEEN'])) {
	return (int) $cache['UNSEEN'];
	}
	}

	// Try STATUS (should be faster than SELECT+SEARCH)
	$counts = $this->status($mailbox);
	if (is_array($counts)) {
	return (int) $counts['UNSEEN'];
	}

	// Invoke SEARCH as a fallback
	$index = $this->search($mailbox, 'ALL UNSEEN', false, ['COUNT']);
	if (!$index->is_error()) {
	return $index->count();
	}

	return false;
	}

	/**
	* Executes ID command (RFC2971)
	*
	* @param array $items Client identification information key/value hash
	*
	* @return array\|false Server identification information key/value hash, False on error
	* @since 0.6
	*/
	public function id($items = [])
	{
	if (is_array($items) && !empty($items)) {
	foreach ($items as $key => $value) {
	$args[] = $this->escape($key, true);
	$args[] = $this->escape($value, true);
	}
	}

	list($code, $response) = $this->execute('ID',
	[!empty($args) ? '(' . implode(' ', (array) $args) . ')' : $this->escape(null)],
	0, '/^\* ID /i'
	);

	if ($code == self::ERROR_OK && $response) {
	$response = substr($response, 5); // remove prefix "* ID "
	$items = $this->tokenizeResponse($response, 1);
	$result = [];

	if (is_array($items)) {
	for ($i=0, $len=count($items); $i<$len; $i += 2) {
	$result[$items[$i]] = $items[$i+1];
	}
	}

	return $result;
	}

	return false;
	}

	/**
	* Executes ENABLE command (RFC5161)
	*
	* @param mixed $extension Extension name to enable (or array of names)
	*
	* @return array\|bool List of enabled extensions, False on error
	* @since 0.6
	*/
	public function enable($extension)
	{
	if (empty($extension)) {
	return false;
	}

	if (!$this->hasCapability('ENABLE')) {
	return false;
	}

	if (!is_array($extension)) {
	$extension = [$extension];
	}

	if (!empty($this->extensions_enabled)) {
	// check if all extensions are already enabled
	$diff = array_diff($extension, $this->extensions_enabled);

	if (empty($diff)) {
	return $extension;
	}

	// Make sure the mailbox isn't selected, before enabling extension(s)
	if ($this->selected !== null) {
	$this->close();
	}
	}

	list($code, $response) = $this->execute('ENABLE', $extension, 0, '/^\* ENABLED /i');

	if ($code == self::ERROR_OK && $response) {
	$response = substr($response, 10); // remove prefix "* ENABLED "
	$result = (array) $this->tokenizeResponse($response);

	$this->extensions_enabled = array_unique(array_merge((array)$this->extensions_enabled, $result));

	return $this->extensions_enabled;
	}

	return false;
	}

	/**
	* Executes SORT command
	*
	* @param string $mailbox Mailbox name
	* @param string $field Field to sort by (ARRIVAL, CC, DATE, FROM, SIZE, SUBJECT, TO)
	* @param string $criteria Searching criteria
	* @param bool $return_uid Enables UID SORT usage
	* @param string $encoding Character set
	*
	* @return rcube_result_index Response data
	*/
	public function sort($mailbox, $field = 'ARRIVAL', $criteria = '', $return_uid = false, $encoding = 'US-ASCII')
	{
	$old_sel = $this->selected;
	$supported = ['ARRIVAL', 'CC', 'DATE', 'FROM', 'SIZE', 'SUBJECT', 'TO'];
	$field = strtoupper($field);

	if ($field == 'INTERNALDATE') {
	$field = 'ARRIVAL';
	}

	if (!in_array($field, $supported)) {
	return new rcube_result_index($mailbox);
	}

	if (!$this->select($mailbox)) {
	return new rcube_result_index($mailbox);
	}

	// return empty result when folder is empty and we're just after SELECT
	if ($old_sel != $mailbox && empty($this->data['EXISTS'])) {
	return new rcube_result_index($mailbox, '* SORT');
	}

	// RFC 5957: SORT=DISPLAY
	if (($field == 'FROM' \|\| $field == 'TO') && $this->getCapability('SORT=DISPLAY')) {
	$field = 'DISPLAY' . $field;
	}

	$encoding = $encoding ? trim($encoding) : 'US-ASCII';
	$criteria = $criteria ? 'ALL ' . trim($criteria) : 'ALL';

	list($code, $response) = $this->execute($return_uid ? 'UID SORT' : 'SORT',
	["($field)", $encoding, $criteria]);

	if ($code != self::ERROR_OK) {
	$response = null;
	}

	return new rcube_result_index($mailbox, $response);
	}

	/**
	* Executes THREAD command
	*
	* @param string $mailbox Mailbox name
	* @param string $algorithm Threading algorithm (ORDEREDSUBJECT, REFERENCES, REFS)
	* @param string $criteria Searching criteria
	* @param bool $return_uid Enables UIDs in result instead of sequence numbers
	* @param string $encoding Character set
	*
	* @return rcube_result_thread Thread data
	*/
	public function thread($mailbox, $algorithm = 'REFERENCES', $criteria = '', $return_uid = false, $encoding = 'US-ASCII')
	{
	$old_sel = $this->selected;

	if (!$this->select($mailbox)) {
	return new rcube_result_thread($mailbox);
	}

	// return empty result when folder is empty and we're just after SELECT
	if ($old_sel != $mailbox && !$this->data['EXISTS']) {
	return new rcube_result_thread($mailbox, '* THREAD');
	}

	$encoding = $encoding ? trim($encoding) : 'US-ASCII';
	$algorithm = $algorithm ? trim($algorithm) : 'REFERENCES';
	$criteria = $criteria ? 'ALL '.trim($criteria) : 'ALL';

	list($code, $response) = $this->execute($return_uid ? 'UID THREAD' : 'THREAD',
	[$algorithm, $encoding, $criteria]);

	if ($code != self::ERROR_OK) {
	$response = null;
	}

	return new rcube_result_thread($mailbox, $response);
	}

	/**
	* Executes SEARCH command
	*
	* @param string $mailbox Mailbox name
	* @param string $criteria Searching criteria
	* @param bool $return_uid Enable UID in result instead of sequence ID
	* @param array $items Return items (MIN, MAX, COUNT, ALL)
	*
	* @return rcube_result_index Result data
	*/
	public function search($mailbox, $criteria, $return_uid = false, $items = [])
	{
	$old_sel = $this->selected;

	if (!$this->select($mailbox)) {
	return new rcube_result_index($mailbox);
	}

	// return empty result when folder is empty and we're just after SELECT
	if ($old_sel != $mailbox && !$this->data['EXISTS']) {
	return new rcube_result_index($mailbox, '* SEARCH');
	}

	// If ESEARCH is supported always use ALL
	// but not when items are specified or using simple id2uid search
	if (empty($items) && preg_match('/[^0-9]/', $criteria)) {
	$items = ['ALL'];
	}

	$esearch = empty($items) ? false : $this->getCapability('ESEARCH');
	$criteria = trim($criteria);
	$params = '';

	// RFC4731: ESEARCH
	if (!empty($items) && $esearch) {
	$params .= 'RETURN (' . implode(' ', $items) . ')';
	}

	if (!empty($criteria)) {
	$params .= ($params ? ' ' : '') . $criteria;
	}
	else {
	$params .= 'ALL';
	}

	list($code, $response) = $this->execute($return_uid ? 'UID SEARCH' : 'SEARCH', [$params]);

	if ($code != self::ERROR_OK) {
	$response = null;
	}

	return new rcube_result_index($mailbox, $response);
	}

	/**
	* Simulates SORT command by using FETCH and sorting.
	*
	* @param string $mailbox Mailbox name
	* @param string\|array $message_set Searching criteria (list of messages to return)
	* @param string $index_field Field to sort by (ARRIVAL, CC, DATE, FROM, SIZE, SUBJECT, TO)
	* @param bool $skip_deleted Makes that DELETED messages will be skipped
	* @param bool $uidfetch Enables UID FETCH usage
	* @param bool $return_uid Enables returning UIDs instead of IDs
	*
	* @return rcube_result_index Response data
	*/
	public function index($mailbox, $message_set, $index_field = '', $skip_deleted = true,
	$uidfetch = false, $return_uid = false)
	{
	$msg_index = $this->fetchHeaderIndex($mailbox, $message_set,
	$index_field, $skip_deleted, $uidfetch, $return_uid);

	if (!empty($msg_index)) {
	asort($msg_index); // ASC
	$msg_index = array_keys($msg_index);
	$msg_index = '* SEARCH ' . implode(' ', $msg_index);
	}
	else {
	$msg_index = is_array($msg_index) ? '* SEARCH' : null;
	}

	return new rcube_result_index($mailbox, $msg_index);
	}

	/**
	* Fetches specified header/data value for a set of messages.
	*
	* @param string $mailbox Mailbox name
	* @param string\|array $message_set Searching criteria (list of messages to return)
	* @param string $index_field Field to sort by (ARRIVAL, CC, DATE, FROM, SIZE, SUBJECT, TO)
	* @param bool $skip_deleted Makes that DELETED messages will be skipped
	* @param bool $uidfetch Enables UID FETCH usage
	* @param bool $return_uid Enables returning UIDs instead of IDs
	*
	* @return array\|bool List of header values or False on failure
	*/
	public function fetchHeaderIndex($mailbox, $message_set, $index_field = '', $skip_deleted = true,
	$uidfetch = false, $return_uid = false)
	{
	// Validate input
	if (is_array($message_set)) {
	if (!($message_set = $this->compressMessageSet($message_set))) {
	return false;
	}
	}
	else if (empty($message_set)) {
	return false;
	}
	else if (strpos($message_set, ':')) {
	list($from_idx, $to_idx) = explode(':', $message_set);
	if ($to_idx != '*' && (int) $from_idx > (int) $to_idx) {
	return false;
	}
	}

	$index_field = empty($index_field) ? 'DATE' : strtoupper($index_field);

	$supported = [
	'DATE' => 1,
	'INTERNALDATE' => 4,
	'ARRIVAL' => 4,
	'FROM' => 1,
	'REPLY-TO' => 1,
	'SENDER' => 1,
	'TO' => 1,
	'CC' => 1,
	'SUBJECT' => 1,
	'UID' => 2,
	'SIZE' => 2,
	'SEEN' => 3,
	'RECENT' => 3,
	'DELETED' => 3,
	];

	if (empty($supported[$index_field])) {
	return false;
	}

	$mode = $supported[$index_field];

	// Select the mailbox
	if (!$this->select($mailbox)) {
	return false;
	}

	// build FETCH command string
	$key = $this->nextTag();
	$cmd = $uidfetch ? 'UID FETCH' : 'FETCH';
	$fields = [];

	if ($return_uid) {
	$fields[] = 'UID';
	}
	if ($skip_deleted) {
	$fields[] = 'FLAGS';
	}

	if ($mode == 1) {
	if ($index_field == 'DATE') {
	$fields[] = 'INTERNALDATE';
	}
	$fields[] = "BODY.PEEK[HEADER.FIELDS ($index_field)]";
	}
	else if ($mode == 2) {
	if ($index_field == 'SIZE') {
	$fields[] = 'RFC822.SIZE';
	}
	else if (!$return_uid \|\| $index_field != 'UID') {
	$fields[] = $index_field;
	}
	}
	else if ($mode == 3 && !$skip_deleted) {
	$fields[] = 'FLAGS';
	}
	else if ($mode == 4) {
	$fields[] = 'INTERNALDATE';
	}

	$request = "$key $cmd $message_set (" . implode(' ', $fields) . ")";

	if (!$this->putLine($request)) {
	$this->setError(self::ERROR_COMMAND, "Failed to send $cmd command");
	return false;
	}

	$result = [];

	do {
	$line = rtrim($this->readLine(200));
	$line = $this->multLine($line);

	if (preg_match('/^\* ([0-9]+) FETCH/', $line, $m)) {
	$id = $m[1];
	$flags = null;

	if ($return_uid) {
	if (preg_match('/UID ([0-9]+)/', $line, $matches)) {
	$id = (int) $matches[1];
	}
	else {
	continue;
	}
	}

	if ($skip_deleted && preg_match('/FLAGS $([^)]+)$/', $line, $matches)) {
	$flags = explode(' ', strtoupper($matches[1]));
	if (in_array('\\DELETED', $flags)) {
	continue;
	}
	}

	if ($mode == 1 && $index_field == 'DATE') {
	if (preg_match('/BODY\[HEADER\.FIELDS $"DATE"$\] (.*)/', $line, $matches)) {
	$value = preg_replace(['/^"*[a-z]+:/i'], '', $matches[1]);
	$value = trim($value);
	$result[$id] = rcube_utils::strtotime($value);
	}
	// non-existent/empty Date: header, use INTERNALDATE
	if (empty($result[$id])) {
	if (preg_match('/INTERNALDATE "([^"]+)"/', $line, $matches)) {
	$result[$id] = rcube_utils::strtotime($matches[1]);
	}
	else {
	$result[$id] = 0;
	}
	}
	}
	else if ($mode == 1) {
	if (preg_match('/BODY\[HEADER\.FIELDS $"?(FROM\|REPLY-TO\|SENDER\|TO\|SUBJECT)"?$\] (.*)/', $line, $matches)) {
	$value = preg_replace(['/^"*[a-z]+:/i', '/\s+$/sm'], ['', ''], $matches[2]);
	$result[$id] = trim($value);
	}
	else {
	$result[$id] = '';
	}
	}
	else if ($mode == 2) {
	if (preg_match('/' . $index_field . ' ([0-9]+)/', $line, $matches)) {
	$result[$id] = trim($matches[1]);
	}
	else {
	$result[$id] = 0;
	}
	}
	else if ($mode == 3) {
	if (!$flags && preg_match('/FLAGS $([^)]+)$/', $line, $matches)) {
	$flags = explode(' ', $matches[1]);
	}
	$result[$id] = in_array("\\".$index_field, (array) $flags) ? 1 : 0;
	}
	else if ($mode == 4) {
	if (preg_match('/INTERNALDATE "([^"]+)"/', $line, $matches)) {
	$result[$id] = rcube_utils::strtotime($matches[1]);
	}
	else {
	$result[$id] = 0;
	}
	}
	}
	}
	while (!$this->startsWith($line, $key, true, true));

	return $result;
	}

	/**
	* Returns message sequence identifier
	*
	* @param string $mailbox Mailbox name
	* @param int $uid Message unique identifier (UID)
	*
	* @return int Message sequence identifier
	*/
	public function UID2ID($mailbox, $uid)
	{
	if ($uid > 0) {
	$index = $this->search($mailbox, "UID $uid");

	if ($index->count() == 1) {
	$arr = $index->get();
	return (int) $arr[0];
	}
	}
	}

	/**
	* Returns message unique identifier (UID)
	*
	* @param string $mailbox Mailbox name
	* @param int $uid Message sequence identifier
	*
	* @return int Message unique identifier
	*/
	public function ID2UID($mailbox, $id)
	{
	if (empty($id) \|\| $id < 0) {
	return null;
	}

	if (!$this->select($mailbox)) {
	return null;
	}

	if (!empty($this->data['UID-MAP'][$id])) {
	return $this->data['UID-MAP'][$id];
	}

	if (isset($this->data['EXISTS']) && $id > $this->data['EXISTS']) {
	return null;
	}

	$index = $this->search($mailbox, $id, true);

	if ($index->count() == 1) {
	$arr = $index->get();
	return $this->data['UID-MAP'][$id] = (int) $arr[0];
	}
	}

	/**
	* Sets flag of the message(s)
	*
	* @param string $mailbox Mailbox name
	* @param string\|array $messages Message UID(s)
	* @param string $flag Flag name
	*
	* @return bool True on success, False on failure
	*/
	public function flag($mailbox, $messages, $flag)
	{
	return $this->modFlag($mailbox, $messages, $flag, '+');
	}

	/**
	* Unsets flag of the message(s)
	*
	* @param string $mailbox Mailbox name
	* @param string\|array $messages Message UID(s)
	* @param string $flag Flag name
	*
	* @return bool True on success, False on failure
	*/
	public function unflag($mailbox, $messages, $flag)
	{
	return $this->modFlag($mailbox, $messages, $flag, '-');
	}

	/**
	* Changes flag of the message(s)
	*
	* @param string $mailbox Mailbox name
	* @param string\|array $messages Message UID(s)
	* @param string $flag Flag name
	* @param string $mod Modifier [+\|-]. Default: "+".
	*
	* @return bool True on success, False on failure
	*/
	protected function modFlag($mailbox, $messages, $flag, $mod = '+')
	{
	if (!$flag) {
	return false;
	}

	if (!$this->select($mailbox)) {
	return false;
	}

	if (empty($this->data['READ-WRITE'])) {
	$this->setError(self::ERROR_READONLY, "Mailbox is read-only");
	return false;
	}

	if (!empty($this->flags[strtoupper($flag)])) {
	$flag = $this->flags[strtoupper($flag)];
	}

	// if PERMANENTFLAGS is not specified all flags are allowed
	if (!empty($this->data['PERMANENTFLAGS'])
	&& !in_array($flag, (array) $this->data['PERMANENTFLAGS'])
	&& !in_array('\\*', (array) $this->data['PERMANENTFLAGS'])
	) {
	return false;
	}

	// Clear internal status cache
	if ($flag == 'SEEN') {
	unset($this->data['STATUS:'.$mailbox]['UNSEEN']);
	}

	if ($mod != '+' && $mod != '-') {
	$mod = '+';
	}

	$result = $this->execute('UID STORE',
	[$this->compressMessageSet($messages), $mod . 'FLAGS.SILENT', "($flag)"],
	self::COMMAND_NORESPONSE
	);

	return $result == self::ERROR_OK;
	}

	/**
	* Copies message(s) from one folder to another
	*
	* @param string\|array $messages Message UID(s)
	* @param string $from Mailbox name
	* @param string $to Destination mailbox name
	*
	* @return bool True on success, False on failure
	*/
	public function copy($messages, $from, $to)
	{
	// Clear last COPYUID data
	unset($this->data['COPYUID']);

	if (!$this->select($from)) {
	return false;
	}

	// Clear internal status cache
	unset($this->data['STATUS:'.$to]);

	$result = $this->execute('UID COPY',
	[$this->compressMessageSet($messages), $this->escape($to)],
	self::COMMAND_NORESPONSE
	);

	return $result == self::ERROR_OK;
	}

	/**
	* Moves message(s) from one folder to another.
	*
	* @param string\|array $messages Message UID(s)
	* @param string $from Mailbox name
	* @param string $to Destination mailbox name
	*
	* @return bool True on success, False on failure
	*/
	public function move($messages, $from, $to)
	{
	if (!$this->select($from)) {
	return false;
	}

	if (empty($this->data['READ-WRITE'])) {
	$this->setError(self::ERROR_READONLY, "Mailbox is read-only");
	return false;
	}

	// use MOVE command (RFC 6851)
	if ($this->hasCapability('MOVE')) {
	// Clear last COPYUID data
	unset($this->data['COPYUID']);

	// Clear internal status cache
	unset($this->data['STATUS:'.$to]);
	$this->clear_status_cache($from);

	$result = $this->execute('UID MOVE',
	[$this->compressMessageSet($messages), $this->escape($to)],
	self::COMMAND_NORESPONSE
	);

	return $result == self::ERROR_OK;
	}

	// use COPY + STORE +FLAGS.SILENT \Deleted + EXPUNGE
	$result = $this->copy($messages, $from, $to);

	if ($result) {
	// Clear internal status cache
	unset($this->data['STATUS:'.$from]);

	$result = $this->flag($from, $messages, 'DELETED');

	if ($messages == '*') {
	// CLOSE+SELECT should be faster than EXPUNGE
	$this->close();
	}
	else {
	$this->expunge($from, $messages);
	}
	}

	return $result;
	}

	/**
	* FETCH command (RFC3501)
	*
	* @param string $mailbox Mailbox name
	* @param mixed $message_set Message(s) sequence identifier(s) or UID(s)
	* @param bool $is_uid True if $message_set contains UIDs
	* @param array $query_items FETCH command data items
	* @param string $mod_seq Modification sequence for CHANGEDSINCE (RFC4551) query
	* @param bool $vanished Enables VANISHED parameter (RFC5162) for CHANGEDSINCE query
	*
	* @return array List of rcube_message_header elements, False on error
	* @since 0.6
	*/
	public function fetch($mailbox, $message_set, $is_uid = false, $query_items = [],
	$mod_seq = null, $vanished = false)
	{
	if (!$this->select($mailbox)) {
	return false;
	}

	$message_set = $this->compressMessageSet($message_set);
	$result = [];

	$key = $this->nextTag();
	$cmd = ($is_uid ? 'UID ' : '') . 'FETCH';
	$request = "$key $cmd $message_set (" . implode(' ', $query_items) . ")";

	if ($mod_seq !== null && $this->hasCapability('CONDSTORE')) {
	$request .= " (CHANGEDSINCE $mod_seq" . ($vanished ? " VANISHED" : '') .")";
	}

	if (!$this->putLine($request)) {
	$this->setError(self::ERROR_COMMAND, "Failed to send $cmd command");
	return false;
	}

	do {
	$line = $this->readFullLine(4096);

	if (!$line) {
	break;
	}

	// Sample reply line:
	// * 321 FETCH (UID 2417 RFC822.SIZE 2730 FLAGS (\Seen)
	// INTERNALDATE "16-Nov-2008 21:08:46 +0100" BODYSTRUCTURE (...)
	// BODY[HEADER.FIELDS ...

	if (preg_match('/^\* ([0-9]+) FETCH/', $line, $m)) {
	$id = intval($m[1]);

	$result[$id] = new rcube_message_header;
	$result[$id]->id = $id;
	$result[$id]->subject = '';
	$result[$id]->messageID = 'mid:' . $id;

	$headers = null;
	$lines = [];
	$line = substr($line, strlen($m[0]) + 2);
	$ln = 0;

	// Tokenize response and assign to object properties
	while (($tokens = $this->tokenizeResponse($line, 2)) && count($tokens) == 2) {
	list($name, $value) = $tokens;
	if ($name == 'UID') {
	$result[$id]->uid = intval($value);
	}
	else if ($name == 'RFC822.SIZE') {
	$result[$id]->size = intval($value);
	}
	else if ($name == 'RFC822.TEXT') {
	$result[$id]->body = $value;
	}
	else if ($name == 'INTERNALDATE') {
	$result[$id]->internaldate = $value;
	$result[$id]->date = $value;
	$result[$id]->timestamp = rcube_utils::strtotime($value);
	}
	else if ($name == 'FLAGS') {
	if (!empty($value)) {
	foreach ((array)$value as $flag) {
	$flag = str_replace(['$', "\\"], '', $flag);
	$flag = strtoupper($flag);

	$result[$id]->flags[$flag] = true;
	}
	}
	}
	else if ($name == 'MODSEQ') {
	$result[$id]->modseq = $value[0];
	}
	else if ($name == 'ENVELOPE') {
	$result[$id]->envelope = $value;
	}
	else if ($name == 'BODYSTRUCTURE' \|\| ($name == 'BODY' && count($value) > 2)) {
	if (!is_array($value[0]) && (strtolower($value[0]) == 'message' && strtolower($value[1]) == 'rfc822')) {
	$value = [$value];
	}
	$result[$id]->bodystructure = $value;
	}
	else if ($name == 'RFC822') {
	$result[$id]->body = $value;
	}
	else if (stripos($name, 'BODY[') === 0) {
	$name = str_replace(']', '', substr($name, 5));

	if ($name == 'HEADER.FIELDS') {
	// skip ']' after headers list
	$this->tokenizeResponse($line, 1);
	$headers = $this->tokenizeResponse($line, 1);
	}
	else if (strlen($name)) {
	$result[$id]->bodypart[$name] = $value;
	}
	else {
	$result[$id]->body = $value;
	}
	}
	}

	// create array with header field:data
	if (!empty($headers)) {
	$headers = explode("\n", trim($headers));
	foreach ($headers as $resln) {
	if (ord($resln[0]) <= 32) {
	$lines[$ln] .= (empty($lines[$ln]) ? '' : "\n") . trim($resln);
	}
	else {
	$lines[++$ln] = trim($resln);
	}
	}

	foreach ($lines as $str) {
	list($field, $string) = explode(':', $str, 2);

	$field = strtolower($field);
	$string = preg_replace('/\n[\t\s]*/', ' ', trim($string));

	switch ($field) {
	case 'date';
	$string = substr($string, 0, 128);
	$result[$id]->date = $string;
	$result[$id]->timestamp = rcube_utils::strtotime($string);
	break;
	case 'to':
	$result[$id]->to = preg_replace('/undisclosed-recipients:[;,]*/', '', $string);
	break;
	case 'from':
	case 'subject':
	$string = substr($string, 0, 2048);
	case 'cc':
	case 'bcc':
	case 'references':
	$result[$id]->{$field} = $string;
	break;
	case 'reply-to':
	$result[$id]->replyto = $string;
	break;
	case 'content-transfer-encoding':
	$result[$id]->encoding = substr($string, 0, 32);
	break;
	case 'content-type':
	$ctype_parts = preg_split('/[; ]+/', $string);
	$result[$id]->ctype = strtolower(array_first($ctype_parts));
	if (preg_match('/charset\s=\s"?([a-z0-9\-\.\_]+)"?/i', $string, $regs)) {
	$result[$id]->charset = $regs[1];
	}
	break;
	case 'in-reply-to':
	$result[$id]->in_reply_to = str_replace(["\n", '<', '>'], '', $string);
	break;
	- case 'return-receipt-to':
	case 'disposition-notification-to':
	case 'x-confirm-reading-to':
	$result[$id]->mdn_to = substr($string, 0, 2048);
	break;
	case 'message-id':
	$result[$id]->messageID = substr($string, 0, 2048);
	break;
	case 'x-priority':
	if (preg_match('/^(\d+)/', $string, $matches)) {
	$result[$id]->priority = intval($matches[1]);
	}
	break;
	default:
	if (strlen($field) < 3) {
	break;
	}
	if (!empty($result[$id]->others[$field])) {
	$string = array_merge((array) $result[$id]->others[$field], (array) $string);
	}
	$result[$id]->others[$field] = $string;
	}
	}
	}
	}
	// VANISHED response (QRESYNC RFC5162)
	// Sample: * VANISHED (EARLIER) 300:310,405,411
	else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) {
	$line = substr($line, strlen($match[0]));
	$v_data = $this->tokenizeResponse($line, 1);

	$this->data['VANISHED'] = $v_data;
	}
	}
	while (!$this->startsWith($line, $key, true));

	return $result;
	}

	/**
	* Returns message(s) data (flags, headers, etc.)
	*
	* @param string $mailbox Mailbox name
	* @param mixed $message_set Message(s) sequence identifier(s) or UID(s)
	* @param bool $is_uid True if $message_set contains UIDs
	* @param bool $bodystr Enable to add BODYSTRUCTURE data to the result
	* @param array $add_headers List of additional headers
	*
	* @return bool\|array List of rcube_message_header elements, False on error
	*/
	public function fetchHeaders($mailbox, $message_set, $is_uid = false, $bodystr = false, $add_headers = [])
	{
	$query_items = ['UID', 'RFC822.SIZE', 'FLAGS', 'INTERNALDATE'];
	$headers = ['DATE', 'FROM', 'TO', 'SUBJECT', 'CONTENT-TYPE', 'CC', 'REPLY-TO',
	'LIST-POST', 'DISPOSITION-NOTIFICATION-TO', 'X-PRIORITY'];

	if (!empty($add_headers)) {
	$add_headers = array_map('strtoupper', $add_headers);
	$headers = array_unique(array_merge($headers, $add_headers));
	}

	if ($bodystr) {
	$query_items[] = 'BODYSTRUCTURE';
	}

	$query_items[] = 'BODY.PEEK[HEADER.FIELDS (' . implode(' ', $headers) . ')]';

	return $this->fetch($mailbox, $message_set, $is_uid, $query_items);
	}

	/**
	* Returns message data (flags, headers, etc.)
	*
	* @param string $mailbox Mailbox name
	* @param int $id Message sequence identifier or UID
	* @param bool $is_uid True if $id is an UID
	* @param bool $bodystr Enable to add BODYSTRUCTURE data to the result
	* @param array $add_headers List of additional headers
	*
	* @return bool\|rcube_message_header Message data, False on error
	*/
	public function fetchHeader($mailbox, $id, $is_uid = false, $bodystr = false, $add_headers = [])
	{
	$a = $this->fetchHeaders($mailbox, $id, $is_uid, $bodystr, $add_headers);

	if (is_array($a)) {
	return array_first($a);
	}

	return false;
	}

	/**
	* Sort messages by specified header field
	*
	* @param array $messages Array of rcube_message_header objects
	* @param string $field Name of the property to sort by
	* @param string $order Sorting order (ASC\|DESC)
	*
	* @return array Sorted input array
	*/
	public static function sortHeaders($messages, $field, $order = 'ASC')
	{
	$field = empty($field) ? 'uid' : strtolower($field);
	$order = empty($order) ? 'ASC' : strtoupper($order);
	$index = [];

	reset($messages);

	// Create an index
	foreach ($messages as $key => $headers) {
	switch ($field) {
	case 'arrival':
	$field = 'internaldate';
	// no-break
	case 'date':
	case 'internaldate':
	case 'timestamp':
	$value = rcube_utils::strtotime($headers->$field);
	if (!$value && $field != 'timestamp') {
	$value = $headers->timestamp;
	}

	break;

	default:
	// @TODO: decode header value, convert to UTF-8
	$value = $headers->$field;
	if (is_string($value)) {
	$value = str_replace('"', '', $value);

	if ($field == 'subject') {
	$value = rcube_utils::remove_subject_prefix($value);
	}
	}
	}

	$index[$key] = $value;
	}

	$sort_order = $order == 'ASC' ? SORT_ASC : SORT_DESC;
	$sort_flags = SORT_STRING \| SORT_FLAG_CASE;

	if (in_array($field, ['arrival', 'date', 'internaldate', 'timestamp'])) {
	$sort_flags = SORT_NUMERIC;
	}

	array_multisort($index, $sort_order, $sort_flags, $messages);

	return $messages;
	}

	/**
	* Fetch MIME headers of specified message parts
	*
	* @param string $mailbox Mailbox name
	* @param int $uid Message UID
	* @param array $parts Message part identifiers
	* @param bool $mime Use MIME instead of HEADER
	*
	* @return array\|bool Array containing headers string for each specified body
	* False on failure.
	*/
	public function fetchMIMEHeaders($mailbox, $uid, $parts, $mime = true)
	{
	if (!$this->select($mailbox)) {
	return false;
	}

	$result = false;
	$parts = (array) $parts;
	$key = $this->nextTag();
	$peeks = [];
	$type = $mime ? 'MIME' : 'HEADER';

	// format request
	foreach ($parts as $part) {
	$peeks[] = "BODY.PEEK[$part.$type]";
	}

	$request = "$key UID FETCH $uid (" . implode(' ', $peeks) . ')';

	// send request
	if (!$this->putLine($request)) {
	$this->setError(self::ERROR_COMMAND, "Failed to send UID FETCH command");
	return false;
	}

	do {
	$line = $this->readLine(1024);

	if (preg_match('/^\* [0-9]+ FETCH [0-9UID( ]+/', $line, $m)) {
	$line = ltrim(substr($line, strlen($m[0])));
	while (preg_match('/^BODY\[([0-9\.]+)\.'.$type.'\]/', $line, $matches)) {
	$line = substr($line, strlen($matches[0]));
	$result[$matches[1]] = trim($this->multLine($line));
	$line = $this->readLine(1024);
	}
	}
	}
	while (!$this->startsWith($line, $key, true));

	return $result;
	}

	/**
	* Fetches message part header
	*/
	public function fetchPartHeader($mailbox, $id, $is_uid = false, $part = null)
	{
	$part = empty($part) ? 'HEADER' : $part.'.MIME';

	return $this->handlePartBody($mailbox, $id, $is_uid, $part);
	}

	/**
	* Fetches body of the specified message part
	*/
	public function handlePartBody($mailbox, $id, $is_uid = false, $part = '', $encoding = null, $print = null,
	$file = null, $formatted = false, $max_bytes = 0)
	{
	if (!$this->select($mailbox)) {
	return false;
	}

	$binary = true;
	$initiated = false;

	do {
	if (!$initiated) {
	switch ($encoding) {
	case 'base64':
	$mode = 1;
	break;
	case 'quoted-printable':
	$mode = 2;
	break;
	case 'x-uuencode':
	case 'x-uue':
	case 'uue':
	case 'uuencode':
	$mode = 3;
	break;
	default:
	$mode = 0;
	}

	// Use BINARY extension when possible (and safe)
	$binary = $binary && $mode && preg_match('/^[0-9.]+$/', $part) && $this->hasCapability('BINARY');
	$fetch_mode = $binary ? 'BINARY' : 'BODY';
	$partial = $max_bytes ? sprintf('<0.%d>', $max_bytes) : '';

	// format request
	$key = $this->nextTag();
	$cmd = ($is_uid ? 'UID ' : '') . 'FETCH';
	$request = "$key $cmd $id ($fetch_mode.PEEK[$part]$partial)";
	$result = false;
	$found = false;
	$initiated = true;

	// send request
	if (!$this->putLine($request)) {
	$this->setError(self::ERROR_COMMAND, "Failed to send $cmd command");
	return false;
	}

	if ($binary) {
	// WARNING: Use $formatted argument with care, this may break binary data stream
	$mode = -1;
	}
	}

	$line = trim($this->readLine(1024));

	if (!$line) {
	break;
	}

	// handle UNKNOWN-CTE response - RFC 3516, try again with standard BODY request
	if ($binary && !$found && preg_match('/^' . $key . ' NO \[(UNKNOWN-CTE\|PARSE)\]/i', $line)) {
	$binary = $initiated = false;
	continue;
	}

	// skip irrelevant untagged responses (we have a result already)
	if ($found \|\| !preg_match('/^\* ([0-9]+) FETCH (.*)$/', $line, $m)) {
	continue;
	}

	$line = $m[2];

	// handle one line response
	if ($line[0] == '(' && substr($line, -1) == ')') {
	// tokenize content inside brackets
	// the content can be e.g.: (UID 9844 BODY[2.4] NIL)
	$tokens = $this->tokenizeResponse(preg_replace('/(^$\|$$)/', '', $line));

	for ($i=0; $i<count($tokens); $i+=2) {
	if (preg_match('/^(BODY\|BINARY)/i', $tokens[$i])) {
	$result = $tokens[$i+1];
	$found = true;
	break;
	}
	}

	if ($result !== false) {
	if ($mode == 1) {
	$result = base64_decode($result);
	}
	else if ($mode == 2) {
	$result = quoted_printable_decode($result);
	}
	else if ($mode == 3) {
	$result = convert_uudecode($result);
	}
	}
	}
	// response with string literal
	else if (preg_match('/\{([0-9]+)\}$/', $line, $m)) {
	$bytes = (int) $m[1];
	$prev = '';
	$found = true;

	// empty body
	if (!$bytes) {
	$result = '';
	}
	else while ($bytes > 0) {
	$line = $this->readLine(8192);

	if ($line === null) {
	break;
	}

	$len = strlen($line);

	if ($len > $bytes) {
	$line = substr($line, 0, $bytes);
	$len = strlen($line);
	}
	$bytes -= $len;

	// BASE64
	if ($mode == 1) {
	$line = preg_replace('\|[^a-zA-Z0-9+=/]\|', '', $line);
	// create chunks with proper length for base64 decoding
	$line = $prev.$line;
	$length = strlen($line);
	if ($length % 4) {
	$length = floor($length / 4) * 4;
	$prev = substr($line, $length);
	$line = substr($line, 0, $length);
	}
	else {
	$prev = '';
	}
	$line = base64_decode($line);
	}
	// QUOTED-PRINTABLE
	else if ($mode == 2) {
	$line = rtrim($line, "\t\r\0\x0B");
	$line = quoted_printable_decode($line);
	}
	// UUENCODE
	else if ($mode == 3) {
	$line = rtrim($line, "\t\r\n\0\x0B");
	if ($line == 'end' \|\| preg_match('/^begin\s+[0-7]+\s+.+$/', $line)) {
	continue;
	}
	$line = convert_uudecode($line);
	}
	// default
	else if ($formatted) {
	$line = rtrim($line, "\t\r\n\0\x0B") . "\n";
	}

	if ($file) {
	if (fwrite($file, $line) === false) {
	break;
	}
	}
	else if ($print) {
	echo $line;
	}
	else {
	$result .= $line;
	}
	}
	}
	}
	while (!$this->startsWith($line, $key, true) \|\| !$initiated);

	if ($result !== false) {
	if ($file) {
	return fwrite($file, $result);
	}
	else if ($print) {
	echo $result;
	return true;
	}

	return $result;
	}

	return false;
	}

	/**
	* Handler for IMAP APPEND command
	*
	* @param string $mailbox Mailbox name
	* @param string\|array $message The message source string or array (of strings and file pointers)
	* @param array $flags Message flags
	* @param string $date Message internal date
	* @param bool $binary Enable BINARY append (RFC3516)
	*
	* @return string\|bool On success APPENDUID response (if available) or True, False on failure
	*/
	public function append($mailbox, &$message, $flags = [], $date = null, $binary = false)
	{
	unset($this->data['APPENDUID']);

	if ($mailbox === null \|\| $mailbox === '') {
	return false;
	}

	$binary = $binary && $this->getCapability('BINARY');
	$literal_plus = !$binary && !empty($this->prefs['literal+']);
	$len = 0;
	$msg = is_array($message) ? $message : [&$message];
	$chunk_size = 512000;

	for ($i=0, $cnt=count($msg); $i<$cnt; $i++) {
	if (is_resource($msg[$i])) {
	$stat = fstat($msg[$i]);
	if ($stat === false) {
	return false;
	}
	$len += $stat['size'];
	}
	else {
	if (!$binary) {
	$msg[$i] = str_replace("\r", '', $msg[$i]);
	$msg[$i] = str_replace("\n", "\r\n", $msg[$i]);
	}

	$len += strlen($msg[$i]);
	}
	}

	if (!$len) {
	return false;
	}

	// build APPEND command
	$key = $this->nextTag();
	$request = "$key APPEND " . $this->escape($mailbox) . ' (' . $this->flagsToStr($flags) . ')';
	if (!empty($date)) {
	$request .= ' ' . $this->escape($date);
	}
	$request .= ' ' . ($binary ? '~' : '') . '{' . $len . ($literal_plus ? '+' : '') . '}';

	// send APPEND command
	if (!$this->putLine($request)) {
	$this->setError(self::ERROR_COMMAND, "Failed to send APPEND command");
	return false;
	}

	// Do not wait when LITERAL+ is supported
	if (!$literal_plus) {
	$line = $this->readReply();

	if ($line[0] != '+') {
	$this->parseResult($line, 'APPEND: ');
	return false;
	}
	}

	foreach ($msg as $msg_part) {
	// file pointer
	if (is_resource($msg_part)) {
	rewind($msg_part);
	while (!feof($msg_part) && $this->fp) {
	$buffer = fread($msg_part, $chunk_size);
	$this->putLine($buffer, false);
	}
	fclose($msg_part);
	}
	// string
	else {
	$size = strlen($msg_part);

	// Break up the data by sending one chunk (up to 512k) at a time.
	// This approach reduces our peak memory usage
	for ($offset = 0; $offset < $size; $offset += $chunk_size) {
	$chunk = substr($msg_part, $offset, $chunk_size);
	if (!$this->putLine($chunk, false)) {
	return false;
	}
	}
	}
	}

	if (!$this->putLine('')) { // \r\n
	return false;
	}

	do {
	$line = $this->readLine();
	} while (!$this->startsWith($line, $key, true, true));

	// Clear internal status cache
	unset($this->data['STATUS:'.$mailbox]);

	if ($this->parseResult($line, 'APPEND: ') != self::ERROR_OK) {
	return false;
	}

	if (!empty($this->data['APPENDUID'])) {
	return $this->data['APPENDUID'];
	}

	return true;
	}

	/**
	* Handler for IMAP APPEND command.
	*
	* @param string $mailbox Mailbox name
	* @param string $path Path to the file with message body
	* @param string $headers Message headers
	* @param array $flags Message flags
	* @param string $date Message internal date
	* @param bool $binary Enable BINARY append (RFC3516)
	*
	* @return string\|bool On success APPENDUID response (if available) or True, False on failure
	*/
	public function appendFromFile($mailbox, $path, $headers = null, $flags = [], $date = null, $binary = false)
	{
	// open message file
	if (file_exists(realpath($path))) {
	$fp = fopen($path, 'r');
	}

	if (empty($fp)) {
	$this->setError(self::ERROR_UNKNOWN, "Couldn't open $path for reading");
	return false;
	}

	$message = [];
	if ($headers) {
	$message[] = trim($headers, "\r\n") . "\r\n\r\n";
	}
	$message[] = $fp;

	return $this->append($mailbox, $message, $flags, $date, $binary);
	}

	/**
	* Returns QUOTA information
	*
	* @param string $mailbox Mailbox name
	*
	* @return array Quota information
	*/
	public function getQuota($mailbox = null)
	{
	if ($mailbox === null \|\| $mailbox === '') {
	$mailbox = 'INBOX';
	}

	// a0001 GETQUOTAROOT INBOX
	// * QUOTAROOT INBOX user/sample
	// * QUOTA user/sample (STORAGE 654 9765)
	// a0001 OK Completed

	list($code, $response) = $this->execute('GETQUOTAROOT', [$this->escape($mailbox)], 0, '/^\* QUOTA /i');

	$result = false;
	$min_free = PHP_INT_MAX;
	$all = [];

	if ($code == self::ERROR_OK) {
	foreach (explode("\n", $response) as $line) {
	$tokens = $this->tokenizeResponse($line, 3);
	$quota_root = isset($tokens[2]) ? $tokens[2] : null;
	$quotas = $this->tokenizeResponse($line, 1);

	if (empty($quotas)) {
	continue;
	}

	foreach (array_chunk($quotas, 3) as $quota) {
	list($type, $used, $total) = $quota;
	$type = strtolower($type);

	if ($type && $total) {
	$all[$quota_root][$type]['used'] = intval($used);
	$all[$quota_root][$type]['total'] = intval($total);
	}
	}

	if (empty($all[$quota_root]['storage'])) {
	continue;
	}

	$used = $all[$quota_root]['storage']['used'];
	$total = $all[$quota_root]['storage']['total'];
	$free = $total - $used;

	// calculate lowest available space from all storage quotas
	if ($free < $min_free) {
	$min_free = $free;
	$result['used'] = $used;
	$result['total'] = $total;
	$result['percent'] = min(100, round(($used/max(1,$total))*100));
	$result['free'] = 100 - $result['percent'];
	}
	}
	}

	if (!empty($result)) {
	$result['all'] = $all;
	}

	return $result;
	}

	/**
	* Send the SETACL command (RFC4314)
	*
	* @param string $mailbox Mailbox name
	* @param string $user User name
	* @param mixed $acl ACL string or array
	*
	* @return bool True on success, False on failure
	*
	* @since 0.5-beta
	*/
	public function setACL($mailbox, $user, $acl)
	{
	if (is_array($acl)) {
	$acl = implode('', $acl);
	}

	$result = $this->execute('SETACL',
	[$this->escape($mailbox), $this->escape($user), strtolower($acl)],
	self::COMMAND_NORESPONSE
	);

	return $result == self::ERROR_OK;
	}

	/**
	* Send the DELETEACL command (RFC4314)
	*
	* @param string $mailbox Mailbox name
	* @param string $user User name
	*
	* @return bool True on success, False on failure
	*
	* @since 0.5-beta
	*/
	public function deleteACL($mailbox, $user)
	{
	$result = $this->execute('DELETEACL',
	[$this->escape($mailbox), $this->escape($user)],
	self::COMMAND_NORESPONSE
	);

	return $result == self::ERROR_OK;
	}

	/**
	* Send the GETACL command (RFC4314)
	*
	* @param string $mailbox Mailbox name
	*
	* @return array User-rights array on success, NULL on error
	* @since 0.5-beta
	*/
	public function getACL($mailbox)
	{
	list($code, $response) = $this->execute('GETACL', [$this->escape($mailbox)], 0, '/^\* ACL /i');

	if ($code == self::ERROR_OK && $response) {
	// Parse server response (remove "* ACL ")
	$response = substr($response, 6);
	$ret = $this->tokenizeResponse($response);
	$mbox = array_shift($ret);
	$size = count($ret);

	// Create user-rights hash array
	// @TODO: consider implementing fixACL() method according to RFC4314.2.1.1
	// so we could return only standard rights defined in RFC4314,
	// excluding 'c' and 'd' defined in RFC2086.
	if ($size % 2 == 0) {
	for ($i=0; $i<$size; $i++) {
	$ret[$ret[$i]] = str_split($ret[++$i]);
	unset($ret[$i-1]);
	unset($ret[$i]);
	}
	return $ret;
	}

	$this->setError(self::ERROR_COMMAND, "Incomplete ACL response");
	}
	}

	/**
	* Send the LISTRIGHTS command (RFC4314)
	*
	* @param string $mailbox Mailbox name
	* @param string $user User name
	*
	* @return array List of user rights
	* @since 0.5-beta
	*/
	public function listRights($mailbox, $user)
	{
	list($code, $response) = $this->execute('LISTRIGHTS',
	[$this->escape($mailbox), $this->escape($user)], 0, '/^\* LISTRIGHTS /i');

	if ($code == self::ERROR_OK && $response) {
	// Parse server response (remove "* LISTRIGHTS ")
	$response = substr($response, 13);

	$ret_mbox = $this->tokenizeResponse($response, 1);
	$ret_user = $this->tokenizeResponse($response, 1);
	$granted = $this->tokenizeResponse($response, 1);
	$optional = trim($response);

	return [
	'granted' => str_split($granted),
	'optional' => explode(' ', $optional),
	];
	}
	}

	/**
	* Send the MYRIGHTS command (RFC4314)
	*
	* @param string $mailbox Mailbox name
	*
	* @return array MYRIGHTS response on success, NULL on error
	* @since 0.5-beta
	*/
	public function myRights($mailbox)
	{
	list($code, $response) = $this->execute('MYRIGHTS', [$this->escape($mailbox)], 0, '/^\* MYRIGHTS /i');

	if ($code == self::ERROR_OK && $response) {
	// Parse server response (remove "* MYRIGHTS ")
	$response = substr($response, 11);

	$ret_mbox = $this->tokenizeResponse($response, 1);
	$rights = $this->tokenizeResponse($response, 1);

	return str_split($rights);
	}
	}

	/**
	* Send the SETMETADATA command (RFC5464)
	*
	* @param string $mailbox Mailbox name
	* @param array $entries Entry-value array (use NULL value as NIL)
	*
	* @return bool True on success, False on failure
	* @since 0.5-beta
	*/
	public function setMetadata($mailbox, $entries)
	{
	if (!is_array($entries) \|\| empty($entries)) {
	$this->setError(self::ERROR_COMMAND, "Wrong argument for SETMETADATA command");
	return false;
	}

	foreach ($entries as $name => $value) {
	$entries[$name] = $this->escape($name) . ' ' . $this->escape($value, true);
	}

	$entries = implode(' ', $entries);
	$result = $this->execute('SETMETADATA',
	[$this->escape($mailbox), '(' . $entries . ')'],
	self::COMMAND_NORESPONSE
	);

	return $result == self::ERROR_OK;
	}

	/**
	* Send the SETMETADATA command with NIL values (RFC5464)
	*
	* @param string $mailbox Mailbox name
	* @param array $entries Entry names array
	*
	* @return bool True on success, False on failure
	*
	* @since 0.5-beta
	*/
	public function deleteMetadata($mailbox, $entries)
	{
	if (!is_array($entries) && !empty($entries)) {
	$entries = explode(' ', $entries);
	}

	if (empty($entries)) {
	$this->setError(self::ERROR_COMMAND, "Wrong argument for SETMETADATA command");
	return false;
	}

	$data = [];
	foreach ($entries as $entry) {
	$data[$entry] = null;
	}

	return $this->setMetadata($mailbox, $data);
	}

	/**
	* Send the GETMETADATA command (RFC5464)
	*
	* @param string $mailbox Mailbox name
	* @param array $entries Entries
	* @param array $options Command options (with MAXSIZE and DEPTH keys)
	*
	* @return array GETMETADATA result on success, NULL on error
	*
	* @since 0.5-beta
	*/
	public function getMetadata($mailbox, $entries, $options = [])
	{
	if (!is_array($entries)) {
	$entries = [$entries];
	}

	// create entries string
	foreach ($entries as $idx => $name) {
	$entries[$idx] = $this->escape($name);
	}

	$optlist = '';
	$entlist = '(' . implode(' ', $entries) . ')';

	// create options string
	if (is_array($options)) {
	$options = array_change_key_case($options, CASE_UPPER);
	$opts = [];

	if (!empty($options['MAXSIZE'])) {
	$opts[] = 'MAXSIZE '.intval($options['MAXSIZE']);
	}
	if (!empty($options['DEPTH'])) {
	$opts[] = 'DEPTH '.intval($options['DEPTH']);
	}

	if ($opts) {
	$optlist = '(' . implode(' ', $opts) . ')';
	}
	}

	$optlist .= ($optlist ? ' ' : '') . $entlist;

	list($code, $response) = $this->execute('GETMETADATA', [$this->escape($mailbox), $optlist]);

	if ($code == self::ERROR_OK) {
	$result = [];
	$data = $this->tokenizeResponse($response);

	// The METADATA response can contain multiple entries in a single
	// response or multiple responses for each entry or group of entries
	for ($i = 0, $size = count($data); $i < $size; $i++) {
	if ($data[$i] === '*'
	&& $data[++$i] === 'METADATA'
	&& is_string($mbox = $data[++$i])
	&& is_array($data[++$i])
	) {
	for ($x = 0, $size2 = count($data[$i]); $x < $size2; $x += 2) {
	if ($data[$i][$x+1] !== null) {
	$result[$mbox][$data[$i][$x]] = $data[$i][$x+1];
	}
	}
	}
	}

	return $result;
	}
	}

	/**
	* Send the SETANNOTATION command (draft-daboo-imap-annotatemore)
	*
	* @param string $mailbox Mailbox name
	* @param array $data Data array where each item is an array with
	* three elements: entry name, attribute name, value
	*
	* @return bool True on success, False on failure
	* @since 0.5-beta
	*/
	public function setAnnotation($mailbox, $data)
	{
	if (!is_array($data) \|\| empty($data)) {
	$this->setError(self::ERROR_COMMAND, "Wrong argument for SETANNOTATION command");
	return false;
	}

	foreach ($data as $entry) {
	// ANNOTATEMORE drafts before version 08 require quoted parameters
	$entries[] = sprintf('%s (%s %s)', $this->escape($entry[0], true),
	$this->escape($entry[1], true), $this->escape($entry[2], true));
	}

	$entries = implode(' ', $entries);
	$result = $this->execute('SETANNOTATION', [$this->escape($mailbox), $entries], self::COMMAND_NORESPONSE);

	return $result == self::ERROR_OK;
	}

	/**
	* Send the SETANNOTATION command with NIL values (draft-daboo-imap-annotatemore)
	*
	* @param string $mailbox Mailbox name
	* @param array $data Data array where each item is an array with
	* two elements: entry name and attribute name
	*
	* @return bool True on success, False on failure
	*
	* @since 0.5-beta
	*/
	public function deleteAnnotation($mailbox, $data)
	{
	if (!is_array($data) \|\| empty($data)) {
	$this->setError(self::ERROR_COMMAND, "Wrong argument for SETANNOTATION command");
	return false;
	}

	return $this->setAnnotation($mailbox, $data);
	}

	/**
	* Send the GETANNOTATION command (draft-daboo-imap-annotatemore)
	*
	* @param string $mailbox Mailbox name
	* @param array $entries Entries names
	* @param array $attribs Attribs names
	*
	* @return array Annotations result on success, NULL on error
	*
	* @since 0.5-beta
	*/
	public function getAnnotation($mailbox, $entries, $attribs)
	{
	if (!is_array($entries)) {
	$entries = [$entries];
	}

	// create entries string
	// ANNOTATEMORE drafts before version 08 require quoted parameters
	foreach ($entries as $idx => $name) {
	$entries[$idx] = $this->escape($name, true);
	}
	$entries = '(' . implode(' ', $entries) . ')';

	if (!is_array($attribs)) {
	$attribs = [$attribs];
	}

	// create attributes string
	foreach ($attribs as $idx => $name) {
	$attribs[$idx] = $this->escape($name, true);
	}
	$attribs = '(' . implode(' ', $attribs) . ')';

	list($code, $response) = $this->execute('GETANNOTATION', [$this->escape($mailbox), $entries, $attribs]);

	if ($code == self::ERROR_OK) {
	$result = [];
	$data = $this->tokenizeResponse($response);
	$last_entry = null;

	// Here we returns only data compatible with METADATA result format
	if (!empty($data) && ($size = count($data))) {
	for ($i=0; $i<$size; $i++) {
	$entry = $data[$i];
	if (isset($mbox) && is_array($entry)) {
	$attribs = $entry;
	$entry = $last_entry;
	}
	else if ($entry == '*') {
	if ($data[$i+1] == 'ANNOTATION') {
	$mbox = $data[$i+2];
	unset($data[$i]); // "*"
	unset($data[++$i]); // "ANNOTATION"
	unset($data[++$i]); // Mailbox
	}
	// get rid of other untagged responses
	else {
	unset($mbox);
	unset($data[$i]);
	}
	continue;
	}
	else if (isset($mbox)) {
	$attribs = $data[++$i];
	}
	else {
	unset($data[$i]);
	continue;
	}

	if (!empty($attribs)) {
	for ($x=0, $len=count($attribs); $x<$len;) {
	$attr = $attribs[$x++];
	$value = $attribs[$x++];
	if ($attr == 'value.priv' && $value !== null) {
	$result[$mbox]['/private' . $entry] = $value;
	}
	else if ($attr == 'value.shared' && $value !== null) {
	$result[$mbox]['/shared' . $entry] = $value;
	}
	}
	}

	$last_entry = $entry;
	unset($data[$i]);
	}
	}

	return $result;
	}
	}

	/**
	* Returns BODYSTRUCTURE for the specified message.
	*
	* @param string $mailbox Folder name
	* @param int $id Message sequence number or UID
	* @param bool $is_uid True if $id is an UID
	*
	* @return array\|bool Body structure array or False on error.
	* @since 0.6
	*/
	public function getStructure($mailbox, $id, $is_uid = false)
	{
	$result = $this->fetch($mailbox, $id, $is_uid, ['BODYSTRUCTURE']);

	if (is_array($result) && !empty($result)) {
	$result = array_first($result);
	return $result->bodystructure;
	}

	return false;
	}

	/**
	* Returns data of a message part according to specified structure.
	*
	* @param array $structure Message structure (getStructure() result)
	* @param string $part Message part identifier
	*
	* @return array Part data as hash array (type, encoding, charset, size)
	*/
	public static function getStructurePartData($structure, $part)
	{
	$part_a = self::getStructurePartArray($structure, $part);
	$data = [];

	if (empty($part_a)) {
	return $data;
	}

	// content-type
	if (is_array($part_a[0])) {
	$data['type'] = 'multipart';
	}
	else {
	$data['type'] = strtolower($part_a[0]);
	$data['subtype'] = strtolower($part_a[1]);
	$data['encoding'] = strtolower($part_a[5]);

	// charset
	if (is_array($part_a[2])) {
	foreach ($part_a[2] as $key => $val) {
	if (strcasecmp($val, 'charset') == 0) {
	$data['charset'] = $part_a[2][$key+1];
	break;
	}
	}
	}
	}

	// size
	$data['size'] = intval($part_a[6]);

	return $data;
	}

	public static function getStructurePartArray($a, $part)
	{
	if (!is_array($a)) {
	return false;
	}

	if (empty($part)) {
	return $a;
	}

	$ctype = is_string($a[0]) && is_string($a[1]) ? $a[0] . '/' . $a[1] : '';

	if (strcasecmp($ctype, 'message/rfc822') == 0) {
	$a = $a[8];
	}

	if (strpos($part, '.') > 0) {
	$orig_part = $part;
	$pos = strpos($part, '.');
	$rest = substr($orig_part, $pos+1);
	$part = substr($orig_part, 0, $pos);

	return self::getStructurePartArray($a[$part-1], $rest);
	}
	else if ($part > 0) {
	return is_array($a[$part-1]) ? $a[$part-1] : $a;
	}
	}

	/**
	* Creates next command identifier (tag)
	*
	* @return string Command identifier
	* @since 0.5-beta
	*/
	public function nextTag()
	{
	$this->cmd_num++;
	$this->cmd_tag = sprintf('A%04d', $this->cmd_num);

	return $this->cmd_tag;
	}

	/**
	* Sends IMAP command and parses result
	*
	* @param string $command IMAP command
	* @param array $arguments Command arguments
	* @param int $options Execution options
	* @param string $filter Line filter (regexp)
	*
	* @return mixed Response code or list of response code and data
	* @since 0.5-beta
	*/
	public function execute($command, $arguments = [], $options = 0, $filter = null)
	{
	$tag = $this->nextTag();
	$query = $tag . ' ' . $command;
	$noresp = ($options & self::COMMAND_NORESPONSE);
	$response = $noresp ? null : '';

	if (!empty($arguments)) {
	foreach ($arguments as $arg) {
	$query .= ' ' . self::r_implode($arg);
	}
	}

	// Send command
	if (!$this->putLineC($query, true, ($options & self::COMMAND_ANONYMIZED))) {
	preg_match('/^[A-Z0-9]+ ((UID )?[A-Z]+)/', $query, $matches);
	$cmd = $matches[1] ?: 'UNKNOWN';
	$this->setError(self::ERROR_COMMAND, "Failed to send $cmd command");

	return $noresp ? self::ERROR_COMMAND : [self::ERROR_COMMAND, ''];
	}

	// Parse response
	do {
	$line = $this->readFullLine(4096);

	if ($response !== null) {
	if (!$filter \|\| preg_match($filter, $line)) {
	$response .= $line;
	}
	}

	// parse untagged response for [COPYUID 1204196876 3456:3457 123:124] (RFC6851)
	if ($line && $command == 'UID MOVE') {
	if (preg_match("/^\* OK \[COPYUID [0-9]+ ([0-9,:]+) ([0-9,:]+)\]/i", $line, $m)) {
	$this->data['COPYUID'] = [$m[1], $m[2]];
	}
	}
	}
	while (!$this->startsWith($line, $tag . ' ', true, true));

	$code = $this->parseResult($line, $command . ': ');

	// Remove last line from response
	if ($response) {
	if (!$filter) {
	$line_len = min(strlen($response), strlen($line));
	$response = substr($response, 0, -$line_len);
	}

	$response = rtrim($response, "\r\n");
	}

	// optional CAPABILITY response
	if (($options & self::COMMAND_CAPABILITY) && $code == self::ERROR_OK
	&& preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)
	) {
	$this->parseCapability($matches[1], true);
	}

	// return last line only (without command tag, result and response code)
	if ($line && ($options & self::COMMAND_LASTLINE)) {
	$response = preg_replace("/^$tag (OK\|NO\|BAD\|BYE\|PREAUTH)?\s(\[[a-z-]+\])?\s/i", '', trim($line));
	}

	return $noresp ? $code : [$code, $response];
	}

	/**
	* Splits IMAP response into string tokens
	*
	* @param string &$str The IMAP's server response
	* @param int $num Number of tokens to return
	*
	* @return mixed Tokens array or string if $num=1
	* @since 0.5-beta
	*/
	public static function tokenizeResponse(&$str, $num=0)
	{
	$result = [];

	while (!$num \|\| count($result) < $num) {
	// remove spaces from the beginning of the string
	$str = ltrim($str);

	// empty string
	if ($str === '' \|\| $str === null) {
	break;
	}

	switch ($str[0]) {

	// String literal
	case '{':
	if (($epos = strpos($str, "}\r\n", 1)) == false) {
	// error
	}
	if (!is_numeric(($bytes = substr($str, 1, $epos - 1)))) {
	// error
	}

	$result[] = $bytes ? substr($str, $epos + 3, $bytes) : '';
	$str = substr($str, $epos + 3 + $bytes);
	break;

	// Quoted string
	case '"':
	$len = strlen($str);

	for ($pos=1; $pos<$len; $pos++) {
	if ($str[$pos] == '"') {
	break;
	}
	if ($str[$pos] == "\\") {
	if ($str[$pos + 1] == '"' \|\| $str[$pos + 1] == "\\") {
	$pos++;
	}
	}
	}

	// we need to strip slashes for a quoted string
	$result[] = stripslashes(substr($str, 1, $pos - 1));
	$str = substr($str, $pos + 1);
	break;

	// Parenthesized list
	case '(':
	$str = substr($str, 1);
	$result[] = self::tokenizeResponse($str);
	break;

	case ')':
	$str = substr($str, 1);
	return $result;

	// String atom, number, astring, NIL, *, %
	default:
	// excluded chars: SP, CTL, ), DEL
	// we do not exclude [ and ] (#1489223)
	if (preg_match('/^([^\x00-\x20\x29\x7F]+)/', $str, $m)) {
	$result[] = $m[1] == 'NIL' ? null : $m[1];
	$str = substr($str, strlen($m[1]));
	}

	break;
	}
	}

	return $num == 1 ? (isset($result[0]) ? $result[0] : '') : $result;
	}

	/**
	* Joins IMAP command line elements (recursively)
	*/
	protected static function r_implode($element)
	{
	if (!is_array($element)) {
	return $element;
	}

	reset($element);

	$string = '';

	foreach ($element as $value) {
	$string .= ' ' . self::r_implode($value);
	}

	return '(' . trim($string) . ')';
	}

	/**
	* Converts message identifiers array into sequence-set syntax
	*
	* @param array $messages Message identifiers
	* @param bool $force Forces compression of any size
	*
	* @return string Compressed sequence-set
	*/
	public static function compressMessageSet($messages, $force = false)
	{
	// given a comma delimited list of independent mid's,
	// compresses by grouping sequences together
	if (!is_array($messages)) {
	// if less than 255 bytes long, let's not bother
	if (!$force && strlen($messages) < 255) {
	return preg_match('/[^0-9:,*]/', $messages) ? 'INVALID' : $messages;
	}

	// see if it's already been compressed
	if (strpos($messages, ':') !== false) {
	return preg_match('/[^0-9:,*]/', $messages) ? 'INVALID' : $messages;
	}

	// separate, then sort
	$messages = explode(',', $messages);
	}

	sort($messages);

	$result = [];
	$start = $prev = $messages[0];

	foreach ($messages as $id) {
	$incr = $id - $prev;
	if ($incr > 1) { // found a gap
	if ($start == $prev) {
	$result[] = $prev; // push single id
	}
	else {
	$result[] = $start . ':' . $prev; // push sequence as start_id:end_id
	}
	$start = $id; // start of new sequence
	}
	$prev = $id;
	}

	// handle the last sequence/id
	if ($start == $prev) {
	$result[] = $prev;
	}
	else {
	$result[] = $start.':'.$prev;
	}

	// return as comma separated string
	$result = implode(',', $result);

	return preg_match('/[^0-9:,*]/', $result) ? 'INVALID' : $result;
	}

	/**
	* Converts message sequence-set into array
	*
	* @param string $messages Message identifiers
	*
	* @return array List of message identifiers
	*/
	public static function uncompressMessageSet($messages)
	{
	if (empty($messages)) {
	return [];
	}

	$result = [];
	$messages = explode(',', $messages);

	foreach ($messages as $idx => $part) {
	$items = explode(':', $part);

	if (!empty($items[1]) && $items[1] > $items[0]) {
	$max = $items[1];
	}
	else {
	$max = $items[0];
	}

	for ($x = $items[0]; $x <= $max; $x++) {
	$result[] = (int) $x;
	}

	unset($messages[$idx]);
	}

	return $result;
	}

	/**
	* Clear internal status cache
	*/
	protected function clear_status_cache($mailbox)
	{
	unset($this->data['STATUS:' . $mailbox]);

	$keys = ['EXISTS', 'RECENT', 'UNSEEN', 'UID-MAP'];

	foreach ($keys as $key) {
	unset($this->data[$key]);
	}
	}

	/**
	* Clear internal cache of the current mailbox
	*/
	protected function clear_mailbox_cache()
	{
	$this->clear_status_cache($this->selected);

	$keys = ['UIDNEXT', 'UIDVALIDITY', 'HIGHESTMODSEQ', 'NOMODSEQ',
	'PERMANENTFLAGS', 'QRESYNC', 'VANISHED', 'READ-WRITE'];

	foreach ($keys as $key) {
	unset($this->data[$key]);
	}
	}

	/**
	* Converts flags array into string for inclusion in IMAP command
	*
	* @param array $flags Flags (see self::flags)
	*
	* @return string Space-separated list of flags
	*/
	protected function flagsToStr($flags)
	{
	foreach ((array) $flags as $idx => $flag) {
	if ($flag = $this->flags[strtoupper($flag)]) {
	$flags[$idx] = $flag;
	}
	}

	return implode(' ', (array) $flags);
	}

	/**
	* CAPABILITY response parser
	*/
	protected function parseCapability($str, $trusted=false)
	{
	$str = preg_replace('/^\* CAPABILITY /i', '', $str);

	$this->capability = explode(' ', strtoupper($str));

	if (!empty($this->prefs['disabled_caps'])) {
	$this->capability = array_diff($this->capability, $this->prefs['disabled_caps']);
	}

	if (!isset($this->prefs['literal+']) && in_array('LITERAL+', $this->capability)) {
	$this->prefs['literal+'] = true;
	}

	if ($trusted) {
	$this->capability_read = true;
	}
	}

	/**
	* Escapes a string when it contains special characters (RFC3501)
	*
	* @param string $string IMAP string
	* @param bool $force_quotes Forces string quoting (for atoms)
	*
	* @return string String atom, quoted-string or string literal
	* @todo lists
	*/
	public static function escape($string, $force_quotes = false)
	{
	if ($string === null) {
	return 'NIL';
	}

	if ($string === '') {
	return '""';
	}

	// atom-string (only safe characters)
	if (!$force_quotes && !preg_match('/[\x00-\x20\x22\x25\x28-\x2A\x5B-\x5D\x7B\x7D\x80-\xFF]/', $string)) {
	return $string;
	}

	// quoted-string
	if (!preg_match('/[\r\n\x00\x80-\xFF]/', $string)) {
	return '"' . addcslashes($string, '\\"') . '"';
	}

	// literal-string
	return sprintf("{%d}\r\n%s", strlen($string), $string);
	}

	/**
	* Set the value of the debugging flag.
	*
	* @param bool $debug New value for the debugging flag.
	* @param callback $handler Logging handler function
	*
	* @since 0.5-stable
	*/
	public function setDebug($debug, $handler = null)
	{
	$this->debug = $debug;
	$this->debug_handler = $handler;
	}

	/**
	* Write the given debug text to the current debug output handler.
	*
	* @param string $message Debug message text.
	*
	* @since 0.5-stable
	*/
	protected function debug($message)
	{
	if (($len = strlen($message)) > self::DEBUG_LINE_LENGTH) {
	$diff = $len - self::DEBUG_LINE_LENGTH;
	$message = substr($message, 0, self::DEBUG_LINE_LENGTH)
	. "... [truncated $diff bytes]";
	}

	if ($this->resourceid) {
	$message = sprintf('[%s] %s', $this->resourceid, $message);
	}

	if ($this->debug_handler) {
	call_user_func_array($this->debug_handler, [$this, $message]);
	}
	else {
	echo "DEBUG: $message\n";
	}
	}
	}
	diff --git a/program/lib/Roundcube/rcube_message_header.php b/program/lib/Roundcube/rcube_message_header.php
	index ce4cdeddc..c1fa71714 100644
	--- a/program/lib/Roundcube/rcube_message_header.php
	+++ b/program/lib/Roundcube/rcube_message_header.php
	@@ -1,339 +1,338 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| \|
	\| Copyright (C) The Roundcube Dev Team \|
	\| Copyright (C) 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: \|
	\| E-mail message headers representation \|
	+-----------------------------------------------------------------------+
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	/**
	* Struct representing an e-mail message header
	*
	* @package Framework
	* @subpackage Storage
	*/
	class rcube_message_header
	{
	/**
	* Message sequence number
	*
	* @var int
	*/
	public $id;

	/**
	* Message unique identifier
	*
	* @var int
	*/
	public $uid;

	/**
	* Message subject
	*
	* @var string
	*/
	public $subject;

	/**
	* Message sender (From)
	*
	* @var string
	*/
	public $from;

	/**
	* Message recipient (To)
	*
	* @var string
	*/
	public $to;

	/**
	* Message additional recipients (Cc)
	*
	* @var string
	*/
	public $cc;

	/**
	* Message Reply-To header
	*
	* @var string
	*/
	public $replyto;

	/**
	* Message In-Reply-To header
	*
	* @var string
	*/
	public $in_reply_to;

	/**
	* Message date (Date)
	*
	* @var string
	*/
	public $date;

	/**
	* Message identifier (Message-ID)
	*
	* @var string
	*/
	public $messageID;

	/**
	* Message size
	*
	* @var int
	*/
	public $size;

	/**
	* Message encoding
	*
	* @var string
	*/
	public $encoding;

	/**
	* Message charset
	*
	* @var string
	*/
	public $charset;

	/**
	* Message Content-type
	*
	* @var string
	*/
	public $ctype;

	/**
	* Message timestamp (based on message date)
	*
	* @var int
	*/
	public $timestamp;

	/**
	* IMAP bodystructure string
	*
	* @var string
	*/
	public $bodystructure;

	/**
	* IMAP internal date
	*
	* @var string
	*/
	public $internaldate;

	/**
	* Message References header
	*
	* @var string
	*/
	public $references;

	/**
	* Message priority (X-Priority)
	*
	* @var int
	*/
	public $priority;

	/**
	* Message receipt recipient
	*
	* @var string
	*/
	public $mdn_to;

	/**
	* IMAP folder this message is stored in
	*
	* @var string
	*/
	public $folder;

	/**
	* Other message headers
	*
	* @var array
	*/
	public $others = [];

	/**
	* Message flags
	*
	* @var array
	*/
	public $flags = [];

	/**
	* Header name to rcube_message_header object property map
	*
	* @var array
	*/
	private $obj_headers = [
	'date' => 'date',
	'from' => 'from',
	'to' => 'to',
	'subject' => 'subject',
	'reply-to' => 'replyto',
	'cc' => 'cc',
	'bcc' => 'bcc',
	'mbox' => 'folder',
	'folder' => 'folder',
	'content-transfer-encoding' => 'encoding',
	'in-reply-to' => 'in_reply_to',
	'content-type' => 'ctype',
	'charset' => 'charset',
	'references' => 'references',
	- 'return-receipt-to' => 'mdn_to',
	'disposition-notification-to' => 'mdn_to',
	'x-confirm-reading-to' => 'mdn_to',
	'message-id' => 'messageID',
	'x-priority' => 'priority',
	];

	/**
	* Returns header value
	*
	* @param string $name Header name
	* @param bool $decode Decode the header content
	*
	* @param string\|null Header content
	*/
	public function get($name, $decode = true)
	{
	$name = strtolower($name);
	$value = null;

	if (isset($this->obj_headers[$name]) && isset($this->{$this->obj_headers[$name]})) {
	$value = $this->{$this->obj_headers[$name]};
	}
	else if (isset($this->others[$name])) {
	$value = $this->others[$name];
	}

	if ($decode && $value !== null) {
	if (is_array($value)) {
	foreach ($value as $key => $val) {
	$val = rcube_mime::decode_header($val, $this->charset);
	$value[$key] = rcube_charset::clean($val);
	}
	}
	else {
	$value = rcube_mime::decode_header($value, $this->charset);
	$value = rcube_charset::clean($value);
	}
	}

	return $value;
	}

	/**
	* Sets header value
	*
	* @param string $name Header name
	* @param string $value Header content
	*/
	public function set($name, $value)
	{
	$name = strtolower($name);

	if (isset($this->obj_headers[$name])) {
	$this->{$this->obj_headers[$name]} = $value;
	}
	else {
	$this->others[$name] = $value;
	}
	}

	/**
	* Factory method to instantiate headers from a data array
	*
	* @param array $arr Hash array with header values
	*
	* @return rcube_message_header instance filled with headers values
	*/
	public static function from_array($arr)
	{
	$obj = new rcube_message_header;
	foreach ($arr as $k => $v) {
	$obj->set($k, $v);
	}

	return $obj;
	}
	}


	/**
	* Class for sorting an array of rcube_message_header objects in a predetermined order.
	*
	* @package Framework
	* @subpackage Storage
	*/
	class rcube_message_header_sorter
	{
	/** @var array Message UIDs */
	private $uids = [];


	/**
	* Set the predetermined sort order.
	*
	* @param array $index Numerically indexed array of IMAP UIDs
	*/
	function set_index($index)
	{
	$index = array_flip($index);

	$this->uids = $index;
	}

	/**
	* Sort the array of header objects
	*
	* @param array $headers Array of rcube_message_header objects indexed by UID
	*/
	function sort_headers(&$headers)
	{
	uksort($headers, [$this, "compare_uids"]);
	}

	/**
	* Sort method called by uksort()
	*
	* @param int $a Array key (UID)
	* @param int $b Array key (UID)
	*/
	function compare_uids($a, $b)
	{
	// then find each sequence number in my ordered list
	$posa = isset($this->uids[$a]) ? intval($this->uids[$a]) : -1;
	$posb = isset($this->uids[$b]) ? intval($this->uids[$b]) : -1;

	// return the relative position as the comparison value
	return $posa - $posb;
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Feb 3, 4:34 PM (16 h, 21 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 427382
Default Alt Text: (496 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions