No OneTemporary
Actions

Size

664 KB

Referenced Files

None

Subscribers

None

View Options

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

	diff --git a/CHANGELOG b/CHANGELOG
	index 79f19b904..840c34901 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,1498 +1,1501 @@
	CHANGELOG Roundcube Webmail
	===========================

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

	RELEASE 0.5.4
	-------------
	- Fix XSS vulnerability in UI messages (#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/rcmail_output_html.php b/program/include/rcmail_output_html.php
	index 1290e173e..76342c245 100644
	--- a/program/include/rcmail_output_html.php
	+++ b/program/include/rcmail_output_html.php
	@@ -1,1775 +1,1778 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcmail_output_html.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2006-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Class to handle HTML page output using a skin template. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Class to create HTML page output using a skin template
	*
	* @package Core
	* @subpackage View
	*/
	class rcmail_output_html extends rcmail_output
	{
	public $type = 'html';

	protected $message = null;
	protected $js_env = array();
	protected $js_labels = array();
	protected $js_commands = array();
	protected $skin_paths = array();
	protected $template_name;
	protected $scripts_path = '';
	protected $script_files = array();
	protected $css_files = array();
	protected $scripts = array();
	protected $default_template = "<html>\n<head><title></title></head>\n<body></body>\n</html>";
	protected $header = '';
	protected $footer = '';
	protected $body = '';
	protected $base_path = '';

	// deprecated names of templates used before 0.5
	protected $deprecated_templates = array(
	'contact' => 'showcontact',
	'contactadd' => 'addcontact',
	'contactedit' => 'editcontact',
	'identityedit' => 'editidentity',
	'messageprint' => 'printmessage',
	);

	/**
	* Constructor
	*
	* @todo Replace $this->config with the real rcube_config object
	*/
	public function __construct($task = null, $framed = false)
	{
	parent::__construct();

	//$this->framed = $framed;
	$this->set_env('task', $task);
	$this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));

	// add cookie info
	$this->set_env('cookie_domain', ini_get('session.cookie_domain'));
	$this->set_env('cookie_path', ini_get('session.cookie_path'));
	$this->set_env('cookie_secure', ini_get('session.cookie_secure'));

	// load the correct skin (in case user-defined)
	$skin = $this->config->get('skin');
	$this->set_skin($skin);
	$this->set_env('skin', $skin);

	if (!empty($_REQUEST['_extwin']))
	$this->set_env('extwin', 1);

	// add common javascripts
	$this->add_script('var '.self::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');

	// don't wait for page onload. Call init at the bottom of the page (delayed)
	$this->add_script(self::JS_OBJECT_NAME.'.init();', 'docready');

	$this->scripts_path = 'program/js/';
	$this->include_script('jquery.min.js');
	$this->include_script('common.js');
	$this->include_script('app.js');

	// register common UI objects
	$this->add_handlers(array(
	'loginform' => array($this, 'login_form'),
	'preloader' => array($this, 'preloader'),
	'username' => array($this, 'current_username'),
	'message' => array($this, 'message_container'),
	'charsetselector' => array($this, 'charset_selector'),
	'aboutcontent' => array($this, 'about_content'),
	));
	}


	/**
	* Set environment variable
	*
	* @param string Property name
	* @param mixed Property value
	* @param boolean True if this property should be added to client environment
	*/
	public function set_env($name, $value, $addtojs = true)
	{
	$this->env[$name] = $value;
	if ($addtojs \|\| isset($this->js_env[$name])) {
	$this->js_env[$name] = $value;
	}
	}


	/**
	* Getter for the current page title
	*
	* @return string The page title
	*/
	protected function get_pagetitle()
	{
	if (!empty($this->pagetitle)) {
	$title = $this->pagetitle;
	}
	else if ($this->env['task'] == 'login') {
	$title = $this->app->gettext(array(
	'name' => 'welcome',
	'vars' => array('product' => $this->config->get('product_name')
	)));
	}
	else {
	$title = ucfirst($this->env['task']);
	}

	return $title;
	}


	/**
	* Set skin
	*/
	public function set_skin($skin)
	{
	$valid = false;

	if (!empty($skin) && is_dir('skins/'.$skin) && is_readable('skins/'.$skin)) {
	$skin_path = 'skins/'.$skin;
	$valid = true;
	}
	else {
	$skin_path = $this->config->get('skin_path');
	if (!$skin_path) {
	$skin_path = 'skins/' . rcube_config::DEFAULT_SKIN;
	}
	$valid = !$skin;
	}

	$this->config->set('skin_path', $skin_path);

	// register skin path(s)
	$this->skin_paths = array();
	$this->load_skin($skin_path);

	return $valid;
	}

	/**
	* Helper method to recursively read skin meta files and register search paths
	*/
	private function load_skin($skin_path)
	{
	$this->skin_paths[] = $skin_path;

	// read meta file and check for dependecies
	$meta = @json_decode(@file_get_contents($skin_path.'/meta.json'), true);
	if ($meta['extends'] && is_dir('skins/' . $meta['extends'])) {
	$this->load_skin('skins/' . $meta['extends']);
	}
	}


	/**
	* Check if a specific template exists
	*
	* @param string Template name
	* @return boolean True if template exists
	*/
	public function template_exists($name)
	{
	$found = false;
	foreach ($this->skin_paths as $skin_path) {
	$filename = $skin_path . '/templates/' . $name . '.html';
	$found = (is_file($filename) && is_readable($filename)) \|\| ($this->deprecated_templates[$name] && $this->template_exists($this->deprecated_templates[$name]));
	if ($found)
	break;
	}
	return $found;
	}


	/**
	* Find the given file in the current skin path stack
	*
	* @param string File name/path to resolve (starting with /)
	* @param string Reference to the base path of the matching skin
	* @param string Additional path to search in
	* @return mixed Relative path to the requested file or False if not found
	*/
	public function get_skin_file($file, &$skin_path, $add_path = null)
	{
	$skin_paths = $this->skin_paths;
	if ($add_path)
	array_unshift($skin_paths, $add_path);

	foreach ($skin_paths as $skin_path) {
	$path = realpath($skin_path . $file);
	if (is_file($path)) {
	return $skin_path . $file;
	}
	}

	return false;
	}


	/**
	* Register a GUI object to the client script
	*
	* @param string Object name
	* @param string Object ID
	* @return void
	*/
	public function add_gui_object($obj, $id)
	{
	$this->add_script(self::JS_OBJECT_NAME.".gui_object('$obj', '$id');");
	}


	/**
	* Call a client method
	*
	* @param string Method to call
	* @param ... Additional arguments
	*/
	public function command()
	{
	$cmd = func_get_args();
	if (strpos($cmd[0], 'plugin.') !== false)
	$this->js_commands[] = array('triggerEvent', $cmd[0], $cmd[1]);
	else
	$this->js_commands[] = $cmd;
	}


	/**
	* Add a localized label to the client environment
	*/
	public function add_label()
	{
	$args = func_get_args();
	if (count($args) == 1 && is_array($args[0]))
	$args = $args[0];

	foreach ($args as $name) {
	$this->js_labels[$name] = $this->app->gettext($name);
	}
	}


	/**
	* Invoke display_message command
	*
	* @param string $message Message to display
	* @param string $type Message type [notice\|confirm\|error]
	* @param array $vars Key-value pairs to be replaced in localized text
	* @param boolean $override Override last set message
	* @param int $timeout Message display time in seconds
	* @uses self::command()
	*/
	public function show_message($message, $type='notice', $vars=null, $override=true, $timeout=0)
	{
	if ($override \|\| !$this->message) {
	if ($this->app->text_exists($message)) {
	if (!empty($vars))
	$vars = array_map('Q', $vars);
	$msgtext = $this->app->gettext(array('name' => $message, 'vars' => $vars));
	}
	else
	$msgtext = $message;

	$this->message = $message;
	$this->command('display_message', $msgtext, $type, $timeout * 1000);
	}
	}


	/**
	* Delete all stored env variables and commands
	*/
	public function reset()
	{
	parent::reset();
	$this->js_env = array();
	$this->js_labels = array();
	$this->js_commands = array();
	$this->script_files = array();
	$this->scripts = array();
	$this->header = '';
	$this->footer = '';
	$this->body = '';
	}


	/**
	* Redirect to a certain url
	*
	* @param mixed $p Either a string with the action or url parameters as key-value pairs
	* @param int $delay Delay in seconds
	*/
	public function redirect($p = array(), $delay = 1)
	{
	if ($this->env['extwin'])
	$p['extwin'] = 1;
	$location = $this->app->url($p);
	header('Location: ' . $location);
	exit;
	}


	/**
	* Send the request output to the client.
	* This will either parse a skin tempalte or send an AJAX response
	*
	* @param string Template name
	* @param boolean True if script should terminate (default)
	*/
	public function send($templ = null, $exit = true)
	{
	if ($templ != 'iframe') {
	// prevent from endless loops
	if ($exit != 'recur' && $this->app->plugins->is_processing('render_page')) {
	rcube::raise_error(array('code' => 505, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => 'Recursion alert: ignoring output->send()'), true, false);
	return;
	}
	$this->parse($templ, false);
	}
	else {
	$this->framed = $templ == 'iframe' ? true : $this->framed;
	$this->write();
	}

	// set output asap
	ob_flush();
	flush();

	if ($exit) {
	exit;
	}
	}


	/**
	* Process template and write to stdOut
	*
	* @param string $template HTML template content
	*/
	public function write($template = '')
	{
	// unlock interface after iframe load
	$unlock = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['_unlock']);
	if ($this->framed) {
	array_unshift($this->js_commands, array('set_busy', false, null, $unlock));
	}
	else if ($unlock) {
	array_unshift($this->js_commands, array('hide_message', $unlock));
	}

	if (!empty($this->script_files))
	$this->set_env('request_token', $this->app->get_request_token());

	// write all env variables to client
	$js = $this->framed ? "if(window.parent) {\n" : '';
	$js .= $this->get_js_commands() . ($this->framed ? ' }' : '');
	$this->add_script($js, 'head_top');

	// send clickjacking protection headers
	$iframe = $this->framed \|\| !empty($_REQUEST['_framed']);
	if (!headers_sent() && ($xframe = $this->app->config->get('x_frame_options', 'sameorigin')))
	header('X-Frame-Options: ' . ($iframe && $xframe == 'deny' ? 'sameorigin' : $xframe));

	// call super method
	$this->_write($template, $this->config->get('skin_path'));
	}


	/**
	* Parse a specific skin template and deliver to stdout (or return)
	*
	* @param string Template name
	* @param boolean Exit script
	* @param boolean Don't write to stdout, return parsed content instead
	*
	* @link http://php.net/manual/en/function.exit.php
	*/
	function parse($name = 'main', $exit = true, $write = true)
	{
	$plugin = false;
	$realname = $name;
	$this->template_name = $realname;

	$temp = explode('.', $name, 2);
	if (count($temp) > 1) {
	$plugin = $temp[0];
	$name = $temp[1];
	$skin_dir = $plugin . '/skins/' . $this->config->get('skin');

	// apply skin search escalation list to plugin directory
	$plugin_skin_paths = array();
	foreach ($this->skin_paths as $skin_path) {
	$plugin_skin_paths[] = $this->app->plugins->url . $plugin . '/' . $skin_path;
	}

	// add fallback to default skin
	if (is_dir($this->app->plugins->dir . $plugin . '/skins/default')) {
	$skin_dir = $plugin . '/skins/default';
	$plugin_skin_paths[] = $this->app->plugins->url . $skin_dir;
	}

	// add plugin skin paths to search list
	$this->skin_paths = array_merge($plugin_skin_paths, $this->skin_paths);
	}

	// find skin template
	$path = false;
	foreach ($this->skin_paths as $skin_path) {
	$path = "$skin_path/templates/$name.html";

	// fallback to deprecated template names
	if (!is_readable($path) && $this->deprecated_templates[$realname]) {
	$path = "$skin_path/templates/" . $this->deprecated_templates[$realname] . ".html";

	if (is_readable($path)) {
	rcube::raise_error(array(
	'code' => 502, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Using deprecated template '" . $this->deprecated_templates[$realname]
	. "' in $skin_path/templates. Please rename to '$realname'"),
	true, false);
	}
	}

	if (is_readable($path)) {
	$this->config->set('skin_path', $skin_path);
	$this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin)
	break;
	}
	else {
	$path = false;
	}
	}

	// read template file
	if (!$path \|\| ($templ = @file_get_contents($path)) === false) {
	rcube::raise_error(array(
	'code' => 501,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => 'Error loading template for '.$realname
	), true, $write);
	return false;
	}

	// replace all path references to plugins/... with the configured plugins dir
	// and /this/ to the current plugin skin directory
	if ($plugin) {
	$templ = preg_replace(array('/\bplugins\//', '/(["\']?)\/this\//'), array($this->app->plugins->url, '\\1'.$this->app->plugins->url.$skin_dir.'/'), $templ);
	}

	// parse for specialtags
	$output = $this->parse_conditions($templ);
	$output = $this->parse_xml($output);

	// trigger generic hook where plugins can put additional content to the page
	$hook = $this->app->plugins->exec_hook("render_page", array('template' => $realname, 'content' => $output));

	// save some memory
	$output = $hook['content'];
	unset($hook['content']);

	// make sure all <form> tags have a valid request token
	$output = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $output);
	$this->footer = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $this->footer);

	if ($write) {
	// add debug console
	if ($realname != 'error' && ($this->config->get('debug_level') & 8)) {
	$this->add_footer('<div id="console" style="position:absolute;top:5px;left:5px;width:405px;padding:2px;background:white;z-index:9000;display:none">
	<a href="#toggle" onclick="con=$(\'#dbgconsole\');con[con.is(\':visible\')?\'hide\':\'show\']();return false">console</a>
	<textarea name="console" id="dbgconsole" rows="20" cols="40" style="display:none;width:400px;border:none;font-size:10px" spellcheck="false"></textarea></div>'
	);
	$this->add_script(
	"if (!window.console \|\| !window.console.log) {\n".
	" window.console = new rcube_console();\n".
	" $('#console').show();\n".
	"}", 'foot');
	}
	$this->write(trim($output));
	}
	else {
	return $output;
	}

	if ($exit) {
	exit;
	}
	}


	/**
	* Return executable javascript code for all registered commands
	*
	* @return string $out
	*/
	protected function get_js_commands()
	{
	$out = '';
	if (!$this->framed && !empty($this->js_env)) {
	$out .= self::JS_OBJECT_NAME . '.set_env('.self::json_serialize($this->js_env).");\n";
	}
	if (!empty($this->js_labels)) {
	$this->command('add_label', $this->js_labels);
	}
	foreach ($this->js_commands as $i => $args) {
	$method = array_shift($args);
	foreach ($args as $i => $arg) {
	$args[$i] = self::json_serialize($arg);
	}
	$parent = $this->framed \|\| preg_match('/^parent\./', $method);
	$out .= sprintf(
	"%s.%s(%s);\n",
	($parent ? 'if(window.parent && parent.'.self::JS_OBJECT_NAME.') parent.' : '') . self::JS_OBJECT_NAME,
	preg_replace('/^parent\./', '', $method),
	implode(',', $args)
	);
	}

	return $out;
	}


	/**
	* Make URLs starting with a slash point to skin directory
	*
	* @param string Input string
	* @param boolean True if URL should be resolved using the current skin path stack
	* @return string
	*/
	public function abs_url($str, $search_path = false)
	{
	if ($str[0] == '/') {
	if ($search_path && ($file_url = $this->get_skin_file($str, $skin_path)))
	return $file_url;

	return $this->base_path . $str;
	}
	else
	return $str;
	}


	/**
	* Show error page and terminate script execution
	*
	* @param int $code Error code
	* @param string $message Error message
	*/
	public function raise_error($code, $message)
	{
	global $__page_content, $ERROR_CODE, $ERROR_MESSAGE;

	$ERROR_CODE = $code;
	$ERROR_MESSAGE = $message;

	include RCUBE_INSTALL_PATH . 'program/steps/utils/error.inc';
	exit;
	}


	/*** Template parsing methods ***/

	/**
	* Replace all strings ($varname)
	* with the content of the according global variable.
	*/
	protected function parse_with_globals($input)
	{
	$GLOBALS['__version'] = html::quote(RCMAIL_VERSION);
	$GLOBALS['__comm_path'] = html::quote($this->app->comm_path);
	$GLOBALS['__skin_path'] = html::quote($this->base_path);

	return preg_replace_callback('/\$(__[a-z0-9_\-]+)/',
	array($this, 'globals_callback'), $input);
	}


	/**
	* Callback funtion for preg_replace_callback() in parse_with_globals()
	*/
	protected function globals_callback($matches)
	{
	return $GLOBALS[$matches[1]];
	}


	/**
	* Correct absolute paths in images and other tags
	* add timestamp to .js and .css filename
	*/
	protected function fix_paths($output)
	{
	return preg_replace_callback(
	'!(src\|href\|background)=(["\']?)([a-z0-9/_.-]+)(["\'\s>])!i',
	array($this, 'file_callback'), $output);
	}


	/**
	* Callback function for preg_replace_callback in write()
	*
	* @return string Parsed string
	*/
	protected function file_callback($matches)
	{
	$file = $matches[3];

	// correct absolute paths
	if ($file[0] == '/') {
	$file = $this->base_path . $file;
	}

	// add file modification timestamp
	if (preg_match('/\.(js\|css)$/', $file)) {
	if ($fs = @filemtime($file)) {
	$file .= '?s=' . $fs;
	}
	}

	return $matches[1] . '=' . $matches[2] . $file . $matches[4];
	}


	/**
	* Public wrapper to dipp into template parsing.
	*
	* @param string $input
	* @return string
	* @uses rcube_output_html::parse_xml()
	* @since 0.1-rc1
	*/
	public function just_parse($input)
	{
	- return $this->parse_xml($input);
	+ $input = $this->parse_conditions($input);
	+ $input = $this->parse_xml($input);
	+
	+ return $input;
	}


	/**
	* Parse for conditional tags
	*
	* @param string $input
	* @return string
	*/
	protected function parse_conditions($input)
	{
	$matches = preg_split('/<roundcube:(if\|elseif\|else\|endif)\s+([^>]+)>\n?/is', $input, 2, PREG_SPLIT_DELIM_CAPTURE);
	if ($matches && count($matches) == 4) {
	if (preg_match('/^(else\|endif)$/i', $matches[1])) {
	return $matches[0] . $this->parse_conditions($matches[3]);
	}
	$attrib = html::parse_attrib_string($matches[2]);
	if (isset($attrib['condition'])) {
	$condmet = $this->check_condition($attrib['condition']);
	$submatches = preg_split('/<roundcube:(elseif\|else\|endif)\s+([^>]+)>\n?/is', $matches[3], 2, PREG_SPLIT_DELIM_CAPTURE);
	if ($condmet) {
	$result = $submatches[0];
	$result.= ($submatches[1] != 'endif' ? preg_replace('/.*<roundcube:endif\s+[^>]+>\n?/Uis', '', $submatches[3], 1) : $submatches[3]);
	}
	else {
	$result = "<roundcube:$submatches[1] $submatches[2]>" . $submatches[3];
	}
	return $matches[0] . $this->parse_conditions($result);
	}
	rcube::raise_error(array(
	'code' => 500,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => "Unable to parse conditional tag " . $matches[2]
	), true, false);
	}
	return $input;
	}


	/**
	* Determines if a given condition is met
	*
	* @todo Get rid off eval() once I understand what this does.
	* @todo Extend this to allow real conditions, not just "set"
	* @param string Condition statement
	* @return boolean True if condition is met, False if not
	*/
	protected function check_condition($condition)
	{
	return eval("return (".$this->parse_expression($condition).");");
	}


	/**
	* Inserts hidden field with CSRF-prevention-token into POST forms
	*/
	protected function alter_form_tag($matches)
	{
	$out = $matches[0];
	$attrib = html::parse_attrib_string($matches[1]);

	if (strtolower($attrib['method']) == 'post') {
	$hidden = new html_hiddenfield(array('name' => '_token', 'value' => $this->app->get_request_token()));
	$out .= "\n" . $hidden->show();
	}

	return $out;
	}


	/**
	* Parses expression and replaces variables
	*
	* @param string Expression statement
	* @return string Expression value
	*/
	protected function parse_expression($expression)
	{
	return preg_replace(
	array(
	'/session:([a-z0-9_]+)/i',
	'/config:([a-z0-9_]+)(:([a-z0-9_]+))?/i',
	'/env:([a-z0-9_]+)/i',
	'/request:([a-z0-9_]+)/i',
	'/cookie:([a-z0-9_]+)/i',
	'/browser:([a-z0-9_]+)/i',
	'/template:name/i',
	),
	array(
	"\$_SESSION['\\1']",
	"\$this->app->config->get('\\1',rcube_utils::get_boolean('\\3'))",
	"\$this->env['\\1']",
	"rcube_utils::get_input_value('\\1', rcube_utils::INPUT_GPC)",
	"\$_COOKIE['\\1']",
	"\$this->browser->{'\\1'}",
	$this->template_name,
	),
	$expression);
	}


	/**
	* Search for special tags in input and replace them
	* with the appropriate content
	*
	* @param string Input string to parse
	* @return string Altered input string
	* @todo Use DOM-parser to traverse template HTML
	* @todo Maybe a cache.
	*/
	protected function parse_xml($input)
	{
	return preg_replace_callback('/<roundcube:([-_a-z]+)\s+((?:[^>]\|\\\\>)+)(?<!\\\\)>/Ui', array($this, 'xml_command'), $input);
	}


	/**
	* Callback function for parsing an xml command tag
	* and turn it into real html content
	*
	* @param array Matches array of preg_replace_callback
	* @return string Tag/Object content
	*/
	protected function xml_command($matches)
	{
	$command = strtolower($matches[1]);
	$attrib = html::parse_attrib_string($matches[2]);

	// empty output if required condition is not met
	if (!empty($attrib['condition']) && !$this->check_condition($attrib['condition'])) {
	return '';
	}

	// execute command
	switch ($command) {
	// return a button
	case 'button':
	if ($attrib['name'] \|\| $attrib['command']) {
	return $this->button($attrib);
	}
	break;

	// frame
	case 'frame':
	return $this->frame($attrib);
	break;

	// show a label
	case 'label':
	if ($attrib['expression'])
	$attrib['name'] = eval("return " . $this->parse_expression($attrib['expression']) .";");

	if ($attrib['name'] \|\| $attrib['command']) {
	// @FIXME: 'noshow' is useless, remove?
	if ($attrib['noshow']) {
	return '';
	}

	$vars = $attrib + array('product' => $this->config->get('product_name'));
	unset($vars['name'], $vars['command']);

	$label = $this->app->gettext($attrib + array('vars' => $vars));
	$quoting = !empty($attrib['quoting']) ? strtolower($attrib['quoting']) : (rcube_utils::get_boolean((string)$attrib['html']) ? 'no' : '');

	switch ($quoting) {
	case 'no':
	case 'raw':
	break;
	case 'javascript':
	case 'js':
	$label = rcube::JQ($label);
	break;
	default:
	$label = html::quote($label);
	break;
	}

	return $label;
	}
	break;

	// include a file
	case 'include':
	$old_base_path = $this->base_path;
	if ($path = $this->get_skin_file($attrib['file'], $skin_path, $attrib['skinpath'])) {
	$this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin)
	$path = realpath($path);
	}

	if (is_readable($path)) {
	if ($this->config->get('skin_include_php')) {
	$incl = $this->include_php($path);
	}
	else {
	$incl = file_get_contents($path);
	}
	$incl = $this->parse_conditions($incl);
	$incl = $this->parse_xml($incl);
	$incl = $this->fix_paths($incl);
	$this->base_path = $old_base_path;
	return $incl;
	}
	break;

	case 'plugin.include':
	$hook = $this->app->plugins->exec_hook("template_plugin_include", $attrib);
	return $hook['content'];

	// define a container block
	case 'container':
	if ($attrib['name'] && $attrib['id']) {
	$this->command('gui_container', $attrib['name'], $attrib['id']);
	// let plugins insert some content here
	$hook = $this->app->plugins->exec_hook("template_container", $attrib);
	return $hook['content'];
	}
	break;

	// return code for a specific application object
	case 'object':
	$object = strtolower($attrib['name']);
	$content = '';

	// we are calling a class/method
	if (($handler = $this->object_handlers[$object]) && is_array($handler)) {
	if ((is_object($handler[0]) && method_exists($handler[0], $handler[1])) \|\|
	(is_string($handler[0]) && class_exists($handler[0])))
	$content = call_user_func($handler, $attrib);
	}
	// execute object handler function
	else if (function_exists($handler)) {
	$content = call_user_func($handler, $attrib);
	}
	else if ($object == 'doctype') {
	$content = html::doctype($attrib['value']);
	}
	else if ($object == 'logo') {
	$attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));
	if ($logo = $this->config->get('skin_logo'))
	$attrib['src'] = $logo;
	$content = html::img($attrib);
	}
	else if ($object == 'productname') {
	$name = $this->config->get('product_name', 'Roundcube Webmail');
	$content = html::quote($name);
	}
	else if ($object == 'version') {
	$ver = (string)RCMAIL_VERSION;
	if (is_file(RCUBE_INSTALL_PATH . '.svn/entries')) {
	if (preg_match('/Revision:\s(\d+)/', @shell_exec('svn info'), $regs))
	$ver .= ' [SVN r'.$regs[1].']';
	}
	else if (is_file(RCUBE_INSTALL_PATH . '.git/index')) {
	if (preg_match('/Date:\s+([^\n]+)/', @shell_exec('git log -1'), $regs)) {
	if ($date = date('Ymd.Hi', strtotime($regs[1]))) {
	$ver .= ' [GIT '.$date.']';
	}
	}
	}
	$content = html::quote($ver);
	}
	else if ($object == 'steptitle') {
	$content = html::quote($this->get_pagetitle());
	}
	else if ($object == 'pagetitle') {
	if ($this->config->get('devel_mode') && !empty($_SESSION['username']))
	$title = $_SESSION['username'].' :: ';
	else if ($prod_name = $this->config->get('product_name'))
	$title = $prod_name . ' :: ';
	else
	$title = '';
	$title .= $this->get_pagetitle();
	$content = html::quote($title);
	}

	// exec plugin hooks for this template object
	$hook = $this->app->plugins->exec_hook("template_object_$object", $attrib + array('content' => $content));
	return $hook['content'];

	// return code for a specified eval expression
	case 'exp':
	$value = $this->parse_expression($attrib['expression']);
	return eval("return html::quote($value);");

	// return variable
	case 'var':
	$var = explode(':', $attrib['name']);
	$name = $var[1];
	$value = '';

	switch ($var[0]) {
	case 'env':
	$value = $this->env[$name];
	break;
	case 'config':
	$value = $this->config->get($name);
	if (is_array($value) && $value[$_SESSION['storage_host']]) {
	$value = $value[$_SESSION['storage_host']];
	}
	break;
	case 'request':
	$value = rcube_utils::get_input_value($name, rcube_utils::INPUT_GPC);
	break;
	case 'session':
	$value = $_SESSION[$name];
	break;
	case 'cookie':
	$value = htmlspecialchars($_COOKIE[$name]);
	break;
	case 'browser':
	$value = $this->browser->{$name};
	break;
	}

	if (is_array($value)) {
	$value = implode(', ', $value);
	}

	return html::quote($value);
	break;
	}
	return '';
	}


	/**
	* Include a specific file and return it's contents
	*
	* @param string File path
	* @return string Contents of the processed file
	*/
	protected function include_php($file)
	{
	ob_start();
	include $file;
	$out = ob_get_contents();
	ob_end_clean();

	return $out;
	}


	/**
	* Create and register a button
	*
	* @param array Named button attributes
	* @return string HTML button
	* @todo Remove all inline JS calls and use jQuery instead.
	* @todo Remove all sprintf()'s - they are pretty, but also slow.
	*/
	public function button($attrib)
	{
	static $s_button_count = 100;

	// these commands can be called directly via url
	$a_static_commands = array('compose', 'list', 'preferences', 'folders', 'identities');

	if (!($attrib['command'] \|\| $attrib['name'])) {
	return '';
	}

	// try to find out the button type
	if ($attrib['type']) {
	$attrib['type'] = strtolower($attrib['type']);
	}
	else {
	$attrib['type'] = ($attrib['image'] \|\| $attrib['imagepas'] \|\| $attrib['imageact']) ? 'image' : 'link';
	}

	$command = $attrib['command'];

	if ($attrib['task'])
	$command = $attrib['task'] . '.' . $command;

	if (!$attrib['image']) {
	$attrib['image'] = $attrib['imagepas'] ? $attrib['imagepas'] : $attrib['imageact'];
	}

	if (!$attrib['id']) {
	$attrib['id'] = sprintf('rcmbtn%d', $s_button_count++);
	}
	// get localized text for labels and titles
	if ($attrib['title']) {
	$attrib['title'] = html::quote($this->app->gettext($attrib['title'], $attrib['domain']));
	}
	if ($attrib['label']) {
	$attrib['label'] = html::quote($this->app->gettext($attrib['label'], $attrib['domain']));
	}
	if ($attrib['alt']) {
	$attrib['alt'] = html::quote($this->app->gettext($attrib['alt'], $attrib['domain']));
	}

	// set title to alt attribute for IE browsers
	if ($this->browser->ie && !$attrib['title'] && $attrib['alt']) {
	$attrib['title'] = $attrib['alt'];
	}

	// add empty alt attribute for XHTML compatibility
	if (!isset($attrib['alt'])) {
	$attrib['alt'] = '';
	}

	// register button in the system
	if ($attrib['command']) {
	$this->add_script(sprintf(
	"%s.register_button('%s', '%s', '%s', '%s', '%s', '%s');",
	self::JS_OBJECT_NAME,
	$command,
	$attrib['id'],
	$attrib['type'],
	$attrib['imageact'] ? $this->abs_url($attrib['imageact']) : $attrib['classact'],
	$attrib['imagesel'] ? $this->abs_url($attrib['imagesel']) : $attrib['classsel'],
	$attrib['imageover'] ? $this->abs_url($attrib['imageover']) : ''
	));

	// make valid href to specific buttons
	if (in_array($attrib['command'], rcmail::$main_tasks)) {
	$attrib['href'] = $this->app->url(array('task' => $attrib['command']));
	$attrib['onclick'] = sprintf("return %s.command('switch-task','%s',this,event)", self::JS_OBJECT_NAME, $attrib['command']);
	}
	else if ($attrib['task'] && in_array($attrib['task'], rcmail::$main_tasks)) {
	$attrib['href'] = $this->app->url(array('action' => $attrib['command'], 'task' => $attrib['task']));
	}
	else if (in_array($attrib['command'], $a_static_commands)) {
	$attrib['href'] = $this->app->url(array('action' => $attrib['command']));
	}
	else if (($attrib['command'] == 'permaurl' \|\| $attrib['command'] == 'extwin') && !empty($this->env['permaurl'])) {
	$attrib['href'] = $this->env['permaurl'];
	}
	}

	// overwrite attributes
	if (!$attrib['href']) {
	$attrib['href'] = '#';
	}
	if ($attrib['task']) {
	if ($attrib['classact'])
	$attrib['class'] = $attrib['classact'];
	}
	else if ($command && !$attrib['onclick']) {
	$attrib['onclick'] = sprintf(
	"return %s.command('%s','%s',this,event)",
	self::JS_OBJECT_NAME,
	$command,
	$attrib['prop']
	);
	}

	$out = '';

	// generate image tag
	if ($attrib['type'] == 'image') {
	$attrib_str = html::attrib_string(
	$attrib,
	array(
	'style', 'class', 'id', 'width', 'height', 'border', 'hspace',
	'vspace', 'align', 'alt', 'tabindex', 'title'
	)
	);
	$btn_content = sprintf('<img src="%s"%s />', $this->abs_url($attrib['image']), $attrib_str);
	if ($attrib['label']) {
	$btn_content .= ' '.$attrib['label'];
	}
	$link_attrib = array('href', 'onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'target');
	}
	else if ($attrib['type'] == 'link') {
	$btn_content = isset($attrib['content']) ? $attrib['content'] : ($attrib['label'] ? $attrib['label'] : $attrib['command']);
	$link_attrib = array('href', 'onclick', 'title', 'id', 'class', 'style', 'tabindex', 'target');
	if ($attrib['innerclass'])
	$btn_content = html::span($attrib['innerclass'], $btn_content);
	}
	else if ($attrib['type'] == 'input') {
	$attrib['type'] = 'button';

	if ($attrib['label']) {
	$attrib['value'] = $attrib['label'];
	}
	if ($attrib['command']) {
	$attrib['disabled'] = 'disabled';
	}

	$out = html::tag('input', $attrib, null, array('type', 'value', 'onclick', 'id', 'class', 'style', 'tabindex', 'disabled'));
	}

	// generate html code for button
	if ($btn_content) {
	$attrib_str = html::attrib_string($attrib, $link_attrib);
	$out = sprintf('<a%s>%s</a>', $attrib_str, $btn_content);
	}

	return $out;
	}


	/**
	* Link an external script file
	*
	* @param string File URL
	* @param string Target position [head\|foot]
	*/
	public function include_script($file, $position='head')
	{
	static $sa_files = array();

	if (!preg_match('\|^https?://\|i', $file) && $file[0] != '/') {
	$file = $this->scripts_path . $file;
	if ($fs = @filemtime($file)) {
	$file .= '?s=' . $fs;
	}
	}

	if (in_array($file, $sa_files)) {
	return;
	}

	$sa_files[] = $file;

	if (!is_array($this->script_files[$position])) {
	$this->script_files[$position] = array();
	}

	$this->script_files[$position][] = $file;
	}


	/**
	* Add inline javascript code
	*
	* @param string JS code snippet
	* @param string Target position [head\|head_top\|foot]
	*/
	public function add_script($script, $position='head')
	{
	if (!isset($this->scripts[$position])) {
	$this->scripts[$position] = "\n" . rtrim($script);
	}
	else {
	$this->scripts[$position] .= "\n" . rtrim($script);
	}
	}


	/**
	* Link an external css file
	*
	* @param string File URL
	*/
	public function include_css($file)
	{
	$this->css_files[] = $file;
	}


	/**
	* Add HTML code to the page header
	*
	* @param string $str HTML code
	*/
	public function add_header($str)
	{
	$this->header .= "\n" . $str;
	}


	/**
	* Add HTML code to the page footer
	* To be added right befor </body>
	*
	* @param string $str HTML code
	*/
	public function add_footer($str)
	{
	$this->footer .= "\n" . $str;
	}


	/**
	* Process template and write to stdOut
	*
	* @param string HTML template
	* @param string Base for absolute paths
	*/
	public function _write($templ = '', $base_path = '')
	{
	$output = empty($templ) ? $this->default_template : trim($templ);

	// set default page title
	if (empty($this->pagetitle)) {
	$this->pagetitle = 'Roundcube Mail';
	}

	// replace specialchars in content
	$page_title = html::quote($this->pagetitle);
	$page_header = '';
	$page_footer = '';

	// include meta tag with charset
	if (!empty($this->charset)) {
	if (!headers_sent()) {
	header('Content-Type: text/html; charset=' . $this->charset);
	}
	$page_header = '<meta http-equiv="content-type"';
	$page_header.= ' content="text/html; charset=';
	$page_header.= $this->charset . '" />'."\n";
	}

	// definition of the code to be placed in the document header and footer
	if (is_array($this->script_files['head'])) {
	foreach ($this->script_files['head'] as $file) {
	$page_header .= html::script($file);
	}
	}

	$head_script = $this->scripts['head_top'] . $this->scripts['head'];
	if (!empty($head_script)) {
	$page_header .= html::script(array(), $head_script);
	}

	if (!empty($this->header)) {
	$page_header .= $this->header;
	}

	// put docready commands into page footer
	if (!empty($this->scripts['docready'])) {
	$this->add_script('$(document).ready(function(){ ' . $this->scripts['docready'] . "\n});", 'foot');
	}

	if (is_array($this->script_files['foot'])) {
	foreach ($this->script_files['foot'] as $file) {
	$page_footer .= html::script($file);
	}
	}

	if (!empty($this->footer)) {
	$page_footer .= $this->footer . "\n";
	}

	if (!empty($this->scripts['foot'])) {
	$page_footer .= html::script(array(), $this->scripts['foot']);
	}

	// find page header
	if ($hpos = stripos($output, '</head>')) {
	$page_header .= "\n";
	}
	else {
	if (!is_numeric($hpos)) {
	$hpos = stripos($output, '<body');
	}
	if (!is_numeric($hpos) && ($hpos = stripos($output, '<html'))) {
	while ($output[$hpos] != '>') {
	$hpos++;
	}
	$hpos++;
	}
	$page_header = "<head>\n<title>$page_title</title>\n$page_header\n</head>\n";
	}

	// add page hader
	if ($hpos) {
	$output = substr_replace($output, $page_header, $hpos, 0);
	}
	else {
	$output = $page_header . $output;
	}

	// add page footer
	if (($fpos = strripos($output, '</body>')) \|\| ($fpos = strripos($output, '</html>'))) {
	$output = substr_replace($output, $page_footer."\n", $fpos, 0);
	}
	else {
	$output .= "\n".$page_footer;
	}

	// add css files in head, before scripts, for speed up with parallel downloads
	if (!empty($this->css_files) &&
	(($pos = stripos($output, '<script ')) \|\| ($pos = stripos($output, '</head>')))
	) {
	$css = '';
	foreach ($this->css_files as $file) {
	$css .= html::tag('link', array('rel' => 'stylesheet',
	'type' => 'text/css', 'href' => $file, 'nl' => true));
	}
	$output = substr_replace($output, $css, $pos, 0);
	}

	$output = $this->parse_with_globals($this->fix_paths($output));

	// trigger hook with final HTML content to be sent
	$hook = $this->app->plugins->exec_hook("send_page", array('content' => $output));
	if (!$hook['abort']) {
	if ($this->charset != RCUBE_CHARSET) {
	echo rcube_charset::convert($hook['content'], RCUBE_CHARSET, $this->charset);
	}
	else {
	echo $hook['content'];
	}
	}
	}


	/**
	* Returns iframe object, registers some related env variables
	*
	* @param array $attrib HTML attributes
	* @param boolean $is_contentframe Register this iframe as the 'contentframe' gui object
	* @return string IFRAME element
	*/
	public function frame($attrib, $is_contentframe = false)
	{
	static $idcount = 0;

	if (!$attrib['id']) {
	$attrib['id'] = 'rcmframe' . ++$idcount;
	}

	$attrib['name'] = $attrib['id'];
	$attrib['src'] = $attrib['src'] ? $this->abs_url($attrib['src'], true) : 'program/resources/blank.gif';

	// register as 'contentframe' object
	if ($is_contentframe \|\| $attrib['contentframe']) {
	$this->set_env('contentframe', $attrib['contentframe'] ? $attrib['contentframe'] : $attrib['name']);
	$this->set_env('blankpage', $attrib['src']);
	}

	return html::iframe($attrib);
	}


	/* *********** common functions delivering gui objects ************ */


	/**
	* Create a form tag with the necessary hidden fields
	*
	* @param array Named tag parameters
	* @return string HTML code for the form
	*/
	public function form_tag($attrib, $content = null)
	{
	if ($this->framed \|\| !empty($_REQUEST['_framed'])) {
	$hiddenfield = new html_hiddenfield(array('name' => '_framed', 'value' => '1'));
	$hidden = $hiddenfield->show();
	}
	if ($this->env['extwin']) {
	$hiddenfield = new html_hiddenfield(array('name' => '_extwin', 'value' => '1'));
	$hidden = $hiddenfield->show();
	}

	if (!$content)
	$attrib['noclose'] = true;

	return html::tag('form',
	$attrib + array('action' => "./", 'method' => "get"),
	$hidden . $content,
	array('id','class','style','name','method','action','enctype','onsubmit'));
	}


	/**
	* Build a form tag with a unique request token
	*
	* @param array Named tag parameters including 'action' and 'task' values which will be put into hidden fields
	* @param string Form content
	* @return string HTML code for the form
	*/
	public function request_form($attrib, $content = '')
	{
	$hidden = new html_hiddenfield();
	if ($attrib['task']) {
	$hidden->add(array('name' => '_task', 'value' => $attrib['task']));
	}
	if ($attrib['action']) {
	$hidden->add(array('name' => '_action', 'value' => $attrib['action']));
	}

	unset($attrib['task'], $attrib['request']);
	$attrib['action'] = './';

	// we already have a <form> tag
	if ($attrib['form']) {
	if ($this->framed \|\| !empty($_REQUEST['_framed']))
	$hidden->add(array('name' => '_framed', 'value' => '1'));
	return $hidden->show() . $content;
	}
	else
	return $this->form_tag($attrib, $hidden->show() . $content);
	}


	/**
	* GUI object 'username'
	* Showing IMAP username of the current session
	*
	* @param array Named tag parameters (currently not used)
	* @return string HTML code for the gui object
	*/
	public function current_username($attrib)
	{
	static $username;

	// alread fetched
	if (!empty($username)) {
	return $username;
	}

	// Current username is an e-mail address
	if (strpos($_SESSION['username'], '@')) {
	$username = $_SESSION['username'];
	}
	// get e-mail address from default identity
	else if ($sql_arr = $this->app->user->get_identity()) {
	$username = $sql_arr['email'];
	}
	else {
	$username = $this->app->user->get_username();
	}

	return rcube_utils::idn_to_utf8($username);
	}


	/**
	* GUI object 'loginform'
	* Returns code for the webmail login form
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	protected function login_form($attrib)
	{
	$default_host = $this->config->get('default_host');
	$autocomplete = (int) $this->config->get('login_autocomplete');

	$_SESSION['temp'] = true;

	// save original url
	$url = rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST);
	if (empty($url) && !preg_match('/_(task\|action)=logout/', $_SERVER['QUERY_STRING']))
	$url = $_SERVER['QUERY_STRING'];

	// Disable autocapitalization on iPad/iPhone (#1488609)
	$attrib['autocapitalize'] = 'off';

	// set atocomplete attribute
	$user_attrib = $autocomplete > 0 ? array() : array('autocomplete' => 'off');
	$host_attrib = $autocomplete > 0 ? array() : array('autocomplete' => 'off');
	$pass_attrib = $autocomplete > 1 ? array() : array('autocomplete' => 'off');

	$input_task = new html_hiddenfield(array('name' => '_task', 'value' => 'login'));
	$input_action = new html_hiddenfield(array('name' => '_action', 'value' => 'login'));
	$input_tzone = new html_hiddenfield(array('name' => '_timezone', 'id' => 'rcmlogintz', 'value' => '_default_'));
	$input_url = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => $url));
	$input_user = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser')
	+ $attrib + $user_attrib);
	$input_pass = new html_passwordfield(array('name' => '_pass', 'id' => 'rcmloginpwd')
	+ $attrib + $pass_attrib);
	$input_host = null;

	if (is_array($default_host) && count($default_host) > 1) {
	$input_host = new html_select(array('name' => '_host', 'id' => 'rcmloginhost'));

	foreach ($default_host as $key => $value) {
	if (!is_array($value)) {
	$input_host->add($value, (is_numeric($key) ? $value : $key));
	}
	else {
	$input_host = null;
	break;
	}
	}
	}
	else if (is_array($default_host) && ($host = array_pop($default_host))) {
	$hide_host = true;
	$input_host = new html_hiddenfield(array(
	'name' => '_host', 'id' => 'rcmloginhost', 'value' => $host) + $attrib);
	}
	else if (empty($default_host)) {
	$input_host = new html_inputfield(array('name' => '_host', 'id' => 'rcmloginhost')
	+ $attrib + $host_attrib);
	}

	$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
	$this->add_gui_object('loginform', $form_name);

	// create HTML table with two cols
	$table = new html_table(array('cols' => 2));

	$table->add('title', html::label('rcmloginuser', html::quote($this->app->gettext('username'))));
	$table->add('input', $input_user->show(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC)));

	$table->add('title', html::label('rcmloginpwd', html::quote($this->app->gettext('password'))));
	$table->add('input', $input_pass->show());

	// add host selection row
	if (is_object($input_host) && !$hide_host) {
	$table->add('title', html::label('rcmloginhost', html::quote($this->app->gettext('server'))));
	$table->add('input', $input_host->show(rcube_utils::get_input_value('_host', rcube_utils::INPUT_GPC)));
	}

	$out = $input_task->show();
	$out .= $input_action->show();
	$out .= $input_tzone->show();
	$out .= $input_url->show();
	$out .= $table->show();

	if ($hide_host) {
	$out .= $input_host->show();
	}

	// surround html output with a form tag
	if (empty($attrib['form'])) {
	$out = $this->form_tag(array('name' => $form_name, 'method' => 'post'), $out);
	}

	// include script for timezone detection
	$this->include_script('jstz.min.js');

	return $out;
	}


	/**
	* GUI object 'preloader'
	* Loads javascript code for images preloading
	*
	* @param array Named parameters
	* @return void
	*/
	protected function preloader($attrib)
	{
	$images = preg_split('/[\s\t\n,]+/', $attrib['images'], -1, PREG_SPLIT_NO_EMPTY);
	$images = array_map(array($this, 'abs_url'), $images);

	if (empty($images) \|\| $this->app->task == 'logout')
	return;

	$this->add_script('var images = ' . self::json_serialize($images) .';
	for (var i=0; i<images.length; i++) {
	img = new Image();
	img.src = images[i];
	}', 'docready');
	}


	/**
	* GUI object 'searchform'
	* Returns code for search function
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	protected function search_form($attrib)
	{
	// add some labels to client
	$this->add_label('searching');

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

	if (empty($attrib['id'])) {
	$attrib['id'] = 'rcmqsearchbox';
	}
	if ($attrib['type'] == 'search' && !$this->browser->khtml) {
	unset($attrib['type'], $attrib['results']);
	}

	$input_q = new html_inputfield($attrib);
	$out = $input_q->show();

	$this->add_gui_object('qsearchbox', $attrib['id']);

	// add form tag around text field
	if (empty($attrib['form'])) {
	$out = $this->form_tag(array(
	'name' => "rcmqsearchform",
	'onsubmit' => self::JS_OBJECT_NAME . ".command('search'); return false",
	'style' => "display:inline"),
	$out);
	}

	return $out;
	}


	/**
	* Builder for GUI object 'message'
	*
	* @param array Named tag parameters
	* @return string HTML code for the gui object
	*/
	protected function message_container($attrib)
	{
	if (isset($attrib['id']) === false) {
	$attrib['id'] = 'rcmMessageContainer';
	}

	$this->add_gui_object('message', $attrib['id']);

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


	/**
	* GUI object 'charsetselector'
	*
	* @param array Named parameters for the select tag
	* @return string HTML code for the gui object
	*/
	public function charset_selector($attrib)
	{
	// pass the following attributes to the form class
	$field_attrib = array('name' => '_charset');
	foreach ($attrib as $attr => $value) {
	if (in_array($attr, array('id', 'name', 'class', 'style', 'size', 'tabindex'))) {
	$field_attrib[$attr] = $value;
	}
	}

	$charsets = array(
	'UTF-8' => 'UTF-8 ('.$this->app->gettext('unicode').')',
	'US-ASCII' => 'ASCII ('.$this->app->gettext('english').')',
	'ISO-8859-1' => 'ISO-8859-1 ('.$this->app->gettext('westerneuropean').')',
	'ISO-8859-2' => 'ISO-8859-2 ('.$this->app->gettext('easterneuropean').')',
	'ISO-8859-4' => 'ISO-8859-4 ('.$this->app->gettext('baltic').')',
	'ISO-8859-5' => 'ISO-8859-5 ('.$this->app->gettext('cyrillic').')',
	'ISO-8859-6' => 'ISO-8859-6 ('.$this->app->gettext('arabic').')',
	'ISO-8859-7' => 'ISO-8859-7 ('.$this->app->gettext('greek').')',
	'ISO-8859-8' => 'ISO-8859-8 ('.$this->app->gettext('hebrew').')',
	'ISO-8859-9' => 'ISO-8859-9 ('.$this->app->gettext('turkish').')',
	'ISO-8859-10' => 'ISO-8859-10 ('.$this->app->gettext('nordic').')',
	'ISO-8859-11' => 'ISO-8859-11 ('.$this->app->gettext('thai').')',
	'ISO-8859-13' => 'ISO-8859-13 ('.$this->app->gettext('baltic').')',
	'ISO-8859-14' => 'ISO-8859-14 ('.$this->app->gettext('celtic').')',
	'ISO-8859-15' => 'ISO-8859-15 ('.$this->app->gettext('westerneuropean').')',
	'ISO-8859-16' => 'ISO-8859-16 ('.$this->app->gettext('southeasterneuropean').')',
	'WINDOWS-1250' => 'Windows-1250 ('.$this->app->gettext('easterneuropean').')',
	'WINDOWS-1251' => 'Windows-1251 ('.$this->app->gettext('cyrillic').')',
	'WINDOWS-1252' => 'Windows-1252 ('.$this->app->gettext('westerneuropean').')',
	'WINDOWS-1253' => 'Windows-1253 ('.$this->app->gettext('greek').')',
	'WINDOWS-1254' => 'Windows-1254 ('.$this->app->gettext('turkish').')',
	'WINDOWS-1255' => 'Windows-1255 ('.$this->app->gettext('hebrew').')',
	'WINDOWS-1256' => 'Windows-1256 ('.$this->app->gettext('arabic').')',
	'WINDOWS-1257' => 'Windows-1257 ('.$this->app->gettext('baltic').')',
	'WINDOWS-1258' => 'Windows-1258 ('.$this->app->gettext('vietnamese').')',
	'ISO-2022-JP' => 'ISO-2022-JP ('.$this->app->gettext('japanese').')',
	'ISO-2022-KR' => 'ISO-2022-KR ('.$this->app->gettext('korean').')',
	'ISO-2022-CN' => 'ISO-2022-CN ('.$this->app->gettext('chinese').')',
	'EUC-JP' => 'EUC-JP ('.$this->app->gettext('japanese').')',
	'EUC-KR' => 'EUC-KR ('.$this->app->gettext('korean').')',
	'EUC-CN' => 'EUC-CN ('.$this->app->gettext('chinese').')',
	'BIG5' => 'BIG5 ('.$this->app->gettext('chinese').')',
	'GB2312' => 'GB2312 ('.$this->app->gettext('chinese').')',
	);

	if (!empty($_POST['_charset'])) {
	$set = $_POST['_charset'];
	}
	else if (!empty($attrib['selected'])) {
	$set = $attrib['selected'];
	}
	else {
	$set = $this->get_charset();
	}

	$set = strtoupper($set);
	if (!isset($charsets[$set])) {
	$charsets[$set] = $set;
	}

	$select = new html_select($field_attrib);
	$select->add(array_values($charsets), array_keys($charsets));

	return $select->show($set);
	}

	/**
	* Include content from config/about.<LANG>.html if available
	*/
	protected function about_content($attrib)
	{
	$content = '';
	$filenames = array(
	'about.' . $_SESSION['language'] . '.html',
	'about.' . substr($_SESSION['language'], 0, 2) . '.html',
	'about.html',
	);
	foreach ($filenames as $file) {
	$fn = RCUBE_CONFIG_DIR . $file;
	if (is_readable($fn)) {
	$content = file_get_contents($fn);
	$content = $this->parse_conditions($content);
	$content = $this->parse_xml($content);
	break;
	}
	}

	return $content;
	}

	}
	diff --git a/program/js/app.js b/program/js/app.js
	index 955c77ff5..b5bf1840a 100644
	--- a/program/js/app.js
	+++ b/program/js/app.js
	@@ -1,6805 +1,6790 @@
	/*
	+-----------------------------------------------------------------------+
	\| Roundcube Webmail Client Script \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| Copyright (C) 2011, Kolab Systems AG \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Authors: Thomas Bruederli <roundcube@gmail.com> \|
	\| Aleksander 'A.L.E.C' Machniak <alec@alec.pl> \|
	\| Charles McNulty <charles@charlesmcnulty.com> \|
	+-----------------------------------------------------------------------+
	\| Requires: jquery.js, common.js, list.js \|
	+-----------------------------------------------------------------------+
	*/

	function rcube_webmail()
	{
	this.labels = {};
	this.buttons = {};
	this.buttons_sel = {};
	this.gui_objects = {};
	this.gui_containers = {};
	this.commands = {};
	this.command_handlers = {};
	this.onloads = [];
	this.messages = {};
	this.group2expand = {};

	// webmail client settings
	this.dblclick_time = 500;
	this.message_time = 4000;
	this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');

	// environment defaults
	this.env = {
	request_timeout: 180, // seconds
	draft_autosave: 0, // seconds
	comm_path: './',
	blankpage: 'program/resources/blank.gif',
	recipients_separator: ',',
	recipients_delimiter: ', '
	};

	// create protected reference to myself
	this.ref = 'rcmail';
	var ref = this;

	// set jQuery ajax options
	$.ajaxSetup({
	cache: false,
	timeout: this.env.request_timeout * 1000,
	error: function(request, status, err){ ref.http_error(request, status, err); },
	beforeSend: function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
	});

	// unload fix
	$(window).bind('beforeunload', function() { rcmail.unload = true; });

	// set environment variable(s)
	this.set_env = function(p, value)
	{
	if (p != null && typeof p === 'object' && !value)
	for (var n in p)
	this.env[n] = p[n];
	else
	this.env[p] = value;
	};

	// add a localized label to the client environment
	this.add_label = function(p, value)
	{
	if (typeof p == 'string')
	this.labels[p] = value;
	else if (typeof p == 'object')
	$.extend(this.labels, p);
	};

	// add a button to the button list
	this.register_button = function(command, id, type, act, sel, over)
	{
	var button_prop = {id:id, type:type};

	if (act) button_prop.act = act;
	if (sel) button_prop.sel = sel;
	if (over) button_prop.over = over;

	if (!this.buttons[command])
	this.buttons[command] = [];

	this.buttons[command].push(button_prop);

	if (this.loaded)
	init_button(command, button_prop);
	};

	// register a specific gui object
	this.gui_object = function(name, id)
	{
	this.gui_objects[name] = this.loaded ? rcube_find_object(id) : id;
	};

	// register a container object
	this.gui_container = function(name, id)
	{
	this.gui_containers[name] = id;
	};

	// add a GUI element (html node) to a specified container
	this.add_element = function(elm, container)
	{
	if (this.gui_containers[container] && this.gui_containers[container].jquery)
	this.gui_containers[container].append(elm);
	};

	// register an external handler for a certain command
	this.register_command = function(command, callback, enable)
	{
	this.command_handlers[command] = callback;

	if (enable)
	this.enable_command(command, true);
	};

	// execute the given script on load
	this.add_onload = function(f)
	{
	this.onloads.push(f);
	};

	// initialize webmail client
	this.init = function()
	{
	var n, p = this;
	this.task = this.env.task;

	// check browser
	if (!bw.dom \|\| !bw.xmlhttp_test() \|\| (bw.mz && bw.vendver < 1.9)) {
	this.goto_url('error', '_code=0x199');
	return;
	}

	// find all registered gui containers
	for (n in this.gui_containers)
	this.gui_containers[n] = $('#'+this.gui_containers[n]);

	// find all registered gui objects
	for (n in this.gui_objects)
	this.gui_objects[n] = rcube_find_object(this.gui_objects[n]);

	// clickjacking protection
	if (this.env.x_frame_options) {
	try {
	// bust frame if not allowed
	if (this.env.x_frame_options == 'deny' && top.location.href != self.location.href)
	top.location.href = self.location.href;
	else if (top.location.hostname != self.location.hostname)
	throw 1;
	} catch (e) {
	// possible clickjacking attack: disable all form elements
	$('form').each(function(){ ref.lock_form(this, true); });
	this.display_message("Blocked: possible clickjacking attack!", 'error');
	return;
	}
	}

	// init registered buttons
	this.init_buttons();

	// tell parent window that this frame is loaded
	if (this.is_framed()) {
	parent.rcmail.set_busy(false, null, parent.rcmail.env.frame_lock);
	parent.rcmail.env.frame_lock = null;
	}

	// enable general commands
	this.enable_command('close', 'logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', 'switch-task', true);

	if (this.env.permaurl)
	this.enable_command('permaurl', 'extwin', true);

	switch (this.task) {

	case 'mail':
	// enable mail commands
	this.enable_command('list', 'checkmail', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);

	if (this.gui_objects.messagelist) {
	this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {
	multiselect:true, multiexpand:true, draggable:true, keyboard:true,
	column_movable:this.env.col_movable, dblclick_time:this.dblclick_time
	});
	this.message_list.row_init = function(o){ p.init_message_row(o); };
	this.message_list.addEventListener('dblclick', function(o){ p.msglist_dbl_click(o); });
	this.message_list.addEventListener('click', function(o){ p.msglist_click(o); });
	this.message_list.addEventListener('keypress', function(o){ p.msglist_keypress(o); });
	this.message_list.addEventListener('select', function(o){ p.msglist_select(o); });
	this.message_list.addEventListener('dragstart', function(o){ p.drag_start(o); });
	this.message_list.addEventListener('dragmove', function(e){ p.drag_move(e); });
	this.message_list.addEventListener('dragend', function(e){ p.drag_end(e); });
	this.message_list.addEventListener('expandcollapse', function(e){ p.msglist_expand(e); });
	this.message_list.addEventListener('column_replace', function(e){ p.msglist_set_coltypes(e); });

	document.onmouseup = function(e){ return p.doc_mouse_up(e); };
	this.gui_objects.messagelist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };

	this.message_list.init();
	this.enable_command('toggle_status', 'toggle_flag', 'menu-open', 'menu-save', 'sort', true);

	// load messages
	this.command('list');
	}

	if (this.gui_objects.qsearchbox) {
	if (this.env.search_text != null)
	this.gui_objects.qsearchbox.value = this.env.search_text;
	$(this.gui_objects.qsearchbox).focusin(function() { rcmail.message_list.blur(); });
	}

	this.set_button_titles();

	- this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward',
	- 'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download',
	- 'print', 'load-attachment', 'show-headers', 'hide-headers', 'forward-attachment'];
	+ this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list',
	+ 'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource',
	+ 'print', 'load-attachment', 'show-headers', 'hide-headers', 'download',
	+ 'forward', 'forward-inline', 'forward-attachment'];

	if (this.env.action == 'show' \|\| this.env.action == 'preview') {
	this.enable_command(this.env.message_commands, this.env.uid);
	this.enable_command('reply-list', this.env.list_post);

	if (this.env.action == 'show') {
	this.http_request('pagenav', {_uid: this.env.uid, _mbox: this.env.mailbox, _search: this.env.search_request},
	this.display_message('', 'loading'));
	}

	if (this.env.blockedobjects) {
	if (this.gui_objects.remoteobjectsmsg)
	this.gui_objects.remoteobjectsmsg.style.display = 'block';
	this.enable_command('load-images', 'always-load', true);
	}

	// make preview/message frame visible
	if (this.env.action == 'preview' && this.is_framed()) {
	this.enable_command('compose', 'add-contact', false);
	parent.rcmail.show_contentframe(true);
	}
	}
	else if (this.env.action == 'compose') {
	this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor', 'list-adresses', 'extwin'];

	if (this.env.drafts_mailbox)
	this.env.compose_commands.push('savedraft')

	this.enable_command(this.env.compose_commands, 'identities', true);

	// add more commands (not enabled)
	$.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']);

	if (this.env.spellcheck) {
	this.env.spellcheck.spelling_state_observer = function(s) { ref.spellcheck_state(); };
	this.env.compose_commands.push('spellcheck')
	this.enable_command('spellcheck', true);
	}

	document.onmouseup = function(e){ return p.doc_mouse_up(e); };

	// init message compose form
	this.init_messageform();
	}
	// show printing dialog
	else if (this.env.action == 'print' && this.env.uid)
	if (bw.safari)
	setTimeout('window.print()', 10);
	else
	window.print();

	// get unread count for each mailbox
	if (this.gui_objects.mailboxlist) {
	this.env.unread_counts = {};
	this.gui_objects.folderlist = this.gui_objects.mailboxlist;
	this.http_request('getunread');
	}

	// init address book widget
	if (this.gui_objects.contactslist) {
	this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
	{ multiselect:true, draggable:false, keyboard:false });
	this.contact_list.addEventListener('select', function(o){ ref.compose_recipient_select(o); });
	this.contact_list.addEventListener('dblclick', function(o){ ref.compose_add_recipient('to'); });
	this.contact_list.init();
	}

	if (this.gui_objects.addressbookslist) {
	this.gui_objects.folderlist = this.gui_objects.addressbookslist;
	this.enable_command('list-adresses', true);
	}

	// ask user to send MDN
	if (this.env.mdn_request && this.env.uid) {
	var postact = 'sendmdn',
	postdata = {_uid: this.env.uid, _mbox: this.env.mailbox};
	if (!confirm(this.get_label('mdnrequest'))) {
	postdata._flag = 'mdnsent';
	postact = 'mark';
	}
	this.http_post(postact, postdata);
	}

	// detect browser capabilities
	if (!this.is_framed())
	this.browser_capabilities_check();

	break;

	case 'addressbook':
	if (this.gui_objects.folderlist)
	this.env.contactfolders = $.extend($.extend({}, this.env.address_sources), this.env.contactgroups);

	this.enable_command('add', 'import', this.env.writable_source);
	this.enable_command('list', 'listgroup', 'listsearch', 'advanced-search', true);

	if (this.gui_objects.contactslist) {
	this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
	{multiselect:true, draggable:this.gui_objects.folderlist?true:false, keyboard:true});
	this.contact_list.row_init = function(row){ p.triggerEvent('insertrow', { cid:row.uid, row:row }); };
	this.contact_list.addEventListener('keypress', function(o){ p.contactlist_keypress(o); });
	this.contact_list.addEventListener('select', function(o){ p.contactlist_select(o); });
	this.contact_list.addEventListener('dragstart', function(o){ p.drag_start(o); });
	this.contact_list.addEventListener('dragmove', function(e){ p.drag_move(e); });
	this.contact_list.addEventListener('dragend', function(e){ p.drag_end(e); });
	this.contact_list.init();

	if (this.env.cid)
	this.contact_list.highlight_row(this.env.cid);

	this.gui_objects.contactslist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };
	document.onmouseup = function(e){ return p.doc_mouse_up(e); };
	if (this.gui_objects.qsearchbox)
	$(this.gui_objects.qsearchbox).focusin(function() { rcmail.contact_list.blur(); });

	this.update_group_commands();
	this.command('list');
	}

	this.set_page_buttons();

	if (this.env.cid) {
	this.enable_command('show', 'edit', true);
	// register handlers for group assignment via checkboxes
	if (this.gui_objects.editform) {
	$('input.groupmember').change(function() {
	ref.group_member_change(this.checked ? 'add' : 'del', ref.env.cid, ref.env.source, this.value);
	});
	}
	}

	if (this.gui_objects.editform) {
	this.enable_command('save', true);
	if (this.env.action == 'add' \|\| this.env.action == 'edit')
	this.init_contact_form();
	}

	if (this.gui_objects.qsearchbox)
	this.enable_command('search', 'reset-search', 'moveto', true);

	break;

	case 'settings':
	this.enable_command('preferences', 'identities', 'save', 'folders', true);

	if (this.env.action == 'identities') {
	this.enable_command('add', this.env.identities_level < 2);
	}
	else if (this.env.action == 'edit-identity' \|\| this.env.action == 'add-identity') {
	this.enable_command('save', 'edit', 'toggle-editor', true);
	this.enable_command('delete', this.env.identities_level < 2);

	if (this.env.action == 'add-identity')
	$("input[type='text']").first().select();
	}
	else if (this.env.action == 'folders') {
	this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', true);
	}
	else if (this.env.action == 'edit-folder' && this.gui_objects.editform) {
	this.enable_command('save', 'folder-size', true);
	parent.rcmail.env.messagecount = this.env.messagecount;
	parent.rcmail.enable_command('purge', this.env.messagecount);
	$("input[type='text']").first().select();
	}

	if (this.gui_objects.identitieslist) {
	this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist, {multiselect:false, draggable:false, keyboard:false});
	this.identity_list.addEventListener('select', function(o){ p.identity_select(o); });
	this.identity_list.init();
	this.identity_list.focus();

	if (this.env.iid)
	this.identity_list.highlight_row(this.env.iid);
	}
	else if (this.gui_objects.sectionslist) {
	this.sections_list = new rcube_list_widget(this.gui_objects.sectionslist, {multiselect:false, draggable:false, keyboard:false});
	this.sections_list.addEventListener('select', function(o){ p.section_select(o); });
	this.sections_list.init();
	this.sections_list.focus();
	}
	else if (this.gui_objects.subscriptionlist)
	this.init_subscription_list();

	break;

	case 'login':
	var input_user = $('#rcmloginuser');
	input_user.bind('keyup', function(e){ return rcmail.login_user_keyup(e); });

	if (input_user.val() == '')
	input_user.focus();
	else
	$('#rcmloginpwd').focus();

	// detect client timezone
	if (window.jstz && !bw.ie6) {
	var timezone = jstz.determine();
	if (timezone.name())
	$('#rcmlogintz').val(timezone.name());
	}
	else {
	$('#rcmlogintz').val(new Date().getStdTimezoneOffset() / -60);
	}

	// display 'loading' message on form submit, lock submit button
	$('form').submit(function () {
	$('input[type=submit]', this).prop('disabled', true);
	rcmail.clear_messages();
	rcmail.display_message('', 'loading');
	});

	this.enable_command('login', true);
	break;

	default:
	break;
	}

	// prevent from form submit with Enter key in file input fields
	if (bw.ie)
	$('input[type=file]').keydown(function(e) { if (e.keyCode == '13') e.preventDefault(); });

	// flag object as complete
	this.loaded = true;

	// show message
	if (this.pending_message)
	this.display_message(this.pending_message[0], this.pending_message[1], this.pending_message[2]);

	// map implicit containers
	if (this.gui_objects.folderlist)
	this.gui_containers.foldertray = $(this.gui_objects.folderlist);

	// activate html5 file drop feature (if browser supports it and if configured)
	if (this.gui_objects.filedrop && this.env.filedrop && ((window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary) \|\| window.FormData)) {
	$(document.body).bind('dragover dragleave drop', function(e){ return ref.document_drag_hover(e, e.type == 'dragover'); });
	$(this.gui_objects.filedrop).addClass('droptarget')
	.bind('dragover dragleave', function(e){ return ref.file_drag_hover(e, e.type == 'dragover'); })
	.get(0).addEventListener('drop', function(e){ return ref.file_dropped(e); }, false);
	}

	// trigger init event hook
	this.triggerEvent('init', { task:this.task, action:this.env.action });

	// execute all foreign onload scripts
	// @deprecated
	for (var i in this.onloads) {
	if (typeof this.onloads[i] === 'string')
	eval(this.onloads[i]);
	else if (typeof this.onloads[i] === 'function')
	this.onloads[i]();
	}

	// start keep-alive and refresh intervals
	this.start_refresh();
	this.start_keepalive();
	};

	this.log = function(msg)
	{
	if (window.console && console.log)
	console.log(msg);
	};

	/*********************************************************/
	/******* client command interface *******/
	/*********************************************************/

	// execute a specific command on the web client
	this.command = function(command, props, obj, event)
	{
	var ret, uid, cid, url, flag;

	if (obj && obj.blur)
	obj.blur();

	if (this.busy)
	return false;

	// let the browser handle this click (shift/ctrl usually opens the link in a new window/tab)
	if ((obj && obj.href && String(obj.href).indexOf(location.href) < 0) && rcube_event.get_modifier(event)) {
	return true;
	}

	// command not supported or allowed
	if (!this.commands[command]) {
	// pass command to parent window
	if (this.is_framed())
	parent.rcmail.command(command, props);

	return false;
	}

	// check input before leaving compose step
	if (this.task == 'mail' && this.env.action == 'compose' && $.inArray(command, this.env.compose_commands)<0) {
	if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
	return false;
	}

	// process external commands
	if (typeof this.command_handlers[command] === 'function') {
	ret = this.command_handlers[command](props, obj);
	return ret !== undefined ? ret : (obj ? false : true);
	}
	else if (typeof this.command_handlers[command] === 'string') {
	ret = window[this.command_handlers[command]](props, obj);
	return ret !== undefined ? ret : (obj ? false : true);
	}

	// trigger plugin hooks
	this.triggerEvent('actionbefore', {props:props, action:command});
	ret = this.triggerEvent('before'+command, props);
	if (ret !== undefined) {
	// abort if one of the handlers returned false
	if (ret === false)
	return false;
	else
	props = ret;
	}

	ret = undefined;

	// process internal command
	switch (command) {

	case 'login':
	if (this.gui_objects.loginform)
	this.gui_objects.loginform.submit();
	break;

	// commands to switch task
	case 'mail':
	case 'addressbook':
	case 'settings':
	case 'logout':
	this.switch_task(command);
	break;

	case 'about':
	this.redirect('?_task=settings&_action=about', false);
	break;

	case 'permaurl':
	if (obj && obj.href && obj.target)
	return true;
	else if (this.env.permaurl)
	parent.location.href = this.env.permaurl;
	break;

	case 'extwin':
	if (this.env.action == 'compose') {
	var prevstate = this.env.compose_extwin;
	$("input[name='_action']", this.gui_objects.messageform).val('compose');
	this.gui_objects.messageform.action = this.url('mail/compose', { _id: this.env.compose_id, _extwin: 1 });
	this.gui_objects.messageform.target = this.open_window('', 1150, 900);
	this.gui_objects.messageform.submit();
	}
	else {
	this.open_window(this.env.permaurl, 1000, 1200);
	}
	break;

	case 'menu-open':
	case 'menu-save':
	this.triggerEvent(command, {props:props});
	return false;

	case 'open':
	if (uid = this.get_single_uid()) {
	obj.href = this.url('show', {_mbox: this.env.mailbox, _uid: uid});
	return true;
	}
	break;

	case 'close':
	if (this.env.extwin)
	window.close();
	break;

	case 'list':
	if (props && props != '')
	this.reset_qsearch();
	if (this.env.action == 'compose' && this.env.extwin)
	window.close();
	else if (this.task == 'mail') {
	this.list_mailbox(props);
	this.set_button_titles();
	}
	else if (this.task == 'addressbook')
	this.list_contacts(props);
	break;

	case 'sort':
	var sort_order = this.env.sort_order,
	sort_col = !this.env.disabled_sort_col ? props : this.env.sort_col;

	if (!this.env.disabled_sort_order)
	sort_order = this.env.sort_col == sort_col && sort_order == 'ASC' ? 'DESC' : 'ASC';

	// set table header and update env
	this.set_list_sorting(sort_col, sort_order);

	// reload message list
	this.list_mailbox('', '', sort_col+'_'+sort_order);
	break;

	case 'nextpage':
	this.list_page('next');
	break;

	case 'lastpage':
	this.list_page('last');
	break;

	case 'previouspage':
	this.list_page('prev');
	break;

	case 'firstpage':
	this.list_page('first');
	break;

	case 'expunge':
	- if (this.env.messagecount)
	+ if (this.env.exists)
	this.expunge_mailbox(this.env.mailbox);
	break;

	case 'purge':
	case 'empty-mailbox':
	- if (this.env.messagecount)
	+ if (this.env.exists)
	this.purge_mailbox(this.env.mailbox);
	break;

	// common commands used in multiple tasks
	case 'show':
	if (this.task == 'mail') {
	uid = this.get_single_uid();
	if (uid && (!this.env.uid \|\| uid != this.env.uid)) {
	if (this.env.mailbox == this.env.drafts_mailbox)
	this.open_compose_step({ _draft_uid: uid, _mbox: this.env.mailbox });
	else
	this.show_message(uid);
	}
	}
	else if (this.task == 'addressbook') {
	cid = props ? props : this.get_single_cid();
	if (cid && !(this.env.action == 'show' && cid == this.env.cid))
	this.load_contact(cid, 'show');
	}
	break;

	case 'add':
	if (this.task == 'addressbook')
	this.load_contact(0, 'add');
	else if (this.task == 'settings') {
	this.identity_list.clear_selection();
	this.load_identity(0, 'add-identity');
	}
	break;

	case 'edit':
	if (this.task == 'addressbook' && (cid = this.get_single_cid()))
	this.load_contact(cid, 'edit');
	else if (this.task == 'settings' && props)
	this.load_identity(props, 'edit-identity');
	else if (this.task == 'mail' && (cid = this.get_single_uid())) {
	url = { _mbox: this.env.mailbox };
	url[this.env.mailbox == this.env.drafts_mailbox && props != 'new' ? '_draft_uid' : '_uid'] = cid;
	this.open_compose_step(url);
	}
	break;

	case 'save':
	var input, form = this.gui_objects.editform;
	if (form) {
	// adv. search
	if (this.env.action == 'search') {
	}
	// user prefs
	else if ((input = $("input[name='_pagesize']", form)) && input.length && isNaN(parseInt(input.val()))) {
	alert(this.get_label('nopagesizewarning'));
	input.focus();
	break;
	}
	// contacts/identities
	else {
	// reload form
	if (props == 'reload') {
	form.action += '?_reload=1';
	}
	else if (this.task == 'settings' && (this.env.identities_level % 2) == 0 &&
	(input = $("input[name='_email']", form)) && input.length && !rcube_check_email(input.val())
	) {
	alert(this.get_label('noemailwarning'));
	input.focus();
	break;
	}

	// clear empty input fields
	$('input.placeholder').each(function(){ if (this.value == this._placeholder) this.value = ''; });
	}

	// add selected source (on the list)
	if (parent.rcmail && parent.rcmail.env.source)
	form.action = this.add_url(form.action, '_orig_source', parent.rcmail.env.source);

	form.submit();
	}
	break;

	case 'delete':
	// mail task
	if (this.task == 'mail')
	this.delete_messages(event);
	// addressbook task
	else if (this.task == 'addressbook')
	this.delete_contacts();
	// user settings task
	else if (this.task == 'settings')
	this.delete_identity();
	break;

	// mail task commands
	case 'move':
	case 'moveto':
	if (this.task == 'mail')
	this.move_messages(props);
	else if (this.task == 'addressbook' && this.drag_active)
	this.copy_contact(null, props);
	break;

	case 'copy':
	if (this.task == 'mail')
	this.copy_messages(props);
	break;

	case 'mark':
	if (props)
	this.mark_message(props);
	break;

	case 'toggle_status':
	if (props && !props._row)
	break;

	flag = 'read';

	if (props._row.uid) {
	uid = props._row.uid;

	// toggle read/unread
	if (this.message_list.rows[uid].deleted)
	flag = 'undelete';
	else if (!this.message_list.rows[uid].unread)
	flag = 'unread';
	}

	this.mark_message(flag, uid);
	break;

	case 'toggle_flag':
	if (props && !props._row)
	break;

	flag = 'flagged';

	if (props._row.uid) {
	uid = props._row.uid;
	// toggle flagged/unflagged
	if (this.message_list.rows[uid].flagged)
	flag = 'unflagged';
	}
	this.mark_message(flag, uid);
	break;

	case 'always-load':
	if (this.env.uid && this.env.sender) {
	this.add_contact(this.env.sender);
	setTimeout(function(){ ref.command('load-images'); }, 300);
	break;
	}

	case 'load-images':
	if (this.env.uid)
	this.show_message(this.env.uid, true, this.env.action=='preview');
	break;

	case 'load-attachment':
	var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props.part;

	// open attachment in frame if it's of a supported mimetype
	if (this.env.uid && props.mimetype && this.env.mimetypes && $.inArray(props.mimetype, $.map(this.env.mimetypes, function(v,k){ return v })) >= 0) {
	if (props.mimetype == 'text/html')
	qstring += '&_safe=1';
	this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
	if (this.attachment_win) {
	setTimeout(function(){ ref.attachment_win.focus(); }, 10);
	break;
	}
	}

	this.goto_url('get', qstring+'&_download=1', false);
	break;

	case 'select-all':
	this.select_all_mode = props ? false : true;
	this.dummy_select = true; // prevent msg opening if there's only one msg on the list
	if (props == 'invert')
	this.message_list.invert_selection();
	else
	this.message_list.select_all(props == 'page' ? '' : props);
	this.dummy_select = null;
	break;

	case 'select-none':
	this.select_all_mode = false;
	this.message_list.clear_selection();
	break;

	case 'expand-all':
	this.env.autoexpand_threads = 1;
	this.message_list.expand_all();
	break;

	case 'expand-unread':
	this.env.autoexpand_threads = 2;
	this.message_list.collapse_all();
	this.expand_unread();
	break;

	case 'collapse-all':
	this.env.autoexpand_threads = 0;
	this.message_list.collapse_all();
	break;

	case 'nextmessage':
	if (this.env.next_uid)
	this.show_message(this.env.next_uid, false, this.env.action=='preview');
	break;

	case 'lastmessage':
	if (this.env.last_uid)
	this.show_message(this.env.last_uid);
	break;

	case 'previousmessage':
	if (this.env.prev_uid)
	this.show_message(this.env.prev_uid, false, this.env.action == 'preview');
	break;

	case 'firstmessage':
	if (this.env.first_uid)
	this.show_message(this.env.first_uid);
	break;

	case 'compose':
	url = {};

	if (this.task == 'mail') {
	url._mbox = this.env.mailbox;
	if (props)
	url._to = props;
	// also send search request so we can go back to search result after message is sent
	if (this.env.search_request)
	url._search = this.env.search_request;
	}
	// modify url if we're in addressbook
	else if (this.task == 'addressbook') {
	// switch to mail compose step directly
	if (props && props.indexOf('@') > 0) {
	url._to = props;
	}
	else {
	// use contact_id passed as command parameter
	var n, len, a_cids = [];
	if (props)
	a_cids.push(props);
	// get selected contacts
	else if (this.contact_list) {
	var selection = this.contact_list.get_selection();
	for (n=0, len=selection.length; n<len; n++)
	a_cids.push(selection[n]);
	}

	if (a_cids.length)
	this.http_post('mailto', { _cid: a_cids.join(','), _source: this.env.source }, true);
	else if (this.env.group)
	this.http_post('mailto', { _gid: this.env.group, _source: this.env.source }, true);

	break;
	}
	}
	else if (props)
	url._to = props;

	this.open_compose_step(url);
	break;

	case 'spellcheck':
	if (this.spellcheck_state()) {
	this.stop_spellchecking();
	}
	else {
	if (window.tinyMCE && tinyMCE.get(this.env.composebody)) {
	tinyMCE.execCommand('mceSpellCheck', true);
	}
	else if (this.env.spellcheck && this.env.spellcheck.spellCheck) {
	this.env.spellcheck.spellCheck();
	}
	}
	this.spellcheck_state();
	break;

	case 'savedraft':
	// Reset the auto-save timer
	clearTimeout(this.save_timer);

	// compose form did not change
	if (this.cmp_hash == this.compose_field_hash()) {
	this.auto_save_start();
	break;
	}

	this.submit_messageform(true);
	break;

	case 'send':
	if (!props.nocheck && !this.check_compose_input(command))
	break;

	// Reset the auto-save timer
	clearTimeout(this.save_timer);

	this.submit_messageform();
	break;

	case 'send-attachment':
	// Reset the auto-save timer
	clearTimeout(this.save_timer);

	this.upload_file(props \|\| this.gui_objects.uploadform);
	break;

	case 'insert-sig':
	this.change_identity($("[name='_from']")[0], true);
	break;

	case 'list-adresses':
	this.list_contacts(props);
	this.enable_command('add-recipient', false);
	break;

	case 'add-recipient':
	this.compose_add_recipient(props);
	break;

	case 'reply-all':
	case 'reply-list':
	case 'reply':
	if (uid = this.get_single_uid()) {
	url = {_reply_uid: uid, _mbox: this.env.mailbox};
	if (command == 'reply-all')
	// do reply-list, when list is detected and popup menu wasn't used
	url._all = (!props && this.commands['reply-list'] ? 'list' : 'all');
	else if (command == 'reply-list')
	url._all = 'list';

	this.open_compose_step(url);
	}
	break;

	case 'forward-attachment':
	+ case 'forward-inline':
	case 'forward':
	- if (uid = this.get_single_uid()) {
	- url = { _forward_uid: uid, _mbox: this.env.mailbox };
	- if (command == 'forward-attachment' \|\| (!props && this.env.forward_attachment))
	+ var uids = this.env.uid ? [this.env.uid] : (this.message_list ? this.message_list.get_selection() : []);
	+ if (uids.length) {
	+ url = { _forward_uid: this.uids_to_list(uids), _mbox: this.env.mailbox };
	+ if (command == 'forward-attachment' \|\| (!props && this.env.forward_attachment) \|\| uids.length > 1)
	url._attachment = 1;
	this.open_compose_step(url);
	}
	break;

	case 'print':
	if (uid = this.get_single_uid()) {
	ref.printwin = window.open(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''));
	if (this.printwin) {
	setTimeout(function(){ ref.printwin.focus(); }, 20);
	if (this.env.action != 'show')
	this.mark_message('read', uid);
	}
	}
	break;

	case 'viewsource':
	if (uid = this.get_single_uid()) {
	ref.sourcewin = window.open(this.env.comm_path+'&_action=viewsource&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox));
	if (this.sourcewin)
	setTimeout(function(){ ref.sourcewin.focus(); }, 20);
	}
	break;

	case 'download':
	if (uid = this.get_single_uid())
	this.goto_url('viewsource', { _uid: uid, _mbox: this.env.mailbox, _save: 1 });
	break;

	// quicksearch
	case 'search':
	if (!props && this.gui_objects.qsearchbox)
	props = this.gui_objects.qsearchbox.value;
	if (props) {
	this.qsearch(props);
	break;
	}

	// reset quicksearch
	case 'reset-search':
	var n, s = this.env.search_request \|\| this.env.qsearch;

	this.reset_qsearch();
	this.select_all_mode = false;

	if (s && this.env.mailbox)
	this.list_mailbox(this.env.mailbox, 1);
	else if (s && this.task == 'addressbook') {
	if (this.env.source == '') {
	for (n in this.env.address_sources) break;
	this.env.source = n;
	this.env.group = '';
	}
	this.list_contacts(this.env.source, this.env.group, 1);
	}
	break;

	case 'listgroup':
	this.reset_qsearch();
	this.list_contacts(props.source, props.id);
	break;

	case 'import':
	if (this.env.action == 'import' && this.gui_objects.importform) {
	var file = document.getElementById('rcmimportfile');
	if (file && !file.value) {
	alert(this.get_label('selectimportfile'));
	break;
	}
	this.gui_objects.importform.submit();
	this.set_busy(true, 'importwait');
	this.lock_form(this.gui_objects.importform, true);
	}
	else
	this.goto_url('import', (this.env.source ? '_target='+urlencode(this.env.source)+'&' : ''));
	break;

	case 'export':
	if (this.contact_list.rowcount > 0) {
	this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _search: this.env.search_request });
	}
	break;

	case 'upload-photo':
	this.upload_contact_photo(props \|\| this.gui_objects.uploadform);
	break;

	case 'delete-photo':
	this.replace_contact_photo('-del-');
	break;

	// user settings commands
	case 'preferences':
	case 'identities':
	case 'folders':
	this.goto_url('settings/' + command);
	break;

	case 'undo':
	this.http_request('undo', '', this.display_message('', 'loading'));
	break;

	// unified command call (command name == function name)
	default:
	var func = command.replace(/-/g, '_');
	if (this[func] && typeof this[func] === 'function') {
	ret = this[func](props, obj);
	}
	break;
	}

	if (this.triggerEvent('after'+command, props) === false)
	ret = false;
	this.triggerEvent('actionafter', {props:props, action:command});

	return ret === false ? false : obj ? false : true;
	};

	// set command(s) enabled or disabled
	this.enable_command = function()
	{
	var i, n, args = Array.prototype.slice.call(arguments),
	enable = args.pop(), cmd;

	for (n=0; n<args.length; n++) {
	cmd = args[n];
	// argument of type array
	if (typeof cmd === 'string') {
	this.commands[cmd] = enable;
	this.set_button(cmd, (enable ? 'act' : 'pas'));
	}
	// push array elements into commands array
	else {
	for (i in cmd)
	args.push(cmd[i]);
	}
	}
	};

	// lock/unlock interface
	this.set_busy = function(a, message, id)
	{
	if (a && message) {
	var msg = this.get_label(message);
	if (msg == message)
	msg = 'Loading...';

	id = this.display_message(msg, 'loading');
	}
	else if (!a && id) {
	this.hide_message(id);
	}

	this.busy = a;
	//document.body.style.cursor = a ? 'wait' : 'default';

	if (this.gui_objects.editform)
	this.lock_form(this.gui_objects.editform, a);

	return id;
	};

	// return a localized string
	this.get_label = function(name, domain)
	{
	if (domain && this.labels[domain+'.'+name])
	return this.labels[domain+'.'+name];
	else if (this.labels[name])
	return this.labels[name];
	else
	return name;
	};

	// alias for convenience reasons
	this.gettext = this.get_label;

	// switch to another application task
	this.switch_task = function(task)
	{
	if (this.task===task && task!='mail')
	return;

	var url = this.get_task_url(task);
	if (task=='mail')
	url += '&_mbox=INBOX';

	this.redirect(url);
	};

	this.get_task_url = function(task, url)
	{
	if (!url)
	url = this.env.comm_path;

	return url.replace(/_task=[a-z]+/, '_task='+task);
	};

	this.reload = function(delay)
	{
	if (this.is_framed())
	parent.rcmail.reload(delay);
	else if (delay)
	setTimeout(function(){ rcmail.reload(); }, delay);
	else if (window.location)
	location.href = this.env.comm_path + (this.env.action ? '&_action='+this.env.action : '');
	};

	// Add variable to GET string, replace old value if exists
	this.add_url = function(url, name, value)
	{
	value = urlencode(value);

	if (/(\?.*)$/.test(url)) {
	var urldata = RegExp.$1,
	datax = RegExp('((\\?\|&)'+RegExp.escape(name)+'=[^&]*)');

	if (datax.test(urldata)) {
	urldata = urldata.replace(datax, RegExp.$2 + name + '=' + value);
	}
	else
	urldata += '&' + name + '=' + value

	return url.replace(/(\?.*)$/, urldata);
	}

	return url + '?' + name + '=' + value;
	};

	this.is_framed = function()
	{
	return (this.env.framed && parent.rcmail && parent.rcmail != this && parent.rcmail.command);
	};

	this.save_pref = function(prop)
	{
	var request = {'_name': prop.name, '_value': prop.value};

	if (prop.session)
	request['_session'] = prop.session;
	if (prop.env)
	this.env[prop.env] = prop.value;

	this.http_post('save-pref', request);
	};

	this.html_identifier = function(str, encode)
	{
	str = String(str);
	if (encode)
	return Base64.encode(str).replace(/=+$/, '').replace(/\+/g, '-').replace(/\//g, '_');
	else
	return str.replace(this.identifier_expr, '_');
	};

	this.html_identifier_decode = function(str)
	{
	str = String(str).replace(/-/g, '+').replace(/_/g, '/');

	while (str.length % 4) str += '=';

	return Base64.decode(str);
	};


	/*********************************************************/
	/******* event handling methods *******/
	/*********************************************************/

	this.drag_menu = function(e, target)
	{
	var modkey = rcube_event.get_modifier(e),
	menu = this.gui_objects.message_dragmenu;

	if (menu && modkey == SHIFT_KEY && this.commands['copy']) {
	var pos = rcube_event.get_mouse_pos(e);
	this.env.drag_target = target;
	$(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'}).show();
	return true;
	}

	return false;
	};

	this.drag_menu_action = function(action)
	{
	var menu = this.gui_objects.message_dragmenu;
	if (menu) {
	$(menu).hide();
	}
	this.command(action, this.env.drag_target);
	this.env.drag_target = null;
	};

	this.drag_start = function(list)
	{
	var model = this.task == 'mail' ? this.env.mailboxes : this.env.contactfolders;

	this.drag_active = true;

	if (this.preview_timer)
	clearTimeout(this.preview_timer);
	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);

	// save folderlist and folders location/sizes for droptarget calculation in drag_move()
	if (this.gui_objects.folderlist && model) {
	this.initialBodyScrollTop = bw.ie ? 0 : window.pageYOffset;
	this.initialListScrollTop = this.gui_objects.folderlist.parentNode.scrollTop;

	var k, li, height,
	list = $(this.gui_objects.folderlist);
	pos = list.offset();

	this.env.folderlist_coords = { x1:pos.left, y1:pos.top, x2:pos.left + list.width(), y2:pos.top + list.height() };

	this.env.folder_coords = [];
	for (k in model) {
	if (li = this.get_folder_li(k)) {
	// only visible folders
	if (height = li.firstChild.offsetHeight) {
	pos = $(li.firstChild).offset();
	this.env.folder_coords[k] = { x1:pos.left, y1:pos.top,
	x2:pos.left + li.firstChild.offsetWidth, y2:pos.top + height, on:0 };
	}
	}
	}
	}
	};

	this.drag_end = function(e)
	{
	this.drag_active = false;
	this.env.last_folder_target = null;

	if (this.folder_auto_timer) {
	clearTimeout(this.folder_auto_timer);
	this.folder_auto_timer = null;
	this.folder_auto_expand = null;
	}

	// over the folders
	if (this.gui_objects.folderlist && this.env.folder_coords) {
	for (var k in this.env.folder_coords) {
	if (this.env.folder_coords[k].on)
	$(this.get_folder_li(k)).removeClass('droptarget');
	}
	}
	};

	this.drag_move = function(e)
	{
	if (this.gui_objects.folderlist && this.env.folder_coords) {
	var k, li, div, check, oldclass,
	layerclass = 'draglayernormal',
	mouse = rcube_event.get_mouse_pos(e),
	pos = this.env.folderlist_coords,
	// offsets to compensate for scrolling while dragging a message
	boffset = bw.ie ? -document.documentElement.scrollTop : this.initialBodyScrollTop,
	moffset = this.initialListScrollTop-this.gui_objects.folderlist.parentNode.scrollTop;

	if (this.contact_list && this.contact_list.draglayer)
	oldclass = this.contact_list.draglayer.attr('class');

	mouse.y += -moffset-boffset;

	// if mouse pointer is outside of folderlist
	if (mouse.x < pos.x1 \|\| mouse.x >= pos.x2 \|\| mouse.y < pos.y1 \|\| mouse.y >= pos.y2) {
	if (this.env.last_folder_target) {
	$(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
	this.env.folder_coords[this.env.last_folder_target].on = 0;
	this.env.last_folder_target = null;
	}
	if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
	this.contact_list.draglayer.attr('class', layerclass);
	return;
	}

	// over the folders
	for (k in this.env.folder_coords) {
	pos = this.env.folder_coords[k];
	if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2){
	if ((check = this.check_droptarget(k))) {
	li = this.get_folder_li(k);
	div = $(li.getElementsByTagName('div')[0]);

	// if the folder is collapsed, expand it after 1sec and restart the drag & drop process.
	if (div.hasClass('collapsed')) {
	if (this.folder_auto_timer)
	clearTimeout(this.folder_auto_timer);

	this.folder_auto_expand = this.env.mailboxes[k].id;
	this.folder_auto_timer = setTimeout(function() {
	rcmail.command('collapse-folder', rcmail.folder_auto_expand);
	rcmail.drag_start(null);
	}, 1000);
	} else if (this.folder_auto_timer) {
	clearTimeout(this.folder_auto_timer);
	this.folder_auto_timer = null;
	this.folder_auto_expand = null;
	}

	$(li).addClass('droptarget');
	this.env.folder_coords[k].on = 1;
	this.env.last_folder_target = k;
	layerclass = 'draglayer' + (check > 1 ? 'copy' : 'normal');
	} else { // Clear target, otherwise drag end will trigger move into last valid droptarget
	this.env.last_folder_target = null;
	}
	}
	else if (pos.on) {
	$(this.get_folder_li(k)).removeClass('droptarget');
	this.env.folder_coords[k].on = 0;
	}
	}

	if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
	this.contact_list.draglayer.attr('class', layerclass);
	}
	};

	this.collapse_folder = function(name)
	{
	var li = this.get_folder_li(name, '', true),
	div = $('div:first', li),
	ul = $('ul:first', li);

	if (div.hasClass('collapsed')) {
	ul.show();
	div.removeClass('collapsed').addClass('expanded');
	var reg = new RegExp('&'+urlencode(name)+'&');
	this.env.collapsed_folders = this.env.collapsed_folders.replace(reg, '');
	}
	else if (div.hasClass('expanded')) {
	ul.hide();
	div.removeClass('expanded').addClass('collapsed');
	this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(name)+'&';

	// select the folder if one of its childs is currently selected
	// don't select if it's virtual (#1488346)
	if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0 && !$(li).hasClass('virtual'))
	this.command('list', name);
	}
	else
	return;

	// Work around a bug in IE6 and IE7, see #1485309
	if (bw.ie6 \|\| bw.ie7) {
	var siblings = li.nextSibling ? li.nextSibling.getElementsByTagName('ul') : null;
	if (siblings && siblings.length && (li = siblings[0]) && li.style && li.style.display != 'none') {
	li.style.display = 'none';
	li.style.display = '';
	}
	}

	this.command('save-pref', { name: 'collapsed_folders', value: this.env.collapsed_folders });
	this.set_unread_count_display(name, false);
	};

	this.doc_mouse_up = function(e)
	{
	var model, list, id;

	// ignore event if jquery UI dialog is open
	if ($(rcube_event.get_target(e)).closest('.ui-dialog, .ui-widget-overlay').length)
	return;

	if (list = this.message_list)
	model = this.env.mailboxes;
	else if (list = this.contact_list)
	model = this.env.contactfolders;
	else if (this.ksearch_value)
	this.ksearch_blur();

	if (list && !rcube_mouse_is_over(e, list.list.parentNode))
	list.blur();

	// handle mouse release when dragging
	if (this.drag_active && model && this.env.last_folder_target) {
	var target = model[this.env.last_folder_target];

	$(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
	this.env.last_folder_target = null;
	list.draglayer.hide();

	if (!this.drag_menu(e, target))
	this.command('moveto', target);
	}

	// reset 'pressed' buttons
	if (this.buttons_sel) {
	for (id in this.buttons_sel)
	if (typeof id !== 'function')
	this.button_out(this.buttons_sel[id], id);
	this.buttons_sel = {};
	}
	};

	this.click_on_list = function(e)
	{
	if (this.gui_objects.qsearchbox)
	this.gui_objects.qsearchbox.blur();

	if (this.message_list)
	this.message_list.focus();
	else if (this.contact_list)
	this.contact_list.focus();

	return true;
	};

	this.msglist_select = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);
	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);

	var selected = list.get_single_selection() != null;

	this.enable_command(this.env.message_commands, selected);
	if (selected) {
	// Hide certain command buttons when Drafts folder is selected
	if (this.env.mailbox == this.env.drafts_mailbox)
	- this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-attachment', false);
	+ this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-attachment', 'forward-inline', false);
	// Disable reply-list when List-Post header is not set
	else {
	var msg = this.env.messages[list.get_single_selection()];
	if (!msg.ml)
	this.enable_command('reply-list', false);
	}
	}
	// Multi-message commands
	- this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
	+ this.enable_command('delete', 'moveto', 'copy', 'mark', 'forward', 'forward-attachment', list.selection.length > 0);

	// reset all-pages-selection
	if (selected \|\| (list.selection.length && list.selection.length != list.rowcount))
	this.select_all_mode = false;

	// start timer for message preview (wait for double click)
	if (selected && this.env.contentframe && !list.multi_selecting && !this.dummy_select)
	this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, 200);
	else if (this.env.contentframe)
	this.show_contentframe(false);
	};

	// This allow as to re-select selected message and display it in preview frame
	this.msglist_click = function(list)
	{
	if (list.multi_selecting \|\| !this.env.contentframe)
	return;

	if (list.get_single_selection())
	return;

	var win = this.get_frame_window(this.env.contentframe);

	if (win && win.location.href.indexOf(this.env.blankpage)>=0) {
	if (this.preview_timer)
	clearTimeout(this.preview_timer);
	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);
	this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, 200);
	}
	};

	this.msglist_dbl_click = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);

	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);

	var uid = list.get_single_selection();
	if (uid && this.env.mailbox == this.env.drafts_mailbox)
	this.open_compose_step({ _draft_uid: uid, _mbox: this.env.mailbox });
	else if (uid)
	this.show_message(uid, false, false);
	};

	this.msglist_keypress = function(list)
	{
	if (list.modkey == CONTROL_KEY)
	return;

	if (list.key_pressed == list.ENTER_KEY)
	this.command('show');
	else if (list.key_pressed == list.DELETE_KEY \|\| list.key_pressed == list.BACKSPACE_KEY)
	this.command('delete');
	else if (list.key_pressed == 33)
	this.command('previouspage');
	else if (list.key_pressed == 34)
	this.command('nextpage');
	};

	this.msglist_get_preview = function()
	{
	var uid = this.get_single_uid();
	if (uid && this.env.contentframe && !this.drag_active)
	this.show_message(uid, false, true);
	else if (this.env.contentframe)
	this.show_contentframe(false);
	};

	this.msglist_expand = function(row)
	{
	if (this.env.messages[row.uid])
	this.env.messages[row.uid].expanded = row.expanded;
	$(row.obj)[row.expanded?'addClass':'removeClass']('expanded');
	};

	this.msglist_set_coltypes = function(list)
	{
	var i, found, name, cols = list.list.tHead.rows[0].cells;

	this.env.coltypes = [];

	for (i=0; i<cols.length; i++)
	if (cols[i].id && cols[i].id.match(/^rcm/)) {
	name = cols[i].id.replace(/^rcm/, '');
	this.env.coltypes.push(name);
	}

	if ((found = $.inArray('flag', this.env.coltypes)) >= 0)
	this.env.flagged_col = found;

	if ((found = $.inArray('subject', this.env.coltypes)) >= 0)
	this.env.subject_col = found;

	this.command('save-pref', { name: 'list_cols', value: this.env.coltypes, session: 'list_attrib/columns' });
	};

	this.check_droptarget = function(id)
	{
	var allow = false, copy = false;

	if (this.task == 'mail')
	allow = (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
	else if (this.task == 'settings')
	allow = (id != this.env.mailbox);
	else if (this.task == 'addressbook') {
	if (id != this.env.source && this.env.contactfolders[id]) {
	if (this.env.contactfolders[id].type == 'group') {
	var target_abook = this.env.contactfolders[id].source;
	allow = this.env.contactfolders[id].id != this.env.group && !this.env.contactfolders[target_abook].readonly;
	copy = target_abook != this.env.source;
	}
	else {
	allow = !this.env.contactfolders[id].readonly;
	copy = true;
	}
	}
	}

	return allow ? (copy ? 2 : 1) : 0;
	};

	this.open_window = function(url, width, height)
	{
	var w = Math.min(width, screen.width - 10),
	h = Math.min(height, screen.height - 100),
	l = (screen.width - w) / 2 + (screen.left \|\| 0),
	t = Math.max(0, (screen.height - h) / 2 + (screen.top \|\| 0) - 20);

	var wname = 'rcmextwin' + new Date().getTime(),
	extwin = window.open(url + '&_extwin=1', wname, 'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,toolbar=no,status=no');
	extwin.moveTo(l,t);

	// write loading... message to empty windows
	if (!url && extwin.document) {
	extwin.document.write('<html><body>' + this.get_label('loading') + '</body></html>');
	}

	// focus window, delayed to bring to front
	window.setTimeout(function(){ extwin.focus(); }, 10);

	return wname;
	};


	/*********************************************************/
	/******* (message) list functionality *******/
	/*********************************************************/

	this.init_message_row = function(row)
	{
	var expando, self = this, uid = row.uid,
	status_icon = (this.env.status_col != null ? 'status' : 'msg') + 'icn' + row.uid;

	if (uid && this.env.messages[uid])
	$.extend(row, this.env.messages[uid]);

	// set eventhandler to status icon
	if (row.icon = document.getElementById(status_icon)) {
	row.icon._row = row.obj;
	row.icon.onmousedown = function(e) { self.command('toggle_status', this); rcube_event.cancel(e); };
	}

	// save message icon position too
	if (this.env.status_col != null)
	row.msgicon = document.getElementById('msgicn'+row.uid);
	else
	row.msgicon = row.icon;

	// set eventhandler to flag icon, if icon found
	if (this.env.flagged_col != null && (row.flagicon = document.getElementById('flagicn'+row.uid))) {
	row.flagicon._row = row.obj;
	row.flagicon.onmousedown = function(e) { self.command('toggle_flag', this); rcube_event.cancel(e); };
	}

	if (!row.depth && row.has_children && (expando = document.getElementById('rcmexpando'+row.uid))) {
	row.expando = expando;
	expando.onmousedown = function(e) { return self.expand_message_row(e, uid); };
	}

	this.triggerEvent('insertrow', { uid:uid, row:row });
	};

	// create a table row in the message list
	this.add_message_row = function(uid, cols, flags, attop)
	{
	if (!this.gui_objects.messagelist \|\| !this.message_list)
	return false;

	// Prevent from adding messages from different folder (#1487752)
	if (flags.mbox != this.env.mailbox && !flags.skip_mbox_check)
	return false;

	if (!this.env.messages[uid])
	this.env.messages[uid] = {};

	// merge flags over local message object
	$.extend(this.env.messages[uid], {
	deleted: flags.deleted?1:0,
	replied: flags.answered?1:0,
	unread: !flags.seen?1:0,
	forwarded: flags.forwarded?1:0,
	flagged: flags.flagged?1:0,
	has_children: flags.has_children?1:0,
	depth: flags.depth?flags.depth:0,
	unread_children: flags.unread_children?flags.unread_children:0,
	parent_uid: flags.parent_uid?flags.parent_uid:0,
	selected: this.select_all_mode \|\| this.message_list.in_selection(uid),
	ml: flags.ml?1:0,
	ctype: flags.ctype,
	// flags from plugins
	flags: flags.extra_flags
	});

	var c, n, col, html, css_class,
	tree = '', expando = '',
	list = this.message_list,
	rows = list.rows,
	message = this.env.messages[uid],
	row_class = 'message'
	+ (!flags.seen ? ' unread' : '')
	+ (flags.deleted ? ' deleted' : '')
	+ (flags.flagged ? ' flagged' : '')
	+ (flags.unread_children && flags.seen && !this.env.autoexpand_threads ? ' unroot' : '')
	+ (message.selected ? ' selected' : ''),
	// for performance use DOM instead of jQuery here
	row = document.createElement('tr');

	row.id = 'rcmrow'+uid;

	// message status icons
	css_class = 'msgicon';
	if (this.env.status_col === null) {
	css_class += ' status';
	if (flags.deleted)
	css_class += ' deleted';
	else if (!flags.seen)
	css_class += ' unread';
	else if (flags.unread_children > 0)
	css_class += ' unreadchildren';
	}
	if (flags.answered)
	css_class += ' replied';
	if (flags.forwarded)
	css_class += ' forwarded';

	// update selection
	if (message.selected && !list.in_selection(uid))
	list.selection.push(uid);

	// threads
	if (this.env.threading) {
	if (message.depth) {
	// This assumes that div width is hardcoded to 15px,
	tree += '<span id="rcmtab' + uid + '" class="branch" style="width:' + (message.depth * 15) + 'px;">  </span>';

	if ((rows[message.parent_uid] && rows[message.parent_uid].expanded === false)
	\|\| ((this.env.autoexpand_threads == 0 \|\| this.env.autoexpand_threads == 2) &&
	(!rows[message.parent_uid] \|\| !rows[message.parent_uid].expanded))
	) {
	row.style.display = 'none';
	message.expanded = false;
	}
	else
	message.expanded = true;

	row_class += ' thread expanded';
	}
	else if (message.has_children) {
	if (message.expanded === undefined && (this.env.autoexpand_threads == 1 \|\| (this.env.autoexpand_threads == 2 && message.unread_children))) {
	message.expanded = true;
	}

	expando = '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '">  </div>';
	row_class += ' thread' + (message.expanded? ' expanded' : '');
	}
	}

	tree += '<span id="msgicn'+uid+'" class="'+css_class+'"> </span>';
	row.className = row_class;

	// build subject link
	if (!bw.ie && cols.subject) {
	var action = flags.mbox == this.env.drafts_mailbox ? 'compose' : 'show';
	var uid_param = flags.mbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid';
	cols.subject = '<a href="./?_task=mail&_action='+action+'&_mbox='+urlencode(flags.mbox)+'&'+uid_param+'='+uid+'"'+
	' onclick="return rcube_event.cancel(event)" onmouseover="rcube_webmail.long_subject_title(this,'+(message.depth+1)+')">'+cols.subject+'</a>';
	}

	// add each submitted col
	for (n in this.env.coltypes) {
	c = this.env.coltypes[n];
	col = document.createElement('td');
	col.className = String(c).toLowerCase();

	if (c == 'flag') {
	css_class = (flags.flagged ? 'flagged' : 'unflagged');
	html = '<span id="flagicn'+uid+'" class="'+css_class+'"> </span>';
	}
	else if (c == 'attachment') {
	if (/application\/\|multipart\/(m\|signed)/.test(flags.ctype))
	html = '<span class="attachment"> </span>';
	else if (/multipart\/report/.test(flags.ctype))
	html = '<span class="report"> </span>';
	else
	html = ' ';
	}
	else if (c == 'status') {
	if (flags.deleted)
	css_class = 'deleted';
	else if (!flags.seen)
	css_class = 'unread';
	else if (flags.unread_children > 0)
	css_class = 'unreadchildren';
	else
	css_class = 'msgicon';
	html = '<span id="statusicn'+uid+'" class="'+css_class+'"> </span>';
	}
	else if (c == 'threads')
	html = expando;
	else if (c == 'subject') {
	if (bw.ie) {
	col.onmouseover = function() { rcube_webmail.long_subject_title_ie(this, message.depth+1); };
	if (bw.ie8)
	tree = '<span></span>' + tree; // #1487821
	}
	html = tree + cols[c];
	}
	else if (c == 'priority') {
	if (flags.prio > 0 && flags.prio < 6)
	html = '<span class="prio'+flags.prio+'"> </span>';
	else
	html = ' ';
	}
	else
	html = cols[c];

	col.innerHTML = html;

	row.appendChild(col);
	}

	list.insert_row(row, attop);

	// remove 'old' row
	if (attop && this.env.pagesize && list.rowcount > this.env.pagesize) {
	var uid = list.get_last_row();
	list.remove_row(uid);
	list.clear_selection(uid);
	}
	};

	this.set_list_sorting = function(sort_col, sort_order)
	{
	// set table header class
	$('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));
	if (sort_col)
	$('#rcm'+sort_col).addClass('sorted'+sort_order);

	this.env.sort_col = sort_col;
	this.env.sort_order = sort_order;
	};

	this.set_list_options = function(cols, sort_col, sort_order, threads)
	{
	var update, post_data = {};

	if (sort_col === undefined)
	sort_col = this.env.sort_col;
	if (!sort_order)
	sort_order = this.env.sort_order;

	if (this.env.sort_col != sort_col \|\| this.env.sort_order != sort_order) {
	update = 1;
	this.set_list_sorting(sort_col, sort_order);
	}

	if (this.env.threading != threads) {
	update = 1;
	post_data._threads = threads;
	}

	if (cols && cols.length) {
	// make sure new columns are added at the end of the list
	var i, idx, name, newcols = [], oldcols = this.env.coltypes;
	for (i=0; i<oldcols.length; i++) {
	name = oldcols[i];
	idx = $.inArray(name, cols);
	if (idx != -1) {
	newcols.push(name);
	delete cols[idx];
	}
	}
	for (i=0; i<cols.length; i++)
	if (cols[i])
	newcols.push(cols[i]);

	if (newcols.join() != oldcols.join()) {
	update = 1;
	post_data._cols = newcols.join(',');
	}
	}

	if (update)
	this.list_mailbox('', '', sort_col+'_'+sort_order, post_data);
	};

	// when user double-clicks on a row
	this.show_message = function(id, safe, preview)
	{
	if (!id)
	return;

	var win, target = window,
	action = preview ? 'preview': 'show',
	url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox);

	if (preview && (win = this.get_frame_window(this.env.contentframe))) {
	target = win;
	url += '&_framed=1';
	}

	if (safe)
	url += '&_safe=1';

	// also send search request to get the right messages
	if (this.env.search_request)
	url += '&_search='+this.env.search_request;

	// add browser capabilities, so we can properly handle attachments
	url += '&_caps='+urlencode(this.browser_capabilities());

	if (this.env.extwin)
	url += '&_extwin=1';

	if (preview && String(target.location.href).indexOf(url) >= 0) {
	this.show_contentframe(true);
	}
	else {
	if (!preview && this.env.message_extwin && !this.env.extwin)
	this.open_window(this.env.comm_path+url, 1000, 1200);
	else
	this.location_href(this.env.comm_path+url, target, true);

	// mark as read and change mbox unread counter
	if (preview && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read >= 0) {
	this.preview_read_timer = setTimeout(function() {
	ref.set_message(id, 'unread', false);
	ref.update_thread_root(id, 'read');
	if (ref.env.unread_counts[ref.env.mailbox]) {
	ref.env.unread_counts[ref.env.mailbox] -= 1;
	ref.set_unread_count(ref.env.mailbox, ref.env.unread_counts[ref.env.mailbox], ref.env.mailbox == 'INBOX');
	}
	if (ref.env.preview_pane_mark_read > 0)
	ref.http_post('mark', {_uid: id, _flag: 'read', _quiet: 1});
	}, this.env.preview_pane_mark_read * 1000);
	}
	}
	};

	this.show_contentframe = function(show)
	{
	var frame, win, name = this.env.contentframe;

	if (name && (frame = this.get_frame_element(name))) {
	if (!show && (win = this.get_frame_window(name))) {
	if (win.location && win.location.href.indexOf(this.env.blankpage)<0)
	win.location.href = this.env.blankpage;
	}
	else if (!bw.safari && !bw.konq)
	$(frame)[show ? 'show' : 'hide']();
	}

	if (!show && this.busy)
	this.set_busy(false, null, this.env.frame_lock);
	};

	this.get_frame_element = function(id)
	{
	var frame;

	if (id && (frame = document.getElementById(id)))
	return frame;
	};

	this.get_frame_window = function(id)
	{
	var frame = this.get_frame_element(id);

	if (frame && frame.name && window.frames)
	return window.frames[frame.name];
	};

	this.lock_frame = function()
	{
	if (!this.env.frame_lock)
	(this.is_framed() ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
	};

	// list a specific page
	this.list_page = function(page)
	{
	if (page == 'next')
	page = this.env.current_page+1;
	else if (page == 'last')
	page = this.env.pagecount;
	else if (page == 'prev' && this.env.current_page > 1)
	page = this.env.current_page-1;
	else if (page == 'first' && this.env.current_page > 1)
	page = 1;

	if (page > 0 && page <= this.env.pagecount) {
	this.env.current_page = page;

	if (this.task == 'addressbook' \|\| this.contact_list)
	this.list_contacts(this.env.source, this.env.group, page);
	else if (this.task == 'mail')
	this.list_mailbox(this.env.mailbox, page);
	}
	};

	// sends request to check for recent messages
	this.checkmail = function()
	{
	var lock = this.set_busy(true, 'checkingmail'),
	params = this.check_recent_params();

	this.http_request('check-recent', params, lock);
	};

	// list messages of a specific mailbox using filter
	this.filter_mailbox = function(filter)
	{
	var lock = this.set_busy(true, 'searching');

	this.clear_message_list();

	// reset vars
	this.env.current_page = 1;
	this.http_request('search', this.search_params(false, filter), lock);
	};

	// list messages of a specific mailbox
	this.list_mailbox = function(mbox, page, sort, url)
	{
	var win, target = window;

	if (typeof url != 'object')
	url = {};

	if (!mbox)
	mbox = this.env.mailbox ? this.env.mailbox : 'INBOX';

	// add sort to url if set
	if (sort)
	url._sort = sort;

	// also send search request to get the right messages
	if (this.env.search_request)
	url._search = this.env.search_request;

	// set page=1 if changeing to another mailbox
	if (this.env.mailbox != mbox) {
	page = 1;
	this.env.current_page = page;
	this.select_all_mode = false;
	}

	// unselect selected messages and clear the list and message data
	this.clear_message_list();

	if (mbox != this.env.mailbox \|\| (mbox == this.env.mailbox && !page && !sort))
	url._refresh = 1;

	this.select_folder(mbox, '', true);
	this.unmark_folder(mbox, 'recent', '', true);
	this.env.mailbox = mbox;

	// load message list remotely
	if (this.gui_objects.messagelist) {
	this.list_mailbox_remote(mbox, page, url);
	return;
	}

	if (win = this.get_frame_window(this.env.contentframe)) {
	target = win;
	url._framed = 1;
	}

	// load message list to target frame/window
	if (mbox) {
	this.set_busy(true, 'loading');
	url._mbox = mbox;
	if (page)
	url._page = page;
	this.location_href(url, target);
	}
	};

	this.clear_message_list = function()
	{
	this.env.messages = {};
	this.last_selected = 0;

	this.show_contentframe(false);
	if (this.message_list)
	this.message_list.clear(true);
	};

	// send remote request to load message list
	this.list_mailbox_remote = function(mbox, page, post_data)
	{
	// clear message list first
	this.message_list.clear();

	var lock = this.set_busy(true, 'loading');

	if (typeof post_data != 'object')
	post_data = {};
	post_data._mbox = mbox;
	if (page)
	post_data._page = page;

	this.http_request('list', post_data, lock);
	};

	// removes messages that doesn't exists from list selection array
	this.update_selection = function()
	{
	var selected = this.message_list.selection,
	rows = this.message_list.rows,
	i, selection = [];

	for (i in selected)
	if (rows[selected[i]])
	selection.push(selected[i]);

	this.message_list.selection = selection;
	}

	// expand all threads with unread children
	this.expand_unread = function()
	{
	var r, tbody = this.gui_objects.messagelist.tBodies[0],
	new_row = tbody.firstChild;

	while (new_row) {
	if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) {
	this.message_list.expand_all(r);
	this.set_unread_children(r.uid);
	}
	new_row = new_row.nextSibling;
	}
	return false;
	};

	// thread expanding/collapsing handler
	this.expand_message_row = function(e, uid)
	{
	var row = this.message_list.rows[uid];

	// handle unread_children mark
	row.expanded = !row.expanded;
	this.set_unread_children(uid);
	row.expanded = !row.expanded;

	this.message_list.expand_row(e, uid);
	};

	// message list expanding
	this.expand_threads = function()
	{
	if (!this.env.threading \|\| !this.env.autoexpand_threads \|\| !this.message_list)
	return;

	switch (this.env.autoexpand_threads) {
	case 2: this.expand_unread(); break;
	case 1: this.message_list.expand_all(); break;
	}
	};

	// Initializes threads indicators/expanders after list update
	this.init_threads = function(roots, mbox)
	{
	// #1487752
	if (mbox && mbox != this.env.mailbox)
	return false;

	for (var n=0, len=roots.length; n<len; n++)
	this.add_tree_icons(roots[n]);
	this.expand_threads();
	};

	// adds threads tree icons to the list (or specified thread)
	this.add_tree_icons = function(root)
	{
	var i, l, r, n, len, pos, tmp = [], uid = [],
	row, rows = this.message_list.rows;

	if (root)
	row = rows[root] ? rows[root].obj : null;
	else
	row = this.message_list.list.tBodies[0].firstChild;

	while (row) {
	if (row.nodeType == 1 && (r = rows[row.uid])) {
	if (r.depth) {
	for (i=tmp.length-1; i>=0; i--) {
	len = tmp[i].length;
	if (len > r.depth) {
	pos = len - r.depth;
	if (!(tmp[i][pos] & 2))
	tmp[i][pos] = tmp[i][pos] ? tmp[i][pos]+2 : 2;
	}
	else if (len == r.depth) {
	if (!(tmp[i][0] & 2))
	tmp[i][0] += 2;
	}
	if (r.depth > len)
	break;
	}

	tmp.push(new Array(r.depth));
	tmp[tmp.length-1][0] = 1;
	uid.push(r.uid);
	}
	else {
	if (tmp.length) {
	for (i in tmp) {
	this.set_tree_icons(uid[i], tmp[i]);
	}
	tmp = [];
	uid = [];
	}
	if (root && row != rows[root].obj)
	break;
	}
	}
	row = row.nextSibling;
	}

	if (tmp.length) {
	for (i in tmp) {
	this.set_tree_icons(uid[i], tmp[i]);
	}
	}
	};

	// adds tree icons to specified message row
	this.set_tree_icons = function(uid, tree)
	{
	var i, divs = [], html = '', len = tree.length;

	for (i=0; i<len; i++) {
	if (tree[i] > 2)
	divs.push({'class': 'l3', width: 15});
	else if (tree[i] > 1)
	divs.push({'class': 'l2', width: 15});
	else if (tree[i] > 0)
	divs.push({'class': 'l1', width: 15});
	// separator div
	else if (divs.length && !divs[divs.length-1]['class'])
	divs[divs.length-1].width += 15;
	else
	divs.push({'class': null, width: 15});
	}

	for (i=divs.length-1; i>=0; i--) {
	if (divs[i]['class'])
	html += '<div class="tree '+divs[i]['class']+'" />';
	else
	html += '<div style="width:'+divs[i].width+'px" />';
	}

	if (html)
	$('#rcmtab'+uid).html(html);
	};

	// update parent in a thread
	this.update_thread_root = function(uid, flag)
	{
	if (!this.env.threading)
	return;

	var root = this.message_list.find_root(uid);

	if (uid == root)
	return;

	var p = this.message_list.rows[root];

	if (flag == 'read' && p.unread_children) {
	p.unread_children--;
	}
	else if (flag == 'unread' && p.has_children) {
	// unread_children may be undefined
	p.unread_children = p.unread_children ? p.unread_children + 1 : 1;
	}
	else {
	return;
	}

	this.set_message_icon(root);
	this.set_unread_children(root);
	};

	// update thread indicators for all messages in a thread below the specified message
	// return number of removed/added root level messages
	this.update_thread = function (uid)
	{
	if (!this.env.threading)
	return 0;

	var r, parent, count = 0,
	rows = this.message_list.rows,
	row = rows[uid],
	depth = rows[uid].depth,
	roots = [];

	if (!row.depth) // root message: decrease roots count
	count--;
	else if (row.unread) {
	// update unread_children for thread root
	parent = this.message_list.find_root(uid);
	rows[parent].unread_children--;
	this.set_unread_children(parent);
	}

	parent = row.parent_uid;

	// childrens
	row = row.obj.nextSibling;
	while (row) {
	if (row.nodeType == 1 && (r = rows[row.uid])) {
	if (!r.depth \|\| r.depth <= depth)
	break;

	r.depth--; // move left
	// reset width and clear the content of a tab, icons will be added later
	$('#rcmtab'+r.uid).width(r.depth * 15).html('');
	if (!r.depth) { // a new root
	count++; // increase roots count
	r.parent_uid = 0;
	if (r.has_children) {
	// replace 'leaf' with 'collapsed'
	$('#rcmrow'+r.uid+' '+'.leaf:first')
	.attr('id', 'rcmexpando' + r.uid)
	.attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed'))
	.bind('mousedown', {uid:r.uid, p:this},
	function(e) { return e.data.p.expand_message_row(e, e.data.uid); });

	r.unread_children = 0;
	roots.push(r);
	}
	// show if it was hidden
	if (r.obj.style.display == 'none')
	$(r.obj).show();
	}
	else {
	if (r.depth == depth)
	r.parent_uid = parent;
	if (r.unread && roots.length)
	roots[roots.length-1].unread_children++;
	}
	}
	row = row.nextSibling;
	}

	// update unread_children for roots
	for (var i=0; i<roots.length; i++)
	this.set_unread_children(roots[i].uid);

	return count;
	};

	this.delete_excessive_thread_rows = function()
	{
	var rows = this.message_list.rows,
	tbody = this.message_list.list.tBodies[0],
	row = tbody.firstChild,
	cnt = this.env.pagesize + 1;

	while (row) {
	if (row.nodeType == 1 && (r = rows[row.uid])) {
	if (!r.depth && cnt)
	cnt--;

	if (!cnt)
	this.message_list.remove_row(row.uid);
	}
	row = row.nextSibling;
	}
	};

	// set message icon
	this.set_message_icon = function(uid)
	{
	var css_class,
	row = this.message_list.rows[uid];

	if (!row)
	return false;

	if (row.icon) {
	css_class = 'msgicon';
	if (row.deleted)
	css_class += ' deleted';
	else if (row.unread)
	css_class += ' unread';
	else if (row.unread_children)
	css_class += ' unreadchildren';
	if (row.msgicon == row.icon) {
	if (row.replied)
	css_class += ' replied';
	if (row.forwarded)
	css_class += ' forwarded';
	css_class += ' status';
	}

	row.icon.className = css_class;
	}

	if (row.msgicon && row.msgicon != row.icon) {
	css_class = 'msgicon';
	if (!row.unread && row.unread_children)
	css_class += ' unreadchildren';
	if (row.replied)
	css_class += ' replied';
	if (row.forwarded)
	css_class += ' forwarded';

	row.msgicon.className = css_class;
	}

	if (row.flagicon) {
	css_class = (row.flagged ? 'flagged' : 'unflagged');
	row.flagicon.className = css_class;
	}
	};

	// set message status
	this.set_message_status = function(uid, flag, status)
	{
	var row = this.message_list.rows[uid];

	if (!row)
	return false;

	if (flag == 'unread')
	row.unread = status;
	else if(flag == 'deleted')
	row.deleted = status;
	else if (flag == 'replied')
	row.replied = status;
	else if (flag == 'forwarded')
	row.forwarded = status;
	else if (flag == 'flagged')
	row.flagged = status;
	};

	// set message row status, class and icon
	this.set_message = function(uid, flag, status)
	{
	var row = this.message_list && this.message_list.rows[uid];

	if (!row)
	return false;

	if (flag)
	this.set_message_status(uid, flag, status);

	var rowobj = $(row.obj);

	if (row.unread && !rowobj.hasClass('unread'))
	rowobj.addClass('unread');
	else if (!row.unread && rowobj.hasClass('unread'))
	rowobj.removeClass('unread');

	if (row.deleted && !rowobj.hasClass('deleted'))
	rowobj.addClass('deleted');
	else if (!row.deleted && rowobj.hasClass('deleted'))
	rowobj.removeClass('deleted');

	if (row.flagged && !rowobj.hasClass('flagged'))
	rowobj.addClass('flagged');
	else if (!row.flagged && rowobj.hasClass('flagged'))
	rowobj.removeClass('flagged');

	this.set_unread_children(uid);
	this.set_message_icon(uid);
	};

	// sets unroot (unread_children) class of parent row
	this.set_unread_children = function(uid)
	{
	var row = this.message_list.rows[uid];

	if (row.parent_uid)
	return;

	if (!row.unread && row.unread_children && !row.expanded)
	$(row.obj).addClass('unroot');
	else
	$(row.obj).removeClass('unroot');
	};

	// copy selected messages to the specified mailbox
	this.copy_messages = function(mbox)
	{
	if (mbox && typeof mbox === 'object')
	mbox = mbox.id;

	- // exit if current or no mailbox specified or if selection is empty
	- if (!mbox \|\| mbox == this.env.mailbox \|\| (!this.env.uid && (!this.message_list \|\| !this.message_list.get_selection().length)))
	+ // exit if current or no mailbox specified
	+ if (!mbox \|\| mbox == this.env.mailbox)
	return;

	- var a_uids = [], n, selection,
	- lock = this.display_message(this.get_label('copyingmessage'), 'loading'),
	- post_data = {_mbox: this.env.mailbox, _target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};
	-
	- if (this.env.uid)
	- a_uids[0] = this.env.uid;
	- else {
	- selection = this.message_list.get_selection();
	- for (n in selection) {
	- a_uids.push(selection[n]);
	- }
	- }
	+ var post_data = this.selection_post_data({_target_mbox: mbox});

	- post_data._uid = this.uids_to_list(a_uids);
	+ // exit if selection is empty
	+ if (!post_data._uid)
	+ return;

	// send request to server
	- this.http_post('copy', post_data, lock);
	+ this.http_post('copy', post_data, this.display_message(this.get_label('copyingmessage'), 'loading'));
	};

	// move selected messages to the specified mailbox
	this.move_messages = function(mbox)
	{
	if (mbox && typeof mbox === 'object')
	mbox = mbox.id;

	- // exit if current or no mailbox specified or if selection is empty
	- if (!mbox \|\| mbox == this.env.mailbox \|\| (!this.env.uid && (!this.message_list \|\| !this.message_list.get_selection().length)))
	+ // exit if current or no mailbox specified
	+ if (!mbox \|\| mbox == this.env.mailbox)
	return;

	- var lock = false,
	- add_post = {_target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};
	+ var lock = false, post_data = this.selection_post_data({_target_mbox: mbox});
	+
	+ // exit if selection is empty
	+ if (!post_data._uid)
	+ return;

	// show wait message
	if (this.env.action == 'show')
	lock = this.set_busy(true, 'movingmessage');
	else
	this.show_contentframe(false);

	// Hide message command buttons until a message is selected
	this.enable_command(this.env.message_commands, false);

	- this._with_selected_messages('moveto', lock, add_post);
	+ this._with_selected_messages('moveto', post_data, lock);
	};

	// delete selected messages from the current mailbox
	this.delete_messages = function(event)
	{
	var uid, i, len, trash = this.env.trash_mailbox,
	list = this.message_list,
	- selection = list ? $.merge([], list.get_selection()) : [];
	+ selection = list.get_selection();

	// exit if no mailbox specified or if selection is empty
	if (!this.env.uid && !selection.length)
	return;

	// also select childs of collapsed rows
	for (i=0, len=selection.length; i<len; i++) {
	uid = selection[i];
	if (list.rows[uid].has_children && !list.rows[uid].expanded)
	list.select_children(uid);
	}

	// if config is set to flag for deletion
	if (this.env.flag_for_deletion) {
	this.mark_message('delete');
	return false;
	}
	// if there isn't a defined trash mailbox or we are in it
	- // @TODO: we should check if defined trash mailbox exists
	else if (!trash \|\| this.env.mailbox == trash)
	this.permanently_remove_messages();
	// we're in Junk folder and delete_junk is enabled
	else if (this.env.delete_junk && this.env.junk_mailbox && this.env.mailbox == this.env.junk_mailbox)
	this.permanently_remove_messages();
	// if there is a trash mailbox defined and we're not currently in it
	else {
	// if shift was pressed delete it immediately
	if ((list && list.modkey == SHIFT_KEY) \|\| (event && rcube_event.get_modifier(event) == SHIFT_KEY)) {
	if (confirm(this.get_label('deletemessagesconfirm')))
	this.permanently_remove_messages();
	}
	else
	this.move_messages(trash);
	}

	return true;
	};

	// delete the selected messages permanently
	this.permanently_remove_messages = function()
	{
	- // exit if no mailbox specified or if selection is empty
	- if (!this.env.uid && (!this.message_list \|\| !this.message_list.get_selection().length))
	+ var post_data = this.selection_post_data();
	+
	+ // exit if selection is empty
	+ if (!post_data._uid)
	return;

	this.show_contentframe(false);
	- this._with_selected_messages('delete', false, {_from: this.env.action ? this.env.action : ''});
	+ this._with_selected_messages('delete', post_data);
	};

	// Send a specifc moveto/delete request with UIDs of all selected messages
	// @private
	- this._with_selected_messages = function(action, lock, post_data)
	+ this._with_selected_messages = function(action, post_data, lock)
	{
	- var a_uids = [], count = 0, msg, lock;
	+ var count = 0, msg;

	- if (typeof(post_data) != 'object')
	- post_data = {};
	-
	- if (this.env.uid)
	- a_uids[0] = this.env.uid;
	- else {
	+ // update the list (remove rows, clear selection)
	+ if (this.message_list) {
	var n, id, root, roots = [],
	selection = this.message_list.get_selection();

	for (n=0, len=selection.length; n<len; n++) {
	id = selection[n];
	- a_uids.push(id);

	if (this.env.threading) {
	count += this.update_thread(id);
	root = this.message_list.find_root(id);
	if (root != id && $.inArray(root, roots) < 0) {
	roots.push(root);
	}
	}
	this.message_list.remove_row(id, (this.env.display_next && n == selection.length-1));
	}
	// make sure there are no selected rows
	if (!this.env.display_next)
	this.message_list.clear_selection();
	// update thread tree icons
	for (n=0, len=roots.length; n<len; n++) {
	this.add_tree_icons(roots[n]);
	}
	}

	- // also send search request to get the right messages
	- if (this.env.search_request)
	- post_data._search = this.env.search_request;
	-
	if (this.env.display_next && this.env.next_uid)
	post_data._next_uid = this.env.next_uid;

	if (count < 0)
	post_data._count = (count*-1);
	// remove threads from the end of the list
	else if (count > 0)
	this.delete_excessive_thread_rows();

	- post_data._uid = this.uids_to_list(a_uids);
	- post_data._mbox = this.env.mailbox;
	-
	if (!lock) {
	msg = action == 'moveto' ? 'movingmessage' : 'deletingmessage';
	lock = this.display_message(this.get_label(msg), 'loading');
	}

	// send request to server
	this.http_post(action, post_data, lock);
	};

	+ // build post data for message delete/move/copy/flag requests
	+ this.selection_post_data = function(data)
	+ {
	+ if (typeof(data) != 'object')
	+ data = {};
	+
	+ data._mbox = this.env.mailbox;
	+
	+ if (!data._uid) {
	+ var uids = this.env.uid ? this.env.uid : this.message_list.get_selection();
	+ data._uid = this.uids_to_list(uids);
	+ }
	+
	+ if (this.env.action)
	+ data._from = this.env.action;
	+
	+ // also send search request to get the right messages
	+ if (this.env.search_request)
	+ data._search = this.env.search_request;
	+
	+ return data;
	+ };
	+
	// set a specific flag to one or more messages
	this.mark_message = function(flag, uid)
	{
	- var a_uids = [], r_uids = [], len, n, id, selection,
	+ var a_uids = [], r_uids = [], len, n, id,
	list = this.message_list;

	if (uid)
	a_uids[0] = uid;
	else if (this.env.uid)
	a_uids[0] = this.env.uid;
	- else if (list) {
	- selection = list.get_selection();
	- for (n=0, len=selection.length; n<len; n++) {
	- a_uids.push(selection[n]);
	- }
	- }
	+ else if (list)
	+ a_uids = list.get_selection();

	if (!list)
	r_uids = a_uids;
	else {
	list.focus();
	for (n=0, len=a_uids.length; n<len; n++) {
	id = a_uids[n];
	- if ((flag=='read' && list.rows[id].unread)
	- \|\| (flag=='unread' && !list.rows[id].unread)
	- \|\| (flag=='delete' && !list.rows[id].deleted)
	- \|\| (flag=='undelete' && list.rows[id].deleted)
	- \|\| (flag=='flagged' && !list.rows[id].flagged)
	- \|\| (flag=='unflagged' && list.rows[id].flagged))
	+ if ((flag == 'read' && list.rows[id].unread)
	+ \|\| (flag == 'unread' && !list.rows[id].unread)
	+ \|\| (flag == 'delete' && !list.rows[id].deleted)
	+ \|\| (flag == 'undelete' && list.rows[id].deleted)
	+ \|\| (flag == 'flagged' && !list.rows[id].flagged)
	+ \|\| (flag == 'unflagged' && list.rows[id].flagged))
	{
	r_uids.push(id);
	}
	}
	}

	// nothing to do
	if (!r_uids.length && !this.select_all_mode)
	return;

	switch (flag) {
	case 'read':
	case 'unread':
	this.toggle_read_status(flag, r_uids);
	break;
	case 'delete':
	case 'undelete':
	this.toggle_delete_status(r_uids);
	break;
	case 'flagged':
	case 'unflagged':
	this.toggle_flagged_status(flag, a_uids);
	break;
	}
	};

	// set class to read/unread
	this.toggle_read_status = function(flag, a_uids)
	{
	var i, len = a_uids.length,
	- post_data = {_uid: this.uids_to_list(a_uids), _flag: flag},
	+ post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: flag}),
	lock = this.display_message(this.get_label('markingmessage'), 'loading');

	// mark all message rows as read/unread
	for (i=0; i<len; i++)
	- this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));
	-
	- // also send search request to get the right messages
	- if (this.env.search_request)
	- post_data._search = this.env.search_request;
	+ this.set_message(a_uids[i], 'unread', (flag == 'unread' ? true : false));

	this.http_post('mark', post_data, lock);

	for (i=0; i<len; i++)
	this.update_thread_root(a_uids[i], flag);
	};

	// set image to flagged or unflagged
	this.toggle_flagged_status = function(flag, a_uids)
	{
	var i, len = a_uids.length,
	- post_data = {_uid: this.uids_to_list(a_uids), _flag: flag},
	+ post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: flag}),
	lock = this.display_message(this.get_label('markingmessage'), 'loading');

	// mark all message rows as flagged/unflagged
	for (i=0; i<len; i++)
	- this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));
	-
	- // also send search request to get the right messages
	- if (this.env.search_request)
	- post_data._search = this.env.search_request;
	+ this.set_message(a_uids[i], 'flagged', (flag == 'flagged' ? true : false));

	this.http_post('mark', post_data, lock);
	};

	// mark all message rows as deleted/undeleted
	this.toggle_delete_status = function(a_uids)
	{
	var len = a_uids.length,
	i, uid, all_deleted = true,
	rows = this.message_list ? this.message_list.rows : [];

	if (len == 1) {
	if (!rows.length \|\| (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
	this.flag_as_deleted(a_uids);
	else
	this.flag_as_undeleted(a_uids);

	return true;
	}

	for (i=0; i<len; i++) {
	uid = a_uids[i];
	if (rows[uid] && !rows[uid].deleted) {
	all_deleted = false;
	break;
	}
	}

	if (all_deleted)
	this.flag_as_undeleted(a_uids);
	else
	this.flag_as_deleted(a_uids);

	return true;
	};

	this.flag_as_undeleted = function(a_uids)
	{
	- var i, len=a_uids.length,
	- post_data = {_uid: this.uids_to_list(a_uids), _flag: 'undelete'},
	+ var i, len = a_uids.length,
	+ post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'undelete'}),
	lock = this.display_message(this.get_label('markingmessage'), 'loading');

	for (i=0; i<len; i++)
	this.set_message(a_uids[i], 'deleted', false);

	- // also send search request to get the right messages
	- if (this.env.search_request)
	- post_data._search = this.env.search_request;
	-
	this.http_post('mark', post_data, lock);
	- return true;
	};

	this.flag_as_deleted = function(a_uids)
	{
	var r_uids = [],
	- post_data = {_uid: this.uids_to_list(a_uids), _flag: 'delete'},
	+ post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'delete'}),
	lock = this.display_message(this.get_label('markingmessage'), 'loading'),
	rows = this.message_list ? this.message_list.rows : [],
	count = 0;

	for (var i=0, len=a_uids.length; i<len; i++) {
	uid = a_uids[i];
	if (rows[uid]) {
	if (rows[uid].unread)
	r_uids[r_uids.length] = uid;

	if (this.env.skip_deleted) {
	count += this.update_thread(uid);
	this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1));
	}
	else
	this.set_message(uid, 'deleted', true);
	}
	}

	// make sure there are no selected rows
	if (this.env.skip_deleted && this.message_list) {
	if(!this.env.display_next)
	this.message_list.clear_selection();
	if (count < 0)
	post_data._count = (count*-1);
	else if (count > 0)
	// remove threads from the end of the list
	this.delete_excessive_thread_rows();
	}

	- if (this.env.action)
	- post_data._from = this.env.action;
	-
	// ??
	if (r_uids.length)
	post_data._ruid = this.uids_to_list(r_uids);

	if (this.env.skip_deleted && this.env.display_next && this.env.next_uid)
	post_data._next_uid = this.env.next_uid;

	- // also send search request to get the right messages
	- if (this.env.search_request)
	- post_data._search = this.env.search_request;
	-
	this.http_post('mark', post_data, lock);
	- return true;
	};

	// flag as read without mark request (called from backend)
	// argument should be a coma-separated list of uids
	this.flag_deleted_as_read = function(uids)
	{
	var icn_src, uid, i, len,
	rows = this.message_list ? this.message_list.rows : [];

	uids = String(uids).split(',');

	for (i=0, len=uids.length; i<len; i++) {
	uid = uids[i];
	if (rows[uid])
	this.set_message(uid, 'unread', false);
	}
	};

	// Converts array of message UIDs to comma-separated list for use in URL
	// with select_all mode checking
	this.uids_to_list = function(uids)
	{
	return this.select_all_mode ? '*' : uids.join(',');
	};

	// Sets title of the delete button
	this.set_button_titles = function()
	{
	var label = 'deletemessage';

	if (!this.env.flag_for_deletion
	&& this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox
	&& (!this.env.delete_junk \|\| !this.env.junk_mailbox \|\| this.env.mailbox != this.env.junk_mailbox)
	)
	label = 'movemessagetotrash';

	this.set_alttext('delete', label);
	};

	/*********************************************************/
	/******* mailbox folders methods *******/
	/*********************************************************/

	this.expunge_mailbox = function(mbox)
	{
	var lock, post_data = {_mbox: mbox};

	// lock interface if it's the active mailbox
	if (mbox == this.env.mailbox) {
	lock = this.set_busy(true, 'loading');
	post_data._reload = 1;
	if (this.env.search_request)
	post_data._search = this.env.search_request;
	}

	// send request to server
	this.http_post('expunge', post_data, lock);
	};

	this.purge_mailbox = function(mbox)
	{
	var lock, post_data = {_mbox: mbox};

	if (!confirm(this.get_label('purgefolderconfirm')))
	return false;

	// lock interface if it's the active mailbox
	if (mbox == this.env.mailbox) {
	lock = this.set_busy(true, 'loading');
	post_data._reload = 1;
	}

	// send request to server
	this.http_post('purge', post_data, lock);
	};

	// test if purge command is allowed
	this.purge_mailbox_test = function()
	{
	- return (this.env.messagecount && (this.env.mailbox == this.env.trash_mailbox \|\| this.env.mailbox == this.env.junk_mailbox
	+ return (this.env.exists && (this.env.mailbox == this.env.trash_mailbox \|\| this.env.mailbox == this.env.junk_mailbox
	\|\| this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter))
	\|\| this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))));
	};


	/*********************************************************/
	/******* login form methods *******/
	/*********************************************************/

	// handler for keyboard events on the _user field
	this.login_user_keyup = function(e)
	{
	var key = rcube_event.get_keycode(e);
	var passwd = $('#rcmloginpwd');

	// enter
	if (key == 13 && passwd.length && !passwd.val()) {
	passwd.focus();
	return rcube_event.cancel(e);
	}

	return true;
	};


	/*********************************************************/
	/******* message compose methods *******/
	/*********************************************************/

	this.open_compose_step = function(p)
	{
	var url = this.url('mail/compose', p);

	// open new compose window
	if (this.env.compose_extwin && !this.env.extwin) {
	this.open_window(url, 1150, 900);
	}
	else {
	this.redirect(url);
	window.resizeTo(Math.max(1150, $(window).width()), Math.max(900, $(window).height()));
	}
	};

	// init message compose form: set focus and eventhandlers
	this.init_messageform = function()
	{
	if (!this.gui_objects.messageform)
	return false;

	var input_from = $("[name='_from']"),
	input_to = $("[name='_to']"),
	input_subject = $("input[name='_subject']"),
	input_message = $("[name='_message']").get(0),
	html_mode = $("input[name='_is_html']").val() == '1',
	ac_fields = ['cc', 'bcc', 'replyto', 'followupto'],
	ac_props;

	// close compose step in opener
	if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose') {
	setTimeout(function(){ opener.history.back(); }, 100);
	this.env.opened_extwin = true;
	}

	// configure parallel autocompletion
	if (this.env.autocomplete_threads > 0) {
	ac_props = {
	threads: this.env.autocomplete_threads,
	sources: this.env.autocomplete_sources
	};
	}

	// init live search events
	this.init_address_input_events(input_to, ac_props);
	for (var i in ac_fields) {
	this.init_address_input_events($("[name='_"+ac_fields[i]+"']"), ac_props);
	}

	if (!html_mode) {
	this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
	// add signature according to selected identity
	// if we have HTML editor, signature is added in callback
	if (input_from.prop('type') == 'select-one' && !this.env.opened_extwin) {
	this.change_identity(input_from[0]);
	}
	}

	if (input_to.val() == '')
	input_to.focus();
	else if (input_subject.val() == '')
	input_subject.focus();
	else if (input_message)
	input_message.focus();

	this.env.compose_focus_elem = document.activeElement;

	// get summary of all field values
	this.compose_field_hash(true);

	// start the auto-save timer
	this.auto_save_start();
	};

	this.init_address_input_events = function(obj, props)
	{
	this.env.recipients_delimiter = this.env.recipients_separator + ' ';

	obj[bw.ie \|\| bw.safari \|\| bw.chrome ? 'keydown' : 'keypress'](function(e) { return ref.ksearch_keydown(e, this, props); })
	.attr('autocomplete', 'off');
	};

	this.submit_messageform = function(draft)
	{
	var form = this.gui_objects.messageform;

	if (!form)
	return;

	// all checks passed, send message
	var msgid = this.set_busy(true, draft ? 'savingmessage' : 'sendingmessage'),
	lang = this.spellcheck_lang(),
	files = [];

	// send files list
	$('li', this.gui_objects.attachmentlist).each(function() { files.push(this.id.replace(/^rcmfile/, '')); });
	$('input[name="_attachments"]', form).val(files.join());

	form.target = 'savetarget';
	form._draft.value = draft ? '1' : '';
	form.action = this.add_url(form.action, '_unlock', msgid);
	form.action = this.add_url(form.action, '_lang', lang);
	form.submit();
	};

	this.compose_recipient_select = function(list)
	{
	this.enable_command('add-recipient', list.selection.length > 0);
	};

	this.compose_add_recipient = function(field)
	{
	var recipients = [], input = $('#_'+field);

	if (this.contact_list && this.contact_list.selection.length) {
	for (var id, n=0; n < this.contact_list.selection.length; n++) {
	id = this.contact_list.selection[n];
	if (id && this.env.contactdata[id]) {
	recipients.push(this.env.contactdata[id]);

	// group is added, expand it
	if (id.charAt(0) == 'E' && this.env.contactdata[id].indexOf('@') < 0 && input.length) {
	var gid = id.substr(1);
	this.group2expand[gid] = { name:this.env.contactdata[id], input:input.get(0) };
	this.http_request('group-expand', {_source: this.env.source, _gid: gid}, false);
	}
	}
	}
	}

	if (recipients.length && input.length) {
	var oldval = input.val();
	input.val((oldval ? oldval + this.env.recipients_delimiter : '') + recipients.join(this.env.recipients_delimiter));
	this.triggerEvent('add-recipient', { field:field, recipients:recipients });
	}
	};

	// checks the input fields before sending a message
	this.check_compose_input = function(cmd)
	{
	// check input fields
	var ed, input_to = $("[name='_to']"),
	input_cc = $("[name='_cc']"),
	input_bcc = $("[name='_bcc']"),
	input_from = $("[name='_from']"),
	input_subject = $("[name='_subject']"),
	input_message = $("[name='_message']");

	// check sender (if have no identities)
	if (input_from.prop('type') == 'text' && !rcube_check_email(input_from.val(), true)) {
	alert(this.get_label('nosenderwarning'));
	input_from.focus();
	return false;
	}

	// check for empty recipient
	var recipients = input_to.val() ? input_to.val() : (input_cc.val() ? input_cc.val() : input_bcc.val());
	if (!rcube_check_email(recipients.replace(/^\s+/, '').replace(/[\s,;]+$/, ''), true)) {
	alert(this.get_label('norecipientwarning'));
	input_to.focus();
	return false;
	}

	// check if all files has been uploaded
	for (var key in this.env.attachments) {
	if (typeof this.env.attachments[key] === 'object' && !this.env.attachments[key].complete) {
	alert(this.get_label('notuploadedwarning'));
	return false;
	}
	}

	// display localized warning for missing subject
	if (input_subject.val() == '') {
	var myprompt = $('<div class="prompt">').html('<div class="message">' + this.get_label('nosubjectwarning') + '</div>').appendTo(document.body);
	var prompt_value = $('<input>').attr('type', 'text').attr('size', 30).appendTo(myprompt).val(this.get_label('nosubject'));

	var buttons = {};
	buttons[this.get_label('cancel')] = function(){
	input_subject.focus();
	$(this).dialog('close');
	};
	buttons[this.get_label('sendmessage')] = function(){
	input_subject.val(prompt_value.val());
	$(this).dialog('close');
	ref.command(cmd, { nocheck:true }); // repeat command which triggered this
	};

	myprompt.dialog({
	modal: true,
	resizable: false,
	buttons: buttons,
	close: function(event, ui) { $(this).remove() }
	});
	prompt_value.select();
	return false;
	}

	// Apply spellcheck changes if spell checker is active
	this.stop_spellchecking();

	if (window.tinyMCE)
	ed = tinyMCE.get(this.env.composebody);

	// check for empty body
	if (!ed && input_message.val() == '' && !confirm(this.get_label('nobodywarning'))) {
	input_message.focus();
	return false;
	}
	else if (ed) {
	if (!ed.getContent() && !confirm(this.get_label('nobodywarning'))) {
	ed.focus();
	return false;
	}
	// move body from html editor to textarea (just to be sure, #1485860)
	tinyMCE.triggerSave();
	}

	return true;
	};

	this.toggle_editor = function(props)
	{
	this.stop_spellchecking();

	if (props.mode == 'html') {
	this.plain2html($('#'+props.id).val(), props.id);
	tinyMCE.execCommand('mceAddControl', false, props.id);

	if (this.env.default_font)
	setTimeout(function() {
	$(tinyMCE.get(props.id).getBody()).css('font-family', rcmail.env.default_font);
	}, 500);
	}
	else {
	var thisMCE = tinyMCE.get(props.id), existingHtml;

	if (existingHtml = thisMCE.getContent()) {
	if (!confirm(this.get_label('editorwarning'))) {
	return false;
	}
	this.html2plain(existingHtml, props.id);
	}
	tinyMCE.execCommand('mceRemoveControl', false, props.id);
	}

	return true;
	};

	this.stop_spellchecking = function()
	{
	var ed;

	if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody))) {
	if (ed.plugins && ed.plugins.spellchecker && ed.plugins.spellchecker.active)
	ed.execCommand('mceSpellCheck');
	}
	else if (ed = this.env.spellcheck) {
	if (ed.state && ed.state != 'ready' && ed.state != 'no_error_found')
	$(ed.spell_span).trigger('click');
	}

	this.spellcheck_state();
	};

	this.spellcheck_state = function()
	{
	var ed, active;

	if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins && ed.plugins.spellchecker)
	active = ed.plugins.spellchecker.active;
	else if ((ed = this.env.spellcheck) && ed.state)
	active = ed.state != 'ready' && ed.state != 'no_error_found';

	if (rcmail.buttons.spellcheck)
	$('#'+rcmail.buttons.spellcheck[0].id)[active ? 'addClass' : 'removeClass']('selected');

	return active;
	};

	// get selected language
	this.spellcheck_lang = function()
	{
	var ed;

	if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins && ed.plugins.spellchecker)
	return ed.plugins.spellchecker.selectedLang;
	else if (this.env.spellcheck)
	return GOOGIE_CUR_LANG;
	};

	this.spellcheck_lang_set = function(lang)
	{
	var ed;

	if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins)
	ed.plugins.spellchecker.selectedLang = lang;
	else if (this.env.spellcheck)
	this.env.spellcheck.setCurrentLanguage(lang);
	};

	// resume spellchecking, highlight provided mispellings without new ajax request
	this.spellcheck_resume = function(ishtml, data)
	{
	if (ishtml) {
	var ed = tinyMCE.get(this.env.composebody);
	sp = ed.plugins.spellchecker;

	sp.active = 1;
	sp._markWords(data);
	ed.nodeChanged();
	}
	else {
	var sp = this.env.spellcheck;
	sp.prepare(false, true);
	sp.processData(data);
	}

	this.spellcheck_state();
	}

	this.set_draft_id = function(id)
	{
	$("input[name='_draft_saveid']").val(id);
	};

	this.auto_save_start = function()
	{
	if (this.env.draft_autosave)
	this.save_timer = setTimeout(function(){ ref.command("savedraft"); }, this.env.draft_autosave * 1000);

	// Unlock interface now that saving is complete
	this.busy = false;
	};

	this.compose_field_hash = function(save)
	{
	// check input fields
	var ed, i, val, str = '', hash_fields = ['to', 'cc', 'bcc', 'subject'];

	for (i=0; i<hash_fields.length; i++)
	if (val = $('[name="_' + hash_fields[i] + '"]').val())
	str += val + ':';

	if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)))
	str += ed.getContent();
	else
	str += $("[name='_message']").val();

	if (this.env.attachments)
	for (var upload_id in this.env.attachments)
	str += upload_id;

	if (save)
	this.cmp_hash = str;

	return str;
	};

	this.change_identity = function(obj, show_sig)
	{
	if (!obj \|\| !obj.options)
	return false;

	if (!show_sig)
	show_sig = this.env.show_sig;

	var cursor_pos, p = -1,
	id = obj.options[obj.selectedIndex].value,
	input_message = $("[name='_message']"),
	message = input_message.val(),
	is_html = ($("input[name='_is_html']").val() == '1'),
	sig = this.env.identity;

	// enable manual signature insert
	if (this.env.signatures && this.env.signatures[id]) {
	this.enable_command('insert-sig', true);
	this.env.compose_commands.push('insert-sig');
	}
	else
	this.enable_command('insert-sig', false);

	if (!is_html) {
	// remove the 'old' signature
	if (show_sig && sig && this.env.signatures && this.env.signatures[sig]) {
	sig = this.env.signatures[sig].text;
	sig = sig.replace(/\r\n/g, '\n');

	p = this.env.sig_above ? message.indexOf(sig) : message.lastIndexOf(sig);
	if (p >= 0)
	message = message.substring(0, p) + message.substring(p+sig.length, message.length);
	}
	// add the new signature string
	if (show_sig && this.env.signatures && this.env.signatures[id]) {
	sig = this.env.signatures[id].text;
	sig = sig.replace(/\r\n/g, '\n');

	if (this.env.sig_above) {
	if (p >= 0) { // in place of removed signature
	message = message.substring(0, p) + sig + message.substring(p, message.length);
	cursor_pos = p - 1;
	}
	else if (!message) { // empty message
	cursor_pos = 0;
	message = '\n\n' + sig;
	}
	else if (pos = this.get_caret_pos(input_message.get(0))) { // at cursor position
	message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
	cursor_pos = pos;
	}
	else { // on top
	cursor_pos = 0;
	message = '\n\n' + sig + '\n\n' + message.replace(/^[\r\n]+/, '');
	}
	}
	else {
	message = message.replace(/[\r\n]+$/, '');
	cursor_pos = !this.env.top_posting && message.length ? message.length+1 : 0;
	message += '\n\n' + sig;
	}
	}
	else
	cursor_pos = this.env.top_posting ? 0 : message.length;

	input_message.val(message);

	// move cursor before the signature
	this.set_caret_pos(input_message.get(0), cursor_pos);
	}
	else if (show_sig && this.env.signatures) { // html
	var editor = tinyMCE.get(this.env.composebody),
	sigElem = editor.dom.get('_rc_sig');

	// Append the signature as a div within the body
	if (!sigElem) {
	var body = editor.getBody(),
	doc = editor.getDoc();

	sigElem = doc.createElement('div');
	sigElem.setAttribute('id', '_rc_sig');

	if (this.env.sig_above) {
	// if no existing sig and top posting then insert at caret pos
	editor.getWin().focus(); // correct focus in IE & Chrome

	var node = editor.selection.getNode();
	if (node.nodeName == 'BODY') {
	// no real focus, insert at start
	body.insertBefore(sigElem, body.firstChild);
	body.insertBefore(doc.createElement('br'), body.firstChild);
	}
	else {
	body.insertBefore(sigElem, node.nextSibling);
	body.insertBefore(doc.createElement('br'), node.nextSibling);
	}
	}
	else {
	if (bw.ie) // add empty line before signature on IE
	body.appendChild(doc.createElement('br'));

	body.appendChild(sigElem);
	}
	}

	if (this.env.signatures[id])
	sigElem.innerHTML = this.env.signatures[id].html;
	}

	this.env.identity = id;
	return true;
	};

	// upload attachment file
	this.upload_file = function(form)
	{
	if (!form)
	return false;

	// count files and size on capable browser
	var size = 0, numfiles = 0;

	$('input[type=file]', form).each(function(i, field) {
	var files = field.files ? field.files.length : (field.value ? 1 : 0);

	// check file size
	if (field.files) {
	for (var i=0; i < files; i++)
	size += field.files[i].size;
	}

	numfiles += files;
	});

	// create hidden iframe and post upload form
	if (numfiles) {
	if (this.env.max_filesize && this.env.filesizeerror && size > this.env.max_filesize) {
	this.display_message(this.env.filesizeerror, 'error');
	return;
	}

	var frame_name = this.async_upload_form(form, 'upload', function(e) {
	var d, content = '';
	try {
	if (this.contentDocument) {
	d = this.contentDocument;
	} else if (this.contentWindow) {
	d = this.contentWindow.document;
	}
	content = d.childNodes[0].innerHTML;
	} catch (err) {}

	if (!content.match(/add2attachment/) && (!bw.opera \|\| (rcmail.env.uploadframe && rcmail.env.uploadframe == e.data.ts))) {
	if (!content.match(/display_message/))
	rcmail.display_message(rcmail.get_label('fileuploaderror'), 'error');
	rcmail.remove_from_attachment_list(e.data.ts);
	}
	// Opera hack: handle double onload
	if (bw.opera)
	rcmail.env.uploadframe = e.data.ts;
	});

	// display upload indicator and cancel button
	var content = '<span>' + this.get_label('uploading' + (numfiles > 1 ? 'many' : '')) + '</span>',
	ts = frame_name.replace(/^rcmupload/, '');

	this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', frame:frame_name, complete:false });

	// upload progress support
	if (this.env.upload_progress_time) {
	this.upload_progress_start('upload', ts);
	}
	}

	// set reference to the form object
	this.gui_objects.attachmentform = form;
	return true;
	};

	// add file name to attachment list
	// called from upload page
	this.add2attachment_list = function(name, att, upload_id)
	{
	if (!this.gui_objects.attachmentlist)
	return false;

	if (!att.complete && ref.env.loadingicon)
	att.html = '<img src="'+ref.env.loadingicon+'" alt="" class="uploading" />' + att.html;

	if (!att.complete && att.frame)
	att.html = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+name+'\', \''+att.frame+'\');" href="#cancelupload" class="cancelupload">'
	+ (this.env.cancelicon ? '<img src="'+this.env.cancelicon+'" alt="" />' : this.get_label('cancel')) + '</a>' + att.html;

	var indicator, li = $('<li>').attr('id', name).addClass(att.classname).html(att.html);

	// replace indicator's li
	if (upload_id && (indicator = document.getElementById(upload_id))) {
	li.replaceAll(indicator);
	}
	else { // add new li
	li.appendTo(this.gui_objects.attachmentlist);
	}

	if (upload_id && this.env.attachments[upload_id])
	delete this.env.attachments[upload_id];

	this.env.attachments[name] = att;

	return true;
	};

	this.remove_from_attachment_list = function(name)
	{
	delete this.env.attachments[name];
	$('#'+name).remove();
	};

	this.remove_attachment = function(name)
	{
	if (name && this.env.attachments[name])
	this.http_post('remove-attachment', { _id:this.env.compose_id, _file:name });

	return true;
	};

	this.cancel_attachment_upload = function(name, frame_name)
	{
	if (!name \|\| !frame_name)
	return false;

	this.remove_from_attachment_list(name);
	$("iframe[name='"+frame_name+"']").remove();
	return false;
	};

	this.upload_progress_start = function(action, name)
	{
	setTimeout(function() { rcmail.http_request(action, {_progress: name}); },
	this.env.upload_progress_time * 1000);
	};

	this.upload_progress_update = function(param)
	{
	var elem = $('#'+param.name + '> span');

	if (!elem.length \|\| !param.text)
	return;

	elem.text(param.text);

	if (!param.done)
	this.upload_progress_start(param.action, param.name);
	};

	// send remote request to add a new contact
	this.add_contact = function(value)
	{
	if (value)
	this.http_post('addcontact', {_address: value});

	return true;
	};

	// send remote request to search mail or contacts
	this.qsearch = function(value)
	{
	if (value != '') {
	var r, lock = this.set_busy(true, 'searching'),
	url = this.search_params(value);

	if (this.message_list)
	this.clear_message_list();
	else if (this.contact_list)
	this.list_contacts_clear();

	if (this.env.source)
	url._source = this.env.source;
	if (this.env.group)
	url._gid = this.env.group;

	// reset vars
	this.env.current_page = 1;

	r = this.http_request('search', url, lock);

	this.env.qsearch = {lock: lock, request: r};
	}
	};

	// build URL params for search
	this.search_params = function(search, filter)
	{
	var n, url = {}, mods_arr = [],
	mods = this.env.search_mods,
	mbox = this.env.mailbox;

	if (!filter && this.gui_objects.search_filter)
	filter = this.gui_objects.search_filter.value;

	if (!search && this.gui_objects.qsearchbox)
	search = this.gui_objects.qsearchbox.value;

	if (filter)
	url._filter = filter;

	if (search) {
	url._q = search;

	if (mods && this.message_list)
	mods = mods[mbox] ? mods[mbox] : mods['*'];

	if (mods) {
	for (n in mods)
	mods_arr.push(n);
	url._headers = mods_arr.join(',');
	}
	}

	if (mbox)
	url._mbox = mbox;

	return url;
	};

	// reset quick-search form
	this.reset_qsearch = function()
	{
	if (this.gui_objects.qsearchbox)
	this.gui_objects.qsearchbox.value = '';

	if (this.env.qsearch)
	this.abort_request(this.env.qsearch);

	this.env.qsearch = null;
	this.env.search_request = null;
	this.env.search_id = null;
	};

	this.sent_successfully = function(type, msg)
	{
	this.display_message(msg, type);

	if (this.env.extwin && window.opener && opener.rcmail) {
	this.lock_form(this.gui_objects.messageform);
	opener.rcmail.display_message(msg, type);
	setTimeout(function(){ window.close() }, 1000);
	}
	else {
	// before redirect we need to wait some time for Chrome (#1486177)
	setTimeout(function(){ ref.list_mailbox(); }, 500);
	}
	};


	/*********************************************************/
	/******* keyboard live-search methods *******/
	/*********************************************************/

	// handler for keyboard events on address-fields
	this.ksearch_keydown = function(e, obj, props)
	{
	if (this.ksearch_timer)
	clearTimeout(this.ksearch_timer);

	var highlight,
	key = rcube_event.get_keycode(e),
	mod = rcube_event.get_modifier(e);

	switch (key) {
	case 38: // arrow up
	case 40: // arrow down
	if (!this.ksearch_visible())
	break;

	var dir = key==38 ? 1 : 0;

	highlight = document.getElementById('rcmksearchSelected');
	if (!highlight)
	highlight = this.ksearch_pane.__ul.firstChild;

	if (highlight)
	this.ksearch_select(dir ? highlight.previousSibling : highlight.nextSibling);

	return rcube_event.cancel(e);

	case 9: // tab
	if (mod == SHIFT_KEY \|\| !this.ksearch_visible()) {
	this.ksearch_hide();
	return;
	}

	case 13: // enter
	if (!this.ksearch_visible())
	return false;

	// insert selected address and hide ksearch pane
	this.insert_recipient(this.ksearch_selected);
	this.ksearch_hide();

	return rcube_event.cancel(e);

	case 27: // escape
	this.ksearch_hide();
	return;

	case 37: // left
	case 39: // right
	if (mod != SHIFT_KEY)
	return;
	}

	// start timer
	this.ksearch_timer = setTimeout(function(){ ref.ksearch_get_results(props); }, 200);
	this.ksearch_input = obj;

	return true;
	};

	this.ksearch_visible = function()
	{
	return (this.ksearch_selected !== null && this.ksearch_selected !== undefined && this.ksearch_value);
	};

	this.ksearch_select = function(node)
	{
	var current = $('#rcmksearchSelected');
	if (current[0] && node) {
	current.removeAttr('id').removeClass('selected');
	}

	if (node) {
	$(node).attr('id', 'rcmksearchSelected').addClass('selected');
	this.ksearch_selected = node._rcm_id;
	}
	};

	this.insert_recipient = function(id)
	{
	if (id === null \|\| !this.env.contacts[id] \|\| !this.ksearch_input)
	return;

	// get cursor pos
	var inp_value = this.ksearch_input.value,
	cpos = this.get_caret_pos(this.ksearch_input),
	p = inp_value.lastIndexOf(this.ksearch_value, cpos),
	trigger = false,
	insert = '',
	// replace search string with full address
	pre = inp_value.substring(0, p),
	end = inp_value.substring(p+this.ksearch_value.length, inp_value.length);

	this.ksearch_destroy();

	// insert all members of a group
	if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].id) {
	insert += this.env.contacts[id].name + this.env.recipients_delimiter;
	this.group2expand[this.env.contacts[id].id] = $.extend({ input: this.ksearch_input }, this.env.contacts[id]);
	this.http_request('mail/group-expand', {_source: this.env.contacts[id].source, _gid: this.env.contacts[id].id}, false);
	}
	else if (typeof this.env.contacts[id] === 'string') {
	insert = this.env.contacts[id] + this.env.recipients_delimiter;
	trigger = true;
	}

	this.ksearch_input.value = pre + insert + end;

	// set caret to insert pos
	cpos = p+insert.length;
	if (this.ksearch_input.setSelectionRange)
	this.ksearch_input.setSelectionRange(cpos, cpos);

	if (trigger)
	this.triggerEvent('autocomplete_insert', { field:this.ksearch_input, insert:insert });
	};

	this.replace_group_recipients = function(id, recipients)
	{
	if (this.group2expand[id]) {
	this.group2expand[id].input.value = this.group2expand[id].input.value.replace(this.group2expand[id].name, recipients);
	this.triggerEvent('autocomplete_insert', { field:this.group2expand[id].input, insert:recipients });
	this.group2expand[id] = null;
	}
	};

	// address search processor
	this.ksearch_get_results = function(props)
	{
	var inp_value = this.ksearch_input ? this.ksearch_input.value : null;

	if (inp_value === null)
	return;

	if (this.ksearch_pane && this.ksearch_pane.is(":visible"))
	this.ksearch_pane.hide();

	// get string from current cursor pos to last comma
	var cpos = this.get_caret_pos(this.ksearch_input),
	p = inp_value.lastIndexOf(this.env.recipients_separator, cpos-1),
	q = inp_value.substring(p+1, cpos),
	min = this.env.autocomplete_min_length,
	ac = this.ksearch_data;

	// trim query string
	q = $.trim(q);

	// Don't (re-)search if the last results are still active
	if (q == this.ksearch_value)
	return;

	this.ksearch_destroy();

	if (q.length && q.length < min) {
	if (!this.ksearch_info) {
	this.ksearch_info = this.display_message(
	this.get_label('autocompletechars').replace('$min', min));
	}
	return;
	}

	var old_value = this.ksearch_value;
	this.ksearch_value = q;

	// ...string is empty
	if (!q.length)
	return;

	// ...new search value contains old one and previous search was not finished or its result was empty
	if (old_value && old_value.length && q.indexOf(old_value) == 0 && (!ac \|\| ac.num <= 0) && this.env.contacts && !this.env.contacts.length)
	return;

	var i, lock, source, xhr, reqid = new Date().getTime(),
	post_data = {_search: q, _id: reqid},
	threads = props && props.threads ? props.threads : 1,
	sources = props && props.sources ? props.sources : [],
	action = props && props.action ? props.action : 'mail/autocomplete';

	this.ksearch_data = {id: reqid, sources: sources.slice(), action: action,
	locks: [], requests: [], num: sources.length};

	for (i=0; i<threads; i++) {
	source = this.ksearch_data.sources.shift();
	if (threads > 1 && source === undefined)
	break;

	post_data._source = source ? source : '';
	lock = this.display_message(this.get_label('searching'), 'loading');
	xhr = this.http_post(action, post_data, lock);

	this.ksearch_data.locks.push(lock);
	this.ksearch_data.requests.push(xhr);
	}
	};

	this.ksearch_query_results = function(results, search, reqid)
	{
	// search stopped in meantime?
	if (!this.ksearch_value)
	return;

	// ignore this outdated search response
	if (this.ksearch_input && search != this.ksearch_value)
	return;

	// display search results
	var i, len, ul, li, text, init,
	value = this.ksearch_value,
	data = this.ksearch_data,
	maxlen = this.env.autocomplete_max ? this.env.autocomplete_max : 15;

	// create results pane if not present
	if (!this.ksearch_pane) {
	ul = $('<ul>');
	this.ksearch_pane = $('<div>').attr('id', 'rcmKSearchpane')
	.css({ position:'absolute', 'z-index':30000 }).append(ul).appendTo(document.body);
	this.ksearch_pane.__ul = ul[0];
	}

	ul = this.ksearch_pane.__ul;

	// remove all search results or add to existing list if parallel search
	if (reqid && this.ksearch_pane.data('reqid') == reqid) {
	maxlen -= ul.childNodes.length;
	}
	else {
	this.ksearch_pane.data('reqid', reqid);
	init = 1;
	// reset content
	ul.innerHTML = '';
	this.env.contacts = [];
	// move the results pane right under the input box
	var pos = $(this.ksearch_input).offset();
	this.ksearch_pane.css({ left:pos.left+'px', top:(pos.top + this.ksearch_input.offsetHeight)+'px', display: 'none'});
	}

	// add each result line to list
	if (results && (len = results.length)) {
	for (i=0; i < len && maxlen > 0; i++) {
	text = typeof results[i] === 'object' ? results[i].name : results[i];
	li = document.createElement('LI');
	li.innerHTML = text.replace(new RegExp('('+RegExp.escape(value)+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
	li.onmouseover = function(){ ref.ksearch_select(this); };
	li.onmouseup = function(){ ref.ksearch_click(this) };
	li._rcm_id = this.env.contacts.length + i;
	ul.appendChild(li);
	maxlen -= 1;
	}
	}

	if (ul.childNodes.length) {
	this.ksearch_pane.show();
	// select the first
	if (!this.env.contacts.length) {
	$('li:first', ul).attr('id', 'rcmksearchSelected').addClass('selected');
	this.ksearch_selected = 0;
	}
	}

	if (len)
	this.env.contacts = this.env.contacts.concat(results);

	// run next parallel search
	if (data.id == reqid) {
	data.num--;
	if (maxlen > 0 && data.sources.length) {
	var lock, xhr, source = data.sources.shift(), post_data;
	if (source) {
	post_data = {_search: value, _id: reqid, _source: source};
	lock = this.display_message(this.get_label('searching'), 'loading');
	xhr = this.http_post(data.action, post_data, lock);

	this.ksearch_data.locks.push(lock);
	this.ksearch_data.requests.push(xhr);
	}
	}
	else if (!maxlen) {
	if (!this.ksearch_msg)
	this.ksearch_msg = this.display_message(this.get_label('autocompletemore'));
	// abort pending searches
	this.ksearch_abort();
	}
	}
	};

	this.ksearch_click = function(node)
	{
	if (this.ksearch_input)
	this.ksearch_input.focus();

	this.insert_recipient(node._rcm_id);
	this.ksearch_hide();
	};

	this.ksearch_blur = function()
	{
	if (this.ksearch_timer)
	clearTimeout(this.ksearch_timer);

	this.ksearch_input = null;
	this.ksearch_hide();
	};

	this.ksearch_hide = function()
	{
	this.ksearch_selected = null;
	this.ksearch_value = '';

	if (this.ksearch_pane)
	this.ksearch_pane.hide();

	this.ksearch_destroy();
	};

	// Clears autocomplete data/requests
	this.ksearch_destroy = function()
	{
	this.ksearch_abort();

	if (this.ksearch_info)
	this.hide_message(this.ksearch_info);

	if (this.ksearch_msg)
	this.hide_message(this.ksearch_msg);

	this.ksearch_data = null;
	this.ksearch_info = null;
	this.ksearch_msg = null;
	}

	// Aborts pending autocomplete requests
	this.ksearch_abort = function()
	{
	var i, len, ac = this.ksearch_data;

	if (!ac)
	return;

	for (i=0, len=ac.locks.length; i<len; i++)
	this.abort_request({request: ac.requests[i], lock: ac.locks[i]});
	};


	/*********************************************************/
	/******* address book methods *******/
	/*********************************************************/

	this.contactlist_keypress = function(list)
	{
	if (list.key_pressed == list.DELETE_KEY)
	this.command('delete');
	};

	this.contactlist_select = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);

	var n, id, sid, ref = this, writable = false,
	source = this.env.source ? this.env.address_sources[this.env.source] : null;

	if (id = list.get_single_selection())
	this.preview_timer = setTimeout(function(){ ref.load_contact(id, 'show'); }, 200);
	else if (this.env.contentframe)
	this.show_contentframe(false);

	// no source = search result, we'll need to detect if any of
	// selected contacts are in writable addressbook to enable edit/delete
	if (list.selection.length) {
	if (!source) {
	for (n in list.selection) {
	sid = String(list.selection[n]).replace(/^[^-]+-/, '');
	if (sid && this.env.address_sources[sid] && !this.env.address_sources[sid].readonly) {
	writable = true;
	break;
	}
	}
	}
	else {
	writable = !source.readonly;
	}
	}

	// if a group is currently selected, and there is at least one contact selected
	// thend we can enable the group-remove-selected command
	this.enable_command('group-remove-selected', this.env.group && list.selection.length > 0);
	this.enable_command('compose', this.env.group \|\| list.selection.length > 0);
	this.enable_command('edit', id && writable);
	this.enable_command('delete', list.selection.length && writable);

	return false;
	};

	this.list_contacts = function(src, group, page)
	{
	var win, folder, url = {},
	target = window;

	if (!src)
	src = this.env.source;

	if (page && this.current_page == page && src == this.env.source && group == this.env.group)
	return false;

	if (src != this.env.source) {
	page = this.env.current_page = 1;
	this.reset_qsearch();
	}
	else if (group != this.env.group)
	page = this.env.current_page = 1;

	if (this.env.search_id)
	folder = 'S'+this.env.search_id;
	else
	folder = group ? 'G'+src+group : src;

	this.select_folder(folder);

	this.env.source = src;
	this.env.group = group;

	// load contacts remotely
	if (this.gui_objects.contactslist) {
	this.list_contacts_remote(src, group, page);
	return;
	}

	if (win = this.get_frame_window(this.env.contentframe)) {
	target = win;
	url._framed = 1;
	}

	if (group)
	url._gid = group;
	if (page)
	url._page = page;
	if (src)
	url._source = src;

	// also send search request to get the correct listing
	if (this.env.search_request)
	url._search = this.env.search_request;

	this.set_busy(true, 'loading');
	this.location_href(url, target);
	};

	// send remote request to load contacts list
	this.list_contacts_remote = function(src, group, page)
	{
	// clear message list first
	this.list_contacts_clear();

	// send request to server
	var url = {}, lock = this.set_busy(true, 'loading');

	if (src)
	url._source = src;
	if (page)
	url._page = page;
	if (group)
	url._gid = group;

	this.env.source = src;
	this.env.group = group;

	// also send search request to get the right messages
	if (this.env.search_request)
	url._search = this.env.search_request;

	this.http_request(this.env.task == 'mail' ? 'list-contacts' : 'list', url, lock);
	};

	this.list_contacts_clear = function()
	{
	this.contact_list.clear(true);
	this.show_contentframe(false);
	this.enable_command('delete', false);
	this.enable_command('compose', this.env.group ? true : false);
	};

	// load contact record
	this.load_contact = function(cid, action, framed)
	{
	var win, url = {}, target = window;

	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	this.show_contentframe(true);

	// load dummy content
	if (!cid) {
	// unselect selected row(s)
	this.contact_list.clear_selection();
	this.enable_command('delete', 'compose', false);
	}
	}
	else if (framed)
	return false;

	if (action && (cid \|\| action=='add') && !this.drag_active) {
	if (this.env.group)
	url._gid = this.env.group;

	url._action = action;
	url._source = this.env.source;
	url._cid = cid;

	this.location_href(url, target, true);
	}

	return true;
	};

	// add/delete member to/from the group
	this.group_member_change = function(what, cid, source, gid)
	{
	what = what == 'add' ? 'add' : 'del';
	var label = this.get_label(what == 'add' ? 'addingmember' : 'removingmember'),
	lock = this.display_message(label, 'loading'),
	post_data = {_cid: cid, _source: source, _gid: gid};

	this.http_post('group-'+what+'members', post_data, lock);
	};

	// copy a contact to the specified target (group or directory)
	this.copy_contact = function(cid, to)
	{
	if (!cid)
	cid = this.contact_list.get_selection().join(',');

	if (to.type == 'group' && to.source == this.env.source)
	this.group_member_change('add', cid, to.source, to.id);
	else if (to.type == 'group' && !this.env.address_sources[to.source].readonly) {
	var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
	post_data = {_cid: cid, _source: this.env.source, _to: to.source, _togid: to.id,
	_gid: (this.env.group ? this.env.group : '')};

	this.http_post('copy', post_data, lock);
	}
	else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly) {
	var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
	post_data = {_cid: cid, _source: this.env.source, _to: to.id,
	_gid: (this.env.group ? this.env.group : '')};

	this.http_post('copy', post_data, lock);
	}
	};

	this.delete_contacts = function()
	{
	var selection = this.contact_list.get_selection(),
	undelete = this.env.source && this.env.address_sources[this.env.source].undelete;

	// exit if no mailbox specified or if selection is empty
	if (!(selection.length \|\| this.env.cid) \|\| (!undelete && !confirm(this.get_label('deletecontactconfirm'))))
	return;

	var id, n, a_cids = [],
	post_data = {_source: this.env.source, _from: (this.env.action ? this.env.action : '')},
	lock = this.display_message(this.get_label('contactdeleting'), 'loading');

	if (this.env.cid)
	a_cids.push(this.env.cid);
	else {
	for (n=0; n<selection.length; n++) {
	id = selection[n];
	a_cids.push(id);
	this.contact_list.remove_row(id, (n == selection.length-1));
	}

	// hide content frame if we delete the currently displayed contact
	if (selection.length == 1)
	this.show_contentframe(false);
	}

	post_data._cid = a_cids.join(',');

	if (this.env.group)
	post_data._gid = this.env.group;

	// also send search request to get the right records from the next page
	if (this.env.search_request)
	post_data._search = this.env.search_request;

	// send request to server
	this.http_post('delete', post_data, lock)

	return true;
	};

	// update a contact record in the list
	this.update_contact_row = function(cid, cols_arr, newcid, source)
	{
	var c, row, list = this.contact_list;

	cid = this.html_identifier(cid);

	// when in searching mode, concat cid with the source name
	if (!list.rows[cid]) {
	cid = cid+'-'+source;
	if (newcid)
	newcid = newcid+'-'+source;
	}

	if (list.rows[cid] && (row = list.rows[cid].obj)) {
	for (c=0; c<cols_arr.length; c++)
	if (row.cells[c])
	$(row.cells[c]).html(cols_arr[c]);

	// cid change
	if (newcid) {
	newcid = this.html_identifier(newcid);
	row.id = 'rcmrow' + newcid;
	list.remove_row(cid);
	list.init_row(row);
	list.selection[0] = newcid;
	row.style.display = '';
	}
	}
	};

	// add row to contacts list
	this.add_contact_row = function(cid, cols, classes)
	{
	if (!this.gui_objects.contactslist)
	return false;

	var c, col, list = this.contact_list,
	row = document.createElement('tr');

	row.id = 'rcmrow'+this.html_identifier(cid);
	row.className = 'contact ' + (classes \|\| '');

	if (list.in_selection(cid))
	row.className += ' selected';

	// add each submitted col
	for (c in cols) {
	col = document.createElement('td');
	col.className = String(c).toLowerCase();
	col.innerHTML = cols[c];
	row.appendChild(col);
	}

	list.insert_row(row);

	this.enable_command('export', list.rowcount > 0);
	};

	this.init_contact_form = function()
	{
	var ref = this, col;

	this.set_photo_actions($('#ff_photo').val());

	for (col in this.env.coltypes)
	this.init_edit_field(col, null);

	$('.contactfieldgroup .row a.deletebutton').click(function() {
	ref.delete_edit_field(this);
	return false;
	});

	$('select.addfieldmenu').change(function(e) {
	ref.insert_edit_field($(this).val(), $(this).attr('rel'), this);
	this.selectedIndex = 0;
	});

	// enable date pickers on date fields
	if ($.datepicker && this.env.date_format) {
	$.datepicker.setDefaults({
	dateFormat: this.env.date_format,
	changeMonth: true,
	changeYear: true,
	yearRange: '-100:+10',
	showOtherMonths: true,
	selectOtherMonths: true,
	onSelect: function(dateText) { $(this).focus().val(dateText) }
	});
	$('input.datepicker').datepicker();
	}

	$("input[type='text']:visible").first().focus();
	};

	this.group_create = function()
	{
	this.add_input_row('contactgroup');
	};

	this.group_rename = function()
	{
	if (!this.env.group \|\| !this.gui_objects.folderlist)
	return;

	if (!this.name_input) {
	this.enable_command('list', 'listgroup', false);
	this.name_input = $('<input>').attr('type', 'text').val(this.env.contactgroups['G'+this.env.source+this.env.group].name);
	this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
	this.env.group_renaming = true;

	var link, li = this.get_folder_li(this.env.source+this.env.group, 'rcmliG');
	if (li && (link = li.firstChild)) {
	$(link).hide().before(this.name_input);
	}
	}

	this.name_input.select().focus();
	};

	this.group_delete = function()
	{
	if (this.env.group && confirm(this.get_label('deletegroupconfirm'))) {
	var lock = this.set_busy(true, 'groupdeleting');
	this.http_post('group-delete', {_source: this.env.source, _gid: this.env.group}, lock);
	}
	};

	// callback from server upon group-delete command
	this.remove_group_item = function(prop)
	{
	var li, key = 'G'+prop.source+prop.id;
	if ((li = this.get_folder_li(key))) {
	this.triggerEvent('group_delete', { source:prop.source, id:prop.id, li:li });

	li.parentNode.removeChild(li);
	delete this.env.contactfolders[key];
	delete this.env.contactgroups[key];
	}

	this.list_contacts(prop.source, 0);
	};

	// @TODO: maybe it would be better to use popup instead of inserting input to the list?
	this.add_input_row = function(type)
	{
	if (!this.gui_objects.folderlist)
	return;

	if (!this.name_input) {
	this.name_input = $('<input>').attr('type', 'text').data('tt', type);
	this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
	this.name_input_li = $('<li>').addClass(type).append(this.name_input);

	var li = type == 'contactsearch' ? $('li:last', this.gui_objects.folderlist) : this.get_folder_li(this.env.source);
	this.name_input_li.insertAfter(li);
	}

	this.name_input.select().focus();
	};

	//remove selected contacts from current active group
	this.group_remove_selected = function()
	{
	ref.http_post('group-delmembers', {_cid: this.contact_list.selection,
	_source: this.env.source, _gid: this.env.group});
	};

	//callback after deleting contact(s) from current group
	this.remove_group_contacts = function(props)
	{
	if('undefined' != typeof this.env.group && (this.env.group === props.gid)){
	var n, selection = this.contact_list.get_selection();
	for (n=0; n<selection.length; n++) {
	id = selection[n];
	this.contact_list.remove_row(id, (n == selection.length-1));
	}
	}
	}

	// handler for keyboard events on the input field
	this.add_input_keydown = function(e)
	{
	var key = rcube_event.get_keycode(e),
	input = $(e.target), itype = input.data('tt');

	// enter
	if (key == 13) {
	var newname = input.val();

	if (newname) {
	var lock = this.set_busy(true, 'loading');

	if (itype == 'contactsearch')
	this.http_post('search-create', {_search: this.env.search_request, _name: newname}, lock);
	else if (this.env.group_renaming)
	this.http_post('group-rename', {_source: this.env.source, _gid: this.env.group, _name: newname}, lock);
	else
	this.http_post('group-create', {_source: this.env.source, _name: newname}, lock);
	}
	return false;
	}
	// escape
	else if (key == 27)
	this.reset_add_input();

	return true;
	};

	this.reset_add_input = function()
	{
	if (this.name_input) {
	if (this.env.group_renaming) {
	var li = this.name_input.parent();
	li.children().last().show();
	this.env.group_renaming = false;
	}

	this.name_input.remove();

	if (this.name_input_li)
	this.name_input_li.remove();

	this.name_input = this.name_input_li = null;
	}

	this.enable_command('list', 'listgroup', true);
	};

	// callback for creating a new contact group
	this.insert_contact_group = function(prop)
	{
	this.reset_add_input();

	prop.type = 'group';
	var key = 'G'+prop.source+prop.id,
	link = $('<a>').attr('href', '#')
	.attr('rel', prop.source+':'+prop.id)
	.click(function() { return rcmail.command('listgroup', prop, this); })
	.html(prop.name),
	li = $('<li>').attr({id: 'rcmli'+this.html_identifier(key), 'class': 'contactgroup'})
	.append(link);

	this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
	this.add_contact_group_row(prop, li);

	this.triggerEvent('group_insert', { id:prop.id, source:prop.source, name:prop.name, li:li[0] });
	};

	// callback for renaming a contact group
	this.update_contact_group = function(prop)
	{
	this.reset_add_input();

	var key = 'G'+prop.source+prop.id,
	li = this.get_folder_li(key),
	link;

	// group ID has changed, replace link node and identifiers
	if (li && prop.newid) {
	var newkey = 'G'+prop.source+prop.newid,
	newprop = $.extend({}, prop);;

	li.id = 'rcmli' + this.html_identifier(newkey);
	this.env.contactfolders[newkey] = this.env.contactfolders[key];
	this.env.contactfolders[newkey].id = prop.newid;
	this.env.group = prop.newid;

	delete this.env.contactfolders[key];
	delete this.env.contactgroups[key];

	newprop.id = prop.newid;
	newprop.type = 'group';

	link = $('<a>').attr('href', '#')
	.attr('rel', prop.source+':'+prop.newid)
	.click(function() { return rcmail.command('listgroup', newprop, this); })
	.html(prop.name);
	$(li).children().replaceWith(link);
	}
	// update displayed group name
	else if (li && (link = li.firstChild) && link.tagName.toLowerCase() == 'a')
	link.innerHTML = prop.name;

	this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
	this.add_contact_group_row(prop, $(li), true);

	this.triggerEvent('group_update', { id:prop.id, source:prop.source, name:prop.name, li:li[0], newid:prop.newid });
	};

	// add contact group row to the list, with sorting
	this.add_contact_group_row = function(prop, li, reloc)
	{
	var row, name = prop.name.toUpperCase(),
	sibling = this.get_folder_li(prop.source),
	prefix = 'rcmliG' + this.html_identifier(prop.source);

	// When renaming groups, we need to remove it from DOM and insert it in the proper place
	if (reloc) {
	row = li.clone(true);
	li.remove();
	}
	else
	row = li;

	$('li[id^="'+prefix+'"]', this.gui_objects.folderlist).each(function(i, elem) {
	if (name >= $(this).text().toUpperCase())
	sibling = elem;
	else
	return false;
	});

	row.insertAfter(sibling);
	};

	this.update_group_commands = function()
	{
	var source = this.env.source != '' ? this.env.address_sources[this.env.source] : null;
	this.enable_command('group-create', (source && source.groups && !source.readonly));
	this.enable_command('group-rename', 'group-delete', (source && source.groups && this.env.group && !source.readonly));
	};

	this.init_edit_field = function(col, elem)
	{
	var label = this.env.coltypes[col].label;

	if (!elem)
	elem = $('.ff_' + col);

	if (label)
	elem.placeholder(label);
	};

	this.insert_edit_field = function(col, section, menu)
	{
	// just make pre-defined input field visible
	var elem = $('#ff_'+col);
	if (elem.length) {
	elem.show().focus();
	$(menu).children('option[value="'+col+'"]').prop('disabled', true);
	}
	else {
	var lastelem = $('.ff_'+col),
	appendcontainer = $('#contactsection'+section+' .contactcontroller'+col);

	if (!appendcontainer.length) {
	var sect = $('#contactsection'+section),
	lastgroup = $('.contactfieldgroup', sect).last();
	appendcontainer = $('<fieldset>').addClass('contactfieldgroup contactcontroller'+col);
	if (lastgroup.length)
	appendcontainer.insertAfter(lastgroup);
	else
	sect.prepend(appendcontainer);
	}

	if (appendcontainer.length && appendcontainer.get(0).nodeName == 'FIELDSET') {
	var input, colprop = this.env.coltypes[col],
	row = $('<div>').addClass('row'),
	cell = $('<div>').addClass('contactfieldcontent data'),
	label = $('<div>').addClass('contactfieldlabel label');

	if (colprop.subtypes_select)
	label.html(colprop.subtypes_select);
	else
	label.html(colprop.label);

	var name_suffix = colprop.limit != 1 ? '[]' : '';
	if (colprop.type == 'text' \|\| colprop.type == 'date') {
	input = $('<input>')
	.addClass('ff_'+col)
	.attr({type: 'text', name: '_'+col+name_suffix, size: colprop.size})
	.appendTo(cell);

	this.init_edit_field(col, input);

	if (colprop.type == 'date' && $.datepicker)
	input.datepicker();
	}
	else if (colprop.type == 'textarea') {
	input = $('<textarea>')
	.addClass('ff_'+col)
	.attr({ name: '_'+col+name_suffix, cols:colprop.size, rows:colprop.rows })
	.appendTo(cell);

	this.init_edit_field(col, input);
	}
	else if (colprop.type == 'composite') {
	var childcol, cp, first, templ, cols = [], suffices = [];
	// read template for composite field order
	if ((templ = this.env[col+'_template'])) {
	for (var j=0; j < templ.length; j++) {
	cols.push(templ[j][1]);
	suffices.push(templ[j][2]);
	}
	}
	else { // list fields according to appearance in colprop
	for (childcol in colprop.childs)
	cols.push(childcol);
	}

	for (var i=0; i < cols.length; i++) {
	childcol = cols[i];
	cp = colprop.childs[childcol];
	input = $('<input>')
	.addClass('ff_'+childcol)
	.attr({ type: 'text', name: '_'+childcol+name_suffix, size: cp.size })
	.appendTo(cell);
	cell.append(suffices[i] \|\| " ");
	this.init_edit_field(childcol, input);
	if (!first) first = input;
	}
	input = first; // set focus to the first of this composite fields
	}
	else if (colprop.type == 'select') {
	input = $('<select>')
	.addClass('ff_'+col)
	.attr('name', '_'+col+name_suffix)
	.appendTo(cell);

	var options = input.attr('options');
	options[options.length] = new Option('---', '');
	if (colprop.options)
	$.each(colprop.options, function(i, val){ options[options.length] = new Option(val, i); });
	}

	if (input) {
	var delbutton = $('<a href="#del"></a>')
	.addClass('contactfieldbutton deletebutton')
	.attr({title: this.get_label('delete'), rel: col})
	.html(this.env.delbutton)
	.click(function(){ ref.delete_edit_field(this); return false })
	.appendTo(cell);

	row.append(label).append(cell).appendTo(appendcontainer.show());
	input.first().focus();

	// disable option if limit reached
	if (!colprop.count) colprop.count = 0;
	if (++colprop.count == colprop.limit && colprop.limit)
	$(menu).children('option[value="'+col+'"]').prop('disabled', true);
	}
	}
	}
	};

	this.delete_edit_field = function(elem)
	{
	var col = $(elem).attr('rel'),
	colprop = this.env.coltypes[col],
	fieldset = $(elem).parents('fieldset.contactfieldgroup'),
	addmenu = fieldset.parent().find('select.addfieldmenu');

	// just clear input but don't hide the last field
	if (--colprop.count <= 0 && colprop.visible)
	$(elem).parent().children('input').val('').blur();
	else {
	$(elem).parents('div.row').remove();
	// hide entire fieldset if no more rows
	if (!fieldset.children('div.row').length)
	fieldset.hide();
	}

	// enable option in add-field selector or insert it if necessary
	if (addmenu.length) {
	var option = addmenu.children('option[value="'+col+'"]');
	if (option.length)
	option.prop('disabled', false);
	else
	option = $('<option>').attr('value', col).html(colprop.label).appendTo(addmenu);
	addmenu.show();
	}
	};

	this.upload_contact_photo = function(form)
	{
	if (form && form.elements._photo.value) {
	this.async_upload_form(form, 'upload-photo', function(e) {
	rcmail.set_busy(false, null, rcmail.file_upload_id);
	});

	// display upload indicator
	this.file_upload_id = this.set_busy(true, 'uploading');
	}
	};

	this.replace_contact_photo = function(id)
	{
	var img_src = id == '-del-' ? this.env.photo_placeholder :
	this.env.comm_path + '&_action=photo&_source=' + this.env.source + '&_cid=' + this.env.cid + '&_photo=' + id;

	this.set_photo_actions(id);
	$(this.gui_objects.contactphoto).children('img').attr('src', img_src);
	};

	this.photo_upload_end = function()
	{
	this.set_busy(false, null, this.file_upload_id);
	delete this.file_upload_id;
	};

	this.set_photo_actions = function(id)
	{
	var n, buttons = this.buttons['upload-photo'];
	for (n=0; buttons && n < buttons.length; n++)
	$('a#'+buttons[n].id).html(this.get_label(id == '-del-' ? 'addphoto' : 'replacephoto'));

	$('#ff_photo').val(id);
	this.enable_command('upload-photo', this.env.coltypes.photo ? true : false);
	this.enable_command('delete-photo', this.env.coltypes.photo && id != '-del-');
	};

	// load advanced search page
	this.advanced_search = function()
	{
	var win, url = {_form: 1, _action: 'search'}, target = window;

	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	this.contact_list.clear_selection();
	}

	this.location_href(url, target, true);

	return true;
	};

	// unselect directory/group
	this.unselect_directory = function()
	{
	this.select_folder('');
	this.enable_command('search-delete', false);
	};

	// callback for creating a new saved search record
	this.insert_saved_search = function(name, id)
	{
	this.reset_add_input();

	var key = 'S'+id,
	link = $('<a>').attr('href', '#')
	.attr('rel', id)
	.click(function() { return rcmail.command('listsearch', id, this); })
	.html(name),
	li = $('<li>').attr({id: 'rcmli' + this.html_identifier(key), 'class': 'contactsearch'})
	.append(link),
	prop = {name:name, id:id, li:li[0]};

	this.add_saved_search_row(prop, li);
	this.select_folder('S'+id);
	this.enable_command('search-delete', true);
	this.env.search_id = id;

	this.triggerEvent('abook_search_insert', prop);
	};

	// add saved search row to the list, with sorting
	this.add_saved_search_row = function(prop, li, reloc)
	{
	var row, sibling, name = prop.name.toUpperCase();

	// When renaming groups, we need to remove it from DOM and insert it in the proper place
	if (reloc) {
	row = li.clone(true);
	li.remove();
	}
	else
	row = li;

	$('li[class~="contactsearch"]', this.gui_objects.folderlist).each(function(i, elem) {
	if (!sibling)
	sibling = this.previousSibling;

	if (name >= $(this).text().toUpperCase())
	sibling = elem;
	else
	return false;
	});

	if (sibling)
	row.insertAfter(sibling);
	else
	row.appendTo(this.gui_objects.folderlist);
	};

	// creates an input for saved search name
	this.search_create = function()
	{
	this.add_input_row('contactsearch');
	};

	this.search_delete = function()
	{
	if (this.env.search_request) {
	var lock = this.set_busy(true, 'savedsearchdeleting');
	this.http_post('search-delete', {_sid: this.env.search_id}, lock);
	}
	};

	// callback from server upon search-delete command
	this.remove_search_item = function(id)
	{
	var li, key = 'S'+id;
	if ((li = this.get_folder_li(key))) {
	this.triggerEvent('search_delete', { id:id, li:li });

	li.parentNode.removeChild(li);
	}

	this.env.search_id = null;
	this.env.search_request = null;
	this.list_contacts_clear();
	this.reset_qsearch();
	this.enable_command('search-delete', 'search-create', false);
	};

	this.listsearch = function(id)
	{
	var folder, lock = this.set_busy(true, 'searching');

	if (this.contact_list) {
	this.list_contacts_clear();
	}

	this.reset_qsearch();
	this.select_folder('S'+id);

	// reset vars
	this.env.current_page = 1;
	this.http_request('search', {_sid: id}, lock);
	};


	/*********************************************************/
	/******* user settings methods *******/
	/*********************************************************/

	// preferences section select and load options frame
	this.section_select = function(list)
	{
	var win, id = list.get_single_selection(), target = window,
	url = {_action: 'edit-prefs', _section: id};

	if (id) {
	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	}
	this.location_href(url, target, true);
	}

	return true;
	};

	this.identity_select = function(list)
	{
	var id;
	if (id = list.get_single_selection()) {
	this.enable_command('delete', list.rowcount > 1 && this.env.identities_level < 2);
	this.load_identity(id, 'edit-identity');
	}
	};

	// load identity record
	this.load_identity = function(id, action)
	{
	if (action == 'edit-identity' && (!id \|\| id == this.env.iid))
	return false;

	var win, target = window,
	url = {_action: action, _iid: id};

	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	}

	if (action && (id \|\| action == 'add-identity')) {
	this.set_busy(true);
	this.location_href(url, target);
	}

	return true;
	};

	this.delete_identity = function(id)
	{
	// exit if no identity is specified or if selection is empty
	var selection = this.identity_list.get_selection();
	if (!(selection.length \|\| this.env.iid))
	return;

	if (!id)
	id = this.env.iid ? this.env.iid : selection[0];

	// submit request with appended token
	if (confirm(this.get_label('deleteidentityconfirm')))
	this.goto_url('delete-identity', { _iid: id, _token: this.env.request_token }, true);

	return true;
	};

	this.update_identity_row = function(id, name, add)
	{
	var row, col, list = this.identity_list,
	rid = this.html_identifier(id);

	if (list.rows[rid] && (row = list.rows[rid].obj)) {
	$(row.cells[0]).html(name);
	}
	else if (add) {
	row = $('<tr>').attr('id', 'rcmrow'+rid).get(0);
	col = $('<td>').addClass('mail').html(name).appendTo(row);
	list.insert_row(row);
	list.select(rid);
	}
	};


	/*********************************************************/
	/******* folder manager methods *******/
	/*********************************************************/

	this.init_subscription_list = function()
	{
	var p = this;
	this.subscription_list = new rcube_list_widget(this.gui_objects.subscriptionlist,
	{multiselect:false, draggable:true, keyboard:false, toggleselect:true});
	this.subscription_list.addEventListener('select', function(o){ p.subscription_select(o); });
	this.subscription_list.addEventListener('dragstart', function(o){ p.drag_active = true; });
	this.subscription_list.addEventListener('dragend', function(o){ p.subscription_move_folder(o); });
	this.subscription_list.row_init = function (row) {
	row.obj.onmouseover = function() { p.focus_subscription(row.id); };
	row.obj.onmouseout = function() { p.unfocus_subscription(row.id); };
	};
	this.subscription_list.init();
	$('#mailboxroot')
	.mouseover(function(){ p.focus_subscription(this.id); })
	.mouseout(function(){ p.unfocus_subscription(this.id); })
	};

	this.focus_subscription = function(id)
	{
	var row, folder,
	delim = RegExp.escape(this.env.delimiter),
	reg = RegExp('['+delim+']?[^'+delim+']+$');

	if (this.drag_active && this.env.mailbox && (row = document.getElementById(id)))
	if (this.env.subscriptionrows[id] &&
	(folder = this.env.subscriptionrows[id][0]) !== null
	) {
	if (this.check_droptarget(folder) &&
	!this.env.subscriptionrows[this.get_folder_row_id(this.env.mailbox)][2] &&
	(folder != this.env.mailbox.replace(reg, '')) &&
	(!folder.match(new RegExp('^'+RegExp.escape(this.env.mailbox+this.env.delimiter))))
	) {
	this.env.dstfolder = folder;
	$(row).addClass('droptarget');
	}
	}
	};

	this.unfocus_subscription = function(id)
	{
	var row = $('#'+id);

	this.env.dstfolder = null;
	if (this.env.subscriptionrows[id] && row[0])
	row.removeClass('droptarget');
	else
	$(this.subscription_list.frame).removeClass('droptarget');
	};

	this.subscription_select = function(list)
	{
	var id, folder;

	if (list && (id = list.get_single_selection()) &&
	(folder = this.env.subscriptionrows['rcmrow'+id])
	) {
	this.env.mailbox = folder[0];
	this.show_folder(folder[0]);
	this.enable_command('delete-folder', !folder[2]);
	}
	else {
	this.env.mailbox = null;
	this.show_contentframe(false);
	this.enable_command('delete-folder', 'purge', false);
	}
	};

	this.subscription_move_folder = function(list)
	{
	var delim = RegExp.escape(this.env.delimiter),
	reg = RegExp('['+delim+']?[^'+delim+']+$');

	if (this.env.mailbox && this.env.dstfolder !== null && (this.env.dstfolder != this.env.mailbox) &&
	(this.env.dstfolder != this.env.mailbox.replace(reg, ''))
	) {
	reg = new RegExp('[^'+delim+']*['+delim+']', 'g');
	var basename = this.env.mailbox.replace(reg, ''),
	newname = this.env.dstfolder === '' ? basename : this.env.dstfolder+this.env.delimiter+basename;

	if (newname != this.env.mailbox) {
	this.http_post('rename-folder', {_folder_oldname: this.env.mailbox, _folder_newname: newname}, this.set_busy(true, 'foldermoving'));
	this.subscription_list.draglayer.hide();
	}
	}
	this.drag_active = false;
	this.unfocus_subscription(this.get_folder_row_id(this.env.dstfolder));
	};

	// tell server to create and subscribe a new mailbox
	this.create_folder = function()
	{
	this.show_folder('', this.env.mailbox);
	};

	// delete a specific mailbox with all its messages
	this.delete_folder = function(name)
	{
	var id = this.get_folder_row_id(name ? name : this.env.mailbox),
	folder = this.env.subscriptionrows[id][0];

	if (folder && confirm(this.get_label('deletefolderconfirm'))) {
	var lock = this.set_busy(true, 'folderdeleting');
	this.http_post('delete-folder', {_mbox: folder}, lock);
	}
	};

	// Add folder row to the table and initialize it
	this.add_folder_row = function (name, display_name, is_protected, subscribed, skip_init, class_name)
	{
	if (!this.gui_objects.subscriptionlist)
	return false;

	var row, n, i, tmp, tmp_name, folders, rowid, list = [], slist = [],
	tbody = this.gui_objects.subscriptionlist.tBodies[0],
	refrow = $('tr', tbody).get(1),
	id = 'rcmrow'+((new Date).getTime());

	if (!refrow) {
	// Refresh page if we don't have a table row to clone
	this.goto_url('folders');
	return false;
	}

	// clone a table row if there are existing rows
	row = $(refrow).clone(true);

	// set ID, reset css class
	row.attr('id', id);
	row.attr('class', class_name);

	// set folder name
	row.find('td:first').html(display_name);

	// update subscription checkbox
	$('input[name="_subscribed[]"]', row).val(name)
	.prop({checked: subscribed ? true : false, disabled: is_protected ? true : false});

	// add to folder/row-ID map
	this.env.subscriptionrows[id] = [name, display_name, 0];

	// sort folders, to find a place where to insert the row
	folders = [];
	$.each(this.env.subscriptionrows, function(k,v){ folders.push(v) });
	folders.sort(function(a,b){ return a[0] < b[0] ? -1 : (a[0] > b[0] ? 1 : 0) });

	for (n in folders) {
	// protected folder
	if (folders[n][2]) {
	tmp_name = folders[n][0] + this.env.delimiter;
	// prefix namespace cannot have subfolders (#1488349)
	if (tmp_name == this.env.prefix_ns)
	continue;
	slist.push(folders[n][0]);
	tmp = tmp_name;
	}
	// protected folder's child
	else if (tmp && folders[n][0].indexOf(tmp) == 0)
	slist.push(folders[n][0]);
	// other
	else {
	list.push(folders[n][0]);
	tmp = null;
	}
	}

	// check if subfolder of a protected folder
	for (n=0; n<slist.length; n++) {
	if (name.indexOf(slist[n]+this.env.delimiter) == 0)
	rowid = this.get_folder_row_id(slist[n]);
	}

	// find folder position after sorting
	for (n=0; !rowid && n<list.length; n++) {
	if (n && list[n] == name)
	rowid = this.get_folder_row_id(list[n-1]);
	}

	// add row to the table
	if (rowid)
	$('#'+rowid).after(row);
	else
	row.appendTo(tbody);

	// update list widget
	this.subscription_list.clear_selection();
	if (!skip_init)
	this.init_subscription_list();

	row = row.get(0);
	if (row.scrollIntoView)
	row.scrollIntoView();

	return row;
	};

	// replace an existing table row with a new folder line (with subfolders)
	this.replace_folder_row = function(oldfolder, newfolder, display_name, is_protected, class_name)
	{
	if (!this.gui_objects.subscriptionlist)
	return false;

	var i, n, len, name, dispname, oldrow, tmprow, row, level,
	tbody = this.gui_objects.subscriptionlist.tBodies[0],
	folders = this.env.subscriptionrows,
	id = this.get_folder_row_id(oldfolder),
	regex = new RegExp('^'+RegExp.escape(oldfolder)),
	subscribed = $('input[name="_subscribed[]"]', $('#'+id)).prop('checked'),
	// find subfolders of renamed folder
	list = this.get_subfolders(oldfolder);

	// replace an existing table row
	this._remove_folder_row(id);
	row = $(this.add_folder_row(newfolder, display_name, is_protected, subscribed, true, class_name));

	// detect tree depth change
	if (len = list.length) {
	level = (oldfolder.split(this.env.delimiter)).length - (newfolder.split(this.env.delimiter)).length;
	}

	// move subfolders to the new branch
	for (n=0; n<len; n++) {
	id = list[n];
	name = this.env.subscriptionrows[id][0];
	dispname = this.env.subscriptionrows[id][1];
	oldrow = $('#'+id);
	tmprow = oldrow.clone(true);
	oldrow.remove();
	row.after(tmprow);
	row = tmprow;
	// update folder index
	name = name.replace(regex, newfolder);
	$('input[name="_subscribed[]"]', row).val(name);
	this.env.subscriptionrows[id][0] = name;
	// update the name if level is changed
	if (level != 0) {
	if (level > 0) {
	for (i=level; i>0; i--)
	dispname = dispname.replace(/^    /, '');
	}
	else {
	for (i=level; i<0; i++)
	dispname = '    ' + dispname;
	}
	row.find('td:first').html(dispname);
	this.env.subscriptionrows[id][1] = dispname;
	}
	}

	// update list widget
	this.init_subscription_list();
	};

	// remove the table row of a specific mailbox from the table
	this.remove_folder_row = function(folder, subs)
	{
	var n, len, list = [], id = this.get_folder_row_id(folder);

	// get subfolders if any
	if (subs)
	list = this.get_subfolders(folder);

	// remove old row
	this._remove_folder_row(id);

	// remove subfolders
	for (n=0, len=list.length; n<len; n++)
	this._remove_folder_row(list[n]);
	};

	this._remove_folder_row = function(id)
	{
	this.subscription_list.remove_row(id.replace(/^rcmrow/, ''));
	$('#'+id).remove();
	delete this.env.subscriptionrows[id];
	}

	this.get_subfolders = function(folder)
	{
	var name, list = [],
	regex = new RegExp('^'+RegExp.escape(folder)+RegExp.escape(this.env.delimiter)),
	row = $('#'+this.get_folder_row_id(folder)).get(0);

	while (row = row.nextSibling) {
	if (row.id) {
	name = this.env.subscriptionrows[row.id][0];
	if (regex.test(name)) {
	list.push(row.id);
	}
	else
	break;
	}
	}

	return list;
	}

	this.subscribe = function(folder)
	{
	if (folder) {
	var lock = this.display_message(this.get_label('foldersubscribing'), 'loading');
	this.http_post('subscribe', {_mbox: folder}, lock);
	}
	};

	this.unsubscribe = function(folder)
	{
	if (folder) {
	var lock = this.display_message(this.get_label('folderunsubscribing'), 'loading');
	this.http_post('unsubscribe', {_mbox: folder}, lock);
	}
	};

	// helper method to find a specific mailbox row ID
	this.get_folder_row_id = function(folder)
	{
	var id, folders = this.env.subscriptionrows;
	for (id in folders)
	if (folders[id] && folders[id][0] == folder)
	break;

	return id;
	};

	// when user select a folder in manager
	this.show_folder = function(folder, path, force)
	{
	var win, target = window,
	url = '&_action=edit-folder&_mbox='+urlencode(folder);

	if (path)
	url += '&_path='+urlencode(path);

	if (win = this.get_frame_window(this.env.contentframe)) {
	target = win;
	url += '&_framed=1';
	}

	if (String(target.location.href).indexOf(url) >= 0 && !force)
	this.show_contentframe(true);
	else
	this.location_href(this.env.comm_path+url, target, true);
	};

	// disables subscription checkbox (for protected folder)
	this.disable_subscription = function(folder)
	{
	var id = this.get_folder_row_id(folder);
	if (id)
	$('input[name="_subscribed[]"]', $('#'+id)).prop('disabled', true);
	};

	this.folder_size = function(folder)
	{
	var lock = this.set_busy(true, 'loading');
	this.http_post('folder-size', {_mbox: folder}, lock);
	};

	this.folder_size_update = function(size)
	{
	$('#folder-size').replaceWith(size);
	};


	/*********************************************************/
	/******* GUI functionality *******/
	/*********************************************************/

	var init_button = function(cmd, prop)
	{
	var elm = document.getElementById(prop.id);
	if (!elm)
	return;

	var preload = false;
	if (prop.type == 'image') {
	elm = elm.parentNode;
	preload = true;
	}

	elm._command = cmd;
	elm._id = prop.id;
	if (prop.sel) {
	elm.onmousedown = function(e){ return rcmail.button_sel(this._command, this._id); };
	elm.onmouseup = function(e){ return rcmail.button_out(this._command, this._id); };
	if (preload)
	new Image().src = prop.sel;
	}
	if (prop.over) {
	elm.onmouseover = function(e){ return rcmail.button_over(this._command, this._id); };
	elm.onmouseout = function(e){ return rcmail.button_out(this._command, this._id); };
	if (preload)
	new Image().src = prop.over;
	}
	};

	// set event handlers on registered buttons
	this.init_buttons = function()
	{
	for (var cmd in this.buttons) {
	if (typeof cmd !== 'string')
	continue;

	for (var i=0; i<this.buttons[cmd].length; i++) {
	init_button(cmd, this.buttons[cmd][i]);
	}
	}

	// set active task button
	this.set_button(this.task, 'sel');
	};

	// set button to a specific state
	this.set_button = function(command, state)
	{
	var n, button, obj, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	obj = document.getElementById(button.id);

	if (!obj)
	continue;

	// get default/passive setting of the button
	if (button.type == 'image' && !button.status) {
	button.pas = obj._original_src ? obj._original_src : obj.src;
	// respect PNG fix on IE browsers
	if (obj.runtimeStyle && obj.runtimeStyle.filter && obj.runtimeStyle.filter.match(/src=['"]([^'"]+)['"]/))
	button.pas = RegExp.$1;
	}
	else if (!button.status)
	button.pas = String(obj.className);

	// set image according to button state
	if (button.type == 'image' && button[state]) {
	button.status = state;
	obj.src = button[state];
	}
	// set class name according to button state
	else if (button[state] !== undefined) {
	button.status = state;
	obj.className = button[state];
	}
	// disable/enable input buttons
	if (button.type == 'input') {
	button.status = state;
	obj.disabled = !state;
	}
	}
	};

	// display a specific alttext
	this.set_alttext = function(command, label)
	{
	var n, button, obj, link, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	obj = document.getElementById(button.id);

	if (button.type == 'image' && obj) {
	obj.setAttribute('alt', this.get_label(label));
	if ((link = obj.parentNode) && link.tagName.toLowerCase() == 'a')
	link.setAttribute('title', this.get_label(label));
	}
	else if (obj)
	obj.setAttribute('title', this.get_label(label));
	}
	};

	// mouse over button
	this.button_over = function(command, id)
	{
	var n, button, obj, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	if (button.id == id && button.status == 'act') {
	obj = document.getElementById(button.id);
	if (obj && button.over) {
	if (button.type == 'image')
	obj.src = button.over;
	else
	obj.className = button.over;
	}
	}
	}
	};

	// mouse down on button
	this.button_sel = function(command, id)
	{
	var n, button, obj, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	if (button.id == id && button.status == 'act') {
	obj = document.getElementById(button.id);
	if (obj && button.sel) {
	if (button.type == 'image')
	obj.src = button.sel;
	else
	obj.className = button.sel;
	}
	this.buttons_sel[id] = command;
	}
	}
	};

	// mouse out of button
	this.button_out = function(command, id)
	{
	var n, button, obj, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	if (button.id == id && button.status == 'act') {
	obj = document.getElementById(button.id);
	if (obj && button.act) {
	if (button.type == 'image')
	obj.src = button.act;
	else
	obj.className = button.act;
	}
	}
	}
	};

	// write to the document/window title
	this.set_pagetitle = function(title)
	{
	if (title && document.title)
	document.title = title;
	};

	// display a system message, list of types in common.css (below #message definition)
	this.display_message = function(msg, type, timeout)
	{
	// pass command to parent window
	if (this.is_framed())
	return parent.rcmail.display_message(msg, type, timeout);

	if (!this.gui_objects.message) {
	// save message in order to display after page loaded
	if (type != 'loading')
	this.pending_message = [msg, type, timeout];
	return 1;
	}

	type = type ? type : 'notice';

	var ref = this,
	key = this.html_identifier(msg),
	date = new Date(),
	id = type + date.getTime();

	if (!timeout)
	timeout = this.message_time * (type == 'error' \|\| type == 'warning' ? 2 : 1);

	if (type == 'loading') {
	key = 'loading';
	timeout = this.env.request_timeout * 1000;
	if (!msg)
	msg = this.get_label('loading');
	}

	// The same message is already displayed
	if (this.messages[key]) {
	// replace label
	if (this.messages[key].obj)
	this.messages[key].obj.html(msg);
	// store label in stack
	if (type == 'loading') {
	this.messages[key].labels.push({'id': id, 'msg': msg});
	}
	// add element and set timeout
	this.messages[key].elements.push(id);
	setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
	return id;
	}

	// create DOM object and display it
	var obj = $('<div>').addClass(type).html(msg).data('key', key),
	cont = $(this.gui_objects.message).append(obj).show();

	this.messages[key] = {'obj': obj, 'elements': [id]};

	if (type == 'loading') {
	this.messages[key].labels = [{'id': id, 'msg': msg}];
	}
	else {
	obj.click(function() { return ref.hide_message(obj); });
	}

	this.triggerEvent('message', { message:msg, type:type, timeout:timeout, object:obj });

	if (timeout > 0)
	setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
	return id;
	};

	// make a message to disapear
	this.hide_message = function(obj, fade)
	{
	// pass command to parent window
	if (this.is_framed())
	return parent.rcmail.hide_message(obj, fade);

	if (!this.gui_objects.message)
	return;

	var k, n, i, msg, m = this.messages;

	// Hide message by object, don't use for 'loading'!
	if (typeof obj === 'object') {
	$(obj)[fade?'fadeOut':'hide']();
	msg = $(obj).data('key');
	if (this.messages[msg])
	delete this.messages[msg];
	}
	// Hide message by id
	else {
	for (k in m) {
	for (n in m[k].elements) {
	if (m[k] && m[k].elements[n] == obj) {
	m[k].elements.splice(n, 1);
	// hide DOM element if last instance is removed
	if (!m[k].elements.length) {
	m[k].obj[fade?'fadeOut':'hide']();
	delete m[k];
	}
	// set pending action label for 'loading' message
	else if (k == 'loading') {
	for (i in m[k].labels) {
	if (m[k].labels[i].id == obj) {
	delete m[k].labels[i];
	}
	else {
	msg = m[k].labels[i].msg;
	}
	m[k].obj.html(msg);
	}
	}
	}
	}
	}
	}
	};

	// remove all messages immediately
	this.clear_messages = function()
	{
	// pass command to parent window
	if (this.is_framed())
	return parent.rcmail.clear_messages();

	var k, n, m = this.messages;

	for (k in m)
	for (n in m[k].elements)
	if (m[k].obj)
	m[k].obj.hide();

	this.messages = {};
	};

	// open a jquery UI dialog with the given content
	this.show_popup_dialog = function(html, title)
	{
	// forward call to parent window
	if (this.is_framed()) {
	parent.rcmail.show_popup_dialog(html, title);
	return;
	}

	var popup = $('<div class="popup">')
	.html(html)
	.dialog({
	title: title,
	modal: true,
	resizable: true,
	width: 580,
	close: function(event, ui) { $(this).remove() }
	});

	// resize and center popup
	var win = $(window), w = win.width(), h = win.height(),
	width = popup.width(), height = popup.height();
	popup.dialog('option', { height: Math.min(h-40, height+50), width: Math.min(w-20, width+50) })
	.dialog('option', 'position', ['center', 'center']); // only works in a separate call (!?)
	};

	// enable/disable buttons for page shifting
	this.set_page_buttons = function()
	{
	this.enable_command('nextpage', 'lastpage', (this.env.pagecount > this.env.current_page));
	this.enable_command('previouspage', 'firstpage', (this.env.current_page > 1));
	};

	// mark a mailbox as selected and set environment variable
	this.select_folder = function(name, prefix, encode)
	{
	if (this.gui_objects.folderlist) {
	var current_li, target_li;

	if ((current_li = $('li.selected', this.gui_objects.folderlist))) {
	current_li.removeClass('selected').addClass('unfocused');
	}
	if ((target_li = this.get_folder_li(name, prefix, encode))) {
	$(target_li).removeClass('unfocused').addClass('selected');
	}

	// trigger event hook
	this.triggerEvent('selectfolder', { folder:name, prefix:prefix });
	}
	};

	// adds a class to selected folder
	this.mark_folder = function(name, class_name, prefix, encode)
	{
	$(this.get_folder_li(name, prefix, encode)).addClass(class_name);
	};

	// adds a class to selected folder
	this.unmark_folder = function(name, class_name, prefix, encode)
	{
	$(this.get_folder_li(name, prefix, encode)).removeClass(class_name);
	};

	// helper method to find a folder list item
	this.get_folder_li = function(name, prefix, encode)
	{
	if (!prefix)
	prefix = 'rcmli';

	if (this.gui_objects.folderlist) {
	name = this.html_identifier(name, encode);
	return document.getElementById(prefix+name);
	}

	return null;
	};

	// for reordering column array (Konqueror workaround)
	// and for setting some message list global variables
	this.set_message_coltypes = function(coltypes, repl, smart_col)
	{
	var list = this.message_list,
	thead = list ? list.list.tHead : null,
	cell, col, n, len, th, tr;

	this.env.coltypes = coltypes;

	// replace old column headers
	if (thead) {
	if (repl) {
	th = document.createElement('thead');
	tr = document.createElement('tr');

	for (c=0, len=repl.length; c < len; c++) {
	cell = document.createElement('td');
	cell.innerHTML = repl[c].html;
	if (repl[c].id) cell.id = repl[c].id;
	if (repl[c].className) cell.className = repl[c].className;
	tr.appendChild(cell);
	}
	th.appendChild(tr);
	thead.parentNode.replaceChild(th, thead);
	thead = th;
	}

	for (n=0, len=this.env.coltypes.length; n<len; n++) {
	col = this.env.coltypes[n];
	if ((cell = thead.rows[0].cells[n]) && (col == 'from' \|\| col == 'to' \|\| col == 'fromto')) {
	cell.id = 'rcm'+col;
	$('span,a', cell).text(this.get_label(col == 'fromto' ? smart_col : col));
	// if we have links for sorting, it's a bit more complicated...
	$('a', cell).click(function(){
	return rcmail.command('sort', this.id.replace(/^rcm/, ''), this);
	});
	}
	}
	}

	this.env.subject_col = null;
	this.env.flagged_col = null;
	this.env.status_col = null;

	if ((n = $.inArray('subject', this.env.coltypes)) >= 0) {
	this.env.subject_col = n;
	if (list)
	list.subject_col = n;
	}
	if ((n = $.inArray('flag', this.env.coltypes)) >= 0)
	this.env.flagged_col = n;
	if ((n = $.inArray('status', this.env.coltypes)) >= 0)
	this.env.status_col = n;

	if (list)
	list.init_header();
	};

	// replace content of row count display
	this.set_rowcount = function(text, mbox)
	{
	// #1487752
	if (mbox && mbox != this.env.mailbox)
	return false;

	$(this.gui_objects.countdisplay).html(text);

	// update page navigation buttons
	this.set_page_buttons();
	};

	// replace content of mailboxname display
	this.set_mailboxname = function(content)
	{
	if (this.gui_objects.mailboxname && content)
	this.gui_objects.mailboxname.innerHTML = content;
	};

	// replace content of quota display
	this.set_quota = function(content)
	{
	if (this.gui_objects.quotadisplay && content && content.type == 'text')
	$(this.gui_objects.quotadisplay).html(content.percent+'%').attr('title', content.title);

	this.triggerEvent('setquota', content);
	this.env.quota_content = content;
	};

	// update the mailboxlist
	this.set_unread_count = function(mbox, count, set_title, mark)
	{
	if (!this.gui_objects.mailboxlist)
	return false;

	this.env.unread_counts[mbox] = count;
	this.set_unread_count_display(mbox, set_title);

	if (mark)
	this.mark_folder(mbox, mark, '', true);
	else if (!count)
	this.unmark_folder(mbox, 'recent', '', true);
	};

	// update the mailbox count display
	this.set_unread_count_display = function(mbox, set_title)
	{
	var reg, link, text_obj, item, mycount, childcount, div;

	if (item = this.get_folder_li(mbox, '', true)) {
	mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
	link = $(item).children('a').eq(0);
	text_obj = link.children('span.unreadcount');
	if (!text_obj.length && mycount)
	text_obj = $('<span>').addClass('unreadcount').appendTo(link);
	reg = /\s+$[0-9]+$$/i;

	childcount = 0;
	if ((div = item.getElementsByTagName('div')[0]) &&
	div.className.match(/collapsed/)) {
	// add children's counters
	for (var k in this.env.unread_counts)
	if (k.indexOf(mbox + this.env.delimiter) == 0)
	childcount += this.env.unread_counts[k];
	}

	if (mycount && text_obj.length)
	text_obj.html(this.env.unreadwrap.replace(/%[sd]/, mycount));
	else if (text_obj.length)
	text_obj.remove();

	// set parent's display
	reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+$');
	if (mbox.match(reg))
	this.set_unread_count_display(mbox.replace(reg, ''), false);

	// set the right classes
	if ((mycount+childcount)>0)
	$(item).addClass('unread');
	else
	$(item).removeClass('unread');
	}

	// set unread count to window title
	reg = /^$[0-9]+$\s+/i;
	if (set_title && document.title) {
	var new_title = '',
	doc_title = String(document.title);

	if (mycount && doc_title.match(reg))
	new_title = doc_title.replace(reg, '('+mycount+') ');
	else if (mycount)
	new_title = '('+mycount+') '+doc_title;
	else
	new_title = doc_title.replace(reg, '');

	this.set_pagetitle(new_title);
	}
	};

	// display fetched raw headers
	this.set_headers = function(content)
	{
	if (this.gui_objects.all_headers_row && this.gui_objects.all_headers_box && content)
	$(this.gui_objects.all_headers_box).html(content).show();
	};

	// display all-headers row and fetch raw message headers
	this.show_headers = function(props, elem)
	{
	if (!this.gui_objects.all_headers_row \|\| !this.gui_objects.all_headers_box \|\| !this.env.uid)
	return;

	$(elem).removeClass('show-headers').addClass('hide-headers');
	$(this.gui_objects.all_headers_row).show();
	elem.onclick = function() { rcmail.command('hide-headers', '', elem); };

	// fetch headers only once
	if (!this.gui_objects.all_headers_box.innerHTML) {
	var lock = this.display_message(this.get_label('loading'), 'loading');
	this.http_post('headers', {_uid: this.env.uid}, lock);
	}
	};

	// hide all-headers row
	this.hide_headers = function(props, elem)
	{
	if (!this.gui_objects.all_headers_row \|\| !this.gui_objects.all_headers_box)
	return;

	$(elem).removeClass('hide-headers').addClass('show-headers');
	$(this.gui_objects.all_headers_row).hide();
	elem.onclick = function() { rcmail.command('show-headers', '', elem); };
	};


	/********************************************************/
	/******* html to text conversion functions *******/
	/********************************************************/

	this.html2plain = function(htmlText, id)
	{
	var rcmail = this,
	url = '?_task=utils&_action=html2text',
	lock = this.set_busy(true, 'converting');

	this.log('HTTP POST: ' + url);

	$.ajax({ type: 'POST', url: url, data: htmlText, contentType: 'application/octet-stream',
	error: function(o, status, err) { rcmail.http_error(o, status, err, lock); },
	success: function(data) { rcmail.set_busy(false, null, lock); $('#'+id).val(data); rcmail.log(data); }
	});
	};

	this.plain2html = function(plain, id)
	{
	var lock = this.set_busy(true, 'converting');

	plain = plain.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
	$('#'+id).val(plain ? '<pre>'+plain+'</pre>' : '');

	this.set_busy(false, null, lock);
	};


	/********************************************************/
	/******* remote request methods *******/
	/********************************************************/

	// compose a valid url with the given parameters
	this.url = function(action, query)
	{
	var querystring = typeof query === 'string' ? '&' + query : '';

	if (typeof action !== 'string')
	query = action;
	else if (!query \|\| typeof query !== 'object')
	query = {};

	if (action)
	query._action = action;
	else
	query._action = this.env.action;

	var base = this.env.comm_path, k, param = {};

	// overwrite task name
	if (query._action.match(/([a-z]+)\/([a-z0-9-_.]+)/)) {
	query._action = RegExp.$2;
	base = base.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
	}

	// remove undefined values
	for (k in query) {
	if (query[k] !== undefined && query[k] !== null)
	param[k] = query[k];
	}

	return base + '&' + $.param(param) + querystring;
	};

	this.redirect = function(url, lock)
	{
	if (lock \|\| lock === null)
	this.set_busy(true);

	if (this.is_framed()) {
	parent.rcmail.redirect(url, lock);
	}
	else {
	if (this.env.extwin) {
	if (typeof url == 'string')
	url += (url.indexOf('?') < 0 ? '?' : '&') + '_extwin=1';
	else
	url._extwin = 1;
	}
	this.location_href(url, window);
	}
	};

	this.goto_url = function(action, query, lock)
	{
	this.redirect(this.url(action, query));
	};

	this.location_href = function(url, target, frame)
	{
	if (frame)
	this.lock_frame();

	if (typeof url == 'object')
	url = this.env.comm_path + '&' + $.param(url);

	// simulate real link click to force IE to send referer header
	if (bw.ie && target == window)
	$('<a>').attr('href', url).appendTo(document.body).get(0).click();
	else
	target.location.href = url;

	// reset keep-alive interval
	this.start_keepalive();
	};

	// send a http request to the server
	this.http_request = function(action, query, lock)
	{
	var url = this.url(action, query);

	// trigger plugin hook
	var result = this.triggerEvent('request'+action, query);

	if (result !== undefined) {
	// abort if one the handlers returned false
	if (result === false)
	return false;
	else
	query = result;
	}

	url += '&_remote=1';

	// send request
	this.log('HTTP GET: ' + url);

	return $.ajax({
	type: 'GET', url: url, data: { _unlock:(lock?lock:0) }, dataType: 'json',
	success: function(data){ ref.http_response(data); },
	error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
	});

	// reset keep-alive interval
	this.start_keepalive();
	};

	// send a http POST request to the server
	this.http_post = function(action, postdata, lock)
	{
	var url = this.url(action);

	if (postdata && typeof postdata === 'object') {
	postdata._remote = 1;
	postdata._unlock = (lock ? lock : 0);
	}
	else
	postdata += (postdata ? '&' : '') + '_remote=1' + (lock ? '&_unlock='+lock : '');

	// trigger plugin hook
	var result = this.triggerEvent('request'+action, postdata);
	if (result !== undefined) {
	// abort if one of the handlers returned false
	if (result === false)
	return false;
	else
	postdata = result;
	}

	// send request
	this.log('HTTP POST: ' + url);

	return $.ajax({
	type: 'POST', url: url, data: postdata, dataType: 'json',
	success: function(data){ ref.http_response(data); },
	error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
	});

	// reset keep-alive interval
	this.start_keepalive();
	};

	// aborts ajax request
	this.abort_request = function(r)
	{
	if (r.request)
	r.request.abort();
	if (r.lock)
	this.set_busy(false, null, r.lock);
	};

	// handle HTTP response
	this.http_response = function(response)
	{
	if (!response)
	return;

	if (response.unlock)
	this.set_busy(false);

	this.triggerEvent('responsebefore', {response: response});
	this.triggerEvent('responsebefore'+response.action, {response: response});

	// set env vars
	if (response.env)
	this.set_env(response.env);

	// we have labels to add
	if (typeof response.texts === 'object') {
	for (var name in response.texts)
	if (typeof response.texts[name] === 'string')
	this.add_label(name, response.texts[name]);
	}

	// if we get javascript code from server -> execute it
	if (response.exec) {
	this.log(response.exec);
	eval(response.exec);
	}

	// execute callback functions of plugins
	if (response.callbacks && response.callbacks.length) {
	for (var i=0; i < response.callbacks.length; i++)
	this.triggerEvent(response.callbacks[i][0], response.callbacks[i][1]);
	}

	// process the response data according to the sent action
	switch (response.action) {
	case 'delete':
	if (this.task == 'addressbook') {
	var sid, uid = this.contact_list.get_selection(), writable = false;

	if (uid && this.contact_list.rows[uid]) {
	// search results, get source ID from record ID
	if (this.env.source == '') {
	sid = String(uid).replace(/^[^-]+-/, '');
	writable = sid && this.env.address_sources[sid] && !this.env.address_sources[sid].readonly;
	}
	else {
	writable = !this.env.address_sources[this.env.source].readonly;
	}
	}
	this.enable_command('compose', (uid && this.contact_list.rows[uid]));
	this.enable_command('delete', 'edit', writable);
	this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
	}

	case 'moveto':
	if (this.env.action == 'show') {
	// re-enable commands on move/delete error
	this.enable_command(this.env.message_commands, true);
	if (!this.env.list_post)
	this.enable_command('reply-list', false);
	}
	else if (this.task == 'addressbook') {
	this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
	}

	case 'purge':
	case 'expunge':
	if (this.task == 'mail') {
	- if (!this.env.messagecount) {
	+ if (!this.env.exists) {
	// clear preview pane content
	if (this.env.contentframe)
	this.show_contentframe(false);
	// disable commands useless when mailbox is empty
	this.enable_command(this.env.message_commands, 'purge', 'expunge',
	'select-all', 'select-none', 'expand-all', 'expand-unread', 'collapse-all', false);
	}
	if (this.message_list)
	this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
	}
	break;

	case 'refresh':
	case 'check-recent':
	case 'getunread':
	case 'search':
	this.env.qsearch = null;
	case 'list':
	if (this.task == 'mail') {
	- this.enable_command('show', 'expunge', 'select-all', 'select-none', (this.env.messagecount > 0));
	+ this.enable_command('show', 'select-all', 'select-none', this.env.messagecount > 0);
	+ this.enable_command('expunge', this.env.exists);
	this.enable_command('purge', this.purge_mailbox_test());
	this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount);

	if ((response.action == 'list' \|\| response.action == 'search') && this.message_list) {
	this.msglist_select(this.message_list);
	this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
	}
	}
	else if (this.task == 'addressbook') {
	this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));

	if (response.action == 'list' \|\| response.action == 'search') {
	this.enable_command('search-create', this.env.source == '');
	this.enable_command('search-delete', this.env.search_id);
	this.update_group_commands();
	this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
	}
	}
	break;
	}

	if (response.unlock)
	this.hide_message(response.unlock);

	this.triggerEvent('responseafter', {response: response});
	this.triggerEvent('responseafter'+response.action, {response: response});

	// reset keep-alive interval
	this.start_keepalive();
	};

	// handle HTTP request errors
	this.http_error = function(request, status, err, lock, action)
	{
	var errmsg = request.statusText;

	this.set_busy(false, null, lock);
	request.abort();

	// don't display error message on page unload (#1488547)
	if (this.unload)
	return;

	if (request.status && errmsg)
	this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
	else if (status == 'timeout')
	this.display_message(this.get_label('requesttimedout'), 'error');
	else if (request.status == 0 && status != 'abort')
	this.display_message(this.get_label('servererror') + ' (No connection)', 'error');

	// redirect to url specified in location header if not empty
	var location_url = request.getResponseHeader("Location");
	if (location_url)
	this.redirect(location_url);

	// re-send keep-alive requests after 30 seconds
	if (action == 'keep-alive')
	setTimeout(function(){ ref.keep_alive(); ref.start_keepalive(); }, 30000);
	};

	// post the given form to a hidden iframe
	this.async_upload_form = function(form, action, onload)
	{
	var ts = new Date().getTime(),
	frame_name = 'rcmupload'+ts;

	// upload progress support
	if (this.env.upload_progress_name) {
	var fname = this.env.upload_progress_name,
	field = $('input[name='+fname+']', form);

	if (!field.length) {
	field = $('<input>').attr({type: 'hidden', name: fname});
	field.prependTo(form);
	}

	field.val(ts);
	}

	// have to do it this way for IE
	// otherwise the form will be posted to a new window
	if (document.all) {
	var html = '<iframe name="'+frame_name+'" src="program/resources/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
	document.body.insertAdjacentHTML('BeforeEnd', html);
	}
	else { // for standards-compilant browsers
	var frame = document.createElement('iframe');
	frame.name = frame_name;
	frame.style.border = 'none';
	frame.style.width = 0;
	frame.style.height = 0;
	frame.style.visibility = 'hidden';
	document.body.appendChild(frame);
	}

	// handle upload errors, parsing iframe content in onload
	$(frame_name).bind('load', {ts:ts}, onload);

	$(form).attr({
	target: frame_name,
	action: this.url(action, { _id:this.env.compose_id\|\|'', _uploadid:ts }),
	method: 'POST'})
	.attr(form.encoding ? 'encoding' : 'enctype', 'multipart/form-data')
	.submit();

	return frame_name;
	};

	// html5 file-drop API
	this.document_drag_hover = function(e, over)
	{
	e.preventDefault();
	$(ref.gui_objects.filedrop)[(over?'addClass':'removeClass')]('active');
	};

	this.file_drag_hover = function(e, over)
	{
	e.preventDefault();
	e.stopPropagation();
	$(ref.gui_objects.filedrop)[(over?'addClass':'removeClass')]('hover');
	};

	// handler when files are dropped to a designated area.
	// compose a multipart form data and submit it to the server
	this.file_dropped = function(e)
	{
	// abort event and reset UI
	this.file_drag_hover(e, false);

	// prepare multipart form data composition
	var files = e.target.files \|\| e.dataTransfer.files,
	formdata = window.FormData ? new FormData() : null,
	fieldname = (this.env.filedrop.fieldname \|\| '_file') + (this.env.filedrop.single ? '' : '[]'),
	boundary = '------multipartformboundary' + (new Date).getTime(),
	dashdash = '--', crlf = '\r\n',
	multipart = dashdash + boundary + crlf;

	if (!files \|\| !files.length)
	return;

	// inline function to submit the files to the server
	var submit_data = function() {
	var multiple = files.length > 1,
	ts = new Date().getTime(),
	content = '<span>' + (multiple ? ref.get_label('uploadingmany') : files[0].name) + '</span>';

	// add to attachments list
	if (!ref.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false }))
	ref.file_upload_id = ref.set_busy(true, 'uploading');

	// complete multipart content and post request
	multipart += dashdash + boundary + dashdash + crlf;

	$.ajax({
	type: 'POST',
	dataType: 'json',
	url: ref.url(ref.env.filedrop.action\|\|'upload', { _id:ref.env.compose_id\|\|ref.env.cid\|\|'', _uploadid:ts, _remote:1 }),
	contentType: formdata ? false : 'multipart/form-data; boundary=' + boundary,
	processData: false,
	data: formdata \|\| multipart,
	headers: {'X-Roundcube-Request': ref.env.request_token},
	beforeSend: function(xhr, s) { if (!formdata && xhr.sendAsBinary) xhr.send = xhr.sendAsBinary; },
	success: function(data){ ref.http_response(data); },
	error: function(o, status, err) { ref.http_error(o, status, err, null, 'attachment'); }
	});
	};

	// get contents of all dropped files
	var last = this.env.filedrop.single ? 0 : files.length - 1;
	for (var j=0, i=0, f; j <= last && (f = files[i]); i++) {
	if (!f.name) f.name = f.fileName;
	if (!f.size) f.size = f.fileSize;
	if (!f.type) f.type = 'application/octet-stream';

	// file name contains non-ASCII characters, do UTF8-binary string conversion.
	if (!formdata && /[^\x20-\x7E]/.test(f.name))
	f.name_bin = unescape(encodeURIComponent(f.name));

	// filter by file type if requested
	if (this.env.filedrop.filter && !f.type.match(new RegExp(this.env.filedrop.filter))) {
	// TODO: show message to user
	continue;
	}

	// do it the easy way with FormData (FF 4+, Chrome 5+, Safari 5+)
	if (formdata) {
	formdata.append(fieldname, f);
	if (j == last)
	return submit_data();
	}
	// use FileReader supporetd by Firefox 3.6
	else if (window.FileReader) {
	var reader = new FileReader();

	// closure to pass file properties to async callback function
	reader.onload = (function(file, j) {
	return function(e) {
	multipart += 'Content-Disposition: form-data; name="' + fieldname + '"';
	multipart += '; filename="' + (f.name_bin \|\| file.name) + '"' + crlf;
	multipart += 'Content-Length: ' + file.size + crlf;
	multipart += 'Content-Type: ' + file.type + crlf + crlf;
	multipart += e.target.result + crlf;
	multipart += dashdash + boundary + crlf;

	if (j == last) // we're done, submit the data
	return submit_data();
	}
	})(f,j);
	reader.readAsBinaryString(f);
	}
	// Firefox 3
	else if (f.getAsBinary) {
	multipart += 'Content-Disposition: form-data; name="' + fieldname + '"';
	multipart += '; filename="' + (f.name_bin \|\| f.name) + '"' + crlf;
	multipart += 'Content-Length: ' + f.size + crlf;
	multipart += 'Content-Type: ' + f.type + crlf + crlf;
	multipart += f.getAsBinary() + crlf;
	multipart += dashdash + boundary +crlf;

	if (j == last)
	return submit_data();
	}

	j++;
	}
	};

	// starts interval for keep-alive signal
	this.start_keepalive = function()
	{
	if (!this.env.session_lifetime \|\| this.env.framed \|\| this.env.extwin \|\| this.task == 'login' \|\| this.env.action == 'print')
	return;

	if (this._keepalive)
	clearInterval(this._keepalive);

	this._keepalive = setInterval(function(){ ref.keep_alive(); }, this.env.session_lifetime * 0.5 * 1000);
	};

	// starts interval for refresh signal
	this.start_refresh = function()
	{
	if (!this.env.refresh_interval \|\| this.env.framed \|\| this.env.extwin \|\| this.task == 'login' \|\| this.env.action == 'print')
	return;

	if (this._refresh)
	clearInterval(this._refresh);

	this._refresh = setInterval(function(){ ref.refresh(); }, this.env.refresh_interval * 1000);
	};

	// sends keep-alive signal
	this.keep_alive = function()
	{
	if (!this.busy)
	this.http_request('keep-alive');
	};

	// sends refresh signal
	this.refresh = function()
	{
	if (this.busy) {
	// try again after 10 seconds
	setTimeout(function(){ ref.refresh(); ref.start_refresh(); }, 10000);
	return;
	}

	var params = {}, lock = this.set_busy(true, 'refreshing');

	if (this.task == 'mail' && this.gui_objects.mailboxlist)
	params = this.check_recent_params();

	// plugins should bind to 'requestrefresh' event to add own params
	this.http_request('refresh', params, lock);
	};

	// returns check-recent request parameters
	this.check_recent_params = function()
	{
	var params = {_mbox: this.env.mailbox};

	if (this.gui_objects.mailboxlist)
	params._folderlist = 1;
	if (this.gui_objects.messagelist)
	params._list = 1;
	if (this.gui_objects.quotadisplay)
	params._quota = 1;
	if (this.env.search_request)
	params._search = this.env.search_request;

	return params;
	};


	/********************************************************/
	/******* helper methods *******/
	/********************************************************/

	// check if we're in show mode or if we have a unique selection
	// and return the message uid
	this.get_single_uid = function()
	{
	return this.env.uid ? this.env.uid : (this.message_list ? this.message_list.get_single_selection() : null);
	};

	// same as above but for contacts
	this.get_single_cid = function()
	{
	return this.env.cid ? this.env.cid : (this.contact_list ? this.contact_list.get_single_selection() : null);
	};

	// gets cursor position
	this.get_caret_pos = function(obj)
	{
	if (obj.selectionEnd !== undefined)
	return obj.selectionEnd;

	if (document.selection && document.selection.createRange) {
	var range = document.selection.createRange();
	if (range.parentElement() != obj)
	return 0;

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

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

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

	return obj.value.length;
	};

	// moves cursor to specified position
	this.set_caret_pos = function(obj, pos)
	{
	if (obj.setSelectionRange)
	obj.setSelectionRange(pos, pos);
	else if (obj.createTextRange) {
	var range = obj.createTextRange();
	range.collapse(true);
	range.moveEnd('character', pos);
	range.moveStart('character', pos);
	range.select();
	}
	};

	// disable/enable all fields of a form
	this.lock_form = function(form, lock)
	{
	if (!form \|\| !form.elements)
	return;

	var n, len, elm;

	if (lock)
	this.disabled_form_elements = [];

	for (n=0, len=form.elements.length; n<len; n++) {
	elm = form.elements[n];

	if (elm.type == 'hidden')
	continue;
	// remember which elem was disabled before lock
	if (lock && elm.disabled)
	this.disabled_form_elements.push(elm);
	// check this.disabled_form_elements before inArray() as a workaround for FF5 bug
	// http://bugs.jquery.com/ticket/9873
	else if (lock \|\| (this.disabled_form_elements && $.inArray(elm, this.disabled_form_elements)<0))
	elm.disabled = lock;
	}
	};

	this.mailto_handler_uri = function()
	{
	return location.href.split('?')[0] + '?_task=mail&_action=compose&_to=%s';
	};

	this.register_protocol_handler = function(name)
	{
	try {
	window.navigator.registerProtocolHandler('mailto', this.mailto_handler_uri(), name);
	}
	catch(e) {};
	};

	this.check_protocol_handler = function(name, elem)
	{
	var nav = window.navigator;
	if (!nav
	\|\| (typeof nav.registerProtocolHandler != 'function')
	\|\| ((typeof nav.isProtocolHandlerRegistered == 'function')
	&& nav.isProtocolHandlerRegistered('mailto', this.mailto_handler_uri()) == 'registered')
	)
	$(elem).addClass('disabled');
	else
	$(elem).click(function() { rcmail.register_protocol_handler(name); return false; });
	};

	// Checks browser capabilities eg. PDF support, TIF support
	this.browser_capabilities_check = function()
	{
	if (!this.env.browser_capabilities)
	this.env.browser_capabilities = {};

	if (this.env.browser_capabilities.pdf === undefined)
	this.env.browser_capabilities.pdf = this.pdf_support_check();

	if (this.env.browser_capabilities.flash === undefined)
	this.env.browser_capabilities.flash = this.flash_support_check();

	if (this.env.browser_capabilities.tif === undefined)
	this.tif_support_check();
	};

	// Returns browser capabilities string
	this.browser_capabilities = function()
	{
	if (!this.env.browser_capabilities)
	return '';

	var n, ret = [];

	for (n in this.env.browser_capabilities)
	ret.push(n + '=' + this.env.browser_capabilities[n]);

	return ret.join();
	};

	this.tif_support_check = function()
	{
	var img = new Image();

	img.onload = function() { rcmail.env.browser_capabilities.tif = 1; };
	img.onerror = function() { rcmail.env.browser_capabilities.tif = 0; };
	img.src = 'program/resources/blank.tif';
	};

	this.pdf_support_check = function()
	{
	var plugin = navigator.mimeTypes ? navigator.mimeTypes["application/pdf"] : {},
	plugins = navigator.plugins,
	len = plugins.length,
	regex = /Adobe Reader\|PDF\|Acrobat/i;

	if (plugin && plugin.enabledPlugin)
	return 1;

	if (window.ActiveXObject) {
	try {
	if (axObj = new ActiveXObject("AcroPDF.PDF"))
	return 1;
	}
	catch (e) {}
	try {
	if (axObj = new ActiveXObject("PDF.PdfCtrl"))
	return 1;
	}
	catch (e) {}
	}

	for (i=0; i<len; i++) {
	plugin = plugins[i];
	if (typeof plugin === 'String') {
	if (regex.test(plugin))
	return 1;
	}
	else if (plugin.name && regex.test(plugin.name))
	return 1;
	}

	return 0;
	};

	this.flash_support_check = function()
	{
	var plugin = navigator.mimeTypes ? navigator.mimeTypes["application/x-shockwave-flash"] : {};

	if (plugin && plugin.enabledPlugin)
	return 1;

	if (window.ActiveXObject) {
	try {
	if (axObj = new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))
	return 1;
	}
	catch (e) {}
	}

	return 0;
	};

	// Cookie setter
	this.set_cookie = function(name, value, expires)
	{
	setCookie(name, value, expires, this.env.cookie_path, this.env.cookie_domain, this.env.cookie_secure);
	}

	} // end object rcube_webmail


	// some static methods
	rcube_webmail.long_subject_title = function(elem, indent)
	{
	if (!elem.title) {
	var $elem = $(elem);
	if ($elem.width() + indent * 15 > $elem.parent().width())
	elem.title = $elem.html();
	}
	};

	rcube_webmail.long_subject_title_ie = function(elem, indent)
	{
	if (!elem.title) {
	var $elem = $(elem),
	txt = $.trim($elem.text()),
	tmp = $('<span>').text(txt)
	.css({'position': 'absolute', 'float': 'left', 'visibility': 'hidden',
	'font-size': $elem.css('font-size'), 'font-weight': $elem.css('font-weight')})
	.appendTo($('body')),
	w = tmp.width();

	tmp.remove();
	if (w + indent * 15 > $elem.width())
	elem.title = txt;
	}
	};

	rcube_webmail.prototype.get_cookie = getCookie;

	// copy event engine prototype
	rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;
	rcube_webmail.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener;
	rcube_webmail.prototype.triggerEvent = rcube_event_engine.prototype.triggerEvent;
	diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
	index a2495462a..ea3743d02 100644
	--- a/program/lib/Roundcube/rcube_imap.php
	+++ b/program/lib/Roundcube/rcube_imap.php
	@@ -1,4173 +1,4177 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_imap.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| Copyright (C) 2011-2012, Kolab Systems AG \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| IMAP Storage Engine \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Interface class for accessing an IMAP server
	*
	* @package Framework
	* @subpackage Storage
	* @author Thomas Bruederli <roundcube@gmail.com>
	* @author Aleksander Machniak <alec@alec.pl>
	*/
	class rcube_imap extends rcube_storage
	{
	/**
	* Instance of rcube_imap_generic
	*
	* @var rcube_imap_generic
	*/
	public $conn;

	/**
	* Instance of rcube_imap_cache
	*
	* @var rcube_imap_cache
	*/
	protected $mcache;

	/**
	* Instance of rcube_cache
	*
	* @var rcube_cache
	*/
	protected $cache;

	/**
	* Internal (in-memory) cache
	*
	* @var array
	*/
	protected $icache = array();

	protected $list_page = 1;
	protected $delimiter;
	protected $namespace;
	protected $sort_field = '';
	protected $sort_order = 'DESC';
	protected $struct_charset;
	protected $uid_id_map = array();
	protected $msg_headers = array();
	protected $search_set;
	protected $search_string = '';
	protected $search_charset = '';
	protected $search_sort_field = '';
	protected $search_threads = false;
	protected $search_sorted = false;
	protected $options = array('auth_method' => 'check');
	protected $caching = false;
	protected $messages_caching = false;
	protected $threading = false;


	/**
	* Object constructor.
	*/
	public function __construct()
	{
	$this->conn = new rcube_imap_generic();

	// Set namespace and delimiter from session,
	// so some methods would work before connection
	if (isset($_SESSION['imap_namespace'])) {
	$this->namespace = $_SESSION['imap_namespace'];
	}
	if (isset($_SESSION['imap_delimiter'])) {
	$this->delimiter = $_SESSION['imap_delimiter'];
	}
	}


	/**
	* Magic getter for backward compat.
	*
	* @deprecated.
	*/
	public function __get($name)
	{
	if (isset($this->{$name})) {
	return $this->{$name};
	}
	}


	/**
	* Connect to an IMAP server
	*
	* @param string $host Host to connect
	* @param string $user Username for IMAP account
	* @param string $pass Password for IMAP account
	* @param integer $port Port to connect to
	* @param string $use_ssl SSL schema (either ssl or tls) or null if plain connection
	*
	* @return boolean TRUE on success, FALSE on failure
	*/
	public function connect($host, $user, $pass, $port=143, $use_ssl=null)
	{
	// check for OpenSSL support in PHP build
	if ($use_ssl && extension_loaded('openssl')) {
	$this->options['ssl_mode'] = $use_ssl == 'imaps' ? 'ssl' : $use_ssl;
	}
	else if ($use_ssl) {
	rcube::raise_error(array('code' => 403, 'type' => 'imap',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "OpenSSL not available"), true, false);
	$port = 143;
	}

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

	if ($this->options['debug']) {
	$this->set_debug(true);

	$this->options['ident'] = array(
	'name' => 'Roundcube',
	'version' => RCUBE_VERSION,
	'php' => PHP_VERSION,
	'os' => PHP_OS,
	'command' => $_SERVER['REQUEST_URI'],
	);
	}

	$attempt = 0;
	do {
	- $data = rcube::get_instance()->plugins->exec_hook('imap_connect',
	+ $data = rcube::get_instance()->plugins->exec_hook('storage_connect',
	array_merge($this->options, array('host' => $host, 'user' => $user,
	'attempt' => ++$attempt)));

	if (!empty($data['pass'])) {
	$pass = $data['pass'];
	}

	$this->conn->connect($data['host'], $data['user'], $pass, $data);
	} while(!$this->conn->connected() && $data['retry']);

	$config = array(
	'host' => $data['host'],
	'user' => $data['user'],
	'password' => $pass,
	'port' => $port,
	'ssl' => $use_ssl,
	);

	$this->options = array_merge($this->options, $config);
	$this->connect_done = true;

	if ($this->conn->connected()) {
	// get namespace and delimiter
	$this->set_env();
	return true;
	}
	// write error log
	else if ($this->conn->error) {
	if ($pass && $user) {
	$message = sprintf("Login failed for %s from %s. %s",
	$user, rcube_utils::remote_ip(), $this->conn->error);

	rcube::raise_error(array('code' => 403, 'type' => 'imap',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => $message), true, false);
	}
	}

	return false;
	}


	/**
	* Close IMAP connection.
	* Usually done on script shutdown
	*/
	public function close()
	{
	$this->conn->closeConnection();
	if ($this->mcache) {
	$this->mcache->close();
	}
	}


	/**
	* Check connection state, connect if not connected.
	*
	* @return bool Connection state.
	*/
	public function check_connection()
	{
	// Establish connection if it wasn't done yet
	if (!$this->connect_done && !empty($this->options['user'])) {
	return $this->connect(
	$this->options['host'],
	$this->options['user'],
	$this->options['password'],
	$this->options['port'],
	$this->options['ssl']
	);
	}

	return $this->is_connected();
	}


	/**
	* Checks IMAP connection.
	*
	* @return boolean TRUE on success, FALSE on failure
	*/
	public function is_connected()
	{
	return $this->conn->connected();
	}


	/**
	* Returns code of last error
	*
	* @return int Error code
	*/
	public function get_error_code()
	{
	return $this->conn->errornum;
	}


	/**
	* Returns text of last error
	*
	* @return string Error string
	*/
	public function get_error_str()
	{
	return $this->conn->error;
	}


	/**
	* Returns code of last command response
	*
	* @return int Response code
	*/
	public function get_response_code()
	{
	switch ($this->conn->resultcode) {
	case 'NOPERM':
	return self::NOPERM;
	case 'READ-ONLY':
	return self::READONLY;
	case 'TRYCREATE':
	return self::TRYCREATE;
	case 'INUSE':
	return self::INUSE;
	case 'OVERQUOTA':
	return self::OVERQUOTA;
	case 'ALREADYEXISTS':
	return self::ALREADYEXISTS;
	case 'NONEXISTENT':
	return self::NONEXISTENT;
	case 'CONTACTADMIN':
	return self::CONTACTADMIN;
	default:
	return self::UNKNOWN;
	}
	}


	/**
	* Activate/deactivate debug mode
	*
	* @param boolean $dbg True if IMAP conversation should be logged
	*/
	public function set_debug($dbg = true)
	{
	$this->options['debug'] = $dbg;
	$this->conn->setDebug($dbg, array($this, 'debug_handler'));
	}


	/**
	* Set internal folder reference.
	* All operations will be perfomed on this folder.
	*
	* @param string $folder Folder name
	*/
	public function set_folder($folder)
	{
	if ($this->folder == $folder) {
	return;
	}

	$this->folder = $folder;

	// clear messagecount cache for this folder
	$this->clear_messagecount($folder);
	}


	/**
	* Save a search result for future message listing methods
	*
	* @param array $set Search set, result from rcube_imap::get_search_set():
	* 0 - searching criteria, string
	* 1 - search result, rcube_result_index\|rcube_result_thread
	* 2 - searching character set, string
	* 3 - sorting field, string
	* 4 - true if sorted, bool
	*/
	public function set_search_set($set)
	{
	$set = (array)$set;

	$this->search_string = $set[0];
	$this->search_set = $set[1];
	$this->search_charset = $set[2];
	$this->search_sort_field = $set[3];
	$this->search_sorted = $set[4];
	$this->search_threads = is_a($this->search_set, 'rcube_result_thread');
	}


	/**
	* Return the saved search set as hash array
	*
	* @return array Search set
	*/
	public function get_search_set()
	{
	if (empty($this->search_set)) {
	return null;
	}

	return array(
	$this->search_string,
	$this->search_set,
	$this->search_charset,
	$this->search_sort_field,
	$this->search_sorted,
	);
	}


	/**
	* Returns the IMAP server's capability.
	*
	* @param string $cap Capability name
	*
	* @return mixed Capability value or TRUE if supported, FALSE if not
	*/
	public function get_capability($cap)
	{
	$cap = strtoupper($cap);
	$sess_key = "STORAGE_$cap";

	if (!isset($_SESSION[$sess_key])) {
	if (!$this->check_connection()) {
	return false;
	}

	$_SESSION[$sess_key] = $this->conn->getCapability($cap);
	}

	return $_SESSION[$sess_key];
	}


	/**
	* Checks the PERMANENTFLAGS capability of the current folder
	* and returns true if the given flag is supported by the IMAP server
	*
	* @param string $flag Permanentflag name
	*
	* @return boolean True if this flag is supported
	*/
	public function check_permflag($flag)
	{
	$flag = strtoupper($flag);
	$imap_flag = $this->conn->flags[$flag];
	$perm_flags = $this->get_permflags($this->folder);

	return in_array_nocase($imap_flag, $perm_flags);
	}


	/**
	* Returns PERMANENTFLAGS of the specified folder
	*
	* @param string $folder Folder name
	*
	* @return array Flags
	*/
	public function get_permflags($folder)
	{
	if (!strlen($folder)) {
	return array();
	}
	/*
	Checking PERMANENTFLAGS is rather rare, so we disable caching of it
	Re-think when we'll use it for more than only MDNSENT flag

	$cache_key = 'mailboxes.permanentflags.' . $folder;
	$permflags = $this->get_cache($cache_key);

	if ($permflags !== null) {
	return explode(' ', $permflags);
	}
	*/
	if (!$this->check_connection()) {
	return array();
	}

	if ($this->conn->select($folder)) {
	$permflags = $this->conn->data['PERMANENTFLAGS'];
	}
	else {
	return array();
	}

	if (!is_array($permflags)) {
	$permflags = array();
	}
	/*
	// Store permflags as string to limit cached object size
	$this->update_cache($cache_key, implode(' ', $permflags));
	*/
	return $permflags;
	}


	/**
	* Returns the delimiter that is used by the IMAP server for folder separation
	*
	* @return string Delimiter string
	* @access public
	*/
	public function get_hierarchy_delimiter()
	{
	return $this->delimiter;
	}


	/**
	* Get namespace
	*
	* @param string $name Namespace array index: personal, other, shared, prefix
	*
	* @return array Namespace data
	*/
	public function get_namespace($name = null)
	{
	$ns = $this->namespace;

	if ($name) {
	return isset($ns[$name]) ? $ns[$name] : null;
	}

	unset($ns['prefix']);
	return $ns;
	}


	/**
	* Sets delimiter and namespaces
	*/
	protected function set_env()
	{
	if ($this->delimiter !== null && $this->namespace !== null) {
	return;
	}

	$config = rcube::get_instance()->config;
	$imap_personal = $config->get('imap_ns_personal');
	$imap_other = $config->get('imap_ns_other');
	$imap_shared = $config->get('imap_ns_shared');
	$imap_delimiter = $config->get('imap_delimiter');

	if (!$this->check_connection()) {
	return;
	}

	$ns = $this->conn->getNamespace();

	// Set namespaces (NAMESPACE supported)
	if (is_array($ns)) {
	$this->namespace = $ns;
	}
	else {
	$this->namespace = array(
	'personal' => NULL,
	'other' => NULL,
	'shared' => NULL,
	);
	}

	if ($imap_delimiter) {
	$this->delimiter = $imap_delimiter;
	}
	if (empty($this->delimiter)) {
	$this->delimiter = $this->namespace['personal'][0][1];
	}
	if (empty($this->delimiter)) {
	$this->delimiter = $this->conn->getHierarchyDelimiter();
	}
	if (empty($this->delimiter)) {
	$this->delimiter = '/';
	}

	// Overwrite namespaces
	if ($imap_personal !== null) {
	$this->namespace['personal'] = NULL;
	foreach ((array)$imap_personal as $dir) {
	$this->namespace['personal'][] = array($dir, $this->delimiter);
	}
	}
	if ($imap_other !== null) {
	$this->namespace['other'] = NULL;
	foreach ((array)$imap_other as $dir) {
	if ($dir) {
	$this->namespace['other'][] = array($dir, $this->delimiter);
	}
	}
	}
	if ($imap_shared !== null) {
	$this->namespace['shared'] = NULL;
	foreach ((array)$imap_shared as $dir) {
	if ($dir) {
	$this->namespace['shared'][] = array($dir, $this->delimiter);
	}
	}
	}

	// Find personal namespace prefix for mod_folder()
	// Prefix can be removed when there is only one personal namespace
	if (is_array($this->namespace['personal']) && count($this->namespace['personal']) == 1) {
	$this->namespace['prefix'] = $this->namespace['personal'][0][0];
	}

	$_SESSION['imap_namespace'] = $this->namespace;
	$_SESSION['imap_delimiter'] = $this->delimiter;
	}


	/**
	* Get message count for a specific folder
	*
	* @param string $folder Folder name
	- * @param string $mode Mode for count [ALL\|THREADS\|UNSEEN\|RECENT]
	+ * @param string $mode Mode for count [ALL\|THREADS\|UNSEEN\|RECENT\|EXISTS]
	* @param boolean $force Force reading from server and update cache
	* @param boolean $status Enables storing folder status info (max UID/count),
	* required for folder_status()
	*
	* @return int Number of messages
	*/
	public function count($folder='', $mode='ALL', $force=false, $status=true)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	return $this->countmessages($folder, $mode, $force, $status);
	}


	/**
	* protected method for getting nr of messages
	*
	* @param string $folder Folder name
	- * @param string $mode Mode for count [ALL\|THREADS\|UNSEEN\|RECENT]
	+ * @param string $mode Mode for count [ALL\|THREADS\|UNSEEN\|RECENT\|EXISTS]
	* @param boolean $force Force reading from server and update cache
	* @param boolean $status Enables storing folder status info (max UID/count),
	* required for folder_status()
	*
	* @return int Number of messages
	* @see rcube_imap::count()
	*/
	protected function countmessages($folder, $mode='ALL', $force=false, $status=true)
	{
	$mode = strtoupper($mode);

	// count search set, assume search set is always up-to-date (don't check $force flag)
	if ($this->search_string && $folder == $this->folder && ($mode == 'ALL' \|\| $mode == 'THREADS')) {
	if ($mode == 'ALL') {
	return $this->search_set->count_messages();
	}
	else {
	return $this->search_set->count();
	}
	}

	+ // EXISTS is a special alias for ALL, it allows to get the number
	+ // of all messages in a folder also when search is active and with
	+ // any skip_deleted setting
	+
	$a_folder_cache = $this->get_cache('messagecount');

	// return cached value
	if (!$force && is_array($a_folder_cache[$folder]) && isset($a_folder_cache[$folder][$mode])) {
	return $a_folder_cache[$folder][$mode];
	}

	if (!is_array($a_folder_cache[$folder])) {
	$a_folder_cache[$folder] = array();
	}

	if ($mode == 'THREADS') {
	$res = $this->fetch_threads($folder, $force);
	$count = $res->count();

	if ($status) {
	$msg_count = $res->count_messages();
	$this->set_folder_stats($folder, 'cnt', $msg_count);
	$this->set_folder_stats($folder, 'maxuid', $msg_count ? $this->id2uid($msg_count, $folder) : 0);
	}
	}
	// Need connection here
	else if (!$this->check_connection()) {
	return 0;
	}
	// RECENT count is fetched a bit different
	else if ($mode == 'RECENT') {
	$count = $this->conn->countRecent($folder);
	}
	// use SEARCH for message counting
	- else if (!empty($this->options['skip_deleted'])) {
	+ else if ($mode != 'EXISTS' && !empty($this->options['skip_deleted'])) {
	$search_str = "ALL UNDELETED";
	$keys = array('COUNT');

	if ($mode == 'UNSEEN') {
	$search_str .= " UNSEEN";
	}
	else {
	if ($this->messages_caching) {
	$keys[] = 'ALL';
	}
	if ($status) {
	$keys[] = 'MAX';
	}
	}

	// @TODO: if $force==false && $mode == 'ALL' we could try to use cache index here

	// get message count using (E)SEARCH
	// not very performant but more precise (using UNDELETED)
	$index = $this->conn->search($folder, $search_str, true, $keys);
	$count = $index->count();

	if ($mode == 'ALL') {
	// Cache index data, will be used in index_direct()
	$this->icache['undeleted_idx'] = $index;

	if ($status) {
	$this->set_folder_stats($folder, 'cnt', $count);
	$this->set_folder_stats($folder, 'maxuid', $index->max());
	}
	}
	}
	else {
	if ($mode == 'UNSEEN') {
	$count = $this->conn->countUnseen($folder);
	}
	else {
	$count = $this->conn->countMessages($folder);
	- if ($status) {
	- $this->set_folder_stats($folder,'cnt', $count);
	+ if ($status && $mode == 'ALL') {
	+ $this->set_folder_stats($folder, 'cnt', $count);
	$this->set_folder_stats($folder, 'maxuid', $count ? $this->id2uid($count, $folder) : 0);
	}
	}
	}

	$a_folder_cache[$folder][$mode] = (int)$count;

	// write back to cache
	$this->update_cache('messagecount', $a_folder_cache);

	return (int)$count;
	}


	/**
	* Public method for listing headers
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param string $sort_field Header field to sort by
	* @param string $sort_order Sort order [ASC\|DESC]
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	*/
	public function list_messages($folder='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	return $this->_list_messages($folder, $page, $sort_field, $sort_order, $slice);
	}


	/**
	* protected method for listing message headers
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param string $sort_field Header field to sort by
	* @param string $sort_order Sort order [ASC\|DESC]
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	* @see rcube_imap::list_messages
	*/
	protected function _list_messages($folder='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
	{
	if (!strlen($folder)) {
	return array();
	}

	$this->set_sort_order($sort_field, $sort_order);
	$page = $page ? $page : $this->list_page;

	// use saved message set
	if ($this->search_string && $folder == $this->folder) {
	return $this->list_search_messages($folder, $page, $slice);
	}

	if ($this->threading) {
	return $this->list_thread_messages($folder, $page, $slice);
	}

	// get UIDs of all messages in the folder, sorted
	$index = $this->index($folder, $this->sort_field, $this->sort_order);

	if ($index->is_empty()) {
	return array();
	}

	$from = ($page-1) * $this->page_size;
	$to = $from + $this->page_size;

	$index->slice($from, $to - $from);

	if ($slice) {
	$index->slice(-$slice, $slice);
	}

	// fetch reqested messages headers
	$a_index = $index->get();
	$a_msg_headers = $this->fetch_headers($folder, $a_index);

	return array_values($a_msg_headers);
	}


	/**
	* protected method for listing message headers using threads
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	* @see rcube_imap::list_messages
	*/
	protected function list_thread_messages($folder, $page, $slice=0)
	{
	// get all threads (not sorted)
	if ($mcache = $this->get_mcache_engine()) {
	$threads = $mcache->get_thread($folder);
	}
	else {
	$threads = $this->fetch_threads($folder);
	}

	return $this->fetch_thread_headers($folder, $threads, $page, $slice);
	}

	/**
	* Method for fetching threads data
	*
	* @param string $folder Folder name
	* @param bool $force Use IMAP server, no cache
	*
	* @return rcube_imap_thread Thread data object
	*/
	function fetch_threads($folder, $force = false)
	{
	if (!$force && ($mcache = $this->get_mcache_engine())) {
	// don't store in self's internal cache, cache has it's own internal cache
	return $mcache->get_thread($folder);
	}

	if (empty($this->icache['threads'])) {
	if (!$this->check_connection()) {
	return new rcube_result_thread();
	}

	// get all threads
	$result = $this->conn->thread($folder, $this->threading,
	$this->options['skip_deleted'] ? 'UNDELETED' : '', true);

	// add to internal (fast) cache
	$this->icache['threads'] = $result;
	}

	return $this->icache['threads'];
	}


	/**
	* protected method for fetching threaded messages headers
	*
	* @param string $folder Folder name
	* @param rcube_result_thread $threads Threads data object
	* @param int $page List page number
	* @param int $slice Number of threads to slice
	*
	* @return array Messages headers
	*/
	protected function fetch_thread_headers($folder, $threads, $page, $slice=0)
	{
	// Sort thread structure
	$this->sort_threads($threads);

	$from = ($page-1) * $this->page_size;
	$to = $from + $this->page_size;

	$threads->slice($from, $to - $from);

	if ($slice) {
	$threads->slice(-$slice, $slice);
	}

	// Get UIDs of all messages in all threads
	$a_index = $threads->get();

	// fetch reqested headers from server
	$a_msg_headers = $this->fetch_headers($folder, $a_index);

	unset($a_index);

	// Set depth, has_children and unread_children fields in headers
	$this->set_thread_flags($a_msg_headers, $threads);

	return array_values($a_msg_headers);
	}


	/**
	* protected method for setting threaded messages flags:
	* depth, has_children and unread_children
	*
	* @param array $headers Reference to headers array indexed by message UID
	* @param rcube_result_thread $threads Threads data object
	*
	* @return array Message headers array indexed by message UID
	*/
	protected function set_thread_flags(&$headers, $threads)
	{
	$parents = array();

	list ($msg_depth, $msg_children) = $threads->get_thread_data();

	foreach ($headers as $uid => $header) {
	$depth = $msg_depth[$uid];
	$parents = array_slice($parents, 0, $depth);

	if (!empty($parents)) {
	$headers[$uid]->parent_uid = end($parents);
	if (empty($header->flags['SEEN']))
	$headers[$parents[0]]->unread_children++;
	}
	array_push($parents, $uid);

	$headers[$uid]->depth = $depth;
	$headers[$uid]->has_children = $msg_children[$uid];
	}
	}


	/**
	* protected method for listing a set of message headers (search results)
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	*/
	protected function list_search_messages($folder, $page, $slice=0)
	{
	if (!strlen($folder) \|\| empty($this->search_set) \|\| $this->search_set->is_empty()) {
	return array();
	}

	// use saved messages from searching
	if ($this->threading) {
	return $this->list_search_thread_messages($folder, $page, $slice);
	}

	// search set is threaded, we need a new one
	if ($this->search_threads) {
	$this->search('', $this->search_string, $this->search_charset, $this->sort_field);
	}

	$index = clone $this->search_set;
	$from = ($page-1) * $this->page_size;
	$to = $from + $this->page_size;

	// return empty array if no messages found
	if ($index->is_empty()) {
	return array();
	}

	// quickest method (default sorting)
	if (!$this->search_sort_field && !$this->sort_field) {
	$got_index = true;
	}
	// sorted messages, so we can first slice array and then fetch only wanted headers
	else if ($this->search_sorted) { // SORT searching result
	$got_index = true;
	// reset search set if sorting field has been changed
	if ($this->sort_field && $this->search_sort_field != $this->sort_field) {
	$this->search('', $this->search_string, $this->search_charset, $this->sort_field);

	$index = clone $this->search_set;

	// return empty array if no messages found
	if ($index->is_empty()) {
	return array();
	}
	}
	}

	if ($got_index) {
	if ($this->sort_order != $index->get_parameters('ORDER')) {
	$index->revert();
	}

	// get messages uids for one page
	$index->slice($from, $to-$from);

	if ($slice) {
	$index->slice(-$slice, $slice);
	}

	// fetch headers
	$a_index = $index->get();
	$a_msg_headers = $this->fetch_headers($folder, $a_index);

	return array_values($a_msg_headers);
	}

	// SEARCH result, need sorting
	$cnt = $index->count();

	// 300: experimantal value for best result
	if (($cnt > 300 && $cnt > $this->page_size) \|\| !$this->sort_field) {
	// use memory less expensive (and quick) method for big result set
	$index = clone $this->index('', $this->sort_field, $this->sort_order);
	// get messages uids for one page...
	$index->slice($start_msg, min($cnt-$from, $this->page_size));

	if ($slice) {
	$index->slice(-$slice, $slice);
	}

	// ...and fetch headers
	$a_index = $index->get();
	$a_msg_headers = $this->fetch_headers($folder, $a_index);

	return array_values($a_msg_headers);
	}
	else {
	// for small result set we can fetch all messages headers
	$a_index = $index->get();
	$a_msg_headers = $this->fetch_headers($folder, $a_index, false);

	// return empty array if no messages found
	if (!is_array($a_msg_headers) \|\| empty($a_msg_headers)) {
	return array();
	}

	if (!$this->check_connection()) {
	return array();
	}

	// if not already sorted
	$a_msg_headers = $this->conn->sortHeaders(
	$a_msg_headers, $this->sort_field, $this->sort_order);

	// only return the requested part of the set
	$slice_length = min($this->page_size, $cnt - ($to > $cnt ? $from : $to));
	$a_msg_headers = array_slice(array_values($a_msg_headers), $from, $slice_length);

	if ($slice) {
	$a_msg_headers = array_slice($a_msg_headers, -$slice, $slice);
	}

	return $a_msg_headers;
	}
	}


	/**
	* protected method for listing a set of threaded message headers (search results)
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	* @see rcube_imap::list_search_messages()
	*/
	protected function list_search_thread_messages($folder, $page, $slice=0)
	{
	// update search_set if previous data was fetched with disabled threading
	if (!$this->search_threads) {
	if ($this->search_set->is_empty()) {
	return array();
	}
	$this->search('', $this->search_string, $this->search_charset, $this->sort_field);
	}

	return $this->fetch_thread_headers($folder, clone $this->search_set, $page, $slice);
	}


	/**
	* Fetches messages headers (by UID)
	*
	* @param string $folder Folder name
	* @param array $msgs Message UIDs
	* @param bool $sort Enables result sorting by $msgs
	* @param bool $force Disables cache use
	*
	* @return array Messages headers indexed by UID
	*/
	function fetch_headers($folder, $msgs, $sort = true, $force = false)
	{
	if (empty($msgs)) {
	return array();
	}

	if (!$force && ($mcache = $this->get_mcache_engine())) {
	$headers = $mcache->get_messages($folder, $msgs);
	}
	else if (!$this->check_connection()) {
	return array();
	}
	else {
	// fetch reqested headers from server
	$headers = $this->conn->fetchHeaders(
	$folder, $msgs, true, false, $this->get_fetch_headers());
	}

	if (empty($headers)) {
	return array();
	}

	foreach ($headers as $h) {
	$a_msg_headers[$h->uid] = $h;
	}

	if ($sort) {
	// use this class for message sorting
	$sorter = new rcube_message_header_sorter();
	$sorter->set_index($msgs);
	$sorter->sort_headers($a_msg_headers);
	}

	return $a_msg_headers;
	}


	/**
	* Returns current status of folder
	*
	* We compare the maximum UID to determine the number of
	* new messages because the RECENT flag is not reliable.
	*
	* @param string $folder Folder name
	*
	* @return int Folder status
	*/
	public function folder_status($folder = null)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}
	$old = $this->get_folder_stats($folder);

	// refresh message count -> will update
	$this->countmessages($folder, 'ALL', true);

	$result = 0;

	if (empty($old)) {
	return $result;
	}

	$new = $this->get_folder_stats($folder);

	// got new messages
	if ($new['maxuid'] > $old['maxuid']) {
	$result += 1;
	}
	// some messages has been deleted
	if ($new['cnt'] < $old['cnt']) {
	$result += 2;
	}

	// @TODO: optional checking for messages flags changes (?)
	// @TODO: UIDVALIDITY checking

	return $result;
	}


	/**
	* Stores folder statistic data in session
	* @TODO: move to separate DB table (cache?)
	*
	* @param string $folder Folder name
	* @param string $name Data name
	* @param mixed $data Data value
	*/
	protected function set_folder_stats($folder, $name, $data)
	{
	$_SESSION['folders'][$folder][$name] = $data;
	}


	/**
	* Gets folder statistic data
	*
	* @param string $folder Folder name
	*
	* @return array Stats data
	*/
	protected function get_folder_stats($folder)
	{
	if ($_SESSION['folders'][$folder]) {
	return (array) $_SESSION['folders'][$folder];
	}

	return array();
	}


	/**
	* Return sorted list of message UIDs
	*
	* @param string $folder Folder to get index from
	* @param string $sort_field Sort column
	* @param string $sort_order Sort order [ASC, DESC]
	*
	* @return rcube_result_index\|rcube_result_thread List of messages (UIDs)
	*/
	public function index($folder = '', $sort_field = NULL, $sort_order = NULL)
	{
	if ($this->threading) {
	return $this->thread_index($folder, $sort_field, $sort_order);
	}

	$this->set_sort_order($sort_field, $sort_order);

	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	// we have a saved search result, get index from there
	if ($this->search_string) {
	if ($this->search_threads) {
	$this->search($folder, $this->search_string, $this->search_charset, $this->sort_field);
	}

	// use message index sort as default sorting
	if (!$this->sort_field \|\| $this->search_sorted) {
	if ($this->sort_field && $this->search_sort_field != $this->sort_field) {
	$this->search($folder, $this->search_string, $this->search_charset, $this->sort_field);
	}
	$index = $this->search_set;
	}
	else if (!$this->check_connection()) {
	return new rcube_result_index();
	}
	else {
	$index = $this->conn->index($folder, $this->search_set->get(),
	$this->sort_field, $this->options['skip_deleted'], true, true);
	}

	if ($this->sort_order != $index->get_parameters('ORDER')) {
	$index->revert();
	}

	return $index;
	}

	// check local cache
	if ($mcache = $this->get_mcache_engine()) {
	$index = $mcache->get_index($folder, $this->sort_field, $this->sort_order);
	}
	// fetch from IMAP server
	else {
	$index = $this->index_direct(
	$folder, $this->sort_field, $this->sort_order);
	}

	return $index;
	}


	/**
	* Return sorted list of message UIDs ignoring current search settings.
	* Doesn't uses cache by default.
	*
	* @param string $folder Folder to get index from
	* @param string $sort_field Sort column
	* @param string $sort_order Sort order [ASC, DESC]
	* @param bool $skip_cache Disables cache usage
	*
	* @return rcube_result_index Sorted list of message UIDs
	*/
	public function index_direct($folder, $sort_field = null, $sort_order = null, $skip_cache = true)
	{
	if (!$skip_cache && ($mcache = $this->get_mcache_engine())) {
	$index = $mcache->get_index($folder, $sort_field, $sort_order);
	}
	// use message index sort as default sorting
	else if (!$sort_field) {
	// use search result from count() if possible
	if ($this->options['skip_deleted'] && !empty($this->icache['undeleted_idx'])
	&& $this->icache['undeleted_idx']->get_parameters('ALL') !== null
	&& $this->icache['undeleted_idx']->get_parameters('MAILBOX') == $folder
	) {
	$index = $this->icache['undeleted_idx'];
	}
	else if (!$this->check_connection()) {
	return new rcube_result_index();
	}
	else {
	$index = $this->conn->search($folder,
	'ALL' .($this->options['skip_deleted'] ? ' UNDELETED' : ''), true);
	}
	}
	else if (!$this->check_connection()) {
	return new rcube_result_index();
	}
	// fetch complete message index
	else {
	if ($this->get_capability('SORT')) {
	$index = $this->conn->sort($folder, $sort_field,
	$this->options['skip_deleted'] ? 'UNDELETED' : '', true);
	}

	if (empty($index) \|\| $index->is_error()) {
	$index = $this->conn->index($folder, "1:*", $sort_field,
	$this->options['skip_deleted'], false, true);
	}
	}

	if ($sort_order != $index->get_parameters('ORDER')) {
	$index->revert();
	}

	return $index;
	}


	/**
	* Return index of threaded message UIDs
	*
	* @param string $folder Folder to get index from
	* @param string $sort_field Sort column
	* @param string $sort_order Sort order [ASC, DESC]
	*
	* @return rcube_result_thread Message UIDs
	*/
	public function thread_index($folder='', $sort_field=NULL, $sort_order=NULL)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	// we have a saved search result, get index from there
	if ($this->search_string && $this->search_threads && $folder == $this->folder) {
	$threads = $this->search_set;
	}
	else {
	// get all threads (default sort order)
	$threads = $this->fetch_threads($folder);
	}

	$this->set_sort_order($sort_field, $sort_order);
	$this->sort_threads($threads);

	return $threads;
	}


	/**
	* Sort threaded result, using THREAD=REFS method
	*
	* @param rcube_result_thread $threads Threads result set
	*/
	protected function sort_threads($threads)
	{
	if ($threads->is_empty()) {
	return;
	}

	// THREAD=ORDEREDSUBJECT: sorting by sent date of root message
	// THREAD=REFERENCES: sorting by sent date of root message
	// THREAD=REFS: sorting by the most recent date in each thread

	if ($this->sort_field && ($this->sort_field != 'date' \|\| $this->get_capability('THREAD') != 'REFS')) {
	$index = $this->index_direct($this->folder, $this->sort_field, $this->sort_order, false);

	if (!$index->is_empty()) {
	$threads->sort($index);
	}
	}
	else {
	if ($this->sort_order != $threads->get_parameters('ORDER')) {
	$threads->revert();
	}
	}
	}


	/**
	* Invoke search request to IMAP server
	*
	* @param string $folder Folder name to search in
	* @param string $str Search criteria
	* @param string $charset Search charset
	* @param string $sort_field Header field to sort by
	*
	* @todo: Search criteria should be provided in non-IMAP format, eg. array
	*/
	public function search($folder='', $str='ALL', $charset=NULL, $sort_field=NULL)
	{
	if (!$str) {
	$str = 'ALL';
	}

	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	$results = $this->search_index($folder, $str, $charset, $sort_field);

	$this->set_search_set(array($str, $results, $charset, $sort_field,
	$this->threading \|\| $this->search_sorted ? true : false));
	}


	/**
	* Direct (real and simple) SEARCH request (without result sorting and caching).
	*
	* @param string $mailbox Mailbox name to search in
	* @param string $str Search string
	*
	* @return rcube_result_index Search result (UIDs)
	*/
	public function search_once($folder = null, $str = 'ALL')
	{
	if (!$str) {
	return 'ALL';
	}

	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	if (!$this->check_connection()) {
	return new rcube_result_index();
	}

	$index = $this->conn->search($folder, $str, true);

	return $index;
	}


	/**
	* protected search method
	*
	* @param string $folder Folder name
	* @param string $criteria Search criteria
	* @param string $charset Charset
	* @param string $sort_field Sorting field
	*
	* @return rcube_result_index\|rcube_result_thread Search results (UIDs)
	* @see rcube_imap::search()
	*/
	protected function search_index($folder, $criteria='ALL', $charset=NULL, $sort_field=NULL)
	{
	$orig_criteria = $criteria;

	if (!$this->check_connection()) {
	if ($this->threading) {
	return new rcube_result_thread();
	}
	else {
	return new rcube_result_index();
	}
	}

	if ($this->options['skip_deleted'] && !preg_match('/UNDELETED/', $criteria)) {
	$criteria = 'UNDELETED '.$criteria;
	}

	// unset CHARSET if criteria string is ASCII, this way
	// SEARCH won't be re-sent after "unsupported charset" response
	if ($charset && $charset != 'US-ASCII' && is_ascii($criteria)) {
	$charset = 'US-ASCII';
	}

	if ($this->threading) {
	$threads = $this->conn->thread($folder, $this->threading, $criteria, true, $charset);

	// Error, try with US-ASCII (RFC5256: SORT/THREAD must support US-ASCII and UTF-8,
	// but I've seen that Courier doesn't support UTF-8)
	if ($threads->is_error() && $charset && $charset != 'US-ASCII') {
	$threads = $this->conn->thread($folder, $this->threading,
	$this->convert_criteria($criteria, $charset), true, 'US-ASCII');
	}

	return $threads;
	}

	if ($sort_field && $this->get_capability('SORT')) {
	$charset = $charset ? $charset : $this->default_charset;
	$messages = $this->conn->sort($folder, $sort_field, $criteria, true, $charset);

	// Error, try with US-ASCII (RFC5256: SORT/THREAD must support US-ASCII and UTF-8,
	// but I've seen Courier with disabled UTF-8 support)
	if ($messages->is_error() && $charset && $charset != 'US-ASCII') {
	$messages = $this->conn->sort($folder, $sort_field,
	$this->convert_criteria($criteria, $charset), true, 'US-ASCII');
	}

	if (!$messages->is_error()) {
	$this->search_sorted = true;
	return $messages;
	}
	}

	$messages = $this->conn->search($folder,
	($charset && $charset != 'US-ASCII' ? "CHARSET $charset " : '') . $criteria, true);

	// Error, try with US-ASCII (some servers may support only US-ASCII)
	if ($messages->is_error() && $charset && $charset != 'US-ASCII') {
	$messages = $this->conn->search($folder,
	$this->convert_criteria($criteria, $charset), true);
	}

	$this->search_sorted = false;

	return $messages;
	}


	/**
	* Converts charset of search criteria string
	*
	* @param string $str Search string
	* @param string $charset Original charset
	* @param string $dest_charset Destination charset (default US-ASCII)
	*
	* @return string Search string
	*/
	protected function convert_criteria($str, $charset, $dest_charset='US-ASCII')
	{
	// convert strings to US_ASCII
	if (preg_match_all('/\{([0-9]+)\}\r\n/', $str, $matches, PREG_OFFSET_CAPTURE)) {
	$last = 0; $res = '';
	foreach ($matches[1] as $m) {
	$string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n
	$string = substr($str, $string_offset - 1, $m[0]);
	$string = rcube_charset::convert($string, $charset, $dest_charset);
	if ($string === false) {
	continue;
	}
	$res .= substr($str, $last, $m[1] - $last - 1) . rcube_imap_generic::escape($string);
	$last = $m[0] + $string_offset - 1;
	}
	if ($last < strlen($str)) {
	$res .= substr($str, $last, strlen($str)-$last);
	}
	}
	// strings for conversion not found
	else {
	$res = $str;
	}

	return $res;
	}


	/**
	* Refresh saved search set
	*
	* @return array Current search set
	*/
	public function refresh_search()
	{
	if (!empty($this->search_string)) {
	$this->search('', $this->search_string, $this->search_charset, $this->search_sort_field);
	}

	return $this->get_search_set();
	}


	/**
	* Return message headers object of a specific message
	*
	* @param int $id Message UID
	* @param string $folder Folder to read from
	* @param bool $force True to skip cache
	*
	* @return rcube_message_header Message headers
	*/
	public function get_message_headers($uid, $folder = null, $force = false)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	// get cached headers
	if (!$force && $uid && ($mcache = $this->get_mcache_engine())) {
	$headers = $mcache->get_message($folder, $uid);
	}
	else if (!$this->check_connection()) {
	$headers = false;
	}
	else {
	$headers = $this->conn->fetchHeader(
	$folder, $uid, true, true, $this->get_fetch_headers());
	}

	return $headers;
	}


	/**
	* Fetch message headers and body structure from the IMAP server and build
	* an object structure similar to the one generated by PEAR::Mail_mimeDecode
	*
	* @param int $uid Message UID to fetch
	* @param string $folder Folder to read from
	*
	* @return object rcube_message_header Message data
	*/
	public function get_message($uid, $folder = null)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	// Check internal cache
	if (!empty($this->icache['message'])) {
	if (($headers = $this->icache['message']) && $headers->uid == $uid) {
	return $headers;
	}
	}

	$headers = $this->get_message_headers($uid, $folder);

	// message doesn't exist?
	if (empty($headers)) {
	return null;
	}

	// structure might be cached
	if (!empty($headers->structure)) {
	return $headers;
	}

	$this->msg_uid = $uid;

	if (!$this->check_connection()) {
	return $headers;
	}

	if (empty($headers->bodystructure)) {
	$headers->bodystructure = $this->conn->getStructure($folder, $uid, true);
	}

	$structure = $headers->bodystructure;

	if (empty($structure)) {
	return $headers;
	}

	// set message charset from message headers
	if ($headers->charset) {
	$this->struct_charset = $headers->charset;
	}
	else {
	$this->struct_charset = $this->structure_charset($structure);
	}

	$headers->ctype = strtolower($headers->ctype);

	// Here we can recognize malformed BODYSTRUCTURE and
	// 1. [@TODO] parse the message in other way to create our own message structure
	// 2. or just show the raw message body.
	// Example of structure for malformed MIME message:
	// ("text" "plain" NIL NIL NIL "7bit" 2154 70 NIL NIL NIL)
	if ($headers->ctype && !is_array($structure[0]) && $headers->ctype != 'text/plain'
	&& strtolower($structure[0].'/'.$structure[1]) == 'text/plain') {
	// we can handle single-part messages, by simple fix in structure (#1486898)
	if (preg_match('/^(text\|application)\/(.*)/', $headers->ctype, $m)) {
	$structure[0] = $m[1];
	$structure[1] = $m[2];
	}
	else {
	// Try to parse the message using Mail_mimeDecode package
	// We need a better solution, Mail_mimeDecode parses message
	// in memory, which wouldn't work for very big messages,
	// (it uses up to 10x more memory than the message size)
	// it's also buggy and not actively developed
	if ($headers->size && rcube_utils::mem_check($headers->size * 10)) {
	$raw_msg = $this->get_raw_body($uid);
	$struct = rcube_mime::parse_message($raw_msg);
	}
	else {
	return $headers;
	}
	}
	}

	if (empty($struct)) {
	$struct = $this->structure_part($structure, 0, '', $headers);
	}

	// don't trust given content-type
	if (empty($struct->parts) && !empty($headers->ctype)) {
	$struct->mime_id = '1';
	$struct->mimetype = strtolower($headers->ctype);
	list($struct->ctype_primary, $struct->ctype_secondary) = explode('/', $struct->mimetype);
	}

	$headers->structure = $struct;

	return $this->icache['message'] = $headers;
	}


	/**
	* Build message part object
	*
	* @param array $part
	* @param int $count
	* @param string $parent
	*/
	protected function structure_part($part, $count=0, $parent='', $mime_headers=null)
	{
	$struct = new rcube_message_part;
	$struct->mime_id = empty($parent) ? (string)$count : "$parent.$count";

	// multipart
	if (is_array($part[0])) {
	$struct->ctype_primary = 'multipart';

	/* RFC3501: BODYSTRUCTURE fields of multipart part
	part1 array
	part2 array
	part3 array
	....
	1. subtype
	2. parameters (optional)
	3. description (optional)
	4. language (optional)
	5. location (optional)
	*/

	// find first non-array entry
	for ($i=1; $i<count($part); $i++) {
	if (!is_array($part[$i])) {
	$struct->ctype_secondary = strtolower($part[$i]);
	break;
	}
	}

	$struct->mimetype = 'multipart/'.$struct->ctype_secondary;

	// build parts list for headers pre-fetching
	for ($i=0; $i<count($part); $i++) {
	if (!is_array($part[$i])) {
	break;
	}
	// fetch message headers if message/rfc822
	// or named part (could contain Content-Location header)
	if (!is_array($part[$i][0])) {
	$tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
	if (strtolower($part[$i][0]) == 'message' && strtolower($part[$i][1]) == 'rfc822') {
	$mime_part_headers[] = $tmp_part_id;
	}
	else if (in_array('name', (array)$part[$i][2]) && empty($part[$i][3])) {
	$mime_part_headers[] = $tmp_part_id;
	}
	}
	}

	// pre-fetch headers of all parts (in one command for better performance)
	// @TODO: we could do this before _structure_part() call, to fetch
	// headers for parts on all levels
	if ($mime_part_headers) {
	$mime_part_headers = $this->conn->fetchMIMEHeaders($this->folder,
	$this->msg_uid, $mime_part_headers);
	}

	$struct->parts = array();
	for ($i=0, $count=0; $i<count($part); $i++) {
	if (!is_array($part[$i])) {
	break;
	}
	$tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
	$struct->parts[] = $this->structure_part($part[$i], ++$count, $struct->mime_id,
	$mime_part_headers[$tmp_part_id]);
	}

	return $struct;
	}

	/* RFC3501: BODYSTRUCTURE fields of non-multipart part
	0. type
	1. subtype
	2. parameters
	3. id
	4. description
	5. encoding
	6. size
	-- text
	7. lines
	-- message/rfc822
	7. envelope structure
	8. body structure
	9. lines
	--
	x. md5 (optional)
	x. disposition (optional)
	x. language (optional)
	x. location (optional)
	*/

	// regular part
	$struct->ctype_primary = strtolower($part[0]);
	$struct->ctype_secondary = strtolower($part[1]);
	$struct->mimetype = $struct->ctype_primary.'/'.$struct->ctype_secondary;

	// read content type parameters
	if (is_array($part[2])) {
	$struct->ctype_parameters = array();
	for ($i=0; $i<count($part[2]); $i+=2) {
	$struct->ctype_parameters[strtolower($part[2][$i])] = $part[2][$i+1];
	}

	if (isset($struct->ctype_parameters['charset'])) {
	$struct->charset = $struct->ctype_parameters['charset'];
	}
	}

	// #1487700: workaround for lack of charset in malformed structure
	if (empty($struct->charset) && !empty($mime_headers) && $mime_headers->charset) {
	$struct->charset = $mime_headers->charset;
	}

	// read content encoding
	if (!empty($part[5])) {
	$struct->encoding = strtolower($part[5]);
	$struct->headers['content-transfer-encoding'] = $struct->encoding;
	}

	// get part size
	if (!empty($part[6])) {
	$struct->size = intval($part[6]);
	}

	// read part disposition
	$di = 8;
	if ($struct->ctype_primary == 'text') {
	$di += 1;
	}
	else if ($struct->mimetype == 'message/rfc822') {
	$di += 3;
	}

	if (is_array($part[$di]) && count($part[$di]) == 2) {
	$struct->disposition = strtolower($part[$di][0]);

	if (is_array($part[$di][1])) {
	for ($n=0; $n<count($part[$di][1]); $n+=2) {
	$struct->d_parameters[strtolower($part[$di][1][$n])] = $part[$di][1][$n+1];
	}
	}
	}

	// get message/rfc822's child-parts
	if (is_array($part[8]) && $di != 8) {
	$struct->parts = array();
	for ($i=0, $count=0; $i<count($part[8]); $i++) {
	if (!is_array($part[8][$i])) {
	break;
	}
	$struct->parts[] = $this->structure_part($part[8][$i], ++$count, $struct->mime_id);
	}
	}

	// get part ID
	if (!empty($part[3])) {
	$struct->content_id = $part[3];
	$struct->headers['content-id'] = $part[3];

	if (empty($struct->disposition)) {
	$struct->disposition = 'inline';
	}
	}

	// fetch message headers if message/rfc822 or named part (could contain Content-Location header)
	if ($struct->ctype_primary == 'message' \|\| ($struct->ctype_parameters['name'] && !$struct->content_id)) {
	if (empty($mime_headers)) {
	$mime_headers = $this->conn->fetchPartHeader(
	$this->folder, $this->msg_uid, true, $struct->mime_id);
	}

	if (is_string($mime_headers)) {
	$struct->headers = rcube_mime::parse_headers($mime_headers) + $struct->headers;
	}
	else if (is_object($mime_headers)) {
	$struct->headers = get_object_vars($mime_headers) + $struct->headers;
	}

	// get real content-type of message/rfc822
	if ($struct->mimetype == 'message/rfc822') {
	// single-part
	if (!is_array($part[8][0])) {
	$struct->real_mimetype = strtolower($part[8][0] . '/' . $part[8][1]);
	}
	// multi-part
	else {
	for ($n=0; $n<count($part[8]); $n++) {
	if (!is_array($part[8][$n])) {
	break;
	}
	}
	$struct->real_mimetype = 'multipart/' . strtolower($part[8][$n]);
	}
	}

	if ($struct->ctype_primary == 'message' && empty($struct->parts)) {
	if (is_array($part[8]) && $di != 8) {
	$struct->parts[] = $this->structure_part($part[8], ++$count, $struct->mime_id);
	}
	}
	}

	// normalize filename property
	$this->set_part_filename($struct, $mime_headers);

	return $struct;
	}


	/**
	* Set attachment filename from message part structure
	*
	* @param rcube_message_part $part Part object
	* @param string $headers Part's raw headers
	*/
	protected function set_part_filename(&$part, $headers=null)
	{
	if (!empty($part->d_parameters['filename'])) {
	$filename_mime = $part->d_parameters['filename'];
	}
	else if (!empty($part->d_parameters['filename*'])) {
	$filename_encoded = $part->d_parameters['filename*'];
	}
	else if (!empty($part->ctype_parameters['name*'])) {
	$filename_encoded = $part->ctype_parameters['name*'];
	}
	// RFC2231 value continuations
	// TODO: this should be rewrited to support RFC2231 4.1 combinations
	else if (!empty($part->d_parameters['filename*0'])) {
	$i = 0;
	while (isset($part->d_parameters['filename*'.$i])) {
	$filename_mime .= $part->d_parameters['filename*'.$i];
	$i++;
	}
	// some servers (eg. dovecot-1.x) have no support for parameter value continuations
	// we must fetch and parse headers "manually"
	if ($i<2) {
	if (!$headers) {
	$headers = $this->conn->fetchPartHeader(
	$this->folder, $this->msg_uid, true, $part->mime_id);
	}
	$filename_mime = '';
	$i = 0;
	while (preg_match('/filename\'.$i.'\s=\s"([^"\n;]+)[";]*/', $headers, $matches)) {
	$filename_mime .= $matches[1];
	$i++;
	}
	}
	}
	else if (!empty($part->d_parameters['filename0'])) {
	$i = 0;
	while (isset($part->d_parameters['filename'.$i.''])) {
	$filename_encoded .= $part->d_parameters['filename'.$i.''];
	$i++;
	}
	if ($i<2) {
	if (!$headers) {
	$headers = $this->conn->fetchPartHeader(
	$this->folder, $this->msg_uid, true, $part->mime_id);
	}
	$filename_encoded = '';
	$i = 0; $matches = array();
	while (preg_match('/filename\'.$i.'\\s=\s"([^"\n;]+)[";]/', $headers, $matches)) {
	$filename_encoded .= $matches[1];
	$i++;
	}
	}
	}
	else if (!empty($part->ctype_parameters['name*0'])) {
	$i = 0;
	while (isset($part->ctype_parameters['name*'.$i])) {
	$filename_mime .= $part->ctype_parameters['name*'.$i];
	$i++;
	}
	if ($i<2) {
	if (!$headers) {
	$headers = $this->conn->fetchPartHeader(
	$this->folder, $this->msg_uid, true, $part->mime_id);
	}
	$filename_mime = '';
	$i = 0; $matches = array();
	while (preg_match('/\s+name\'.$i.'\s=\s"([^"\n;]+)[";]*/', $headers, $matches)) {
	$filename_mime .= $matches[1];
	$i++;
	}
	}
	}
	else if (!empty($part->ctype_parameters['name0'])) {
	$i = 0;
	while (isset($part->ctype_parameters['name'.$i.''])) {
	$filename_encoded .= $part->ctype_parameters['name'.$i.''];
	$i++;
	}
	if ($i<2) {
	if (!$headers) {
	$headers = $this->conn->fetchPartHeader(
	$this->folder, $this->msg_uid, true, $part->mime_id);
	}
	$filename_encoded = '';
	$i = 0; $matches = array();
	while (preg_match('/\s+name\'.$i.'\\s=\s"([^"\n;]+)[";]/', $headers, $matches)) {
	$filename_encoded .= $matches[1];
	$i++;
	}
	}
	}
	// read 'name' after rfc2231 parameters as it may contains truncated filename (from Thunderbird)
	else if (!empty($part->ctype_parameters['name'])) {
	$filename_mime = $part->ctype_parameters['name'];
	}
	// Content-Disposition
	else if (!empty($part->headers['content-description'])) {
	$filename_mime = $part->headers['content-description'];
	}
	else {
	return;
	}

	// decode filename
	if (!empty($filename_mime)) {
	if (!empty($part->charset)) {
	$charset = $part->charset;
	}
	else if (!empty($this->struct_charset)) {
	$charset = $this->struct_charset;
	}
	else {
	$charset = rcube_charset::detect($filename_mime, $this->default_charset);
	}

	$part->filename = rcube_mime::decode_mime_string($filename_mime, $charset);
	}
	else if (!empty($filename_encoded)) {
	// decode filename according to RFC 2231, Section 4
	if (preg_match("/^([^'])'[^']'(.*)$/", $filename_encoded, $fmatches)) {
	$filename_charset = $fmatches[1];
	$filename_encoded = $fmatches[2];
	}

	$part->filename = rcube_charset::convert(urldecode($filename_encoded), $filename_charset);
	}
	}


	/**
	* Get charset name from message structure (first part)
	*
	* @param array $structure Message structure
	*
	* @return string Charset name
	*/
	protected function structure_charset($structure)
	{
	while (is_array($structure)) {
	if (is_array($structure[2]) && $structure[2][0] == 'charset') {
	return $structure[2][1];
	}
	$structure = $structure[0];
	}
	}


	/**
	* Fetch message body of a specific message from the server
	*
	* @param int $uid Message UID
	* @param string $part Part number
	* @param rcube_message_part $o_part Part object created by get_structure()
	* @param mixed $print True to print part, ressource to write part contents in
	* @param resource $fp File pointer to save the message part
	* @param boolean $skip_charset_conv Disables charset conversion
	* @param int $max_bytes Only read this number of bytes
	*
	* @return string Message/part body if not printed
	*/
	public function get_message_part($uid, $part=1, $o_part=NULL, $print=NULL, $fp=NULL, $skip_charset_conv=false, $max_bytes=0)
	{
	if (!$this->check_connection()) {
	return null;
	}

	// get part data if not provided
	if (!is_object($o_part)) {
	$structure = $this->conn->getStructure($this->folder, $uid, true);
	$part_data = rcube_imap_generic::getStructurePartData($structure, $part);

	$o_part = new rcube_message_part;
	$o_part->ctype_primary = $part_data['type'];
	$o_part->encoding = $part_data['encoding'];
	$o_part->charset = $part_data['charset'];
	$o_part->size = $part_data['size'];
	}

	if ($o_part && $o_part->size) {
	$body = $this->conn->handlePartBody($this->folder, $uid, true,
	$part ? $part : 'TEXT', $o_part->encoding, $print, $fp, $o_part->ctype_primary == 'text', $max_bytes);
	}

	if ($fp \|\| $print) {
	return true;
	}

	// convert charset (if text or message part)
	if ($body && preg_match('/^(text\|message)$/', $o_part->ctype_primary)) {
	// Remove NULL characters if any (#1486189)
	if (strpos($body, "\x00") !== false) {
	$body = str_replace("\x00", '', $body);
	}

	if (!$skip_charset_conv) {
	if (!$o_part->charset \|\| strtoupper($o_part->charset) == 'US-ASCII') {
	// try to extract charset information from HTML meta tag (#1488125)
	if ($o_part->ctype_secondary == 'html' && preg_match('/<meta[^>]+charset=([a-z0-9-_]+)/i', $body, $m)) {
	$o_part->charset = strtoupper($m[1]);
	}
	else {
	$o_part->charset = $this->default_charset;
	}
	}
	$body = rcube_charset::convert($body, $o_part->charset);
	}
	}

	return $body;
	}


	/**
	* Returns the whole message source as string (or saves to a file)
	*
	* @param int $uid Message UID
	* @param resource $fp File pointer to save the message
	*
	* @return string Message source string
	*/
	public function get_raw_body($uid, $fp=null)
	{
	if (!$this->check_connection()) {
	return null;
	}

	return $this->conn->handlePartBody($this->folder, $uid,
	true, null, null, false, $fp);
	}


	/**
	* Returns the message headers as string
	*
	* @param int $uid Message UID
	*
	* @return string Message headers string
	*/
	public function get_raw_headers($uid)
	{
	if (!$this->check_connection()) {
	return null;
	}

	return $this->conn->fetchPartHeader($this->folder, $uid, true);
	}


	/**
	* Sends the whole message source to stdout
	*
	* @param int $uid Message UID
	* @param bool $formatted Enables line-ending formatting
	*/
	public function print_raw_body($uid, $formatted = true)
	{
	if (!$this->check_connection()) {
	return;
	}

	$this->conn->handlePartBody($this->folder, $uid, true, null, null, true, null, $formatted);
	}


	/**
	* Set message flag to one or several messages
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $flag Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
	* @param string $folder Folder name
	* @param boolean $skip_cache True to skip message cache clean up
	*
	* @return boolean Operation status
	*/
	public function set_flag($uids, $flag, $folder=null, $skip_cache=false)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	if (!$this->check_connection()) {
	return false;
	}

	$flag = strtoupper($flag);
	list($uids, $all_mode) = $this->parse_uids($uids);

	if (strpos($flag, 'UN') === 0) {
	$result = $this->conn->unflag($folder, $uids, substr($flag, 2));
	}
	else {
	$result = $this->conn->flag($folder, $uids, $flag);
	}

	if ($result && !$skip_cache) {
	// reload message headers if cached
	// update flags instead removing from cache
	if ($mcache = $this->get_mcache_engine()) {
	$status = strpos($flag, 'UN') !== 0;
	$mflag = preg_replace('/^UN/', '', $flag);
	$mcache->change_flag($folder, $all_mode ? null : explode(',', $uids),
	$mflag, $status);
	}

	// clear cached counters
	if ($flag == 'SEEN' \|\| $flag == 'UNSEEN') {
	$this->clear_messagecount($folder, 'SEEN');
	$this->clear_messagecount($folder, 'UNSEEN');
	}
	else if ($flag == 'DELETED' \|\| $flag == 'UNDELETED') {
	$this->clear_messagecount($folder, 'DELETED');
	// remove cached messages
	if ($this->options['skip_deleted']) {
	$this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
	}
	}
	}

	return $result;
	}


	/**
	* Append a mail message (source) to a specific folder
	*
	* @param string $folder Target folder
	* @param string $message The message source string or filename
	* @param string $headers Headers string if $message contains only the body
	* @param boolean $is_file True if $message is a filename
	* @param array $flags Message flags
	* @param mixed $date Message internal date
	* @param bool $binary Enables BINARY append
	*
	* @return int\|bool Appended message UID or True on success, False on error
	*/
	public function save_message($folder, &$message, $headers='', $is_file=false, $flags = array(), $date = null, $binary = false)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	if (!$this->check_connection()) {
	return false;
	}

	// make sure folder exists
	if (!$this->folder_exists($folder)) {
	return false;
	}

	$date = $this->date_format($date);

	if ($is_file) {
	$saved = $this->conn->appendFromFile($folder, $message, $headers, $flags, $date, $binary);
	}
	else {
	$saved = $this->conn->append($folder, $message, $flags, $date, $binary);
	}

	if ($saved) {
	// increase messagecount of the target folder
	$this->set_messagecount($folder, 'ALL', 1);
	}

	return $saved;
	}


	/**
	* Move a message from one folder to another
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $to_mbox Target folder
	* @param string $from_mbox Source folder
	*
	* @return boolean True on success, False on error
	*/
	public function move_message($uids, $to_mbox, $from_mbox='')
	{
	if (!strlen($from_mbox)) {
	$from_mbox = $this->folder;
	}

	if ($to_mbox === $from_mbox) {
	return false;
	}

	list($uids, $all_mode) = $this->parse_uids($uids);

	// exit if no message uids are specified
	if (empty($uids)) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	// make sure folder exists
	if ($to_mbox != 'INBOX' && !$this->folder_exists($to_mbox)) {
	if (in_array($to_mbox, $this->default_folders)) {
	if (!$this->create_folder($to_mbox, true)) {
	return false;
	}
	}
	else {
	return false;
	}
	}

	$config = rcube::get_instance()->config;
	$to_trash = $to_mbox == $config->get('trash_mbox');

	// flag messages as read before moving them
	if ($to_trash && $config->get('read_when_deleted')) {
	// don't flush cache (4th argument)
	$this->set_flag($uids, 'SEEN', $from_mbox, true);
	}

	// move messages
	$moved = $this->conn->move($uids, $from_mbox, $to_mbox);

	// send expunge command in order to have the moved message
	// really deleted from the source folder
	if ($moved) {
	$this->expunge_message($uids, $from_mbox, false);
	$this->clear_messagecount($from_mbox);
	$this->clear_messagecount($to_mbox);
	}
	// moving failed
	else if ($to_trash && $config->get('delete_always', false)) {
	$moved = $this->delete_message($uids, $from_mbox);
	}

	if ($moved) {
	// unset threads internal cache
	unset($this->icache['threads']);

	// remove message ids from search set
	if ($this->search_set && $from_mbox == $this->folder) {
	// threads are too complicated to just remove messages from set
	if ($this->search_threads \|\| $all_mode) {
	$this->refresh_search();
	}
	else {
	$this->search_set->filter(explode(',', $uids));
	}
	}

	// remove cached messages
	// @TODO: do cache update instead of clearing it
	$this->clear_message_cache($from_mbox, $all_mode ? null : explode(',', $uids));
	}

	return $moved;
	}


	/**
	* Copy a message from one folder to another
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $to_mbox Target folder
	* @param string $from_mbox Source folder
	*
	* @return boolean True on success, False on error
	*/
	public function copy_message($uids, $to_mbox, $from_mbox='')
	{
	if (!strlen($from_mbox)) {
	$from_mbox = $this->folder;
	}

	list($uids, $all_mode) = $this->parse_uids($uids);

	// exit if no message uids are specified
	if (empty($uids)) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	// make sure folder exists
	if ($to_mbox != 'INBOX' && !$this->folder_exists($to_mbox)) {
	if (in_array($to_mbox, $this->default_folders)) {
	if (!$this->create_folder($to_mbox, true)) {
	return false;
	}
	}
	else {
	return false;
	}
	}

	// copy messages
	$copied = $this->conn->copy($uids, $from_mbox, $to_mbox);

	if ($copied) {
	$this->clear_messagecount($to_mbox);
	}

	return $copied;
	}


	/**
	* Mark messages as deleted and expunge them
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $folder Source folder
	*
	* @return boolean True on success, False on error
	*/
	public function delete_message($uids, $folder='')
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	list($uids, $all_mode) = $this->parse_uids($uids);

	// exit if no message uids are specified
	if (empty($uids)) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	$deleted = $this->conn->flag($folder, $uids, 'DELETED');

	if ($deleted) {
	// send expunge command in order to have the deleted message
	// really deleted from the folder
	$this->expunge_message($uids, $folder, false);
	$this->clear_messagecount($folder);
	unset($this->uid_id_map[$folder]);

	// unset threads internal cache
	unset($this->icache['threads']);

	// remove message ids from search set
	if ($this->search_set && $folder == $this->folder) {
	// threads are too complicated to just remove messages from set
	if ($this->search_threads \|\| $all_mode) {
	$this->refresh_search();
	}
	else {
	$this->search_set->filter(explode(',', $uids));
	}
	}

	// remove cached messages
	$this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
	}

	return $deleted;
	}


	/**
	* Send IMAP expunge command and clear cache
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $folder Folder name
	* @param boolean $clear_cache False if cache should not be cleared
	*
	* @return boolean True on success, False on failure
	*/
	public function expunge_message($uids, $folder = null, $clear_cache = true)
	{
	if ($uids && $this->get_capability('UIDPLUS')) {
	list($uids, $all_mode) = $this->parse_uids($uids);
	}
	else {
	$uids = null;
	}

	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	if (!$this->check_connection()) {
	return false;
	}

	// force folder selection and check if folder is writeable
	// to prevent a situation when CLOSE is executed on closed
	// or EXPUNGE on read-only folder
	$result = $this->conn->select($folder);
	if (!$result) {
	return false;
	}

	if (!$this->conn->data['READ-WRITE']) {
	$this->conn->setError(rcube_imap_generic::ERROR_READONLY, "Folder is read-only");
	return false;
	}

	// CLOSE(+SELECT) should be faster than EXPUNGE
	if (empty($uids) \|\| $all_mode) {
	$result = $this->conn->close();
	}
	else {
	$result = $this->conn->expunge($folder, $uids);
	}

	if ($result && $clear_cache) {
	$this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
	$this->clear_messagecount($folder);
	}

	return $result;
	}


	/* --------------------------------
	* folder managment
	* --------------------------------*/

	/**
	* Public method for listing subscribed folders.
	*
	* @param string $root Optional root folder
	* @param string $name Optional name pattern
	* @param string $filter Optional filter
	* @param string $rights Optional ACL requirements
	* @param bool $skip_sort Enable to return unsorted list (for better performance)
	*
	* @return array List of folders
	*/
	public function list_folders_subscribed($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
	{
	$cache_key = $root.':'.$name;
	if (!empty($filter)) {
	$cache_key .= ':'.(is_string($filter) ? $filter : serialize($filter));
	}
	$cache_key .= ':'.$rights;
	$cache_key = 'mailboxes.'.md5($cache_key);

	// get cached folder list
	$a_mboxes = $this->get_cache($cache_key);
	if (is_array($a_mboxes)) {
	return $a_mboxes;
	}

	// Give plugins a chance to provide a list of folders
	$data = rcube::get_instance()->plugins->exec_hook('storage_folders',
	array('root' => $root, 'name' => $name, 'filter' => $filter, 'mode' => 'LSUB'));

	if (isset($data['folders'])) {
	$a_mboxes = $data['folders'];
	}
	else {
	$a_mboxes = $this->list_folders_subscribed_direct($root, $name);
	}

	if (!is_array($a_mboxes)) {
	return array();
	}

	// filter folders list according to rights requirements
	if ($rights && $this->get_capability('ACL')) {
	$a_mboxes = $this->filter_rights($a_mboxes, $rights);
	}

	// INBOX should always be available
	if ((!$filter \|\| $filter == 'mail') && !in_array('INBOX', $a_mboxes)) {
	array_unshift($a_mboxes, 'INBOX');
	}

	// sort folders (always sort for cache)
	if (!$skip_sort \|\| $this->cache) {
	$a_mboxes = $this->sort_folder_list($a_mboxes);
	}

	// write folders list to cache
	$this->update_cache($cache_key, $a_mboxes);

	return $a_mboxes;
	}


	/**
	* Method for direct folders listing (LSUB)
	*
	* @param string $root Optional root folder
	* @param string $name Optional name pattern
	*
	* @return array List of subscribed folders
	* @see rcube_imap::list_folders_subscribed()
	*/
	public function list_folders_subscribed_direct($root='', $name='*')
	{
	if (!$this->check_connection()) {
	return null;
	}

	$config = rcube::get_instance()->config;

	// Server supports LIST-EXTENDED, we can use selection options
	// #1486225: Some dovecot versions returns wrong result using LIST-EXTENDED
	$list_extended = !$config->get('imap_force_lsub') && $this->get_capability('LIST-EXTENDED');
	if ($list_extended) {
	// This will also set folder options, LSUB doesn't do that
	$a_folders = $this->conn->listMailboxes($root, $name,
	NULL, array('SUBSCRIBED'));
	}
	else {
	// retrieve list of folders from IMAP server using LSUB
	$a_folders = $this->conn->listSubscribed($root, $name);
	}

	if (!is_array($a_folders)) {
	return array();
	}

	// #1486796: some server configurations doesn't return folders in all namespaces
	if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
	$this->list_folders_update($a_folders, ($list_extended ? 'ext-' : '') . 'subscribed');
	}

	if ($list_extended) {
	// unsubscribe non-existent folders, remove from the list
	// we can do this only when LIST response is available
	if (is_array($a_folders) && $name == '*' && !empty($this->conn->data['LIST'])) {
	foreach ($a_folders as $idx => $folder) {
	if (($opts = $this->conn->data['LIST'][$folder])
	&& in_array('\\NonExistent', $opts)
	) {
	$this->conn->unsubscribe($folder);
	unset($a_folders[$idx]);
	}
	}
	}
	}
	else {
	// unsubscribe non-existent folders, remove them from the list,
	// we can do this only when LIST response is available
	if (is_array($a_folders) && $name == '*' && !empty($this->conn->data['LIST'])) {
	foreach ($a_folders as $idx => $folder) {
	if (!isset($this->conn->data['LIST'][$folder])
	\|\| in_array('\\Noselect', $this->conn->data['LIST'][$folder])
	) {
	// Some servers returns \Noselect for existing folders
	if (!$this->folder_exists($folder)) {
	$this->conn->unsubscribe($folder);
	unset($a_folders[$idx]);
	}
	}
	}
	}
	}

	return $a_folders;
	}


	/**
	* Get a list of all folders available on the server
	*
	* @param string $root IMAP root dir
	* @param string $name Optional name pattern
	* @param mixed $filter Optional filter
	* @param string $rights Optional ACL requirements
	* @param bool $skip_sort Enable to return unsorted list (for better performance)
	*
	* @return array Indexed array with folder names
	*/
	public function list_folders($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
	{
	$cache_key = $root.':'.$name;
	if (!empty($filter)) {
	$cache_key .= ':'.(is_string($filter) ? $filter : serialize($filter));
	}
	$cache_key .= ':'.$rights;
	$cache_key = 'mailboxes.list.'.md5($cache_key);

	// get cached folder list
	$a_mboxes = $this->get_cache($cache_key);
	if (is_array($a_mboxes)) {
	return $a_mboxes;
	}

	// Give plugins a chance to provide a list of folders
	$data = rcube::get_instance()->plugins->exec_hook('storage_folders',
	array('root' => $root, 'name' => $name, 'filter' => $filter, 'mode' => 'LIST'));

	if (isset($data['folders'])) {
	$a_mboxes = $data['folders'];
	}
	else {
	// retrieve list of folders from IMAP server
	$a_mboxes = $this->list_folders_direct($root, $name);
	}

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

	// INBOX should always be available
	if ((!$filter \|\| $filter == 'mail') && !in_array('INBOX', $a_mboxes)) {
	array_unshift($a_mboxes, 'INBOX');
	}

	// cache folder attributes
	if ($root == '' && $name == '*' && empty($filter) && !empty($this->conn->data)) {
	$this->update_cache('mailboxes.attributes', $this->conn->data['LIST']);
	}

	// filter folders list according to rights requirements
	if ($rights && $this->get_capability('ACL')) {
	$a_folders = $this->filter_rights($a_folders, $rights);
	}

	// filter folders and sort them
	if (!$skip_sort) {
	$a_mboxes = $this->sort_folder_list($a_mboxes);
	}

	// write folders list to cache
	$this->update_cache($cache_key, $a_mboxes);

	return $a_mboxes;
	}


	/**
	* Method for direct folders listing (LIST)
	*
	* @param string $root Optional root folder
	* @param string $name Optional name pattern
	*
	* @return array List of folders
	* @see rcube_imap::list_folders()
	*/
	public function list_folders_direct($root='', $name='*')
	{
	if (!$this->check_connection()) {
	return null;
	}

	$result = $this->conn->listMailboxes($root, $name);

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

	$config = rcube::get_instance()->config;

	// #1486796: some server configurations doesn't return folders in all namespaces
	if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
	$this->list_folders_update($result);
	}

	return $result;
	}


	/**
	* Fix folders list by adding folders from other namespaces.
	* Needed on some servers eg. Courier IMAP
	*
	* @param array $result Reference to folders list
	* @param string $type Listing type (ext-subscribed, subscribed or all)
	*/
	private function list_folders_update(&$result, $type = null)
	{
	$delim = $this->get_hierarchy_delimiter();
	$namespace = $this->get_namespace();
	$search = array();

	// build list of namespace prefixes
	foreach ((array)$namespace as $ns) {
	if (is_array($ns)) {
	foreach ($ns as $ns_data) {
	if (strlen($ns_data[0])) {
	$search[] = $ns_data[0];
	}
	}
	}
	}

	if (!empty($search)) {
	// go through all folders detecting namespace usage
	foreach ($result as $folder) {
	foreach ($search as $idx => $prefix) {
	if (strpos($folder, $prefix) === 0) {
	unset($search[$idx]);
	}
	}
	if (empty($search)) {
	break;
	}
	}

	// get folders in hidden namespaces and add to the result
	foreach ($search as $prefix) {
	if ($type == 'ext-subscribed') {
	$list = $this->conn->listMailboxes('', $prefix . '*', null, array('SUBSCRIBED'));
	}
	else if ($type == 'subscribed') {
	$list = $this->conn->listSubscribed('', $prefix . '*');
	}
	else {
	$list = $this->conn->listMailboxes('', $prefix . '*');
	}

	if (!empty($list)) {
	$result = array_merge($result, $list);
	}
	}
	}
	}


	/**
	* Filter the given list of folders according to access rights
	*/
	protected function filter_rights($a_folders, $rights)
	{
	$regex = '/('.$rights.')/';
	foreach ($a_folders as $idx => $folder) {
	$myrights = join('', (array)$this->my_rights($folder));
	if ($myrights !== null && !preg_match($regex, $myrights)) {
	unset($a_folders[$idx]);
	}
	}

	return $a_folders;
	}


	/**
	* Get mailbox quota information
	* added by Nuny
	*
	* @return mixed Quota info or False if not supported
	*/
	public function get_quota()
	{
	if ($this->get_capability('QUOTA') && $this->check_connection()) {
	return $this->conn->getQuota();
	}

	return false;
	}


	/**
	* Get folder size (size of all messages in a folder)
	*
	* @param string $folder Folder name
	*
	* @return int Folder size in bytes, False on error
	*/
	public function folder_size($folder)
	{
	if (!$this->check_connection()) {
	return 0;
	}

	// @TODO: could we try to use QUOTA here?
	$result = $this->conn->fetchHeaderIndex($folder, '1:*', 'SIZE', false);

	if (is_array($result)) {
	$result = array_sum($result);
	}

	return $result;
	}


	/**
	* Subscribe to a specific folder(s)
	*
	* @param array $folders Folder name(s)
	*
	* @return boolean True on success
	*/
	public function subscribe($folders)
	{
	// let this common function do the main work
	return $this->change_subscription($folders, 'subscribe');
	}


	/**
	* Unsubscribe folder(s)
	*
	* @param array $a_mboxes Folder name(s)
	*
	* @return boolean True on success
	*/
	public function unsubscribe($folders)
	{
	// let this common function do the main work
	return $this->change_subscription($folders, 'unsubscribe');
	}


	/**
	* Create a new folder on the server and register it in local cache
	*
	* @param string $folder New folder name
	* @param boolean $subscribe True if the new folder should be subscribed
	*
	* @return boolean True on success
	*/
	public function create_folder($folder, $subscribe=false)
	{
	if (!$this->check_connection()) {
	return false;
	}

	$result = $this->conn->createFolder($folder);

	// try to subscribe it
	if ($result) {
	// clear cache
	$this->clear_cache('mailboxes', true);

	if ($subscribe) {
	$this->subscribe($folder);
	}
	}

	return $result;
	}


	/**
	* Set a new name to an existing folder
	*
	* @param string $folder Folder to rename
	* @param string $new_name New folder name
	*
	* @return boolean True on success
	*/
	public function rename_folder($folder, $new_name)
	{
	if (!strlen($new_name)) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	$delm = $this->get_hierarchy_delimiter();

	// get list of subscribed folders
	if ((strpos($folder, '%') === false) && (strpos($folder, '*') === false)) {
	$a_subscribed = $this->list_folders_subscribed('', $folder . $delm . '*');
	$subscribed = $this->folder_exists($folder, true);
	}
	else {
	$a_subscribed = $this->list_folders_subscribed();
	$subscribed = in_array($folder, $a_subscribed);
	}

	$result = $this->conn->renameFolder($folder, $new_name);

	if ($result) {
	// unsubscribe the old folder, subscribe the new one
	if ($subscribed) {
	$this->conn->unsubscribe($folder);
	$this->conn->subscribe($new_name);
	}

	// check if folder children are subscribed
	foreach ($a_subscribed as $c_subscribed) {
	if (strpos($c_subscribed, $folder.$delm) === 0) {
	$this->conn->unsubscribe($c_subscribed);
	$this->conn->subscribe(preg_replace('/^'.preg_quote($folder, '/').'/',
	$new_name, $c_subscribed));

	// clear cache
	$this->clear_message_cache($c_subscribed);
	}
	}

	// clear cache
	$this->clear_message_cache($folder);
	$this->clear_cache('mailboxes', true);
	}

	return $result;
	}


	/**
	* Remove folder from server
	*
	* @param string $folder Folder name
	*
	* @return boolean True on success
	*/
	function delete_folder($folder)
	{
	$delm = $this->get_hierarchy_delimiter();

	if (!$this->check_connection()) {
	return false;
	}

	// get list of folders
	if ((strpos($folder, '%') === false) && (strpos($folder, '*') === false)) {
	$sub_mboxes = $this->list_folders('', $folder . $delm . '*');
	}
	else {
	$sub_mboxes = $this->list_folders();
	}

	// send delete command to server
	$result = $this->conn->deleteFolder($folder);

	if ($result) {
	// unsubscribe folder
	$this->conn->unsubscribe($folder);

	foreach ($sub_mboxes as $c_mbox) {
	if (strpos($c_mbox, $folder.$delm) === 0) {
	$this->conn->unsubscribe($c_mbox);
	if ($this->conn->deleteFolder($c_mbox)) {
	$this->clear_message_cache($c_mbox);
	}
	}
	}

	// clear folder-related cache
	$this->clear_message_cache($folder);
	$this->clear_cache('mailboxes', true);
	}

	return $result;
	}


	/**
	* Create all folders specified as default
	*/
	public function create_default_folders()
	{
	// create default folders if they do not exist
	foreach ($this->default_folders as $folder) {
	if (!$this->folder_exists($folder)) {
	$this->create_folder($folder, true);
	}
	else if (!$this->folder_exists($folder, true)) {
	$this->subscribe($folder);
	}
	}
	}


	/**
	* Checks if folder exists and is subscribed
	*
	* @param string $folder Folder name
	* @param boolean $subscription Enable subscription checking
	*
	* @return boolean TRUE or FALSE
	*/
	public function folder_exists($folder, $subscription=false)
	{
	if ($folder == 'INBOX') {
	return true;
	}

	$key = $subscription ? 'subscribed' : 'existing';

	if (is_array($this->icache[$key]) && in_array($folder, $this->icache[$key])) {
	return true;
	}

	if (!$this->check_connection()) {
	return false;
	}

	if ($subscription) {
	$a_folders = $this->conn->listSubscribed('', $folder);
	}
	else {
	$a_folders = $this->conn->listMailboxes('', $folder);
	}

	if (is_array($a_folders) && in_array($folder, $a_folders)) {
	$this->icache[$key][] = $folder;
	return true;
	}

	return false;
	}


	/**
	* Returns the namespace where the folder is in
	*
	* @param string $folder Folder name
	*
	* @return string One of 'personal', 'other' or 'shared'
	*/
	public function folder_namespace($folder)
	{
	if ($folder == 'INBOX') {
	return 'personal';
	}

	foreach ($this->namespace as $type => $namespace) {
	if (is_array($namespace)) {
	foreach ($namespace as $ns) {
	if ($len = strlen($ns[0])) {
	if (($len > 1 && $folder == substr($ns[0], 0, -1))
	\|\| strpos($folder, $ns[0]) === 0
	) {
	return $type;
	}
	}
	}
	}
	}

	return 'personal';
	}


	/**
	* Modify folder name according to namespace.
	* For output it removes prefix of the personal namespace if it's possible.
	* For input it adds the prefix. Use it before creating a folder in root
	* of the folders tree.
	*
	* @param string $folder Folder name
	* @param string $mode Mode name (out/in)
	*
	* @return string Folder name
	*/
	public function mod_folder($folder, $mode = 'out')
	{
	if (!strlen($folder)) {
	return $folder;
	}

	$prefix = $this->namespace['prefix']; // see set_env()
	$prefix_len = strlen($prefix);

	if (!$prefix_len) {
	return $folder;
	}

	// remove prefix for output
	if ($mode == 'out') {
	if (substr($folder, 0, $prefix_len) === $prefix) {
	return substr($folder, $prefix_len);
	}
	}
	// add prefix for input (e.g. folder creation)
	else {
	return $prefix . $folder;
	}

	return $folder;
	}


	/**
	* Gets folder attributes from LIST response, e.g. \Noselect, \Noinferiors
	*
	* @param string $folder Folder name
	* @param bool $force Set to True if attributes should be refreshed
	*
	* @return array Options list
	*/
	public function folder_attributes($folder, $force=false)
	{
	// get attributes directly from LIST command
	if (!empty($this->conn->data['LIST']) && is_array($this->conn->data['LIST'][$folder])) {
	$opts = $this->conn->data['LIST'][$folder];
	}
	// get cached folder attributes
	else if (!$force) {
	$opts = $this->get_cache('mailboxes.attributes');
	$opts = $opts[$folder];
	}

	if (!is_array($opts)) {
	if (!$this->check_connection()) {
	return array();
	}

	$this->conn->listMailboxes('', $folder);
	$opts = $this->conn->data['LIST'][$folder];
	}

	return is_array($opts) ? $opts : array();
	}


	/**
	* Gets connection (and current folder) data: UIDVALIDITY, EXISTS, RECENT,
	* PERMANENTFLAGS, UIDNEXT, UNSEEN
	*
	* @param string $folder Folder name
	*
	* @return array Data
	*/
	public function folder_data($folder)
	{
	if (!strlen($folder)) {
	$folder = $this->folder !== null ? $this->folder : 'INBOX';
	}

	if ($this->conn->selected != $folder) {
	if (!$this->check_connection()) {
	return array();
	}

	if ($this->conn->select($folder)) {
	$this->folder = $folder;
	}
	else {
	return null;
	}
	}

	$data = $this->conn->data;

	// add (E)SEARCH result for ALL UNDELETED query
	if (!empty($this->icache['undeleted_idx'])
	&& $this->icache['undeleted_idx']->get_parameters('MAILBOX') == $folder
	) {
	$data['UNDELETED'] = $this->icache['undeleted_idx'];
	}

	return $data;
	}


	/**
	* Returns extended information about the folder
	*
	* @param string $folder Folder name
	*
	* @return array Data
	*/
	public function folder_info($folder)
	{
	if ($this->icache['options'] && $this->icache['options']['name'] == $folder) {
	return $this->icache['options'];
	}

	// get cached metadata
	$cache_key = 'mailboxes.folder-info.' . $folder;
	$cached = $this->get_cache($cache_key);

	if (is_array($cached)) {
	return $cached;
	}

	$acl = $this->get_capability('ACL');
	$namespace = $this->get_namespace();
	$options = array();

	// check if the folder is a namespace prefix
	if (!empty($namespace)) {
	$mbox = $folder . $this->delimiter;
	foreach ($namespace as $ns) {
	if (!empty($ns)) {
	foreach ($ns as $item) {
	if ($item[0] === $mbox) {
	$options['is_root'] = true;
	break 2;
	}
	}
	}
	}
	}
	// check if the folder is other user virtual-root
	if (!$options['is_root'] && !empty($namespace) && !empty($namespace['other'])) {
	$parts = explode($this->delimiter, $folder);
	if (count($parts) == 2) {
	$mbox = $parts[0] . $this->delimiter;
	foreach ($namespace['other'] as $item) {
	if ($item[0] === $mbox) {
	$options['is_root'] = true;
	break;
	}
	}
	}
	}

	$options['name'] = $folder;
	$options['attributes'] = $this->folder_attributes($folder, true);
	$options['namespace'] = $this->folder_namespace($folder);
	$options['special'] = in_array($folder, $this->default_folders);

	// Set 'noselect' flag
	if (is_array($options['attributes'])) {
	foreach ($options['attributes'] as $attrib) {
	$attrib = strtolower($attrib);
	if ($attrib == '\noselect' \|\| $attrib == '\nonexistent') {
	$options['noselect'] = true;
	}
	}
	}
	else {
	$options['noselect'] = true;
	}

	// Get folder rights (MYRIGHTS)
	if ($acl && ($rights = $this->my_rights($folder))) {
	$options['rights'] = $rights;
	}

	// Set 'norename' flag
	if (!empty($options['rights'])) {
	$options['norename'] = !in_array('x', $options['rights']) && !in_array('d', $options['rights']);

	if (!$options['noselect']) {
	$options['noselect'] = !in_array('r', $options['rights']);
	}
	}
	else {
	$options['norename'] = $options['is_root'] \|\| $options['namespace'] != 'personal';
	}

	// update caches
	$this->icache['options'] = $options;
	$this->update_cache($cache_key, $options);

	return $options;
	}


	/**
	* Synchronizes messages cache.
	*
	* @param string $folder Folder name
	*/
	public function folder_sync($folder)
	{
	if ($mcache = $this->get_mcache_engine()) {
	$mcache->synchronize($folder);
	}
	}


	/**
	* Get message header names for rcube_imap_generic::fetchHeader(s)
	*
	* @return string Space-separated list of header names
	*/
	protected function get_fetch_headers()
	{
	if (!empty($this->options['fetch_headers'])) {
	$headers = explode(' ', $this->options['fetch_headers']);
	$headers = array_map('strtoupper', $headers);
	}
	else {
	$headers = array();
	}

	if ($this->messages_caching \|\| $this->options['all_headers']) {
	$headers = array_merge($headers, $this->all_headers);
	}

	return implode(' ', array_unique($headers));
	}


	/* -----------------------------------------
	* ACL and METADATA/ANNOTATEMORE methods
	* ----------------------------------------*/

	/**
	* Changes the ACL on the specified folder (SETACL)
	*
	* @param string $folder Folder name
	* @param string $user User name
	* @param string $acl ACL string
	*
	* @return boolean True on success, False on failure
	* @since 0.5-beta
	*/
	public function set_acl($folder, $user, $acl)
	{
	if (!$this->get_capability('ACL')) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	$this->clear_cache('mailboxes.folder-info.' . $folder);

	return $this->conn->setACL($folder, $user, $acl);
	}


	/**
	* Removes any <identifier,rights> pair for the
	* specified user from the ACL for the specified
	* folder (DELETEACL)
	*
	* @param string $folder Folder name
	* @param string $user User name
	*
	* @return boolean True on success, False on failure
	* @since 0.5-beta
	*/
	public function delete_acl($folder, $user)
	{
	if (!$this->get_capability('ACL')) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	return $this->conn->deleteACL($folder, $user);
	}


	/**
	* Returns the access control list for folder (GETACL)
	*
	* @param string $folder Folder name
	*
	* @return array User-rights array on success, NULL on error
	* @since 0.5-beta
	*/
	public function get_acl($folder)
	{
	if (!$this->get_capability('ACL')) {
	return null;
	}

	if (!$this->check_connection()) {
	return null;
	}

	return $this->conn->getACL($folder);
	}


	/**
	* Returns information about what rights can be granted to the
	* user (identifier) in the ACL for the folder (LISTRIGHTS)
	*
	* @param string $folder Folder name
	* @param string $user User name
	*
	* @return array List of user rights
	* @since 0.5-beta
	*/
	public function list_rights($folder, $user)
	{
	if (!$this->get_capability('ACL')) {
	return null;
	}

	if (!$this->check_connection()) {
	return null;
	}

	return $this->conn->listRights($folder, $user);
	}


	/**
	* Returns the set of rights that the current user has to
	* folder (MYRIGHTS)
	*
	* @param string $folder Folder name
	*
	* @return array MYRIGHTS response on success, NULL on error
	* @since 0.5-beta
	*/
	public function my_rights($folder)
	{
	if (!$this->get_capability('ACL')) {
	return null;
	}

	if (!$this->check_connection()) {
	return null;
	}

	return $this->conn->myRights($folder);
	}


	/**
	* Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
	*
	* @param string $folder Folder name (empty for server metadata)
	* @param array $entries Entry-value array (use NULL value as NIL)
	*
	* @return boolean True on success, False on failure
	* @since 0.5-beta
	*/
	public function set_metadata($folder, $entries)
	{
	if (!$this->check_connection()) {
	return false;
	}

	$this->clear_cache('mailboxes.metadata.', true);

	if ($this->get_capability('METADATA') \|\|
	(!strlen($folder) && $this->get_capability('METADATA-SERVER'))
	) {
	return $this->conn->setMetadata($folder, $entries);
	}
	else if ($this->get_capability('ANNOTATEMORE') \|\| $this->get_capability('ANNOTATEMORE2')) {
	foreach ((array)$entries as $entry => $value) {
	list($ent, $attr) = $this->md2annotate($entry);
	$entries[$entry] = array($ent, $attr, $value);
	}
	return $this->conn->setAnnotation($folder, $entries);
	}

	return false;
	}


	/**
	* Unsets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
	*
	* @param string $folder Folder name (empty for server metadata)
	* @param array $entries Entry names array
	*
	* @return boolean True on success, False on failure
	* @since 0.5-beta
	*/
	public function delete_metadata($folder, $entries)
	{
	if (!$this->check_connection()) {
	return false;
	}

	$this->clear_cache('mailboxes.metadata.', true);

	if ($this->get_capability('METADATA') \|\|
	(!strlen($folder) && $this->get_capability('METADATA-SERVER'))
	) {
	return $this->conn->deleteMetadata($folder, $entries);
	}
	else if ($this->get_capability('ANNOTATEMORE') \|\| $this->get_capability('ANNOTATEMORE2')) {
	foreach ((array)$entries as $idx => $entry) {
	list($ent, $attr) = $this->md2annotate($entry);
	$entries[$idx] = array($ent, $attr, NULL);
	}
	return $this->conn->setAnnotation($folder, $entries);
	}

	return false;
	}


	/**
	* Returns IMAP metadata/annotations (GETMETADATA/GETANNOTATION)
	*
	* @param string $folder Folder name (empty for server metadata)
	* @param array $entries Entries
	* @param array $options Command options (with MAXSIZE and DEPTH keys)
	*
	* @return array Metadata entry-value hash array on success, NULL on error
	* @since 0.5-beta
	*/
	public function get_metadata($folder, $entries, $options=array())
	{
	$entries = (array)$entries;

	// create cache key
	// @TODO: this is the simplest solution, but we do the same with folders list
	// maybe we should store data per-entry and merge on request
	sort($options);
	sort($entries);
	$cache_key = 'mailboxes.metadata.' . $folder;
	$cache_key .= '.' . md5(serialize($options).serialize($entries));

	// get cached data
	$cached_data = $this->get_cache($cache_key);

	if (is_array($cached_data)) {
	return $cached_data;
	}

	if (!$this->check_connection()) {
	return null;
	}

	if ($this->get_capability('METADATA') \|\|
	(!strlen($folder) && $this->get_capability('METADATA-SERVER'))
	) {
	$res = $this->conn->getMetadata($folder, $entries, $options);
	}
	else if ($this->get_capability('ANNOTATEMORE') \|\| $this->get_capability('ANNOTATEMORE2')) {
	$queries = array();
	$res = array();

	// Convert entry names
	foreach ($entries as $entry) {
	list($ent, $attr) = $this->md2annotate($entry);
	$queries[$attr][] = $ent;
	}

	// @TODO: Honor MAXSIZE and DEPTH options
	foreach ($queries as $attrib => $entry) {
	if ($result = $this->conn->getAnnotation($folder, $entry, $attrib)) {
	$res = array_merge_recursive($res, $result);
	}
	}
	}

	if (isset($res)) {
	$this->update_cache($cache_key, $res);
	return $res;
	}

	return null;
	}


	/**
	* Converts the METADATA extension entry name into the correct
	* entry-attrib names for older ANNOTATEMORE version.
	*
	* @param string $entry Entry name
	*
	* @return array Entry-attribute list, NULL if not supported (?)
	*/
	protected function md2annotate($entry)
	{
	if (substr($entry, 0, 7) == '/shared') {
	return array(substr($entry, 7), 'value.shared');
	}
	else if (substr($entry, 0, 8) == '/private') {
	return array(substr($entry, 8), 'value.priv');
	}

	// @TODO: log error
	return null;
	}


	/* --------------------------------
	* internal caching methods
	* --------------------------------*/

	/**
	* Enable or disable indexes caching
	*
	* @param string $type Cache type (@see rcube::get_cache)
	*/
	public function set_caching($type)
	{
	if ($type) {
	$this->caching = $type;
	}
	else {
	if ($this->cache) {
	$this->cache->close();
	}
	$this->cache = null;
	$this->caching = false;
	}
	}

	/**
	* Getter for IMAP cache object
	*/
	protected function get_cache_engine()
	{
	if ($this->caching && !$this->cache) {
	$rcube = rcube::get_instance();
	$ttl = $rcube->config->get('message_cache_lifetime', '10d');
	$this->cache = $rcube->get_cache('IMAP', $this->caching, $ttl);
	}

	return $this->cache;
	}

	/**
	* Returns cached value
	*
	* @param string $key Cache key
	*
	* @return mixed
	*/
	public function get_cache($key)
	{
	if ($cache = $this->get_cache_engine()) {
	return $cache->get($key);
	}
	}

	/**
	* Update cache
	*
	* @param string $key Cache key
	* @param mixed $data Data
	*/
	public function update_cache($key, $data)
	{
	if ($cache = $this->get_cache_engine()) {
	$cache->set($key, $data);
	}
	}

	/**
	* Clears the cache.
	*
	* @param string $key Cache key name or pattern
	* @param boolean $prefix_mode Enable it to clear all keys starting
	* with prefix specified in $key
	*/
	public function clear_cache($key = null, $prefix_mode = false)
	{
	if ($cache = $this->get_cache_engine()) {
	$cache->remove($key, $prefix_mode);
	}
	}

	/**
	* Delete outdated cache entries
	*/
	public function expunge_cache()
	{
	if ($this->mcache) {
	$ttl = rcube::get_instance()->config->get('message_cache_lifetime', '10d');
	$this->mcache->expunge($ttl);
	}

	if ($this->cache) {
	$this->cache->expunge();
	}
	}


	/* --------------------------------
	* message caching methods
	* --------------------------------*/

	/**
	* Enable or disable messages caching
	*
	* @param boolean $set Flag
	*/
	public function set_messages_caching($set)
	{
	if ($set) {
	$this->messages_caching = true;
	}
	else {
	if ($this->mcache) {
	$this->mcache->close();
	}
	$this->mcache = null;
	$this->messages_caching = false;
	}
	}


	/**
	* Getter for messages cache object
	*/
	protected function get_mcache_engine()
	{
	if ($this->messages_caching && !$this->mcache) {
	$rcube = rcube::get_instance();
	if (($dbh = $rcube->get_dbh()) && ($userid = $rcube->get_user_id())) {
	$this->mcache = new rcube_imap_cache(
	$dbh, $this, $userid, $this->options['skip_deleted']);
	}
	}

	return $this->mcache;
	}


	/**
	* Clears the messages cache.
	*
	* @param string $folder Folder name
	* @param array $uids Optional message UIDs to remove from cache
	*/
	protected function clear_message_cache($folder = null, $uids = null)
	{
	if ($mcache = $this->get_mcache_engine()) {
	$mcache->clear($folder, $uids);
	}
	}


	/* --------------------------------
	* protected methods
	* --------------------------------*/

	/**
	* Validate the given input and save to local properties
	*
	* @param string $sort_field Sort column
	* @param string $sort_order Sort order
	*/
	protected function set_sort_order($sort_field, $sort_order)
	{
	if ($sort_field != null) {
	$this->sort_field = asciiwords($sort_field);
	}
	if ($sort_order != null) {
	$this->sort_order = strtoupper($sort_order) == 'DESC' ? 'DESC' : 'ASC';
	}
	}


	/**
	* Sort folders first by default folders and then in alphabethical order
	*
	* @param array $a_folders Folders list
	*/
	protected function sort_folder_list($a_folders)
	{
	$a_out = $a_defaults = $folders = array();

	$delimiter = $this->get_hierarchy_delimiter();

	// find default folders and skip folders starting with '.'
	foreach ($a_folders as $i => $folder) {
	if ($folder[0] == '.') {
	continue;
	}

	if (($p = array_search($folder, $this->default_folders)) !== false && !$a_defaults[$p]) {
	$a_defaults[$p] = $folder;
	}
	else {
	$folders[$folder] = rcube_charset::convert($folder, 'UTF7-IMAP');
	}
	}

	// sort folders and place defaults on the top
	asort($folders, SORT_LOCALE_STRING);
	ksort($a_defaults);
	$folders = array_merge($a_defaults, array_keys($folders));

	// finally we must rebuild the list to move
	// subfolders of default folders to their place...
	// ...also do this for the rest of folders because
	// asort() is not properly sorting case sensitive names
	while (list($key, $folder) = each($folders)) {
	// set the type of folder name variable (#1485527)
	$a_out[] = (string) $folder;
	unset($folders[$key]);
	$this->rsort($folder, $delimiter, $folders, $a_out);
	}

	return $a_out;
	}


	/**
	* Recursive method for sorting folders
	*/
	protected function rsort($folder, $delimiter, &$list, &$out)
	{
	while (list($key, $name) = each($list)) {
	if (strpos($name, $folder.$delimiter) === 0) {
	// set the type of folder name variable (#1485527)
	$out[] = (string) $name;
	unset($list[$key]);
	$this->rsort($name, $delimiter, $list, $out);
	}
	}
	reset($list);
	}


	/**
	* Find UID of the specified message sequence ID
	*
	* @param int $id Message (sequence) ID
	* @param string $folder Folder name
	*
	* @return int Message UID
	*/
	public function id2uid($id, $folder = null)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	if ($uid = array_search($id, (array)$this->uid_id_map[$folder])) {
	return $uid;
	}

	if (!$this->check_connection()) {
	return null;
	}

	$uid = $this->conn->ID2UID($folder, $id);

	$this->uid_id_map[$folder][$uid] = $id;

	return $uid;
	}


	/**
	* Subscribe/unsubscribe a list of folders and update local cache
	*/
	protected function change_subscription($folders, $mode)
	{
	$updated = false;

	if (!empty($folders)) {
	if (!$this->check_connection()) {
	return false;
	}

	foreach ((array)$folders as $i => $folder) {
	$folders[$i] = $folder;

	if ($mode == 'subscribe') {
	$updated = $this->conn->subscribe($folder);
	}
	else if ($mode == 'unsubscribe') {
	$updated = $this->conn->unsubscribe($folder);
	}
	}
	}

	// clear cached folders list(s)
	if ($updated) {
	$this->clear_cache('mailboxes', true);
	}

	return $updated;
	}


	/**
	* Increde/decrese messagecount for a specific folder
	*/
	protected function set_messagecount($folder, $mode, $increment)
	{
	if (!is_numeric($increment)) {
	return false;
	}

	$mode = strtoupper($mode);
	$a_folder_cache = $this->get_cache('messagecount');

	if (!is_array($a_folder_cache[$folder]) \|\| !isset($a_folder_cache[$folder][$mode])) {
	return false;
	}

	// add incremental value to messagecount
	$a_folder_cache[$folder][$mode] += $increment;

	// there's something wrong, delete from cache
	if ($a_folder_cache[$folder][$mode] < 0) {
	unset($a_folder_cache[$folder][$mode]);
	}

	// write back to cache
	$this->update_cache('messagecount', $a_folder_cache);

	return true;
	}


	/**
	* Remove messagecount of a specific folder from cache
	*/
	protected function clear_messagecount($folder, $mode=null)
	{
	$a_folder_cache = $this->get_cache('messagecount');

	if (is_array($a_folder_cache[$folder])) {
	if ($mode) {
	unset($a_folder_cache[$folder][$mode]);
	}
	else {
	unset($a_folder_cache[$folder]);
	}
	$this->update_cache('messagecount', $a_folder_cache);
	}
	}


	/**
	* Converts date string/object into IMAP date/time format
	*/
	protected function date_format($date)
	{
	if (empty($date)) {
	return null;
	}

	if (!is_object($date) \|\| !is_a($date, 'DateTime')) {
	try {
	$timestamp = rcube_utils::strtotime($date);
	$date = new DateTime("@".$timestamp);
	}
	catch (Exception $e) {
	return null;
	}
	}

	return $date->format('d-M-Y H:i:s O');
	}


	/**
	* This is our own debug handler for the IMAP connection
	* @access public
	*/
	public function debug_handler(&$imap, $message)
	{
	rcube::write_log('imap', $message);
	}


	/**
	* Deprecated methods (to be removed)
	*/

	public function decode_address_list($input, $max = null, $decode = true, $fallback = null)
	{
	return rcube_mime::decode_address_list($input, $max, $decode, $fallback);
	}

	public function decode_header($input, $fallback = null)
	{
	return rcube_mime::decode_mime_string((string)$input, $fallback);
	}

	public static function decode_mime_string($input, $fallback = null)
	{
	return rcube_mime::decode_mime_string($input, $fallback);
	}

	public function mime_decode($input, $encoding = '7bit')
	{
	return rcube_mime::decode($input, $encoding);
	}

	public static function explode_header_string($separator, $str, $remove_comments = false)
	{
	return rcube_mime::explode_header_string($separator, $str, $remove_comments);
	}

	public function select_mailbox($mailbox)
	{
	// do nothing
	}

	public function set_mailbox($folder)
	{
	$this->set_folder($folder);
	}

	public function get_mailbox_name()
	{
	return $this->get_folder();
	}

	public function list_headers($folder='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
	{
	return $this->list_messages($folder, $page, $sort_field, $sort_order, $slice);
	}

	public function get_headers($uid, $folder = null, $force = false)
	{
	return $this->get_message_headers($uid, $folder, $force);
	}

	public function mailbox_status($folder = null)
	{
	return $this->folder_status($folder);
	}

	public function message_index($folder = '', $sort_field = NULL, $sort_order = NULL)
	{
	return $this->index($folder, $sort_field, $sort_order);
	}

	public function message_index_direct($folder, $sort_field = null, $sort_order = null, $skip_cache = true)
	{
	return $this->index_direct($folder, $sort_field, $sort_order, $skip_cache);
	}

	public function list_mailboxes($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
	{
	return $this->list_folders_subscribed($root, $name, $filter, $rights, $skip_sort);
	}

	public function list_unsubscribed($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
	{
	return $this->list_folders($root, $name, $filter, $rights, $skip_sort);
	}

	public function get_mailbox_size($folder)
	{
	return $this->folder_size($folder);
	}

	public function create_mailbox($folder, $subscribe=false)
	{
	return $this->create_folder($folder, $subscribe);
	}

	public function rename_mailbox($folder, $new_name)
	{
	return $this->rename_folder($folder, $new_name);
	}

	function delete_mailbox($folder)
	{
	return $this->delete_folder($folder);
	}

	function clear_mailbox($folder = null)
	{
	return $this->clear_folder($folder);
	}

	public function mailbox_exists($folder, $subscription=false)
	{
	return $this->folder_exists($folder, $subscription);
	}

	public function mailbox_namespace($folder)
	{
	return $this->folder_namespace($folder);
	}

	public function mod_mailbox($folder, $mode = 'out')
	{
	return $this->mod_folder($folder, $mode);
	}

	public function mailbox_attributes($folder, $force=false)
	{
	return $this->folder_attributes($folder, $force);
	}

	public function mailbox_data($folder)
	{
	return $this->folder_data($folder);
	}

	public function mailbox_info($folder)
	{
	return $this->folder_info($folder);
	}

	public function mailbox_sync($folder)
	{
	return $this->folder_sync($folder);
	}

	public function expunge($folder='', $clear_cache=true)
	{
	return $this->expunge_folder($folder, $clear_cache);
	}

	}
	diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
	index 51cf5d246..47508a2ef 100644
	--- a/program/lib/Roundcube/rcube_plugin_api.php
	+++ b/program/lib/Roundcube/rcube_plugin_api.php
	@@ -1,499 +1,500 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_plugin_api.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-2011, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Plugins repository \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

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


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

	public $dir;
	public $url = 'plugins/';
	public $task = '';
	public $output;

	public $handlers = array();
	protected $plugins = array();
	protected $tasks = array();
	protected $actions = array();
	protected $actionmap = array();
	protected $objectsmap = array();
	protected $template_contents = array();
	protected $active_hook = false;

	// Deprecated names of hooks, will be removed after 0.5-stable release
	protected $deprecated_hooks = array(
	'create_user' => 'user_create',
	'kill_session' => 'session_destroy',
	'upload_attachment' => 'attachment_upload',
	'save_attachment' => 'attachment_save',
	'get_attachment' => 'attachment_get',
	'cleanup_attachments' => 'attachments_cleanup',
	'display_attachment' => 'attachment_display',
	'remove_attachment' => 'attachment_delete',
	'outgoing_message_headers' => 'message_outgoing_headers',
	'outgoing_message_body' => 'message_outgoing_body',
	'address_sources' => 'addressbooks_list',
	'get_address_book' => 'addressbook_get',
	'create_contact' => 'contact_create',
	'save_contact' => 'contact_update',
	'contact_save' => 'contact_update',
	'delete_contact' => 'contact_delete',
	'manage_folders' => 'folders_list',
	'list_mailboxes' => 'mailboxes_list',
	'save_preferences' => 'preferences_save',
	'user_preferences' => 'preferences_list',
	'list_prefs_sections' => 'preferences_sections_list',
	'list_identities' => 'identities_list',
	'create_identity' => 'identity_create',
	'delete_identity' => 'identity_delete',
	'save_identity' => 'identity_update',
	'identity_save' => 'identity_update',
	// to be removed after 0.8
	'imap_init' => 'storage_init',
	- 'mailboxes_list' => 'storage_folders',
	+ 'mailboxes_list' => 'storage_folders',
	+ 'imap_connect' => 'storage_connect',
	);

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

	return self::$instance;
	}


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


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

	// register an internal hook
	$this->register_hook('template_container', array($this, 'template_container_hook'));

	// maybe also register a shudown function which triggers shutdown functions of all plugin objects
	}


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

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

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

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

	/**
	* Load the specified plugin
	*
	* @param string Plugin name
	* @return boolean True on success, false if not loaded or failure
	*/
	public function load_plugin($plugin_name)
	{
	static $plugins_dir;

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

	// plugin already loaded
	if ($this->plugins[$plugin_name] \|\| class_exists($plugin_name, false))
	return true;

	$fn = $plugins_dir . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';

	if (file_exists($fn)) {
	include($fn);

	// instantiate class if exists
	if (class_exists($plugin_name, false)) {
	$plugin = new $plugin_name($this);
	// check inheritance...
	if (is_subclass_of($plugin, 'rcube_plugin')) {
	// ... task, request type and framed mode
	if ((!$plugin->task \|\| preg_match('/^('.$plugin->task.')$/i', $this->task))
	&& (!$plugin->noajax \|\| (is_object($this->output) && $this->output->type == 'html'))
	&& (!$plugin->noframe \|\| empty($_REQUEST['_framed']))
	) {
	$plugin->init();
	$this->plugins[$plugin_name] = $plugin;
	}
	return true;
	}
	}
	else {
	rcube::raise_error(array('code' => 520, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "No plugin class $plugin_name found in $fn"), true, false);
	}
	}
	else {
	rcube::raise_error(array('code' => 520, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Failed to load plugin file $fn"), true, false);
	}

	return false;
	}


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

	/**
	* Allow a plugin object to unregister a callback.
	*
	* @param string $hook Hook name
	* @param mixed $callback String with global function name or array($obj, 'methodname')
	*/
	public function unregister_hook($hook, $callback)
	{
	$callback_id = array_search($callback, $this->handlers[$hook]);
	if ($callback_id !== false) {
	unset($this->handlers[$hook][$callback_id]);
	}
	}


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

	$args += array('abort' => false);
	$this->active_hook = $hook;

	foreach ((array)$this->handlers[$hook] as $callback) {
	$ret = call_user_func($callback, $args);
	if ($ret && is_array($ret))
	$args = $ret + $args;

	if ($args['abort'])
	break;
	}

	$this->active_hook = false;
	return $args;
	}


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

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


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


	/**
	* Register a handler function for template objects
	*
	* @param string $name Object name
	* @param string $owner Plugin name that registers this action
	* @param mixed $callback Callback: string with global function name or array($obj, 'methodname')
	*/
	public function register_handler($name, $owner, $callback)
	{
	// check name
	if (strpos($name, 'plugin.') !== 0)
	$name = 'plugin.'.$name;

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


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

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

	return false;
	}


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


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

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


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


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


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


	/**
	* Callback for template_container hooks
	*
	* @param array $attrib
	* @return array
	*/
	protected function template_container_hook($attrib)
	{
	$container = $attrib['name'];
	return array('content' => $attrib['content'] . $this->template_contents[$container]);
	}


	/**
	* Make the given file name link into the plugins directory
	*
	* @param string $fn Filename
	* @return string
	*/
	protected function resource_url($fn)
	{
	if ($fn[0] != '/' && !preg_match('\|^https?://\|i', $fn))
	return $this->url . $fn;
	else
	return $fn;
	}

	}
	diff --git a/program/lib/Roundcube/rcube_storage.php b/program/lib/Roundcube/rcube_storage.php
	index 245d911c0..763b9155e 100644
	--- a/program/lib/Roundcube/rcube_storage.php
	+++ b/program/lib/Roundcube/rcube_storage.php
	@@ -1,992 +1,993 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_storage.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| Copyright (C) 2012, Kolab Systems AG \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Mail Storage Engine \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Abstract class for accessing mail messages storage server
	*
	* @package Framework
	* @subpackage Storage
	* @author Thomas Bruederli <roundcube@gmail.com>
	* @author Aleksander Machniak <alec@alec.pl>
	*/
	abstract class rcube_storage
	{
	/**
	* Instance of connection object e.g. rcube_imap_generic
	*
	* @var mixed
	*/
	public $conn;

	protected $folder = 'INBOX';
	protected $default_charset = 'ISO-8859-1';
	protected $default_folders = array('INBOX');
	protected $search_set;
	protected $options = array('auth_method' => 'check');
	protected $page_size = 10;
	protected $threading = false;

	/**
	* All (additional) headers used (in any way) by Roundcube
	* Not listed here: DATE, FROM, TO, CC, REPLY-TO, SUBJECT, CONTENT-TYPE, LIST-POST
	* (used for messages listing) are hardcoded in rcube_imap_generic::fetchHeaders()
	*
	* @var array
	*/
	protected $all_headers = array(
	'IN-REPLY-TO',
	'BCC',
	'MESSAGE-ID',
	'CONTENT-TRANSFER-ENCODING',
	'REFERENCES',
	'X-DRAFT-INFO',
	'MAIL-FOLLOWUP-TO',
	'MAIL-REPLY-TO',
	'RETURN-PATH',
	'DELIVERED-TO',
	+ 'ENVELOPE-TO',
	);

	const UNKNOWN = 0;
	const NOPERM = 1;
	const READONLY = 2;
	const TRYCREATE = 3;
	const INUSE = 4;
	const OVERQUOTA = 5;
	const ALREADYEXISTS = 6;
	const NONEXISTENT = 7;
	const CONTACTADMIN = 8;


	/**
	* Connect to the server
	*
	* @param string $host Host to connect
	* @param string $user Username for IMAP account
	* @param string $pass Password for IMAP account
	* @param integer $port Port to connect to
	* @param string $use_ssl SSL schema (either ssl or tls) or null if plain connection
	*
	* @return boolean TRUE on success, FALSE on failure
	*/
	abstract function connect($host, $user, $pass, $port = 143, $use_ssl = null);


	/**
	* Close connection. Usually done on script shutdown
	*/
	abstract function close();


	/**
	* Checks connection state.
	*
	* @return boolean TRUE on success, FALSE on failure
	*/
	abstract function is_connected();


	/**
	* Check connection state, connect if not connected.
	*
	* @return bool Connection state.
	*/
	abstract function check_connection();


	/**
	* Returns code of last error
	*
	* @return int Error code
	*/
	abstract function get_error_code();


	/**
	* Returns message of last error
	*
	* @return string Error message
	*/
	abstract function get_error_str();


	/**
	* Returns code of last command response
	*
	* @return int Response code (class constant)
	*/
	abstract function get_response_code();


	/**
	* Set connection and class options
	*
	* @param array $opt Options array
	*/
	public function set_options($opt)
	{
	$this->options = array_merge($this->options, (array)$opt);
	}


	/**
	* Activate/deactivate debug mode.
	*
	* @param boolean $dbg True if conversation with the server should be logged
	*/
	abstract function set_debug($dbg = true);


	/**
	* Set default message charset.
	*
	* This will be used for message decoding if a charset specification is not available
	*
	* @param string $cs Charset string
	*/
	public function set_charset($cs)
	{
	$this->default_charset = $cs;
	}


	/**
	* This list of folders will be listed above all other folders
	*
	* @param array $arr Indexed list of folder names
	*/
	public function set_default_folders($arr)
	{
	if (is_array($arr)) {
	$this->default_folders = $arr;

	// add inbox if not included
	if (!in_array('INBOX', $this->default_folders)) {
	array_unshift($this->default_folders, 'INBOX');
	}
	}
	}


	/**
	* Set internal folder reference.
	* All operations will be perfomed on this folder.
	*
	* @param string $folder Folder name
	*/
	public function set_folder($folder)
	{
	if ($this->folder === $folder) {
	return;
	}

	$this->folder = $folder;
	}


	/**
	* Returns the currently used folder name
	*
	* @return string Name of the folder
	*/
	public function get_folder()
	{
	return $this->folder;
	}


	/**
	* Set internal list page number.
	*
	* @param int $page Page number to list
	*/
	public function set_page($page)
	{
	$this->list_page = (int) $page;
	}


	/**
	* Gets internal list page number.
	*
	* @return int Page number
	*/
	public function get_page()
	{
	return $this->list_page;
	}


	/**
	* Set internal page size
	*
	* @param int $size Number of messages to display on one page
	*/
	public function set_pagesize($size)
	{
	$this->page_size = (int) $size;
	}


	/**
	* Get internal page size
	*
	* @return int Number of messages to display on one page
	*/
	public function get_pagesize()
	{
	return $this->page_size;
	}


	/**
	* Save a search result for future message listing methods.
	*
	* @param mixed $set Search set in driver specific format
	*/
	abstract function set_search_set($set);


	/**
	* Return the saved search set.
	*
	* @return array Search set in driver specific format, NULL if search wasn't initialized
	*/
	abstract function get_search_set();


	/**
	* Returns the storage server's (IMAP) capability
	*
	* @param string $cap Capability name
	*
	* @return mixed Capability value or TRUE if supported, FALSE if not
	*/
	abstract function get_capability($cap);


	/**
	* Sets threading flag to the best supported THREAD algorithm.
	* Enable/Disable threaded mode.
	*
	* @param boolean $enable TRUE to enable and FALSE
	*
	* @return mixed Threading algorithm or False if THREAD is not supported
	*/
	public function set_threading($enable = false)
	{
	$this->threading = false;

	if ($enable && ($caps = $this->get_capability('THREAD'))) {
	$methods = array('REFS', 'REFERENCES', 'ORDEREDSUBJECT');
	$methods = array_intersect($methods, $caps);

	$this->threading = array_shift($methods);
	}

	return $this->threading;
	}


	/**
	* Get current threading flag.
	*
	* @return mixed Threading algorithm or False if THREAD is not supported or disabled
	*/
	public function get_threading()
	{
	return $this->threading;
	}


	/**
	* Checks the PERMANENTFLAGS capability of the current folder
	* and returns true if the given flag is supported by the server.
	*
	* @param string $flag Permanentflag name
	*
	* @return boolean True if this flag is supported
	*/
	abstract function check_permflag($flag);


	/**
	* Returns the delimiter that is used by the server
	* for folder hierarchy separation.
	*
	* @return string Delimiter string
	*/
	abstract function get_hierarchy_delimiter();


	/**
	* Get namespace
	*
	* @param string $name Namespace array index: personal, other, shared, prefix
	*
	* @return array Namespace data
	*/
	abstract function get_namespace($name = null);


	/**
	* Get messages count for a specific folder.
	*
	* @param string $folder Folder name
	- * @param string $mode Mode for count [ALL\|THREADS\|UNSEEN\|RECENT]
	+ * @param string $mode Mode for count [ALL\|THREADS\|UNSEEN\|RECENT\|EXISTS]
	* @param boolean $force Force reading from server and update cache
	* @param boolean $status Enables storing folder status info (max UID/count),
	* required for folder_status()
	*
	* @return int Number of messages
	*/
	abstract function count($folder = null, $mode = 'ALL', $force = false, $status = true);


	/**
	* Public method for listing headers.
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param string $sort_field Header field to sort by
	* @param string $sort_order Sort order [ASC\|DESC]
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	*/
	abstract function list_messages($folder = null, $page = null, $sort_field = null, $sort_order = null, $slice = 0);


	/**
	* Return sorted list of message UIDs
	*
	* @param string $folder Folder to get index from
	* @param string $sort_field Sort column
	* @param string $sort_order Sort order [ASC, DESC]
	*
	* @return rcube_result_index\|rcube_result_thread List of messages (UIDs)
	*/
	abstract function index($folder = null, $sort_field = null, $sort_order = null);


	/**
	* Invoke search request to the server.
	*
	* @param string $folder Folder name to search in
	* @param string $str Search criteria
	* @param string $charset Search charset
	* @param string $sort_field Header field to sort by
	*
	* @todo: Search criteria should be provided in non-IMAP format, eg. array
	*/
	abstract function search($folder = null, $str = 'ALL', $charset = null, $sort_field = null);


	/**
	* Direct (real and simple) search request (without result sorting and caching).
	*
	* @param string $folder Folder name to search in
	* @param string $str Search string
	*
	* @return rcube_result_index Search result (UIDs)
	*/
	abstract function search_once($folder = null, $str = 'ALL');


	/**
	* Refresh saved search set
	*
	* @return array Current search set
	*/
	abstract function refresh_search();


	/* --------------------------------
	* messages management
	* --------------------------------*/

	/**
	* Fetch message headers and body structure from the server and build
	* an object structure similar to the one generated by PEAR::Mail_mimeDecode
	*
	* @param int $uid Message UID to fetch
	* @param string $folder Folder to read from
	*
	* @return object rcube_message_header Message data
	*/
	abstract function get_message($uid, $folder = null);


	/**
	* Return message headers object of a specific message
	*
	* @param int $id Message sequence ID or UID
	* @param string $folder Folder to read from
	* @param bool $force True to skip cache
	*
	* @return rcube_message_header Message headers
	*/
	abstract function get_message_headers($uid, $folder = null, $force = false);


	/**
	* Fetch message body of a specific message from the server
	*
	* @param int $uid Message UID
	* @param string $part Part number
	* @param rcube_message_part $o_part Part object created by get_structure()
	* @param mixed $print True to print part, ressource to write part contents in
	* @param resource $fp File pointer to save the message part
	* @param boolean $skip_charset_conv Disables charset conversion
	*
	* @return string Message/part body if not printed
	*/
	abstract function get_message_part($uid, $part = 1, $o_part = null, $print = null, $fp = null, $skip_charset_conv = false);


	/**
	* Fetch message body of a specific message from the server
	*
	* @param int $uid Message UID
	*
	* @return string $part Message/part body
	* @see rcube_imap::get_message_part()
	*/
	public function get_body($uid, $part = 1)
	{
	$headers = $this->get_message_headers($uid);
	return rcube_charset::convert($this->get_message_part($uid, $part, null),
	$headers->charset ? $headers->charset : $this->default_charset);
	}


	/**
	* Returns the whole message source as string (or saves to a file)
	*
	* @param int $uid Message UID
	* @param resource $fp File pointer to save the message
	*
	* @return string Message source string
	*/
	abstract function get_raw_body($uid, $fp = null);


	/**
	* Returns the message headers as string
	*
	* @param int $uid Message UID
	*
	* @return string Message headers string
	*/
	abstract function get_raw_headers($uid);


	/**
	* Sends the whole message source to stdout
	*
	* @param int $uid Message UID
	* @param bool $formatted Enables line-ending formatting
	*/
	abstract function print_raw_body($uid, $formatted = true);


	/**
	* Set message flag to one or several messages
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $flag Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
	* @param string $folder Folder name
	* @param boolean $skip_cache True to skip message cache clean up
	*
	* @return bool Operation status
	*/
	abstract function set_flag($uids, $flag, $folder = null, $skip_cache = false);


	/**
	* Remove message flag for one or several messages
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $flag Flag to unset: SEEN, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
	* @param string $folder Folder name
	*
	* @return bool Operation status
	* @see set_flag
	*/
	public function unset_flag($uids, $flag, $folder = null)
	{
	return $this->set_flag($uids, 'UN'.$flag, $folder);
	}


	/**
	* Append a mail message (source) to a specific folder.
	*
	* @param string $folder Target folder
	* @param string $message The message source string or filename
	* @param string $headers Headers string if $message contains only the body
	* @param boolean $is_file True if $message is a filename
	* @param array $flags Message flags
	* @param mixed $date Message internal date
	*
	* @return int\|bool Appended message UID or True on success, False on error
	*/
	abstract function save_message($folder, &$message, $headers = '', $is_file = false, $flags = array(), $date = null);


	/**
	* Move message(s) from one folder to another.
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $to Target folder
	* @param string $from Source folder
	*
	* @return boolean True on success, False on error
	*/
	abstract function move_message($uids, $to, $from = null);


	/**
	* Copy message(s) from one mailbox to another.
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $to Target folder
	* @param string $from Source folder
	*
	* @return boolean True on success, False on error
	*/
	abstract function copy_message($uids, $to, $from = null);


	/**
	* Mark message(s) as deleted and expunge.
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $folder Source folder
	*
	* @return boolean True on success, False on error
	*/
	abstract function delete_message($uids, $folder = null);


	/**
	* Expunge message(s) and clear the cache.
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $folder Folder name
	* @param boolean $clear_cache False if cache should not be cleared
	*
	* @return boolean True on success, False on error
	*/
	abstract function expunge_message($uids, $folder = null, $clear_cache = true);


	/**
	* Parse message UIDs input
	*
	* @param mixed $uids UIDs array or comma-separated list or '' or '1:'
	*
	* @return array Two elements array with UIDs converted to list and ALL flag
	*/
	protected function parse_uids($uids)
	{
	if ($uids === '' \|\| $uids === '1:') {
	if (empty($this->search_set)) {
	$uids = '1:*';
	$all = true;
	}
	// get UIDs from current search set
	else {
	$uids = join(',', $this->search_set->get());
	}
	}
	else {
	if (is_array($uids)) {
	$uids = join(',', $uids);
	}

	if (preg_match('/[^0-9,]/', $uids)) {
	$uids = '';
	}
	}

	return array($uids, (bool) $all);
	}


	/* --------------------------------
	* folder managment
	* --------------------------------*/

	/**
	* Get a list of subscribed folders.
	*
	* @param string $root Optional root folder
	* @param string $name Optional name pattern
	* @param string $filter Optional filter
	* @param string $rights Optional ACL requirements
	* @param bool $skip_sort Enable to return unsorted list (for better performance)
	*
	* @return array List of folders
	*/
	abstract function list_folders_subscribed($root = '', $name = '*', $filter = null, $rights = null, $skip_sort = false);


	/**
	* Get a list of all folders available on the server.
	*
	* @param string $root IMAP root dir
	* @param string $name Optional name pattern
	* @param mixed $filter Optional filter
	* @param string $rights Optional ACL requirements
	* @param bool $skip_sort Enable to return unsorted list (for better performance)
	*
	* @return array Indexed array with folder names
	*/
	abstract function list_folders($root = '', $name = '*', $filter = null, $rights = null, $skip_sort = false);


	/**
	* Subscribe to a specific folder(s)
	*
	* @param array $folders Folder name(s)
	*
	* @return boolean True on success
	*/
	abstract function subscribe($folders);


	/**
	* Unsubscribe folder(s)
	*
	* @param array $folders Folder name(s)
	*
	* @return boolean True on success
	*/
	abstract function unsubscribe($folders);


	/**
	* Create a new folder on the server.
	*
	* @param string $folder New folder name
	* @param boolean $subscribe True if the newvfolder should be subscribed
	*
	* @return boolean True on success, False on error
	*/
	abstract function create_folder($folder, $subscribe = false);


	/**
	* Set a new name to an existing folder
	*
	* @param string $folder Folder to rename
	* @param string $new_name New folder name
	*
	* @return boolean True on success, False on error
	*/
	abstract function rename_folder($folder, $new_name);


	/**
	* Remove a folder from the server.
	*
	* @param string $folder Folder name
	*
	* @return boolean True on success, False on error
	*/
	abstract function delete_folder($folder);


	/**
	* Send expunge command and clear the cache.
	*
	* @param string $folder Folder name
	* @param boolean $clear_cache False if cache should not be cleared
	*
	* @return boolean True on success, False on error
	*/
	public function expunge_folder($folder = null, $clear_cache = true)
	{
	return $this->expunge_message('*', $folder, $clear_cache);
	}


	/**
	* Remove all messages in a folder..
	*
	* @param string $folder Folder name
	*
	* @return boolean True on success, False on error
	*/
	public function clear_folder($folder = null)
	{
	return $this->delete_message('*', $folder);
	}


	/**
	* Checks if folder exists and is subscribed
	*
	* @param string $folder Folder name
	* @param boolean $subscription Enable subscription checking
	*
	* @return boolean True if folder exists, False otherwise
	*/
	abstract function folder_exists($folder, $subscription = false);


	/**
	* Get folder size (size of all messages in a folder)
	*
	* @param string $folder Folder name
	*
	* @return int Folder size in bytes, False on error
	*/
	abstract function folder_size($folder);


	/**
	* Returns the namespace where the folder is in
	*
	* @param string $folder Folder name
	*
	* @return string One of 'personal', 'other' or 'shared'
	*/
	abstract function folder_namespace($folder);


	/**
	* Gets folder attributes (from LIST response, e.g. \Noselect, \Noinferiors).
	*
	* @param string $folder Folder name
	* @param bool $force Set to True if attributes should be refreshed
	*
	* @return array Options list
	*/
	abstract function folder_attributes($folder, $force = false);


	/**
	* Gets connection (and current folder) data: UIDVALIDITY, EXISTS, RECENT,
	* PERMANENTFLAGS, UIDNEXT, UNSEEN
	*
	* @param string $folder Folder name
	*
	* @return array Data
	*/
	abstract function folder_data($folder);


	/**
	* Returns extended information about the folder.
	*
	* @param string $folder Folder name
	*
	* @return array Data
	*/
	abstract function folder_info($folder);


	/**
	* Returns current status of a folder
	*
	* @param string $folder Folder name
	*
	* @return int Folder status
	*/
	abstract function folder_status($folder = null);


	/**
	* Synchronizes messages cache.
	*
	* @param string $folder Folder name
	*/
	abstract function folder_sync($folder);


	/**
	* Modify folder name according to namespace.
	* For output it removes prefix of the personal namespace if it's possible.
	* For input it adds the prefix. Use it before creating a folder in root
	* of the folders tree.
	*
	* @param string $folder Folder name
	* @param string $mode Mode name (out/in)
	*
	* @return string Folder name
	*/
	abstract function mod_folder($folder, $mode = 'out');


	/**
	* Create all folders specified as default
	*/
	public function create_default_folders()
	{
	// create default folders if they do not exist
	foreach ($this->default_folders as $folder) {
	if (!$this->folder_exists($folder)) {
	$this->create_folder($folder, true);
	}
	else if (!$this->folder_exists($folder, true)) {
	$this->subscribe($folder);
	}
	}
	}


	/**
	* Get mailbox quota information.
	*
	* @return mixed Quota info or False if not supported
	*/
	abstract function get_quota();


	/* -----------------------------------------
	* ACL and METADATA methods
	* ----------------------------------------*/

	/**
	* Changes the ACL on the specified folder (SETACL)
	*
	* @param string $folder Folder name
	* @param string $user User name
	* @param string $acl ACL string
	*
	* @return boolean True on success, False on failure
	*/
	abstract function set_acl($folder, $user, $acl);


	/**
	* Removes any <identifier,rights> pair for the
	* specified user from the ACL for the specified
	* folder (DELETEACL).
	*
	* @param string $folder Folder name
	* @param string $user User name
	*
	* @return boolean True on success, False on failure
	*/
	abstract function delete_acl($folder, $user);


	/**
	* Returns the access control list for a folder (GETACL).
	*
	* @param string $folder Folder name
	*
	* @return array User-rights array on success, NULL on error
	*/
	abstract function get_acl($folder);


	/**
	* Returns information about what rights can be granted to the
	* user (identifier) in the ACL for the folder (LISTRIGHTS).
	*
	* @param string $folder Folder name
	* @param string $user User name
	*
	* @return array List of user rights
	*/
	abstract function list_rights($folder, $user);


	/**
	* Returns the set of rights that the current user has to a folder (MYRIGHTS).
	*
	* @param string $folder Folder name
	*
	* @return array MYRIGHTS response on success, NULL on error
	*/
	abstract function my_rights($folder);


	/**
	* Sets metadata/annotations (SETMETADATA/SETANNOTATION)
	*
	* @param string $folder Folder name (empty for server metadata)
	* @param array $entries Entry-value array (use NULL value as NIL)
	*
	* @return boolean True on success, False on failure
	*/
	abstract function set_metadata($folder, $entries);


	/**
	* Unsets metadata/annotations (SETMETADATA/SETANNOTATION)
	*
	* @param string $folder Folder name (empty for server metadata)
	* @param array $entries Entry names array
	*
	* @return boolean True on success, False on failure
	*/
	abstract function delete_metadata($folder, $entries);


	/**
	* Returns folder metadata/annotations (GETMETADATA/GETANNOTATION).
	*
	* @param string $folder Folder name (empty for server metadata)
	* @param array $entries Entries
	* @param array $options Command options (with MAXSIZE and DEPTH keys)
	*
	* @return array Metadata entry-value hash array on success, NULL on error
	*/
	abstract function get_metadata($folder, $entries, $options = array());


	/* -----------------------------------------
	* Cache related functions
	* ----------------------------------------*/

	/**
	* Clears the cache.
	*
	* @param string $key Cache key name or pattern
	* @param boolean $prefix_mode Enable it to clear all keys starting
	* with prefix specified in $key
	*/
	abstract function clear_cache($key = null, $prefix_mode = false);


	/**
	* Returns cached value
	*
	* @param string $key Cache key
	*
	* @return mixed Cached value
	*/
	abstract function get_cache($key);


	/**
	* Delete outdated cache entries
	*/
	abstract function expunge_cache();

	} // end class rcube_storage
	diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
	index 61693b4ed..4befbf275 100644
	--- a/program/steps/mail/check_recent.inc
	+++ b/program/steps/mail/check_recent.inc
	@@ -1,116 +1,118 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/check_recent.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2010, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Check for recent messages, in all mailboxes \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// If there's no folder or messages list, there's nothing to update
	// This can happen on 'refresh' request
	if (empty($_REQUEST['_folderlist']) && empty($_REQUEST['_list'])) {
	return;
	}

	$current = $RCMAIL->storage->get_folder();
	$check_all = $RCMAIL->action != 'refresh' \|\| (bool)$RCMAIL->config->get('check_all_folders');

	// list of folders to check
	if ($check_all) {
	$a_mailboxes = $RCMAIL->storage->list_folders_subscribed('', '*', 'mail');
	}
	else {
	$a_mailboxes = (array) $current;
	if ($current != 'INBOX') {
	$a_mailboxes[] = 'INBOX';
	}
	}

	// Control folders list from a plugin
	$plugin = $RCMAIL->plugins->exec_hook('check_recent', array('folders' => $a_mailboxes, 'all' => $check_all));
	$a_mailboxes = $plugin['folders'];

	// check recent/unseen counts
	foreach ($a_mailboxes as $mbox_name) {
	$is_current = $mbox_name == $current;
	if ($is_current) {
	// Synchronize mailbox cache, handle flag changes
	$RCMAIL->storage->folder_sync($mbox_name);
	}

	// Get mailbox status
	$status = $RCMAIL->storage->folder_status($mbox_name);

	if ($status & 1) {
	// trigger plugin hook
	$RCMAIL->plugins->exec_hook('new_messages',
	array('mailbox' => $mbox_name, 'is_current' => $is_current));
	}

	rcmail_send_unread_count($mbox_name, true, null,
	(!$is_current && ($status & 1)) ? 'recent' : '');

	if ($status && $is_current) {
	// refresh saved search set
	$search_request = get_input_value('_search', RCUBE_INPUT_GPC);
	if ($search_request && isset($_SESSION['search'])
	&& $_SESSION['search_request'] == $search_request
	) {
	$_SESSION['search'] = $RCMAIL->storage->refresh_search();
	}

	if (!empty($_GET['_quota']))
	$OUTPUT->command('set_quota', rcmail_quota_content());

	+ $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
	+
	// "No-list" mode, don't get messages
	if (empty($_GET['_list']))
	continue;

	// get overall message count; allow caching because rcube_storage::folder_status() did a refresh
	$list_mode = $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL';
	- $all_count = $RCMAIL->storage->count(null, $list_mode, false, false);
	+ $all_count = $RCMAIL->storage->count($mbox_name, $list_mode, false, false);
	$page = $RCMAIL->storage->get_page();
	$page_size = $RCMAIL->storage->get_pagesize();

	// check current page if we're not on the first page
	if ($all_count && $page > 1) {
	$remaining = $all_count - $page_size * ($page - 1);
	if ($remaining <= 0) {
	$page -= 1;
	$RCMAIL->storage->set_page($page);
	$_SESSION['page'] = $page;
	}
	}

	$OUTPUT->set_env('messagecount', $all_count);
	$OUTPUT->set_env('pagecount', ceil($all_count/$page_size));
	$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($all_count), $mbox_name);
	$OUTPUT->set_env('current_page', $all_count ? $page : 1);

	// remove old rows (and clear selection if new list is empty)
	$OUTPUT->command('message_list.clear', $all_count ? false : true);

	if ($all_count) {
	$a_headers = $RCMAIL->storage->list_messages($mbox_name, null, rcmail_sort_column(), rcmail_sort_order());
	// add message rows
	rcmail_js_message_list($a_headers, false);
	// remove messages that don't exists from list selection array
	$OUTPUT->command('update_selection');
	}
	}
	}

	$OUTPUT->send();
	diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
	index 908de950e..b4dbd8d9c 100644
	--- a/program/steps/mail/compose.inc
	+++ b/program/steps/mail/compose.inc
	@@ -1,1687 +1,1727 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/compose.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Compose a new mail message with all headers and attachments \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// define constants for message compose mode
	define('RCUBE_COMPOSE_REPLY', 0x0106);
	define('RCUBE_COMPOSE_FORWARD', 0x0107);
	define('RCUBE_COMPOSE_DRAFT', 0x0108);
	define('RCUBE_COMPOSE_EDIT', 0x0109);

	$MESSAGE_FORM = null;
	$COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GET);
	$COMPOSE = null;

	if ($COMPOSE_ID && $_SESSION['compose_data_'.$COMPOSE_ID])
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];

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

	// Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or
	// if a compose-ID is given (i.e. when the compose step is opened in a new window/tab).
	if (!is_array($COMPOSE))
	{
	// Infinite redirect prevention in case of broken session (#1487028)
	if ($COMPOSE_ID)
	raise_error(array('code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid compose ID"), true, true);

	$COMPOSE_ID = uniqid(mt_rand());
	$_SESSION['compose_data_'.$COMPOSE_ID] = array(
	'id' => $COMPOSE_ID,
	'param' => request2param(RCUBE_INPUT_GET),
	'mailbox' => $RCMAIL->storage->get_folder(),
	);
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];

	// process values like "mailto:foo@bar.com?subject=new+message&cc=another"
	if ($COMPOSE['param']['to']) {
	// #1486037: remove "mailto:" prefix
	$COMPOSE['param']['to'] = preg_replace('/^mailto:/i', '', $COMPOSE['param']['to']);
	$mailto = explode('?', $COMPOSE['param']['to']);
	if (count($mailto) > 1) {
	$COMPOSE['param']['to'] = $mailto[0];
	parse_str($mailto[1], $query);
	foreach ($query as $f => $val)
	$COMPOSE['param'][$f] = $val;
	}
	}

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

	// pipe compose parameters thru plugins
	$plugin = $RCMAIL->plugins->exec_hook('message_compose', $COMPOSE);
	$COMPOSE['param'] = array_merge($COMPOSE['param'], $plugin['param']);

	// add attachments listed by message_compose hook
	if (is_array($plugin['attachments'])) {
	foreach ($plugin['attachments'] as $attach) {
	// we have structured data
	if (is_array($attach)) {
	$attachment = $attach;
	}
	// only a file path is given
	else {
	$filename = basename($attach);
	$attachment = array(
	'group' => $COMPOSE_ID,
	'name' => $filename,
	'mimetype' => rc_mime_content_type($attach, $filename),
	'path' => $attach,
	);
	}

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

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

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

	// redirect to a unique URL with all parameters stored in session
	$OUTPUT->redirect(array(
	'_action' => 'compose',
	'_id' => $COMPOSE['id'],
	'_search' => $_REQUEST['_search'],
	));
	}


	// add some labels to client
	$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'cancel',
	'nobodywarning', 'notsentwarning', 'notuploadedwarning', 'savingmessage', 'sendingmessage',
	'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'uploadingmany',
	'fileuploaderror', 'sendmessage');

	$OUTPUT->set_env('compose_id', $COMPOSE['id']);
	$OUTPUT->set_pagetitle(rcube_label('compose'));

	// add config parameters to client script
	if (!empty($CONFIG['drafts_mbox'])) {
	$OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
	$OUTPUT->set_env('draft_autosave', $CONFIG['draft_autosave']);
	}
	// set current mailbox in client environment
	$OUTPUT->set_env('mailbox', $RCMAIL->storage->get_folder());
	$OUTPUT->set_env('sig_above', $RCMAIL->config->get('sig_above', false));
	$OUTPUT->set_env('top_posting', intval($RCMAIL->config->get('reply_mode')) > 0);
	$OUTPUT->set_env('recipients_separator', trim($RCMAIL->config->get('recipients_separator', ',')));

	// default font for HTML editor
	$font = rcube_fontdefs($RCMAIL->config->get('default_font', 'Verdana'));
	if ($font && !is_array($font)) {
	$OUTPUT->set_env('default_font', $font);
	}

	// get reference message and set compose mode
	if ($msg_uid = $COMPOSE['param']['draft_uid']) {
	- $RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
	$compose_mode = RCUBE_COMPOSE_DRAFT;
	+ $RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
	}
	-else if ($msg_uid = $COMPOSE['param']['reply_uid'])
	+else if ($msg_uid = $COMPOSE['param']['reply_uid']) {
	$compose_mode = RCUBE_COMPOSE_REPLY;
	-else if ($msg_uid = $COMPOSE['param']['forward_uid'])
	+ $OUTPUT->set_env('compose_mode', 'reply');
	+}
	+else if ($msg_uid = $COMPOSE['param']['forward_uid']) {
	$compose_mode = RCUBE_COMPOSE_FORWARD;
	-else if ($msg_uid = $COMPOSE['param']['uid'])
	+ $OUTPUT->set_env('compose_mode', 'forward');
	+ $COMPOSE['forward_uid'] = $msg_uid;
	+ $COMPOSE['as_attachment'] = !empty($COMPOSE['param']['attachment']);
	+}
	+else if ($msg_uid = $COMPOSE['param']['uid']) {
	$compose_mode = RCUBE_COMPOSE_EDIT;
	+}

	$config_show_sig = $RCMAIL->config->get('show_sig', 1);
	-if ($config_show_sig == 1)
	+if ($compose_mode == RCUBE_COMPOSE_EDIT \|\| $compose_mode == RCUBE_COMPOSE_DRAFT) {
	+ // don't add signature in draft/edit mode, we'll also not remove the old-one
	+}
	+else if ($config_show_sig == 1)
	$OUTPUT->set_env('show_sig', true);
	-else if ($config_show_sig == 2 && (empty($compose_mode) \|\| $compose_mode == RCUBE_COMPOSE_EDIT \|\| $compose_mode == RCUBE_COMPOSE_DRAFT))
	+else if ($config_show_sig == 2 && empty($compose_mode))
	$OUTPUT->set_env('show_sig', true);
	else if ($config_show_sig == 3 && ($compose_mode == RCUBE_COMPOSE_REPLY \|\| $compose_mode == RCUBE_COMPOSE_FORWARD))
	$OUTPUT->set_env('show_sig', true);
	-else
	- $OUTPUT->set_env('show_sig', false);

	// set line length for body wrapping
	$LINE_LENGTH = $RCMAIL->config->get('line_length', 72);

	-if (!empty($msg_uid))
	+if (!empty($msg_uid) && empty($COMPOSE['as_attachment']))
	{
	// similar as in program/steps/mail/show.inc
	// re-set 'prefer_html' to have possibility to use html part for compose
	$CONFIG['prefer_html'] = $CONFIG['prefer_html'] \|\| $CONFIG['htmleditor'] \|\| $compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT;
	$MESSAGE = new rcube_message($msg_uid);

	// make sure message is marked as read
	if ($MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN']))
	$RCMAIL->storage->set_flag($msg_uid, 'SEEN');

	if (!empty($MESSAGE->headers->charset))
	$RCMAIL->storage->set_charset($MESSAGE->headers->charset);

	- if ($compose_mode == RCUBE_COMPOSE_REPLY)
	- {
	+ if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	$COMPOSE['reply_uid'] = $msg_uid;
	$COMPOSE['reply_msgid'] = $MESSAGE->headers->messageID;
	$COMPOSE['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID);

	if (!empty($COMPOSE['param']['all']))
	$MESSAGE->reply_all = $COMPOSE['param']['all'];

	- $OUTPUT->set_env('compose_mode', 'reply');
	-
	// Save the sent message in the same folder of the message being replied to
	if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $COMPOSE['mailbox'])
	&& rcmail_check_sent_folder($sent_folder, false)
	) {
	$COMPOSE['param']['sent_mbox'] = $sent_folder;
	}
	}
	- else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
	- {
	- if ($MESSAGE->headers->others['x-draft-info'])
	- {
	+ else if ($compose_mode == RCUBE_COMPOSE_DRAFT) {
	+ if ($MESSAGE->headers->others['x-draft-info']) {
	// get reply_uid/forward_uid to flag the original message when sending
	$info = rcmail_draftinfo_decode($MESSAGE->headers->others['x-draft-info']);

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

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

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

	if ($MESSAGE->headers->in_reply_to)
	$COMPOSE['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>';

	$COMPOSE['references'] = $MESSAGE->headers->references;
	}
	- else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
	- {
	- $COMPOSE['forward_uid'] = $msg_uid;
	- $OUTPUT->set_env('compose_mode', 'forward');
	-
	- if (!empty($COMPOSE['param']['attachment']))
	- $MESSAGE->forward_attachment = true;
	- }
	}
	else {
	$MESSAGE = new stdClass();
	}

	$MESSAGE->compose = array();

	// get user's identities
	$MESSAGE->identities = $RCMAIL->user->list_identities(null, true);

	// Set From field value
	if (!empty($_POST['_from'])) {
	$MESSAGE->compose['from'] = get_input_value('_from', RCUBE_INPUT_POST);
	}
	else if (!empty($COMPOSE['param']['from'])) {
	$MESSAGE->compose['from'] = $COMPOSE['param']['from'];
	}
	else if (count($MESSAGE->identities)) {
	$ident = rcmail_identity_select($MESSAGE, $MESSAGE->identities, $compose_mode);

	$MESSAGE->compose['from_email'] = $ident['email'];
	$MESSAGE->compose['from'] = $ident['identity_id'];
	}

	// Set other headers
	$a_recipients = array();
	$parts = array('to', 'cc', 'bcc', 'replyto', 'followupto');
	$separator = trim($RCMAIL->config->get('recipients_separator', ',')) . ' ';

	foreach ($parts as $header) {
	$fvalue = '';
	$decode_header = true;

	// we have a set of recipients stored is session
	if ($header == 'to' && ($mailto_id = $COMPOSE['param']['mailto'])
	&& $_SESSION['mailto'][$mailto_id]
	) {
	$fvalue = urldecode($_SESSION['mailto'][$mailto_id]);
	$decode_header = false;

	// make session to not grow up too much
	unset($_SESSION['mailto'][$mailto_id]);
	$COMPOSE['param']['to'] = $fvalue;
	}
	else if (!empty($_POST['_'.$header])) {
	$fvalue = get_input_value('_'.$header, RCUBE_INPUT_POST, TRUE);
	}
	else if (!empty($COMPOSE['param'][$header])) {
	$fvalue = $COMPOSE['param'][$header];
	}
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	// get recipent address(es) out of the message headers
	if ($header == 'to') {
	$mailfollowup = $MESSAGE->headers->others['mail-followup-to'];
	$mailreplyto = $MESSAGE->headers->others['mail-reply-to'];

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

	// Reply to message sent by yourself (#1487074)
	if (!empty($ident) && $fvalue == $ident['ident']) {
	$fvalue = $MESSAGE->headers->to;
	}
	}
	// add recipient of original message if reply to all
	else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') {
	if ($v = $MESSAGE->headers->to)
	$fvalue .= $v;
	if ($v = $MESSAGE->headers->cc)
	$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
	}
	}
	else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
	// get drafted headers
	if ($header=='to' && !empty($MESSAGE->headers->to))
	$fvalue = $MESSAGE->get_header('to', true);
	else if ($header=='cc' && !empty($MESSAGE->headers->cc))
	$fvalue = $MESSAGE->get_header('cc', true);
	else if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
	$fvalue = $MESSAGE->get_header('bcc', true);
	else if ($header=='replyto' && !empty($MESSAGE->headers->others['mail-reply-to']))
	$fvalue = $MESSAGE->get_header('mail-reply-to');
	else if ($header=='replyto' && !empty($MESSAGE->headers->replyto))
	$fvalue = $MESSAGE->get_header('reply-to');
	else if ($header=='followupto' && !empty($MESSAGE->headers->others['mail-followup-to']))
	$fvalue = $MESSAGE->get_header('mail-followup-to');
	}

	// split recipients and put them back together in a unique way
	if (!empty($fvalue) && in_array($header, array('to', 'cc', 'bcc'))) {
	$to_addresses = rcube_mime::decode_address_list($fvalue, null, $decode_header, $MESSAGE->headers->charset);
	$fvalue = array();

	foreach ($to_addresses as $addr_part) {
	if (empty($addr_part['mailto']))
	continue;

	$mailto = format_email(rcube_idn_to_utf8($addr_part['mailto']));

	if (!in_array($mailto, $a_recipients)
	&& ($header == 'to' \|\| empty($MESSAGE->compose['from_email']) \|\| $mailto != $MESSAGE->compose['from_email'])
	) {
	if ($addr_part['name'] && $addr_part['mailto'] != $addr_part['name'])
	$string = format_email_recipient($mailto, $addr_part['name']);
	else
	$string = $mailto;

	$fvalue[] = $string;
	$a_recipients[] = $addr_part['mailto'];
	}
	}

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

	$MESSAGE->compose[$header] = $fvalue;
	}
	unset($a_recipients);

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


	/**** compose mode functions ******/

	function rcmail_identity_select($MESSAGE, $identities, $compose_mode)
	{
	$a_recipients = array();
	$a_names = array();

	// extract all recipients of the reply-message
	if (is_object($MESSAGE->headers) && in_array($compose_mode, array(RCUBE_COMPOSE_REPLY, RCUBE_COMPOSE_FORWARD))) {
	$a_to = rcube_mime::decode_address_list($MESSAGE->headers->to, null, true, $MESSAGE->headers->charset);
	foreach ($a_to as $addr) {
	if (!empty($addr['mailto'])) {
	$a_recipients[] = format_email($addr['mailto']);
	$a_names[] = $addr['name'];
	}
	}

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

	$from_idx = null;
	$found_idx = null;
	$default_identity = 0; // default identity is always first on the list

	// Select identity
	foreach ($identities as $idx => $ident) {
	// use From header
	if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
	if ($MESSAGE->headers->from == $ident['ident']) {
	$from_idx = $idx;
	break;
	}
	}
	// reply to yourself
	else if ($compose_mode == RCUBE_COMPOSE_REPLY && $MESSAGE->headers->from == $ident['ident']) {
	$from_idx = $idx;
	break;
	}
	// use replied message recipients
	else if (($found = array_search($ident['email_ascii'], $a_recipients)) !== false) {
	if ($found_idx === null) {
	$found_idx = $idx;
	}
	// match identity name
	if ($a_names[$found] && $ident['name'] && $a_names[$found] == $ident['name']) {
	$from_idx = $idx;
	break;
	}
	}
	}

	// If matching by name+address doesn't found any amtches, get first found address (identity)
	if ($from_idx === null) {
	$from_idx = $found_idx;
	}

	// Try Return-Path
	if ($from_idx === null && ($return_path = $MESSAGE->headers->others['return-path'])) {
	foreach ($identities as $idx => $ident) {
	if (strpos($return_path, str_replace('@', '=', $ident['email_ascii']).'@') !== false) {
	$from_idx = $idx;
	break;
	}
	}
	}

	// Fallback using Delivered-To
	if ($from_idx === null && ($delivered_to = $MESSAGE->headers->others['delivered-to'])) {
	foreach ($identities as $idx => $ident) {
	if (in_array($ident['email_ascii'], (array)$delivered_to)) {
	$from_idx = $idx;
	break;
	}
	}
	}

	+ // Fallback using Envelope-To
	+ if ($from_idx === null && ($envelope_to = $MESSAGE->headers->others['envelope-to'])) {
	+ foreach ($identities as $idx => $ident) {
	+ if (in_array($ident['email_ascii'], (array)$envelope_to)) {
	+ $from_idx = $idx;
	+ break;
	+ }
	+ }
	+ }
	+
	return $identities[$from_idx !== null ? $from_idx : $default_identity];
	}


	function rcmail_compose_headers($attrib)
	{
	global $MESSAGE;

	list($form_start, $form_end) = get_form_tags($attrib);

	$out = '';
	$part = strtolower($attrib['part']);

	switch ($part)
	{
	case 'from':
	return $form_start . rcmail_compose_header_from($attrib);

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

	$allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex');
	$field_type = 'html_textarea';
	break;

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

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

	$allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
	$field_type = 'html_inputfield';
	break;
	}

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

	// create teaxtarea object
	$input = new $field_type($field_attrib);
	$out = $input->show($MESSAGE->compose[$param]);
	}

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

	// configure autocompletion
	rcube_autocomplete_init();

	return $out;
	}


	function rcmail_compose_header_from($attrib)
	{
	global $MESSAGE, $OUTPUT, $RCMAIL, $compose_mode;

	// pass the following attributes to the form class
	$field_attrib = array('name' => '_from');
	foreach ($attrib as $attr => $value)
	if (in_array($attr, array('id', 'class', 'style', 'size', 'tabindex')))
	$field_attrib[$attr] = $value;

	if (count($MESSAGE->identities))
	{
	$a_signatures = array();
	$separator = $RCMAIL->config->get('sig_above')
	&& ($compose_mode == RCUBE_COMPOSE_REPLY \|\| $compose_mode == RCUBE_COMPOSE_FORWARD) ? '---' : '-- ';

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

	// create SELECT element
	foreach ($MESSAGE->identities as $sql_arr)
	{
	$identity_id = $sql_arr['identity_id'];
	$select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $identity_id);

	// add signature to array
	if (!empty($sql_arr['signature']) && empty($COMPOSE['param']['nosig']))
	{
	$text = $html = $sql_arr['signature'];

	if ($sql_arr['html_signature']) {
	$h2t = new html2text($sql_arr['signature'], false, false);
	$text = trim($h2t->get_text());
	}
	else {
	$html = htmlentities($html, ENT_NOQUOTES, RCMAIL_CHARSET);
	}

	if (!preg_match('/^--[ -]\r?\n/m', $text)) {
	$text = $separator . "\n" . $text;
	$html = $separator . "<br>" . $html;
	}

	if (!$sql_arr['html_signature']) {
	$html = "<pre>" . $html . "</pre>";
	}

	$a_signatures[$identity_id]['text'] = $text;
	$a_signatures[$identity_id]['html'] = $html;
	}
	}

	$out = $select_from->show($MESSAGE->compose['from']);

	// add signatures to client
	$OUTPUT->set_env('signatures', $a_signatures);
	}
	// no identities, display text input field
	else {
	$field_attrib['class'] = 'from_address';
	$input_from = new html_inputfield($field_attrib);
	$out = $input_from->show($MESSAGE->compose['from']);
	}

	return $out;
	}


	function rcmail_compose_editor_mode()
	{
	global $RCMAIL, $MESSAGE, $compose_mode;
	static $useHtml;

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

	$html_editor = intval($RCMAIL->config->get('htmleditor'));

	if (isset($_POST['_is_html'])) {
	$useHtml = !empty($_POST['_is_html']);
	}
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT) {
	$useHtml = $MESSAGE->has_html_part(false, true);
	}
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	$useHtml = ($html_editor == 1 \|\| ($html_editor >= 2 && $MESSAGE->has_html_part(false, true)));
	}
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
	$useHtml = ($html_editor == 1 \|\| ($html_editor == 3 && $MESSAGE->has_html_part(false, true)));
	}
	else {
	$useHtml = ($html_editor == 1);
	}

	return $useHtml;
	}


	function rcmail_prepare_message_body()
	{
	global $RCMAIL, $MESSAGE, $COMPOSE, $compose_mode, $LINE_LENGTH, $HTML_MODE;

	// use posted message body
	if (!empty($_POST['_message'])) {
	$body = get_input_value('_message', RCUBE_INPUT_POST, true);
	$isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);
	}
	else if ($COMPOSE['param']['body']) {
	$body = $COMPOSE['param']['body'];
	$isHtml = false;
	}
	// forward as attachment
	- else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $MESSAGE->forward_attachment) {
	+ else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $COMPOSE['as_attachment']) {
	$isHtml = rcmail_compose_editor_mode();
	$body = '';
	if (empty($COMPOSE['attachments']))
	- rcmail_write_forward_attachment($MESSAGE);
	+ rcmail_write_forward_attachments();
	}
	// reply/edit/draft/forward
	else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY \|\| $RCMAIL->config->get('reply_mode') != -1)) {
	$isHtml = rcmail_compose_editor_mode();

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

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

	// compose reply-body
	if ($compose_mode == RCUBE_COMPOSE_REPLY)
	$body = rcmail_create_reply_body($body, $isHtml);
	// forward message body inline
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
	$body = rcmail_create_forward_body($body, $isHtml);
	// load draft message body
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT)
	$body = rcmail_create_draft_body($body, $isHtml);
	}
	else { // new message
	$isHtml = rcmail_compose_editor_mode();
	}

	$plugin = $RCMAIL->plugins->exec_hook('message_compose_body',
	array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode));
	$body = $plugin['body'];
	unset($plugin);

	// add blocked.gif attachment (#1486516)
	if ($isHtml && preg_match('#<img src="\./program/resources/blocked\.gif"#', $body)) {
	if ($attachment = rcmail_save_image('program/resources/blocked.gif', 'image/gif')) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
	$body = preg_replace('#\./program/resources/blocked\.gif#', $url, $body);
	}
	}

	$HTML_MODE = $isHtml;

	return $body;
	}

	function rcmail_compose_part_body($part, $isHtml = false)
	{
	global $RCMAIL, $MESSAGE, $compose_mode;

	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	if (!rcmail_mem_check($part->size * 10)) {
	return '';
	}

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

	$body = $part->body;

	if ($isHtml) {
	if ($part->ctype_secondary == 'html') {
	}
	else if ($part->ctype_secondary == 'enriched') {
	$body = rcube_enriched::to_html($body);
	}
	else {
	// try to remove the signature
	- if ($RCMAIL->config->get('strip_existing_sig', true)) {
	- $body = rcmail_remove_signature($body);
	+ if ($compose_mode != RCUBE_COMPOSE_DRAFT && $compose_mode != RCUBE_COMPOSE_EDIT) {
	+ if ($RCMAIL->config->get('strip_existing_sig', true)) {
	+ $body = rcmail_remove_signature($body);
	+ }
	}
	// add HTML formatting
	$body = rcmail_plain_body($body);
	if ($body) {
	$body = '<pre>' . $body . '</pre>';
	}
	}
	}
	else {
	if ($part->ctype_secondary == 'enriched') {
	$body = rcube_enriched::to_html($body);
	$part->ctype_secondary = 'html';
	}

	if ($part->ctype_secondary == 'html') {
	// use html part if it has been used for message (pre)viewing
	// decrease line length for quoting
	$len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
	$txt = new html2text($body, false, true, $len);
	$body = $txt->get_text();
	}
	else if ($part->ctype_secondary == 'enriched') {
	$body = rcube_enriched::to_html($body);
	}
	else {
	if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
	$body = rcube_mime::unfold_flowed($body);
	}

	// try to remove the signature
	- if ($RCMAIL->config->get('strip_existing_sig', true)) {
	- $body = rcmail_remove_signature($body);
	+ if ($compose_mode != RCUBE_COMPOSE_DRAFT && $compose_mode != RCUBE_COMPOSE_EDIT) {
	+ if ($RCMAIL->config->get('strip_existing_sig', true)) {
	+ $body = rcmail_remove_signature($body);
	+ }
	}
	}
	}

	return $body;
	}

	function rcmail_compose_body($attrib)
	{
	global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode, $LINE_LENGTH, $HTML_MODE, $MESSAGE_BODY;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

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

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

	$isHtml = $HTML_MODE;

	$out = $form_start ? "$form_start\n" : '';

	$saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE->headers->messageID) : ''));
	$out .= $saveid->show();

	$drafttoggle = new html_hiddenfield(array('name' => '_draft', 'value' => 'yes'));
	$out .= $drafttoggle->show();

	$msgtype = new html_hiddenfield(array('name' => '_is_html', 'value' => ($isHtml?"1":"0")));
	$out .= $msgtype->show();

	// If desired, set this textarea to be editable by TinyMCE
	if ($isHtml) {
	$MESSAGE_BODY = htmlentities($MESSAGE_BODY, ENT_NOQUOTES, RCMAIL_CHARSET);
	$attrib['class'] = 'mce_editor';
	$attrib['is_escaped'] = true;
	$textarea = new html_textarea($attrib);
	$out .= $textarea->show($MESSAGE_BODY);
	}
	else {
	$textarea = new html_textarea($attrib);
	$out .= $textarea->show('');
	// quote plain text, inject into textarea
	$table = get_html_translation_table(HTML_SPECIALCHARS);
	$MESSAGE_BODY = strtr($MESSAGE_BODY, $table);
	$out = substr($out, 0, -11) . $MESSAGE_BODY . '</textarea>';
	}

	$out .= $form_end ? "\n$form_end" : '';

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

	// include HTML editor
	rcube_html_editor();

	// Set language list
	if (!empty($CONFIG['enable_spellcheck'])) {
	$engine = $RCMAIL->config->get('spellcheck_engine','googie');
	$dictionary = (bool) $RCMAIL->config->get('spellcheck_dictionary');
	$spellcheck_langs = (array) $RCMAIL->config->get('spellcheck_languages',
	array('da'=>'Dansk', 'de'=>'Deutsch', 'en' => 'English', 'es'=>'Español',
	'fr'=>'Français', 'it'=>'Italiano', 'nl'=>'Nederlands', 'pl'=>'Polski',
	'pt'=>'Português', 'ru'=>'Русский', 'fi'=>'Suomi', 'sv'=>'Svenska'));

	// googie works only with two-letter codes
	if ($engine == 'googie') {
	$lang = strtolower(substr($_SESSION['language'], 0, 2));

	$spellcheck_langs_googie = array();
	foreach ($spellcheck_langs as $key => $name)
	$spellcheck_langs_googie[strtolower(substr($key,0,2))] = $name;
	$spellcheck_langs = $spellcheck_langs_googie;
	}
	else {
	$lang = $_SESSION['language'];

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

	if (!$spellcheck_langs[$lang])
	$lang = 'en';

	$OUTPUT->set_env('spell_langs', $spellcheck_langs);
	$OUTPUT->set_env('spell_lang', $lang);

	$editor_lang_set = array();
	foreach ($spellcheck_langs as $key => $name) {
	$editor_lang_set[] = ($key == $lang ? '+' : '') . JQ($name).'='.JQ($key);
	}

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

	$OUTPUT->add_label('checking');
	$OUTPUT->set_env('spellcheck_langs', join(',', $editor_lang_set));
	}

	$out .= "\n".'<iframe name="savetarget" src="program/resources/blank.gif" style="width:0;height:0;border:none;visibility:hidden;"></iframe>';

	return $out;
	}


	function rcmail_create_reply_body($body, $bodyIsHtml)
	{
	global $RCMAIL, $MESSAGE, $LINE_LENGTH;

	// build reply prefix
	$from = array_pop(rcube_mime::decode_address_list($MESSAGE->get_header('from'), 1, false, $MESSAGE->headers->charset));
	$prefix = rcube_label(array(
	'name' => 'mailreplyintro',
	'vars' => array(
	'date' => format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long')),
	'sender' => $from['name'] ? $from['name'] : rcube_idn_to_utf8($from['mailto']),
	)
	));

	if (!$bodyIsHtml) {
	$body = preg_replace('/\r?\n/', "\n", $body);
	$body = trim($body, "\n");

	// soft-wrap and quote message text
	$body = rcmail_wrap_and_quote($body, $LINE_LENGTH);

	$prefix .= "\n";
	$suffix = '';

	if (intval($RCMAIL->config->get('reply_mode')) > 0) { // top-posting
	$prefix = "\n\n\n" . $prefix;
	}
	}
	else {
	// save inline images to files
	$cid_map = rcmail_write_inline_attachments($MESSAGE);
	// set is_safe flag (we need this for html body washing)
	rcmail_check_safe($MESSAGE);
	// clean up html tags
	$body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map);

	// build reply (quote content)
	$prefix = '<p>' . Q($prefix) . "</p>\n";
	$prefix .= '<blockquote>';

	if (intval($RCMAIL->config->get('reply_mode')) > 0) { // top-posting
	$prefix = '<br>' . $prefix;
	$suffix = '</blockquote>';
	}
	else {
	$suffix = '</blockquote><p></p>';
	}
	}

	return $prefix.$body.$suffix;
	}


	function rcmail_create_forward_body($body, $bodyIsHtml)
	{
	global $RCMAIL, $MESSAGE, $COMPOSE;

	// add attachments
	if (!isset($COMPOSE['forward_attachments']) && is_array($MESSAGE->mime_parts))
	$cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);

	$date = format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long'));
	$charset = $RCMAIL->output->get_charset();

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

	if ($MESSAGE->headers->cc)
	$prefix .= rcube_label('cc') . ': ' . $MESSAGE->get_header('cc') . "\n";
	if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
	$prefix .= rcube_label('replyto') . ': ' . $MESSAGE->get_header('replyto') . "\n";

	$prefix .= "\n";
	$body = trim($body, "\r\n");
	}
	else {
	// set is_safe flag (we need this for html body washing)
	rcmail_check_safe($MESSAGE);
	// clean up html tags
	$body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map);

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

	if ($MESSAGE->headers->cc)
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	rcube_label('cc'),
	Q($MESSAGE->get_header('cc'), 'replace'));

	if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	rcube_label('replyto'),
	Q($MESSAGE->get_header('replyto'), 'replace'));

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

	return $prefix.$body;
	}


	function rcmail_create_draft_body($body, $bodyIsHtml)
	{
	global $MESSAGE, $OUTPUT, $COMPOSE;

	/**
	* add attachments
	* sizeof($MESSAGE->mime_parts can be 1 - e.g. attachment, but no text!
	*/
	if (empty($COMPOSE['forward_attachments'])
	&& is_array($MESSAGE->mime_parts)
	&& count($MESSAGE->mime_parts) > 0)
	{
	$cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);

	// replace cid with href in inline images links
	if ($cid_map)
	$body = str_replace(array_keys($cid_map), array_values($cid_map), $body);
	}

	return $body;
	}


	function rcmail_remove_signature($body)
	{
	global $RCMAIL;

	$body = str_replace("\r\n", "\n", $body);
	$len = strlen($body);
	$sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15);

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

	return $body;
	}


	function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
	{
	global $RCMAIL, $COMPOSE, $compose_mode;

	$cid_map = $messages = array();
	foreach ((array)$message->mime_parts as $pid => $part)
	{
	if ($part->disposition == 'attachment' \|\| ($part->disposition == 'inline' && $bodyIsHtml) \|\| $part->filename) {
	if ($part->ctype_primary == 'message' \|\| $part->ctype_primary == 'multipart') {
	continue;
	}
	if ($part->mimetype == 'application/ms-tnef') {
	continue;
	}
	// skip inline images when forwarding in plain text
	if ($part->content_id && !$bodyIsHtml && $compose_mode == RCUBE_COMPOSE_FORWARD) {
	continue;
	}

	$skip = false;
	if ($part->mimetype == 'message/rfc822') {
	$messages[] = $part->mime_id;
	} else if ($messages) {
	// skip attachments included in message/rfc822 attachment (#1486487)
	foreach ($messages as $mimeid)
	if (strpos($part->mime_id, $mimeid.'.') === 0) {
	$skip = true;
	break;
	}
	}

	if (!$skip && ($attachment = rcmail_save_attachment($message, $pid))) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	if ($bodyIsHtml && ($part->content_id \|\| $part->content_location)) {
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
	if ($part->content_id)
	$cid_map['cid:'.$part->content_id] = $url;
	else
	$cid_map[$part->content_location] = $url;
	}
	}
	}
	}

	$COMPOSE['forward_attachments'] = true;

	return $cid_map;
	}


	function rcmail_write_inline_attachments(&$message)
	{
	global $RCMAIL, $COMPOSE;

	$cid_map = array();
	foreach ((array)$message->mime_parts as $pid => $part) {
	if (($part->content_id \|\| $part->content_location) && $part->filename) {
	if ($attachment = rcmail_save_attachment($message, $pid)) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
	if ($part->content_id)
	$cid_map['cid:'.$part->content_id] = $url;
	else
	$cid_map[$part->content_location] = $url;
	}
	}
	}

	return $cid_map;
	}

	-// Creates an attachment from the forwarded message
	-function rcmail_write_forward_attachment(&$message)
	+// Creates attachment(s) from the forwarded message(s)
	+function rcmail_write_forward_attachments()
	{
	- global $RCMAIL, $COMPOSE;
	+ global $RCMAIL, $COMPOSE, $MESSAGE;
	+
	+ $storage = $RCMAIL->get_storage();
	+ $mem_limit = parse_bytes(ini_get('memory_limit'));
	+ $curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 1610241024; // safe value: 16MB
	+ $names = array();

	- if (strlen($message->subject)) {
	- $name = mb_substr($message->subject, 0, 64) . '.eml';
	+ if ($COMPOSE['forward_uid'] == '*') {
	+ $index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order());
	+ $COMPOSE['forward_uid'] = $index->get();
	}
	else {
	- $name = 'message_rfc822.eml';
	+ $COMPOSE['forward_uid'] = explode(',', $COMPOSE['forward_uid']);
	}

	- $mem_limit = parse_bytes(ini_get('memory_limit'));
	- $curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 1610241024; // safe value: 16MB
	- $data = $path = null;
	+ foreach ((array)$COMPOSE['forward_uid'] as $uid) {
	+ $message = new rcube_message($uid);

	- // don't load too big attachments into memory
	- if ($mem_limit > 0 && $message->size > $mem_limit - $curr_mem) {
	- $temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
	- $path = tempnam($temp_dir, 'rcmAttmnt');
	- if ($fp = fopen($path, 'w')) {
	- $RCMAIL->storage->get_raw_body($message->uid, $fp);
	- fclose($fp);
	- } else
	- return false;
	- } else {
	- $data = $RCMAIL->storage->get_raw_body($message->uid);
	- }
	+ if (empty($message->headers)) {
	+ continue;
	+ }

	- $attachment = array(
	- 'group' => $COMPOSE['id'],
	- 'name' => $name,
	- 'mimetype' => 'message/rfc822',
	- 'data' => $data,
	- 'path' => $path,
	- 'size' => $path ? filesize($path) : strlen($data),
	- );
	+ if (!empty($message->headers->charset)) {
	+ $storage->set_charset($message->headers->charset);
	+ }

	- $attachment = $RCMAIL->plugins->exec_hook('attachment_save', $attachment);
	+ if (empty($MESSAGE->subject)) {
	+ $MESSAGE->subject = $message->subject;
	+ }

	- if ($attachment['status']) {
	- unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
	- $COMPOSE['attachments'][$attachment['id']] = $attachment;
	- return true;
	- } else if ($path) {
	- @unlink($path);
	- }
	+ // generate (unique) attachment name
	+ $name = strlen($message->subject) ? mb_substr($message->subject, 0, 64) : 'message_rfc822';
	+ if (!empty($names[$name])) {
	+ $names[$name]++;
	+ $name .= '_' . $names[$name];
	+ }
	+ $names[$name] = 1;
	+ $name .= '.eml';
	+
	+ $data = $path = null;
	+
	+ // don't load too big attachments into memory
	+ if ($mem_limit > 0 && $message->size > $mem_limit - $curr_mem) {
	+ $temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
	+ $path = tempnam($temp_dir, 'rcmAttmnt');
	+ if ($fp = fopen($path, 'w')) {
	+ $storage->get_raw_body($message->uid, $fp);
	+ fclose($fp);
	+ }
	+ else {
	+ return false;
	+ }
	+ }
	+ else {
	+ $data = $storage->get_raw_body($message->uid);
	+ $curr_mem += $message->size;
	+ }

	- return false;
	+ $attachment = array(
	+ 'group' => $COMPOSE['id'],
	+ 'name' => $name,
	+ 'mimetype' => 'message/rfc822',
	+ 'data' => $data,
	+ 'path' => $path,
	+ 'size' => $path ? filesize($path) : strlen($data),
	+ );
	+
	+ $attachment = $RCMAIL->plugins->exec_hook('attachment_save', $attachment);
	+
	+ if ($attachment['status']) {
	+ unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
	+ $COMPOSE['attachments'][$attachment['id']] = $attachment;
	+ }
	+ else if ($path) {
	+ @unlink($path);
	+ }
	+ }
	}


	function rcmail_save_attachment(&$message, $pid)
	{
	global $COMPOSE;

	$rcmail = rcmail::get_instance();
	$part = $message->mime_parts[$pid];
	$mem_limit = parse_bytes(ini_get('memory_limit'));
	$curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 1610241024; // safe value: 16MB
	$data = $path = null;

	// don't load too big attachments into memory
	if ($mem_limit > 0 && $part->size > $mem_limit - $curr_mem) {
	$temp_dir = unslashify($rcmail->config->get('temp_dir'));
	$path = tempnam($temp_dir, 'rcmAttmnt');
	if ($fp = fopen($path, 'w')) {
	$message->get_part_content($pid, $fp);
	fclose($fp);
	} else
	return false;
	} else {
	$data = $message->get_part_content($pid);
	}

	$mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
	$filename = $part->filename;
	if (!strlen($filename)) {
	if ($mimetype == 'text/html') {
	$filename = rcube_label('htmlmessage');
	}
	else {
	$filename = 'Part_'.$pid;
	}
	$filename .= '.' . $part->ctype_secondary;
	}

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => $filename,
	'mimetype' => $mimetype,
	'content_id' => $part->content_id,
	'data' => $data,
	'path' => $path,
	'size' => $path ? filesize($path) : strlen($data),
	);

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

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

	return false;
	}

	function rcmail_save_image($path, $mimetype='')
	{
	global $COMPOSE;

	// handle attachments in memory
	$data = file_get_contents($path);

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => rcmail_basename($path),
	'mimetype' => $mimetype ? $mimetype : rc_mime_content_type($path, $name),
	'data' => $data,
	'size' => strlen($data),
	);

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

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

	return false;
	}

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

	function rcmail_compose_subject($attrib)
	{
	global $MESSAGE, $COMPOSE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_subject';
	$attrib['spellcheck'] = 'true';
	$textfield = new html_inputfield($attrib);

	$subject = '';

	// use subject from post
	if (isset($_POST['_subject'])) {
	$subject = get_input_value('_subject', RCUBE_INPUT_POST, TRUE);
	}
	// create a reply-subject
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	if (preg_match('/^re:/i', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Re: '.$MESSAGE->subject;
	}
	// create a forward-subject
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
	if (preg_match('/^fwd:/i', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Fwd: '.$MESSAGE->subject;
	}
	// creeate a draft-subject
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT) {
	$subject = $MESSAGE->subject;
	}
	else if (!empty($COMPOSE['param']['subject'])) {
	$subject = $COMPOSE['param']['subject'];
	}

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

	return $out;
	}


	function rcmail_compose_attachment_list($attrib)
	{
	global $OUTPUT, $CONFIG, $COMPOSE;

	// add ID if not given
	if (!$attrib['id'])
	$attrib['id'] = 'rcmAttachmentList';

	$out = "\n";
	$jslist = array();

	if (is_array($COMPOSE['attachments'])) {
	if ($attrib['deleteicon']) {
	$button = html::img(array(
	'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
	'alt' => rcube_label('delete')
	));
	}
	else
	$button = Q(rcube_label('delete'));

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

	$out .= html::tag('li', array('id' => 'rcmfile'.$id, 'class' => rcmail_filetype2classname($a_prop['mimetype'], $a_prop['name'])),
	html::a(array(
	'href' => "#delete",
	'title' => rcube_label('delete'),
	'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id),
	'class' => 'delete'),
	$button) . Q($a_prop['name']));

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

	if ($attrib['deleteicon'])
	$COMPOSE['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
	if ($attrib['cancelicon'])
	$OUTPUT->set_env('cancelicon', $CONFIG['skin_path'] . $attrib['cancelicon']);
	if ($attrib['loadingicon'])
	$OUTPUT->set_env('loadingicon', $CONFIG['skin_path'] . $attrib['loadingicon']);

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

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


	function rcmail_compose_attachment_form($attrib)
	{
	global $OUTPUT;

	// set defaults
	$attrib += array('id' => 'rcmUploadbox', 'buttons' => 'yes');

	// Get filesize, enable upload progress bar
	$max_filesize = rcube_upload_init();

	$button = new html_inputfield(array('type' => 'button'));

	$out = html::div($attrib,
	$OUTPUT->form_tag(array('id' => $attrib['id'].'Frm', 'name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
	html::div(null, rcmail_compose_attachment_field(array('size' => $attrib['attachmentfieldsize']))) .
	html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
	(get_boolean($attrib['buttons']) ? html::div('buttons',
	$button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
	$button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
	) : '')
	)
	);

	$OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');
	return $out;
	}


	function rcmail_compose_attachment_field($attrib)
	{
	$attrib['type'] = 'file';
	$attrib['name'] = '_attachments[]';
	$attrib['multiple'] = 'multiple';

	$field = new html_inputfield($attrib);
	return $field->show();
	}


	function rcmail_priority_selector($attrib)
	{
	global $MESSAGE;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_priority';
	$selector = new html_select($attrib);

	$selector->add(array(rcube_label('lowest'),
	rcube_label('low'),
	rcube_label('normal'),
	rcube_label('high'),
	rcube_label('highest')),
	array(5, 4, 0, 2, 1));

	if (isset($_POST['_priority']))
	$sel = $_POST['_priority'];
	else if (intval($MESSAGE->headers->priority) != 3)
	$sel = intval($MESSAGE->headers->priority);
	else
	$sel = 0;

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

	return $out;
	}


	function rcmail_receipt_checkbox($attrib)
	{
	global $RCMAIL, $MESSAGE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

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

	$attrib['name'] = '_receipt';
	$attrib['value'] = '1';
	$checkbox = new html_checkbox($attrib);

	if (isset($_POST['_receipt']))
	$mdn_default = $_POST['_receipt'];
	else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
	$mdn_default = (bool) $MESSAGE->headers->mdn_to;
	else
	$mdn_default = $RCMAIL->config->get('mdn_default');

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

	return $out;
	}


	function rcmail_dsn_checkbox($attrib)
	{
	global $RCMAIL;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

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

	$attrib['name'] = '_dsn';
	$attrib['value'] = '1';
	$checkbox = new html_checkbox($attrib);

	if (isset($_POST['_dsn']))
	$dsn_value = $_POST['_dsn'];
	else
	$dsn_value = $RCMAIL->config->get('dsn_default');

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

	return $out;
	}


	function rcmail_editor_selector($attrib)
	{
	// determine whether HTML or plain text should be checked
	$useHtml = rcmail_compose_editor_mode();

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

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

	$attrib['onchange'] = "return rcmail_toggle_editor(this, '".$attrib['editorid']."', '_is_html')";

	$select = new html_select($attrib);

	$select->add(Q(rcube_label('htmltoggle')), 'html');
	$select->add(Q(rcube_label('plaintoggle')), 'plain');

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

	foreach ($choices as $value => $text) {
	$attrib['id'] = '_' . $value;
	$attrib['value'] = $value;
	$selector .= $radio->show($chosenvalue, $attrib) . html::label($attrib['id'], Q(rcube_label($text)));
	}

	return $selector;
	}


	function rcmail_store_target_selection($attrib)
	{
	global $COMPOSE;

	$attrib['name'] = '_store_target';
	$select = rcmail_mailbox_select(array_merge($attrib, array(
	'noselection' => '- '.rcube_label('dontsave').' -',
	'folder_filter' => 'mail',
	'folder_rights' => 'w',
	)));
	return $select->show(isset($_POST['_store_target']) ? $_POST['_store_target'] : $COMPOSE['param']['sent_mbox'], $attrib);
	}


	function rcmail_check_sent_folder($folder, $create=false)
	{
	global $RCMAIL;

	// we'll not save the message, so it doesn't matter
	if ($RCMAIL->config->get('no_save_sent_messages')) {
	return true;
	}

	if ($RCMAIL->storage->folder_exists($folder, true)) {
	return true;
	}

	// folder may exist but isn't subscribed (#1485241)
	if ($create) {
	if (!$RCMAIL->storage->folder_exists($folder))
	return $RCMAIL->storage->create_folder($folder, true);
	else
	return $RCMAIL->storage->subscribe($folder);
	}

	return false;
	}


	function get_form_tags($attrib)
	{
	global $RCMAIL, $MESSAGE_FORM, $COMPOSE;

	$form_start = '';
	if (!$MESSAGE_FORM)
	{
	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
	$hiddenfields->add(array('name' => '_action', 'value' => 'send'));
	$hiddenfields->add(array('name' => '_id', 'value' => $COMPOSE['id']));
	$hiddenfields->add(array('name' => '_attachments'));

	$form_start = empty($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
	$form_start .= $hiddenfields->show();
	}

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

	if (!$MESSAGE_FORM)
	$RCMAIL->output->add_gui_object('messageform', $form_name);

	$MESSAGE_FORM = $form_name;

	return array($form_start, $form_end);
	}


	function rcmail_addressbook_list($attrib = array())
	{
	global $RCMAIL, $OUTPUT;

	$attrib += array('id' => 'rcmdirectorylist');

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

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

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

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

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

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

	// return the contacts list as HTML table
	function rcmail_contacts_list($attrib = array())
	{
	global $OUTPUT;

	$attrib += array('id' => 'rcmAddressList');

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

	return rcube_table_output($attrib, array(), array('name'), 'ID');
	}


	/**
	* Register a certain container as active area to drop files onto
	*/
	function compose_file_drop_area($attrib)
	{
	global $OUTPUT;

	if ($attrib['id']) {
	$OUTPUT->add_gui_object('filedrop', $attrib['id']);
	$OUTPUT->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
	}
	}


	// register UI objects
	$OUTPUT->add_handlers(array(
	'composeheaders' => 'rcmail_compose_headers',
	'composesubject' => 'rcmail_compose_subject',
	'composebody' => 'rcmail_compose_body',
	'composeattachmentlist' => 'rcmail_compose_attachment_list',
	'composeattachmentform' => 'rcmail_compose_attachment_form',
	'composeattachment' => 'rcmail_compose_attachment_field',
	'filedroparea' => 'compose_file_drop_area',
	'priorityselector' => 'rcmail_priority_selector',
	'editorselector' => 'rcmail_editor_selector',
	'receiptcheckbox' => 'rcmail_receipt_checkbox',
	'dsncheckbox' => 'rcmail_dsn_checkbox',
	'storetarget' => 'rcmail_store_target_selection',
	'addressbooks' => 'rcmail_addressbook_list',
	'addresslist' => 'rcmail_contacts_list',
	));

	$OUTPUT->send('compose');
	diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
	index c56c914cd..574d6e975 100644
	--- a/program/steps/mail/folders.inc
	+++ b/program/steps/mail/folders.inc
	@@ -1,81 +1,82 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/folders.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Implement folder operations line EXPUNGE and Clear \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// only process ajax requests
	if (!$OUTPUT->ajax_call)
	return;

	$mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);

	// send EXPUNGE command
	if ($RCMAIL->action == 'expunge') {

	$success = $RCMAIL->storage->expunge_folder($mbox);

	// reload message list if current mailbox
	if ($success) {
	$OUTPUT->show_message('folderexpunged', 'confirmation');

	if (!empty($_REQUEST['_reload'])) {
	$OUTPUT->command('set_quota', rcmail_quota_content());
	$OUTPUT->command('message_list.clear');
	$RCMAIL->action = 'list';
	return;
	}
	}
	else {
	rcmail_display_server_error();
	}
	}

	// clear mailbox
	else if ($RCMAIL->action == 'purge')
	{
	$delimiter = $RCMAIL->storage->get_hierarchy_delimiter();
	$trash_regexp = '/^' . preg_quote($CONFIG['trash_mbox'] . $delimiter, '/') . '/';
	$junk_regexp = '/^' . preg_quote($CONFIG['junk_mbox'] . $delimiter, '/') . '/';

	// we should only be purging trash and junk (or their subfolders)
	if ($mbox == $CONFIG['trash_mbox'] \|\| $mbox == $CONFIG['junk_mbox']
	\|\| preg_match($trash_regexp, $mbox) \|\| preg_match($junk_regexp, $mbox)
	) {
	$success = $RCMAIL->storage->clear_folder($mbox);

	if ($success) {
	$OUTPUT->show_message('folderpurged', 'confirmation');

	if (!empty($_REQUEST['_reload'])) {
	$OUTPUT->set_env('messagecount', 0);
	$OUTPUT->set_env('pagecount', 0);
	+ $OUTPUT->set_env('exists', 0);
	$OUTPUT->command('message_list.clear');
	$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text(), $mbox);
	$OUTPUT->command('set_unread_count', $mbox, 0);
	$OUTPUT->command('set_quota', rcmail_quota_content());
	rcmail_set_unseen_count($mbox, 0);
	}
	}
	else {
	rcmail_display_server_error();
	}
	}
	}

	$OUTPUT->send();
	diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
	index b433f81fc..b8c3ee021 100644
	--- a/program/steps/mail/list.inc
	+++ b/program/steps/mail/list.inc
	@@ -1,120 +1,121 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/list.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2007, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Send message list to client (as remote response) \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	if (!$OUTPUT->ajax_call) {
	return;
	}

	$save_arr = array();
	$dont_override = (array) $RCMAIL->config->get('dont_override');

	// is there a sort type for this request?
	if ($sort = get_input_value('_sort', RCUBE_INPUT_GET)) {
	// yes, so set the sort vars
	list($sort_col, $sort_order) = explode('_', $sort);

	// set session vars for sort (so next page and task switch know how to sort)
	if (!in_array('message_sort_col', $dont_override)) {
	$_SESSION['sort_col'] = $save_arr['message_sort_col'] = $sort_col;
	}
	if (!in_array('message_sort_order', $dont_override)) {
	$_SESSION['sort_order'] = $save_arr['message_sort_order'] = $sort_order;
	}
	}

	// is there a set of columns for this request?
	if ($cols = get_input_value('_cols', RCUBE_INPUT_GET)) {
	if (!in_array('list_cols', $dont_override)) {
	$save_arr['list_cols'] = explode(',', $cols);
	}
	}

	if (!empty($save_arr)) {
	$RCMAIL->user->save_prefs($save_arr);
	}

	$mbox_name = $RCMAIL->storage->get_folder();
	$threading = (bool) $RCMAIL->storage->get_threading();

	// Synchronize mailbox cache, handle flag changes
	$RCMAIL->storage->folder_sync($mbox_name);

	// 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->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, rcmail_sort_column());
	$_SESSION['search'] = $RCMAIL->storage->get_search_set();
	$_SESSION['search_request'] = $search_request;
	$OUTPUT->set_env('search_request', $search_request);
	}

	// fetch message headers
	if ($count = $RCMAIL->storage->count($mbox_name, $threading ? 'THREADS' : 'ALL', !empty($_REQUEST['_refresh'])))
	$a_headers = $RCMAIL->storage->list_messages($mbox_name, NULL, rcmail_sort_column(), rcmail_sort_order());

	// update search set (possible change of threading mode)
	if (!empty($_REQUEST['_search']) && isset($_SESSION['search'])
	&& $_SESSION['search_request'] == $_REQUEST['_search']
	) {
	$_SESSION['search'] = $RCMAIL->storage->get_search_set();
	}
	// remove old search data
	else if (empty($_REQUEST['_search']) && isset($_SESSION['search'])) {
	$RCMAIL->session->remove('search');
	}

	// empty result? we'll skip UNSEEN counting in rcmail_send_unread_count()
	if (empty($search_request) && empty($a_headers)) {
	$unseen = 0;
	}

	// update mailboxlist
	rcmail_send_unread_count($mbox_name, !empty($_REQUEST['_refresh']), $unseen);

	// update message count display
	$pages = ceil($count/$RCMAIL->storage->get_pagesize());
	$OUTPUT->set_env('messagecount', $count);
	$OUTPUT->set_env('pagecount', $pages);
	$OUTPUT->set_env('threading', $threading);
	$OUTPUT->set_env('current_page', $count ? $RCMAIL->storage->get_page() : 1);
	+$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
	$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count), $mbox_name);
	$OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text());

	// add message rows
	rcmail_js_message_list($a_headers, FALSE, $cols);
	if (isset($a_headers) && count($a_headers)) {
	if ($search_request) {
	$OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
	}
	}
	else {
	// handle IMAP errors (e.g. #1486905)
	if ($err_code = $RCMAIL->storage->get_error_code()) {
	rcmail_display_server_error();
	}
	else if ($search_request)
	$OUTPUT->show_message('searchnomatch', 'notice');
	else
	$OUTPUT->show_message('nomessagesfound', 'notice');
	}

	// send response
	$OUTPUT->send();
	diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
	index da43b4000..3e2252683 100644
	--- a/program/steps/mail/move_del.inc
	+++ b/program/steps/mail/move_del.inc
	@@ -1,148 +1,147 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/move_del.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Move the submitted messages to a specific mailbox or delete them \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// only process ajax requests
	if (!$OUTPUT->ajax_call)
	return;

	// count messages before changing anything
	$threading = (bool) $RCMAIL->storage->get_threading();
	$old_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
	$old_pages = ceil($old_count / $RCMAIL->storage->get_pagesize());

	// move messages
	if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
	$count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
	$target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true);
	$mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);

	$moved = $RCMAIL->storage->move_message($uids, $target, $mbox);

	if (!$moved) {
	// send error message
	- if ($_POST['_from'] != 'show')
	+ if ($_POST['_from'] != 'show')
	$OUTPUT->command('list_mailbox');
	rcmail_display_server_error('errormoving');
	$OUTPUT->send();
	exit;
	}
	else {
	$OUTPUT->show_message('messagemoved', 'confirmation');
	}

	$addrows = true;
	}
	// delete messages
	else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
	$count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
	$mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);

	$del = $RCMAIL->storage->delete_message($uids, $mbox);

	if (!$del) {
	// send error message
	- if ($_POST['_from'] != 'show')
	+ if ($_POST['_from'] != 'show')
	$OUTPUT->command('list_mailbox');
	rcmail_display_server_error('errordeleting');
	$OUTPUT->send();
	exit;
	}
	else {
	$OUTPUT->show_message('messagedeleted', 'confirmation');
	}

	$addrows = true;
	}
	// unknown action or missing query param
	else {
	exit;
	}

	$search_request = get_input_value('_search', RCUBE_INPUT_GPC);

	// refresh saved search set after moving some messages
	if ($search_request && $RCMAIL->storage->get_search_set()) {
	$_SESSION['search'] = $RCMAIL->storage->refresh_search();
	}

	if ($_POST['_from'] == 'show')
	{
	if ($next = get_input_value('_next_uid', RCUBE_INPUT_GPC))
	$OUTPUT->command('show_message', $next);
	else
	$OUTPUT->command('command', 'list');
	}
	else
	{
	$msg_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
	$page_size = $RCMAIL->storage->get_pagesize();
	$page = $RCMAIL->storage->get_page();
	$pages = ceil($msg_count / $page_size);
	$nextpage_count = $old_count - $page_size * $page;
	$remaining = $msg_count - $page_size * ($page - 1);

	// jump back one page (user removed the whole last page)
	if ($page > 1 && $remaining == 0) {
	$page -= 1;
	$RCMAIL->storage->set_page($page);
	$_SESSION['page'] = $page;
	$jump_back = true;
	}

	// update message count display
	$OUTPUT->set_env('messagecount', $msg_count);
	$OUTPUT->set_env('current_page', $page);
	$OUTPUT->set_env('pagecount', $pages);
	+ $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox, 'EXISTS', true));

	// update mailboxlist
	$mbox = $RCMAIL->storage->get_folder();
	$unseen_count = $msg_count ? $RCMAIL->storage->count($mbox, 'UNSEEN') : 0;
	$old_unseen = rcmail_get_unseen_count($mbox);

	if ($old_unseen != $unseen_count) {
	$OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
	rcmail_set_unseen_count($mbox, $unseen_count);
	}

	if ($RCMAIL->action == 'moveto' && strlen($target)) {
	rcmail_send_unread_count($target, true);
	}

	$OUTPUT->command('set_quota', rcmail_quota_content());
	$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);

	if ($threading) {
	$count = get_input_value('_count', RCUBE_INPUT_POST);
	}

	// add new rows from next page (if any)
	if ($addrows && $count && $uids != '*' && ($jump_back \|\| $nextpage_count > 0)) {
	$a_headers = $RCMAIL->storage->list_messages($mbox, NULL,
	rcmail_sort_column(), rcmail_sort_order(), $jump_back ? NULL : $count);

	rcmail_js_message_list($a_headers, false);
	}
	}

	// send response
	$OUTPUT->send();
	-
	-
	diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
	index db5424b3b..f9b8f9e67 100644
	--- a/program/steps/mail/search.inc
	+++ b/program/steps/mail/search.inc
	@@ -1,147 +1,148 @@
	<?php
	/*
	+-----------------------------------------------------------------------+
	\| steps/mail/search.inc \|
	\| \|
	\| Search functions for rc webmail \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Benjamin Smith <defitro@gmail.com> \|
	\| Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$REMOTE_REQUEST = TRUE;

	// reset list_page and old search results
	$RCMAIL->storage->set_page(1);
	$RCMAIL->storage->set_search_set(NULL);
	$_SESSION['page'] = 1;

	// using encodeURI with javascript "should" give us
	// a correctly encoded query string
	$imap_charset = RCMAIL_CHARSET;

	// get search string
	$str = get_input_value('_q', RCUBE_INPUT_GET, true);
	$mbox = get_input_value('_mbox', RCUBE_INPUT_GET, true);
	$filter = get_input_value('_filter', RCUBE_INPUT_GET);
	$headers = get_input_value('_headers', RCUBE_INPUT_GET);
	$subject = array();

	$search_request = md5($mbox.$filter.$str);

	// add list filter string
	$search_str = $filter && $filter != 'ALL' ? $filter : '';

	$_SESSION['search_filter'] = $filter;

	// Check the search string for type of search
	if (preg_match("/^from:.*/i", $str))
	{
	list(,$srch) = explode(":", $str);
	$subject['from'] = "HEADER FROM";
	}
	else if (preg_match("/^to:.*/i", $str))
	{
	list(,$srch) = explode(":", $str);
	$subject['to'] = "HEADER TO";
	}
	else if (preg_match("/^cc:.*/i", $str))
	{
	list(,$srch) = explode(":", $str);
	$subject['cc'] = "HEADER CC";
	}
	else if (preg_match("/^bcc:.*/i", $str))
	{
	list(,$srch) = explode(":", $str);
	$subject['bcc'] = "HEADER BCC";
	}
	else if (preg_match("/^subject:.*/i", $str))
	{
	list(,$srch) = explode(":", $str);
	$subject['subject'] = "HEADER SUBJECT";
	}
	else if (preg_match("/^body:.*/i", $str))
	{
	list(,$srch) = explode(":", $str);
	$subject['text'] = "TEXT";
	}
	else if (strlen(trim($str)))
	{
	if ($headers) {
	foreach (explode(',', $headers) as $header) {
	if ($header == 'text') {
	// #1488208: get rid of other headers when searching by "TEXT"
	$subject = array('text' => 'TEXT');
	break;
	}
	else {
	$subject[$header] = 'HEADER '.strtoupper($header);
	}
	}

	// save search modifiers for the current folder to user prefs
	$search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);
	$search_mods[$mbox] = array_fill_keys(array_keys($subject), 1);
	$RCMAIL->user->save_prefs(array('search_mods' => $search_mods));
	} else {
	// search in subject by default
	$subject['subject'] = 'HEADER SUBJECT';
	}
	}

	$search = isset($srch) ? trim($srch) : trim($str);

	if (!empty($subject)) {
	$search_str .= str_repeat(' OR', count($subject)-1);
	foreach ($subject as $sub)
	$search_str .= ' ' . $sub . ' ' . rcube_imap_generic::escape($search);
	}

	$search_str = trim($search_str);
	$sort_column = rcmail_sort_column();

	// execute IMAP search
	if ($search_str)
	$RCMAIL->storage->search($mbox, $search_str, $imap_charset, $sort_column);

	// save search results in session
	if (!is_array($_SESSION['search']))
	$_SESSION['search'] = array();

	if ($search_str) {
	$_SESSION['search'] = $RCMAIL->storage->get_search_set();
	$_SESSION['last_text_search'] = $str;
	}
	$_SESSION['search_request'] = $search_request;


	// Get the headers
	$result_h = $RCMAIL->storage->list_messages($mbox, 1, $sort_column, rcmail_sort_order());
	$count = $RCMAIL->storage->count($mbox, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');

	// Make sure we got the headers
	if (!empty($result_h)) {
	rcmail_js_message_list($result_h);
	if ($search_str)
	$OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->storage->count(NULL, 'ALL')));
	}
	// handle IMAP errors (e.g. #1486905)
	else if ($err_code = $RCMAIL->storage->get_error_code()) {
	rcmail_display_server_error();
	}
	else {
	$OUTPUT->show_message('searchnomatch', 'notice');
	}

	// update message count display
	$OUTPUT->set_env('search_request', $search_str ? $search_request : '');
	$OUTPUT->set_env('messagecount', $count);
	$OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize()));
	+$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
	$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox);
	$OUTPUT->send();
	diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
	index c26d774a2..d48834bb4 100644
	--- a/program/steps/mail/sendmail.inc
	+++ b/program/steps/mail/sendmail.inc
	@@ -1,826 +1,825 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/sendmail.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2011, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Compose a new mail message with all headers and attachments \|
	\| and send it using the PEAR::Net_SMTP class or with PHP mail() \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// remove all scripts and act as called in frame
	$OUTPUT->reset();
	$OUTPUT->framed = TRUE;

	$savedraft = !empty($_POST['_draft']) ? true : false;

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

	/**** checks ******/

	if (!isset($COMPOSE['id'])) {
	raise_error(array('code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid compose ID"), true, false);

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

	if (!$savedraft) {
	if (empty($_POST['_to']) && empty($_POST['_cc']) && empty($_POST['_bcc'])
	&& empty($_POST['_subject']) && $_POST['_message']) {
	$OUTPUT->show_message('sendingfailed', 'error');
	$OUTPUT->send('iframe');
	}

	if(!empty($CONFIG['sendmail_delay'])) {
	$wait_sec = time() - intval($CONFIG['sendmail_delay']) - intval($CONFIG['last_message_time']);
	if ($wait_sec < 0) {
	$OUTPUT->show_message('senttooquickly', 'error', array('sec' => $wait_sec * -1));
	$OUTPUT->send('iframe');
	}
	}
	}


	/**** message sending functions ******/

	// encrypt parts of the header
	function rcmail_encrypt_header($what)
	{
	global $CONFIG, $RCMAIL;
	if (!$CONFIG['http_received_header_encrypt']) {
	return $what;
	}
	return $RCMAIL->encrypt($what);
	}

	// get identity record
	function rcmail_get_identity($id)
	{
	global $RCMAIL, $message_charset;
	global $RCMAIL;

	if ($sql_arr = $RCMAIL->user->get_identity($id)) {
	$out = $sql_arr;

	if ($message_charset != RCMAIL_CHARSET) {
	foreach ($out as $k => $v)
	$out[$k] = rcube_charset_convert($v, RCMAIL_CHARSET, $message_charset);
	}

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

	return $out;
	}

	return FALSE;
	}

	/**
	* go from this:
	* <img src="http[s]://.../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
	*
	* to this:
	*
	* <img src="/path/on/server/.../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
	*/
	function rcmail_fix_emoticon_paths($mime_message)
	{
	global $RCMAIL;

	$body = $mime_message->getHTMLBody();

	// remove any null-byte characters before parsing
	$body = preg_replace('/\x00/', '', $body);

	$searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
	$offset = 0;

	// keep track of added images, so they're only added once
	$included_images = array();

	if (preg_match_all('# src=[\'"]([^\'"]+)#', $body, $matches, PREG_OFFSET_CAPTURE)) {
	foreach ($matches[1] as $m) {
	// find emoticon image tags
	if (preg_match('#'.$searchstr.'(.*)$#', $m[0], $imatches)) {
	$image_name = $imatches[1];

	// sanitize image name so resulting attachment doesn't leave images dir
	$image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i', '', $image_name);
	$img_file = INSTALL_PATH . '/' . $searchstr . $image_name;

	if (! in_array($image_name, $included_images)) {
	// add the image to the MIME message
	if (!$mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name)) {
	$RCMAIL->output->show_message("emoticonerror", 'error');
	}
	array_push($included_images, $image_name);
	}

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

	$mime_message->setHTMLBody($body);
	}

	/**
	* Extract image attachments from HTML content (data URIs)
	*/
	function rcmail_extract_inline_images($mime_message, $from)
	{
	$body = $mime_message->getHTMLBody();
	$offset = 0;
	$list = array();
	$regexp = '# src=[\'"](data:(image/[a-z]+);base64,([a-z0-9+/=\r\n]+))([\'"])#i';

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

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

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

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

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

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

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

	$mime_message->setHTMLBody($body);
	}

	/**
	* Parse and cleanup email address input (and count addresses)
	*
	* @param string Address input
	* @param boolean Do count recipients (saved in global $RECIPIENT_COUNT)
	* @param boolean Validate addresses (errors saved in global $EMAIL_FORMAT_ERROR)
	* @return string Canonical recipients string separated by comma
	*/
	function rcmail_email_input_format($mailto, $count=false, $check=true)
	{
	global $RCMAIL, $EMAIL_FORMAT_ERROR, $RECIPIENT_COUNT;

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

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

	// replace new lines and strip ending ', ', make address input more valid
	$mailto = trim(preg_replace($regexp, $replace, $mailto));

	$result = array();
	$items = rcube_explode_quoted_string($delim, $mailto);

	foreach($items as $item) {
	$item = trim($item);
	// address in brackets without name (do nothing)
	if (preg_match('/^<'.$email_regexp.'>$/', $item)) {
	$item = rcube_idn_to_ascii(trim($item, '<>'));
	$result[] = '<' . $item . '>';
	// address without brackets and without name (add brackets)
	} else if (preg_match('/^'.$email_regexp.'$/', $item)) {
	$item = rcube_idn_to_ascii($item);
	$result[] = '<' . $item . '>';
	// address with name (handle name)
	} else if (preg_match('/<'.$email_regexp.'>$/', $item, $matches)) {
	$address = $matches[0];
	$name = trim(str_replace($address, '', $item));
	if ($name[0] == '"' && $name[count($name)-1] == '"') {
	$name = substr($name, 1, -1);
	}
	$name = stripcslashes($name);
	$address = rcube_idn_to_ascii(trim($address, '<>'));
	$result[] = format_email_recipient($address, $name);
	$item = $address;
	} else if (trim($item)) {
	continue;
	}

	// check address format
	$item = trim($item, '<>');
	if ($item && $check && !check_email($item)) {
	$EMAIL_FORMAT_ERROR = $item;
	return;
	}
	}

	if ($count) {
	$RECIPIENT_COUNT += count($result);
	}

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


	/**** compose message ******/

	if (strlen($_POST['_draft_saveid']) > 3)
	$olddraftmessageid = get_input_value('_draft_saveid', RCUBE_INPUT_POST);

	$message_id = rcmail_gen_message_id();

	// set default charset
	$message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $OUTPUT->get_charset();

	$EMAIL_FORMAT_ERROR = NULL;
	$RECIPIENT_COUNT = 0;

	$mailto = rcmail_email_input_format(get_input_value('_to', RCUBE_INPUT_POST, TRUE, $message_charset), true);
	$mailcc = rcmail_email_input_format(get_input_value('_cc', RCUBE_INPUT_POST, TRUE, $message_charset), true);
	$mailbcc = rcmail_email_input_format(get_input_value('_bcc', RCUBE_INPUT_POST, TRUE, $message_charset), true);

	if ($EMAIL_FORMAT_ERROR) {
	$OUTPUT->show_message('emailformaterror', 'error', array('email' => $EMAIL_FORMAT_ERROR));
	$OUTPUT->send('iframe');
	}

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

	// Get sender name and address...
	$from = get_input_value('_from', RCUBE_INPUT_POST, true, $message_charset);
	// ... from identity...
	if (is_numeric($from)) {
	if (is_array($identity_arr = rcmail_get_identity($from))) {
	if ($identity_arr['mailto'])
	$from = $identity_arr['mailto'];
	if ($identity_arr['string'])
	$from_string = $identity_arr['string'];
	}
	else {
	$from = null;
	}
	}
	// ... if there is no identity record, this might be a custom from
	else if ($from_string = rcmail_email_input_format($from)) {
	if (preg_match('/(\S+@\S+)/', $from_string, $m))
	$from = trim($m[1], '<>');
	else
	$from = null;
	}

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

	// compose headers array
	$headers = array();

	// if configured, the Received headers goes to top, for good measure
	if ($CONFIG['http_received_header'])
	{
	$nldlm = "\r\n\t";
	// FROM/VIA
	$http_header = 'from ';
	if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
	$host = $_SERVER['HTTP_X_FORWARDED_FOR'];
	$hostname = gethostbyaddr($host);
	if ($CONFIG['http_received_header_encrypt']) {
	$http_header .= rcmail_encrypt_header($hostname);
	if ($host != $hostname)
	$http_header .= ' ('. rcmail_encrypt_header($host) . ')';
	} else {
	$http_header .= (($host != $hostname) ? $hostname : '[' . $host . ']');
	if ($host != $hostname)
	$http_header .= ' (['. $host .'])';
	}
	$http_header .= $nldlm . ' via ';
	}
	$host = $_SERVER['REMOTE_ADDR'];
	$hostname = gethostbyaddr($host);
	if ($CONFIG['http_received_header_encrypt']) {
	$http_header .= rcmail_encrypt_header($hostname);
	if ($host != $hostname)
	$http_header .= ' ('. rcmail_encrypt_header($host) . ')';
	} else {
	$http_header .= (($host != $hostname) ? $hostname : '[' . $host . ']');
	if ($host != $hostname)
	$http_header .= ' (['. $host .'])';
	}
	// BY
	$http_header .= $nldlm . 'by ' . $_SERVER['HTTP_HOST'];
	// WITH
	$http_header .= $nldlm . 'with HTTP (' . $_SERVER['SERVER_PROTOCOL'] .
	' '.$_SERVER['REQUEST_METHOD'] . '); ' . date('r');
	$http_header = wordwrap($http_header, 69, $nldlm);

	$headers['Received'] = $http_header;
	}

	$headers['Date'] = rcmail_user_date();
	$headers['From'] = rcube_charset_convert($from_string, RCMAIL_CHARSET, $message_charset);
	$headers['To'] = $mailto;

	// additional recipients
	if (!empty($mailcc)) {
	$headers['Cc'] = $mailcc;
	}
	if (!empty($mailbcc)) {
	$headers['Bcc'] = $mailbcc;
	}
	if (!empty($identity_arr['bcc']) && stripos($headers['Bcc'], $identity_arr['bcc']) === false) {
	$headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
	$RECIPIENT_COUNT ++;
	}

	if (($max_recipients = (int) $RCMAIL->config->get('max_recipients')) > 0) {
	if ($RECIPIENT_COUNT > $max_recipients) {
	$OUTPUT->show_message('toomanyrecipients', 'error', array('max' => $max_recipients));
	$OUTPUT->send('iframe');
	}
	}

	// add subject
	$headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, TRUE, $message_charset));

	if (!empty($identity_arr['organization'])) {
	$headers['Organization'] = $identity_arr['organization'];
	}
	if (!empty($_POST['_replyto'])) {
	$headers['Reply-To'] = rcmail_email_input_format(get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
	}
	else if (!empty($identity_arr['reply-to'])) {
	$headers['Reply-To'] = rcmail_email_input_format($identity_arr['reply-to'], false, true);
	}
	if (!empty($headers['Reply-To'])) {
	$headers['Mail-Reply-To'] = $headers['Reply-To'];
	}
	if (!empty($_POST['_followupto'])) {
	$headers['Mail-Followup-To'] = rcmail_email_input_format(get_input_value('_followupto', RCUBE_INPUT_POST, TRUE, $message_charset));
	}
	if (!empty($COMPOSE['reply_msgid'])) {
	$headers['In-Reply-To'] = $COMPOSE['reply_msgid'];
	}

	// remember reply/forward UIDs in special headers
	if (!empty($COMPOSE['reply_uid']) && $savedraft) {
	$headers['X-Draft-Info'] = array('type' => 'reply', 'uid' => $COMPOSE['reply_uid']);
	}
	else if (!empty($COMPOSE['forward_uid']) && $savedraft) {
	$headers['X-Draft-Info'] = array('type' => 'forward', 'uid' => $COMPOSE['forward_uid']);
	}

	if (!empty($COMPOSE['references'])) {
	$headers['References'] = $COMPOSE['references'];
	}

	if (!empty($_POST['_priority'])) {
	$priority = intval($_POST['_priority']);
	$a_priorities = array(1=>'highest', 2=>'high', 4=>'low', 5=>'lowest');
	if ($str_priority = $a_priorities[$priority]) {
	$headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($str_priority));
	}
	}

	if (!empty($_POST['_receipt'])) {
	$headers['Return-Receipt-To'] = $from_string;
	$headers['Disposition-Notification-To'] = $from_string;
	}

	// additional headers
	$headers['Message-ID'] = $message_id;
	$headers['X-Sender'] = $from;

	if (is_array($headers['X-Draft-Info'])) {
	$headers['X-Draft-Info'] = rcmail_draftinfo_encode($headers['X-Draft-Info'] + array('folder' => $COMPOSE['mailbox']));
	}
	if (!empty($CONFIG['useragent'])) {
	$headers['User-Agent'] = $CONFIG['useragent'];
	}

	// exec hook for header checking and manipulation
	$data = $RCMAIL->plugins->exec_hook('message_outgoing_headers', array('headers' => $headers));

	// sending aborted by plugin
	if ($data['abort'] && !$savedraft) {
	$OUTPUT->show_message($data['message'] ? $data['message'] : 'sendingfailed');
	$OUTPUT->send('iframe');
	}
	else
	$headers = $data['headers'];


	$isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);

	// fetch message body
	$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);

	if ($isHtml) {
	$font = rcube_fontdefs($RCMAIL->config->get('default_font', 'Verdana'));
	$bstyle = $font && is_string($font) ? " style='font-family: $font'" : '';

	// append doctype and html/body wrappers
	$message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">' .
	"\r\n<html><body$bstyle>\r\n" . $message_body;
	}

	if (!$savedraft) {
	if ($isHtml) {
	// remove signature's div ID
	$message_body = preg_replace('/\s*id="_rc_sig"/', '', $message_body);

	// add inline css for blockquotes
	$bstyle = 'padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%';
	$message_body = preg_replace('/<blockquote>/',
	'<blockquote type="cite" style="'.$bstyle.'">', $message_body);
	}

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

	$COMPOSE['spell_checked'] = true;

	if (!$spell_result) {
	$result = $isHtml ? $spellchecker->get_words() : $spellchecker->get_xml();
	$OUTPUT->show_message('mispellingsfound', 'error');
	$OUTPUT->command('spellcheck_resume', $isHtml, $result);
	$OUTPUT->send('iframe');
	}
	}

	// generic footer for all messages
	if ($isHtml && !empty($CONFIG['generic_message_footer_html'])) {
	$footer = file_get_contents(realpath($CONFIG['generic_message_footer_html']));
	$footer = rcube_charset_convert($footer, RCMAIL_CHARSET, $message_charset);
	}
	else if (!empty($CONFIG['generic_message_footer'])) {
	$footer = file_get_contents(realpath($CONFIG['generic_message_footer']));
	$footer = rcube_charset_convert($footer, RCMAIL_CHARSET, $message_charset);
	if ($isHtml)
	$footer = '<pre>'.$footer.'</pre>';
	}

	if ($footer)
	$message_body .= "\r\n" . $footer;
	}

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

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

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

	// set line length for body wrapping
	$LINE_LENGTH = $RCMAIL->config->get('line_length', 72);

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

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

	// Check if we have enough memory to handle the message in it
	// It's faster than using files, so we'll do this if we only can
	if (is_array($COMPOSE['attachments']) && $CONFIG['smtp_server']
	&& ($mem_limit = parse_bytes(ini_get('memory_limit'))))
	{
	$memory = function_exists('memory_get_usage') ? memory_get_usage() : 1610241024; // safe value: 16MB

	foreach ($COMPOSE['attachments'] as $id => $attachment)
	$memory += $attachment['size'];

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

	// For HTML-formatted messages, construct the MIME message with both
	// the HTML part and the plain-text part

	if ($isHtml) {
	$plugin = $RCMAIL->plugins->exec_hook('message_outgoing_body',
	array('body' => $message_body, 'type' => 'html', 'message' => $MAIL_MIME));

	$MAIL_MIME->setHTMLBody($plugin['body']);

	// replace emoticons
	$plugin['body'] = rcmail_replace_emoticons($plugin['body']);

	// add a plain text version of the e-mail as an alternative part.
	$h2t = new html2text($plugin['body'], false, true, 0, $message_charset);
	$plainTextPart = rc_wordwrap($h2t->get_text(), $LINE_LENGTH, "\r\n", false, $message_charset);
	$plainTextPart = wordwrap($plainTextPart, 998, "\r\n", true);

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

	$plugin = $RCMAIL->plugins->exec_hook('message_outgoing_body',
	array('body' => $plainTextPart, 'type' => 'alternative', 'message' => $MAIL_MIME));

	$MAIL_MIME->setTXTBody($plugin['body']);

	// look for "emoticon" images from TinyMCE and change their src paths to
	// be file paths on the server instead of URL paths.
	rcmail_fix_emoticon_paths($MAIL_MIME);

	// Extract image Data URIs into message attachments (#1488502)
	rcmail_extract_inline_images($MAIL_MIME, $from);
	}
	else {
	$plugin = $RCMAIL->plugins->exec_hook('message_outgoing_body',
	array('body' => $message_body, 'type' => 'plain', 'message' => $MAIL_MIME));

	$message_body = $plugin['body'];

	// compose format=flowed content if enabled
	if ($flowed = ($savedraft \|\| $RCMAIL->config->get('send_format_flowed', true)))
	$message_body = rcube_mime::format_flowed($message_body, min($LINE_LENGTH+2, 79), $message_charset);
	else
	$message_body = rc_wordwrap($message_body, $LINE_LENGTH, "\r\n", false, $message_charset);

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

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

	// add stored attachments, if any
	if (is_array($COMPOSE['attachments']))
	{
	foreach ($COMPOSE['attachments'] as $id => $attachment) {
	// This hook retrieves the attachment contents from the file storage backend
	$attachment = $RCMAIL->plugins->exec_hook('attachment_get', $attachment);

	$dispurl = '/\ssrc\s=\s[\'"]\S+display-attachment\S+file=rcmfile' . preg_quote($attachment['id']) . '[\s\'"]/';
	$message_body = $MAIL_MIME->getHTMLBody();
	if ($isHtml && (preg_match($dispurl, $message_body) > 0)) {
	$message_body = preg_replace($dispurl, ' src="'.$attachment['name'].'" ', $message_body);
	$MAIL_MIME->setHTMLBody($message_body);

	if ($attachment['data'])
	$MAIL_MIME->addHTMLImage($attachment['data'], $attachment['mimetype'], $attachment['name'], false);
	else
	$MAIL_MIME->addHTMLImage($attachment['path'], $attachment['mimetype'], $attachment['name'], true);
	}
	else {
	$ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914
	$file = $attachment['data'] ? $attachment['data'] : $attachment['path'];

	- // .eml attachments send inline
	$MAIL_MIME->addAttachment($file,
	$ctype,
	$attachment['name'],
	($attachment['data'] ? false : true),
	($ctype == 'message/rfc822' ? '8bit' : 'base64'),
	- ($ctype == 'message/rfc822' ? 'inline' : 'attachment'),
	+ 'attachment',
	'', '', '',
	$CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
	$CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL,
	'', RCMAIL_CHARSET
	);
	}
	}
	}

	// choose transfer encoding for plain/text body
	if (preg_match('/[^\x00-\x7F]/', $MAIL_MIME->getTXTBody()))
	$transfer_encoding = $RCMAIL->config->get('force_7bit') ? 'quoted-printable' : '8bit';
	else
	$transfer_encoding = '7bit';

	// encoding settings for mail composing
	$MAIL_MIME->setParam('text_encoding', $transfer_encoding);
	$MAIL_MIME->setParam('html_encoding', 'quoted-printable');
	$MAIL_MIME->setParam('head_encoding', 'quoted-printable');
	$MAIL_MIME->setParam('head_charset', $message_charset);
	$MAIL_MIME->setParam('html_charset', $message_charset);
	$MAIL_MIME->setParam('text_charset', $message_charset . ($flowed ? ";\r\n format=flowed" : ''));

	// encoding subject header with mb_encode provides better results with asian characters
	if (function_exists('mb_encode_mimeheader')) {
	mb_internal_encoding($message_charset);
	$headers['Subject'] = mb_encode_mimeheader($headers['Subject'],
	$message_charset, 'Q', "\r\n", 8);
	mb_internal_encoding(RCMAIL_CHARSET);
	}

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

	// Begin SMTP Delivery Block
	if (!$savedraft)
	{
	// check 'From' address (identity may be incomplete)
	if (empty($from)) {
	$OUTPUT->show_message('nofromaddress', 'error');
	$OUTPUT->send('iframe');
	}

	// Handle Delivery Status Notification request
	if (!empty($_POST['_dsn'])) {
	$smtp_opts['dsn'] = true;
	}

	$sent = rcmail_deliver_message($MAIL_MIME, $from, $mailto,
	$smtp_error, $mailbody_file, $smtp_opts);

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

	if ($smtp_error)
	$OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
	else
	$OUTPUT->show_message('sendingfailed', 'error');
	$OUTPUT->send('iframe');
	}

	// save message sent time
	if (!empty($CONFIG['sendmail_delay']))
	$RCMAIL->user->save_prefs(array('last_message_time' => time()));

	// set replied/forwarded flag
	if ($COMPOSE['reply_uid'])
	$RCMAIL->storage->set_flag($COMPOSE['reply_uid'], 'ANSWERED', $COMPOSE['mailbox']);
	else if ($COMPOSE['forward_uid'])
	$RCMAIL->storage->set_flag($COMPOSE['forward_uid'], 'FORWARDED', $COMPOSE['mailbox']);

	} // End of SMTP Delivery Block


	// Determine which folder to save message
	if ($savedraft)
	$store_target = $CONFIG['drafts_mbox'];
	else if (!$RCMAIL->config->get('no_save_sent_messages'))
	$store_target = isset($_POST['_store_target']) ? get_input_value('_store_target', RCUBE_INPUT_POST) : $CONFIG['sent_mbox'];

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

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

	// file already created
	if ($mailbody_file)
	$msg = $mailbody_file;
	else {
	$temp_dir = $RCMAIL->config->get('temp_dir');
	$mailbody_file = tempnam($temp_dir, 'rcmMsg');
	if (!PEAR::isError($msg = $MAIL_MIME->saveMessageBody($mailbody_file)))
	$msg = $mailbody_file;
	}
	}
	else {
	$msg = $MAIL_MIME->getMessage();
	$headers = '';
	}

	if (PEAR::isError($msg))
	raise_error(array('code' => 650, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not create message: ".$msg->getMessage()),
	TRUE, FALSE);
	else {
	$saved = $RCMAIL->storage->save_message($store_target, $msg, $headers,
	$mailbody_file ? true : false, array('SEEN'));
	}

	if ($mailbody_file) {
	unlink($mailbody_file);
	$mailbody_file = null;
	}
	}

	// raise error if saving failed
	if (!$saved) {
	raise_error(array('code' => 800, 'type' => 'imap',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not save message in $store_target"), TRUE, FALSE);

	if ($savedraft) {
	$OUTPUT->show_message('errorsaving', 'error');
	// start the auto-save timer again
	$OUTPUT->command('auto_save_start');
	$OUTPUT->send('iframe');
	}
	}

	if ($olddraftmessageid) {
	// delete previous saved draft
	// @TODO: use message UID (remember to check UIDVALIDITY) to skip this SEARCH
	$delete_idx = $RCMAIL->storage->search_once($CONFIG['drafts_mbox'],
	'HEADER Message-ID '.$olddraftmessageid);

	if ($del_uid = $delete_idx->get_element('FIRST')) {
	$deleted = $RCMAIL->storage->delete_message($del_uid, $CONFIG['drafts_mbox']);

	// raise error if deletion of old draft failed
	if (!$deleted)
	raise_error(array('code' => 800, 'type' => 'imap',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not delete message from ".$CONFIG['drafts_mbox']), TRUE, FALSE);
	}
	}
	}
	// remove temp file
	else if ($mailbody_file) {
	unlink($mailbody_file);
	}


	if ($savedraft) {
	$msgid = strtr($message_id, array('>' => '', '<' => ''));

	// remember new draft-uid ($saved could be an UID or TRUE here)
	if (is_bool($saved)) {
	$draft_idx = $RCMAIL->storage->search_once($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid);
	$saved = $draft_idx->get_element('FIRST');
	}
	$COMPOSE['param']['draft_uid'] = $saved;
	$plugin = $RCMAIL->plugins->exec_hook('message_draftsaved', array('msgid' => $msgid, 'uid' => $saved, 'folder' => $store_target));

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

	// update "_draft_saveid" and the "cmp_hash" to prevent "Unsaved changes" warning
	$OUTPUT->command('set_draft_id', $msgid);
	$OUTPUT->command('compose_field_hash', true);

	// start the auto-save timer again
	$OUTPUT->command('auto_save_start');

	$OUTPUT->send('iframe');
	}
	else {
	rcmail_compose_cleanup($COMPOSE_ID);

	if ($store_folder && !$saved)
	$OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'));
	else
	$OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'));
	$OUTPUT->send('iframe');
	}
	diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
	index eebb55708..371c83fd9 100644
	--- a/skins/classic/includes/messagetoolbar.html
	+++ b/skins/classic/includes/messagetoolbar.html
	@@ -1,63 +1,63 @@
	<div id="messagetoolbar">
	<roundcube:if condition="template:name == 'message' && env:extwin" />
	<roundcube:button command="close" type="link" class="button back" classAct="button back" classSel="button backSel" title="close" content=" " />
	<roundcube:elseif condition="template:name == 'message'" />
	<roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
	<roundcube:else />
	<roundcube:button command="checkmail" type="link" class="button checkmail" classAct="button checkmail" classSel="button checkmailSel" title="checkmail" content=" " />
	<roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
	<roundcube:endif />
	<roundcube:button command="reply" type="link" class="buttonPas reply" classAct="button reply" classSel="button replySel" title="replytomessage" content=" " />
	<span class="dropbutton">
	<roundcube:button command="reply-all" type="link" class="buttonPas replyAll" classAct="button replyAll" classSel="button replyAllSel" title="replytoallmessage" content=" " />
	<span id="replyallmenulink" onclick="rcmail_ui.show_popup('replyallmenu');return false"></span>
	</span>
	<span class="dropbutton">
	<roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " />
	<span id="forwardmenulink" onclick="rcmail_ui.show_popup('forwardmenu');return false"></span>
	</span>
	<roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletemessage" content=" " />
	<roundcube:container name="toolbar" id="messagetoolbar" />
	<roundcube:button name="markmenulink" id="markmenulink" type="link" class="button markmessage" title="markmessages" onclick="rcmail_ui.show_popup('markmenu');return false" content=" " />
	<roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="moreactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " />
	<roundcube:if condition="template:name == 'message'" />
	<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" folder_filter="mail" />
	<roundcube:endif />
	</div>

	<div id="forwardmenu" class="popupmenu">
	<ul>
	- <li><roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
	+ <li><roundcube:button command="forward-inline" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
	<li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li>
	<roundcube:container name="forwardmenu" id="forwardmenu" />
	</ul>
	</div>

	<div id="replyallmenu" class="popupmenu">
	<ul>
	<li><roundcube:button command="reply-all" label="replyall" prop="sub" classAct="replyalllink active" class="replyalllink" /></li>
	<li><roundcube:button command="reply-list" label="replylist" prop="sub" classAct="replylistlink active" class="replylistlink" /></li>
	<roundcube:container name="replyallmenu" id="replyallmenu" />
	</ul>
	</div>

	<div id="messagemenu" class="popupmenu">
	<ul class="toolbarmenu">
	<li><roundcube:button class="printlink" command="print" label="printmessage" classAct="printlink active" /></li>
	<li><roundcube:button class="downloadlink" command="download" label="emlsave" classAct="downloadlink active" /></li>
	<li><roundcube:button class="editlink" command="edit" prop="new" label="editasnew" classAct="editlink active" /></li>
	<li class="separator_below"><roundcube:button class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /></li>
	<li><roundcube:button class="openlink" command="open" label="openinextwin" target="_blank" classAct="openlink active" /></li>
	<roundcube:container name="messagemenu" id="messagemenu" />
	</ul>
	</div>

	<div id="markmessagemenu" class="popupmenu">
	<ul class="toolbarmenu">
	<li><roundcube:button command="mark" prop="read" label="markread" classAct="readlink active" class="readlink" /></li>
	<li><roundcube:button command="mark" prop="unread" label="markunread" classAct="unreadlink active" class="unreadlink" /></li>
	<li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="flaggedlink active" class="flaggedlink" /></li>
	<li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="unflaggedlink active" class="unflaggedlink" /></li>
	<roundcube:container name="markmenu" id="markmessagemenu" />
	</ul>
	</div>
	diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html
	index 31472cbb3..8efcc762c 100644
	--- a/skins/larry/includes/mailtoolbar.html
	+++ b/skins/larry/includes/mailtoolbar.html
	@@ -1,53 +1,53 @@
	<roundcube:button command="reply" type="link" class="button reply disabled" classAct="button reply" classSel="button reply pressed" label="reply" title="replytomessage" />
	<span class="dropbutton">
	<roundcube:button command="reply-all" type="link" class="button reply-all disabled" classAct="button reply-all" classSel="button reply-all pressed" label="replyall" title="replytoallmessage" />
	<span class="dropbuttontip" id="replyallmenulink" onclick="UI.show_popup('replyallmenu');return false"></span>
	</span>
	<span class="dropbutton">
	<roundcube:button command="forward" type="link" class="button forward disabled" classAct="button forward" classSel="button forward pressed" label="forward" title="forwardmessage" />
	<span class="dropbuttontip" id="forwardmenulink" onclick="UI.show_popup('forwardmenu');return false"></span>
	</span>
	<roundcube:button command="delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="deletemessage" />
	<roundcube:if condition="template:name == 'message'" />
	<roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="printmessage" />
	<roundcube:endif />
	<roundcube:container name="toolbar" id="mailtoolbar" />
	<roundcube:button name="markmenulink" id="markmessagemenulink" type="link" class="button markmessage" label="mark" title="markmessages" onclick="UI.show_popup('markmessagemenu');return false" />
	<roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button more" label="more" title="moreactions" onclick="UI.show_popup('messagemenu');return false" />

	<div id="forwardmenu" class="popupmenu">
	<ul class="toolbarmenu">
	- <li><roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
	+ <li><roundcube:button command="forward-inline" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
	<li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li>
	<roundcube:container name="forwardmenu" id="forwardmenu" />
	</ul>
	</div>

	<div id="replyallmenu" class="popupmenu">
	<ul class="toolbarmenu">
	<li><roundcube:button command="reply-all" label="replyall" prop="sub" class="replyalllink" classAct="replyalllink active" /></li>
	<li><roundcube:button command="reply-list" label="replylist" prop="sub" class="replylistlink" classAct="replylistlink active" /></li>
	<roundcube:container name="replyallmenu" id="replyallmenu" />
	</ul>
	</div>

	<div id="messagemenu" class="popupmenu">
	<ul class="toolbarmenu iconized">
	<li><roundcube:button command="print" label="printmessage" class="icon" classAct="icon active" innerclass="icon print" /></li>
	<li><roundcube:button command="download" label="emlsave" class="icon" classAct="icon active" innerclass="icon download" /></li>
	<li><roundcube:button command="edit" prop="new" label="editasnew" class="icon" classAct="icon active" innerclass="icon edit" /></li>
	<li><roundcube:button command="viewsource" label="viewsource" class="icon" classAct="icon active" innerclass="icon viewsource" /></li>
	<li><roundcube:button command="open" label="openinextwin" target="_blank" class="icon" classAct="icon active" innerclass="icon extwin" /></li>
	<roundcube:container name="messagemenu" id="messagemenu" />
	</ul>
	</div>

	<div id="markmessagemenu" class="popupmenu">
	<ul class="toolbarmenu iconized">
	<li><roundcube:button command="mark" prop="read" label="markread" classAct="icon active" class="icon" innerclass="icon read" /></li>
	<li><roundcube:button command="mark" prop="unread" label="markunread" classAct="icon active" class="icon" innerclass="icon unread" /></li>
	<li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="icon active" class="icon" innerclass="icon flagged" /></li>
	<li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="icon active" class="icon" innerclass="icon unflagged" /></li>
	<roundcube:container name="markmenu" id="markmessagemenu" />
	</ul>
	</div>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 6:30 AM (1 d, 7 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166109
Default Alt Text: (664 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions