No OneTemporary
Actions

Size

448 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 0c72d37f1..1691091ec 100644
	--- a/CHANGELOG.md
	+++ b/CHANGELOG.md
	@@ -1,3244 +1,3245 @@
	# Changelog Roundcube Webmail

	## Unreleased

	- OAuth: pass 'id_token' to 'oauth_login' plugin hook (#8214)
	- OAuth: fix expiration of short-lived oauth tokens (#8147)
	- OAuth: fix relative path to assets if /index.php/foo/bar url is used (#8144)
	- Fix so folder search parameters are honored by subscriptions_option plugin (#8312)
	- Fix password change with Directadmin driver (#8322, #8329)
	- Fix so css files in plugins/jqueryui/themes will be minified too (#8337)
	- Fix handling of unicode/special characters in custom From input (#8357)
	+- Fix some PHP8 compatibility issues (#8363)

	## Release 1.5.1

	- Fix importing contacts with no email address (#8227)
	- Fix so session's search scope is not used if search is not active (#8199)
	- Fix some PHP8 warnings (#8239)
	- Fix so dark mode state is retained after closing the browser (#8237)
	- Fix bug where new messages were not added to the list on refresh if skip_deleted=true (#8234)
	- Fix colors on "Show source" page in dark mode (#8246)
	- Fix handling of dark_mode_support:false setting in skins meta.json - also when devel_mode=false (#8249)
	- Fix database initialization if db_prefix is a schema prefix (#8221)
	- Fix undefined constant error in Installer on Windows (#8258)
	- Fix installation/upgrade on MySQL 5.5 - Index column size too large (#8231)
	- Fix regression in setting of contact listing name (#8260)
	- Fix bug in Larry skin where headers toggle state was reset on full page preview (#8203)
	- Fix bug where \u200b characters were added into the recipient input preventing mail delivery (#8269)
	- Fix charset conversion errors on PHP < 8 for charsets not supported by mbstring (#8252)
	- Fix bug where adding a contact to trusted senders via "Always allow from..." button didn't work (#8264, #8268)
	- Fix bug with show_images setting where option 1 and 3 were swapped (#8268)
	- Fix PHP fatal error on an undefined constant in contacts import action (#8277)
	- Fix fetching headers of multiple message parts at once in rcube_imap_generic::fetchMIMEHeaders() (#8282)
	- Fix bug where attachment download could sometimes fail with a CSRF check error (#8283)
	- Fix an infinite loop when parsing environment variables with float/integer values (#8293)
	- Fix so 'small-dark' logo has more priority than the 'small' logo (#8298)

	## Release 1.5.0

	- Support displaying RTF content (including encapsulated HTML) from a TNEF attachment
	- Disable the default spellchecker option using spell.roundcube.net (#8182)
	- Newmail_notifier: Improved the notification sound (#8155)
	- Fix size of Mailvelope iframe for PGP-inlined mail, again (#8126)
	- Fix handling of group names with @ character in autocomplete and contacts widget (#8098)
	- Fix Firefox infinate loading display on mail screen (#8128)
	- Fix converting >1MB of HTML content into plain text (#8137)
	- Fix bug where expanding a group in the recipient input could corrupt the input content (#7569)
	- Fix fatal error/warning on invalid input to user parameter (#8152)
	- Fix changing password with dovecot_passwdfile driver (#8145)
	- Fix handling of headers that occur multiple times by show_additional_headers plugin (#8157)
	- Fix bug where vertical scrollbar in new HTML message bounced back on scroll (#8046)
	- Fix displaying inline images with incorrectly declared content-type (#8158)
	- Fix so addr-spec with missing closing angle bracket can be parsed (#8164)
	- Fix handling of spellcheck connection errors (#8172)
	- Fix a couple of PHP8 warnings (#8175, #8176)
	- Fix bug where "from my contacts" and "from trusted senders" values were mixed up (#8177)
	- Fix password/token length check on OAuth login (#8178)
	- Fix XSS issue in handling attachment filename extension in mimetype mismatch warning (#8193)
	- Fix SQL injection via some session variables
	- Fix handling of dark_mode_support:false setting in skins meta.json (#8186)
	- Fix security issues regarding server name and trusted_host_patterns setting

	## Release 1.5-rc

	- Upgrade to TinyMCE 5.8.2
	- SMTP XCLIENT support (#7893, #6411)
	- Add IDN homograph attack (spoofing) detection [CVE-2019-15237] (#6891)
	- Add configuration options for subject prefixes (#7929, #4981)
	- Support IMAP LITERAL- extension [RFC 7888] (#6878)
	- 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)
	- Submit various simple dialog forms with the Enter key (#7133)
	- Add RFC2231 support to rcube_mime_decode (#7390)
	- 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)
	- Enigma: Optional support for passwordless keys (#7265)
	- Managesieve: Fix removing nested rules in scripts (#8011)
	- Managesieve: Support XOAUTH2, requires Net_Sieve 1.4.5 (#7925)
	- Managesieve: Added ability to remove 'redirect' option from UI (#7922)
	- 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 inserting a group from non-default source using the Insert contact(s) dialog (#8095)
	- 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)
	- Fix bug where consecutive LDAP searches could return wrong results (#8064)
	- Fix bug where plus characters in attachment filename could have been ignored (#8074)
	- Fix displaying HTML body with inline images encapsulated using TNEF format (winmail.dat)
	- Fix handling of custom sender addresses with names (#8106)
	- Fix shift + drag'n'drop menu not working in Elastic skin with Chrome browser (#8107)

	## 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/compose.php b/program/actions/mail/compose.php
	index 1301780c2..3dc247d8d 100644
	--- a/program/actions/mail/compose.php
	+++ b/program/actions/mail/compose.php
	@@ -1,1714 +1,1722 @@
	<?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: \|
	\| Compose a new mail message with all headers and attachments \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	class rcmail_action_mail_compose extends rcmail_action_mail_index
	{
	protected static $COMPOSE_ID;
	protected static $COMPOSE;
	protected static $MESSAGE;
	protected static $MESSAGE_BODY;
	protected static $CID_MAP = [];
	protected static $HTML_MODE = false;
	protected static $SENDMAIL;

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

	self::$COMPOSE_ID = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GET);
	self::$COMPOSE = null;

	if (self::$COMPOSE_ID && $_SESSION['compose_data_' . self::$COMPOSE_ID]) {
	self::$COMPOSE =& $_SESSION['compose_data_' . self::$COMPOSE_ID];
	}

	// give replicated session storage some time to synchronize
	$retries = 0;
	while (self::$COMPOSE_ID && !is_array(self::$COMPOSE) && $rcmail->db->is_replicated() && $retries++ < 5) {
	usleep(500000);
	$rcmail->session->reload();
	if ($_SESSION['compose_data_' . self::$COMPOSE_ID]) {
	self::$COMPOSE =& $_SESSION['compose_data_' . self::$COMPOSE_ID];
	}
	}

	// Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or
	// if a compose-ID is given (i.e. when the compose step is opened in a new window/tab).
	if (!is_array(self::$COMPOSE)) {
	// Infinite redirect prevention in case of broken session (#1487028)
	if (self::$COMPOSE_ID) {
	// if we know the message with specified ID was already sent
	// we can ignore the error and compose a new message (#1490009)
	if (
	!isset($_SESSION['last_compose_session'])
	\|\| self::$COMPOSE_ID != $_SESSION['last_compose_session']
	) {
	rcube::raise_error(['code' => 450], false, true);
	}
	}

	self::$COMPOSE_ID = uniqid(mt_rand());
	$params = rcube_utils::request2param(rcube_utils::INPUT_GET, 'task\|action', true);

	$_SESSION['compose_data_' . self::$COMPOSE_ID] = [
	'id' => self::$COMPOSE_ID,
	'param' => $params,
	'mailbox' => isset($params['mbox']) && strlen($params['mbox'])
	? $params['mbox'] : $rcmail->storage->get_folder(),
	];

	self::$COMPOSE =& $_SESSION['compose_data_' . self::$COMPOSE_ID];
	self::process_compose_params(self::$COMPOSE);

	// check if folder for saving sent messages exists and is subscribed (#1486802)
	if (!empty(self::$COMPOSE['param']['sent_mbox'])) {
	$sent_folder = self::$COMPOSE['param']['sent_mbox'];
	rcmail_sendmail::check_sent_folder($sent_folder, true);
	}

	// redirect to a unique URL with all parameters stored in session
	$rcmail->output->redirect([
	'_action' => 'compose',
	'_id' => self::$COMPOSE['id'],
	'_search' => !empty($_REQUEST['_search']) ? $_REQUEST['_search'] : null,
	]);
	}

	// add some labels to client
	$rcmail->output->add_label('notuploadedwarning', 'savingmessage', 'siginserted', 'responseinserted',
	'messagesaved', 'converting', 'editorwarning', 'discard',
	'fileuploaderror', 'sendmessage', 'newresponse', 'responsename', 'responsetext', 'save',
	'savingresponse', 'restoresavedcomposedata', 'restoremessage', 'delete', 'restore', 'ignore',
	'selectimportfile', 'messageissent', 'loadingdata', 'nopubkeyfor', 'nopubkeyforsender',
	'encryptnoattachments','encryptedsendialog','searchpubkeyservers', 'importpubkeys',
	'encryptpubkeysfound', 'search', 'close', 'import', 'keyid', 'keylength', 'keyexpired',
	'keyrevoked', 'keyimportsuccess', 'keyservererror', 'attaching', 'namex', 'attachmentrename'
	);

	$rcmail->output->set_pagetitle($rcmail->gettext('compose'));

	$rcmail->output->set_env('compose_id', self::$COMPOSE['id']);
	$rcmail->output->set_env('session_id', session_id());
	$rcmail->output->set_env('mailbox', $rcmail->storage->get_folder());
	$rcmail->output->set_env('top_posting', intval($rcmail->config->get('reply_mode')) > 0);
	$rcmail->output->set_env('sig_below', $rcmail->config->get('sig_below'));
	$rcmail->output->set_env('save_localstorage', (bool) $rcmail->config->get('compose_save_localstorage'));
	$rcmail->output->set_env('is_sent', false);
	$rcmail->output->set_env('mimetypes', self::supported_mimetypes());
	$rcmail->output->set_env('keyservers', $rcmail->config->keyservers());
	$rcmail->output->set_env('mailvelope_main_keyring', $rcmail->config->get('mailvelope_main_keyring'));

	$drafts_mbox = $rcmail->config->get('drafts_mbox');
	$config_show_sig = $rcmail->config->get('show_sig', 1);

	// add config parameters to client script
	if (strlen($drafts_mbox)) {
	$rcmail->output->set_env('drafts_mailbox', $drafts_mbox);
	$rcmail->output->set_env('draft_autosave', $rcmail->config->get('draft_autosave'));
	}

	// default font for HTML editor
	$font = self::font_defs($rcmail->config->get('default_font'));
	if ($font && !is_array($font)) {
	$rcmail->output->set_env('default_font', $font);
	}

	// default font size for HTML editor
	if ($font_size = $rcmail->config->get('default_font_size')) {
	$rcmail->output->set_env('default_font_size', $font_size);
	}

	$compose_mode = null;
	$msg_uid = null;

	// get reference message and set compose mode
	if (!empty(self::$COMPOSE['param']['draft_uid'])) {
	$msg_uid = self::$COMPOSE['param']['draft_uid'];
	$compose_mode = rcmail_sendmail::MODE_DRAFT;
	$rcmail->output->set_env('draft_id', $msg_uid);
	$rcmail->storage->set_folder($drafts_mbox);
	}
	else if (!empty(self::$COMPOSE['param']['reply_uid'])) {
	$msg_uid = self::$COMPOSE['param']['reply_uid'];
	$compose_mode = rcmail_sendmail::MODE_REPLY;
	}
	else if (!empty(self::$COMPOSE['param']['forward_uid'])) {
	$msg_uid = self::$COMPOSE['param']['forward_uid'];
	$compose_mode = rcmail_sendmail::MODE_FORWARD;
	self::$COMPOSE['forward_uid'] = $msg_uid;
	self::$COMPOSE['as_attachment'] = !empty(self::$COMPOSE['param']['attachment']);
	}
	else if (!empty(self::$COMPOSE['param']['uid'])) {
	$msg_uid = self::$COMPOSE['param']['uid'];
	$compose_mode = rcmail_sendmail::MODE_EDIT;
	}

	self::$COMPOSE['mode'] = $compose_mode;

	if ($compose_mode) {
	$rcmail->output->set_env('compose_mode', $compose_mode);
	}

	if ($compose_mode == rcmail_sendmail::MODE_EDIT \|\| $compose_mode == rcmail_sendmail::MODE_DRAFT) {
	// don't add signature in draft/edit mode, we'll also not remove the old-one
	// but only on page display, later we should be able to change identity/sig (#1489229)
	if ($config_show_sig == 1 \|\| $config_show_sig == 2) {
	$rcmail->output->set_env('show_sig_later', true);
	}
	}
	else if ($config_show_sig == 1) {
	$rcmail->output->set_env('show_sig', true);
	}
	else if ($config_show_sig == 2 && empty($compose_mode)) {
	$rcmail->output->set_env('show_sig', true);
	}
	else if (
	$config_show_sig == 3
	&& ($compose_mode == rcmail_sendmail::MODE_REPLY \|\| $compose_mode == rcmail_sendmail::MODE_FORWARD)
	) {
	$rcmail->output->set_env('show_sig', true);
	}

	if (!empty($msg_uid) && (empty(self::$COMPOSE['as_attachment']) \|\| $compose_mode == rcmail_sendmail::MODE_DRAFT)) {
	$mbox_name = $rcmail->storage->get_folder();

	// set format before rcube_message construction
	// use the same format as for the message view
	if (isset($_SESSION['msg_formats'][$mbox_name . ':' . $msg_uid])) {
	$rcmail->config->set('prefer_html', $_SESSION['msg_formats'][$mbox_name . ':' . $msg_uid]);
	}
	else {
	$prefer_html = $rcmail->config->get('prefer_html')
	\|\| $rcmail->config->get('htmleditor')
	\|\| $compose_mode == rcmail_sendmail::MODE_DRAFT
	\|\| $compose_mode == rcmail_sendmail::MODE_EDIT;

	$rcmail->config->set('prefer_html', $prefer_html);
	}

	self::$MESSAGE = new rcube_message($msg_uid);

	// make sure message is marked as read
	if (
	!empty(self::$MESSAGE->headers)
	&& self::$MESSAGE->context === null
	&& empty(self::$MESSAGE->headers->flags['SEEN'])
	) {
	$rcmail->storage->set_flag($msg_uid, 'SEEN');
	}

	if (!empty(self::$MESSAGE->headers->charset)) {
	$rcmail->storage->set_charset(self::$MESSAGE->headers->charset);
	}

	if (empty(self::$MESSAGE->headers)) {
	// error
	}
	else if ($compose_mode == rcmail_sendmail::MODE_FORWARD \|\| $compose_mode == rcmail_sendmail::MODE_REPLY) {
	if ($compose_mode == rcmail_sendmail::MODE_REPLY) {
	self::$COMPOSE['reply_uid'] = self::$MESSAGE->context === null ? $msg_uid : null;

	if (!empty(self::$COMPOSE['param']['all'])) {
	self::$MESSAGE->reply_all = self::$COMPOSE['param']['all'];
	}
	}
	else {
	self::$COMPOSE['forward_uid'] = $msg_uid;
	}

	self::$COMPOSE['reply_msgid'] = self::$MESSAGE->headers->messageID;
	self::$COMPOSE['references'] = trim(self::$MESSAGE->headers->references . " " . self::$MESSAGE->headers->messageID);

	// Save the sent message in the same folder of the message being replied to
	if (
	$rcmail->config->get('reply_same_folder')
	&& ($sent_folder = self::$COMPOSE['mailbox'])
	&& rcmail_sendmail::check_sent_folder($sent_folder, false)
	) {
	self::$COMPOSE['param']['sent_mbox'] = $sent_folder;
	}
	}
	else if ($compose_mode == rcmail_sendmail::MODE_DRAFT \|\| $compose_mode == rcmail_sendmail::MODE_EDIT) {
	if ($compose_mode == rcmail_sendmail::MODE_DRAFT) {
	if ($draft_info = self::$MESSAGE->headers->get('x-draft-info')) {
	// get reply_uid/forward_uid to flag the original message when sending
	$info = rcmail_sendmail::draftinfo_decode($draft_info);

	if ($info['type'] == 'reply') {
	self::$COMPOSE['reply_uid'] = $info['uid'];
	}
	else if ($info['type'] == 'forward') {
	self::$COMPOSE['forward_uid'] = $info['uid'];
	}

	self::$COMPOSE['mailbox'] = $info['folder'];

	// Save the sent message in the same folder of the message being replied to
	if (
	$rcmail->config->get('reply_same_folder')
	&& ($sent_folder = $info['folder'])
	&& rcmail_sendmail::check_sent_folder($sent_folder, false)
	) {
	self::$COMPOSE['param']['sent_mbox'] = $sent_folder;
	}
	}

	if (($msgid = self::$MESSAGE->headers->get('message-id')) && !preg_match('/^mid:[0-9]+$/', $msgid)) {
	self::$COMPOSE['param']['message-id'] = $msgid;
	}

	// use message UID as draft_id
	$rcmail->output->set_env('draft_id', $msg_uid);
	}

	if ($in_reply_to = self::$MESSAGE->headers->get('in-reply-to')) {
	self::$COMPOSE['reply_msgid'] = '<' . $in_reply_to . '>';
	}

	self::$COMPOSE['references'] = self::$MESSAGE->headers->references;
	}
	}
	else {
	self::$MESSAGE = new stdClass();

	// apply mailto: URL parameters
	if (!empty(self::$COMPOSE['param']['in-reply-to'])) {
	self::$COMPOSE['reply_msgid'] = '<' . trim(self::$COMPOSE['param']['in-reply-to'], '<> ') . '>';
	}

	if (!empty(self::$COMPOSE['param']['references'])) {
	self::$COMPOSE['references'] = self::$COMPOSE['param']['references'];
	}
	}

	if (!empty(self::$COMPOSE['reply_msgid'])) {
	$rcmail->output->set_env('reply_msgid', self::$COMPOSE['reply_msgid']);
	}

	// Initialize helper class to build the UI
	self::$SENDMAIL = new rcmail_sendmail(self::$COMPOSE, ['message' => self::$MESSAGE]);

	// process self::$MESSAGE body/attachments, set self::$MESSAGE_BODY/$HTML_MODE vars and some session data
	self::$MESSAGE_BODY = self::prepare_message_body();

	// register UI objects (Note: some objects are registered by rcmail_sendmail above)
	$rcmail->output->add_handlers([
	'composebody' => [$this, 'compose_body'],
	'composeobjects' => [$this, 'compose_objects'],
	'composeattachmentlist' => [$this, 'compose_attachment_list'],
	'composeattachmentform' => [$this, 'compose_attachment_form'],
	'composeattachment' => [$this, 'compose_attachment_field'],
	'filedroparea' => [$this, 'compose_file_drop_area'],
	'editorselector' => [$this, 'editor_selector'],
	'addressbooks' => [$this, 'addressbook_list'],
	'addresslist' => [$this, 'contacts_list'],
	'responseslist' => [$this, 'compose_responses_list'],
	]);

	$rcmail->output->include_script('publickey.js');

	self::spellchecker_init();

	$rcmail->output->send('compose');
	}

	// process compose request parameters
	public static function process_compose_params(&$COMPOSE)
	{
	if (!empty($COMPOSE['param']['to'])) {
	$mailto = explode('?', $COMPOSE['param']['to'], 2);

	// #1486037: remove "mailto:" prefix
	$COMPOSE['param']['to'] = preg_replace('/^mailto:/i', '', $mailto[0]);
	// #1490346: decode the recipient address
	// #1490510: use raw encoding for correct "+" character handling as specified in RFC6068
	$COMPOSE['param']['to'] = rawurldecode($COMPOSE['param']['to']);

	// Supported case-insensitive tokens in mailto URL
	$url_tokens = ['to', 'cc', 'bcc', 'reply-to', 'in-reply-to', 'references', 'subject', 'body'];

	if (!empty($mailto[1])) {
	parse_str($mailto[1], $query);
	foreach ($query as $f => $val) {
	if (($key = array_search(strtolower($f), $url_tokens)) !== false) {
	$f = $url_tokens[$key];
	}

	// merge mailto: addresses with addresses from 'to' parameter
	if ($f == 'to' && !empty($COMPOSE['param']['to'])) {
	$to_addresses = rcube_mime::decode_address_list($COMPOSE['param']['to'], null, true, null, true);
	$add_addresses = rcube_mime::decode_address_list($val, null, true);

	foreach ($add_addresses as $addr) {
	if (!in_array($addr['mailto'], $to_addresses)) {
	$to_addresses[] = $addr['mailto'];
	$COMPOSE['param']['to'] = (!empty($to_addresses) ? ', ' : '') . $addr['string'];
	}
	}
	}
	else {
	$COMPOSE['param'][$f] = $val;
	}
	}
	}
	}

	// resolve _forward_uid=* to an absolute list of messages from a search result
	if (
	!empty($COMPOSE['param']['forward_uid'])
	&& $COMPOSE['param']['forward_uid'] == '*'
	&& !empty($_SESSION['search'][1])
	&& is_object($_SESSION['search'][1])
	) {
	$COMPOSE['param']['forward_uid'] = $_SESSION['search'][1]->get();
	}

	// clean HTML message body which can be submitted by URL
	if (!empty($COMPOSE['param']['body'])) {
	if ($COMPOSE['param']['html'] = strpos($COMPOSE['param']['body'], '<') !== false) {
	$wash_params = ['safe' => false, 'inline_html' => true];
	$COMPOSE['param']['body'] = self::prepare_html_body($COMPOSE['param']['body'], $wash_params);
	}
	}

	$rcmail = rcmail::get_instance();

	// select folder where to save the sent message
	$COMPOSE['param']['sent_mbox'] = $rcmail->config->get('sent_mbox');

	// pipe compose parameters thru plugins
	$plugin = $rcmail->plugins->exec_hook('message_compose', $COMPOSE);

	$COMPOSE['param'] = array_merge($COMPOSE['param'], $plugin['param']);

	// add attachments listed by message_compose hook
	if (!empty($plugin['attachments'])) {
	foreach ($plugin['attachments'] as $attach) {
	// we have structured data
	if (is_array($attach)) {
	$attachment = $attach + ['group' => self::$COMPOSE_ID];
	}
	// only a file path is given
	else {
	$filename = basename($attach);
	$attachment = [
	'group' => self::$COMPOSE_ID,
	'name' => $filename,
	'mimetype' => rcube_mime::file_content_type($attach, $filename),
	'size' => filesize($attach),
	'path' => $attach,
	];
	}

	// save attachment if valid
	if (
	(!empty($attachment['data']) && !empty($attachment['name']))
	\|\| (!empty($attachment['path']) && file_exists($attachment['path']))
	) {
	$attachment = $rcmail->plugins->exec_hook('attachment_save', $attachment);
	}

	if (!empty($attachment['status']) && empty($attachment['abort'])) {
	unset($attachment['data'], $attachment['status'], $attachment['abort']);
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	}
	}
	}
	}

	public static function compose_editor_mode()
	{
	static $useHtml;

	if ($useHtml !== null) {
	return $useHtml;
	}

	$rcmail = rcmail::get_instance();
	$html_editor = intval($rcmail->config->get('htmleditor'));
	$compose_mode = self::$COMPOSE['mode'];

	if (isset(self::$COMPOSE['param']['html']) && is_bool(self::$COMPOSE['param']['html'])) {
	$useHtml = self::$COMPOSE['param']['html'];
	}
	else if (isset($_POST['_is_html'])) {
	$useHtml = !empty($_POST['_is_html']);
	}
	else if ($compose_mode == rcmail_sendmail::MODE_DRAFT \|\| $compose_mode == rcmail_sendmail::MODE_EDIT) {
	$useHtml = self::message_is_html();
	}
	else if ($compose_mode == rcmail_sendmail::MODE_REPLY) {
	$useHtml = $html_editor == 1 \|\| ($html_editor >= 2 && self::message_is_html());
	}
	else if ($compose_mode == rcmail_sendmail::MODE_FORWARD) {
	$useHtml = $html_editor == 1 \|\| $html_editor == 4
	\|\| ($html_editor == 3 && self::message_is_html());
	}
	else {
	$useHtml = $html_editor == 1 \|\| $html_editor == 4;
	}

	return $useHtml;
	}

	public static function message_is_html()
	{
	return rcmail::get_instance()->config->get('prefer_html')
	&& (self::$MESSAGE instanceof rcube_message)
	&& self::$MESSAGE->has_html_part(true);
	}

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

	// Set language list
	if ($rcmail->config->get('enable_spellcheck')) {
	$spellchecker = new rcube_spellchecker();
	}
	else {
	return;
	}

	$spellcheck_langs = $spellchecker->languages();

	if (empty($spellcheck_langs)) {
	if ($err = $spellchecker->error()) {
	rcube::raise_error(['code' => 500,
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Spell check engine error: " . trim($err)],
	true, false
	);
	}
	}
	else {
	$dictionary = (bool) $rcmail->config->get('spellcheck_dictionary');
	$lang = $_SESSION['language'];

	// if not found in the list, try with two-letter code
	if (empty($spellcheck_langs[$lang])) {
	$lang = strtolower(substr($lang, 0, 2));
	}

	if (empty($spellcheck_langs[$lang])) {
	$lang = 'en';
	}

	// include GoogieSpell
	$rcmail->output->include_script('googiespell.js');
	$rcmail->output->add_script(sprintf(
	"var googie = new GoogieSpell('%s/images/googiespell/','%s&lang=', %s);\n".
	"googie.lang_chck_spell = \"%s\";\n".
	"googie.lang_rsm_edt = \"%s\";\n".
	"googie.lang_close = \"%s\";\n".
	"googie.lang_revert = \"%s\";\n".
	"googie.lang_no_error_found = \"%s\";\n".
	"googie.lang_learn_word = \"%s\";\n".
	"googie.setLanguages(%s);\n".
	"googie.setCurrentLanguage('%s');\n".
	"googie.setDecoration(false);\n".
	"googie.decorateTextarea(rcmail.env.composebody);\n",
	$rcmail->output->asset_url($rcmail->output->get_skin_path()),
	$rcmail->url(['_task' => 'utils', '_action' => 'spell', '_remote' => 1]),
	!empty($dictionary) ? 'true' : 'false',
	rcube::JQ(rcube::Q($rcmail->gettext('checkspelling'))),
	rcube::JQ(rcube::Q($rcmail->gettext('resumeediting'))),
	rcube::JQ(rcube::Q($rcmail->gettext('close'))),
	rcube::JQ(rcube::Q($rcmail->gettext('revertto'))),
	rcube::JQ(rcube::Q($rcmail->gettext('nospellerrors'))),
	rcube::JQ(rcube::Q($rcmail->gettext('addtodict'))),
	rcube_output::json_serialize($spellcheck_langs),
	$lang
	), 'foot');

	$rcmail->output->add_label('checking');
	$rcmail->output->set_env('spell_langs', $spellcheck_langs);
	$rcmail->output->set_env('spell_lang', $lang);
	}
	}

	public static function prepare_message_body()
	{
	$rcmail = rcmail::get_instance();
	$body = '';

	// use posted message body
	if (!empty($_POST['_message'])) {
	$body = rcube_utils::get_input_value('_message', rcube_utils::INPUT_POST, true);
	$isHtml = (bool) rcube_utils::get_input_value('_is_html', rcube_utils::INPUT_POST);
	}
	else if (!empty(self::$COMPOSE['param']['body'])) {
	$body = self::$COMPOSE['param']['body'];
	$isHtml = !empty(self::$COMPOSE['param']['html']);
	}
	// forward as attachment
	else if (self::$COMPOSE['mode'] == rcmail_sendmail::MODE_FORWARD && !empty(self::$COMPOSE['as_attachment'])) {
	$isHtml = self::compose_editor_mode();

	self::write_forward_attachments();
	}
	// reply/edit/draft/forward
	else if (!empty(self::$COMPOSE['mode'])
	&& (self::$COMPOSE['mode'] != rcmail_sendmail::MODE_REPLY \|\| intval($rcmail->config->get('reply_mode')) != -1)
	) {
	$isHtml = self::compose_editor_mode();
	$messages = [];

	// Create a (fake) image attachments map. We need it before we handle
	// the message body. After that we'll go throughout the list and check
	// which images were used in the body and attach them for real or skip.
	if ($isHtml) {
	self::$CID_MAP = self::cid_map(self::$MESSAGE);
	}

	// set is_safe flag (before HTML body washing)
	if (self::$COMPOSE['mode'] == rcmail_sendmail::MODE_DRAFT) {
	self::$MESSAGE->is_safe = true;
	}
	else {
	self::check_safe(self::$MESSAGE);
	}

	if (!empty(self::$MESSAGE->parts)) {
	// collect IDs of message/rfc822 parts
	foreach (self::$MESSAGE->mime_parts() as $part) {
	if ($part->mimetype == 'message/rfc822') {
	$messages[] = $part->mime_id;
	}
	}

	foreach (self::$MESSAGE->parts as $part) {
	if (!empty($part->realtype) && $part->realtype == 'multipart/encrypted') {
	// find the encrypted message payload part
	if ($pgp_mime_part = self::$MESSAGE->get_multipart_encrypted_part()) {
	$rcmail->output->set_env('pgp_mime_message', [
	'_mbox' => $rcmail->storage->get_folder(),
	'_uid' => self::$MESSAGE->uid,
	'_part' => $pgp_mime_part->mime_id,
	]);
	}
	continue;
	}

	// skip no-content and attachment parts (#1488557)
	if ($part->type != 'content' \|\| !$part->size \|\| self::$MESSAGE->is_attachment($part)) {
	continue;
	}

	// skip all content parts inside the message/rfc822 part
	foreach ($messages as $mimeid) {
	if (strpos($part->mime_id, $mimeid . '.') === 0) {
	continue 2;
	}
	}

	if ($part_body = self::compose_part_body($part, $isHtml)) {
	$body .= ($body ? ($isHtml ? '<br/>' : "\n") : '') . $part_body;
	}
	}
	}
	else {
	$body = self::compose_part_body(self::$MESSAGE, $isHtml);
	}

	// compose reply-body
	if (self::$COMPOSE['mode'] == rcmail_sendmail::MODE_REPLY) {
	$body = self::create_reply_body($body, $isHtml);

	if (!empty(self::$MESSAGE->pgp_mime)) {
	$rcmail->output->set_env('compose_reply_header', self::get_reply_header(self::$MESSAGE));
	}
	}
	// forward message body inline
	else if (self::$COMPOSE['mode'] == rcmail_sendmail::MODE_FORWARD) {
	$body = self::create_forward_body($body, $isHtml);
	}
	// load draft message body
	else if (
	self::$COMPOSE['mode'] == rcmail_sendmail::MODE_DRAFT
	\|\| self::$COMPOSE['mode'] == rcmail_sendmail::MODE_EDIT
	) {
	$body = self::create_draft_body($body, $isHtml);
	}

	// Save forwarded files (or inline images) as attachments
	// This will also update inline images location in the body
	self::write_compose_attachments(self::$MESSAGE, $isHtml, $body);
	}
	// new message
	else {
	$isHtml = self::compose_editor_mode();
	}

	$plugin = $rcmail->plugins->exec_hook('message_compose_body', [
	'body' => $body,
	'html' => $isHtml,
	'mode' => self::$COMPOSE['mode'],
	'message' => self::$MESSAGE,
	]);

	$body = $plugin['body'];
	unset($plugin);

	// add blocked.gif attachment (#1486516)
	$regexp = '/ src="' . preg_quote($rcmail->output->asset_url('program/resources/blocked.gif'), '/') . '"/';
	if ($isHtml && preg_match($regexp, $body)) {
	$content = self::get_resource_content('blocked.gif');

	if ($content && ($attachment = self::save_image('blocked.gif', 'image/gif', $content))) {
	self::$COMPOSE['attachments'][$attachment['id']] = $attachment;
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$rcmail->comm_path, self::$COMPOSE['id'], $attachment['id']);
	$body = preg_replace($regexp, ' src="' . $url . '"', $body);
	}
	}

	self::$HTML_MODE = $isHtml;

	return $body;
	}

	+ /**
	+ * Prepare message (or message part) body for composition
	+ *
	+ * @param rcube_message\|rcube_message_part $part Message or message part object
	+ * @param bool $isHtml Use HTML mode
	+ *
	+ * @return string Message body text
	+ */
	public static function compose_part_body($part, $isHtml = false)
	{
	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	if (!rcube_utils::mem_check($part->size * 10)) {
	return '';
	}

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

	// message is cached but not exists (#1485443), or other error
	if ($body === false) {
	return '';
	}

	$rcmail = rcmail::get_instance();

	// register this part as pgp encrypted
	if (strpos($body, '-----BEGIN PGP MESSAGE-----') !== false) {
	self::$MESSAGE->pgp_mime = true;
	$rcmail->output->set_env('pgp_mime_message', [
	'_mbox' => $rcmail->storage->get_folder(),
	'_uid' => self::$MESSAGE->uid,
	'_part' => $part->mime_id,
	]);
	}

	$strip_signature = self::$COMPOSE['mode'] != rcmail_sendmail::MODE_DRAFT
	&& self::$COMPOSE['mode'] != rcmail_sendmail::MODE_EDIT
	&& $rcmail->config->get('strip_existing_sig', true);

	$flowed = !empty($part->ctype_parameters['format']) && $part->ctype_parameters['format'] == 'flowed';
	$delsp = $flowed && !empty($part->ctype_parameters['delsp']) && $part->ctype_parameters['delsp'] == 'yes';

	if ($isHtml) {
	if ($part->ctype_secondary == 'html') {
	$body = self::prepare_html_body($body);
	}
	else if ($part->ctype_secondary == 'enriched') {
	$body = rcube_enriched::to_html($body);
	}
	else {
	// try to remove the signature
	if ($strip_signature) {
	$body = self::remove_signature($body);
	}

	// add HTML formatting
	$body = self::plain_body($body, $flowed, $delsp);
	}
	}
	else {
	if ($part->ctype_secondary == 'enriched') {
	$body = rcube_enriched::to_html($body);
	$part->ctype_secondary = 'html';
	}

	if ($part->ctype_secondary == 'html') {
	// set line length for body wrapping
	$line_length = $rcmail->config->get('line_length', 72);

	// use html part if it has been used for message (pre)viewing
	// decrease line length for quoting
	$len = self::$COMPOSE['mode'] == rcmail_sendmail::MODE_REPLY ? $line_length-2 : $line_length;
	$body = $rcmail->html2text($body, ['width' => $len]);
	}
	else {
	if ($part->ctype_secondary == 'plain' && $flowed) {
	$body = rcube_mime::unfold_flowed($body, null, $delsp);
	}

	// try to remove the signature
	if ($strip_signature) {
	$body = self::remove_signature($body);
	}
	}
	}

	return $body;
	}

	public static function compose_body($attrib)
	{
	list($form_start, $form_end) = self::$SENDMAIL->form_tags($attrib);
	unset($attrib['form']);

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

	// If desired, set this textarea to be editable by TinyMCE
	$attrib['data-html-editor'] = true;
	if (self::$HTML_MODE) {
	$attrib['class'] = trim((isset($attrib['class']) ? $attrib['class'] : '') . ' mce_editor');
	}

	$attrib['name'] = '_message';

	$rcmail = rcmail::get_instance();
	$textarea = new html_textarea($attrib);
	$hidden = new html_hiddenfield();

	$hidden->add(['name' => '_draft_saveid', 'value' => $rcmail->output->get_env('draft_id')]);
	$hidden->add(['name' => '_draft', 'value' => '']);
	$hidden->add(['name' => '_is_html', 'value' => self::$HTML_MODE ? "1" : "0"]);
	$hidden->add(['name' => '_framed', 'value' => '1']);

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

	// include HTML editor
	self::html_editor();

	return ($form_start ? "$form_start\n" : '')
	. "\n" . $hidden->show() . "\n" . $textarea->show(self::$MESSAGE_BODY)
	. ($form_end ? "\n$form_end\n" : '');
	}

	public static function create_reply_body($body, $bodyIsHtml)
	{
	$rcmail = rcmail::get_instance();
	$reply_mode = (int) $rcmail->config->get('reply_mode');
	$reply_indent = $reply_mode != 2;

	// In top-posting without quoting it's better to use multi-line header
	if ($reply_mode == 2) {
	$prefix = self::get_forward_header(self::$MESSAGE, $bodyIsHtml, false);
	}
	else {
	$prefix = self::get_reply_header(self::$MESSAGE);
	if ($bodyIsHtml) {
	$prefix = '<p id="reply-intro">' . rcube::Q($prefix) . '</p>';
	}
	else {
	$prefix .= "\n";
	}
	}

	if (!$bodyIsHtml) {
	// soft-wrap and quote message text
	$line_length = $rcmail->config->get('line_length', 72);
	$body = self::wrap_and_quote($body, $line_length, $reply_indent);

	if ($reply_mode > 0) { // top-posting
	$prefix = "\n\n\n" . $prefix;
	$suffix = '';
	}
	else {
	$suffix = "\n";
	}
	}
	else {
	$suffix = '';

	if ($reply_indent) {
	$prefix .= '<blockquote>';
	$suffix .= '</blockquote>';
	}

	if ($reply_mode == 2) {
	// top-posting, no indent
	}
	else if ($reply_mode > 0) {
	// top-posting
	$prefix = '<br>' . $prefix;
	}
	else {
	$suffix .= '<p><br/></p>';
	}
	}

	return $prefix . $body . $suffix;
	}

	public static function get_reply_header($message)
	{
	if (empty($message->headers)) {
	return '';
	}

	$rcmail = rcmail::get_instance();
	$list = rcube_mime::decode_address_list($message->get_header('from'), 1, false, $message->headers->charset);
	$from = array_pop($list);

	return $rcmail->gettext([
	'name' => 'mailreplyintro',
	'vars' => [
	'date' => $rcmail->format_date($message->get_header('date'), $rcmail->config->get('date_long')),
	'sender' => !empty($from['name']) ? $from['name'] : rcube_utils::idn_to_utf8($from['mailto']),
	]
	]);
	}

	public static function create_forward_body($body, $bodyIsHtml)
	{
	return self::get_forward_header(self::$MESSAGE, $bodyIsHtml) . trim($body, "\r\n");
	}

	public static function get_forward_header($message, $bodyIsHtml = false, $extended = true)
	{
	if (empty($message->headers)) {
	return '';
	}

	$rcmail = rcmail::get_instance();
	$date = $rcmail->format_date($message->get_header('date'), $rcmail->config->get('date_long'));

	if (!$bodyIsHtml) {
	$prefix = "\n\n\n-------- " . $rcmail->gettext('originalmessage') . " --------\n";
	$prefix .= $rcmail->gettext('subject') . ': ' . $message->subject . "\n";
	$prefix .= $rcmail->gettext('date') . ': ' . $date . "\n";
	$prefix .= $rcmail->gettext('from') . ': ' . $message->get_header('from') . "\n";
	$prefix .= $rcmail->gettext('to') . ': ' . $message->get_header('to') . "\n";

	if ($extended && ($cc = $message->get_header('cc'))) {
	$prefix .= $rcmail->gettext('cc') . ': ' . $cc . "\n";
	}

	if ($extended && ($replyto = $message->get_header('reply-to')) && $replyto != $message->get_header('from')) {
	$prefix .= $rcmail->gettext('replyto') . ': ' . $replyto . "\n";
	}

	$prefix .= "\n";
	}
	else {
	$prefix = sprintf(
	"<br /><p>-------- " . $rcmail->gettext('originalmessage') . " --------</p>" .
	"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	$rcmail->gettext('subject'), rcube::Q($message->subject),
	$rcmail->gettext('date'), rcube::Q($date),
	$rcmail->gettext('from'), rcube::Q($message->get_header('from'), 'replace'),
	$rcmail->gettext('to'), rcube::Q($message->get_header('to'), 'replace')
	);

	if ($extended && ($cc = $message->get_header('cc'))) {
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	$rcmail->gettext('cc'), rcube::Q($cc, 'replace'));
	}

	if ($extended && ($replyto = $message->get_header('reply-to')) && $replyto != $message->get_header('from')) {
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	$rcmail->gettext('replyto'), rcube::Q($replyto, 'replace'));
	}

	$prefix .= "</tbody></table><br>";
	}

	return $prefix;
	}

	public static function create_draft_body($body, $bodyIsHtml)
	{
	// Return the draft body as-is
	return $body;
	}

	// Clean up HTML content of Draft/Reply/Forward (part of the message)
	public static function prepare_html_body($body, $wash_params = [])
	{
	static $part_no;

	// Set attributes of the part container
	$container_id = self::$COMPOSE['mode'] . 'body' . (++$part_no);
	$container_attrib = ['id' => $container_id];
	$body_args = [
	'safe' => self::$MESSAGE->is_safe,
	'plain' => false,
	'css_prefix' => 'v' . $part_no,
	];

	// remove comments (produced by washtml)
	$replace = ['/<!--[^>]+-->/' => ''];

	if (self::$COMPOSE['mode'] == rcmail_sendmail::MODE_DRAFT) {
	// convert TinyMCE's empty-line sequence (#1490463)
	$replace['/<p>\xC2\xA0<\/p>/'] = '<p><br /></p>';
	// remove <body> tags
	$replace['/<body([^>]*)>/i'] = '';
	$replace['/<\/body>/i'] = '';
	}
	else {
	$body_args['container_id'] = $container_id;
	$body_args['container_attrib'] = $container_attrib;
	}

	// Make the HTML content safe and clean
	$body = self::wash_html($body, $wash_params + $body_args, self::$CID_MAP);
	$body = preg_replace(array_keys($replace), array_values($replace), $body);
	$body = self::html4inline($body, $body_args);

	if (self::$COMPOSE['mode'] != rcmail_sendmail::MODE_DRAFT) {
	$body = html::div($container_attrib, $body);
	}

	return $body;
	}

	// Removes signature from the message body
	public static function remove_signature($body)
	{
	$rcmail = rcmail::get_instance();
	$body = str_replace("\r\n", "\n", $body);
	$len = strlen($body);
	$sig_max_lines = $rcmail->config->get('sig_max_lines', 15);

	while (($sp = strrpos($body, "-- \n", !empty($sp) ? -$len + $sp - 1 : 0)) !== false) {
	if ($sp == 0 \|\| $body[$sp-1] == "\n") {
	// do not touch blocks with more that X lines
	if (substr_count($body, "\n", $sp) < $sig_max_lines) {
	$body = substr($body, 0, max(0, $sp-1));
	}
	break;
	}
	}

	return $body;
	}

	public static function write_compose_attachments(&$message, $bodyIsHtml, &$message_body)
	{
	if (!empty($message->pgp_mime) \|\| !empty(self::$COMPOSE['forward_attachments'])) {
	return;
	}

	$messages = [];
	$loaded_attachments = [];

	if (!empty(self::$COMPOSE['attachments'])) {
	foreach ((array) self::$COMPOSE['attachments'] as $attachment) {
	$loaded_attachments[$attachment['name'] . $attachment['mimetype']] = $attachment;
	}
	}

	$rcmail = rcmail::get_instance();
	$has_html = $message->has_html_part();

	foreach ((array) $message->mime_parts() as $pid => $part) {
	if ($part->mimetype == 'message/rfc822') {
	$messages[] = $part->mime_id;
	}

	if (
	$part->disposition == 'attachment'
	\|\| ($part->disposition == 'inline' && $bodyIsHtml)
	\|\| $part->filename
	\|\| $part->mimetype == 'message/rfc822'
	) {
	// skip parts that aren't valid attachments
	if ($part->ctype_primary == 'multipart' \|\| $part->mimetype == 'application/ms-tnef') {
	continue;
	}

	// skip message attachments in reply mode
	if ($part->ctype_primary == 'message' && self::$COMPOSE['mode'] == rcmail_sendmail::MODE_REPLY) {
	continue;
	}

	// skip version.txt parts of multipart/encrypted messages
	if (!empty($message->pgp_mime) && $part->mimetype == 'application/pgp-encrypted' && $part->filename == 'version.txt') {
	continue;
	}

	// skip attachments included in message/rfc822 attachment (#1486487, #1490607)
	foreach ($messages as $mimeid) {
	if (strpos($part->mime_id, $mimeid . '.') === 0) {
	continue 2;
	}
	}

	$replace = null;

	// Skip inline images when not used in the body
	// Note: Apple Mail sends PDF files marked as inline (#7382)
	// Note: Apple clients send inline images even if there's no HTML body (#7414)
	if ($has_html && $part->disposition == 'inline' && $part->mimetype != 'application/pdf') {
	if (!$bodyIsHtml) {
	continue;
	}

	$idx = $part->content_id ? ('cid:' . $part->content_id) : $part->content_location;

	if ($idx && isset(self::$CID_MAP[$idx]) && strpos($message_body, self::$CID_MAP[$idx]) !== false) {
	$replace = self::$CID_MAP[$idx];
	}
	else {
	continue;
	}
	}
	// skip any other attachment on Reply
	else if (self::$COMPOSE['mode'] == rcmail_sendmail::MODE_REPLY) {
	continue;
	}

	$key = self::attachment_name($part) . $part->mimetype;

	if (!empty($loaded_attachments[$key])) {
	$attachment = $loaded_attachments[$key];
	}
	else {
	$attachment = self::save_attachment($message, $pid, self::$COMPOSE['id']);
	}

	if ($attachment) {
	if ($replace) {
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$rcmail->comm_path, self::$COMPOSE['id'], $attachment['id']);

	$message_body = str_replace($replace, $url, $message_body);
	}
	}
	}
	}

	self::$COMPOSE['forward_attachments'] = true;
	}

	/**
	* Create a map of attachment content-id/content-locations
	*/
	public static function cid_map($message)
	{
	if (!empty($message->pgp_mime)) {
	return [];
	}

	$messages = [];
	$map = [];

	foreach ((array) $message->mime_parts() as $pid => $part) {
	if ($part->mimetype == 'message/rfc822') {
	$messages[] = $part->mime_id;
	}

	if (!empty($part->content_id) \|\| !empty($part->content_location)) {
	// skip attachments included in message/rfc822 attachment (#1486487, #1490607)
	foreach ($messages as $mimeid) {
	if (strpos($part->mime_id, $mimeid . '.') === 0) {
	continue 2;
	}
	}

	$url = sprintf('RCMAP%s', md5($message->folder . '/' . $message->uid . '/' . $pid));
	$idx = !empty($part->content_id) ? ('cid:' . $part->content_id) : $part->content_location;

	$map[$idx] = $url;
	}
	}

	return $map;
	}

	// Creates attachment(s) from the forwarded message(s)
	public static function write_forward_attachments()
	{
	if (!empty(self::$MESSAGE->pgp_mime)) {
	return;
	}

	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();
	$names = [];
	$refs = [];
	$size_errors = 0;
	$size_limit = parse_bytes($rcmail->config->get('max_message_size'));
	$total_size = 10 * 1024; // size of message body, to start with

	$loaded_attachments = [];

	if (!empty(self::$COMPOSE['attachments'])) {
	foreach ((array) self::$COMPOSE['attachments'] as $attachment) {
	$loaded_attachments[$attachment['name'] . $attachment['mimetype']] = $attachment;
	$total_size += $attachment['size'];
	}
	}

	if (self::$COMPOSE['forward_uid'] == '*') {
	$index = $storage->index(null, self::sort_column(), self::sort_order());
	self::$COMPOSE['forward_uid'] = $index->get();
	}
	else if (!is_array(self::$COMPOSE['forward_uid']) && strpos(self::$COMPOSE['forward_uid'], ':')) {
	self::$COMPOSE['forward_uid'] = rcube_imap_generic::uncompressMessageSet(self::$COMPOSE['forward_uid']);
	}
	else if (is_string(self::$COMPOSE['forward_uid'])) {
	self::$COMPOSE['forward_uid'] = explode(',', self::$COMPOSE['forward_uid']);
	}

	foreach ((array) self::$COMPOSE['forward_uid'] as $uid) {
	$message = new rcube_message($uid);

	if (empty($message->headers)) {
	continue;
	}

	if (!empty($message->headers->charset)) {
	$storage->set_charset($message->headers->charset);
	}

	if (empty(self::$MESSAGE->subject)) {
	self::$MESSAGE->subject = $message->subject;
	}

	if ($message->headers->get('bcc', false) \|\| $message->headers->get('resent-bcc', false)) {
	self::$COMPOSE['has_bcc'] = true;
	}

	// generate (unique) attachment name
	$name = strlen($message->subject) ? mb_substr($message->subject, 0, 64) : 'message_rfc822';
	if (!empty($names[$name])) {
	$names[$name]++;
	$name .= '_' . $names[$name];
	}
	$names[$name] = 1;
	$name .= '.eml';

	if (!empty($loaded_attachments[$name . 'message/rfc822'])) {
	continue;
	}

	if ($size_limit && $size_limit < $total_size + $message->headers->size) {
	$size_errors++;
	continue;
	}

	$total_size += $message->headers->size;

	self::save_attachment($message, null, self::$COMPOSE['id'], ['filename' => $name]);

	if ($message->headers->messageID) {
	$refs[] = $message->headers->messageID;
	}
	}

	// set In-Reply-To and References headers
	if (count($refs) == 1) {
	self::$COMPOSE['reply_msgid'] = $refs[0];
	}

	if (!empty($refs)) {
	self::$COMPOSE['references'] = implode(' ', $refs);
	}

	if ($size_errors) {
	$limit = self::show_bytes($size_limit);
	$error = $rcmail->gettext([
	'name' => 'msgsizeerrorfwd',
	'vars' => ['num' => $size_errors, 'size' => $limit]
	]);
	$script = sprintf("%s.display_message('%s', 'error');", rcmail_output::JS_OBJECT_NAME, rcube::JQ($error));
	$rcmail->output->add_script($script, 'docready');
	}
	}

	/**
	* Saves an image as attachment
	*/
	public static function save_image($path, $mimetype = '', $data = null)
	{
	$is_file = false;

	// handle attachments in memory
	if (empty($data)) {
	$data = file_get_contents($path);
	$is_file = true;
	}

	$name = self::basename($path);

	if (empty($mimetype)) {
	if ($is_file) {
	$mimetype = rcube_mime::file_content_type($path, $name);
	}
	else {
	$mimetype = rcube_mime::file_content_type($data, $name, 'application/octet-stream', true);
	}
	}

	$attachment = [
	'group' => self::$COMPOSE['id'],
	'name' => $name,
	'mimetype' => $mimetype,
	'data' => $data,
	'size' => strlen($data),
	];

	$attachment = rcmail::get_instance()->plugins->exec_hook('attachment_save', $attachment);

	if ($attachment['status']) {
	unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
	return $attachment;
	}

	return false;
	}

	/**
	* Unicode-safe basename()
	*/
	public static function basename($filename)
	{
	// basename() is not unicode safe and locale dependent
	if (stristr(PHP_OS, 'win') \|\| stristr(PHP_OS, 'netware')) {
	return preg_replace('/^.*[\\\\\\/]/', '', $filename);
	}
	else {
	return preg_replace('/^.*[\/]/', '', $filename);
	}
	}

	/**
	* Handler for template object 'composeObjects'
	*
	* @param array $attrib HTML attributes
	*
	* @return string HTML content
	*/
	public static function compose_objects($attrib)
	{
	if (empty($attrib['id'])) {
	$attrib['id'] = 'compose-objects';
	}

	$rcmail = rcmail::get_instance();
	$content = [];

	// Add a warning about Bcc recipients
	if (!empty(self::$COMPOSE['has_bcc'])) {
	$msg = html::span(null, rcube::Q($rcmail->gettext('bccemail')));
	$msg_attrib = ['id' => 'bcc-warning', 'class' => 'boxwarning'];
	$content[] = html::div($msg_attrib, $msg);
	}

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

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

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

	/**
	* Attachments list object for templates
	*/
	public static function compose_attachment_list($attrib)
	{
	// add ID if not given
	if (empty($attrib['id'])) {
	$attrib['id'] = 'rcmAttachmentList';
	}

	$rcmail = rcmail::get_instance();
	$out = '';
	$button = '';
	$jslist = [];

	if (!empty($attrib['icon_pos']) && $attrib['icon_pos'] == 'left') {
	self::$COMPOSE['icon_pos'] = 'left';
	}
	$icon_pos = isset(self::$COMPOSE['icon_pos']) ? self::$COMPOSE['icon_pos'] : null;

	if (!empty(self::$COMPOSE['attachments'])) {
	if (!empty($attrib['deleteicon'])) {
	$button = html::img([
	'src' => $rcmail->output->asset_url($attrib['deleteicon'], true),
	'alt' => $rcmail->gettext('delete')
	]);
	}
	else if (self::get_bool_attr($attrib, 'textbuttons')) {
	$button = rcube::Q($rcmail->gettext('delete'));
	}

	foreach (self::$COMPOSE['attachments'] as $id => $a_prop) {
	if (empty($a_prop)) {
	continue;
	}

	$link_content = sprintf(
	'<span class="attachment-name" onmouseover="rcube_webmail.long_subject_title_ex(this)">%s</span>'
	. ' <span class="attachment-size">(%s)</span>',
	rcube::Q($a_prop['name']),
	self::show_bytes($a_prop['size'])
	);

	$content_link = html::a([
	'href' => '#load',
	'class' => 'filename',
	'onclick' => sprintf(
	"return %s.command('load-attachment','rcmfile%s', this, event)",
	rcmail_output::JS_OBJECT_NAME,
	$id
	),
	'tabindex' => !empty($attrib['tabindex']) ? $attrib['tabindex'] : '0',
	],
	$link_content
	);

	$delete_link = html::a([
	'href' => '#delete',
	'title' => $rcmail->gettext('delete'),
	'onclick' => sprintf(
	"return %s.command('remove-attachment','rcmfile%s', this, event)",
	rcmail_output::JS_OBJECT_NAME,
	$id
	),
	'class' => 'delete',
	'tabindex' => !empty($attrib['tabindex']) ? $attrib['tabindex'] : '0',
	'aria-label' => $rcmail->gettext('delete') . ' ' . $a_prop['name'],
	],
	$button
	);

	$out .= html::tag('li', [
	'id' => 'rcmfile' . $id,
	'class' => rcube_utils::file2class($a_prop['mimetype'], $a_prop['name']),
	],
	$icon_pos == 'left' ? $delete_link.$content_link : $content_link.$delete_link
	);

	$jslist['rcmfile'.$id] = [
	'name' => $a_prop['name'],
	'complete' => true,
	'mimetype' => $a_prop['mimetype']
	];
	}
	}

	if (!empty($attrib['deleteicon'])) {
	self::$COMPOSE['deleteicon'] = $rcmail->output->asset_url($attrib['deleteicon'], true);
	}
	else if (self::get_bool_attr($attrib, 'textbuttons')) {
	self::$COMPOSE['textbuttons'] = true;
	}
	if (!empty($attrib['cancelicon'])) {
	$rcmail->output->set_env('cancelicon', $rcmail->output->asset_url($attrib['cancelicon'], true));
	}
	if (!empty($attrib['loadingicon'])) {
	$rcmail->output->set_env('loadingicon', $rcmail->output->asset_url($attrib['loadingicon'], true));
	}

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

	// put tabindex value into data-tabindex attribute
	if (isset($attrib['tabindex'])) {
	$attrib['data-tabindex'] = $attrib['tabindex'];
	unset($attrib['tabindex']);
	}

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

	/**
	* Attachment upload form object for templates
	*/
	public static function compose_attachment_form($attrib)
	{
	$rcmail = rcmail::get_instance();

	// Limit attachment size according to message size limit
	$limit = parse_bytes($rcmail->config->get('max_message_size')) / 1.33;

	return self::upload_form($attrib, 'uploadform', 'send-attachment', ['multiple' => true], $limit);
	}

	/**
	* Register a certain container as active area to drop files onto
	*/
	public static function compose_file_drop_area($attrib)
	{
	$rcmail = rcmail::get_instance();

	if (!empty($attrib['id'])) {
	$rcmail->output->add_gui_object('filedrop', $attrib['id']);
	$rcmail->output->set_env('filedrop', ['action' => 'upload', 'fieldname' => '_attachments']);
	}
	}

	/**
	* Editor mode selector object for templates
	*/
	public static function editor_selector($attrib)
	{
	$rcmail = rcmail::get_instance();

	// determine whether HTML or plain text should be checked
	$useHtml = self::compose_editor_mode();

	if (empty($attrib['editorid'])) {
	$attrib['editorid'] = 'rcmComposeBody';
	}

	if (empty($attrib['name'])) {
	$attrib['name'] = 'editorSelect';
	}

	$attrib['onchange'] = "return rcmail.command('toggle-editor', {id: '".$attrib['editorid']."', html: this.value == 'html'}, '', event)";

	$select = new html_select($attrib);

	$select->add(rcube::Q($rcmail->gettext('htmltoggle')), 'html');
	$select->add(rcube::Q($rcmail->gettext('plaintoggle')), 'plain');

	return $select->show($useHtml ? 'html' : 'plain');
	}

	/**
	* Addressbooks list object for templates
	*/
	public static function addressbook_list($attrib = [])
	{
	$rcmail = rcmail::get_instance();

	$attrib += ['id' => 'rcmdirectorylist'];

	$line_templ = html::tag('li',
	['id' => 'rcmli%s', 'class' => '%s'],
	html::a([
	'href' => '#list',
	'rel' => '%s',
	'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('list-addresses','%s',this)"
	],
	'%s'
	)
	);

	$out = '';

	foreach ($rcmail->get_address_sources(false, true) as $j => $source) {
	$id = strval(strlen($source['id']) ? $source['id'] : $j);
	$js_id = rcube::JQ($id);

	// set class name(s)
	$class_name = 'addressbook';
	if (!empty($source['class_name'])) {
	$class_name .= ' ' . $source['class_name'];
	}

	$out .= sprintf($line_templ,
	rcube_utils::html_identifier($id,true),
	$class_name,
	$source['id'],
	$js_id,
	!empty($source['name']) ? $source['name'] : $id
	);
	}

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

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

	/**
	* Contacts list object for templates
	*/
	public static function contacts_list($attrib = [])
	{
	$rcmail = rcmail::get_instance();

	$attrib += ['id' => 'rcmAddressList'];

	// set client env
	$rcmail->output->add_gui_object('contactslist', $attrib['id']);
	$rcmail->output->set_env('pagecount', 0);
	$rcmail->output->set_env('current_page', 0);
	$rcmail->output->include_script('list.js');

	return $rcmail->table_output($attrib, [], ['name'], 'ID');
	}

	/**
	* Responses list object for templates
	*/
	public static function compose_responses_list($attrib)
	{
	$rcmail = rcmail::get_instance();

	$attrib += ['id' => 'rcmresponseslist', 'tagname' => 'ul', 'cols' => 1];

	$jsenv = [];
	$list = new html_table($attrib);

	foreach ($rcmail->get_compose_responses(true) as $response) {
	$key = $response['key'];
	$item = html::a([
	'href' => '#' . urlencode($response['name']),
	'class' => rtrim('insertresponse ' . $attrib['itemclass']),
	'unselectable' => 'on',
	'tabindex' => '0',
	'rel' => $key,
	],
	rcube::Q($response['name'])
	);

	$jsenv[$key] = $response;

	$list->add([], $item);
	}

	// add placeholder text when there are no responses available
	if (!empty($attrib['list-placeholder']) && $list->size() == 0) {
	$list->add([], html::a([
	'href' => '#',
	'class' => rtrim('insertresponse placeholder disabled'),
	'unselectable' => 'on',
	'tabindex' => '0',
	'aria-disabled' => 'true',
	],
	rcube::Q($rcmail->gettext($attrib['list-placeholder']))
	));
	}

	// set client env
	$rcmail->output->set_env('textresponses', $jsenv);
	$rcmail->output->add_gui_object('responseslist', $attrib['id']);

	return $list->show();
	}

	public static function save_attachment($message, $pid, $compose_id, $params = [])
	{
	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();

	if ($pid) {
	// attachment requested
	$part = $message->mime_parts[$pid];
	$size = $part->size;
	$mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
	$filename = !empty($params['filename']) ? $params['filename'] : self::attachment_name($part);
	}
	else if ($message instanceof rcube_message) {
	// the whole message requested
	$size = isset($message->size) ? $message->size : null;
	$mimetype = 'message/rfc822';
	$filename = !empty($params['filename']) ? $params['filename'] : 'message_rfc822.eml';
	}
	else if (is_string($message)) {
	// the whole message requested
	$size = strlen($message);
	$data = $message;
	$mimetype = $params['mimetype'];
	$filename = $params['filename'];
	}
	else {
	return;
	}

	if (!isset($data)) {
	$data = null;
	$path = null;

	// don't load too big attachments into memory
	if (!rcube_utils::mem_check($size)) {
	$path = rcube_utils::temp_filename('attmnt');

	if ($fp = fopen($path, 'w')) {
	if ($pid) {
	// part body
	$message->get_part_body($pid, false, 0, $fp);
	}
	else {
	// complete message
	$storage->get_raw_body($message->uid, $fp);
	}

	fclose($fp);
	}
	else {
	return false;
	}
	}
	else if ($pid) {
	// part body
	$data = $message->get_part_body($pid);
	}
	else {
	// complete message
	$data = $storage->get_raw_body($message->uid);
	}
	}

	$attachment = [
	'group' => $compose_id,
	'name' => $filename,
	'mimetype' => $mimetype,
	'content_id' => !empty($part) && isset($part->content_id) ? $part->content_id : null,
	'data' => $data,
	'path' => isset($path) ? $path : null,
	'size' => isset($path) ? filesize($path) : strlen($data),
	'charset' => !empty($part) ? $part->charset : (isset($params['charset']) ? $params['charset'] : null),
	];

	$attachment = $rcmail->plugins->exec_hook('attachment_save', $attachment);

	if ($attachment['status']) {
	unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);

	// rcube_session::append() replaces current session data with the old values
	// (in rcube_session::reload()). This is a problem in 'compose' action, because before
	// the first append() use we set some important data in the session.
	// It also overwrites attachments list. Fixing reload() is not so simple if possible
	// as we don't really know what has been added and what removed in meantime.
	// So, for now we'll do not use append() on 'compose' action (#1490608).

	if ($rcmail->action == 'compose') {
	self::$COMPOSE['attachments'][$attachment['id']] = $attachment;
	}
	else {
	$rcmail->session->append('compose_data_' . $compose_id . '.attachments', $attachment['id'], $attachment);
	}

	return $attachment;
	}
	else if (!empty($path)) {
	@unlink($path);
	}

	return false;
	}
	}
	diff --git a/program/actions/mail/search_contacts.php b/program/actions/mail/search_contacts.php
	index 5061fa4ac..c9f7e70b4 100644
	--- a/program/actions/mail/search_contacts.php
	+++ b/program/actions/mail/search_contacts.php
	@@ -1,138 +1,139 @@
	<?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: \|
	\| Search contacts from the address book widget \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	class rcmail_action_mail_search_contacts extends rcmail_action_mail_list_contacts
	{
	protected static $mode = self::MODE_AJAX;

	/**
	* Request handler.
	*
	* @param array $args Arguments from the previous step(s)
	*/
	public function run($args = [])
	{
	$rcmail = rcmail::get_instance();
	$search = rcube_utils::get_input_value('_q', rcube_utils::INPUT_GPC, true);
	$sources = $rcmail->get_address_sources();
	$search_mode = (int) $rcmail->config->get('addressbook_search_mode');
	$addr_sort_col = $rcmail->config->get('addressbook_sort_col', 'name');
	$afields = $rcmail->config->get('contactlist_fields');
	$page_size = $rcmail->config->get('addressbook_pagesize', $rcmail->config->get('pagesize', 50));
	$records = [];
	$search_set = [];
	$jsresult = [];
	$search_mode \|= rcube_addressbook::SEARCH_GROUPS;

	foreach ($sources as $s) {
	$source = $rcmail->get_address_book($s['id']);
	$source->set_page(1);
	$source->set_pagesize(9999);

	// list matching groups of this source
	if ($source->groups) {
	$jsresult += self::compose_contact_groups($source, $s['id'], $search, $search_mode);
	}

	// get contacts count
	$result = $source->search($afields, $search, $search_mode, true, true, 'email');

	if (!$result->count) {
	continue;
	}

	while ($row = $result->next()) {
	$row['sourceid'] = $s['id'];
	$key = rcube_addressbook::compose_contact_key($row, $addr_sort_col);
	$records[$key] = $row;
	}

	$search_set[$s['id']] = $source->get_search_set();
	unset($result);
	}

	$group_count = count($jsresult);

	// sort the records
	ksort($records, SORT_LOCALE_STRING);

	// create resultset object
	$count = count($records);
	$result = new rcube_result_set($count);

	// select the requested page
	if ($page_size < $count) {
	$records = array_slice($records, $result->first, $page_size);
	}

	$result->records = array_values($records);

	if (!empty($result) && $result->count > 0) {
	// create javascript list
	while ($row = $result->next()) {
	$name = rcube_addressbook::compose_list_name($row);
	- $classname = $row['_type'] == 'group' ? 'group' : 'person';
	- $keyname = $row['_type'] == 'group' ? 'contactgroup' : 'contact';
	+ $is_group = isset($row['_type']) && $row['_type'] == 'group';
	+ $classname = $is_group ? 'group' : 'person';
	+ $keyname = $is_group ? 'contactgroup' : 'contact';

	// add record for every email address of the contact
	// (same as in list_contacts.inc)
	$emails = rcube_addressbook::get_col_values('email', $row, true);

	foreach ($emails as $i => $email) {
	$row_id = $row['sourceid'].'-'.$row['ID'].'-'.$i;

	$jsresult[$row_id] = format_email_recipient($email, $name);

	$title = rcube_addressbook::compose_search_name($row, $email, $name);
	$link_content = rcube::Q($name ?: $email);
	if ($name && count($emails) > 1) {
	$link_content .= ' ' . html::span('email', rcube::Q($email));
	}
	$link = html::a(['title' => $title], $link_content);

	$rcmail->output->command('add_contact_row', $row_id, [$keyname => $link], $classname);
	}
	}

	// search request ID
	$search_request = md5('composeaddr' . $search);

	// save search settings in session
	$_SESSION['contact_search'][$search_request] = $search_set;
	$_SESSION['contact_search_params'] = ['id' => $search_request, 'data' => [$afields, $search]];

	$rcmail->output->show_message('contactsearchsuccessful', 'confirmation', ['nr' => $result->count]);

	$rcmail->output->set_env('search_request', $search_request);
	$rcmail->output->set_env('source', '');
	$rcmail->output->command('unselect_directory');
	}
	else if (!$group_count) {
	$rcmail->output->show_message('nocontactsfound', 'notice');
	}

	// update env
	$rcmail->output->set_env('contactdata', $jsresult);
	$rcmail->output->set_env('pagecount', ceil($result->count / $page_size));
	$rcmail->output->command('set_page_buttons');

	// send response
	$rcmail->output->send();
	}
	}
	diff --git a/program/actions/mail/send.php b/program/actions/mail/send.php
	index ae199d797..b8edf16c9 100644
	--- a/program/actions/mail/send.php
	+++ b/program/actions/mail/send.php
	@@ -1,421 +1,423 @@
	<?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: \|
	\| Compose a new mail message and send it or store as draft \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

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

	// remove all scripts and act as called in frame
	$rcmail->output->reset();
	$rcmail->output->framed = true;

	$COMPOSE_ID = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];

	// Sanity checks
	if (!isset($COMPOSE['id'])) {
	rcube::raise_error([
	'code' => 500,
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Invalid compose ID"
	], true, false
	);

	$rcmail->output->show_message('internalerror', 'error');
	$rcmail->output->send('iframe');
	}

	$saveonly = !empty($_GET['_saveonly']);
	$savedraft = !empty($_POST['_draft']) && !$saveonly;
	$SENDMAIL = new rcmail_sendmail($COMPOSE, [
	'sendmail' => true,
	'saveonly' => $saveonly,
	'savedraft' => $savedraft,
	'error_handler' => function() use ($rcmail) {
	call_user_func_array([$rcmail->output, 'show_message'], func_get_args());
	$rcmail->output->send('iframe');
	}
	]);

	if (!isset($COMPOSE['attachments'])) {
	$COMPOSE['attachments'] = [];
	}

	// Collect input for message headers
	$headers = $SENDMAIL->headers_input();

	$COMPOSE['param']['message-id'] = $headers['Message-ID'];

	$message_id = $headers['Message-ID'];
	$message_charset = $SENDMAIL->options['charset'];
	$message_body = rcube_utils::get_input_value('_message', rcube_utils::INPUT_POST, true, $message_charset);
	$isHtml = (bool) rcube_utils::get_input_value('_is_html', rcube_utils::INPUT_POST);

	// Reset message body and attachments in Mailvelope mode
	if (isset($_POST['_pgpmime'])) {
	$pgp_mime = rcube_utils::get_input_value('_pgpmime', rcube_utils::INPUT_POST);
	$isHtml = false;
	$message_body = '';

	// clear unencrypted attachments
	if (!empty($COMPOSE['attachments'])) {
	foreach ((array) $COMPOSE['attachments'] as $attach) {
	$rcmail->plugins->exec_hook('attachment_delete', $attach);
	}
	}

	$COMPOSE['attachments'] = [];
	}

	if ($isHtml) {
	$bstyle = [];

	if ($font_size = $rcmail->config->get('default_font_size')) {
	$bstyle[] = 'font-size: ' . $font_size;
	}
	if ($font_family = $rcmail->config->get('default_font')) {
	$bstyle[] = 'font-family: ' . self::font_defs($font_family);
	}

	// append doctype and html/body wrappers
	$bstyle = !empty($bstyle) ? (" style='" . implode('; ', $bstyle) . "'") : '';
	$message_body = '<html><head>'
	. '<meta http-equiv="Content-Type" content="text/html; charset='
	. ($message_charset ?: RCUBE_CHARSET) . '" /></head>'
	. "<body" . $bstyle . ">\r\n" . $message_body;
	}

	if (!$savedraft) {
	if ($isHtml) {
	$b_style = 'padding: 0 0.4em; border-left: #1010ff 2px solid; margin: 0';
	$pre_style = 'margin: 0; padding: 0; font-family: monospace';

	$message_body = preg_replace(
	[
	// remove empty signature div
	'/<div id="_rc_sig">( )?<\/div>[\s\r\n]*$/',
	// replace signature's div ID (#6073)
	'/ id="_rc_sig"/',
	// add inline css for blockquotes and container
	'/<blockquote>/',
	'/<div class="pre">/',
	// convert TinyMCE's new-line sequences (#1490463)
	'/<p> <\/p>/',
	],
	[
	'',
	' id="signature"',
	'<blockquote type="cite" style="'.$b_style.'">',
	'<div class="pre" style="'.$pre_style.'">',
	'<p><br /></p>',
	],
	$message_body
	);

	rcube_utils::preg_error([
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => "Could not format HTML!"
	], true);
	}

	// Check spelling before send
	if (
	$rcmail->config->get('spellcheck_before_send')
	&& $rcmail->config->get('enable_spellcheck')
	&& empty($COMPOSE['spell_checked'])
	&& !empty($message_body)
	) {
	$language = rcube_utils::get_input_value('_lang', rcube_utils::INPUT_GPC);
	$message_body = str_replace("\r\n", "\n", $message_body);
	$spellchecker = new rcube_spellchecker($language);
	$spell_result = $spellchecker->check($message_body, $isHtml);

	if ($error = $spellchecker->error()) {
	rcube::raise_error([
	'code' => 500, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Spellcheck error: " . $error
	],
	true, false
	);
	}
	else {
	$COMPOSE['spell_checked'] = true;

	if (!$spell_result) {
	if ($isHtml) {
	$result['words'] = $spellchecker->get();
	$result['dictionary'] = (bool) $rcmail->config->get('spellcheck_dictionary');
	}
	else {
	$result = $spellchecker->get_xml();
	}

	$rcmail->output->show_message('mispellingsfound', 'error');
	$rcmail->output->command('spellcheck_resume', $result);
	$rcmail->output->send('iframe');
	}
	}
	}

	// generic footer for all messages
	if ($footer = $SENDMAIL->generic_message_footer($isHtml)) {
	$message_body .= "\r\n" . $footer;
	}
	}

	if ($isHtml) {
	$message_body .= "\r\n</body></html>\r\n";
	}

	// sort attachments to make sure the order is the same as in the UI (#1488423)
	if ($files = rcube_utils::get_input_value('_attachments', rcube_utils::INPUT_POST)) {
	$files = explode(',', $files);
	$files = array_flip($files);
	foreach ($files as $idx => $val) {
	if (!empty($COMPOSE['attachments'][$idx])) {
	$files[$idx] = $COMPOSE['attachments'][$idx];
	unset($COMPOSE['attachments'][$idx]);
	}
	}

	$COMPOSE['attachments'] = array_merge(array_filter($files), (array) $COMPOSE['attachments']);
	}

	// Since we can handle big messages with disk usage, we need more time to work
	@set_time_limit(360);

	// create PEAR::Mail_mime instance, set headers, body and params
	$MAIL_MIME = $SENDMAIL->create_message($headers, $message_body, $isHtml, $COMPOSE['attachments']);

	// add stored attachments, if any
	if (is_array($COMPOSE['attachments'])) {
	self::add_attachments($SENDMAIL, $MAIL_MIME, $COMPOSE['attachments'], $isHtml);
	}

	// compose PGP/Mime message
	if (!empty($pgp_mime)) {
	$MAIL_MIME->addAttachment(new Mail_mimePart('Version: 1', [
	'content_type' => 'application/pgp-encrypted',
	'description' => 'PGP/MIME version identification',
	]));

	$MAIL_MIME->addAttachment(new Mail_mimePart($pgp_mime, [
	'content_type' => 'application/octet-stream',
	'filename' => 'encrypted.asc',
	'disposition' => 'inline',
	]));

	$MAIL_MIME->setContentType('multipart/encrypted', ['protocol' => 'application/pgp-encrypted']);
	$MAIL_MIME->setParam('preamble', 'This is an OpenPGP/MIME encrypted message (RFC 2440 and 3156)');
	}

	// This hook allows to modify the message before send or save action
	$plugin = $rcmail->plugins->exec_hook('message_ready', ['message' => $MAIL_MIME]);
	$MAIL_MIME = $plugin['message'];

	// Deliver the message over SMTP
	if (!$savedraft && !$saveonly) {
	$sent = $SENDMAIL->deliver_message($MAIL_MIME);
	}

	// Save the message in Drafts/Sent
	$saved = $SENDMAIL->save_message($MAIL_MIME);

	// raise error if saving failed
	if (!$saved && $savedraft) {
	self::display_server_error('errorsaving');
	// start the auto-save timer again
	$rcmail->output->command('auto_save_start');
	$rcmail->output->send('iframe');
	}

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

	// delete previous saved draft
	$drafts_mbox = $rcmail->config->get('drafts_mbox');
	$old_id = rcube_utils::get_input_value('_draft_saveid', rcube_utils::INPUT_POST);

	if ($old_id && (!empty($sent) \|\| $saved)) {
	$deleted = $rcmail->storage->delete_message($old_id, $drafts_mbox);

	// raise error if deletion of old draft failed
	if (!$deleted) {
	rcube::raise_error([
	'code' => 800,
	'type' => 'imap',
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Could not delete message from $drafts_mbox"
	],
	true, false
	);
	}
	}

	if ($savedraft) {
	// remember new draft-uid ($saved could be an UID or true/false here)
	if ($saved && is_bool($saved)) {
	$index = $rcmail->storage->search_once($drafts_mbox, 'HEADER Message-ID ' . $message_id);
	$saved = $index->max();
	}

	if ($saved) {
	$plugin = $rcmail->plugins->exec_hook('message_draftsaved', [
	'msgid' => $message_id,
	'uid' => $saved,
	'folder' => $store_target
	]);

	// display success
	$rcmail->output->show_message(!empty($plugin['message']) ? $plugin['message'] : 'messagesaved', 'confirmation');

	// update "_draft_saveid" and the "cmp_hash" to prevent "Unsaved changes" warning
	$COMPOSE['param']['draft_uid'] = $plugin['uid'];
	$rcmail->output->command('set_draft_id', $plugin['uid']);
	$rcmail->output->command('compose_field_hash', true);
	}

	// start the auto-save timer again
	$rcmail->output->command('auto_save_start');
	}
	else {
	// Collect folders which could contain the composed message,
	// we'll refresh the list if currently opened folder is one of them (#1490238)
	$folders = [];
	$save_error = false;

	if (!$saveonly) {
	if (in_array($COMPOSE['mode'], ['reply', 'forward', 'draft'])) {
	$folders[] = $COMPOSE['mailbox'];
	}
	if (!empty($COMPOSE['param']['draft_uid']) && $drafts_mbox) {
	$folders[] = $drafts_mbox;
	}
	}

	if ($store_folder && !$saved) {
	$params = $saveonly ? null : ['prefix' => true];
	self::display_server_error('errorsavingsent', null, null, $params);

	if ($saveonly) {
	$rcmail->output->send('iframe');
	}

	$save_error = true;
	}
	else {
	$rcmail->plugins->exec_hook('attachments_cleanup', ['group' => $COMPOSE_ID]);
	$rcmail->session->remove('compose_data_' . $COMPOSE_ID);
	$_SESSION['last_compose_session'] = $COMPOSE_ID;

	$rcmail->output->command('remove_compose_data', $COMPOSE_ID);

	if ($store_folder) {
	$folders[] = $store_target;
	}
	}

	$msg = $rcmail->gettext($saveonly ? 'successfullysaved' : 'messagesent');

	$rcmail->output->command('sent_successfully', 'confirmation', $msg, $folders, $save_error);
	}

	$rcmail->output->send('iframe');
	}

	public static function add_attachments($SENDMAIL, $message, $attachments, $isHtml)
	{
	$rcmail = rcmail::get_instance();

	foreach ($attachments as $id => $attachment) {
	// This hook retrieves the attachment contents from the file storage backend
	$attachment = $rcmail->plugins->exec_hook('attachment_get', $attachment);
	$is_inline = false;
	$dispurl = null;

	if ($isHtml) {
	$dispurl = '/[\'"]\S+display-attachment\S+file=rcmfile' . preg_quote($attachment['id']) . '[\'"]/';
	$message_body = $message->getHTMLBody();
	$is_inline = preg_match($dispurl, $message_body);
	}

	+ $ctype = isset($attachment['mimetype']) ? $attachment['mimetype'] : '';
	+ $ctype = str_replace('image/pjpeg', 'image/jpeg', $ctype); // #1484914
	+
	// inline image
	if ($is_inline) {
	// Mail_Mime does not support many inline attachments with the same name (#1489406)
	// we'll generate cid: urls here to workaround this
	$cid = preg_replace('/[^0-9a-zA-Z]/', '', uniqid(time(), true));
	if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $SENDMAIL->options['from'], $matches)) {
	$cid .= $matches[1];
	}
	else {
	$cid .= '@localhost';
	}

	if ($dispurl && !empty($message_body)) {
	$message_body = preg_replace($dispurl, '"cid:' . $cid . '"', $message_body);

	rcube_utils::preg_error([
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => "Could not replace an image reference!"
	], true
	);

	$message->setHTMLBody($message_body);
	}

	if (!empty($attachment['data'])) {
	- $message->addHTMLImage($attachment['data'], $attachment['mimetype'], $attachment['name'], false, $cid);
	+ $message->addHTMLImage($attachment['data'], $ctype, $attachment['name'], false, $cid);
	}
	else {
	- $message->addHTMLImage($attachment['path'], $attachment['mimetype'], $attachment['name'], true, $cid);
	+ $message->addHTMLImage($attachment['path'], $ctype, $attachment['name'], true, $cid);
	}
	}
	else {
	- $ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914
	$file = !empty($attachment['data']) ? $attachment['data'] : $attachment['path'];
	$folding = (int) $rcmail->config->get('mime_param_folding');

	$message->addAttachment($file,
	$ctype,
	$attachment['name'],
	!empty($attachment['data']) ? false : true,
	$ctype == 'message/rfc822' ? '8bit' : 'base64',
	'attachment',
	isset($attachment['charset']) ? $attachment['charset'] : null,
	'', '',
	$folding ? 'quoted-printable' : null,
	$folding == 2 ? 'quoted-printable' : null,
	'', RCUBE_CHARSET
	);
	}
	}
	}
	}
	diff --git a/program/include/rcmail_action.php b/program/include/rcmail_action.php
	index a767fa3ac..110515513 100644
	--- a/program/include/rcmail_action.php
	+++ b/program/include/rcmail_action.php
	@@ -1,1488 +1,1488 @@
	<?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: \|
	\| An abstract for HTTP request handlers with some helpers. \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	/**
	* An abstract for HTTP request handlers with some helpers.
	*
	* @package Webmail
	*/
	abstract class rcmail_action
	{
	const MODE_AJAX = 1;
	const MODE_HTTP = 2;

	/**
	* Mode of operation supported by the action. Use MODE_* constants.
	* By default all modes are allowed.
	*
	* @var int
	*/
	protected static $mode;

	/**
	* A name of a initialized common form
	*
	* @var string
	*/
	protected static $edit_form;

	/**
	* Deprecated action aliases.
	*
	* @todo Get rid of these (but it will be a big BC break)
	* @var array
	*/
	public static $aliases = [];

	/**
	* Request handler. The only abstract method.
	*
	* @param array $args Arguments from the previous step(s)
	*/
	abstract public function run($args = []);

	/**
	* Request sanity checks, e.g. supported request mode
	*
	* @return bool
	*/
	public function checks()
	{
	$rcmail = rcmail::get_instance();

	if (static::$mode) {
	if (!(static::$mode & self::MODE_HTTP) && empty($rcmail->output->ajax_call)) {
	return false;
	}

	if (!(static::$mode & self::MODE_AJAX) && !empty($rcmail->output->ajax_call)) {
	return false;
	}
	}

	return true;
	}

	/**
	* Set environment variables for specified config boolean options
	*
	* @param array $options List of configuration option names
	*/
	public static function set_env_config($options)
	{
	$rcmail = rcmail::get_instance();

	foreach ((array) $options as $option) {
	if ($rcmail->config->get($option)) {
	$rcmail->output->set_env($option, true);
	}
	}
	}

	/**
	* Create a HTML table based on the given data
	*
	* @param array $attrib Named table attributes
	* @param mixed $table_data Table row data. Either a two-dimensional array
	* or a valid SQL result set
	* @param array $show_cols List of cols to show
	* @param string $id_col Name of the identifier col
	*
	* @return string HTML table code
	*/
	public static function table_output($attrib, $table_data, $show_cols, $id_col)
	{
	$rcmail = rcmail::get_instance();
	$table = new html_table($attrib);

	// add table header
	if (empty($attrib['noheader'])) {
	foreach ($show_cols as $col) {
	$table->add_header($col, rcube::Q($rcmail->gettext($col)));
	}
	}

	if (!is_array($table_data)) {
	$db = $rcmail->get_dbh();
	while ($table_data && ($sql_arr = $db->fetch_assoc($table_data))) {
	$table->add_row(['id' => 'rcmrow' . rcube_utils::html_identifier($sql_arr[$id_col])]);

	// format each col
	foreach ($show_cols as $col) {
	$table->add($col, rcube::Q($sql_arr[$col]));
	}
	}
	}
	else {
	foreach ($table_data as $row_data) {
	$class = !empty($row_data['class']) ? $row_data['class'] : null;
	if (!empty($attrib['rowclass'])) {
	$class = trim($class . ' ' . $attrib['rowclass']);
	}

	$rowid = 'rcmrow' . rcube_utils::html_identifier($row_data[$id_col]);

	$table->add_row(['id' => $rowid, 'class' => $class]);

	// format each col
	foreach ($show_cols as $col) {
	$val = is_array($row_data[$col]) ? $row_data[$col][0] : $row_data[$col];
	$table->add($col, empty($attrib['ishtml']) ? rcube::Q($val) : $val);
	}
	}
	}

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

	/**
	* Return HTML for quota indicator object
	*
	* @param array $attrib Named parameters
	*
	* @return string HTML code for the quota indicator object
	*/
	public static function quota_display($attrib)
	{
	$rcmail = rcmail::get_instance();

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

	$_SESSION['quota_display'] = !empty($attrib['display']) ? $attrib['display'] : 'text';

	$quota = self::quota_content($attrib);

	$rcmail->output->add_gui_object('quotadisplay', $attrib['id']);
	$rcmail->output->add_script('rcmail.set_quota('.rcube_output::json_serialize($quota).');', 'docready');

	return html::span($attrib, ' ');
	}

	/**
	* Return (parsed) quota information
	*
	* @param array $attrib Named parameters
	* @param array $folder Current folder
	*
	* @return array Quota information
	*/
	public static function quota_content($attrib = null, $folder = null)
	{
	$rcmail = rcmail::get_instance();
	$quota = $rcmail->storage->get_quota($folder);
	$quota = $rcmail->plugins->exec_hook('quota', $quota);

	$quota_result = (array) $quota;
	$quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
	$quota_result['folder'] = $folder !== null && $folder !== '' ? $folder : 'INBOX';

	if (!empty($quota['total']) && $quota['total'] > 0) {
	if (!isset($quota['percent'])) {
	$quota_result['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100));
	}

	$title = $rcmail->gettext('quota') . ': ' . sprintf('%s / %s (%.0f%%)',
	self::show_bytes($quota['used'] * 1024),
	self::show_bytes($quota['total'] * 1024),
	$quota_result['percent']
	);

	$quota_result['title'] = $title;

	if (!empty($attrib['width'])) {
	$quota_result['width'] = $attrib['width'];
	}
	if (!empty($attrib['height'])) {
	$quota_result['height'] = $attrib['height'];
	}

	// build a table of quota types/roots info
	if (($root_cnt = count($quota_result['all'])) > 1 \|\| count($quota_result['all'][key($quota_result['all'])]) > 1) {
	$table = new html_table(['cols' => 3, 'class' => 'quota-info']);

	$table->add_header(null, rcube::Q($rcmail->gettext('quotatype')));
	$table->add_header(null, rcube::Q($rcmail->gettext('quotatotal')));
	$table->add_header(null, rcube::Q($rcmail->gettext('quotaused')));

	foreach ($quota_result['all'] as $root => $data) {
	if ($root_cnt > 1 && $root) {
	$table->add(['colspan' => 3, 'class' => 'root'], rcube::Q($root));
	}

	if ($storage = $data['storage']) {
	$percent = min(100, round(($storage['used']/max(1,$storage['total']))*100));

	$table->add('name', rcube::Q($rcmail->gettext('quotastorage')));
	$table->add(null, self::show_bytes($storage['total'] * 1024));
	$table->add(null, sprintf('%s (%.0f%%)', self::show_bytes($storage['used'] * 1024), $percent));
	}
	if ($message = $data['message']) {
	$percent = min(100, round(($message['used']/max(1,$message['total']))*100));

	$table->add('name', rcube::Q($rcmail->gettext('quotamessage')));
	$table->add(null, intval($message['total']));
	$table->add(null, sprintf('%d (%.0f%%)', $message['used'], $percent));
	}
	}

	$quota_result['table'] = $table->show();
	}
	}
	else {
	$unlimited = $rcmail->config->get('quota_zero_as_unlimited');
	$quota_result['title'] = $rcmail->gettext($unlimited ? 'unlimited' : 'unknown');
	$quota_result['percent'] = 0;
	}

	// cleanup
	unset($quota_result['abort']);
	if (empty($quota_result['table'])) {
	unset($quota_result['all']);
	}

	return $quota_result;
	}

	/**
	* Outputs error message according to server error/response codes
	*
	* @param string $fallback Fallback message label
	* @param array $fallback_args Fallback message label arguments
	* @param string $suffix Message label suffix
	* @param array $params Additional parameters (type, prefix)
	*/
	public static function display_server_error($fallback = null, $fallback_args = null, $suffix = '', $params = [])
	{
	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();
	$err_code = $storage->get_error_code();
	$res_code = $storage->get_response_code();
	$args = [];

	if ($res_code == rcube_storage::NOPERM) {
	$error = 'errornoperm';
	}
	else if ($res_code == rcube_storage::READONLY) {
	$error = 'errorreadonly';
	}
	else if ($res_code == rcube_storage::OVERQUOTA) {
	$error = 'erroroverquota';
	}
	else if ($err_code && ($err_str = $storage->get_error_str())) {
	// try to detect access rights problem and display appropriate message
	if (stripos($err_str, 'Permission denied') !== false) {
	$error = 'errornoperm';
	}
	// try to detect full mailbox problem and display appropriate message
	// there can be e.g. "Quota exceeded" / "quotum would exceed" / "Over quota"
	else if (stripos($err_str, 'quot') !== false && preg_match('/exceed\|over/i', $err_str)) {
	$error = 'erroroverquota';
	}
	else {
	$error = 'servererrormsg';
	$args = ['msg' => rcube::Q($err_str)];
	}
	}
	else if ($err_code < 0) {
	$error = 'storageerror';
	}
	else if ($fallback) {
	$error = $fallback;
	$args = $fallback_args;
	$params['prefix'] = false;
	}

	if (!empty($error)) {
	if ($suffix && $rcmail->text_exists($error . $suffix)) {
	$error .= $suffix;
	}

	$msg = $rcmail->gettext(['name' => $error, 'vars' => $args]);

	if (!empty($params['prefix']) && $fallback) {
	$msg = $rcmail->gettext(['name' => $fallback, 'vars' => $fallback_args]) . ' ' . $msg;
	}

	$rcmail->output->show_message($msg, !empty($params['type']) ? $params['type'] : 'error');
	}
	}

	/**
	* Displays an error message on storage fatal errors
	*/
	public static function storage_fatal_error()
	{
	$rcmail = rcmail::get_instance();
	$err_code = $rcmail->storage->get_error_code();

	switch ($err_code) {
	// Not all are really fatal, but these should catch
	// connection/authentication errors the best we can
	case rcube_imap_generic::ERROR_NO:
	case rcube_imap_generic::ERROR_BAD:
	case rcube_imap_generic::ERROR_BYE:
	self::display_server_error();
	}
	}

	/**
	* Output HTML editor scripts
	*
	* @param string $mode Editor mode
	*/
	public static function html_editor($mode = '')
	{
	$rcmail = rcmail::get_instance();
	$spellcheck = intval($rcmail->config->get('enable_spellcheck'));
	$spelldict = intval($rcmail->config->get('spellcheck_dictionary'));
	$disabled_plugins = [];
	$disabled_buttons = [];
	$extra_plugins = [];
	$extra_buttons = [];

	if (!$spellcheck) {
	$disabled_plugins[] = 'spellchecker';
	}

	$hook = $rcmail->plugins->exec_hook('html_editor', [
	'mode' => $mode,
	'disabled_plugins' => $disabled_plugins,
	'disabled_buttons' => $disabled_buttons,
	'extra_plugins' => $extra_plugins,
	'extra_buttons' => $extra_buttons,
	]);

	if (!empty($hook['abort'])) {
	return;
	}

	$lang_codes = [$_SESSION['language']];
	$assets_dir = $rcmail->config->get('assets_dir') ?: INSTALL_PATH;
	$skin_path = $rcmail->output->get_skin_path();

	if ($pos = strpos($_SESSION['language'], '_')) {
	$lang_codes[] = substr($_SESSION['language'], 0, $pos);
	}

	foreach ($lang_codes as $code) {
	if (file_exists("$assets_dir/program/js/tinymce/langs/$code.js")) {
	$lang = $code;
	break;
	}
	}

	if (empty($lang)) {
	$lang = 'en';
	}

	$config = [
	'mode' => $mode,
	'lang' => $lang,
	'skin_path' => $skin_path,
	'spellcheck' => $spellcheck, // deprecated
	'spelldict' => $spelldict,
	'content_css' => 'program/resources/tinymce/content.css',
	'disabled_plugins' => $hook['disabled_plugins'],
	'disabled_buttons' => $hook['disabled_buttons'],
	'extra_plugins' => $hook['extra_plugins'],
	'extra_buttons' => $hook['extra_buttons'],
	];

	if ($path = $rcmail->config->get('editor_css_location')) {
	if ($path = $rcmail->find_asset($skin_path . $path)) {
	$config['content_css'] = $path;
	}
	}

	$font_family = $rcmail->output->get_env('default_font');
	$font_size = $rcmail->output->get_env('default_font_size');
	$style = [];

	if ($font_family) {
	$style[] = "font-family: $font_family;";
	}
	if ($font_size) {
	$style[] = "font-size: $font_size;";
	}
	if (!empty($style)) {
	$config['content_style'] = "body {" . implode(' ', $style) . "}";
	}

	$rcmail->output->set_env('editor_config', $config);
	$rcmail->output->add_label('selectimage', 'addimage', 'selectmedia', 'addmedia', 'close');

	if ($path = $rcmail->config->get('media_browser_css_location', 'program/resources/tinymce/browser.css')) {
	if ($path != 'none' && ($path = $rcmail->find_asset($path))) {
	$rcmail->output->include_css($path);
	}
	}

	$rcmail->output->include_script('tinymce/tinymce.min.js');
	$rcmail->output->include_script('editor.js');
	}

	/**
	* File upload progress handler.
	*
	* @deprecated We're using HTML5 upload progress
	*/
	public static function upload_progress()
	{
	// NOOP
	rcmail::get_instance()->output->send();
	}

	/**
	* Initializes file uploading interface.
	*
	* @param int $max_size Optional maximum file size in bytes
	*
	* @return string Human-readable file size limit
	*/
	public static function upload_init($max_size = null)
	{
	$rcmail = rcmail::get_instance();

	// find max filesize value
	$max_filesize = rcube_utils::max_upload_size();
	if ($max_size && $max_size < $max_filesize) {
	$max_filesize = $max_size;
	}

	$max_filesize_txt = self::show_bytes($max_filesize);
	$rcmail->output->set_env('max_filesize', $max_filesize);
	$rcmail->output->set_env('filesizeerror', $rcmail->gettext([
	'name' => 'filesizeerror', 'vars' => ['size' => $max_filesize_txt]]));

	if ($max_filecount = ini_get('max_file_uploads')) {
	$rcmail->output->set_env('max_filecount', $max_filecount);
	$rcmail->output->set_env('filecounterror', $rcmail->gettext([
	'name' => 'filecounterror', 'vars' => ['count' => $max_filecount]]));
	}

	$rcmail->output->add_label('uploadprogress', 'GB', 'MB', 'KB', 'B');

	return $max_filesize_txt;
	}

	/**
	* Upload form object
	*
	* @param array $attrib Object attributes
	* @param string $name Form object name
	* @param string $action Form action name
	* @param array $input_attr File input attributes
	* @param int $max_size Maximum upload size
	*
	* @return string HTML output
	*/
	public static function upload_form($attrib, $name, $action, $input_attr = [], $max_size = null)
	{
	$rcmail = rcmail::get_instance();

	// Get filesize, enable upload progress bar
	$max_filesize = self::upload_init($max_size);

	$hint = html::div('hint', $rcmail->gettext(['name' => 'maxuploadsize', 'vars' => ['size' => $max_filesize]]));

	if (!empty($attrib['mode']) && $attrib['mode'] == 'hint') {
	return $hint;
	}

	// set defaults
	$attrib += ['id' => 'rcmUploadbox', 'buttons' => 'yes'];

	$event = rcmail_output::JS_OBJECT_NAME . ".command('$action', this.form)";
	$form_id = $attrib['id'] . 'Frm';

	// Default attributes of file input and form
	$input_attr += [
	'id' => $attrib['id'] . 'Input',
	'type' => 'file',
	'name' => '_attachments[]',
	'class' => 'form-control',
	];

	$form_attr = [
	'id' => $form_id,
	'name' => $name,
	'method' => 'post',
	'enctype' => 'multipart/form-data'
	];

	if (!empty($attrib['mode']) && $attrib['mode'] == 'smart') {
	unset($attrib['buttons']);
	$form_attr['class'] = 'smart-upload';
	$input_attr = array_merge($input_attr, [
	// #5854: Chrome does not execute onchange when selecting the same file.
	// To fix this we reset the input using null value.
	'onchange' => "$event; this.value=null",
	'class' => 'smart-upload',
	'tabindex' => '-1',
	]);
	}

	$input = new html_inputfield($input_attr);
	$content = (isset($attrib['prefix']) ? $attrib['prefix'] : '') . $input->show();

	if (empty($attrib['mode']) \|\| $attrib['mode'] != 'smart') {
	$content = html::div(null, $content . $hint);
	}

	if (self::get_bool_attr($attrib, 'buttons')) {
	$button = new html_inputfield(['type' => 'button']);
	$content .= html::div('buttons',
	$button->show($rcmail->gettext('close'), ['class' => 'button', 'onclick' => "$('#{$attrib['id']}').hide()"])
	. ' ' .
	$button->show($rcmail->gettext('upload'), ['class' => 'button mainaction', 'onclick' => $event])
	);
	}

	$rcmail->output->add_gui_object($name, $form_id);

	return html::div($attrib, $rcmail->output->form_tag($form_attr, $content));
	}

	/**
	* Common file upload error handler
	*
	* @param int $php_error PHP error from $_FILES
	* @param array $attachment Attachment data from attachment_upload hook
	* @param string $add_error Additional error label (highest prio)
	*/
	public static function upload_error($php_error, $attachment = null, $add_error = null)
	{
	$rcmail = rcmail::get_instance();

	if ($add_error) {
	$msg = $rcmail->gettext($add_error);
	}
	else if ($attachment && !empty($attachment['error'])) {
	$msg = $attachment['error'];
	}
	else if ($php_error == UPLOAD_ERR_INI_SIZE \|\| $php_error == UPLOAD_ERR_FORM_SIZE) {
	$post_size = self::show_bytes(rcube_utils::max_upload_size());
	$msg = $rcmail->gettext(['name' => 'filesizeerror', 'vars' => ['size' => $post_size]]);
	}
	else {
	$msg = $rcmail->gettext('fileuploaderror');
	}

	$rcmail->output->command('display_message', $msg, 'error');
	}

	/**
	* Common POST file upload error handler
	*
	* @return bool True if it was a POST request, False otherwise
	*/
	public static function upload_failure()
	{
	if (!isset($_SERVER['REQUEST_METHOD']) \|\| $_SERVER['REQUEST_METHOD'] != 'POST') {
	return false;
	}

	$rcmail = rcmail::get_instance();

	// if filesize exceeds post_max_size then $_FILES array is empty,
	// show filesizeerror instead of fileuploaderror
	if ($maxsize = ini_get('post_max_size')) {
	$msg = $rcmail->gettext([
	'name' => 'filesizeerror',
	'vars' => ['size' => self::show_bytes(parse_bytes($maxsize))]
	]);
	}
	else {
	$msg = $rcmail->gettext('fileuploaderror');
	}

	$rcmail->output->command('display_message', $msg, 'error');

	return true;
	}

	/**
	* Outputs uploaded file content (with image thumbnails support
	*
	* @param array $file Uploaded file data
	*/
	public static function display_uploaded_file($file)
	{
	if (empty($file)) {
	return;
	}

	$rcmail = rcmail::get_instance();

	$file = $rcmail->plugins->exec_hook('attachment_display', $file);

	if (!empty($file['status'])) {
	if (empty($file['size'])) {
	$file['size'] = !empty($file['data']) ? strlen($file['data']) : @filesize($file['path']);
	}

	// generate image thumbnail for file browser in HTML editor
	if (!empty($_GET['_thumbnail'])) {
	$thumbnail_size = 80;
	$mimetype = $file['mimetype'];
	$file_ident = $file['id'] . ':' . $file['mimetype'] . ':' . $file['size'];
	$thumb_name = 'thumb' . md5($file_ident . ':' . $rcmail->user->ID . ':' . $thumbnail_size);
	$cache_file = rcube_utils::temp_filename($thumb_name, false, false);

	// render thumbnail image if not done yet
	if (!is_file($cache_file)) {
	if (!$file['path']) {
	$orig_name = $filename = $cache_file . '.tmp';
	file_put_contents($orig_name, $file['data']);
	}
	else {
	$filename = $file['path'];
	}

	$image = new rcube_image($filename);
	if ($imgtype = $image->resize($thumbnail_size, $cache_file, true)) {
	$mimetype = 'image/' . $imgtype;

	if (!empty($orig_name)) {
	unlink($orig_name);
	}
	}
	}

	if (is_file($cache_file)) {
	// cache for 1h
	$rcmail->output->future_expire_header(3600);
	header('Content-Type: ' . $mimetype);
	header('Content-Length: ' . filesize($cache_file));

	readfile($cache_file);
	exit;
	}
	}

	header('Content-Type: ' . $file['mimetype']);
	header('Content-Length: ' . $file['size']);

	- if ($file['data']) {
	+ if (isset($file['data']) && is_string($file['data'])) {
	echo $file['data'];
	}
	- else if ($file['path']) {
	+ else if (!empty($file['path'])) {
	readfile($file['path']);
	}
	}
	}

	/**
	* Initializes client-side autocompletion.
	*/
	public static function autocomplete_init()
	{
	static $init;

	if ($init) {
	return;
	}

	$init = 1;
	$rcmail = rcmail::get_instance();

	if (($threads = (int) $rcmail->config->get('autocomplete_threads')) > 0) {
	$book_types = (array) $rcmail->config->get('autocomplete_addressbooks', 'sql');
	if (count($book_types) > 1) {
	$rcmail->output->set_env('autocomplete_threads', $threads);
	$rcmail->output->set_env('autocomplete_sources', $book_types);
	}
	}

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

	/**
	* Returns supported font-family specifications
	*
	* @param string $font Font name
	*
	* @return string\|array Font-family specification array or string (if $font is used)
	*/
	public static function font_defs($font = null)
	{
	$fonts = [
	'Andale Mono' => '"Andale Mono",Times,monospace',
	'Arial' => 'Arial,Helvetica,sans-serif',
	'Arial Black' => '"Arial Black","Avant Garde",sans-serif',
	'Book Antiqua' => '"Book Antiqua",Palatino,serif',
	'Courier New' => '"Courier New",Courier,monospace',
	'Georgia' => 'Georgia,Palatino,serif',
	'Helvetica' => 'Helvetica,Arial,sans-serif',
	'Impact' => 'Impact,Chicago,sans-serif',
	'Tahoma' => 'Tahoma,Arial,Helvetica,sans-serif',
	'Terminal' => 'Terminal,Monaco,monospace',
	'Times New Roman' => '"Times New Roman",Times,serif',
	'Trebuchet MS' => '"Trebuchet MS",Geneva,sans-serif',
	'Verdana' => 'Verdana,Geneva,sans-serif',
	];

	if ($font) {
	return !empty($fonts[$font]) ? $fonts[$font] : null;
	}

	return $fonts;
	}

	/**
	* Create a human readable string for a number of bytes
	*
	* @param int $bytes Number of bytes
	* @param string &$unit Size unit
	*
	* @return string Byte string
	*/
	public static function show_bytes($bytes, &$unit = null)
	{
	$rcmail = rcmail::get_instance();

	// Plugins may want to display different units
	$plugin = $rcmail->plugins->exec_hook('show_bytes', ['bytes' => $bytes, 'unit' => null]);

	$unit = $plugin['unit'];

	if (isset($plugin['result'])) {
	return $plugin['result'];
	}

	if ($bytes >= 1073741824) {
	$unit = 'GB';
	$gb = $bytes/1073741824;
	$str = sprintf($gb >= 10 ? "%d " : "%.1f ", $gb) . $rcmail->gettext($unit);
	}
	else if ($bytes >= 1048576) {
	$unit = 'MB';
	$mb = $bytes/1048576;
	$str = sprintf($mb >= 10 ? "%d " : "%.1f ", $mb) . $rcmail->gettext($unit);
	}
	else if ($bytes >= 1024) {
	$unit = 'KB';
	$str = sprintf("%d ", round($bytes/1024)) . $rcmail->gettext($unit);
	}
	else {
	$unit = 'B';
	$str = sprintf('%d ', $bytes) . $rcmail->gettext($unit);
	}

	return $str;
	}

	/**
	* Returns real size (calculated) of the message part
	*
	* @param rcube_message_part $part Message part
	*
	* @return string Part size (and unit)
	*/
	public static function message_part_size($part)
	{
	if (isset($part->d_parameters['size'])) {
	$size = self::show_bytes((int) $part->d_parameters['size']);
	}
	else {
	$size = $part->size;

	if ($size === 0) {
	$part->exact_size = true;
	}

	if (isset($part->encoding) && $part->encoding == 'base64') {
	$size = $size / 1.33;
	}

	$size = self::show_bytes($size);
	}

	if (empty($part->exact_size)) {
	$size = '~' . $size;
	}

	return $size;
	}

	/**
	* Returns message UID(s) and IMAP folder(s) from GET/POST data
	*
	* @param string $uids UID value to decode
	* @param string $mbox Default mailbox value (if not encoded in UIDs)
	* @param bool $is_multifolder Will be set to True if multi-folder request
	* @param int $mode Request mode. Default: rcube_utils::INPUT_GPC.
	*
	* @return array List of message UIDs per folder
	*/
	public static function get_uids($uids = null, $mbox = null, &$is_multifolder = false, $mode = null)
	{
	// message UID (or comma-separated list of IDs) is provided in
	// the form of <ID>-<MBOX>[,<ID>-<MBOX>]*

	$_uid = $uids ?: rcube_utils::get_input_value('_uid', $mode ?: rcube_utils::INPUT_GPC, true);
	$_mbox = $mbox ?: (string) rcube_utils::get_input_value('_mbox', $mode ?: rcube_utils::INPUT_GPC, true);

	// already a hash array
	if (is_array($_uid) && !isset($_uid[0])) {
	return $_uid;
	}

	$is_multifolder = false;
	$result = [];

	// special case: *
	if ($_uid == '*' && !empty($_SESSION['search'][1]) && !empty($_SESSION['search'][1]->multi)) {
	$is_multifolder = true;
	// extract the full list of UIDs per folder from the search set
	foreach ($_SESSION['search'][1]->sets as $subset) {
	$mbox = $subset->get_parameters('MAILBOX');
	$result[$mbox] = $subset->get();
	}
	}
	else {
	if (is_string($_uid)) {
	$_uid = explode(',', $_uid);
	}

	// create a per-folder UIDs array
	foreach ((array) $_uid as $uid) {
	$tokens = explode('-', $uid, 2);
	$uid = $tokens[0];

	if (!isset($tokens[1]) \|\| !strlen($tokens[1])) {
	$mbox = $_mbox;
	}
	else {
	$mbox = $tokens[1];
	$is_multifolder = true;
	}

	if ($uid == '*') {
	$result[$mbox] = $uid;
	}
	else if (preg_match('/^[0-9:.]+$/', $uid)) {
	$result[$mbox][] = $uid;
	}
	}
	}

	return $result;
	}

	/**
	* Get resource file content (with assets_dir support)
	*
	* @param string $name File name
	*
	* @return string File content
	*/
	public static function get_resource_content($name)
	{
	if (strpos($name, '/') !== 0) {
	$name = "program/resources/$name";
	}

	$assets_dir = rcmail::get_instance()->config->get('assets_dir');

	if ($assets_dir) {
	$path = slashify($assets_dir) . $name;
	if (@file_exists($path)) {
	$name = $path;
	}
	}
	else {
	$name = INSTALL_PATH . $name;
	}

	return file_get_contents($name, false);
	}

	/**
	* Prepare a common edit form.
	*
	* @param array $attrib Form attributes
	* @param string $action Action name
	* @param string $id An extra index for the form key
	* @param array $hidden Additional hidden fields
	*
	* @return array Start and end tags, Empty if the farm was initialized before
	*/
	public static function get_form_tags($attrib, $action, $id = null, $hidden = [])
	{
	$rcmail = rcmail::get_instance();

	$form_start = $form_end = '';

	if (empty(self::$edit_form)) {
	$request_key = $action . (isset($id) ? '.'.$id : '');
	$form_start = $rcmail->output->request_form([
	'name' => 'form',
	'method' => 'post',
	'task' => $rcmail->task,
	'action' => $action,
	'request' => $request_key,
	'noclose' => true
	] + $attrib
	);

	if (!empty($hidden) && is_array($hidden)) {
	$hiddenfields = new html_hiddenfield($hidden);
	$form_start .= $hiddenfields->show();
	}

	$form_end = empty($attrib['form']) ? '</form>' : '';
	self::$edit_form = !empty($attrib['form']) ? $attrib['form'] : 'form';

	$rcmail->output->add_gui_object('editform', self::$edit_form);
	}

	return [$form_start, $form_end];
	}

	/**
	* Return folders list in HTML
	*
	* @param array $attrib Named parameters
	*
	* @return string HTML code for the gui object
	*/
	public static function folder_list($attrib)
	{
	static $a_mailboxes;

	$attrib += ['maxlength' => 100, 'realnames' => false, 'unreadwrap' => ' (%s)'];

	$type = !empty($attrib['type']) ? $attrib['type'] : 'ul';
	unset($attrib['type']);

	if ($type == 'ul' && empty($attrib['id'])) {
	$attrib['id'] = 'rcmboxlist';
	}

	if (empty($attrib['folder_name'])) {
	$attrib['folder_name'] = '*';
	}

	// get current folder
	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();
	$mbox_name = $storage->get_folder();
	$delimiter = $storage->get_hierarchy_delimiter();

	// build the folders tree
	if (empty($a_mailboxes)) {
	// get mailbox list
	$a_mailboxes = [];
	$a_folders = $storage->list_folders_subscribed(
	'',
	$attrib['folder_name'],
	isset($attrib['folder_filter']) ? $attrib['folder_filter'] : null
	);

	foreach ($a_folders as $folder) {
	self::build_folder_tree($a_mailboxes, $folder, $delimiter);
	}
	}

	// allow plugins to alter the folder tree or to localize folder names
	$hook = $rcmail->plugins->exec_hook('render_mailboxlist', [
	'list' => $a_mailboxes,
	'delimiter' => $delimiter,
	'type' => $type,
	'attribs' => $attrib,
	]);

	$a_mailboxes = $hook['list'];
	$attrib = $hook['attribs'];

	if ($type == 'select') {
	$attrib['is_escaped'] = true;
	$select = new html_select($attrib);

	// add no-selection option
	if (!empty($attrib['noselection'])) {
	$select->add(html::quote($rcmail->gettext($attrib['noselection'])), '');
	}

	$maxlength = isset($attrib['maxlength']) ? $attrib['maxlength'] : null;
	$realnames = isset($attrib['realnames']) ? $attrib['realnames'] : null;
	$default = isset($attrib['default']) ? $attrib['default'] : null;

	self::render_folder_tree_select($a_mailboxes, $mbox_name, $maxlength, $select, $realnames);
	$out = $select->show($default);
	}
	else {
	$out = '';
	$js_mailboxlist = [];
	$tree = self::render_folder_tree_html($a_mailboxes, $mbox_name, $js_mailboxlist, $attrib);

	if ($type != 'js') {
	$out = html::tag('ul', $attrib, $tree, html::$common_attrib);

	$rcmail->output->include_script('treelist.js');
	$rcmail->output->add_gui_object('mailboxlist', $attrib['id']);
	$rcmail->output->set_env('unreadwrap', isset($attrib['unreadwrap']) ? $attrib['unreadwrap'] : false);
	$rcmail->output->set_env('collapsed_folders', (string) $rcmail->config->get('collapsed_folders'));
	}

	$rcmail->output->set_env('mailboxes', $js_mailboxlist);

	// we can't use object keys in javascript because they are unordered
	// we need sorted folders list for folder-selector widget
	$rcmail->output->set_env('mailboxes_list', array_keys($js_mailboxlist));
	}

	// add some labels to client
	$rcmail->output->add_label('purgefolderconfirm', 'deletemessagesconfirm');

	return $out;
	}

	/**
	* Return folders list as html_select object
	*
	* @param array $p Named parameters
	*
	* @return html_select HTML drop-down object
	*/
	public static function folder_selector($p = [])
	{
	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();
	$realnames = $rcmail->config->get('show_real_foldernames');
	$p += ['maxlength' => 100, 'realnames' => $realnames, 'is_escaped' => true];
	$a_mailboxes = [];

	if (empty($p['folder_name'])) {
	$p['folder_name'] = '*';
	}

	$f_filter = isset($p['folder_filter']) ? $p['folder_filter'] : null;
	$f_rights = isset($p['folder_rights']) ? $p['folder_rights'] : null;

	if (!empty($p['unsubscribed'])) {
	$list = $storage->list_folders('', $p['folder_name'], $f_filter, $f_rights);
	}
	else {
	$list = $storage->list_folders_subscribed('', $p['folder_name'], $f_filter, $f_rights);
	}

	$delimiter = $storage->get_hierarchy_delimiter();

	if (!empty($p['exceptions'])) {
	$list = array_diff($list, (array) $p['exceptions']);
	}

	if (!empty($p['additional'])) {
	foreach ($p['additional'] as $add_folder) {
	$add_items = explode($delimiter, $add_folder);
	$folder = '';
	while (count($add_items)) {
	$folder .= array_shift($add_items);

	// @TODO: sorting
	if (!in_array($folder, $list)) {
	$list[] = $folder;
	}

	$folder .= $delimiter;
	}
	}
	}

	foreach ($list as $folder) {
	self::build_folder_tree($a_mailboxes, $folder, $delimiter);
	}

	// allow plugins to alter the folder tree or to localize folder names
	$hook = $rcmail->plugins->exec_hook('render_folder_selector', [
	'list' => $a_mailboxes,
	'delimiter' => $delimiter,
	'attribs' => $p,
	]);

	$a_mailboxes = $hook['list'];
	$p = $hook['attribs'];

	$select = new html_select($p);

	if (!empty($p['noselection'])) {
	$select->add(html::quote($p['noselection']), '');
	}

	self::render_folder_tree_select($a_mailboxes, $mbox, $p['maxlength'], $select, $p['realnames'], 0, $p);

	return $select;
	}

	/**
	* Create a hierarchical array of the mailbox list
	*/
	protected static function build_folder_tree(&$arrFolders, $folder, $delm = '/', $path = '')
	{
	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();

	// Handle namespace prefix
	$prefix = '';

	if (!$path) {
	$n_folder = $folder;
	$folder = $storage->mod_folder($folder);

	if ($n_folder != $folder) {
	$prefix = substr($n_folder, 0, -strlen($folder));
	}
	}

	$pos = strpos($folder, $delm);

	if ($pos !== false) {
	$subFolders = substr($folder, $pos+1);
	$currentFolder = substr($folder, 0, $pos);

	// sometimes folder has a delimiter as the last character
	if (!strlen($subFolders)) {
	$virtual = false;
	}
	else if (!isset($arrFolders[$currentFolder])) {
	$virtual = true;
	}
	else {
	$virtual = $arrFolders[$currentFolder]['virtual'];
	}
	}
	else {
	$subFolders = false;
	$currentFolder = $folder;
	$virtual = false;
	}

	$path .= $prefix . $currentFolder;

	if (!isset($arrFolders[$currentFolder])) {
	$arrFolders[$currentFolder] = [
	'id' => $path,
	'name' => rcube_charset::convert($currentFolder, 'UTF7-IMAP'),
	'virtual' => $virtual,
	'folders' => []
	];
	}
	else {
	$arrFolders[$currentFolder]['virtual'] = $virtual;
	}

	if (strlen($subFolders)) {
	self::build_folder_tree($arrFolders[$currentFolder]['folders'], $subFolders, $delm, $path.$delm);
	}
	}

	/**
	* Return html for a structured list <ul> for the mailbox tree
	*/
	protected static function render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
	{
	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();

	$maxlength = intval($attrib['maxlength']);
	$realnames = (bool) $attrib['realnames'];
	$msgcounts = $storage->get_cache('messagecount');
	$collapsed = $rcmail->config->get('collapsed_folders');
	$realnames = $rcmail->config->get('show_real_foldernames');

	$out = '';
	foreach ($arrFolders as $folder) {
	$title = null;
	$folder_class = self::folder_classname($folder['id'], isset($folder['class']) ? $folder['class'] : null);
	$is_collapsed = strpos($collapsed, '&'.rawurlencode($folder['id']).'&') !== false;
	$unread = 0;
	$realname = isset($folder['realname']) ? $folder['realname'] : $realnames;

	if ($msgcounts && !empty($msgcounts[$folder['id']]['UNSEEN'])) {
	$unread = intval($msgcounts[$folder['id']]['UNSEEN']);
	}

	if ($folder_class && !$realname && $rcmail->text_exists($folder_class)) {
	$foldername = $rcmail->gettext($folder_class);
	}
	else {
	$foldername = $folder['name'];

	// shorten the folder name to a given length
	if ($maxlength && $maxlength > 1) {
	$fname = abbreviate_string($foldername, $maxlength);
	if ($fname != $foldername) {
	$title = $foldername;
	}
	$foldername = $fname;
	}
	}

	// make folder name safe for ids and class names
	$folder_id = rcube_utils::html_identifier($folder['id'], true);
	$classes = ['mailbox'];

	// set special class for Sent, Drafts, Trash and Junk
	if ($folder_class) {
	$classes[] = $folder_class;
	}

	if ($folder['id'] == $mbox_name) {
	$classes[] = 'selected';
	}

	if ($folder['virtual']) {
	$classes[] = 'virtual';
	}
	else if ($unread) {
	$classes[] = 'unread';
	}

	$js_name = rcube::JQ($folder['id']);
	$html_name = rcube::Q($foldername) . ($unread ? html::span('unreadcount skip-content', sprintf($attrib['unreadwrap'], $unread)) : '');
	$link_attrib = $folder['virtual'] ? [] : [
	'href' => $rcmail->url(['_mbox' => $folder['id']]),
	'onclick' => sprintf("return %s.command('list','%s',this,event)", rcmail_output::JS_OBJECT_NAME, $js_name),
	'rel' => $folder['id'],
	'title' => $title,
	];

	$out .= html::tag('li', [
	'id' => "rcmli" . $folder_id,
	'class' => implode(' ', $classes),
	'noclose' => true
	],
	html::a($link_attrib, $html_name)
	);

	if (!empty($folder['folders'])) {
	$out .= html::div('treetoggle ' . ($is_collapsed ? 'collapsed' : 'expanded'), ' ');
	}

	$jslist[$folder['id']] = [
	'id' => $folder['id'],
	'name' => $foldername,
	'virtual' => $folder['virtual'],
	];

	if (!empty($folder_class)) {
	$jslist[$folder['id']]['class'] = $folder_class;
	}

	if (!empty($folder['folders'])) {
	$out .= html::tag('ul', ['style' => $is_collapsed ? "display:none;" : null],
	self::render_folder_tree_html($folder['folders'], $mbox_name, $jslist, $attrib, $nestLevel+1));
	}

	$out .= "</li>\n";
	}

	return $out;
	}

	/**
	* Return html for a flat list <select> for the mailbox tree
	*/
	protected static function render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = [])
	{
	$out = '';
	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();

	foreach ($arrFolders as $folder) {
	// skip exceptions (and its subfolders)
	if (!empty($opts['exceptions']) && in_array($folder['id'], $opts['exceptions'])) {
	continue;
	}

	// skip folders in which it isn't possible to create subfolders
	if (!empty($opts['skip_noinferiors'])) {
	$attrs = $storage->folder_attributes($folder['id']);
	if ($attrs && in_array_nocase('\\Noinferiors', $attrs)) {
	continue;
	}
	}

	$folder_class = self::folder_classname($folder['id'], isset($folder['class']) ? $folder['class'] : null);
	$realname = isset($folder['realname']) ? $folder['realname'] : $realnames;

	if ($folder_class && !$realname && $rcmail->text_exists($folder_class)) {
	$foldername = $rcmail->gettext($folder_class);
	}
	else {
	$foldername = $folder['name'];

	// shorten the folder name to a given length
	if ($maxlength && $maxlength > 1) {
	$foldername = abbreviate_string($foldername, $maxlength);
	}
	}

	$select->add(str_repeat(' ', $nestLevel*4) . html::quote($foldername), $folder['id']);

	if (!empty($folder['folders'])) {
	$out .= self::render_folder_tree_select($folder['folders'], $mbox_name, $maxlength,
	$select, $realnames, $nestLevel+1, $opts);
	}
	}

	return $out;
	}

	/**
	* Returns class name for the given folder if it is a special folder
	* (including shared/other users namespace roots).
	*
	* @param string $folder_id IMAP Folder name
	* @param string $fallback Fallback Folder CSS class name
	*
	* @return string\|null CSS class name
	*/
	public static function folder_classname($folder_id, $fallback = null)
	{
	static $classes;

	if ($classes === null) {
	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();
	$classes = ['INBOX' => 'inbox'];

	// for these mailboxes we have css classes
	foreach (['sent', 'drafts', 'trash', 'junk'] as $type) {
	if (($mbox = $rcmail->config->get($type . '_mbox')) && !isset($classes[$mbox])) {
	$classes[$mbox] = $type;
	}
	}

	// add classes for shared/other user namespace roots
	foreach (['other', 'shared'] as $ns_name) {
	if ($ns = $storage->get_namespace($ns_name)) {
	foreach ($ns as $root) {
	$root = substr($root[0], 0, -1);
	if (strlen($root) && !isset($classes[$root])) {
	$classes[$root] = "ns-$ns_name";
	}
	}
	}
	}
	}

	return !empty($classes[$folder_id]) ? $classes[$folder_id] : $fallback;
	}

	/**
	* Try to localize the given IMAP folder name.
	* UTF-7 decode it in case no localized text was found
	*
	* @param string $name Folder name
	* @param bool $with_path Enable path localization
	* @param bool $path_remove Remove the path
	*
	* @return string Localized folder name in UTF-8 encoding
	*/
	public static function localize_foldername($name, $with_path = false, $path_remove = false)
	{
	$rcmail = rcmail::get_instance();
	$realnames = $rcmail->config->get('show_real_foldernames');

	if (!$realnames && ($folder_class = self::folder_classname($name)) && $rcmail->text_exists($folder_class)) {
	return $rcmail->gettext($folder_class);
	}

	$storage = $rcmail->get_storage();
	$delimiter = $storage->get_hierarchy_delimiter();

	// Remove the path
	if ($path_remove) {
	if (strpos($name, $delimiter)) {
	$path = explode($delimiter, $name);
	$name = array_pop($path);
	}
	}
	// try to localize path of the folder
	else if ($with_path && !$realnames) {
	$path = explode($delimiter, $name);
	$count = count($path);

	if ($count > 1) {
	for ($i = 1; $i < $count; $i++) {
	$folder = implode($delimiter, array_slice($path, 0, -$i));
	$folder_class = self::folder_classname($folder);

	if ($folder_class && $rcmail->text_exists($folder_class)) {
	$name = implode($delimiter, array_slice($path, $count - $i));
	$name = rcube_charset::convert($name, 'UTF7-IMAP');

	return $rcmail->gettext($folder_class) . $delimiter . $name;
	}
	}
	}
	}

	return rcube_charset::convert($name, 'UTF7-IMAP');
	}

	/**
	* Localize folder path
	*/
	public static function localize_folderpath($path)
	{
	$rcmail = rcmail::get_instance();
	$protect_folders = $rcmail->config->get('protect_default_folders');
	$delimiter = $rcmail->storage->get_hierarchy_delimiter();
	$path = explode($delimiter, $path);
	$result = [];

	foreach ($path as $idx => $dir) {
	$directory = implode($delimiter, array_slice($path, 0, $idx+1));
	if ($protect_folders && $rcmail->storage->is_special_folder($directory)) {
	unset($result);
	$result[] = self::localize_foldername($directory);
	}
	else {
	$result[] = rcube_charset::convert($dir, 'UTF7-IMAP');
	}
	}

	return implode($delimiter, $result);
	}

	/**
	* Gets a value of a boolean attribute from template object attributes
	*
	* @param array $attributes Template object attributes
	* @param string $name Attribute name
	*/
	public static function get_bool_attr($attributes, $name)
	{
	if (!isset($attributes[$name])) {
	return false;
	}

	return rcube_utils::get_boolean($attributes[$name]);
	}
	}
	diff --git a/program/include/rcmail_sendmail.php b/program/include/rcmail_sendmail.php
	index b94aa784d..e9337ecc2 100644
	--- a/program/include/rcmail_sendmail.php
	+++ b/program/include/rcmail_sendmail.php
	@@ -1,1709 +1,1709 @@
	<?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;
	}
	}
	else {
	// ... if there is no identity record, this might be a custom from
	$from_addresses = rcube_mime::decode_address_list($from, null, true, $charset);

	if (count($from_addresses) == 1) {
	$from = $from_addresses[1]['mailto'];
	$from_string = $from_addresses[1]['string'];
	}
	// ... 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['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];

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

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

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

	$name = $list[$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;
	+ $mdn_default = !empty($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/bootstrap.php b/program/lib/Roundcube/bootstrap.php
	index 17b143631..6aaa444fa 100644
	--- a/program/lib/Roundcube/bootstrap.php
	+++ b/program/lib/Roundcube/bootstrap.php
	@@ -1,445 +1,449 @@
	<?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. \|
	\| \|
	\| CONTENTS: \|
	\| Roundcube Framework Initialization \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	/**
	* Roundcube Framework Initialization
	*
	* @package Framework
	* @subpackage Core
	*/

	$config = [
	'error_reporting' => E_ALL & ~E_NOTICE & ~E_STRICT,
	'display_errors' => false,
	'log_errors' => true,
	// Some users are not using Installer, so we'll check some
	// critical PHP settings here. Only these, which doesn't provide
	// an error/warning in the logs later. See (#1486307).
	'mbstring.func_overload' => 0,
	];

	// check these additional ini settings if not called via CLI
	if (php_sapi_name() != 'cli') {
	$config += [
	'suhosin.session.encrypt' => false,
	'file_uploads' => true,
	'session.auto_start' => false,
	'zlib.output_compression' => false,
	];
	}

	foreach ($config as $optname => $optval) {
	$ini_optval = filter_var(ini_get($optname), is_bool($optval) ? FILTER_VALIDATE_BOOLEAN : FILTER_VALIDATE_INT);
	if ($optval != $ini_optval && @ini_set($optname, $optval) === false) {
	$optval = !is_bool($optval) ? $optval : ($optval ? 'On' : 'Off');
	$error = "ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n"
	. "Check your PHP configuration (including php_admin_flag).";

	if (defined('STDERR')) fwrite(STDERR, $error); else echo $error;
	exit(1);
	}
	}

	// framework constants
	define('RCUBE_VERSION', '1.5.1');
	define('RCUBE_CHARSET', 'UTF-8');
	define('RCUBE_TEMP_FILE_PREFIX', 'RCMTEMP');

	if (!defined('RCUBE_LIB_DIR')) {
	define('RCUBE_LIB_DIR', __DIR__ . '/');
	}

	if (!defined('RCUBE_INSTALL_PATH')) {
	define('RCUBE_INSTALL_PATH', RCUBE_LIB_DIR);
	}

	if (!defined('RCUBE_CONFIG_DIR')) {
	define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config/');
	}

	if (!defined('RCUBE_PLUGINS_DIR')) {
	define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'plugins/');
	}

	if (!defined('RCUBE_LOCALIZATION_DIR')) {
	define('RCUBE_LOCALIZATION_DIR', RCUBE_INSTALL_PATH . 'localization/');
	}

	// set internal encoding for mbstring extension
	mb_internal_encoding(RCUBE_CHARSET);
	mb_regex_encoding(RCUBE_CHARSET);

	// make sure the Roundcube lib directory is in the include_path
	$rcube_path = realpath(RCUBE_LIB_DIR . '..');
	$sep = PATH_SEPARATOR;
	$regexp = "!(^\|$sep)" . preg_quote($rcube_path, '!') . "($sep\|\$)!";
	$path = ini_get('include_path');

	if (!preg_match($regexp, $path)) {
	set_include_path($path . PATH_SEPARATOR . $rcube_path);
	}

	// Register autoloader
	spl_autoload_register('rcube_autoload');

	// set PEAR error handling (will also load the PEAR main class)
	PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, function($err) { rcube::raise_error($err, true); });


	/**
	* Similar function as in_array() but case-insensitive with multibyte support.
	*
	* @param string $needle Needle value
	* @param array $heystack Array to search in
	*
	* @return bool True if found, False if not
	*/
	function in_array_nocase($needle, $haystack)
	{
	+ if (!is_string($heystack)) {
	+ return false;
	+ }
	+
	// use much faster method for ascii
	if (is_ascii($needle)) {
	foreach ((array) $haystack as $value) {
	- if (strcasecmp($value, $needle) === 0) {
	+ if (is_string($value) && strcasecmp($value, $needle) === 0) {
	return true;
	}
	}
	}
	else {
	$needle = mb_strtolower($needle);
	foreach ((array) $haystack as $value) {
	- if ($needle === mb_strtolower($value)) {
	+ if (is_string($value) && $needle === mb_strtolower($value)) {
	return true;
	}
	}
	}

	return false;
	}

	/**
	* Parse a human readable string for a number of bytes.
	*
	* @param string $str Input string
	*
	* @return float Number of bytes
	*/
	function parse_bytes($str)
	{
	if (is_numeric($str)) {
	return floatval($str);
	}

	$bytes = 0;

	if (preg_match('/([0-9\.]+)\s([a-z])/i', $str, $regs)) {
	$bytes = floatval($regs[1]);
	switch (strtolower($regs[2])) {
	case 'g':
	case 'gb':
	$bytes *= 1073741824;
	break;
	case 'm':
	case 'mb':
	$bytes *= 1048576;
	break;
	case 'k':
	case 'kb':
	$bytes *= 1024;
	break;
	}
	}

	return floatval($bytes);
	}

	/**
	* Make sure the string ends with a slash
	*
	* @param string $str A string
	*
	* @return string A string ending with a slash
	*/
	function slashify($str)
	{
	return unslashify($str) . '/';
	}

	/**
	* Remove slashes at the end of the string
	*
	* @param string $str A string
	*
	* @return string A string ending with no slash
	*/
	function unslashify($str)
	{
	return rtrim($str, '/');
	}

	/**
	* Returns number of seconds for a specified offset string.
	*
	* @param string $str String representation of the offset (e.g. 20min, 5h, 2days, 1week)
	*
	* @return int Number of seconds
	*/
	function get_offset_sec($str)
	{
	if (preg_match('/^([0-9]+)\s*([smhdw])/i', $str, $regs)) {
	$amount = (int) $regs[1];
	$unit = strtolower($regs[2]);
	}
	else {
	$amount = (int) $str;
	$unit = 's';
	}

	switch ($unit) {
	case 'w':
	$amount *= 7;
	case 'd':
	$amount *= 24;
	case 'h':
	$amount *= 60;
	case 'm':
	$amount *= 60;
	}

	return $amount;
	}

	/**
	* Create a unix timestamp with a specified offset from now.
	*
	* @param string $offset_str String representation of the offset (e.g. 20min, 5h, 2days)
	* @param int $factor Factor to multiply with the offset
	*
	* @return int Unix timestamp
	*/
	function get_offset_time($offset_str, $factor = 1)
	{
	return time() + get_offset_sec($offset_str) * $factor;
	}

	/**
	* Truncate string if it is longer than the allowed length.
	* Replace the middle or the ending part of a string with a placeholder.
	*
	* @param string $str Input string
	* @param int $maxlength Max. length
	* @param string $placeholder Replace removed chars with this
	* @param bool $ending Set to True if string should be truncated from the end
	*
	* @return string Abbreviated string
	*/
	function abbreviate_string($str, $maxlength, $placeholder = '...', $ending = false)
	{
	$length = mb_strlen($str);

	if ($length > $maxlength) {
	if ($ending) {
	return mb_substr($str, 0, $maxlength) . $placeholder;
	}

	$placeholder_length = mb_strlen($placeholder);
	$first_part_length = floor(($maxlength - $placeholder_length)/2);
	$second_starting_location = $length - $maxlength + $first_part_length + $placeholder_length;

	$prefix = mb_substr($str, 0, $first_part_length);
	$suffix = mb_substr($str, $second_starting_location);
	$str = $prefix . $placeholder . $suffix;
	}

	return $str;
	}

	/**
	* Get all keys from array (recursive).
	*
	* @param array $array Input array
	*
	* @return array List of array keys
	*/
	function array_keys_recursive($array)
	{
	$keys = [];

	if (!empty($array) && is_array($array)) {
	foreach ($array as $key => $child) {
	$keys[] = $key;
	foreach (array_keys_recursive($child) as $val) {
	$keys[] = $val;
	}
	}
	}

	return $keys;
	}

	/**
	* Get first element from an array
	*
	* @param array $array Input array
	*
	* @return mixed First element if found, Null otherwise
	*/
	function array_first($array)
	{
	if (is_array($array)) {
	reset($array);
	foreach ($array as $element) {
	return $element;
	}
	}
	}

	/**
	* Remove all non-ascii and non-word chars except ., -, _
	*
	* @param string $str A string
	* @param bool $css_id The result may be used as CSS identifier
	* @param string $replace_with Replacement character
	*
	* @return string Clean string
	*/
	function asciiwords($str, $css_id = false, $replace_with = '')
	{
	$allowed = 'a-z0-9\_\-' . (!$css_id ? '\.' : '');
	return preg_replace("/[^$allowed]+/i", $replace_with, $str);
	}

	/**
	* Check if a string contains only ascii characters
	*
	* @param string $str String to check
	* @param bool $control_chars Includes control characters
	*
	* @return bool True if the string contains ASCII-only, False otherwise
	*/
	function is_ascii($str, $control_chars = true)
	{
	$regexp = $control_chars ? '/[^\x00-\x7F]/' : '/[^\x20-\x7E]/';
	return preg_match($regexp, $str) ? false : true;
	}

	/**
	* Compose a valid representation of name and e-mail address
	*
	* @param string $email E-mail address
	* @param string $name Person name
	*
	* @return string Formatted string
	*/
	function format_email_recipient($email, $name = '')
	{
	$email = trim($email);

	if ($name && $name != $email) {
	// Special chars as defined by RFC 822 need to in quoted string (or escaped).
	if (preg_match('/[\<\>\\\.\[\]@,;:"]/', $name)) {
	$name = '"'.addcslashes($name, '"').'"';
	}

	return "$name <$email>";
	}

	return $email;
	}

	/**
	* Format e-mail address
	*
	* @param string $email E-mail address
	*
	* @return string Formatted e-mail address
	*/
	function format_email($email)
	{
	$email = trim($email);
	$parts = explode('@', $email);
	$count = count($parts);

	if ($count > 1) {
	$parts[$count-1] = mb_strtolower($parts[$count-1]);

	$email = implode('@', $parts);
	}

	return $email;
	}

	/**
	* Fix version number so it can be used correctly in version_compare()
	*
	* @param string $version Version number string
	*
	* @param return Version number string
	*/
	function version_parse($version)
	{
	return str_replace(
	['-stable', '-git'],
	['.0', '.99'],
	$version
	);
	}

	/**
	* Use PHP5 autoload for dynamic class loading
	*
	* @param string $classname Class name
	*
	* @return bool True when the class file has been found
	*
	* @todo Make Zend, PEAR etc play with this
	* @todo Make our classes conform to a more straight forward CS.
	*/
	function rcube_autoload($classname)
	{
	if (strpos($classname, 'rcube') === 0) {
	$classname = preg_replace('/^rcube_(cache\|db\|session\|spellchecker)_/', '\\1/', $classname);
	$classname = 'Roundcube/' . $classname;
	}
	else if (strpos($classname, 'html_') === 0 \|\| $classname === 'html') {
	$classname = 'Roundcube/html';
	}
	else if (strpos($classname, 'Mail_') === 0) {
	$classname = 'Mail/' . substr($classname, 5);
	}
	else if (strpos($classname, 'Net_') === 0) {
	$classname = 'Net/' . substr($classname, 4);
	}
	else if (strpos($classname, 'Auth_') === 0) {
	$classname = 'Auth/' . substr($classname, 5);
	}

	// Translate PHP namespaces into directories,
	// i.e. use \Sabre\VObject; $vcf = VObject\Reader::read(...)
	// -> Sabre/VObject/Reader.php
	$classname = str_replace('\\', '/', $classname);

	if ($fp = @fopen("$classname.php", 'r', true)) {
	fclose($fp);
	include_once "$classname.php";
	return true;
	}

	return false;
	}
	diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
	index 748673d55..ad305fd67 100644
	--- a/program/lib/Roundcube/rcube_plugin_api.php
	+++ b/program/lib/Roundcube/rcube_plugin_api.php
	@@ -1,802 +1,802 @@
	<?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: \|
	\| Plugins repository \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// location where plugins are loaded from
	if (!defined('RCUBE_PLUGINS_DIR')) {
	define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'plugins/');
	}

	/**
	* The plugin loader and global API
	*
	* @package Framework
	* @subpackage PluginAPI
	*/
	class rcube_plugin_api
	{
	static protected $instance;

	/** @var string */
	public $dir;
	/** @var string */
	public $url = 'plugins/';
	/** @var string */
	public $task = '';
	/** @var bool */
	public $initialized = false;

	public $output;
	public $handlers = [];
	public $allowed_prefs = [];
	public $allowed_session_prefs = [];
	public $active_plugins = [];

	protected $plugins = [];
	protected $plugins_initialized = [];
	protected $tasks = [];
	protected $actions = [];
	protected $actionmap = [];
	protected $objectsmap = [];
	protected $template_contents = [];
	protected $exec_stack = [];
	protected $deprecated_hooks = [];


	/**
	* This implements the 'singleton' design pattern
	*
	* @return rcube_plugin_api The one and only instance if this class
	*/
	static function get_instance()
	{
	if (!self::$instance) {
	self::$instance = new rcube_plugin_api();
	}

	return self::$instance;
	}

	/**
	* Private constructor
	*/
	protected function __construct()
	{
	$this->dir = slashify(RCUBE_PLUGINS_DIR);
	}

	/**
	* Initialize plugin engine
	*
	* This has to be done after rcmail::load_gui() or rcmail::json_init()
	* was called because plugins need to have access to rcmail->output
	*
	* @param rcube $app Instance of the rcube base class
	* @param string $task Current application task (used for conditional plugin loading)
	*/
	public function init($app, $task = '')
	{
	$this->task = $task;
	$this->output = $app->output;

	// register an internal hook
	$this->register_hook('template_container', [$this, 'template_container_hook']);
	// maybe also register a shutdown function which triggers
	// shutdown functions of all plugin objects

	foreach ($this->plugins as $plugin) {
	// ... task, request type and framed mode
	if (empty($this->plugins_initialized[$plugin->ID]) && !$this->filter($plugin)) {
	$plugin->init();
	$this->plugins_initialized[$plugin->ID] = $plugin;
	}
	}

	// we have finished initializing all plugins
	$this->initialized = true;
	}

	/**
	* Load and init all enabled plugins
	*
	* This has to be done after rcmail::load_gui() or rcmail::json_init()
	* was called because plugins need to have access to rcmail->output
	*
	* @param array $plugins_enabled List of configured plugins to load
	* @param array $plugins_required List of plugins required by the application
	*/
	public function load_plugins($plugins_enabled, $plugins_required = [])
	{
	foreach ($plugins_enabled as $plugin_name) {
	$this->load_plugin($plugin_name);
	}

	// check existence of all required core plugins
	foreach ($plugins_required as $plugin_name) {
	$loaded = false;
	foreach ($this->plugins as $plugin) {
	if ($plugin instanceof $plugin_name) {
	$loaded = true;
	break;
	}
	}

	// load required core plugin if no derivate was found
	if (!$loaded) {
	$loaded = $this->load_plugin($plugin_name);
	}

	// trigger fatal error if still not loaded
	if (!$loaded) {
	rcube::raise_error([
	'code' => 520, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Required plugin $plugin_name was not loaded"
	],
	true, true
	);
	}
	}
	}

	/**
	* Load the specified plugin
	*
	* @param string $plugin_name Plugin name
	* @param bool $force Force loading of the plugin even if it doesn't match the filter
	* @param bool $require Require loading of the plugin, error if it doesn't exist
	*
	* @return bool True on success, false if not loaded or failure
	*/
	public function load_plugin($plugin_name, $force = false, $require = true)
	{
	static $plugins_dir;

	if (!$plugins_dir) {
	$dir = dir($this->dir);
	$plugins_dir = unslashify($dir->path);
	}

	// Validate the plugin name to prevent from path traversal
	if (preg_match('/[^a-zA-Z0-9_-]/', $plugin_name)) {
	rcube::raise_error([
	'code' => 520, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid plugin name: $plugin_name"
	],
	true, false
	);

	return false;
	}

	// plugin already loaded?
	if (!isset($this->plugins[$plugin_name])) {
	$fn = "$plugins_dir/$plugin_name/$plugin_name.php";

	if (!is_readable($fn)) {
	if ($require) {
	rcube::raise_error([
	'code' => 520, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Failed to load plugin file $fn"
	],
	true, false
	);
	}

	return false;
	}

	if (!class_exists($plugin_name, false)) {
	include $fn;
	}

	// instantiate class if exists
	if (!class_exists($plugin_name, false)) {
	rcube::raise_error([
	'code' => 520, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "No plugin class $plugin_name found in $fn"
	],
	true, false
	);

	return false;
	}

	$plugin = new $plugin_name($this);
	$this->active_plugins[] = $plugin_name;

	// check inheritance...
	if (is_subclass_of($plugin, 'rcube_plugin')) {
	// call onload method on plugin if it exists.
	// this is useful if you want to be called early in the boot process
	if (method_exists($plugin, 'onload')) {
	$plugin->onload();
	}

	if (!empty($plugin->allowed_prefs)) {
	$this->allowed_prefs = array_merge($this->allowed_prefs, $plugin->allowed_prefs);
	}

	$this->plugins[$plugin_name] = $plugin;
	}
	}

	if (!empty($this->plugins[$plugin_name])) {
	$plugin = $this->plugins[$plugin_name];

	// init a plugin only if $force is set or if we're called after initialization
	if (
	($force \|\| $this->initialized)
	&& empty($this->plugins_initialized[$plugin_name])
	&& ($force \|\| !$this->filter($plugin))
	) {
	$plugin->init();
	$this->plugins_initialized[$plugin_name] = $plugin;
	}
	}

	return true;
	}

	/**
	* Check if we should prevent this plugin from initializing
	*
	* @param rcube_plugin $plugin Plugin object
	*
	* @return bool
	*/
	private function filter($plugin)
	{
	return ($plugin->noajax && !(is_object($this->output) && $this->output->type == 'html'))
	\|\| ($plugin->task && !preg_match('/^('.$plugin->task.')$/i', $this->task))
	\|\| ($plugin->noframe && !empty($_REQUEST['_framed']));
	}

	/**
	* Get information about a specific plugin.
	* This is either provided by a plugin's info() method or extracted from a package.xml or a composer.json file
	*
	* @param string $plugin_name Plugin name
	*
	* @return array Meta information about a plugin or False if plugin was not found
	*/
	public function get_info($plugin_name)
	{
	static $composer_lock, $license_uris = [
	'Apache' => 'http://www.apache.org/licenses/LICENSE-2.0.html',
	'Apache-2' => 'http://www.apache.org/licenses/LICENSE-2.0.html',
	'Apache-1' => 'http://www.apache.org/licenses/LICENSE-1.0',
	'Apache-1.1' => 'http://www.apache.org/licenses/LICENSE-1.1',
	'GPL' => 'http://www.gnu.org/licenses/gpl.html',
	'GPL-2.0' => 'http://www.gnu.org/licenses/gpl-2.0.html',
	'GPL-2.0+' => 'http://www.gnu.org/licenses/gpl.html',
	'GPL-3.0' => 'http://www.gnu.org/licenses/gpl-3.0.html',
	'GPL-3.0+' => 'http://www.gnu.org/licenses/gpl.html',
	'AGPL-3.0' => 'http://www.gnu.org/licenses/agpl.html',
	'AGPL-3.0+' => 'http://www.gnu.org/licenses/agpl.html',
	'LGPL' => 'http://www.gnu.org/licenses/lgpl.html',
	'LGPL-2.0' => 'http://www.gnu.org/licenses/lgpl-2.0.html',
	'LGPL-2.1' => 'http://www.gnu.org/licenses/lgpl-2.1.html',
	'LGPL-3.0' => 'http://www.gnu.org/licenses/lgpl.html',
	'LGPL-3.0+' => 'http://www.gnu.org/licenses/lgpl.html',
	'BSD' => 'http://opensource.org/licenses/bsd-license.html',
	'BSD-2-Clause' => 'http://opensource.org/licenses/BSD-2-Clause',
	'BSD-3-Clause' => 'http://opensource.org/licenses/BSD-3-Clause',
	'FreeBSD' => 'http://opensource.org/licenses/BSD-2-Clause',
	'MIT' => 'http://www.opensource.org/licenses/mit-license.php',
	'PHP' => 'http://opensource.org/licenses/PHP-3.0',
	'PHP-3' => 'http://www.php.net/license/3_01.txt',
	'PHP-3.0' => 'http://www.php.net/license/3_0.txt',
	'PHP-3.01' => 'http://www.php.net/license/3_01.txt',
	];

	$dir = dir($this->dir);
	$fn = unslashify($dir->path) . "/$plugin_name/$plugin_name.php";
	$info = false;

	// Validate the plugin name to prevent from path traversal
	if (preg_match('/[^a-zA-Z0-9_-]/', $plugin_name)) {
	rcube::raise_error([
	'code' => 520, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid plugin name: $plugin_name"
	],
	true, false
	);

	return false;
	}

	if (!class_exists($plugin_name, false)) {
	if (is_readable($fn)) {
	include($fn);
	}
	else {
	return false;
	}
	}

	if (class_exists($plugin_name)) {
	$info = $plugin_name::info();
	}

	// fall back to composer.json file
	if (!$info) {
	$composer = INSTALL_PATH . "/plugins/$plugin_name/composer.json";
	if (is_readable($composer) && ($json = @json_decode(file_get_contents($composer), true))) {
	// Build list of plugins required
	$require = [];
	foreach (array_keys((array) $json['require']) as $dname) {
	if (!preg_match('\|^([^/]+)/([a-zA-Z0-9_-]+)$\|', $dname, $m)) {
	continue;
	}

	$vendor = $m[1];
	$name = $m[2];

	if ($name != 'plugin-installer' && $vendor != 'pear' && $vendor != 'pear-pear') {
	$dpath = unslashify($dir->path) . "/$name/$name.php";
	if (is_readable($dpath)) {
	$require[] = $name;
	}
	}
	}

	list($info['vendor'], $info['name']) = explode('/', $json['name']);
	$info['version'] = $json['version'];
	$info['license'] = $json['license'];
	$info['require'] = $require;

	if (!empty($json['homepage'])) {
	$info['uri'] = $json['homepage'];
	}
	}

	// read local composer.lock file (once)
	if (!isset($composer_lock)) {
	$composer_lock = @json_decode(@file_get_contents(INSTALL_PATH . "/composer.lock"), true);
	- if ($composer_lock['packages']) {
	+ if ($composer_lock && !empty($composer_lock['packages'])) {
	foreach ($composer_lock['packages'] as $i => $package) {
	$composer_lock['installed'][$package['name']] = $package;
	}
	}
	}

	// load additional information from local composer.lock file
	- if (!empty($json['name']) && !empty($composer_lock['installed'])
	+ if (!empty($json['name']) && $composer_lock && !empty($composer_lock['installed'])
	&& !empty($composer_lock['installed'][$json['name']])
	) {
	$lock = $composer_lock['installed'][$json['name']];
	$info['version'] = $lock['version'];
	$info['uri'] = $lock['homepage'] ?: $lock['source']['uri'];
	$info['src_uri'] = $lock['dist']['uri'] ?: $lock['source']['uri'];
	}
	}

	// fall back to package.xml file
	if (!$info) {
	$package = INSTALL_PATH . "/plugins/$plugin_name/package.xml";
	if (is_readable($package) && ($file = file_get_contents($package))) {
	$doc = new DOMDocument();
	$doc->loadXML($file);
	$xpath = new DOMXPath($doc);
	$xpath->registerNamespace('rc', "http://pear.php.net/dtd/package-2.0");

	// XPaths of plugin metadata elements
	$metadata = [
	'name' => 'string(//rc:package/rc:name)',
	'version' => 'string(//rc:package/rc:version/rc:release)',
	'license' => 'string(//rc:package/rc:license)',
	'license_uri' => 'string(//rc:package/rc:license/@uri)',
	'src_uri' => 'string(//rc:package/rc:srcuri)',
	'uri' => 'string(//rc:package/rc:uri)',
	];

	foreach ($metadata as $key => $path) {
	$info[$key] = $xpath->evaluate($path);
	}

	// dependent required plugins (can be used, but not included in config)
	$deps = $xpath->evaluate('//rc:package/rc:dependencies/rc:required/rc:package/rc:name');
	for ($i = 0; $i < $deps->length; $i++) {
	$dn = $deps->item($i)->nodeValue;
	$info['require'][] = $dn;
	}
	}
	}

	// At least provide the name
	if (!$info && class_exists($plugin_name)) {
	$info = ['name' => $plugin_name, 'version' => '--'];
	}
	else if (!empty($info['license'])) {
	// Convert license identifier to something shorter
	if (preg_match('/^([ALGP]+)[-v]([0-9.]+)(\+\|-or-later)?/', $info['license'], $matches)) {
	$info['license'] = $matches[1] . '-' . sprintf('%.1f', $matches[2])
	. (!empty($matches[3]) ? '+' : '');
	}

	if (empty($info['license_uri']) && !empty($license_uris[$info['license']])) {
	$info['license_uri'] = $license_uris[$info['license']];
	}
	}

	return $info;
	}

	/**
	* Allows a plugin object to register a callback for a certain hook
	*
	* @param string $hook Hook name
	* @param callback $callback A callback function
	*/
	public function register_hook($hook, $callback)
	{
	if (is_callable($callback)) {
	if (isset($this->deprecated_hooks[$hook])) {
	rcube::raise_error([
	'code' => 522, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Deprecated hook name. "
	. $hook . ' -> ' . $this->deprecated_hooks[$hook]
	], true, false
	);
	$hook = $this->deprecated_hooks[$hook];
	}
	$this->handlers[$hook][] = $callback;
	}
	else {
	rcube::raise_error([
	'code' => 521, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid callback function for $hook"
	],
	true, false
	);
	}
	}

	/**
	* Allow a plugin object to unregister a callback.
	*
	* @param string $hook Hook name
	* @param callback $callback A callback function
	*/
	public function unregister_hook($hook, $callback)
	{
	if (empty($this->handlers[$hook])) {
	return;
	}

	$callback_id = array_search($callback, (array) $this->handlers[$hook]);
	if ($callback_id !== false) {
	// array_splice() removes the element and re-indexes keys
	// that is required by the 'for' loop in exec_hook() below
	array_splice($this->handlers[$hook], $callback_id, 1);
	}
	}

	/**
	* Triggers a plugin hook.
	* This is called from the application and executes all registered handlers
	*
	* @param string $hook Hook name
	* @param array $args Named arguments (key->value pairs)
	*
	* @return array The (probably) altered hook arguments
	*/
	public function exec_hook($hook, $args = [])
	{
	if (!is_array($args)) {
	$args = ['arg' => $args];
	}

	// TODO: avoid recursion by checking in_array($hook, $this->exec_stack) ?

	$args += ['abort' => false];
	array_push($this->exec_stack, $hook);

	// Use for loop here, so handlers added in the hook will be executed too
	if (!empty($this->handlers[$hook])) {
	for ($i = 0; $i < count($this->handlers[$hook]); $i++) {
	$ret = call_user_func($this->handlers[$hook][$i], $args);
	if ($ret && is_array($ret)) {
	$args = $ret + $args;
	}

	if (!empty($args['break'])) {
	break;
	}
	}
	}

	array_pop($this->exec_stack);
	return $args;
	}

	/**
	* Let a plugin register a handler for a specific request
	*
	* @param string $action Action name (_task=mail&_action=plugin.foo)
	* @param string $owner Plugin name that registers this action
	* @param callback $callback A callback function
	* @param string $task Task name registered by this plugin
	*/
	public function register_action($action, $owner, $callback, $task = null)
	{
	// check action name
	if ($task) {
	$action = $task.'.'.$action;
	}
	else if (strpos($action, 'plugin.') !== 0) {
	$action = 'plugin.'.$action;
	}

	// can register action only if it's not taken or registered by myself
	if (!isset($this->actionmap[$action]) \|\| $this->actionmap[$action] == $owner) {
	$this->actions[$action] = $callback;
	$this->actionmap[$action] = $owner;
	}
	else {
	rcube::raise_error([
	'code' => 523, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Cannot register action $action; already taken by another plugin"
	],
	true, false
	);
	}
	}

	/**
	* This method handles requests like _task=mail&_action=plugin.foo
	* It executes the callback function that was registered with the given action.
	*
	* @param string $action Action name
	*/
	public function exec_action($action)
	{
	if (isset($this->actions[$action])) {
	call_user_func($this->actions[$action]);
	}
	else if (rcube::get_instance()->action != 'refresh') {
	rcube::raise_error([
	'code' => 524, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "No handler found for action $action"
	],
	true, true
	);
	}
	}

	/**
	* Register a handler function for template objects
	*
	* @param string $name Object name
	* @param string $owner Plugin name that registers this action
	* @param callback $callback A callback function
	*/
	public function register_handler($name, $owner, $callback)
	{
	// check name
	if (strpos($name, 'plugin.') !== 0) {
	$name = 'plugin.' . $name;
	}

	// can register handler only if it's not taken or registered by myself
	if (is_object($this->output)
	&& (!isset($this->objectsmap[$name]) \|\| $this->objectsmap[$name] == $owner)
	) {
	$this->output->add_handler($name, $callback);
	$this->objectsmap[$name] = $owner;
	}
	else {
	rcube::raise_error([
	'code' => 525, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Cannot register template handler $name;"
	." already taken by another plugin or no output object available"
	],
	true, false
	);
	}
	}

	/**
	* Register this plugin to be responsible for a specific task
	*
	* @param string $task Task name (only characters [a-z0-9_-] are allowed)
	* @param string $owner Plugin name that registers this action
	*/
	public function register_task($task, $owner)
	{
	// tasks are irrelevant in framework mode
	if (!class_exists('rcmail', false)) {
	return true;
	}

	if ($task != asciiwords($task, true)) {
	rcube::raise_error([
	'code' => 526, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid task name: $task."
	." Only characters [a-z0-9_.-] are allowed"
	],
	true, false
	);
	}
	else if (in_array($task, rcmail::$main_tasks)) {
	rcube::raise_error([
	'code' => 526, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Cannot register task $task;"
	." already taken by another plugin or the application itself"
	],
	true, false
	);
	}
	else {
	$this->tasks[$task] = $owner;
	rcmail::$main_tasks[] = $task;
	return true;
	}

	return false;
	}

	/**
	* Checks whether the given task is registered by a plugin
	*
	* @param string $task Task name
	*
	* @return bool True if registered, otherwise false
	*/
	public function is_plugin_task($task)
	{
	return !empty($this->tasks[$task]);
	}

	/**
	* Check if a plugin hook is currently processing.
	* Mainly used to prevent loops and recursion.
	*
	* @param string $hook Hook to check (optional)
	*
	* @return bool True if any/the given hook is currently processed, otherwise false
	*/
	public function is_processing($hook = null)
	{
	return count($this->exec_stack) > 0 && (!$hook \|\| in_array($hook, $this->exec_stack));
	}

	/**
	* Include a plugin script file in the current HTML page
	*
	* @param string $fn Path to script
	*/
	public function include_script($fn)
	{
	if (is_object($this->output) && $this->output->type == 'html') {
	$src = $this->resource_url($fn);
	$this->output->include_script($src, 'head_bottom', false);
	}
	}

	/**
	* Include a plugin stylesheet in the current HTML page
	*
	* @param string $fn Path to stylesheet
	*/
	public function include_stylesheet($fn)
	{
	if (is_object($this->output) && $this->output->type == 'html') {
	if ($fn[0] != '/' && !preg_match('\|^https?://\|i', $fn)) {
	$rcube = rcube::get_instance();
	$devel_mode = $rcube->config->get('devel_mode');
	$assets_dir = $rcube->config->get('assets_dir');
	$path = unslashify($assets_dir ?: RCUBE_INSTALL_PATH);
	$dir = $path . (strpos($fn, "plugins/") === false ? '/plugins' : '');

	// Prefer .less files in devel_mode (assume less.js is loaded)
	if ($devel_mode) {
	$less = preg_replace('/\.css$/i', '.less', $fn);
	if ($less != $fn && is_file("$dir/$less")) {
	$fn = $less;
	}
	}
	else if (!preg_match('/\.min\.css$/', $fn)) {
	$min = preg_replace('/\.css$/i', '.min.css', $fn);
	if (is_file("$dir/$min")) {
	$fn = $min;
	}
	}

	if (!is_file("$dir/$fn")) {
	return;
	}
	}

	$src = $this->resource_url($fn);
	$this->output->include_css($src);
	}
	}

	/**
	* Save the given HTML content to be added to a template container
	*
	* @param string $html HTML content
	* @param string $container Template container identifier
	*/
	public function add_content($html, $container)
	{
	if (!isset($this->template_contents[$container])) {
	$this->template_contents[$container] = '';
	}

	$this->template_contents[$container] .= $html . "\n";
	}

	/**
	* Returns list of loaded plugins names
	*
	* @return array List of plugin names
	*/
	public function loaded_plugins()
	{
	return array_keys($this->plugins);
	}

	/**
	* Returns loaded plugin
	*
	* @return rcube_plugin\|null Plugin instance
	*/
	public function get_plugin($name)
	{
	return !empty($this->plugins[$name]) ? $this->plugins[$name] : null;
	}

	/**
	* Callback for template_container hooks
	*
	* @param array $attrib Container attributes
	*
	* @return array
	*/
	protected function template_container_hook($attrib)
	{
	$container = $attrib['name'];
	$content = isset($attrib['content']) ? $attrib['content'] : '';

	if (isset($this->template_contents[$container])) {
	$content .= $this->template_contents[$container];
	}

	return ['content' => $content];
	}

	/**
	* Make the given file name link into the plugins directory
	*
	* @param string $fn Filename
	*
	* @return string
	*/
	protected function resource_url($fn)
	{
	// pattern "skins/" used to identify plugin resources loaded from the core skin folder
	if ($fn[0] != '/' && !preg_match('#^(https?://\|skins/)#i', $fn)) {
	return $this->url . $fn;
	}
	else {
	return $fn;
	}
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Wed, Feb 25, 9:47 PM (2 h, 41 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 446915
Default Alt Text: (448 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions