No OneTemporary
Actions

Size

224 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CHANGELOG b/CHANGELOG
	index 8be44a41b..4ecd740c1 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,1246 +1,1247 @@
	CHANGELOG Roundcube Webmail
	===========================

	+- Fix bug in handling of base href and inline content (#1488290)
	- Fix SQL Error when saving a contact with many email addresses (#1488286)
	- Fix strict email address searching if contact has more than one address
	- Use proper timezones from PHP's internal timezonedb (#1485592)
	- Add separate pagesize setting for mail messages and contacts (#1488269)
	- Fix handling of INBOX's subfolders in special folders config (#1488279)
	- Add ifModule statement for setting Options -Indexes in .htaccess file (#1488274)
	- Fix crashes with eAccelerator (#1488256)
	- Fix searching on IMAP servers without CHARSET specifier support (#1488271)
	- Fix expanding folders during drag&drop (#1488260)
	- Deprecate $DB, $USER, $IMAP global variables, Use $RCMAIL instead
	- Add option to set default font for HTML message (#1484137)
	- Fix issues with big memory allocation of IMAP results
	- Prevent from memory_limit exceeding when trying to parse big messages bodies (#1487424)
	- Add possibility to add SASL mechanisms for SMTP in smtp_connect hook (#1487937)
	- Mark (with different color) folders with recent messages (#1486234)
	- TinyMCE updated to 3.4.6

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

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

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

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

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

	RELEASE 0.5.4
	-------------
	- Fix XSS vulnerability in UI messages (#1488030)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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




	diff --git a/program/include/main.inc b/program/include/main.inc
	index ad41a13e7..b16f0202a 100644
	--- a/program/include/main.inc
	+++ b/program/include/main.inc
	@@ -1,2464 +1,2525 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/main.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2011, The Roundcube Dev Team \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Provide basic functions for the webmail package \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	/**
	* Roundcube Webmail common functions
	*
	* @package Core
	* @author Thomas Bruederli <roundcube@gmail.com>
	*/

	require_once 'utf7.inc';
	require_once INSTALL_PATH . 'program/include/rcube_shared.inc';

	// define constannts for input reading
	define('RCUBE_INPUT_GET', 0x0101);
	define('RCUBE_INPUT_POST', 0x0102);
	define('RCUBE_INPUT_GPC', 0x0103);



	/**
	* Return correct name for a specific database table
	*
	* @param string Table name
	* @return string Translated table name
	*/
	function get_table_name($table)
	{
	global $CONFIG;

	// return table name if configured
	$config_key = 'db_table_'.$table;

	if (strlen($CONFIG[$config_key]))
	return $CONFIG[$config_key];

	return $table;
	}


	/**
	* Return correct name for a specific database sequence
	* (used for Postgres only)
	*
	* @param string Secuence name
	* @return string Translated sequence name
	*/
	function get_sequence_name($sequence)
	{
	// return sequence name if configured
	$config_key = 'db_sequence_'.$sequence;
	$opt = rcmail::get_instance()->config->get($config_key);

	if (!empty($opt))
	return $opt;

	return $sequence;
	}


	/**
	* Get localized text in the desired language
	* It's a global wrapper for rcmail::gettext()
	*
	* @param mixed Named parameters array or label name
	* @param string Domain to search in (e.g. plugin name)
	* @return string Localized text
	* @see rcmail::gettext()
	*/
	function rcube_label($p, $domain=null)
	{
	return rcmail::get_instance()->gettext($p, $domain);
	}


	/**
	* Global wrapper of rcmail::text_exists()
	* to check whether a text label is defined
	*
	* @see rcmail::text_exists()
	*/
	function rcube_label_exists($name, $domain=null, &$ref_domain = null)
	{
	return rcmail::get_instance()->text_exists($name, $domain, $ref_domain);
	}


	/**
	* Overwrite action variable
	*
	* @param string New action value
	*/
	function rcmail_overwrite_action($action)
	{
	$app = rcmail::get_instance();
	$app->action = $action;
	$app->output->set_env('action', $action);
	}


	/**
	* Compose an URL for a specific action
	*
	* @param string Request action
	* @param array More URL parameters
	* @param string Request task (omit if the same)
	* @return The application URL
	*/
	function rcmail_url($action, $p=array(), $task=null)
	{
	$app = rcmail::get_instance();
	return $app->url((array)$p + array('_action' => $action, 'task' => $task));
	}


	/**
	* Garbage collector function for temp files.
	* Remove temp files older than two days
	*/
	function rcmail_temp_gc()
	{
	$rcmail = rcmail::get_instance();

	$tmp = unslashify($rcmail->config->get('temp_dir'));
	$expire = mktime() - 172800; // expire in 48 hours

	if ($dir = opendir($tmp)) {
	while (($fname = readdir($dir)) !== false) {
	if ($fname{0} == '.')
	continue;

	if (filemtime($tmp.'/'.$fname) < $expire)
	@unlink($tmp.'/'.$fname);
	}

	closedir($dir);
	}
	}


	/**
	* Garbage collector for cache entries.
	* Remove all expired message cache records
	* @return void
	*/
	function rcmail_cache_gc()
	{
	$rcmail = rcmail::get_instance();
	$db = $rcmail->get_dbh();

	// get target timestamp
	$ts = get_offset_time($rcmail->config->get('message_cache_lifetime', '30d'), -1);

	$db->query("DELETE FROM ".get_table_name('cache_messages')
	." WHERE changed < " . $db->fromunixtime($ts));

	$db->query("DELETE FROM ".get_table_name('cache_index')
	." WHERE changed < " . $db->fromunixtime($ts));

	$db->query("DELETE FROM ".get_table_name('cache_thread')
	." WHERE changed < " . $db->fromunixtime($ts));

	$db->query("DELETE FROM ".get_table_name('cache')
	." WHERE created < " . $db->fromunixtime($ts));
	}


	/**
	* Catch an error and throw an exception.
	*
	* @param int Level of the error
	* @param string Error message
	*/
	function rcube_error_handler($errno, $errstr)
	{
	throw new ErrorException($errstr, 0, $errno);
	}


	/**
	* Convert a string from one charset to another.
	* Uses mbstring and iconv functions if possible
	*
	* @param string Input string
	* @param string Suspected charset of the input string
	* @param string Target charset to convert to; defaults to RCMAIL_CHARSET
	* @return string Converted string
	*/
	function rcube_charset_convert($str, $from, $to=NULL)
	{
	static $iconv_options = null;
	static $mbstring_loaded = null;
	static $mbstring_list = null;
	static $conv = null;

	$error = false;

	$to = empty($to) ? strtoupper(RCMAIL_CHARSET) : rcube_parse_charset($to);
	$from = rcube_parse_charset($from);

	if ($from == $to \|\| empty($str) \|\| empty($from))
	return $str;

	// convert charset using iconv module
	if (function_exists('iconv') && $from != 'UTF7-IMAP' && $to != 'UTF7-IMAP') {
	if ($iconv_options === null) {
	// ignore characters not available in output charset
	$iconv_options = '//IGNORE';
	if (iconv('', $iconv_options, '') === false) {
	// iconv implementation does not support options
	$iconv_options = '';
	}
	}

	// throw an exception if iconv reports an illegal character in input
	// it means that input string has been truncated
	set_error_handler('rcube_error_handler', E_NOTICE);
	try {
	$_iconv = iconv($from, $to . $iconv_options, $str);
	} catch (ErrorException $e) {
	$_iconv = false;
	}
	restore_error_handler();
	if ($_iconv !== false) {
	return $_iconv;
	}
	}

	if ($mbstring_loaded === null)
	$mbstring_loaded = extension_loaded('mbstring');

	// convert charset using mbstring module
	if ($mbstring_loaded) {
	$aliases['WINDOWS-1257'] = 'ISO-8859-13';

	if ($mbstring_list === null) {
	$mbstring_list = mb_list_encodings();
	$mbstring_list = array_map('strtoupper', $mbstring_list);
	}

	$mb_from = $aliases[$from] ? $aliases[$from] : $from;
	$mb_to = $aliases[$to] ? $aliases[$to] : $to;

	// return if encoding found, string matches encoding and convert succeeded
	if (in_array($mb_from, $mbstring_list) && in_array($mb_to, $mbstring_list)) {
	if (mb_check_encoding($str, $mb_from) && ($out = mb_convert_encoding($str, $mb_to, $mb_from)))
	return $out;
	}
	}

	// convert charset using bundled classes/functions
	if ($to == 'UTF-8') {
	if ($from == 'UTF7-IMAP') {
	if ($_str = utf7_to_utf8($str))
	return $_str;
	}
	else if ($from == 'UTF-7') {
	if ($_str = rcube_utf7_to_utf8($str))
	return $_str;
	}
	else if (($from == 'ISO-8859-1') && function_exists('utf8_encode')) {
	return utf8_encode($str);
	}
	else if (class_exists('utf8')) {
	if (!$conv)
	$conv = new utf8($from);
	else
	$conv->loadCharset($from);

	if($_str = $conv->strToUtf8($str))
	return $_str;
	}
	$error = true;
	}

	// encode string for output
	if ($from == 'UTF-8') {
	// @TODO: we need a function for UTF-7 (RFC2152) conversion
	if ($to == 'UTF7-IMAP' \|\| $to == 'UTF-7') {
	if ($_str = utf8_to_utf7($str))
	return $_str;
	}
	else if ($to == 'ISO-8859-1' && function_exists('utf8_decode')) {
	return utf8_decode($str);
	}
	else if (class_exists('utf8')) {
	if (!$conv)
	$conv = new utf8($to);
	else
	$conv->loadCharset($from);

	if ($_str = $conv->strToUtf8($str))
	return $_str;
	}
	$error = true;
	}

	// return UTF-8 or original string
	return $str;
	}


	/**
	* Parse and validate charset name string (see #1485758).
	* Sometimes charset string is malformed, there are also charset aliases
	* but we need strict names for charset conversion (specially utf8 class)
	*
	* @param string Input charset name
	* @return string The validated charset name
	*/
	function rcube_parse_charset($input)
	{
	static $charsets = array();
	$charset = strtoupper($input);

	if (isset($charsets[$input]))
	return $charsets[$input];

	$charset = preg_replace(array(
	'/^[^0-9A-Z]+/', // e.g. _ISO-8859-JP$SIO
	'/\$.*$/', // e.g. _ISO-8859-JP$SIO
	'/UNICODE-1-1-*/', // RFC1641/1642
	'/^X-/', // X- prefix (e.g. X-ROMAN8 => ROMAN8)
	), '', $charset);

	if ($charset == 'BINARY')
	return $charsets[$input] = null;

	# Aliases: some of them from HTML5 spec.
	$aliases = array(
	'USASCII' => 'WINDOWS-1252',
	'ANSIX31101983' => 'WINDOWS-1252',
	'ANSIX341968' => 'WINDOWS-1252',
	'UNKNOWN8BIT' => 'ISO-8859-15',
	'UNKNOWN' => 'ISO-8859-15',
	'USERDEFINED' => 'ISO-8859-15',
	'KSC56011987' => 'EUC-KR',
	'GB2312' => 'GBK',
	'GB231280' => 'GBK',
	'UNICODE' => 'UTF-8',
	'UTF7IMAP' => 'UTF7-IMAP',
	'TIS620' => 'WINDOWS-874',
	'ISO88599' => 'WINDOWS-1254',
	'ISO885911' => 'WINDOWS-874',
	'MACROMAN' => 'MACINTOSH',
	'77' => 'MAC',
	'128' => 'SHIFT-JIS',
	'129' => 'CP949',
	'130' => 'CP1361',
	'134' => 'GBK',
	'136' => 'BIG5',
	'161' => 'WINDOWS-1253',
	'162' => 'WINDOWS-1254',
	'163' => 'WINDOWS-1258',
	'177' => 'WINDOWS-1255',
	'178' => 'WINDOWS-1256',
	'186' => 'WINDOWS-1257',
	'204' => 'WINDOWS-1251',
	'222' => 'WINDOWS-874',
	'238' => 'WINDOWS-1250',
	'MS950' => 'CP950',
	'WINDOWS949' => 'UHC',
	);

	// allow A-Z and 0-9 only
	$str = preg_replace('/[^A-Z0-9]/', '', $charset);

	if (isset($aliases[$str]))
	$result = $aliases[$str];
	// UTF
	else if (preg_match('/U[A-Z][A-Z](7\|8\|16\|32)(BE\|LE)*/', $str, $m))
	$result = 'UTF-' . $m[1] . $m[2];
	// ISO-8859
	else if (preg_match('/ISO8859([0-9]{0,2})/', $str, $m)) {
	$iso = 'ISO-8859-' . ($m[1] ? $m[1] : 1);
	// some clients sends windows-1252 text as latin1,
	// it is safe to use windows-1252 for all latin1
	$result = $iso == 'ISO-8859-1' ? 'WINDOWS-1252' : $iso;
	}
	// handle broken charset names e.g. WINDOWS-1250HTTP-EQUIVCONTENT-TYPE
	else if (preg_match('/(WIN\|WINDOWS)([0-9]+)/', $str, $m)) {
	$result = 'WINDOWS-' . $m[2];
	}
	// LATIN
	else if (preg_match('/LATIN(.*)/', $str, $m)) {
	$aliases = array('2' => 2, '3' => 3, '4' => 4, '5' => 9, '6' => 10,
	'7' => 13, '8' => 14, '9' => 15, '10' => 16,
	'ARABIC' => 6, 'CYRILLIC' => 5, 'GREEK' => 7, 'GREEK1' => 7, 'HEBREW' => 8);

	// some clients sends windows-1252 text as latin1,
	// it is safe to use windows-1252 for all latin1
	if ($m[1] == 1) {
	$result = 'WINDOWS-1252';
	}
	// if iconv is not supported we need ISO labels, it's also safe for iconv
	else if (!empty($aliases[$m[1]])) {
	$result = 'ISO-8859-'.$aliases[$m[1]];
	}
	// iconv requires convertion of e.g. LATIN-1 to LATIN1
	else {
	$result = $str;
	}
	}
	else {
	$result = $charset;
	}

	$charsets[$input] = $result;

	return $result;
	}


	/**
	* Converts string from standard UTF-7 (RFC 2152) to UTF-8.
	*
	* @param string Input string
	* @return string The converted string
	*/
	function rcube_utf7_to_utf8($str)
	{
	$Index_64 = array(
	0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
	0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
	0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0,
	1,1,1,1, 1,1,1,1, 1,1,0,0, 0,0,0,0,
	0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1,
	1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,0,
	0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1,
	1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,0,
	);

	$u7len = strlen($str);
	$str = strval($str);
	$res = '';

	for ($i=0; $u7len > 0; $i++, $u7len--)
	{
	$u7 = $str[$i];
	if ($u7 == '+')
	{
	$i++;
	$u7len--;
	$ch = '';

	for (; $u7len > 0; $i++, $u7len--)
	{
	$u7 = $str[$i];

	if (!$Index_64[ord($u7)])
	break;

	$ch .= $u7;
	}

	if ($ch == '') {
	if ($u7 == '-')
	$res .= '+';
	continue;
	}

	$res .= rcube_utf16_to_utf8(base64_decode($ch));
	}
	else
	{
	$res .= $u7;
	}
	}

	return $res;
	}

	/**
	* Converts string from UTF-16 to UTF-8 (helper for utf-7 to utf-8 conversion)
	*
	* @param string Input string
	* @return string The converted string
	*/
	function rcube_utf16_to_utf8($str)
	{
	$len = strlen($str);
	$dec = '';

	for ($i = 0; $i < $len; $i += 2) {
	$c = ord($str[$i]) << 8 \| ord($str[$i + 1]);
	if ($c >= 0x0001 && $c <= 0x007F) {
	$dec .= chr($c);
	} else if ($c > 0x07FF) {
	$dec .= chr(0xE0 \| (($c >> 12) & 0x0F));
	$dec .= chr(0x80 \| (($c >> 6) & 0x3F));
	$dec .= chr(0x80 \| (($c >> 0) & 0x3F));
	} else {
	$dec .= chr(0xC0 \| (($c >> 6) & 0x1F));
	$dec .= chr(0x80 \| (($c >> 0) & 0x3F));
	}
	}
	return $dec;
	}


	/**
	* Replacing specials characters to a specific encoding type
	*
	* @param string Input string
	* @param string Encoding type: text\|html\|xml\|js\|url
	* @param string Replace mode for tags: show\|replace\|remove
	* @param boolean Convert newlines
	* @return string The quoted string
	*/
	function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
	{
	static $html_encode_arr = false;
	static $js_rep_table = false;
	static $xml_rep_table = false;

	if (!$enctype)
	$enctype = $OUTPUT->type;

	// encode for HTML output
	if ($enctype=='html')
	{
	if (!$html_encode_arr)
	{
	$html_encode_arr = get_html_translation_table(HTML_SPECIALCHARS);
	unset($html_encode_arr['?']);
	}

	$ltpos = strpos($str, '<');
	$encode_arr = $html_encode_arr;

	// don't replace quotes and html tags
	if (($mode=='show' \|\| $mode=='') && $ltpos!==false && strpos($str, '>', $ltpos)!==false)
	{
	unset($encode_arr['"']);
	unset($encode_arr['<']);
	unset($encode_arr['>']);
	unset($encode_arr['&']);
	}
	else if ($mode=='remove')
	$str = strip_tags($str);

	$out = strtr($str, $encode_arr);

	// avoid douple quotation of &
	$out = preg_replace('/&([A-Za-z]{2,6}\|#[0-9]{2,4});/', '&\\1;', $out);

	return $newlines ? nl2br($out) : $out;
	}

	// if the replace tables for XML and JS are not yet defined
	if ($js_rep_table===false)
	{
	$js_rep_table = $xml_rep_table = array();
	$xml_rep_table['&'] = '&';

	for ($c=160; $c<256; $c++) // can be increased to support more charsets
	$xml_rep_table[chr($c)] = "&#$c;";

	$xml_rep_table['"'] = '"';
	$js_rep_table['"'] = '\\"';
	$js_rep_table["'"] = "\\'";
	$js_rep_table["\\"] = "\\\\";
	// Unicode line and paragraph separators (#1486310)
	$js_rep_table[chr(hexdec(E2)).chr(hexdec(80)).chr(hexdec(A8))] = ' ';
	$js_rep_table[chr(hexdec(E2)).chr(hexdec(80)).chr(hexdec(A9))] = ' ';
	}

	// encode for javascript use
	if ($enctype=='js')
	return preg_replace(array("/\r?\n/", "/\r/", '/<\\//'), array('\n', '\n', '<\\/'), strtr($str, $js_rep_table));

	// encode for plaintext
	if ($enctype=='text')
	return str_replace("\r\n", "\n", $mode=='remove' ? strip_tags($str) : $str);

	if ($enctype=='url')
	return rawurlencode($str);

	// encode for XML
	if ($enctype=='xml')
	return strtr($str, $xml_rep_table);

	// no encoding given -> return original string
	return $str;
	}

	/**
	* Quote a given string.
	* Shortcut function for rep_specialchars_output
	*
	* @return string HTML-quoted string
	* @see rep_specialchars_output()
	*/
	function Q($str, $mode='strict', $newlines=TRUE)
	{
	return rep_specialchars_output($str, 'html', $mode, $newlines);
	}

	/**
	* Quote a given string for javascript output.
	* Shortcut function for rep_specialchars_output
	*
	* @return string JS-quoted string
	* @see rep_specialchars_output()
	*/
	function JQ($str)
	{
	return rep_specialchars_output($str, 'js');
	}


	/**
	* Read input value and convert it for internal use
	* Performs stripslashes() and charset conversion if necessary
	*
	* @param string Field name to read
	* @param int Source to get value from (GPC)
	* @param boolean Allow HTML tags in field value
	* @param string Charset to convert into
	* @return string Field value or NULL if not available
	*/
	function get_input_value($fname, $source, $allow_html=FALSE, $charset=NULL)
	{
	$value = NULL;

	if ($source == RCUBE_INPUT_GET) {
	if (isset($_GET[$fname]))
	$value = $_GET[$fname];
	}
	else if ($source == RCUBE_INPUT_POST) {
	if (isset($_POST[$fname]))
	$value = $_POST[$fname];
	}
	else if ($source == RCUBE_INPUT_GPC) {
	if (isset($_POST[$fname]))
	$value = $_POST[$fname];
	else if (isset($_GET[$fname]))
	$value = $_GET[$fname];
	else if (isset($_COOKIE[$fname]))
	$value = $_COOKIE[$fname];
	}

	return parse_input_value($value, $allow_html, $charset);
	}

	/**
	* Parse/validate input value. See get_input_value()
	* Performs stripslashes() and charset conversion if necessary
	*
	* @param string Input value
	* @param boolean Allow HTML tags in field value
	* @param string Charset to convert into
	* @return string Parsed value
	*/
	function parse_input_value($value, $allow_html=FALSE, $charset=NULL)
	{
	global $OUTPUT;

	if (empty($value))
	return $value;

	if (is_array($value)) {
	foreach ($value as $idx => $val)
	$value[$idx] = parse_input_value($val, $allow_html, $charset);
	return $value;
	}

	// strip single quotes if magic_quotes_sybase is enabled
	if (ini_get('magic_quotes_sybase'))
	$value = str_replace("''", "'", $value);
	// strip slashes if magic_quotes enabled
	else if (get_magic_quotes_gpc() \|\| get_magic_quotes_runtime())
	$value = stripslashes($value);

	// remove HTML tags if not allowed
	if (!$allow_html)
	$value = strip_tags($value);

	$output_charset = is_object($OUTPUT) ? $OUTPUT->get_charset() : null;

	// remove invalid characters (#1488124)
	if ($output_charset == 'UTF-8')
	$value = rc_utf8_clean($value);

	// convert to internal charset
	if ($charset && $output_charset)
	$value = rcube_charset_convert($value, $output_charset, $charset);

	return $value;
	}

	/**
	* Convert array of request parameters (prefixed with _)
	* to a regular array with non-prefixed keys.
	*
	* @param int Source to get value from (GPC)
	* @return array Hash array with all request parameters
	*/
	function request2param($mode = RCUBE_INPUT_GPC, $ignore = 'task\|action')
	{
	$out = array();
	$src = $mode == RCUBE_INPUT_GET ? $_GET : ($mode == RCUBE_INPUT_POST ? $_POST : $_REQUEST);
	foreach ($src as $key => $value) {
	$fname = $key[0] == '_' ? substr($key, 1) : $key;
	if ($ignore && !preg_match('/^(' . $ignore . ')$/', $fname))
	$out[$fname] = get_input_value($key, $mode);
	}

	return $out;
	}

	/**
	* Remove all non-ascii and non-word chars
	* except ., -, _
	*/
	function asciiwords($str, $css_id = false, $replace_with = '')
	{
	$allowed = 'a-z0-9\_\-' . (!$css_id ? '\.' : '');
	return preg_replace("/[^$allowed]/i", $replace_with, $str);
	}

	/**
	* Convert the given string into a valid HTML identifier
	* Same functionality as done in app.js with rcube_webmail.html_identifier()
	*/
	function html_identifier($str, $encode=false)
	{
	if ($encode)
	return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
	else
	return asciiwords($str, true, '_');
	}

	/**
	* Remove single and double quotes from given string
	*
	* @param string Input value
	* @return string Dequoted string
	*/
	function strip_quotes($str)
	{
	return str_replace(array("'", '"'), '', $str);
	}


	/**
	* Remove new lines characters from given string
	*
	* @param string Input value
	* @return string Stripped string
	*/
	function strip_newlines($str)
	{
	return preg_replace('/[\r\n]/', '', $str);
	}


	/**
	* Create a HTML table based on the given data
	*
	* @param array Named table attributes
	* @param mixed Table row data. Either a two-dimensional array or a valid SQL result set
	* @param array List of cols to show
	* @param string Name of the identifier col
	* @return string HTML table code
	*/
	function rcube_table_output($attrib, $table_data, $a_show_cols, $id_col)
	{
	global $RCMAIL;

	$table = new html_table(/array('cols' => count($a_show_cols))/);

	// add table header
	if (!$attrib['noheader'])
	foreach ($a_show_cols as $col)
	$table->add_header($col, Q(rcube_label($col)));

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

	// format each col
	foreach ($a_show_cols as $col)
	$table->add($col, Q($sql_arr[$col]));

	$c++;
	}
	}
	else {
	foreach ($table_data as $row_data)
	{
	$class = !empty($row_data['class']) ? $row_data['class'] : '';

	$table->add_row(array('id' => 'rcmrow' . html_identifier($row_data[$id_col]), 'class' => $class));

	// format each col
	foreach ($a_show_cols as $col)
	$table->add($col, Q(is_array($row_data[$col]) ? $row_data[$col][0] : $row_data[$col]));

	$c++;
	}
	}

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


	/**
	* Create an edit field for inclusion on a form
	*
	* @param string col field name
	* @param string value field value
	* @param array attrib HTML element attributes for field
	* @param string type HTML element type (default 'text')
	* @return string HTML field definition
	*/
	function rcmail_get_edit_field($col, $value, $attrib, $type='text')
	{
	static $colcounts = array();

	$fname = '_'.$col;
	$attrib['name'] = $fname . ($attrib['array'] ? '[]' : '');
	$attrib['class'] = trim($attrib['class'] . ' ff_' . $col);

	if ($type == 'checkbox') {
	$attrib['value'] = '1';
	$input = new html_checkbox($attrib);
	}
	else if ($type == 'textarea') {
	$attrib['cols'] = $attrib['size'];
	$input = new html_textarea($attrib);
	}
	else if ($type == 'select') {
	$input = new html_select($attrib);
	$input->add('---', '');
	$input->add(array_values($attrib['options']), array_keys($attrib['options']));
	}
	else if ($attrib['type'] == 'password') {
	$input = new html_passwordfield($attrib);
	}
	else {
	if ($attrib['type'] != 'text' && $attrib['type'] != 'hidden')
	$attrib['type'] = 'text';
	$input = new html_inputfield($attrib);
	}

	// use value from post
	if (isset($_POST[$fname])) {
	$postvalue = get_input_value($fname, RCUBE_INPUT_POST, true);
	$value = $attrib['array'] ? $postvalue[intval($colcounts[$col]++)] : $postvalue;
	}

	$out = $input->show($value);

	return $out;
	}


	/**
	* Replace all css definitions with #container [def]
	* and remove css-inlined scripting
	*
	* @param string CSS source code
	* @param string Container ID to use as prefix
	* @return string Modified CSS source
	*/
	function rcmail_mod_css_styles($source, $container_id, $allow_remote=false)
	{
	$last_pos = 0;
	$replacements = new rcube_string_replacer;

	// ignore the whole block if evil styles are detected
	$source = rcmail_xss_entity_decode($source);
	$stripped = preg_replace('/[^a-z\(:;]/i', '', $source);
	$evilexpr = 'expression\|behavior\|javascript:\|import[^a]' . (!$allow_remote ? '\|url\(' : '');
	if (preg_match("/$evilexpr/i", $stripped))
	return '/* evil! */';

	// cut out all contents between { and }
	while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos))) {
	$styles = substr($source, $pos+1, $pos2-($pos+1));

	// check every line of a style block...
	if ($allow_remote) {
	$a_styles = preg_split('/;[\r\n]*/', $styles, -1, PREG_SPLIT_NO_EMPTY);
	foreach ($a_styles as $line) {
	$stripped = preg_replace('/[^a-z\(:;]/i', '', $line);
	// ... and only allow strict url() values
	if (stripos($stripped, 'url(') && !preg_match('!url\s*$[ "\'](https?:)//[a-z0-9/._+-]+["\' ]$!Uims', $line)) {
	$a_styles = array('/* evil! */');
	break;
	}
	}
	$styles = join(";\n", $a_styles);
	}

	$key = $replacements->add($styles);
	$source = substr($source, 0, $pos+1) . $replacements->get_replacement($key) . substr($source, $pos2, strlen($source)-$pos2);
	$last_pos = $pos+2;
	}

	// remove html comments and add #container to each tag selector.
	// also replace body definition because we also stripped off the <body> tag
	$styles = preg_replace(
	array(
	'/(^\s<!--)\|(-->\s$)/',
	'/(^\s\|,\s\|\}\s)([a-z0-9\._#\][a-z0-9\.\-_]*)/im',
	'/'.preg_quote($container_id, '/').'\s+body/i',
	),
	array(
	'',
	"\\1#$container_id \\2",
	$container_id,
	),
	$source);

	// put block contents back in
	$styles = $replacements->resolve($styles);

	return $styles;
	}


	/**
	* Decode escaped entities used by known XSS exploits.
	* See http://downloads.securityfocus.com/vulnerabilities/exploits/26800.eml for examples
	*
	* @param string CSS content to decode
	* @return string Decoded string
	*/
	function rcmail_xss_entity_decode($content)
	{
	$out = html_entity_decode(html_entity_decode($content));
	$out = preg_replace_callback('/\\\([0-9a-f]{4})/i', 'rcmail_xss_entity_decode_callback', $out);
	$out = preg_replace('#/\.\*/#Ums', '', $out);
	return $out;
	}


	/**
	* preg_replace_callback callback for rcmail_xss_entity_decode_callback
	*
	* @param array matches result from preg_replace_callback
	* @return string decoded entity
	*/
	function rcmail_xss_entity_decode_callback($matches)
	{
	return chr(hexdec($matches[1]));
	}

	/**
	* Compose a valid attribute string for HTML tags
	*
	* @param array Named tag attributes
	* @param array List of allowed attributes
	* @return string HTML formatted attribute string
	*/
	function create_attrib_string($attrib, $allowed_attribs=array('id', 'class', 'style'))
	{
	// allow the following attributes to be added to the <iframe> tag
	$attrib_str = '';
	foreach ($allowed_attribs as $a)
	if (isset($attrib[$a]))
	$attrib_str .= sprintf(' %s="%s"', $a, str_replace('"', '"', $attrib[$a]));

	return $attrib_str;
	}


	/**
	* Convert a HTML attribute string attributes to an associative array (name => value)
	*
	* @param string Input string
	* @return array Key-value pairs of parsed attributes
	*/
	function parse_attrib_string($str)
	{
	$attrib = array();
	preg_match_all('/\s([-_a-z]+)=(["\'])??(?(2)([^\2])\2\|(\S+?))/Ui', stripslashes($str), $regs, PREG_SET_ORDER);

	// convert attributes to an associative array (name => value)
	if ($regs) {
	foreach ($regs as $attr) {
	$attrib[strtolower($attr[1])] = html_entity_decode($attr[3] . $attr[4]);
	}
	}

	return $attrib;
	}


	/**
	* Improved equivalent to strtotime()
	*
	* @param string Date string
	* @return int
	*/
	function rcube_strtotime($date)
	{
	// check for MS Outlook vCard date format YYYYMMDD
	if (preg_match('/^([12][90]\d\d)([01]\d)(\d\d)$/', trim($date), $matches)) {
	return mktime(0,0,0, intval($matches[2]), intval($matches[3]), intval($matches[1]));
	}
	else if (is_numeric($date))
	return $date;

	// support non-standard "GMTXXXX" literal
	$date = preg_replace('/GMT\s*([+-][0-9]+)/', '\\1', $date);

	// if date parsing fails, we have a date in non-rfc format.
	// remove token from the end and try again
	while ((($ts = @strtotime($date)) === false) \|\| ($ts < 0)) {
	$d = explode(' ', $date);
	array_pop($d);
	if (!$d) break;
	$date = implode(' ', $d);
	}

	return $ts;
	}


	/**
	* Convert the given date to a human readable form
	* This uses the date formatting properties from config
	*
	* @param mixed Date representation (string or timestamp)
	* @param string Date format to use
	* @param bool Enables date convertion according to user timezone
	*
	* @return string Formatted date string
	*/
	function format_date($date, $format=NULL, $convert=true)
	{
	global $RCMAIL, $CONFIG;

	if (!empty($date))
	$ts = rcube_strtotime($date);

	if (empty($ts))
	return '';

	$date = new DateTime;
	$date->setTimestamp($ts);

	// convert to the right timezone
	$stz = date_default_timezone_get();
	$tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezone') : 'GMT');
	date_default_timezone_set($tz->getName());
	$date->setTimezone($tz);

	$timestamp = $date->getTimestamp();

	// define date format depending on current time
	if (!$format) {
	$now_date = getdate($now);
	$today_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday'], $now_date['year']);
	$week_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday']-6, $now_date['year']);

	if ($CONFIG['prettydate'] && $timestamp > $today_limit && $timestamp < $now) {
	$format = $RCMAIL->config->get('date_today', $RCMAIL->config->get('time_format', 'H:i'));
	$today = true;
	}
	else if ($CONFIG['prettydate'] && $timestamp > $week_limit && $timestamp < $now)
	$format = $RCMAIL->config->get('date_short', 'D H:i');
	else
	$format = $RCMAIL->config->get('date_long', 'Y-m-d H:i');
	}

	// strftime() format
	if (preg_match('/%[a-z]+/i', $format)) {
	$format = strftime($format, $timestamp);
	date_default_timezone_set($stz);
	return $today ? (rcube_label('today') . ' ' . $format) : $format;
	}

	// parse format string manually in order to provide localized weekday and month names
	// an alternative would be to convert the date() format string to fit with strftime()
	$out = '';
	for($i=0; $i<strlen($format); $i++) {
	if ($format[$i]=='\\') // skip escape chars
	continue;

	// write char "as-is"
	if ($format[$i]==' ' \|\| $format{$i-1}=='\\')
	$out .= $format[$i];
	// weekday (short)
	else if ($format[$i]=='D')
	$out .= rcube_label(strtolower($date->format('D')));
	// weekday long
	else if ($format[$i]=='l')
	$out .= rcube_label(strtolower($date->format('l')));
	// month name (short)
	else if ($format[$i]=='M')
	$out .= rcube_label(strtolower($date->format('M')));
	// month name (long)
	else if ($format[$i]=='F')
	$out .= rcube_label('long'.strtolower($date->format('M')));
	else if ($format[$i]=='x')
	$out .= strftime('%x %X', $timestamp);
	else
	$out .= $date->format($format[$i]);
	}

	if ($today) {
	$label = rcube_label('today');
	// replcae $ character with "Today" label (#1486120)
	if (strpos($out, '$') !== false) {
	$out = preg_replace('/\$/', $label, $out, 1);
	}
	else {
	$out = $label . ' ' . $out;
	}
	}

	date_default_timezone_set($stz);
	return $out;
	}


	/**
	* Compose a valid representation of name and e-mail address
	*
	* @param string E-mail address
	* @param string Person name
	* @return string Formatted string
	*/
	function format_email_recipient($email, $name='')
	{
	if ($name && $name != $email) {
	// Special chars as defined by RFC 822 need to in quoted string (or escaped).
	return sprintf('%s <%s>', preg_match('/[\<\>\\\.\[\]@,;:"]/', $name) ? '"'.addcslashes($name, '"').'"' : $name, trim($email));
	}

	return trim($email);
	}


	/**
	* Return the mailboxlist in HTML
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	function rcmail_mailbox_list($attrib)
	{
	global $RCMAIL;
	static $a_mailboxes;

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

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

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

	if ($type=='ul' && !$attrib['id'])
	$attrib['id'] = 'rcmboxlist';

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

	// get mailbox list
	$mbox_name = $RCMAIL->imap->get_mailbox_name();

	// build the folders tree
	if (empty($a_mailboxes)) {
	// get mailbox list
	$a_folders = $RCMAIL->imap->list_mailboxes('', $attrib['folder_name'], $attrib['folder_filter']);
	$delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
	$a_mailboxes = array();

	foreach ($a_folders as $folder)
	rcmail_build_folder_tree($a_mailboxes, $folder, $delimiter);
	}

	// allow plugins to alter the folder tree or to localize folder names
	$hook = $RCMAIL->plugins->exec_hook('render_mailboxlist', array('list' => $a_mailboxes, 'delimiter' => $delimiter));

	if ($type == 'select') {
	$select = new html_select($attrib);

	// add no-selection option
	if ($attrib['noselection'])
	$select->add(rcube_label($attrib['noselection']), '');

	rcmail_render_folder_tree_select($hook['list'], $mbox_name, $attrib['maxlength'], $select, $attrib['realnames']);
	$out = $select->show();
	}
	else {
	$js_mailboxlist = array();
	$out = html::tag('ul', $attrib, rcmail_render_folder_tree_html($hook['list'], $mbox_name, $js_mailboxlist, $attrib), html::$common_attrib);

	$RCMAIL->output->add_gui_object('mailboxlist', $attrib['id']);
	$RCMAIL->output->set_env('mailboxes', $js_mailboxlist);
	$RCMAIL->output->set_env('unreadwrap', $attrib['unreadwrap']);
	$RCMAIL->output->set_env('collapsed_folders', (string)$RCMAIL->config->get('collapsed_folders'));
	}

	return $out;
	}


	/**
	* Return the mailboxlist as html_select object
	*
	* @param array Named parameters
	* @return html_select HTML drop-down object
	*/
	function rcmail_mailbox_select($p = array())
	{
	global $RCMAIL;

	$p += array('maxlength' => 100, 'realnames' => false);
	$a_mailboxes = array();

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

	if ($p['unsubscribed'])
	$list = $RCMAIL->imap->list_unsubscribed('', $p['folder_name'], $p['folder_filter'], $p['folder_rights']);
	else
	$list = $RCMAIL->imap->list_mailboxes('', $p['folder_name'], $p['folder_filter'], $p['folder_rights']);

	$delimiter = $RCMAIL->imap->get_hierarchy_delimiter();

	foreach ($list as $folder) {
	if (empty($p['exceptions']) \|\| !in_array($folder, $p['exceptions']))
	rcmail_build_folder_tree($a_mailboxes, $folder, $delimiter);
	}

	$select = new html_select($p);

	if ($p['noselection'])
	$select->add($p['noselection'], '');

	rcmail_render_folder_tree_select($a_mailboxes, $mbox, $p['maxlength'], $select, $p['realnames'], 0, $p);

	return $select;
	}


	/**
	* Create a hierarchical array of the mailbox list
	* @access private
	* @return void
	*/
	function rcmail_build_folder_tree(&$arrFolders, $folder, $delm='/', $path='')
	{
	global $RCMAIL;

	// Handle namespace prefix
	$prefix = '';
	if (!$path) {
	$n_folder = $folder;
	$folder = $RCMAIL->imap->mod_mailbox($folder);

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

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

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

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

	$path .= $prefix.$currentFolder;

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

	if (strlen($subFolders))
	rcmail_build_folder_tree($arrFolders[$currentFolder]['folders'], $subFolders, $delm, $path.$delm);
	}


	/**
	* Return html for a structured list <ul> for the mailbox tree
	* @access private
	* @return string
	*/
	function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel=0)
	{
	global $RCMAIL, $CONFIG;

	$maxlength = intval($attrib['maxlength']);
	$realnames = (bool)$attrib['realnames'];
	$msgcounts = $RCMAIL->imap->get_cache('messagecount');

	$out = '';
	foreach ($arrFolders as $key => $folder) {
	$title = null;
	$folder_class = rcmail_folder_classname($folder['id']);
	$collapsed = strpos($CONFIG['collapsed_folders'], '&'.rawurlencode($folder['id']).'&') !== false;
	$unread = $msgcounts ? intval($msgcounts[$folder['id']]['UNSEEN']) : 0;

	if ($folder_class && !$realnames) {
	$foldername = rcube_label($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 = html_identifier($folder['id'], true);
	$classes = array('mailbox');

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

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

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

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

	$out .= html::tag('li', array(
	'id' => "rcmli".$folder_id,
	'class' => join(' ', $classes),
	'noclose' => true),
	html::a($link_attrib, $html_name) .
	(!empty($folder['folders']) ? html::div(array(
	'class' => ($collapsed ? 'collapsed' : 'expanded'),
	'style' => "position:absolute",
	'onclick' => sprintf("%s.command('collapse-folder', '%s')", JS_OBJECT_NAME, $js_name)
	), ' ') : ''));

	$jslist[$folder_id] = array('id' => $folder['id'], 'name' => $foldername, 'virtual' => $folder['virtual']);

	if (!empty($folder['folders'])) {
	$out .= html::tag('ul', array('style' => ($collapsed ? "display:none;" : null)),
	rcmail_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
	* @access private
	* @return string
	*/
	function rcmail_render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames=false, $nestLevel=0, $opts=array())
	{
	global $RCMAIL;

	$out = '';

	foreach ($arrFolders as $key => $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 = $RCMAIL->imap->mailbox_attributes($folder['id']))
	&& in_array('\\Noinferiors', $attrs)
	) {
	continue;
	}

	if (!$realnames && ($folder_class = rcmail_folder_classname($folder['id'])))
	$foldername = rcube_label($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) . $foldername, $folder['id']);

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

	return $out;
	}


	/**
	* Return internal name for the given folder if it matches the configured special folders
	* @access private
	* @return string
	*/
	function rcmail_folder_classname($folder_id)
	{
	global $CONFIG;

	if ($folder_id == 'INBOX')
	return 'inbox';

	// for these mailboxes we have localized labels and css classes
	foreach (array('sent', 'drafts', 'trash', 'junk') as $smbx)
	{
	if ($folder_id == $CONFIG[$smbx.'_mbox'])
	return $smbx;
	}
	}


	/**
	* Try to localize the given IMAP folder name.
	* UTF-7 decode it in case no localized text was found
	*
	* @param string Folder name
	* @return string Localized folder name in UTF-8 encoding
	*/
	function rcmail_localize_foldername($name)
	{
	if ($folder_class = rcmail_folder_classname($name))
	return rcube_label($folder_class);
	else
	return rcube_charset_convert($name, 'UTF7-IMAP');
	}


	function rcmail_localize_folderpath($path)
	{
	global $RCMAIL;

	$protect_folders = $RCMAIL->config->get('protect_default_folders');
	$default_folders = (array) $RCMAIL->config->get('default_imap_folders');
	$delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
	$path = explode($delimiter, $path);
	$result = array();

	foreach ($path as $idx => $dir) {
	$directory = implode($delimiter, array_slice($path, 0, $idx+1));
	if ($protect_folders && in_array($directory, $default_folders)) {
	unset($result);
	$result[] = rcmail_localize_foldername($directory);
	}
	else {
	$result[] = rcube_charset_convert($dir, 'UTF7-IMAP');
	}
	}

	return implode($delimiter, $result);
	}


	function rcmail_quota_display($attrib)
	{
	global $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmquotadisplay';

	if(isset($attrib['display']))
	$_SESSION['quota_display'] = $attrib['display'];

	$OUTPUT->add_gui_object('quotadisplay', $attrib['id']);

	$quota = rcmail_quota_content($attrib);

	$OUTPUT->add_script('rcmail.set_quota('.json_serialize($quota).');', 'docready');

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


	function rcmail_quota_content($attrib=NULL)
	{
	global $RCMAIL;

	$quota = $RCMAIL->imap->get_quota();
	$quota = $RCMAIL->plugins->exec_hook('quota', $quota);

	$quota_result = (array) $quota;
	$quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';

	if (!$quota['total'] && $RCMAIL->config->get('quota_zero_as_unlimited')) {
	$quota_result['title'] = rcube_label('unlimited');
	$quota_result['percent'] = 0;
	}
	else if ($quota['total']) {
	if (!isset($quota['percent']))
	$quota_result['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100));

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

	$quota_result['title'] = $title;

	if ($attrib['width'])
	$quota_result['width'] = $attrib['width'];
	if ($attrib['height'])
	$quota_result['height'] = $attrib['height'];
	}
	else {
	$quota_result['title'] = rcube_label('unknown');
	$quota_result['percent'] = 0;
	}

	return $quota_result;
	}


	/**
	* Outputs error message according to server error/response codes
	*
	* @param string Fallback message label
	* @param string Fallback message label arguments
	*
	* @return void
	*/
	function rcmail_display_server_error($fallback=null, $fallback_args=null)
	{
	global $RCMAIL;

	$err_code = $RCMAIL->imap->get_error_code();
	$res_code = $RCMAIL->imap->get_response_code();

	if ($res_code == rcube_imap::NOPERM) {
	$RCMAIL->output->show_message('errornoperm', 'error');
	}
	else if ($res_code == rcube_imap::READONLY) {
	$RCMAIL->output->show_message('errorreadonly', 'error');
	}
	else if ($err_code && ($err_str = $RCMAIL->imap->get_error_str())) {
	// try to detect access rights problem and display appropriate message
	if (stripos($err_str, 'Permission denied') !== false)
	$RCMAIL->output->show_message('errornoperm', 'error');
	else
	$RCMAIL->output->show_message('servererrormsg', 'error', array('msg' => $err_str));
	}
	else if ($fallback) {
	$RCMAIL->output->show_message($fallback, 'error', $fallback_args);
	}

	return true;
	}


	/**
	* Generate CSS classes from mimetype and filename extension
	*
	* @param string Mimetype
	* @param string The filename
	* @return string CSS classes separated by space
	*/
	function rcmail_filetype2classname($mimetype, $filename)
	{
	list($primary, $secondary) = explode('/', $mimetype);

	$classes = array($primary ? $primary : 'unknown');
	if ($secondary)
	$classes[] = $secondary;
	if (preg_match('/\.([a-z0-9]+)$/', $filename, $m))
	$classes[] = $m[1];

	return join(" ", $classes);
	}

	/**
	* Output HTML editor scripts
	*
	* @param string Editor mode
	* @return void
	*/
	function rcube_html_editor($mode='')
	{
	global $RCMAIL;

	$hook = $RCMAIL->plugins->exec_hook('html_editor', array('mode' => $mode));

	if ($hook['abort'])
	return;

	$lang = strtolower($_SESSION['language']);

	// TinyMCE uses two-letter lang codes, with exception of Chinese
	if (strpos($lang, 'zh_') === 0)
	$lang = str_replace('_', '-', $lang);
	else
	$lang = substr($lang, 0, 2);

	if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$lang.'.js'))
	$lang = 'en';

	$RCMAIL->output->include_script('tiny_mce/tiny_mce.js');
	$RCMAIL->output->include_script('editor.js');
	$RCMAIL->output->add_script(sprintf("rcmail_editor_init(%s)",
	json_encode(array(
	'mode' => $mode,
	'skin_path' => '$__skin_path',
	'lang' => $lang,
	'spellcheck' => intval($RCMAIL->config->get('enable_spellcheck')),
	'spelldict' => intval($RCMAIL->config->get('spellcheck_dictionary')),
	))), 'foot');
	}


	/**
	* Replaces TinyMCE's emoticon images with plain-text representation
	*
	* @param string HTML content
	* @return string HTML content
	*/
	function rcmail_replace_emoticons($html)
	{
	$emoticons = array(
	'8-)' => 'smiley-cool',
	':-#' => 'smiley-foot-in-mouth',
	':-*' => 'smiley-kiss',
	':-X' => 'smiley-sealed',
	':-P' => 'smiley-tongue-out',
	':-@' => 'smiley-yell',
	":'(" => 'smiley-cry',
	':-(' => 'smiley-frown',
	':-D' => 'smiley-laughing',
	':-)' => 'smiley-smile',
	':-S' => 'smiley-undecided',
	':-$' => 'smiley-embarassed',
	'O:-)' => 'smiley-innocent',
	':-\|' => 'smiley-money-mouth',
	':-O' => 'smiley-surprised',
	';-)' => 'smiley-wink',
	);

	foreach ($emoticons as $idx => $file) {
	// <img title="Cry" src="http://.../program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif" border="0" alt="Cry" />
	$search[] = '/<img title="[a-z ]+" src="https?:\/\/[a-z0-9_.\/-]+\/tiny_mce\/plugins\/emotions\/img\/'.$file.'.gif"[^>]+\/>/i';
	$replace[] = $idx;
	}

	return preg_replace($search, $replace, $html);
	}


	/**
	* Send the given message using the configured method
	*
	* @param object $message Reference to Mail_MIME object
	* @param string $from Sender address string
	* @param array $mailto Array of recipient address strings
	* @param array $smtp_error SMTP error array (reference)
	* @param string $body_file Location of file with saved message body (reference),
	* used when delay_file_io is enabled
	* @param array $smtp_opts SMTP options (e.g. DSN request)
	*
	* @return boolean Send status.
	*/
	function rcmail_deliver_message(&$message, $from, $mailto, &$smtp_error, &$body_file=null, $smtp_opts=null)
	{
	global $CONFIG, $RCMAIL;

	$headers = $message->headers();

	// send thru SMTP server using custom SMTP library
	if ($CONFIG['smtp_server']) {
	// generate list of recipients
	$a_recipients = array($mailto);

	if (strlen($headers['Cc']))
	$a_recipients[] = $headers['Cc'];
	if (strlen($headers['Bcc']))
	$a_recipients[] = $headers['Bcc'];

	// clean Bcc from header for recipients
	$send_headers = $headers;
	unset($send_headers['Bcc']);
	// here too, it because txtHeaders() below use $message->_headers not only $send_headers
	unset($message->_headers['Bcc']);

	$smtp_headers = $message->txtHeaders($send_headers, true);

	if ($message->getParam('delay_file_io')) {
	// use common temp dir
	$temp_dir = $RCMAIL->config->get('temp_dir');
	$body_file = tempnam($temp_dir, 'rcmMsg');
	if (PEAR::isError($mime_result = $message->saveMessageBody($body_file))) {
	raise_error(array('code' => 650, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not create message: ".$mime_result->getMessage()),
	TRUE, FALSE);
	return false;
	}
	$msg_body = fopen($body_file, 'r');
	} else {
	$msg_body = $message->get();
	}

	// send message
	if (!is_object($RCMAIL->smtp))
	$RCMAIL->smtp_init(true);

	$sent = $RCMAIL->smtp->send_mail($from, $a_recipients, $smtp_headers, $msg_body, $smtp_opts);
	$smtp_response = $RCMAIL->smtp->get_response();
	$smtp_error = $RCMAIL->smtp->get_error();

	// log error
	if (!$sent)
	raise_error(array('code' => 800, 'type' => 'smtp', 'line' => __LINE__, 'file' => __FILE__,
	'message' => "SMTP error: ".join("\n", $smtp_response)), TRUE, FALSE);
	}
	// send mail using PHP's mail() function
	else {
	// unset some headers because they will be added by the mail() function
	$headers_enc = $message->headers($headers);
	$headers_php = $message->_headers;
	unset($headers_php['To'], $headers_php['Subject']);

	// reset stored headers and overwrite
	$message->_headers = array();
	$header_str = $message->txtHeaders($headers_php);

	// #1485779
	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
	if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) {
	$headers_enc['To'] = implode(', ', $m[1]);
	}
	}

	$msg_body = $message->get();

	if (PEAR::isError($msg_body))
	raise_error(array('code' => 650, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not create message: ".$msg_body->getMessage()),
	TRUE, FALSE);
	else {
	$delim = $RCMAIL->config->header_delimiter();
	$to = $headers_enc['To'];
	$subject = $headers_enc['Subject'];
	$header_str = rtrim($header_str);

	if ($delim != "\r\n") {
	$header_str = str_replace("\r\n", $delim, $header_str);
	$msg_body = str_replace("\r\n", $delim, $msg_body);
	$to = str_replace("\r\n", $delim, $to);
	$subject = str_replace("\r\n", $delim, $subject);
	}

	if (ini_get('safe_mode'))
	$sent = mail($to, $subject, $msg_body, $header_str);
	else
	$sent = mail($to, $subject, $msg_body, $header_str, "-f$from");
	}
	}

	if ($sent) {
	$RCMAIL->plugins->exec_hook('message_sent', array('headers' => $headers, 'body' => $msg_body));

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

	// get all recipients
	if ($headers['Cc'])
	$mailto .= $headers['Cc'];
	if ($headers['Bcc'])
	$mailto .= $headers['Bcc'];
	if (preg_match_all('/<([^@]+@[^>]+)>/', $mailto, $m))
	$mailto = implode(', ', array_unique($m[1]));

	if ($CONFIG['smtp_log']) {
	write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s",
	$RCMAIL->user->get_username(),
	$_SERVER['REMOTE_ADDR'],
	$mailto,
	!empty($smtp_response) ? join('; ', $smtp_response) : ''));
	}
	}

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

	$message->_headers = array();
	$message->headers($headers);

	return $sent;
	}


	// Returns unique Message-ID
	function rcmail_gen_message_id()
	{
	global $RCMAIL;

	$local_part = md5(uniqid('rcmail'.mt_rand(),true));
	$domain_part = $RCMAIL->user->get_username('domain');

	// Try to find FQDN, some spamfilters doesn't like 'localhost' (#1486924)
	if (!preg_match('/\.[a-z]+$/i', $domain_part)) {
	if (($host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']))
	&& preg_match('/\.[a-z]+$/i', $host)) {
	$domain_part = $host;
	}
	else if (($host = preg_replace('/:[0-9]+$/', '', $_SERVER['SERVER_NAME']))
	&& preg_match('/\.[a-z]+$/i', $host)) {
	$domain_part = $host;
	}
	}

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


	// Returns RFC2822 formatted current date in user's timezone
	function rcmail_user_date()
	{
	global $RCMAIL;

	// get user's timezone
	$tz = new DateTimeZone($RCMAIL->config->get('timezone'));

	$date = new DateTime('now', $tz);
	return $date->format('r');
	}


	/**
	* Check if we can process not exceeding memory_limit
	*
	* @param integer Required amount of memory
	* @return boolean
	*/
	function rcmail_mem_check($need)
	{
	$mem_limit = parse_bytes(ini_get('memory_limit'));
	$memory = function_exists('memory_get_usage') ? memory_get_usage() : 1610241024; // safe value: 16MB

	return $mem_limit && $memory + $need > $mem_limit ? false : true;
	}


	/**
	* Check if working in SSL mode
	*
	* @param integer HTTPS port number
	* @param boolean Enables 'use_https' option checking
	* @return boolean
	*/
	function rcube_https_check($port=null, $use_https=true)
	{
	global $RCMAIL;

	if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off')
	return true;
	if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https')
	return true;
	if ($port && $_SERVER['SERVER_PORT'] == $port)
	return true;
	if ($use_https && isset($RCMAIL) && $RCMAIL->config->get('use_https'))
	return true;

	return false;
	}


	/**
	* For backward compatibility.
	*
	* @global rcmail $RCMAIL
	* @param string $var_name Variable name.
	* @return void
	*/
	function rcube_sess_unset($var_name=null)
	{
	global $RCMAIL;

	$RCMAIL->session->remove($var_name);
	}


	/**
	* Replaces hostname variables
	*
	* @param string $name Hostname
	* @param string $host Optional IMAP hostname
	* @return string
	*/
	function rcube_parse_host($name, $host='')
	{
	// %n - host
	$n = preg_replace('/:\d+$/', '', $_SERVER['SERVER_NAME']);
	// %d - domain name without first part, e.g. %n=mail.domain.tld, %d=domain.tld
	$d = preg_replace('/^[^\.]+\./', '', $n);
	// %h - IMAP host
	$h = $_SESSION['imap_host'] ? $_SESSION['imap_host'] : $host;
	// %z - IMAP domain without first part, e.g. %h=imap.domain.tld, %z=domain.tld
	$z = preg_replace('/^[^\.]+\./', '', $h);
	// %s - domain name after the '@' from e-mail address provided at login screen. Returns FALSE if an invalid email is provided
	if ( strpos($name, '%s') !== false ){
	$user_email = rcube_idn_convert(get_input_value('_user', RCUBE_INPUT_POST), true);
	if ( preg_match('/(.*)@([a-z0-9\.\-\[\]\:]+)/i', $user_email, $s) < 1 \|\| filter_var($s[1]."@".$s[2], FILTER_VALIDATE_EMAIL) === false )
	return false;
	}

	$name = str_replace(array('%n', '%d', '%h', '%z', '%s'), array($n, $d, $h, $z, $s[2]), $name);
	return $name;
	}


	/**
	* E-mail address validation
	*
	* @param string $email Email address
	* @param boolean $dns_check True to check dns
	* @return boolean
	*/
	function check_email($email, $dns_check=true)
	{
	// Check for invalid characters
	if (preg_match('/[\x00-\x1F\x7F-\xFF]/', $email))
	return false;

	// Check for length limit specified by RFC 5321 (#1486453)
	if (strlen($email) > 254)
	return false;

	$email_array = explode('@', $email);

	// Check that there's one @ symbol
	if (count($email_array) < 2)
	return false;

	$domain_part = array_pop($email_array);
	$local_part = implode('@', $email_array);

	// from PEAR::Validate
	$regexp = '&^(?:
	("\s(?:[^"\f\n\r\t\v\b\s]+\s)+")\| #1 quoted name
	([-\w!\#\$%\&\'+~/^`\|{}=]+(?:\.[-\w!\#\$%\&\'+~/^`\|{}=]+)*)) #2 OR dot-atom (RFC5322)
	$&xi';

	if (!preg_match($regexp, $local_part))
	return false;

	// Check domain part
	if (preg_match('/^\[(25[0-5]\|2[0-4][0-9]\|1[0-9][0-9]\|[1-9]?[0-9])(\.(25[0-5]\|2[0-4][0-9]\|1[0-9][0-9]\|[1-9]?[0-9])){3}\]$/', $domain_part))
	return true; // IP address
	else {
	// If not an IP address
	$domain_array = explode('.', $domain_part);
	if (sizeof($domain_array) < 2)
	return false; // Not enough parts to be a valid domain

	foreach ($domain_array as $part)
	if (!preg_match('/^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])\|([A-Za-z0-9]))$/', $part))
	return false;

	if (!$dns_check \|\| !rcmail::get_instance()->config->get('email_dns_check'))
	return true;

	if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' && version_compare(PHP_VERSION, '5.3.0', '<')) {
	$lookup = array();
	@exec("nslookup -type=MX " . escapeshellarg($domain_part) . " 2>&1", $lookup);
	foreach ($lookup as $line) {
	if (strpos($line, 'MX preference'))
	return true;
	}
	return false;
	}

	// find MX record(s)
	if (getmxrr($domain_part, $mx_records))
	return true;

	// find any DNS record
	if (checkdnsrr($domain_part, 'ANY'))
	return true;
	}

	return false;
	}

	/*
	* Idn_to_ascii wrapper.
	* Intl/Idn modules version of this function doesn't work with e-mail address
	*/
	function rcube_idn_to_ascii($str)
	{
	return rcube_idn_convert($str, true);
	}

	/*
	* Idn_to_ascii wrapper.
	* Intl/Idn modules version of this function doesn't work with e-mail address
	*/
	function rcube_idn_to_utf8($str)
	{
	return rcube_idn_convert($str, false);
	}

	function rcube_idn_convert($input, $is_utf=false)
	{
	if ($at = strpos($input, '@')) {
	$user = substr($input, 0, $at);
	$domain = substr($input, $at+1);
	}
	else {
	$domain = $input;
	}

	$domain = $is_utf ? idn_to_ascii($domain) : idn_to_utf8($domain);

	if ($domain === false) {
	return '';
	}

	return $at ? $user . '@' . $domain : $domain;
	}


	/**
	* Helper class to turn relative urls into absolute ones
	* using a predefined base
	*/
	class rcube_base_replacer
	{
	private $base_url;

	public function __construct($base)
	{
	$this->base_url = $base;
	}

	public function callback($matches)
	{
	- return $matches[1] . '="' . make_absolute_url($matches[3], $this->base_url) . '"';
	+ return $matches[1] . '="' . self::absolute_url($matches[3], $this->base_url) . '"';
	+ }
	+
	+ public function replace($body)
	+ {
	+ return preg_replace_callback(array(
	+ '/(src\|background\|href)=(["\']?)([^"\'\s]+)(\2\|\s\|>)/Ui',
	+ '/(url\s*$)(["\']?)([^"\'$\s]+)(\2)\)/Ui',
	+ ),
	+ array($this, 'callback'), $body);
	+ }
	+
	+ /**
	+ * Convert paths like ../xxx to an absolute path using a base url
	+ *
	+ * @param string $path Relative path
	+ * @param string $base_url Base URL
	+ *
	+ * @return string Absolute URL
	+ */
	+ public static function absolute_url($path, $base_url)
	+ {
	+ $host_url = $base_url;
	+ $abs_path = $path;
	+
	+ // check if path is an absolute URL
	+ if (preg_match('/^[fhtps]+:\/\//', $path)) {
	+ return $path;
	+ }
	+
	+ // check if path is a content-id scheme
	+ if (strpos($path, 'cid:') === 0) {
	+ return $path;
	+ }
	+
	+ // cut base_url to the last directory
	+ if (strrpos($base_url, '/') > 7) {
	+ $host_url = substr($base_url, 0, strpos($base_url, '/', 7));
	+ $base_url = substr($base_url, 0, strrpos($base_url, '/'));
	+ }
	+
	+ // $path is absolute
	+ if ($path[0] == '/') {
	+ $abs_path = $host_url.$path;
	+ }
	+ else {
	+ // strip './' because its the same as ''
	+ $path = preg_replace('/^\.\//', '', $path);
	+
	+ if (preg_match_all('/\.\.\//', $path, $matches, PREG_SET_ORDER)) {
	+ foreach ($matches as $a_match) {
	+ if (strrpos($base_url, '/')) {
	+ $base_url = substr($base_url, 0, strrpos($base_url, '/'));
	+ }
	+ $path = substr($path, 3);
	+ }
	+ }
	+
	+ $abs_path = $base_url.'/'.$path;
	+ }
	+
	+ return $abs_path;
	}
	}


	/**** debugging and logging functions ******/

	/**
	* Print or write debug messages
	*
	* @param mixed Debug message or data
	* @return void
	*/
	function console()
	{
	$args = func_get_args();

	if (class_exists('rcmail', false)) {
	$rcmail = rcmail::get_instance();
	if (is_object($rcmail->plugins)) {
	$plugin = $rcmail->plugins->exec_hook('console', array('args' => $args));
	if ($plugin['abort'])
	return;
	$args = $plugin['args'];
	}
	}

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

	write_log('console', join(";\n", $msg));
	}


	/**
	* Append a line to a logfile in the logs directory.
	* Date will be added automatically to the line.
	*
	* @param $name name of log file
	* @param line Line to append
	* @return void
	*/
	function write_log($name, $line)
	{
	global $CONFIG, $RCMAIL;

	if (!is_string($line))
	$line = var_export($line, true);

	if (empty($CONFIG['log_date_format']))
	$CONFIG['log_date_format'] = 'd-M-Y H:i:s O';

	$date = date($CONFIG['log_date_format']);

	// trigger logging hook
	if (is_object($RCMAIL) && is_object($RCMAIL->plugins)) {
	$log = $RCMAIL->plugins->exec_hook('write_log', array('name' => $name, 'date' => $date, 'line' => $line));
	$name = $log['name'];
	$line = $log['line'];
	$date = $log['date'];
	if ($log['abort'])
	return true;
	}

	if ($CONFIG['log_driver'] == 'syslog') {
	$prio = $name == 'errors' ? LOG_ERR : LOG_INFO;
	syslog($prio, $line);
	return true;
	}
	else {
	$line = sprintf("[%s]: %s\n", $date, $line);

	// log_driver == 'file' is assumed here
	if (empty($CONFIG['log_dir']))
	$CONFIG['log_dir'] = INSTALL_PATH.'logs';

	// try to open specific log file for writing
	$logfile = $CONFIG['log_dir'].'/'.$name;
	if ($fp = @fopen($logfile, 'a')) {
	fwrite($fp, $line);
	fflush($fp);
	fclose($fp);
	return true;
	}
	else
	trigger_error("Error writing to log file $logfile; Please check permissions", E_USER_WARNING);
	}

	return false;
	}


	/**
	* Write login data (name, ID, IP address) to the 'userlogins' log file.
	*
	* @return void
	*/
	function rcmail_log_login()
	{
	global $RCMAIL;

	if (!$RCMAIL->config->get('log_logins') \|\| !$RCMAIL->user)
	return;

	write_log('userlogins', sprintf('Successful login for %s (ID: %d) from %s in session %s',
	$RCMAIL->user->get_username(), $RCMAIL->user->ID, rcmail_remote_ip(), session_id()));
	}


	/**
	* Returns remote IP address and forwarded addresses if found
	*
	* @return string Remote IP address(es)
	*/
	function rcmail_remote_ip()
	{
	$address = $_SERVER['REMOTE_ADDR'];

	// append the NGINX X-Real-IP header, if set
	if (!empty($_SERVER['HTTP_X_REAL_IP'])) {
	$remote_ip[] = 'X-Real-IP: ' . $_SERVER['HTTP_X_REAL_IP'];
	}
	// append the X-Forwarded-For header, if set
	if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
	$remote_ip[] = 'X-Forwarded-For: ' . $_SERVER['HTTP_X_FORWARDED_FOR'];
	}

	if (!empty($remote_ip))
	$address .= '(' . implode(',', $remote_ip) . ')';

	return $address;
	}


	/**
	* Check whether the HTTP referer matches the current request
	*
	* @return boolean True if referer is the same host+path, false if not
	*/
	function rcube_check_referer()
	{
	$uri = parse_url($_SERVER['REQUEST_URI']);
	$referer = parse_url(rc_request_header('Referer'));
	return $referer['host'] == rc_request_header('Host') && $referer['path'] == $uri['path'];
	}


	/**
	* @access private
	* @return mixed
	*/
	function rcube_timer()
	{
	return microtime(true);
	}


	/**
	* @access private
	* @return void
	*/
	function rcube_print_time($timer, $label='Timer', $dest='console')
	{
	static $print_count = 0;

	$print_count++;
	$now = rcube_timer();
	$diff = $now-$timer;

	if (empty($label))
	$label = 'Timer '.$print_count;

	write_log($dest, sprintf("%s: %0.4f sec", $label, $diff));
	}


	/**
	* Throw system error and show error page
	*
	* @param array Named parameters
	* - code: Error code (required)
	* - type: Error type [php\|db\|imap\|javascript] (required)
	* - message: Error message
	* - file: File where error occured
	* - line: Line where error occured
	* @param boolean True to log the error
	* @param boolean Terminate script execution
	*/
	// may be defined in Installer
	if (!function_exists('raise_error')) {
	function raise_error($arg=array(), $log=false, $terminate=false)
	{
	global $__page_content, $CONFIG, $OUTPUT, $ERROR_CODE, $ERROR_MESSAGE;

	// report bug (if not incompatible browser)
	if ($log && $arg['type'] && $arg['message'])
	rcube_log_bug($arg);

	// display error page and terminate script
	if ($terminate) {
	$ERROR_CODE = $arg['code'];
	$ERROR_MESSAGE = $arg['message'];
	include INSTALL_PATH . 'program/steps/utils/error.inc';
	exit;
	}
	}
	}


	/**
	* Report error according to configured debug_level
	*
	* @param array Named parameters
	* @return void
	* @see raise_error()
	*/
	function rcube_log_bug($arg_arr)
	{
	global $CONFIG;

	$program = strtoupper($arg_arr['type']);
	$level = $CONFIG['debug_level'];

	// disable errors for ajax requests, write to log instead (#1487831)
	if (($level & 4) && !empty($_REQUEST['_remote'])) {
	$level = ($level ^ 4) \| 1;
	}

	// write error to local log file
	if ($level & 1) {
	$post_query = ($_SERVER['REQUEST_METHOD'] == 'POST' ? '?_task='.urlencode($_POST['_task']).'&_action='.urlencode($_POST['_action']) : '');
	$log_entry = sprintf("%s Error: %s%s (%s %s)",
	$program,
	$arg_arr['message'],
	$arg_arr['file'] ? sprintf(' in %s on line %d', $arg_arr['file'], $arg_arr['line']) : '',
	$_SERVER['REQUEST_METHOD'],
	$_SERVER['REQUEST_URI'] . $post_query);

	if (!write_log('errors', $log_entry)) {
	// send error to PHPs error handler if write_log didn't succeed
	trigger_error($arg_arr['message']);
	}
	}

	// report the bug to the global bug reporting system
	if ($level & 2) {
	// TODO: Send error via HTTP
	}

	// show error if debug_mode is on
	if ($level & 4) {
	print "<b>$program Error";

	if (!empty($arg_arr['file']) && !empty($arg_arr['line']))
	print " in $arg_arr[file] ($arg_arr[line])";

	print ':</b> ';
	print nl2br($arg_arr['message']);
	print '<br />';
	flush();
	}
	}

	function rcube_upload_progress()
	{
	global $RCMAIL;

	$prefix = ini_get('apc.rfc1867_prefix');
	$params = array(
	'action' => $RCMAIL->action,
	'name' => get_input_value('_progress', RCUBE_INPUT_GET),
	);

	if (function_exists('apc_fetch')) {
	$status = apc_fetch($prefix . $params['name']);

	if (!empty($status)) {
	$status['percent'] = round($status['current']/$status['total']*100);
	$params = array_merge($status, $params);
	}
	}

	if (isset($params['percent']))
	$params['text'] = rcube_label(array('name' => 'uploadprogress', 'vars' => array(
	'percent' => $params['percent'] . '%',
	'current' => show_bytes($params['current']),
	'total' => show_bytes($params['total'])
	)));

	$RCMAIL->output->command('upload_progress_update', $params);
	$RCMAIL->output->send();
	}

	function rcube_upload_init()
	{
	global $RCMAIL;

	// Enable upload progress bar
	if (($seconds = $RCMAIL->config->get('upload_progress')) && ini_get('apc.rfc1867')) {
	if ($field_name = ini_get('apc.rfc1867_name')) {
	$RCMAIL->output->set_env('upload_progress_name', $field_name);
	$RCMAIL->output->set_env('upload_progress_time', (int) $seconds);
	}
	}

	// find max filesize value
	$max_filesize = parse_bytes(ini_get('upload_max_filesize'));
	$max_postsize = parse_bytes(ini_get('post_max_size'));
	if ($max_postsize && $max_postsize < $max_filesize)
	$max_filesize = $max_postsize;

	$RCMAIL->output->set_env('max_filesize', $max_filesize);
	$max_filesize = show_bytes($max_filesize);
	$RCMAIL->output->set_env('filesizeerror', rcube_label(array(
	'name' => 'filesizeerror', 'vars' => array('size' => $max_filesize))));

	return $max_filesize;
	}

	/**
	* Initializes client-side autocompletion
	*/
	function rcube_autocomplete_init()
	{
	global $RCMAIL;
	static $init;

	if ($init)
	return;

	$init = 1;

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

	function rcube_fontdefs($font = null)
	{
	$fonts = array(
	'Andale Mono' => '"Andale Mono",Times,monospace',
	'Arial' => 'Arial,Helvetica,sans-serif',
	'Arial Black' => '"Arial Black","Avant Garde",sans-serif',
	'Book Antiqua' => '"Book Antiqua",Palatino,serif',
	'Courier New' => '"Courier New",Courier,monospace',
	'Georgia' => 'Georgia,Palatino,serif',
	'Helvetica' => 'Helvetica,Arial,sans-serif',
	'Impact' => 'Impact,Chicago,sans-serif',
	'Tahoma' => 'Tahoma,Arial,Helvetica,sans-serif',
	'Terminal' => 'Terminal,Monaco,monospace',
	'Times New Roman' => '"Times New Roman",Times,serif',
	'Trebuchet MS' => '"Trebuchet MS",Geneva,sans-serif',
	'Verdana' => 'Verdana,Geneva,sans-serif',
	);

	if ($font)
	return $fonts[$font];

	return $fonts;
	}
	diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
	index abaa8aa03..aef08341d 100644
	--- a/program/include/rcube_shared.inc
	+++ b/program/include/rcube_shared.inc
	@@ -1,710 +1,664 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| rcube_shared.inc \|
	\| \|
	\| This file is part of the Roundcube PHP suite \|
	\| Copyright (C) 2005-2007, The Roundcube Dev Team \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| CONTENTS: \|
	\| Shared functions and classes used in PHP projects \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/


	/**
	* Roundcube shared functions
	*
	* @package Core
	*/


	/**
	* Send HTTP headers to prevent caching this page
	*/
	function send_nocacheing_headers()
	{
	global $OUTPUT;

	if (headers_sent())
	return;

	header("Expires: ".gmdate("D, d M Y H:i:s")." GMT");
	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
	// Request browser to disable DNS prefetching (CVE-2010-0464)
	header("X-DNS-Prefetch-Control: off");

	// We need to set the following headers to make downloads work using IE in HTTPS mode.
	if ($OUTPUT->browser->ie && rcube_https_check()) {
	header('Pragma: private');
	header("Cache-Control: private, must-revalidate");
	} else {
	header("Cache-Control: private, no-cache, must-revalidate, post-check=0, pre-check=0");
	header("Pragma: no-cache");
	}
	}


	/**
	* Send header with expire date 30 days in future
	*
	* @param int Expiration time in seconds
	*/
	function send_future_expire_header($offset=2600000)
	{
	if (headers_sent())
	return;

	header("Expires: ".gmdate("D, d M Y H:i:s", mktime()+$offset)." GMT");
	header("Cache-Control: max-age=$offset");
	header("Pragma: ");
	}


	/**
	* Similar function as in_array() but case-insensitive
	*
	* @param mixed Needle value
	* @param array Array to search in
	* @return boolean True if found, False if not
	*/
	function in_array_nocase($needle, $haystack)
	{
	$needle = mb_strtolower($needle);
	foreach ($haystack as $value)
	if ($needle===mb_strtolower($value))
	return true;

	return false;
	}


	/**
	* Find out if the string content means TRUE or FALSE
	*
	* @param string Input value
	* @return boolean Imagine what!
	*/
	function get_boolean($str)
	{
	$str = strtolower($str);
	if (in_array($str, array('false', '0', 'no', 'off', 'nein', ''), TRUE))
	return FALSE;
	else
	return TRUE;
	}


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

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

	/**
	* Create a human readable string for a number of bytes
	*
	* @param int Number of bytes
	* @return string Byte string
	*/
	function show_bytes($bytes)
	{
	if ($bytes >= 1073741824)
	{
	$gb = $bytes/1073741824;
	$str = sprintf($gb>=10 ? "%d " : "%.1f ", $gb) . rcube_label('GB');
	}
	else if ($bytes >= 1048576)
	{
	$mb = $bytes/1048576;
	$str = sprintf($mb>=10 ? "%d " : "%.1f ", $mb) . rcube_label('MB');
	}
	else if ($bytes >= 1024)
	$str = sprintf("%d ", round($bytes/1024)) . rcube_label('KB');
	else
	$str = sprintf('%d ', $bytes) . rcube_label('B');

	return $str;
	}

	-/**
	- * Convert paths like ../xxx to an absolute path using a base url
	- *
	- * @param string Relative path
	- * @param string Base URL
	- * @return string Absolute URL
	- */
	-function make_absolute_url($path, $base_url)
	-{
	- $host_url = $base_url;
	- $abs_path = $path;
	-
	- // check if path is an absolute URL
	- if (preg_match('/^[fhtps]+:\/\//', $path))
	- return $path;
	-
	- // cut base_url to the last directory
	- if (strrpos($base_url, '/')>7)
	- {
	- $host_url = substr($base_url, 0, strpos($base_url, '/', 7));
	- $base_url = substr($base_url, 0, strrpos($base_url, '/'));
	- }
	-
	- // $path is absolute
	- if ($path[0] == '/')
	- $abs_path = $host_url.$path;
	- else
	- {
	- // strip './' because its the same as ''
	- $path = preg_replace('/^\.\//', '', $path);
	-
	- if (preg_match_all('/\.\.\//', $path, $matches, PREG_SET_ORDER))
	- foreach ($matches as $a_match)
	- {
	- if (strrpos($base_url, '/'))
	- $base_url = substr($base_url, 0, strrpos($base_url, '/'));
	-
	- $path = substr($path, 3);
	- }
	-
	- $abs_path = $base_url.'/'.$path;
	- }
	-
	- return $abs_path;
	-}
	-
	/**
	* Wrapper function for wordwrap
	*/
	function rc_wordwrap($string, $width=75, $break="\n", $cut=false)
	{
	$para = explode($break, $string);
	$string = '';
	while (count($para)) {
	$line = array_shift($para);
	if ($line[0] == '>') {
	$string .= $line.$break;
	continue;
	}
	$list = explode(' ', $line);
	$len = 0;
	while (count($list)) {
	$line = array_shift($list);
	$l = mb_strlen($line);
	$newlen = $len + $l + ($len ? 1 : 0);

	if ($newlen <= $width) {
	$string .= ($len ? ' ' : '').$line;
	$len += (1 + $l);
	} else {
	if ($l > $width) {
	if ($cut) {
	$start = 0;
	while ($l) {
	$str = mb_substr($line, $start, $width);
	$strlen = mb_strlen($str);
	$string .= ($len ? $break : '').$str;
	$start += $strlen;
	$l -= $strlen;
	$len = $strlen;
	}
	} else {
	$string .= ($len ? $break : '').$line;
	if (count($list)) $string .= $break;
	$len = 0;
	}
	} else {
	$string .= $break.$line;
	$len = $l;
	}
	}
	}
	if (count($para)) $string .= $break;
	}
	return $string;
	}

	/**
	* Read a specific HTTP request header
	*
	* @access static
	* @param string $name Header name
	* @return mixed Header value or null if not available
	*/
	function rc_request_header($name)
	{
	if (function_exists('getallheaders'))
	{
	$hdrs = array_change_key_case(getallheaders(), CASE_UPPER);
	$key = strtoupper($name);
	}
	else
	{
	$key = 'HTTP_' . strtoupper(strtr($name, '-', '_'));
	$hdrs = array_change_key_case($_SERVER, CASE_UPPER);
	}

	return $hdrs[$key];
	}


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


	/**
	* Remove slash at the end of the string
	*/
	function unslashify($str)
	{
	return preg_replace('/\/$/', '', $str);
	}


	/**
	* Delete all files within a folder
	*
	* @param string Path to directory
	* @return boolean True on success, False if directory was not found
	*/
	function clear_directory($dir_path)
	{
	$dir = @opendir($dir_path);
	if(!$dir) return FALSE;

	while ($file = readdir($dir))
	if (strlen($file)>2)
	unlink("$dir_path/$file");

	closedir($dir);
	return TRUE;
	}


	/**
	* Create a unix timestamp with a specified offset from now
	*
	* @param string String representation of the offset (e.g. 20min, 5h, 2days)
	* @param int Factor to multiply with the offset
	* @return int Unix timestamp
	*/
	function get_offset_time($offset_str, $factor=1)
	{
	if (preg_match('/^([0-9]+)\s*([smhdw])/i', $offset_str, $regs))
	{
	$amount = (int)$regs[1];
	$unit = strtolower($regs[2]);
	}
	else
	{
	$amount = (int)$offset_str;
	$unit = 's';
	}

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

	return $ts;
	}


	/**
	* 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 Input string
	* @param int Max. length
	* @param string Replace removed chars with this
	* @param bool Set to True if string should be truncated from the end
	* @return string Abbreviated string
	*/
	function abbreviate_string($str, $maxlength, $place_holder='...', $ending=false)
	{
	$length = mb_strlen($str);

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

	$place_holder_length = mb_strlen($place_holder);
	$first_part_length = floor(($maxlength - $place_holder_length)/2);
	$second_starting_location = $length - $maxlength + $first_part_length + $place_holder_length;
	$str = mb_substr($str, 0, $first_part_length) . $place_holder . mb_substr($str, $second_starting_location);
	}

	return $str;
	}


	/**
	* A method to guess the mime_type of an attachment.
	*
	* @param string $path Path to the file.
	* @param string $name File name (with suffix)
	* @param string $failover Mime type supplied for failover.
	* @param string $is_stream Set to True if $path contains file body
	*
	* @return string
	* @author Till Klampaeckel <till@php.net>
	* @see http://de2.php.net/manual/en/ref.fileinfo.php
	* @see http://de2.php.net/mime_content_type
	*/
	function rc_mime_content_type($path, $name, $failover = 'application/octet-stream', $is_stream=false)
	{
	$mime_type = null;
	$mime_magic = rcmail::get_instance()->config->get('mime_magic');
	$mime_ext = @include(RCMAIL_CONFIG_DIR . '/mimetypes.php');
	$suffix = $name ? substr($name, strrpos($name, '.')+1) : '*';

	// use file name suffix with hard-coded mime-type map
	if (is_array($mime_ext)) {
	$mime_type = $mime_ext[$suffix];
	}
	// try fileinfo extension if available
	if (!$mime_type && function_exists('finfo_open')) {
	if ($finfo = finfo_open(FILEINFO_MIME, $mime_magic)) {
	if ($is_stream)
	$mime_type = finfo_buffer($finfo, $path);
	else
	$mime_type = finfo_file($finfo, $path);
	finfo_close($finfo);
	}
	}
	// try PHP's mime_content_type
	if (!$mime_type && !$is_stream && function_exists('mime_content_type')) {
	$mime_type = @mime_content_type($path);
	}
	// fall back to user-submitted string
	if (!$mime_type) {
	$mime_type = $failover;
	}
	else {
	// Sometimes (PHP-5.3?) content-type contains charset definition,
	// Remove it (#1487122) also "charset=binary" is useless
	$mime_type = array_shift(preg_split('/[; ]/', $mime_type));
	}

	return $mime_type;
	}


	/**
	* Detect image type of the given binary data by checking magic numbers
	*
	* @param string Binary file content
	* @return string Detected mime-type or jpeg as fallback
	*/
	function rc_image_content_type($data)
	{
	$type = 'jpeg';
	if (preg_match('/^\x89\x50\x4E\x47/', $data)) $type = 'png';
	else if (preg_match('/^\x47\x49\x46\x38/', $data)) $type = 'gif';
	else if (preg_match('/^\x00\x00\x01\x00/', $data)) $type = 'ico';
	// else if (preg_match('/^\xFF\xD8\xFF\xE0/', $data)) $type = 'jpeg';

	return 'image/' . $type;
	}


	/**
	* A method to guess encoding of a string.
	*
	* @param string $string String.
	* @param string $failover Default result for failover.
	*
	* @return string
	*/
	function rc_detect_encoding($string, $failover='')
	{
	if (!function_exists('mb_detect_encoding')) {
	return $failover;
	}

	// FIXME: the order is important, because sometimes
	// iso string is detected as euc-jp and etc.
	$enc = array(
	'UTF-8', 'SJIS', 'BIG5', 'GB2312',
	'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
	'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9',
	'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
	'WINDOWS-1252', 'WINDOWS-1251', 'EUC-JP', 'EUC-TW', 'KOI8-R',
	'ISO-2022-KR', 'ISO-2022-JP'
	);

	$result = mb_detect_encoding($string, join(',', $enc));

	return $result ? $result : $failover;
	}

	/**
	* Removes non-unicode characters from input
	*
	* @param mixed $input String or array.
	* @return string
	*/
	function rc_utf8_clean($input)
	{
	// handle input of type array
	if (is_array($input)) {
	foreach ($input as $idx => $val)
	$input[$idx] = rc_utf8_clean($val);
	return $input;
	}

	if (!is_string($input) \|\| $input == '')
	return $input;

	// iconv/mbstring are much faster (especially with long strings)
	if (function_exists('mb_convert_encoding') && ($res = mb_convert_encoding($input, 'UTF-8', 'UTF-8')) !== false)
	return $res;

	if (function_exists('iconv') && ($res = @iconv('UTF-8', 'UTF-8//IGNORE', $input)) !== false)
	return $res;

	$regexp = '/^('.
	// '[\x00-\x7F]'. // UTF8-1
	'\|[\xC2-\xDF][\x80-\xBF]'. // UTF8-2
	'\|\xE0[\xA0-\xBF][\x80-\xBF]'. // UTF8-3
	'\|[\xE1-\xEC][\x80-\xBF][\x80-\xBF]'. // UTF8-3
	'\|\xED[\x80-\x9F][\x80-\xBF]'. // UTF8-3
	'\|[\xEE-\xEF][\x80-\xBF][\x80-\xBF]'. // UTF8-3
	'\|\xF0[\x90-\xBF][\x80-\xBF][\x80-\xBF]'. // UTF8-4
	'\|[\xF1-\xF3][\x80-\xBF][\x80-\xBF][\x80-\xBF]'.// UTF8-4
	'\|\xF4[\x80-\x8F][\x80-\xBF][\x80-\xBF]'. // UTF8-4
	')$/';

	$seq = '';
	$out = '';

	for ($i = 0, $len = strlen($input); $i < $len; $i++) {
	$chr = $input[$i];
	$ord = ord($chr);
	// 1-byte character
	if ($ord <= 0x7F) {
	if ($seq)
	$out .= preg_match($regexp, $seq) ? $seq : '';
	$seq = '';
	$out .= $chr;
	// first (or second) byte of multibyte sequence
	} else if ($ord >= 0xC0) {
	if (strlen($seq)>1) {
	$out .= preg_match($regexp, $seq) ? $seq : '';
	$seq = '';
	} else if ($seq && ord($seq) < 0xC0) {
	$seq = '';
	}
	$seq .= $chr;
	// next byte of multibyte sequence
	} else if ($seq) {
	$seq .= $chr;
	}
	}

	if ($seq)
	$out .= preg_match($regexp, $seq) ? $seq : '';

	return $out;
	}


	/**
	* Convert a variable into a javascript object notation
	*
	* @param mixed Input value
	* @return string Serialized JSON string
	*/
	function json_serialize($input)
	{
	$input = rc_utf8_clean($input);

	// sometimes even using rc_utf8_clean() the input contains invalid UTF-8 sequences
	// that's why we have @ here
	return @json_encode($input);
	}


	/**
	* Explode quoted string
	*
	* @param string Delimiter expression string for preg_match()
	* @param string Input string
	*/
	function rcube_explode_quoted_string($delimiter, $string)
	{
	$result = array();
	$strlen = strlen($string);

	for ($q=$p=$i=0; $i < $strlen; $i++) {
	if ($string[$i] == "\"" && $string[$i-1] != "\\") {
	$q = $q ? false : true;
	}
	else if (!$q && preg_match("/$delimiter/", $string[$i])) {
	$result[] = substr($string, $p, $i - $p);
	$p = $i + 1;
	}
	}

	$result[] = substr($string, $p);
	return $result;
	}


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

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


	/**
	* mbstring replacement functions
	*/

	if (!extension_loaded('mbstring'))
	{
	function mb_strlen($str)
	{
	return strlen($str);
	}

	function mb_strtolower($str)
	{
	return strtolower($str);
	}

	function mb_strtoupper($str)
	{
	return strtoupper($str);
	}

	function mb_substr($str, $start, $len=null)
	{
	return substr($str, $start, $len);
	}

	function mb_strpos($haystack, $needle, $offset=0)
	{
	return strpos($haystack, $needle, $offset);
	}

	function mb_strrpos($haystack, $needle, $offset=0)
	{
	return strrpos($haystack, $needle, $offset);
	}
	}

	/**
	* intl replacement functions
	*/

	if (!function_exists('idn_to_utf8'))
	{
	function idn_to_utf8($domain, $flags=null)
	{
	static $idn, $loaded;

	if (!$loaded) {
	$idn = new Net_IDNA2();
	$loaded = true;
	}

	if ($idn && $domain && preg_match('/(^\|\.)xn--/i', $domain)) {
	try {
	$domain = $idn->decode($domain);
	}
	catch (Exception $e) {
	}
	}
	return $domain;
	}
	}

	if (!function_exists('idn_to_ascii'))
	{
	function idn_to_ascii($domain, $flags=null)
	{
	static $idn, $loaded;

	if (!$loaded) {
	$idn = new Net_IDNA2();
	$loaded = true;
	}

	if ($idn && $domain && preg_match('/[^\x20-\x7E]/', $domain)) {
	try {
	$domain = $idn->encode($domain);
	}
	catch (Exception $e) {
	}
	}
	return $domain;
	}
	}

	diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
	index 3784456c7..f791f7033 100644
	--- a/program/steps/mail/func.inc
	+++ b/program/steps/mail/func.inc
	@@ -1,1642 +1,1640 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2010, The Roundcube Dev Team \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Provide webmail functionality and GUI objects \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	// setup some global vars used by mail steps
	$SENT_MBOX = $RCMAIL->config->get('sent_mbox');
	$DRAFTS_MBOX = $RCMAIL->config->get('drafts_mbox');
	$SEARCH_MODS_DEFAULT = array(
	'*' => array('subject'=>1, 'from'=>1),
	$SENT_MBOX => array('subject'=>1, 'to'=>1),
	$DRAFTS_MBOX => array('subject'=>1, 'to'=>1)
	);

	// actions that do not require imap connection here
	$NOIMAP_ACTIONS = array('addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment', 'get');

	// always instantiate imap object (but not yet connect to server)
	$RCMAIL->imap_init();

	// log in to imap server
	if (!in_array($RCMAIL->action, $NOIMAP_ACTIONS) && !$RCMAIL->imap_connect()) {
	$RCMAIL->kill_session();

	if ($OUTPUT->ajax_call)
	$OUTPUT->redirect(array(), 2000);

	$OUTPUT->set_env('task', 'login');
	$OUTPUT->send('login');
	}

	// set imap properties and session vars
	if (strlen(trim($mbox = get_input_value('_mbox', RCUBE_INPUT_GPC, true))))
	$RCMAIL->imap->set_mailbox(($_SESSION['mbox'] = $mbox));
	else if ($RCMAIL->imap)
	$_SESSION['mbox'] = $RCMAIL->imap->get_mailbox_name();

	if (!empty($_GET['_page']))
	$RCMAIL->imap->set_page(($_SESSION['page'] = intval($_GET['_page'])));

	// set default sort col/order to session
	if (!isset($_SESSION['sort_col']))
	$_SESSION['sort_col'] = !empty($CONFIG['message_sort_col']) ? $CONFIG['message_sort_col'] : '';
	if (!isset($_SESSION['sort_order']))
	$_SESSION['sort_order'] = strtoupper($CONFIG['message_sort_order']) == 'ASC' ? 'ASC' : 'DESC';

	// set threads mode
	$a_threading = $RCMAIL->config->get('message_threading', array());
	if (isset($_GET['_threads'])) {
	if ($_GET['_threads'])
	$a_threading[$_SESSION['mbox']] = true;
	else
	unset($a_threading[$_SESSION['mbox']]);
	$RCMAIL->user->save_prefs(array('message_threading' => $a_threading));
	}
	$RCMAIL->imap->set_threading($a_threading[$_SESSION['mbox']]);

	// set message set for search result
	if (!empty($_REQUEST['_search']) && isset($_SESSION['search'])
	&& $_SESSION['search_request'] == $_REQUEST['_search']
	) {
	$RCMAIL->imap->set_search_set($_SESSION['search']);
	$OUTPUT->set_env('search_request', $_REQUEST['_search']);
	$OUTPUT->set_env('search_text', $_SESSION['last_text_search']);
	}

	// set main env variables, labels and page title
	if (empty($RCMAIL->action) \|\| $RCMAIL->action == 'list') {
	$mbox_name = $RCMAIL->imap->get_mailbox_name();

	if (empty($RCMAIL->action)) {
	// initialize searching result if search_filter is used
	if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') {
	$search_request = md5($mbox_name.$_SESSION['search_filter']);

	$RCMAIL->imap->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $_SESSION['sort_col']);
	$_SESSION['search'] = $RCMAIL->imap->get_search_set();
	$_SESSION['search_request'] = $search_request;
	$OUTPUT->set_env('search_request', $search_request);
	}

	$search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);
	$OUTPUT->set_env('search_mods', $search_mods);
	}

	// set current mailbox and some other vars in client environment
	$OUTPUT->set_env('mailbox', $mbox_name);
	$OUTPUT->set_env('pagesize', $RCMAIL->imap->page_size);
	$OUTPUT->set_env('quota', $RCMAIL->imap->get_capability('QUOTA'));
	$OUTPUT->set_env('delimiter', $RCMAIL->imap->get_hierarchy_delimiter());
	$OUTPUT->set_env('threading', (bool) $RCMAIL->imap->threading);
	$OUTPUT->set_env('threads', $RCMAIL->imap->threading \|\| $RCMAIL->imap->get_capability('THREAD'));
	$OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0));

	if ($CONFIG['flag_for_deletion'])
	$OUTPUT->set_env('flag_for_deletion', true);
	if ($CONFIG['read_when_deleted'])
	$OUTPUT->set_env('read_when_deleted', true);
	if ($CONFIG['skip_deleted'])
	$OUTPUT->set_env('skip_deleted', true);
	if ($CONFIG['display_next'])
	$OUTPUT->set_env('display_next', true);
	if ($CONFIG['forward_attachment'])
	$OUTPUT->set_env('forward_attachment', true);
	if ($CONFIG['trash_mbox'])
	$OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
	if ($CONFIG['drafts_mbox'])
	$OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
	if ($CONFIG['junk_mbox'])
	$OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']);

	if (!$OUTPUT->ajax_call)
	$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
	'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
	'copy', 'move', 'quota');

	$OUTPUT->set_pagetitle(rcmail_localize_foldername($RCMAIL->imap->mod_mailbox($mbox_name)));
	}


	/**
	* return the message list as HTML table
	*/
	function rcmail_message_list($attrib)
	{
	global $RCMAIL, $CONFIG, $OUTPUT;

	// add some labels to client
	$OUTPUT->add_label('from', 'to');

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcubemessagelist';

	// define list of cols to be displayed based on parameter or config
	if (empty($attrib['columns'])) {
	$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
	$OUTPUT->set_env('col_movable', !in_array('list_cols', (array)$CONFIG['dont_override']));
	}
	else {
	$a_show_cols = preg_split('/[\s,;]+/', strip_quotes($attrib['columns']));
	$attrib['columns'] = $a_show_cols;
	}

	// save some variables for use in ajax list
	$_SESSION['list_attrib'] = $attrib;

	$mbox = $RCMAIL->imap->get_mailbox_name();
	$delim = $RCMAIL->imap->get_hierarchy_delimiter();

	// show 'to' instead of 'from' in sent/draft messages
	if ((strpos($mbox.$delim, $CONFIG['sent_mbox'].$delim)===0 \|\| strpos($mbox.$delim, $CONFIG['drafts_mbox'].$delim)===0)
	&& (($f = array_search('from', $a_show_cols)) !== false) && array_search('to', $a_show_cols) === false)
	$a_show_cols[$f] = 'to';

	// make sure 'threads' and 'subject' columns are present
	if (!in_array('subject', $a_show_cols))
	array_unshift($a_show_cols, 'subject');
	if (!in_array('threads', $a_show_cols))
	array_unshift($a_show_cols, 'threads');

	$skin_path = $_SESSION['skin_path'] = $CONFIG['skin_path'];

	// set client env
	$OUTPUT->add_gui_object('messagelist', $attrib['id']);
	$OUTPUT->set_env('autoexpand_threads', intval($CONFIG['autoexpand_threads']));
	$OUTPUT->set_env('sort_col', $_SESSION['sort_col']);
	$OUTPUT->set_env('sort_order', $_SESSION['sort_order']);
	$OUTPUT->set_env('messages', array());
	$OUTPUT->set_env('coltypes', $a_show_cols);

	$OUTPUT->include_script('list.js');

	$thead = '';
	foreach (rcmail_message_list_head($attrib, $a_show_cols) as $cell)
	$thead .= html::tag('td', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);

	return html::tag('table',
	$attrib,
	html::tag('thead', null, html::tag('tr', null, $thead)) .
	html::tag('tbody', null, ''),
	array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
	}


	/**
	* return javascript commands to add rows to the message list
	*/
	function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null)
	{
	global $CONFIG, $RCMAIL, $OUTPUT;

	if (empty($a_show_cols)) {
	if (!empty($_SESSION['list_attrib']['columns']))
	$a_show_cols = $_SESSION['list_attrib']['columns'];
	else
	$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
	}
	else {
	if (!is_array($a_show_cols))
	$a_show_cols = preg_split('/[\s,;]+/', strip_quotes($a_show_cols));
	$head_replace = true;
	}

	$mbox = $RCMAIL->imap->get_mailbox_name();
	$delim = $RCMAIL->imap->get_hierarchy_delimiter();

	// make sure 'threads' and 'subject' columns are present
	if (!in_array('subject', $a_show_cols))
	array_unshift($a_show_cols, 'subject');
	if (!in_array('threads', $a_show_cols))
	array_unshift($a_show_cols, 'threads');

	$_SESSION['list_attrib']['columns'] = $a_show_cols;

	// show 'to' instead of 'from' in sent/draft messages
	if ((strpos($mbox.$delim, $CONFIG['sent_mbox'].$delim)===0 \|\| strpos($mbox.$delim, $CONFIG['drafts_mbox'].$delim)===0)
	&& (($f = array_search('from', $a_show_cols)) !== false) && array_search('to', $a_show_cols) === false)
	$a_show_cols[$f] = 'to';

	// Make sure there are no duplicated columns (#1486999)
	$a_show_cols = array_unique($a_show_cols);

	// Plugins may set header's list_cols/list_flags and other rcube_mail_header variables
	// and list columns
	$plugin = $RCMAIL->plugins->exec_hook('messages_list',
	array('messages' => $a_headers, 'cols' => $a_show_cols));

	$a_show_cols = $plugin['cols'];
	$a_headers = $plugin['messages'];

	$thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;

	$OUTPUT->command('set_message_coltypes', $a_show_cols, $thead);

	if (empty($a_headers))
	return;

	// remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here
	foreach (array('threads', 'attachment', 'flag', 'status', 'priority') as $col) {
	if (($key = array_search($col, $a_show_cols)) !== FALSE)
	unset($a_show_cols[$key]);
	}

	// loop through message headers
	foreach ($a_headers as $n => $header) {
	if (empty($header))
	continue;

	$a_msg_cols = array();
	$a_msg_flags = array();

	$RCMAIL->imap->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']);

	// format each col; similar as in rcmail_message_list()
	foreach ($a_show_cols as $col) {
	if (in_array($col, array('from', 'to', 'cc', 'replyto')))
	$cont = Q(rcmail_address_string($header->$col, 3), 'show');
	else if ($col=='subject') {
	$cont = trim($RCMAIL->imap->decode_header($header->$col));
	if (!$cont) $cont = rcube_label('nosubject');
	$cont = Q($cont);
	}
	else if ($col=='size')
	$cont = show_bytes($header->$col);
	else if ($col=='date')
	$cont = format_date($header->date);
	else
	$cont = Q($header->$col);

	$a_msg_cols[$col] = $cont;
	}

	$a_msg_flags = array_change_key_case(array_map('intval', (array) $header->flags));
	if ($header->depth)
	$a_msg_flags['depth'] = $header->depth;
	else if ($header->has_children)
	$roots[] = $header->uid;
	if ($header->parent_uid)
	$a_msg_flags['parent_uid'] = $header->parent_uid;
	if ($header->has_children)
	$a_msg_flags['has_children'] = $header->has_children;
	if ($header->unread_children)
	$a_msg_flags['unread_children'] = $header->unread_children;
	if ($header->others['list-post'])
	$a_msg_flags['ml'] = 1;
	if ($header->priority)
	$a_msg_flags['prio'] = (int) $header->priority;

	$a_msg_flags['ctype'] = Q($header->ctype);
	$a_msg_flags['mbox'] = $mbox;

	// merge with plugin result (Deprecated, use $header->flags)
	if (!empty($header->list_flags) && is_array($header->list_flags))
	$a_msg_flags = array_merge($a_msg_flags, $header->list_flags);
	if (!empty($header->list_cols) && is_array($header->list_cols))
	$a_msg_cols = array_merge($a_msg_cols, $header->list_cols);

	$OUTPUT->command('add_message_row',
	$header->uid,
	$a_msg_cols,
	$a_msg_flags,
	$insert_top);
	}

	if ($RCMAIL->imap->threading) {
	$OUTPUT->command('init_threads', (array) $roots, $mbox);
	}
	}


	/*
	* Creates <THEAD> for message list table
	*/
	function rcmail_message_list_head($attrib, $a_show_cols)
	{
	global $CONFIG;

	$skin_path = $_SESSION['skin_path'];
	$image_tag = html::img(array('src' => "%s%s", 'alt' => "%s"));

	// check to see if we have some settings for sorting
	$sort_col = $_SESSION['sort_col'];
	$sort_order = $_SESSION['sort_order'];

	// define sortable columns
	$a_sort_cols = array('subject', 'date', 'from', 'to', 'size', 'cc');

	if (!empty($attrib['optionsmenuicon'])) {
	$onclick = 'return ' . JS_OBJECT_NAME . ".command('menu-open', 'messagelistmenu')";
	if ($attrib['optionsmenuicon'] === true \|\| $attrib['optionsmenuicon'] == 'true')
	$list_menu = html::div(array('onclick' => $onclick, 'class' => 'listmenu',
	'id' => 'listmenulink', 'title' => rcube_label('listoptions')));
	else
	$list_menu = html::a(array('href' => '#', 'onclick' => $onclick),
	html::img(array('src' => $skin_path . $attrib['optionsmenuicon'],
	'id' => 'listmenulink', 'title' => rcube_label('listoptions')))
	);
	}
	else
	$list_menu = '';

	$cells = array();

	foreach ($a_show_cols as $col) {
	// get column name
	switch ($col) {
	case 'flag':
	$col_name = '<span class="flagged"> </span>';
	break;
	case 'attachment':
	case 'priority':
	case 'status':
	$col_name = '<span class="' . $col .'"> </span>';
	break;
	case 'threads':
	$col_name = $list_menu;
	break;
	default:
	$col_name = Q(rcube_label($col));
	}

	// make sort links
	if (in_array($col, $a_sort_cols))
	$col_name = html::a(array('href'=>"./#sort", 'onclick' => 'return '.JS_OBJECT_NAME.".command('sort','".$col."',this)", 'title' => rcube_label('sortby')), $col_name);
	else if ($col_name[0] != '<')
	$col_name = '<span class="' . $col .'">' . $col_name . '</span>';

	$sort_class = $col == $sort_col ? " sorted$sort_order" : '';
	$class_name = $col.$sort_class;

	// put it all together
	$cells[] = array('className' => $class_name, 'id' => "rcm$col", 'html' => $col_name);
	}

	return $cells;
	}


	/**
	* return an HTML iframe for loading mail content
	*/
	function rcmail_messagecontent_frame($attrib)
	{
	global $OUTPUT, $RCMAIL;

	if (empty($attrib['id']))
	$attrib['id'] = 'rcmailcontentwindow';

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

	if ($RCMAIL->config->get('preview_pane'))
	$OUTPUT->set_env('contentframe', $attrib['id']);
	$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');

	return html::iframe($attrib);
	}


	function rcmail_messagecount_display($attrib)
	{
	global $RCMAIL;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmcountdisplay';

	$RCMAIL->output->add_gui_object('countdisplay', $attrib['id']);

	$content = $RCMAIL->action != 'show' ? rcmail_get_messagecount_text() : rcube_label('loading');

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


	function rcmail_get_messagecount_text($count=NULL, $page=NULL)
	{
	global $RCMAIL;

	if ($page===NULL)
	$page = $RCMAIL->imap->list_page;

	$start_msg = ($page-1) * $RCMAIL->imap->page_size + 1;

	if ($count!==NULL)
	$max = $count;
	else if ($RCMAIL->action)
	$max = $RCMAIL->imap->messagecount(NULL, $RCMAIL->imap->threading ? 'THREADS' : 'ALL');

	if ($max==0)
	$out = rcube_label('mailboxempty');
	else
	$out = rcube_label(array('name' => $RCMAIL->imap->threading ? 'threadsfromto' : 'messagesfromto',
	'vars' => array('from' => $start_msg,
	'to' => min($max, $start_msg + $RCMAIL->imap->page_size - 1),
	'count' => $max)));

	return Q($out);
	}


	function rcmail_mailbox_name_display($attrib)
	{
	global $RCMAIL;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmmailboxname';

	$RCMAIL->output->add_gui_object('mailboxname', $attrib['id']);

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


	function rcmail_get_mailbox_name_text()
	{
	global $RCMAIL;
	return rcmail_localize_foldername($RCMAIL->imap->get_mailbox_name());
	}


	function rcmail_send_unread_count($mbox_name, $force=false, $count=null, $mark='')
	{
	global $RCMAIL;

	$old_unseen = rcmail_get_unseen_count($mbox_name);

	if ($count === null)
	$unseen = $RCMAIL->imap->messagecount($mbox_name, 'UNSEEN', $force);
	else
	$unseen = $count;

	if ($unseen != $old_unseen \|\| ($mbox_name == 'INBOX'))
	$RCMAIL->output->command('set_unread_count', $mbox_name, $unseen,
	($mbox_name == 'INBOX'), $unseen && $mark ? $mark : '');

	rcmail_set_unseen_count($mbox_name, $unseen);

	return $unseen;
	}


	function rcmail_set_unseen_count($mbox_name, $count)
	{
	// @TODO: this data is doubled (session and cache tables) if caching is enabled

	// Make sure we have an array here (#1487066)
	if (!is_array($_SESSION['unseen_count']))
	$_SESSION['unseen_count'] = array();

	$_SESSION['unseen_count'][$mbox_name] = $count;
	}


	function rcmail_get_unseen_count($mbox_name)
	{
	if (is_array($_SESSION['unseen_count']) && array_key_exists($mbox_name, $_SESSION['unseen_count']))
	return $_SESSION['unseen_count'][$mbox_name];
	else
	return null;
	}


	/**
	* Sets message is_safe flag according to 'show_images' option value
	*
	* @param object rcube_message Message
	*/
	function rcmail_check_safe(&$message)
	{
	global $RCMAIL;

	$show_images = $RCMAIL->config->get('show_images');
	if (!$message->is_safe
	&& !empty($show_images)
	&& $message->has_html_part())
	{
	switch($show_images) {
	case '1': // known senders only
	$CONTACTS = new rcube_contacts($RCMAIL->db, $_SESSION['user_id']);
	if ($CONTACTS->search('email', $message->sender['mailto'], true, false)->count) {
	$message->set_safe(true);
	}
	break;
	case '2': // always
	$message->set_safe(true);
	break;
	}
	}
	}


	/**
	* Cleans up the given message HTML Body (for displaying)
	*
	* @param string HTML
	* @param array Display parameters
	* @param array CID map replaces (inline images)
	* @return string Clean HTML
	*/
	function rcmail_wash_html($html, $p, $cid_replaces)
	{
	global $REMOTE_OBJECTS;

	$p += array('safe' => false, 'inline_html' => true);

	// special replacements (not properly handled by washtml class)
	$html_search = array(
	'/(<\/nobr>)(\s+)(<nobr>)/i', // space(s) between <NOBR>
	'/<title[^>]>[^<]<\/title>/i', // PHP bug #32547 workaround: remove title tag
	'/^(\0\0\xFE\xFF\|\xFF\xFE\0\0\|\xFE\xFF\|\xFF\xFE\|\xEF\xBB\xBF)/', // byte-order mark (only outlook?)
	'/<html\s[^>]+>/i', // washtml/DOMDocument cannot handle xml namespaces
	);
	$html_replace = array(
	'\\1'.'   '.'\\3',
	'',
	'',
	'<html>',
	);
	$html = preg_replace($html_search, $html_replace, trim($html));

	// PCRE errors handling (#1486856), should we use something like for every preg_* use?
	if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {
	$errstr = "Could not clean up HTML message! PCRE Error: $preg_error.";

	if ($preg_error == PREG_BACKTRACK_LIMIT_ERROR)
	$errstr .= " Consider raising pcre.backtrack_limit!";
	if ($preg_error == PREG_RECURSION_LIMIT_ERROR)
	$errstr .= " Consider raising pcre.recursion_limit!";

	raise_error(array('code' => 620, 'type' => 'php',
	'line' => __LINE__, 'file' => __FILE__,
	'message' => $errstr), true, false);
	return '';
	}

	// fix (unknown/malformed) HTML tags before "wash"
	$html = preg_replace_callback('/(<[\/]*)([^\s>]+)/', 'rcmail_html_tag_callback', $html);

	// charset was converted to UTF-8 in rcube_imap::get_message_part(),
	// change/add charset specification in HTML accordingly,
	// washtml cannot work without that
	$meta = '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />';

	// remove old meta tag and add the new one, making sure
	// that it is placed in the head (#1488093)
	$html = preg_replace('/<meta[^>]+charset=[a-z0-9-_]+[^>]*>/Ui', '', $html);
	$html = preg_replace('/(<head[^>]*>)/Ui', '\\1'.$meta, $html, -1, $rcount);
	if (!$rcount) {
	$html = '<head>' . $meta . '</head>' . $html;
	}

	// turn relative into absolute urls
	$html = rcmail_resolve_base($html);

	// clean HTML with washhtml by Frederic Motte
	$wash_opts = array(
	'show_washed' => false,
	'allow_remote' => $p['safe'],
	'blocked_src' => "./program/blocked.gif",
	'charset' => RCMAIL_CHARSET,
	'cid_map' => $cid_replaces,
	'html_elements' => array('body'),
	);

	if (!$p['inline_html']) {
	$wash_opts['html_elements'] = array('html','head','title','body');
	}
	if ($p['safe']) {
	$wash_opts['html_elements'][] = 'link';
	$wash_opts['html_attribs'] = array('rel','type');
	}

	// overwrite washer options with options from plugins
	if (isset($p['html_elements']))
	$wash_opts['html_elements'] = $p['html_elements'];
	if (isset($p['html_attribs']))
	$wash_opts['html_attribs'] = $p['html_attribs'];

	// initialize HTML washer
	$washer = new washtml($wash_opts);

	if (!$p['skip_washer_form_callback'])
	$washer->add_callback('form', 'rcmail_washtml_callback');

	// allow CSS styles, will be sanitized by rcmail_washtml_callback()
	if (!$p['skip_washer_style_callback'])
	$washer->add_callback('style', 'rcmail_washtml_callback');

	// Remove non-UTF8 characters (#1487813)
	$html = rc_utf8_clean($html);

	$html = $washer->wash($html);
	$REMOTE_OBJECTS = $washer->extlinks;

	return $html;
	}


	/**
	* Convert the given message part to proper HTML
	* which can be displayed the message view
	*
	* @param object rcube_message_part Message part
	* @param array Display parameters array
	* @return string Formatted HTML string
	*/
	function rcmail_print_body($part, $p = array())
	{
	global $RCMAIL;

	// trigger plugin hook
	$data = $RCMAIL->plugins->exec_hook('message_part_before',
	array('type' => $part->ctype_secondary, 'body' => $part->body, 'id' => $part->mime_id)
	+ $p + array('safe' => false, 'plain' => false, 'inline_html' => true));

	// convert html to text/plain
	if ($data['type'] == 'html' && $data['plain']) {
	$txt = new html2text($data['body'], false, true);
	$body = $txt->get_text();
	$part->ctype_secondary = 'plain';
	}
	// text/html
	else if ($data['type'] == 'html') {
	$body = rcmail_wash_html($data['body'], $data, $part->replaces);
	$part->ctype_secondary = $data['type'];
	}
	// text/enriched
	else if ($data['type'] == 'enriched') {
	$part->ctype_secondary = 'html';
	require_once(INSTALL_PATH . 'program/lib/enriched.inc');
	$body = Q(enriched_to_html($data['body']), 'show');
	}
	else {
	// assert plaintext
	$body = $part->body;
	$part->ctype_secondary = $data['type'] = 'plain';
	}

	// free some memory (hopefully)
	unset($data['body']);

	// plaintext postprocessing
	if ($part->ctype_secondary == 'plain')
	$body = rcmail_plain_body($body, $part->ctype_parameters['format'] == 'flowed');

	// allow post-processing of the message body
	$data = $RCMAIL->plugins->exec_hook('message_part_after',
	array('type' => $part->ctype_secondary, 'body' => $body, 'id' => $part->mime_id) + $data);

	return $data['type'] == 'html' ? $data['body'] : html::tag('pre', array(), $data['body']);
	}


	/**
	* Handle links and citation marks in plain text message
	*
	* @param string Plain text string
	* @param boolean Text uses format=flowed
	*
	* @return string Formatted HTML string
	*/
	function rcmail_plain_body($body, $flowed=false)
	{
	global $RCMAIL;

	// make links and email-addresses clickable
	$replacer = new rcube_string_replacer;

	// search for patterns like links and e-mail addresses
	$body = preg_replace_callback($replacer->link_pattern, array($replacer, 'link_callback'), $body);
	$body = preg_replace_callback($replacer->mailto_pattern, array($replacer, 'mailto_callback'), $body);

	// split body into single lines
	$body = preg_split('/\r?\n/', $body);
	$quote_level = 0;
	$last = -1;

	// find/mark quoted lines...
	for ($n=0, $cnt=count($body); $n < $cnt; $n++) {
	if ($body[$n][0] == '>' && preg_match('/^(>+\s*)+/', $body[$n], $regs)) {
	$q = strlen(preg_replace('/\s/', '', $regs[0]));
	$body[$n] = substr($body[$n], strlen($regs[0]));

	if ($q > $quote_level) {
	$body[$n] = $replacer->get_replacement($replacer->add(
	str_repeat('<blockquote>', $q - $quote_level))) . $body[$n];
	}
	else if ($q < $quote_level) {
	$body[$n] = $replacer->get_replacement($replacer->add(
	str_repeat('</blockquote>', $quote_level - $q))) . $body[$n];
	}
	else if ($flowed) {
	// previous line is flowed
	if (isset($body[$last]) && $body[$n]
	&& $body[$last][strlen($body[$last])-1] == ' ') {
	// merge lines
	$body[$last] .= $body[$n];
	unset($body[$n]);
	}
	else {
	$last = $n;
	}
	}
	}
	else {
	$q = 0;
	if ($flowed) {
	// sig separator - line is fixed
	if ($body[$n] == '-- ') {
	$last = $last_sig = $n;
	}
	else {
	// remove space-stuffing
	if ($body[$n][0] == ' ')
	$body[$n] = substr($body[$n], 1);

	// previous line is flowed?
	if (isset($body[$last]) && $body[$n]
	&& $last !== $last_sig
	&& $body[$last][strlen($body[$last])-1] == ' '
	) {
	$body[$last] .= $body[$n];
	unset($body[$n]);
	}
	else {
	$last = $n;
	}
	}
	if ($quote_level > 0)
	$body[$last] = $replacer->get_replacement($replacer->add(
	str_repeat('</blockquote>', $quote_level))) . $body[$last];
	}
	else if ($quote_level > 0)
	$body[$n] = $replacer->get_replacement($replacer->add(
	str_repeat('</blockquote>', $quote_level))) . $body[$n];
	}

	$quote_level = $q;
	}

	$body = join("\n", $body);

	// quote plain text (don't use Q() here, to display entities "as is")
	$table = get_html_translation_table(HTML_SPECIALCHARS);
	unset($table['?']);
	$body = strtr($body, $table);

	// colorize signature (up to <sig_max_lines> lines)
	$len = strlen($body);
	$sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15);
	while (($sp = strrpos($body, "-- \n", $sp ? -$len+$sp-1 : 0)) !== false) {
	if ($sp == 0 \|\| $body[$sp-1] == "\n") {
	// do not touch blocks with more that X lines
	if (substr_count($body, "\n", $sp) < $sig_max_lines)
	$body = substr($body, 0, max(0, $sp))
	.'<span class="sig">'.substr($body, $sp).'</span>';
	break;
	}
	}

	// insert url/mailto links and citation tags
	$body = $replacer->resolve($body);

	return $body;
	}


	/**
	* Callback function for washtml cleaning class
	*/
	function rcmail_washtml_callback($tagname, $attrib, $content, $washtml)
	{
	switch ($tagname) {
	case 'form':
	$out = html::div('form', $content);
	break;

	case 'style':
	// decode all escaped entities and reduce to ascii strings
	$stripped = preg_replace('/[^a-zA-Z\(:;]/', '', rcmail_xss_entity_decode($content));

	// now check for evil strings like expression, behavior or url()
	if (!preg_match('/expression\|behavior\|javascript:\|import[^a]/i', $stripped)) {
	if (!$washtml->get_config('allow_remote') && stripos($stripped, 'url('))
	$washtml->extlinks = true;
	else
	$out = html::tag('style', array('type' => 'text/css'), $content);
	break;
	}

	default:
	$out = '';
	}

	return $out;
	}


	/**
	* Callback function for HTML tags fixing
	*/
	function rcmail_html_tag_callback($matches)
	{
	$tagname = $matches[2];

	$tagname = preg_replace(array(
	'/:.*$/', // Microsoft's Smart Tags <st1:xxxx>
	'/[^a-z0-9_\[\]\!-]/i', // forbidden characters
	), '', $tagname);

	return $matches[1].$tagname;
	}


	/**
	* return table with message headers
	*/
	function rcmail_message_headers($attrib, $headers=NULL)
	{
	global $OUTPUT, $MESSAGE, $PRINT_MODE, $RCMAIL;
	static $sa_attrib;

	// keep header table attrib
	if (is_array($attrib) && !$sa_attrib)
	$sa_attrib = $attrib;
	else if (!is_array($attrib) && is_array($sa_attrib))
	$attrib = $sa_attrib;

	if (!isset($MESSAGE))
	return FALSE;

	// get associative array of headers object
	if (!$headers)
	$headers = is_object($MESSAGE->headers) ? get_object_vars($MESSAGE->headers) : $MESSAGE->headers;

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

	foreach ($standard_headers as $hkey) {
	if ($headers[$hkey])
	$value = $headers[$hkey];
	else if ($headers['others'][$hkey])
	$value = $headers['others'][$hkey];
	else
	continue;

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

	if ($hkey == 'date') {
	if ($PRINT_MODE)
	$header_value = format_date($value, $RCMAIL->config->get('date_long', 'x'));
	else
	$header_value = format_date($value);
	}
	else if ($hkey == 'replyto') {
	if ($headers['replyto'] != $headers['from'])
	$header_value = rcmail_address_string($value, null, true, $attrib['addicon']);
	else
	continue;
	}
	else if ($hkey == 'mail-reply-to') {
	if ($headers['mail-replyto'] != $headers['reply-to']
	&& $headers['reply-to'] != $headers['from']
	)
	$header_value = rcmail_address_string($value, null, true, $attrib['addicon']);
	else
	continue;
	}
	else if ($hkey == 'mail-followup-to') {
	$header_value = rcmail_address_string($value, null, true, $attrib['addicon']);
	}
	else if (in_array($hkey, array('from', 'to', 'cc', 'bcc')))
	$header_value = rcmail_address_string($value, null, true, $attrib['addicon']);
	else if ($hkey == 'subject' && empty($value))
	$header_value = rcube_label('nosubject');
	else
	$header_value = trim($RCMAIL->imap->decode_header($value));

	$output_headers[$hkey] = array(
	'title' => rcube_label(preg_replace('/(^mail-\|-)/', '', $hkey)),
	'value' => $header_value, 'raw' => $value
	);
	}

	$plugin = $RCMAIL->plugins->exec_hook('message_headers_output',
	array('output' => $output_headers, 'headers' => $MESSAGE->headers, 'exclude' => $exclude_headers));

	// single header value is requested
	if (!empty($attrib['valueof']))
	return Q($plugin['output'][$attrib['valueof']]['value'], ($hkey == 'subject' ? 'strict' : 'show'));

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

	foreach ($plugin['output'] as $hkey => $row) {
	$table->add(array('class' => 'header-title'), Q($row['title']));
	$table->add(array('class' => 'header '.$hkey), Q($row['value'], ($hkey == 'subject' ? 'strict' : 'show')));
	}

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


	/**
	* return block to show full message headers
	*/
	function rcmail_message_full_headers($attrib, $headers=NULL)
	{
	global $OUTPUT;

	$html = html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('load-headers','',this)"), '');
	$html .= html::div(array('id' => "all-headers", 'class' => "all", 'style' => 'display:none'), html::div(array('id' => 'headers-source'), ''));

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

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


	/**
	* Handler for the 'messagebody' GUI object
	*
	* @param array Named parameters
	* @return string HTML content showing the message body
	*/
	function rcmail_message_body($attrib)
	{
	global $CONFIG, $OUTPUT, $MESSAGE, $RCMAIL, $REMOTE_OBJECTS;

	if (!is_array($MESSAGE->parts) && empty($MESSAGE->body))
	return '';

	if (!$attrib['id'])
	$attrib['id'] = 'rcmailMsgBody';

	$safe_mode = $MESSAGE->is_safe \|\| intval($_GET['_safe']);
	$out = '';

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

	if (!empty($MESSAGE->parts)) {
	foreach ($MESSAGE->parts as $i => $part) {
	if ($part->type == 'headers')
	$out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part->headers);
	else if ($part->type == 'content' && $part->size) {
	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	if (!rcmail_mem_check($part->size * 10)) {
	$out .= html::span('part-notice', rcube_label('messagetoobig'). ' '
	. html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part='.$part->mime_id
	.'&_mbox='. urlencode($RCMAIL->imap->get_mailbox_name()), rcube_label('download')));
	continue;
	}

	if (empty($part->ctype_parameters) \|\| empty($part->ctype_parameters['charset']))
	$part->ctype_parameters['charset'] = $MESSAGE->headers->charset;

	// fetch part if not available
	if (!isset($part->body))
	$part->body = $MESSAGE->get_part_content($part->mime_id);

	// message is cached but not exists (#1485443), or other error
	if ($part->body === false) {
	rcmail_message_error($MESSAGE->uid);
	}

	$plugin = $RCMAIL->plugins->exec_hook('message_body_prefix', array(
	'part' => $part, 'prefix' => ''));

	$body = rcmail_print_body($part, array('safe' => $safe_mode, 'plain' => !$CONFIG['prefer_html']));

	if ($part->ctype_secondary == 'html') {
	$body = rcmail_html4inline($body, $attrib['id'], 'rcmBody', $attrs, $safe_mode);
	$div_attr = array('class' => 'message-htmlpart');
	$style = array();

	if (!empty($attrs)) {
	foreach ($attrs as $a_idx => $a_val)
	$style[] = $a_idx . ': ' . $a_val;
	if (!empty($style))
	$div_attr['style'] = implode('; ', $style);
	}

	$out .= html::div($div_attr, $plugin['prefix'] . $body);
	}
	else
	$out .= html::div('message-part', $plugin['prefix'] . $body);
	}
	}
	}
	else {
	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	if (!rcmail_mem_check(strlen($MESSAGE->body) * 10)) {
	$out .= html::span('part-notice', rcube_label('messagetoobig'). ' '
	. html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part=0'
	.'&_mbox='. urlencode($RCMAIL->imap->get_mailbox_name()), rcube_label('download')));
	}
	else {
	$plugin = $RCMAIL->plugins->exec_hook('message_body_prefix', array(
	'part' => $MESSAGE, 'prefix' => ''));

	$out .= html::div('message-part', $plugin['prefix'] . html::tag('pre', array(),
	rcmail_plain_body(Q($MESSAGE->body, 'strict', false))));
	}
	}

	// list images after mail body
	if ($CONFIG['inline_images'] && !empty($MESSAGE->attachments)) {
	foreach ($MESSAGE->attachments as $attach_prop) {
	// skip inline images
	if ($attach_prop->content_id && $attach_prop->disposition == 'inline') {
	continue;
	}

	// Content-Type: image/*...
	if (preg_match('/^image\//i', $attach_prop->mimetype) \|\|
	// ...or known file extension: many clients are using application/octet-stream
	($attach_prop->filename &&
	preg_match('/^application\/octet-stream$/i', $attach_prop->mimetype) &&
	preg_match('/\.(jpg\|jpeg\|png\|gif\|bmp)$/i', $attach_prop->filename))
	) {
	$out .= html::tag('hr') . html::p(array('align' => "center"),
	html::img(array(
	'src' => $MESSAGE->get_part_url($attach_prop->mime_id, true),
	'title' => $attach_prop->filename,
	'alt' => $attach_prop->filename,
	)));
	}
	}
	}

	// tell client that there are blocked remote objects
	if ($REMOTE_OBJECTS && !$safe_mode)
	$OUTPUT->set_env('blockedobjects', true);

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


	/**
	* Convert all relative URLs according to a <base> in HTML
	*/
	function rcmail_resolve_base($body)
	{
	// check for <base href=...>
	if (preg_match('!(<base.*href=["\']?)([hftps]{3,5}://[a-z0-9/.%-]+)!i', $body, $regs)) {
	$replacer = new rcube_base_replacer($regs[2]);
	-
	- // replace all relative paths
	- $body = preg_replace_callback('/(src\|background\|href)=(["\']?)([^"\'\s]+)(\2\|\s\|>)/Ui', array($replacer, 'callback'), $body);
	- $body = preg_replace_callback('/(url\s*$)(["\']?)([^"\'$\s]+)(\2)\)/Ui', array($replacer, 'callback'), $body);
	+ $body = $replacer->replace($body);
	}

	return $body;
	}

	+
	/**
	* modify a HTML message that it can be displayed inside a HTML page
	*/
	function rcmail_html4inline($body, $container_id, $body_id='', &$attributes=null, $allow_remote=false)
	{
	$last_style_pos = 0;
	$cont_id = $container_id.($body_id ? ' div.'.$body_id : '');

	// find STYLE tags
	while (($pos = stripos($body, '<style', $last_style_pos)) && ($pos2 = stripos($body, '</style>', $pos)))
	{
	$pos = strpos($body, '>', $pos)+1;

	// replace all css definitions with #container [def]
	$styles = rcmail_mod_css_styles(
	substr($body, $pos, $pos2-$pos), $cont_id, $allow_remote);

	$body = substr_replace($body, $styles, $pos, $pos2-$pos);
	$last_style_pos = $pos2;
	}

	// modify HTML links to open a new window if clicked
	$GLOBALS['rcmail_html_container_id'] = $container_id;
	$body = preg_replace_callback('/<(a\|link)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body);
	unset($GLOBALS['rcmail_html_container_id']);

	$body = preg_replace(array(
	// add comments arround html and other tags
	'/(<!DOCTYPE[^>]*>)/i',
	'/(<\?xml[^>]*>)/i',
	'/(<\/?html[^>]*>)/i',
	'/(<\/?head[^>]*>)/i',
	'/(<title[^>]>.<\/title>)/Ui',
	'/(<\/?meta[^>]*>)/i',
	// quote <? of php and xml files that are specified as text/html
	'/<\?/',
	'/\?>/',
	// replace <body> with <div>
	'/<body([^>]*)>/i',
	'/<\/body>/i',
	),
	array(
	'<!--\\1-->',
	'<!--\\1-->',
	'<!--\\1-->',
	'<!--\\1-->',
	'<!--\\1-->',
	'<!--\\1-->',
	'<?',
	'?>',
	'<div class="'.$body_id.'"\\1>',
	'</div>',
	),
	$body);

	$attributes = array();

	// Handle body attributes that doesn't play nicely with div elements
	$regexp = '/<div class="' . preg_quote($body_id, '/') . '"([^>]*)/';
	if (preg_match($regexp, $body, $m)) {
	$attrs = $m[0];
	// Get bgcolor, we'll set it as background-color of the message container
	if ($m[1] && preg_match('/bgcolor=["\']([a-z0-9#]+)["\']/', $attrs, $mb)) {
	$attributes['background-color'] = $mb[1];
	$attrs = preg_replace('/bgcolor=["\']([a-z0-9#]+)["\']/', '', $attrs);
	}
	// Get background, we'll set it as background-image of the message container
	if ($m[1] && preg_match('/background=["\']([^"\'>\s]+)["\']/', $attrs, $mb)) {
	$attributes['background-image'] = 'url('.$mb[1].')';
	$attrs = preg_replace('/background=["\']([^"\'>\s]+)["\']/', '', $attrs);
	}
	if (!empty($attributes)) {
	$body = preg_replace($regexp, rtrim($attrs), $body, 1);
	}

	// handle body styles related to background image
	if ($attributes['background-image']) {
	// get body style
	if (preg_match('/#'.preg_quote($cont_id, '/').'\s+\{([^}]+)}/i', $body, $m)) {
	// get background related style
	if (preg_match_all('/(background-position\|background-repeat)\s:\s([^;]+);/i', $m[1], $ma, PREG_SET_ORDER)) {
	foreach ($ma as $style)
	$attributes[$style[1]] = $style[2];
	}
	}
	}
	}
	// make sure there's 'rcmBody' div, we need it for proper css modification
	// its name is hardcoded in rcmail_message_body() also
	else {
	$body = '<div class="' . $body_id . '">' . $body . '</div>';
	}

	return $body;
	}


	/**
	* parse link attributes and set correct target
	*/
	function rcmail_alter_html_link($matches)
	{
	global $RCMAIL;

	// Support unicode/punycode in top-level domain part
	$EMAIL_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]@[^&@"\'.][^@&"\']\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}\|xn--[a-z0-9]{2,}))';

	$tag = $matches[1];
	$attrib = parse_attrib_string($matches[2]);
	$end = '>';

	// Remove non-printable characters in URL (#1487805)
	if ($attrib['href'])
	$attrib['href'] = preg_replace('/[\x00-\x1F]/', '', $attrib['href']);

	if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
	$tempurl = 'tmp-' . md5($attrib['href']) . '.css';
	$_SESSION['modcssurls'][$tempurl] = $attrib['href'];
	$attrib['href'] = $RCMAIL->url(array('task' => 'utils', 'action' => 'modcss', 'u' => $tempurl, 'c' => $GLOBALS['rcmail_html_container_id']));
	$end = ' />';
	}
	else if (preg_match('/^mailto:'.$EMAIL_PATTERN.'(\?[^"\'>]+)?/i', $attrib['href'], $mailto)) {
	$attrib['href'] = $mailto[0];
	$attrib['onclick'] = sprintf(
	"return %s.command('compose','%s',this)",
	JS_OBJECT_NAME,
	JQ($mailto[1].$mailto[3]));
	}
	else if (empty($attrib['href']) && !$attrib['name']) {
	$attrib['href'] = './#NOP';
	$attrib['onclick'] = 'return false';
	}
	else if (!empty($attrib['href']) && $attrib['href'][0] != '#') {
	$attrib['target'] = '_blank';
	}

	return "<$tag" . html::attrib_string($attrib, array('href','name','target','onclick','id','class','style','title','rel','type','media')) . $end;
	}


	/**
	* decode address string and re-format it as HTML links
	*/
	function rcmail_address_string($input, $max=null, $linked=false, $addicon=null)
	{
	global $RCMAIL, $PRINT_MODE, $CONFIG;

	$a_parts = $RCMAIL->imap->decode_address_list($input);

	if (!sizeof($a_parts))
	return $input;

	$c = count($a_parts);
	$j = 0;
	$out = '';

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

	foreach ($a_parts as $part) {
	$j++;

	$name = $part['name'];
	$mailto = $part['mailto'];
	$string = $part['string'];

	// IDNA ASCII to Unicode
	if ($name == $mailto)
	$name = rcube_idn_to_utf8($name);
	if ($string == $mailto)
	$string = rcube_idn_to_utf8($string);
	$mailto = rcube_idn_to_utf8($mailto);

	if ($PRINT_MODE) {
	$out .= sprintf('%s <%s>', Q($name), $mailto);
	}
	else if (check_email($part['mailto'], false)) {
	if ($linked) {
	$address = html::a(array(
	'href' => 'mailto:'.$mailto,
	'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($mailto)),
	'title' => $mailto,
	'class' => "rcmContactAddress",
	),
	Q($name ? $name : $mailto));
	}
	else {
	$address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
	Q($name ? $name : $mailto));
	}

	if ($addicon && $_SESSION['writeable_abook']) {
	$address = html::span(null, $address . html::a(array(
	'href' => "#add",
	'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($string)),
	'title' => rcube_label('addtoaddressbook'),
	'class' => 'rcmaddcontact',
	),
	html::img(array(
	'src' => $CONFIG['skin_path'] . $addicon,
	'alt' => "Add contact",
	))));
	}
	$out .= $address;
	}
	else {
	if ($name)
	$out .= Q($name);
	if ($mailto)
	$out .= (strlen($out) ? ' ' : '') . sprintf('<%s>', Q($mailto));
	}

	if ($c>$j)
	$out .= ','.($max ? ' ' : ' ');

	if ($max && $j==$max && $c>$j) {
	$out .= '...';
	break;
	}
	}

	return $out;
	}


	/**
	* Wrap text to a given number of characters per line
	* but respect the mail quotation of replies messages (>).
	* Finally add another quotation level by prpending the lines
	* with >
	*
	* @param string Text to wrap
	* @param int The line width
	* @return string The wrapped text
	*/
	function rcmail_wrap_and_quote($text, $length = 72)
	{
	// Rebuild the message body with a maximum of $max chars, while keeping quoted message.
	$max = min(77, $length + 8);
	$lines = preg_split('/\r?\n/', trim($text));
	$out = '';

	foreach ($lines as $line) {
	// don't wrap already quoted lines
	if ($line[0] == '>')
	$line = '>' . rtrim($line);
	else if (mb_strlen($line) > $max) {
	$newline = '';
	foreach(explode("\n", rc_wordwrap($line, $length - 2)) as $l) {
	if (strlen($l))
	$newline .= '> ' . $l . "\n";
	else
	$newline .= ">\n";
	}
	$line = rtrim($newline);
	}
	else
	$line = '> ' . $line;

	// Append the line
	$out .= $line . "\n";
	}

	return $out;
	}


	function rcmail_draftinfo_encode($p)
	{
	$parts = array();
	foreach ($p as $key => $val)
	$parts[] = $key . '=' . ($key == 'folder' ? base64_encode($val) : $val);

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


	function rcmail_draftinfo_decode($str)
	{
	$info = array();
	foreach (preg_split('/;\s+/', $str) as $part) {
	list($key, $val) = explode('=', $part, 2);
	if ($key == 'folder')
	$val = base64_decode($val);
	$info[$key] = $val;
	}

	return $info;
	}


	function rcmail_message_part_controls($attrib)
	{
	global $MESSAGE;

	$part = asciiwords(get_input_value('_part', RCUBE_INPUT_GPC));
	if (!is_object($MESSAGE) \|\| !is_array($MESSAGE->parts) \|\| !($_GET['_uid'] && $_GET['_part']) \|\| !$MESSAGE->mime_parts[$part])
	return '';

	$part = $MESSAGE->mime_parts[$part];
	$table = new html_table(array('cols' => 3));

	if (!empty($part->filename)) {
	$table->add('title', Q(rcube_label('filename')));
	$table->add('header', Q($part->filename));
	$table->add('download-link', html::a(array('href' => './?'.str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING'])), Q(rcube_label('download'))));
	}

	if (!empty($part->size)) {
	$table->add('title', Q(rcube_label('filesize')));
	$table->add('header', Q(show_bytes($part->size)));
	}

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



	function rcmail_message_part_frame($attrib)
	{
	global $MESSAGE;

	$part = $MESSAGE->mime_parts[asciiwords(get_input_value('_part', RCUBE_INPUT_GPC))];
	$ctype_primary = strtolower($part->ctype_primary);

	$attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']);

	return html::iframe($attrib);
	}


	/**
	* clear message composing settings
	*/
	function rcmail_compose_cleanup($id)
	{
	if (!isset($_SESSION['compose_data_'.$id]))
	return;

	$rcmail = rcmail::get_instance();
	$rcmail->plugins->exec_hook('attachments_cleanup', array('group' => $id));
	$rcmail->session->remove('compose_data_'.$id);
	}


	/**
	* Send the MDN response
	*
	* @param mixed $message Original message object (rcube_message) or UID
	* @param array $smtp_error SMTP error array (reference)
	*
	* @return boolean Send status
	*/
	function rcmail_send_mdn($message, &$smtp_error)
	{
	global $RCMAIL;

	if (!is_object($message) \|\| !is_a($message, 'rcube_message'))
	$message = new rcube_message($message);

	if ($message->headers->mdn_to && empty($message->headers->flags['MDNSENT']) &&
	($RCMAIL->imap->check_permflag('MDNSENT') \|\| $RCMAIL->imap->check_permflag('*')))
	{
	$identity = $RCMAIL->user->get_identity();
	$sender = format_email_recipient($identity['email'], $identity['name']);
	$recipient = array_shift($RCMAIL->imap->decode_address_list($message->headers->mdn_to));
	$mailto = $recipient['mailto'];

	$compose = new Mail_mime("\r\n");

	$compose->setParam('text_encoding', 'quoted-printable');
	$compose->setParam('html_encoding', 'quoted-printable');
	$compose->setParam('head_encoding', 'quoted-printable');
	$compose->setParam('head_charset', RCMAIL_CHARSET);
	$compose->setParam('html_charset', RCMAIL_CHARSET);
	$compose->setParam('text_charset', RCMAIL_CHARSET);

	// compose headers array
	$headers = array(
	'Date' => rcmail_user_date(),
	'From' => $sender,
	'To' => $message->headers->mdn_to,
	'Subject' => rcube_label('receiptread') . ': ' . $message->subject,
	'Message-ID' => rcmail_gen_message_id(),
	'X-Sender' => $identity['email'],
	'References' => trim($message->headers->references . ' ' . $message->headers->messageID),
	);

	if ($agent = $RCMAIL->config->get('useragent'))
	$headers['User-Agent'] = $agent;

	$body = rcube_label("yourmessage") . "\r\n\r\n" .
	"\t" . rcube_label("to") . ': ' . rcube_imap::decode_mime_string($message->headers->to, $message->headers->charset) . "\r\n" .
	"\t" . rcube_label("subject") . ': ' . $message->subject . "\r\n" .
	"\t" . rcube_label("sent") . ': ' . format_date($message->headers->date, $RCMAIL->config->get('date_long')) . "\r\n" .
	"\r\n" . rcube_label("receiptnote") . "\r\n";

	$ua = $RCMAIL->config->get('useragent', "Roundcube Webmail (Version ".RCMAIL_VERSION.")");
	$report = "Reporting-UA: $ua\r\n";

	if ($message->headers->to)
	$report .= "Original-Recipient: {$message->headers->to}\r\n";

	$report .= "Final-Recipient: rfc822; {$identity['email']}\r\n" .
	"Original-Message-ID: {$message->headers->messageID}\r\n" .
	"Disposition: manual-action/MDN-sent-manually; displayed\r\n";

	$compose->headers($headers);
	$compose->setContentType('multipart/report', array('report-type'=> 'disposition-notification'));
	$compose->setTXTBody(rc_wordwrap($body, 75, "\r\n"));
	$compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline');

	$sent = rcmail_deliver_message($compose, $identity['email'], $mailto, $smtp_error, $body_file);

	if ($sent)
	{
	$RCMAIL->imap->set_flag($message->uid, 'MDNSENT');
	return true;
	}
	}

	return false;
	}


	// Fixes some content-type names
	function rcmail_fix_mimetype($name)
	{
	// Some versions of Outlook create garbage Content-Type:
	// application/pdf.A520491B_3BF7_494D_8855_7FAC2C6C0608
	if (preg_match('/^application\/pdf.+/', $name))
	$name = 'application/pdf';

	return $name;
	}

	function rcmail_search_filter($attrib)
	{
	global $OUTPUT, $CONFIG;

	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmlistfilter';

	$attrib['onchange'] = JS_OBJECT_NAME.'.filter_mailbox(this.value)';

	/*
	RFC3501 (6.4.4): 'ALL', 'RECENT',
	'ANSWERED', 'DELETED', 'FLAGGED', 'SEEN',
	'UNANSWERED', 'UNDELETED', 'UNFLAGGED', 'UNSEEN',
	'NEW', // = (RECENT UNSEEN)
	'OLD' // = NOT RECENT
	*/

	$select_filter = new html_select($attrib);
	$select_filter->add(rcube_label('all'), 'ALL');
	$select_filter->add(rcube_label('unread'), 'UNSEEN');
	$select_filter->add(rcube_label('flagged'), 'FLAGGED');
	$select_filter->add(rcube_label('unanswered'), 'UNANSWERED');
	if (!$CONFIG['skip_deleted'])
	$select_filter->add(rcube_label('deleted'), 'DELETED');
	$select_filter->add(rcube_label('priority').': '.rcube_label('highest'), 'HEADER X-PRIORITY 1');
	$select_filter->add(rcube_label('priority').': '.rcube_label('high'), 'HEADER X-PRIORITY 2');
	$select_filter->add(rcube_label('priority').': '.rcube_label('normal'), 'NOT HEADER X-PRIORITY 1 NOT HEADER X-PRIORITY 2 NOT HEADER X-PRIORITY 4 NOT HEADER X-PRIORITY 5');
	$select_filter->add(rcube_label('priority').': '.rcube_label('low'), 'HEADER X-PRIORITY 4');
	$select_filter->add(rcube_label('priority').': '.rcube_label('lowest'), 'HEADER X-PRIORITY 5');

	$out = $select_filter->show($_SESSION['search_filter']);

	$OUTPUT->add_gui_object('search_filter', $attrib['id']);

	return $out;
	}

	function rcmail_message_error($uid=null)
	{
	global $RCMAIL;

	// Set env variables for messageerror.html template
	if ($RCMAIL->action == 'show') {
	$mbox_name = $RCMAIL->imap->get_mailbox_name();
	$RCMAIL->output->set_env('mailbox', $mbox_name);
	$RCMAIL->output->set_env('uid', null);
	}
	// display error message
	$RCMAIL->output->show_message('messageopenerror', 'error');
	// ... display message error page
	$RCMAIL->output->send('messageerror');
	}

	// register UI objects
	$OUTPUT->add_handlers(array(
	'mailboxlist' => 'rcmail_mailbox_list',
	'messages' => 'rcmail_message_list',
	'messagecountdisplay' => 'rcmail_messagecount_display',
	'quotadisplay' => 'rcmail_quota_display',
	'mailboxname' => 'rcmail_mailbox_name_display',
	'messageheaders' => 'rcmail_message_headers',
	'messagefullheaders' => 'rcmail_message_full_headers',
	'messagebody' => 'rcmail_message_body',
	'messagecontentframe' => 'rcmail_messagecontent_frame',
	'messagepartframe' => 'rcmail_message_part_frame',
	'messagepartcontrols' => 'rcmail_message_part_controls',
	'searchfilter' => 'rcmail_search_filter',
	'searchform' => array($OUTPUT, 'search_form'),
	));

	// register action aliases
	$RCMAIL->register_action_map(array(
	'preview' => 'show.inc',
	'print' => 'show.inc',
	'moveto' => 'move_del.inc',
	'delete' => 'move_del.inc',
	'send' => 'sendmail.inc',
	'expunge' => 'folders.inc',
	'purge' => 'folders.inc',
	'remove-attachment' => 'attachments.inc',
	'display-attachment' => 'attachments.inc',
	'upload' => 'attachments.inc',
	'group-expand' => 'autocomplete.inc',
	));
	diff --git a/tests/mailfunc.php b/tests/mailfunc.php
	index 1b1bbdf38..2e55d331d 100644
	--- a/tests/mailfunc.php
	+++ b/tests/mailfunc.php
	@@ -1,170 +1,174 @@
	<?php

	/**
	* Test class to test steps/mail/func.inc functions
	*
	* @package Tests
	*/
	class rcube_test_mailfunc extends UnitTestCase
	{

	function __construct()
	{
	$this->UnitTestCase('Mail body rendering tests');

	// simulate environment to successfully include func.inc
	$GLOBALS['RCMAIL'] = $RCMAIL = rcmail::get_instance();
	$GLOBALS['OUTPUT'] = $OUTPUT = $RCMAIL->load_gui();
	$RCMAIL->action = 'autocomplete';
	$RCMAIL->imap_init(false);
	$IMAP = $RCMAIL->imap;

	require_once INSTALL_PATH . 'program/steps/mail/func.inc';

	$GLOBALS['EMAIL_ADDRESS_PATTERN'] = $EMAIL_ADDRESS_PATTERN;
	}

	/**
	* Helper method to create a HTML message part object
	*/
	function get_html_part($body)
	{
	$part = new rcube_message_part;
	$part->ctype_primary = 'text';
	$part->ctype_secondary = 'html';
	$part->body = file_get_contents(TESTS_DIR . $body);
	$part->replaces = array();
	return $part;
	}

	/**
	* Test sanitization of a "normal" html message
	*/
	function test_html()
	{
	$part = $this->get_html_part('src/htmlbody.txt');
	$part->replaces = array('ex1.jpg' => 'part_1.2.jpg', 'ex2.jpg' => 'part_1.2.jpg');

	// render HTML in normal mode
	$html = rcmail_html4inline(rcmail_print_body($part, array('safe' => false)), 'foo');

	$this->assertPattern('/src="'.$part->replaces['ex1.jpg'].'"/', $html, "Replace reference to inline image");
	$this->assertPattern('#background="./program/blocked.gif"#', $html, "Replace external background image");
	$this->assertNoPattern('/ex3.jpg/', $html, "No references to external images");
	$this->assertNoPattern('/<meta [^>]+>/', $html, "No meta tags allowed");
	//$this->assertNoPattern('/<style [^>]+>/', $html, "No style tags allowed");
	$this->assertNoPattern('/<form [^>]+>/', $html, "No form tags allowed");
	$this->assertPattern('/Subscription form/', $html, "Include <form> contents");
	$this->assertPattern('/<!-- link ignored -->/', $html, "No external links allowed");
	$this->assertPattern('/<a[^>]+ target="_blank">/', $html, "Set target to _blank");
	$this->assertTrue($GLOBALS['REMOTE_OBJECTS'], "Remote object detected");

	// render HTML in safe mode
	$html2 = rcmail_html4inline(rcmail_print_body($part, array('safe' => true)), 'foo');

	$this->assertPattern('/<style [^>]+>/', $html2, "Allow styles in safe mode");
	$this->assertPattern('#src="http://evilsite.net/mailings/ex3.jpg"#', $html2, "Allow external images in HTML (safe mode)");
	$this->assertPattern("#url$'?http://evilsite.net/newsletter/image/bg/bg-64.jpg'?$#", $html2, "Allow external images in CSS (safe mode)");
	$css = '<link rel="stylesheet" .+_u=tmp-[a-z0-9]+\.css.+_action=modcss';
	$this->assertPattern('#'.$css.'#Ui', $html2, "Filter (anonymized) external styleseehts with utils/modcss.inc");
	}

	/**
	* Test the elimination of some trivial XSS vulnerabilities
	*/
	function test_html_xss()
	{
	$part = $this->get_html_part('src/htmlxss.txt');
	$washed = rcmail_print_body($part, array('safe' => true));

	$this->assertNoPattern('/src="skins/', $washed, "Remove local references");
	$this->assertNoPattern('/\son[a-z]+/', $washed, "Remove on* attributes");

	$html = rcmail_html4inline($washed, 'foo');
	$this->assertNoPattern('/onclick="return rcmail.command(\'compose\',\'xss@somehost.net\',this)"/', $html, "Clean mailto links");
	$this->assertNoPattern('/alert/', $html, "Remove alerts");
	}

	/**
	* Test HTML sanitization to fix the CSS Expression Input Validation Vulnerability
	* reported at http://www.securityfocus.com/bid/26800/
	*/
	function test_html_xss2()
	{
	$part = $this->get_html_part('src/BID-26800.txt');
	$washed = rcmail_html4inline(rcmail_print_body($part, array('safe' => true)), 'dabody', '', $attr, true);

	$this->assertNoPattern('/alert\|expression\|javascript\|xss/', $washed, "Remove evil style blocks");
	$this->assertNoPattern('/font-style:italic/', $washed, "Allow valid styles");
	}

	/**
	* Test washtml class on non-unicode characters (#1487813)
	*/
	function test_washtml_utf8()
	{
	$part = $this->get_html_part('src/invalidchars.html');
	$washed = rcmail_print_body($part);

	$this->assertPattern('/<p>символ<\/p>/', $washed, "Remove non-unicode characters from HTML message body");
	}

	/**
	* Test links pattern replacements in plaintext messages
	*/
	function test_plaintext()
	{
	$part = new rcube_message_part;
	$part->ctype_primary = 'text';
	$part->ctype_secondary = 'plain';
	$part->body = quoted_printable_decode(file_get_contents(TESTS_DIR . 'src/plainbody.txt'));
	$html = rcmail_print_body($part, array('safe' => true));

	$this->assertPattern('/<a href="mailto:nobody@roundcube.net" onclick="return rcmail.command$\'compose\',\'nobody@roundcube.net\',this$">nobody@roundcube.net<\/a>/', $html, "Mailto links with onclick");
	$this->assertPattern('#<a href="http://www.apple.com/legal/privacy" target="_blank">http://www.apple.com/legal/privacy</a>#', $html, "Links with target=_blank");
	$this->assertPattern('#\\[<a href="http://example.com/\\?tx\\[a\\]=5" target="_blank">http://example.com/\\?tx\\[a\\]=5</a>\\]#', $html, "Links with square brackets");
	}

	/**
	* Test mailto links in html messages
	*/
	function test_mailto()
	{
	$part = $this->get_html_part('src/mailto.txt');

	// render HTML in normal mode
	$html = rcmail_html4inline(rcmail_print_body($part, array('safe' => false)), 'foo');

	$mailto = '<a href="mailto:me@me.com?subject=this is the subject&body=this is the body"'
	.' onclick="return rcmail.command(\'compose\',\'me@me.com?subject=this is the subject&body=this is the body\',this)">e-mail</a>';

	$this->assertPattern('\|'.preg_quote($mailto, '\|').'\|', $html, "Extended mailto links");
	}

	/**
	* Test the elimination of HTML comments
	*/
	function test_html_comments()
	{
	$part = $this->get_html_part('src/htmlcom.txt');
	$washed = rcmail_print_body($part, array('safe' => true));

	// #1487759
	$this->assertPattern('\|<p>test1</p>\|', $washed, "Buggy HTML comments");
	// but conditional comments (<!--[if ...) should be removed
	$this->assertNoPattern('\|<p>test2</p>\|', $washed, "Conditional HTML comments");
	}

	/**
	* Test URI base resolving in HTML messages
	*/
	function test_resolve_base()
	{
	$html = file_get_contents(TESTS_DIR . 'src/htmlbase.txt');
	$html = rcmail_resolve_base($html);

	$this->assertPattern('\|src="http://alec\.pl/dir/img1\.gif"\|', $html, "URI base resolving [1]");
	$this->assertPattern('\|src="http://alec\.pl/dir/img2\.gif"\|', $html, "URI base resolving [2]");
	$this->assertPattern('\|src="http://alec\.pl/img3\.gif"\|', $html, "URI base resolving [3]");
	+
	+ // base resolving exceptions
	+ $this->assertPattern('\|src="cid:theCID"\|', $html, "URI base resolving exception [1]");
	+ $this->assertPattern('\|src="http://other\.domain\.tld/img3\.gif"\|', $html, "URI base resolving exception [2]");
	}
	}
	diff --git a/tests/src/htmlbase.txt b/tests/src/htmlbase.txt
	index d1ddd5406..eb590748b 100644
	--- a/tests/src/htmlbase.txt
	+++ b/tests/src/htmlbase.txt
	@@ -1,10 +1,12 @@
	<html>
	<head>
	<base href="http://alec.pl/dir/" />
	</head>
	<body>
	<img src="img1.gif" />
	<img src="./img2.gif" />
	<img src="../img3.gif" />
	+<img src="cid:theCID" />
	+<img src="http://other.domain.tld/img3.gif" />
	</body>
	</html>

File Metadata

Mime Type: text/x-diff
Expires: Tue, Aug 18, 7:14 AM (1 d, 3 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1259908
Default Alt Text: (224 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions