No OneTemporary
Actions

Size

651 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 6a7b2143b..784bbc81a 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,1411 +1,1413 @@
	CHANGELOG Roundcube Webmail
	===========================

	- Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed
	+- 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)
	Move global functions from main.inc and rcube_shared.inc into classes
	Better classes separation

	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/config/main.inc.php.dist b/config/main.inc.php.dist
	index 1e9c1fdcd..8d615f3b0 100644
	--- a/config/main.inc.php.dist
	+++ b/config/main.inc.php.dist
	@@ -1,854 +1,857 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| Main configuration file \|
	\| \|
	\| 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. \|
	\| \|
	+-----------------------------------------------------------------------+

	*/

	$rcmail_config = array();

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

	// system error reporting: 1 = log; 2 = report (not implemented yet), 4 = show, 8 = trace
	$rcmail_config['debug_level'] = 1;

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

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

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

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

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

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

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

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

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

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

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

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

	// the mail host chosen to perform the log-in
	// leave blank to show a textbox at login, give a list of hosts
	// to display a pulldown menu or set one host as string.
	// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
	// Supported replacement variables:
	// %n - hostname ($_SERVER['SERVER_NAME'])
	// %t - hostname without the first part
	// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
	// %s - domain name after the '@' from e-mail address provided at login screen
	// For example %n = mail.domain.tld, %t = domain.tld
	$rcmail_config['default_host'] = '';

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

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

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

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

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

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

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

	// IMAP connection timeout, in seconds. Default: 0 (no limit)
	$rcmail_config['imap_timeout'] = 0;

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

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

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

	// Enables messages cache. Only 'db' cache is supported.
	$rcmail_config['messages_cache'] = false;


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

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

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

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

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

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

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

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

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

	// SMTP connection timeout, in seconds. Default: 0 (no limit)
	$rcmail_config['smtp_timeout'] = 0;

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

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

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

	// replace Roundcube logo with this image
	// specify an URL relative to the document root of this Roundcube installation
	$rcmail_config['skin_logo'] = null;

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

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

	// use this folder to store log files (must be writeable for apache user)
	// This is used by the 'file' log driver.
	$rcmail_config['log_dir'] = 'logs/';

	// use this folder to store temp files (must be writeable for apache user)
	$rcmail_config['temp_dir'] = 'temp/';

	// lifetime of message cache
	// possible units: s, m, h, d, w
	$rcmail_config['message_cache_lifetime'] = '10d';

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

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

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

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

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

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

	// Session lifetime in minutes
	// must be greater than 'keep_alive'/60
	$rcmail_config['session_lifetime'] = 10;

	-// session domain: .example.org
	+// Session domain: .example.org
	$rcmail_config['session_domain'] = '';

	-// session name. Default: 'roundcube_sessid'
	+// Session name. Default: 'roundcube_sessid'
	$rcmail_config['session_name'] = null;

	+// Session path. Defaults to PHP session.cookie_path setting.
	+$rcmail_config['session_path'] = null;
	+
	// Backend to use for session storage. Can either be 'db' (default) or 'memcache'
	// If set to memcache, a list of servers need to be specified in 'memcache_hosts'
	// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed
	$rcmail_config['session_storage'] = 'db';

	// Use these hosts for accessing memcached
	// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
	$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );

	// check client IP in session athorization
	$rcmail_config['ip_check'] = false;

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

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

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

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

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

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

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

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

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

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

	// use this name to compose page titles
	$rcmail_config['product_name'] = 'Roundcube Webmail';

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

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

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

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

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

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

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

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

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

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

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

	// mime magic database
	$rcmail_config['mime_magic'] = '/usr/share/misc/magic';

	// path to imagemagick identify binary
	$rcmail_config['im_identify_path'] = null;

	// path to imagemagick convert binary
	$rcmail_config['im_convert_path'] = null;

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

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

	// ----------------------------------
	// PLUGINS
	// ----------------------------------

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

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

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

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

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

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

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

	// give this choice of date formats to the user to select from
	$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');

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

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

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

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

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

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

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

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

	// display these folders separately in the mailbox list.
	// these folders will also be displayed with localized names
	// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
	$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');

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

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

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

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

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

	// Set the spell checking engine. 'googie' is the default. 'pspell' is also available,
	// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here.
	$rcmail_config['spellcheck_engine'] = 'googie';

	// For a locally installed Nox Spell Server, please specify the URI to call it.
	// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72
	// Leave empty to use the Google spell checking service, what means
	// that the message content will be sent to Google in order to check spelling
	$rcmail_config['spellcheck_uri'] = '';

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

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

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

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

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

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

	// Minimal value of user's 'keep_alive' setting (in seconds)
	// Must be less than 'session_lifetime'
	$rcmail_config['min_keep_alive'] = 60;

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

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

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

	// This indicates which type of address book to use. Possible choises:
	// 'sql' (default) and 'ldap'.
	// If set to 'ldap' then it will look at using the first writable LDAP
	// address book as the primary address book and it will not display the
	// SQL address book in the 'Address Book' view.
	$rcmail_config['address_book_type'] = 'sql';

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

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

	// definition for contact groups (uncomment if no groups are supported)
	// for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above)
	// if the groups base_dn is empty, the contact base_dn is used for the groups as well
	// -> in this case, assure that groups and contacts are separated due to the concernig filters!
	'groups' => array(
	'base_dn' => '',
	'scope' => 'sub', // search mode: sub\|base\|list
	'filter' => '(objectClass=groupOfNames)',
	'object_classes' => array("top", "groupOfNames"),
	'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember
	'name_attr' => 'cn', // attribute to be used as group name
	),
	);
	*/

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

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

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

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

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

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

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

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

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

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

	// show up to X items in contacts list view
	$rcmail_config['addressbook_pagesize'] = 50;

	// sort contacts by this col (preferably either one of name, firstname, surname)
	$rcmail_config['addressbook_sort_col'] = 'surname';

	// the way how contact names are displayed in the list
	// 0: display name
	// 1: (prefix) firstname middlename surname (suffix)
	// 2: (prefix) surname firstname middlename (suffix)
	// 3: (prefix) surname, firstname middlename (suffix)
	$rcmail_config['addressbook_name_listing'] = 0;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	// Default interval for keep-alive/check-recent requests (in seconds)
	// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime'
	$rcmail_config['keep_alive'] = 60;

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

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

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

	// When replying place cursor above original message (top posting)
	$rcmail_config['top_posting'] = false;

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

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

	// When replying or forwarding place sender's signature above existing message
	$rcmail_config['sig_above'] = false;

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

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

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

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

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

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

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

	// Delivery Status Notification checkbox default state
	$rcmail_config['dsn_default'] = 0;

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

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

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

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

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

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

	// end of config file
	diff --git a/program/include/rcube.php b/program/include/rcube.php
	index 84014ef5c..0e40b3c6b 100644
	--- a/program/include/rcube.php
	+++ b/program/include/rcube.php
	@@ -1,1246 +1,1251 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-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: \|
	\| Framework base class providing core functions and holding \|
	\| instances of all 'global' objects like db- and storage-connections \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Base class of the Roundcube Framework
	* implemented as singleton
	*
	* @package Framework
	* @subpackage Core
	*/
	class rcube
	{
	const INIT_WITH_DB = 1;
	const INIT_WITH_PLUGINS = 2;

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

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

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

	/**
	* Instace of Memcache class.
	*
	* @var Memcache
	*/
	public $memcache;

	/**
	* Instace of rcube_session class.
	*
	* @var rcube_session
	*/
	public $session;

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

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

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

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


	/* private/protected vars */
	protected $texts;
	protected $caches = array();
	protected $shutdown_functions = array();
	protected $expunge_cache = false;


	/**
	* This implements the 'singleton' design pattern
	*
	* @param integer Options to initialize with this instance. See rcube::INIT_WITH_* constants
	*
	* @return rcube The one and only instance
	*/
	static function get_instance($mode = 0)
	{
	if (!self::$instance) {
	self::$instance = new rcube();
	self::$instance->init($mode);
	}

	return self::$instance;
	}


	/**
	* Private constructor
	*/
	protected function __construct()
	{
	// load configuration
	$this->config = new rcube_config;
	$this->plugins = new rcube_dummy_plugin_api;

	register_shutdown_function(array($this, 'shutdown'));
	}


	/**
	* Initial startup function
	*/
	protected function init($mode = 0)
	{
	// initialize syslog
	if ($this->config->get('log_driver') == 'syslog') {
	$syslog_id = $this->config->get('syslog_id', 'roundcube');
	$syslog_facility = $this->config->get('syslog_facility', LOG_USER);
	openlog($syslog_id, LOG_ODELAY, $syslog_facility);
	}

	// connect to database
	if ($mode & self::INIT_WITH_DB) {
	$this->get_dbh();
	}

	// create plugin API and load plugins
	if ($mode & self::INIT_WITH_PLUGINS) {
	$this->plugins = rcube_plugin_api::get_instance();
	}
	}


	/**
	* Get the current database connection
	*
	* @return rcube_db Database object
	*/
	public function get_dbh()
	{
	if (!$this->db) {
	$config_all = $this->config->all();
	$this->db = rcube_db::factory($config_all['db_dsnw'], $config_all['db_dsnr'], $config_all['db_persistent']);
	$this->db->set_debug((bool)$config_all['sql_debug']);
	}

	return $this->db;
	}


	/**
	* Get global handle for memcache access
	*
	* @return object Memcache
	*/
	public function get_memcache()
	{
	if (!isset($this->memcache)) {
	// no memcache support in PHP
	if (!class_exists('Memcache')) {
	$this->memcache = false;
	return false;
	}

	$this->memcache = new Memcache;
	$this->mc_available = 0;

	// add all configured hosts to pool
	$pconnect = $this->config->get('memcache_pconnect', true);
	foreach ($this->config->get('memcache_hosts', array()) as $host) {
	if (substr($host, 0, 7) != 'unix://') {
	list($host, $port) = explode(':', $host);
	if (!$port) $port = 11211;
	}
	else {
	$port = 0;
	}

	$this->mc_available += intval($this->memcache->addServer(
	$host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure')));
	}

	// test connection and failover (will result in $this->mc_available == 0 on complete failure)
	$this->memcache->increment('__CONNECTIONTEST__', 1); // NOP if key doesn't exist

	if (!$this->mc_available) {
	$this->memcache = false;
	}
	}

	return $this->memcache;
	}


	/**
	* Callback for memcache failure
	*/
	public function memcache_failure($host, $port)
	{
	static $seen = array();

	// only report once
	if (!$seen["$host:$port"]++) {
	$this->mc_available--;
	self::raise_error(array(
	'code' => 604, 'type' => 'db',
	'line' => __LINE__, 'file' => __FILE__,
	'message' => "Memcache failure on host $host:$port"),
	true, false);
	}
	}


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

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


	/**
	* Create SMTP object and connect to server
	*
	* @param boolean True if connection should be established
	*/
	public function smtp_init($connect = false)
	{
	$this->smtp = new rcube_smtp();

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


	/**
	* Initialize and get storage object
	*
	* @return rcube_storage Storage object
	*/
	public function get_storage()
	{
	// already initialized
	if (!is_object($this->storage)) {
	$this->storage_init();
	}

	return $this->storage;
	}


	/**
	* Initialize storage object
	*/
	public function storage_init()
	{
	// already initialized
	if (is_object($this->storage)) {
	return;
	}

	$driver = $this->config->get('storage_driver', 'imap');
	$driver_class = "rcube_{$driver}";

	if (!class_exists($driver_class)) {
	self::raise_error(array(
	'code' => 700, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Storage driver class ($driver) not found!"),
	true, true);
	}

	// Initialize storage object
	$this->storage = new $driver_class;

	// for backward compat. (deprecated, will be removed)
	$this->imap = $this->storage;

	// enable caching of mail data
	$storage_cache = $this->config->get("{$driver}_cache");
	$messages_cache = $this->config->get('messages_cache');
	// for backward compatybility
	if ($storage_cache === null && $messages_cache === null && $this->config->get('enable_caching')) {
	$storage_cache = 'db';
	$messages_cache = true;
	}

	if ($storage_cache) {
	$this->storage->set_caching($storage_cache);
	}
	if ($messages_cache) {
	$this->storage->set_messages_caching(true);
	}

	// set pagesize from config
	$pagesize = $this->config->get('mail_pagesize');
	if (!$pagesize) {
	$pagesize = $this->config->get('pagesize', 50);
	}
	$this->storage->set_pagesize($pagesize);

	// set class options
	$options = array(
	'auth_type' => $this->config->get("{$driver}_auth_type", 'check'),
	'auth_cid' => $this->config->get("{$driver}_auth_cid"),
	'auth_pw' => $this->config->get("{$driver}_auth_pw"),
	'debug' => (bool) $this->config->get("{$driver}_debug"),
	'force_caps' => (bool) $this->config->get("{$driver}_force_caps"),
	'timeout' => (int) $this->config->get("{$driver}_timeout"),
	'skip_deleted' => (bool) $this->config->get('skip_deleted'),
	'driver' => $driver,
	);

	if (!empty($_SESSION['storage_host'])) {
	$options['host'] = $_SESSION['storage_host'];
	$options['user'] = $_SESSION['username'];
	$options['port'] = $_SESSION['storage_port'];
	$options['ssl'] = $_SESSION['storage_ssl'];
	$options['password'] = $this->decrypt($_SESSION['password']);
	$_SESSION[$driver.'_host'] = $_SESSION['storage_host'];
	}

	$options = $this->plugins->exec_hook("storage_init", $options);

	// for backward compat. (deprecated, to be removed)
	$options = $this->plugins->exec_hook("imap_init", $options);

	$this->storage->set_options($options);
	$this->set_storage_prop();
	}


	/**
	* Set storage parameters.
	* This must be done AFTER connecting to the server!
	*/
	protected function set_storage_prop()
	{
	$storage = $this->get_storage();

	$storage->set_charset($this->config->get('default_charset', RCMAIL_CHARSET));

	if ($default_folders = $this->config->get('default_folders')) {
	$storage->set_default_folders($default_folders);
	}
	if (isset($_SESSION['mbox'])) {
	$storage->set_folder($_SESSION['mbox']);
	}
	if (isset($_SESSION['page'])) {
	$storage->set_page($_SESSION['page']);
	}
	}


	/**
	* Create session object and start the session.
	*/
	public function session_init()
	{
	// session started (Installer?)
	if (session_id()) {
	return;
	}

	$sess_name = $this->config->get('session_name');
	$sess_domain = $this->config->get('session_domain');
	+ $sess_path = $this->config->get('session_path');
	$lifetime = $this->config->get('session_lifetime', 0) * 60;

	// set session domain
	if ($sess_domain) {
	ini_set('session.cookie_domain', $sess_domain);
	}
	+ // set session path
	+ if ($sess_path) {
	+ ini_set('session.cookie_path', $sess_path);
	+ }
	// set session garbage collecting time according to session_lifetime
	if ($lifetime) {
	ini_set('session.gc_maxlifetime', $lifetime * 2);
	}

	ini_set('session.cookie_secure', rcube_utils::https_check());
	ini_set('session.name', $sess_name ? $sess_name : 'roundcube_sessid');
	ini_set('session.use_cookies', 1);
	ini_set('session.use_only_cookies', 1);
	ini_set('session.serialize_handler', 'php');
	ini_set('session.cookie_httponly', 1);

	// use database for storing session data
	$this->session = new rcube_session($this->get_dbh(), $this->config);

	$this->session->register_gc_handler(array($this, 'temp_gc'));
	$this->session->register_gc_handler(array($this, 'cache_gc'));

	// start PHP session (if not in CLI mode)
	if ($_SERVER['REMOTE_ADDR']) {
	session_start();
	}
	}


	/**
	* Configure session object internals
	*/
	public function session_configure()
	{
	if (!$this->session) {
	return;
	}

	$lifetime = $this->config->get('session_lifetime', 0) * 60;
	$keep_alive = $this->config->get('keep_alive');

	// set keep-alive/check-recent interval
	if ($keep_alive) {
	// be sure that it's less than session lifetime
	if ($lifetime) {
	$keep_alive = min($keep_alive, $lifetime - 30);
	}
	$keep_alive = max(60, $keep_alive);
	$this->session->set_keep_alive($keep_alive);
	}

	$this->session->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
	$this->session->set_ip_check($this->config->get('ip_check'));
	}


	/**
	* Garbage collector function for temp files.
	* Remove temp files older than two days
	*/
	public function temp_gc()
	{
	$tmp = unslashify($this->config->get('temp_dir'));
	$expire = time() - 172800; // expire in 48 hours

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

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

	closedir($dir);
	}
	}


	/**
	* Garbage collector for cache entries.
	* Set flag to expunge caches on shutdown
	*/
	public function cache_gc()
	{
	// because this gc function is called before storage is initialized,
	// we just set a flag to expunge storage cache on shutdown.
	$this->expunge_cache = true;
	}


	/**
	* Get localized text in the desired language
	*
	* @param mixed $attrib Named parameters array or label name
	* @param string $domain Label domain (plugin) name
	*
	* @return string Localized text
	*/
	public function gettext($attrib, $domain=null)
	{
	// load localization files if not done yet
	if (empty($this->texts)) {
	$this->load_language();
	}

	// extract attributes
	if (is_string($attrib)) {
	$attrib = array('name' => $attrib);
	}

	$name = $attrib['name'] ? $attrib['name'] : '';

	// attrib contain text values: use them from now
	if (($setval = $attrib[strtolower($_SESSION['language'])]) \|\| ($setval = $attrib['en_us'])) {
	$this->texts[$name] = $setval;
	}

	// check for text with domain
	if ($domain && ($text = $this->texts[$domain.'.'.$name])) {
	}
	// text does not exist
	else if (!($text = $this->texts[$name])) {
	return "[$name]";
	}

	// replace vars in text
	if (is_array($attrib['vars'])) {
	foreach ($attrib['vars'] as $var_key => $var_value) {
	$text = str_replace($var_key[0]!='$' ? '$'.$var_key : $var_key, $var_value, $text);
	}
	}

	// format output
	if (($attrib['uppercase'] && strtolower($attrib['uppercase'] == 'first')) \|\| $attrib['ucfirst']) {
	return ucfirst($text);
	}
	else if ($attrib['uppercase']) {
	return mb_strtoupper($text);
	}
	else if ($attrib['lowercase']) {
	return mb_strtolower($text);
	}

	return strtr($text, array('\n' => "\n"));
	}


	/**
	* Check if the given text label exists
	*
	* @param string $name Label name
	* @param string $domain Label domain (plugin) name or '*' for all domains
	* @param string $ref_domain Sets domain name if label is found
	*
	* @return boolean True if text exists (either in the current language or in en_US)
	*/
	public function text_exists($name, $domain = null, &$ref_domain = null)
	{
	// load localization files if not done yet
	if (empty($this->texts)) {
	$this->load_language();
	}

	if (isset($this->texts[$name])) {
	$ref_domain = '';
	return true;
	}

	// any of loaded domains (plugins)
	if ($domain == '*') {
	foreach ($this->plugins->loaded_plugins() as $domain) {
	if (isset($this->texts[$domain.'.'.$name])) {
	$ref_domain = $domain;
	return true;
	}
	}
	}
	// specified domain
	else if ($domain) {
	$ref_domain = $domain;
	return isset($this->texts[$domain.'.'.$name]);
	}

	return false;
	}


	/**
	* Load a localization package
	*
	* @param string Language ID
	* @param array Additional text labels/messages
	*/
	public function load_language($lang = null, $add = array())
	{
	$lang = $this->language_prop(($lang ? $lang : $_SESSION['language']));

	// load localized texts
	if (empty($this->texts) \|\| $lang != $_SESSION['language']) {
	$this->texts = array();

	// handle empty lines after closing PHP tag in localization files
	ob_start();

	// get english labels (these should be complete)
	@include(INSTALL_PATH . 'program/localization/en_US/labels.inc');
	@include(INSTALL_PATH . 'program/localization/en_US/messages.inc');

	if (is_array($labels))
	$this->texts = $labels;
	if (is_array($messages))
	$this->texts = array_merge($this->texts, $messages);

	// include user language files
	if ($lang != 'en' && $lang != 'en_US' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) {
	include_once(INSTALL_PATH . 'program/localization/' . $lang . '/labels.inc');
	include_once(INSTALL_PATH . 'program/localization/' . $lang . '/messages.inc');

	if (is_array($labels))
	$this->texts = array_merge($this->texts, $labels);
	if (is_array($messages))
	$this->texts = array_merge($this->texts, $messages);
	}

	ob_end_clean();

	$_SESSION['language'] = $lang;
	}

	// append additional texts (from plugin)
	if (is_array($add) && !empty($add)) {
	$this->texts += $add;
	}
	}


	/**
	* Check the given string and return a valid language code
	*
	* @param string Language code
	*
	* @return string Valid language code
	*/
	protected function language_prop($lang)
	{
	static $rcube_languages, $rcube_language_aliases;

	// user HTTP_ACCEPT_LANGUAGE if no language is specified
	if (empty($lang) \|\| $lang == 'auto') {
	$accept_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
	$lang = str_replace('-', '_', $accept_langs[0]);
	}

	if (empty($rcube_languages)) {
	@include(INSTALL_PATH . 'program/localization/index.inc');
	}

	// check if we have an alias for that language
	if (!isset($rcube_languages[$lang]) && isset($rcube_language_aliases[$lang])) {
	$lang = $rcube_language_aliases[$lang];
	}
	// try the first two chars
	else if (!isset($rcube_languages[$lang])) {
	$short = substr($lang, 0, 2);

	// check if we have an alias for the short language code
	if (!isset($rcube_languages[$short]) && isset($rcube_language_aliases[$short])) {
	$lang = $rcube_language_aliases[$short];
	}
	// expand 'nn' to 'nn_NN'
	else if (!isset($rcube_languages[$short])) {
	$lang = $short.'_'.strtoupper($short);
	}
	}

	if (!isset($rcube_languages[$lang]) \|\| !is_dir(INSTALL_PATH . 'program/localization/' . $lang)) {
	$lang = 'en_US';
	}

	return $lang;
	}


	/**
	* Read directory program/localization and return a list of available languages
	*
	* @return array List of available localizations
	*/
	public function list_languages()
	{
	static $sa_languages = array();

	if (!sizeof($sa_languages)) {
	@include(INSTALL_PATH . 'program/localization/index.inc');

	if ($dh = @opendir(INSTALL_PATH . 'program/localization')) {
	while (($name = readdir($dh)) !== false) {
	if ($name[0] == '.' \|\| !is_dir(INSTALL_PATH . 'program/localization/' . $name)) {
	continue;
	}

	if ($label = $rcube_languages[$name]) {
	$sa_languages[$name] = $label;
	}
	}
	closedir($dh);
	}
	}

	return $sa_languages;
	}


	/**
	* Encrypt using 3DES
	*
	* @param string $clear clear text input
	* @param string $key encryption key to retrieve from the configuration, defaults to 'des_key'
	* @param boolean $base64 whether or not to base64_encode() the result before returning
	*
	* @return string encrypted text
	*/
	public function encrypt($clear, $key = 'des_key', $base64 = true)
	{
	if (!$clear) {
	return '';
	}

	/*-
	* Add a single canary byte to the end of the clear text, which
	* will help find out how much of padding will need to be removed
	* upon decryption; see http://php.net/mcrypt_generic#68082
	*/
	$clear = pack("a*H2", $clear, "80");

	if (function_exists('mcrypt_module_open') &&
	($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, ""))
	) {
	$iv = $this->create_iv(mcrypt_enc_get_iv_size($td));
	mcrypt_generic_init($td, $this->config->get_crypto_key($key), $iv);
	$cipher = $iv . mcrypt_generic($td, $clear);
	mcrypt_generic_deinit($td);
	mcrypt_module_close($td);
	}
	else {
	@include_once 'des.inc';

	if (function_exists('des')) {
	$des_iv_size = 8;
	$iv = $this->create_iv($des_iv_size);
	$cipher = $iv . des($this->config->get_crypto_key($key), $clear, 1, 1, $iv);
	}
	else {
	self::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not perform encryption; make sure Mcrypt is installed or lib/des.inc is available"
	), true, true);
	}
	}

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


	/**
	* Decrypt 3DES-encrypted string
	*
	* @param string $cipher encrypted text
	* @param string $key encryption key to retrieve from the configuration, defaults to 'des_key'
	* @param boolean $base64 whether or not input is base64-encoded
	*
	* @return string decrypted text
	*/
	public function decrypt($cipher, $key = 'des_key', $base64 = true)
	{
	if (!$cipher) {
	return '';
	}

	$cipher = $base64 ? base64_decode($cipher) : $cipher;

	if (function_exists('mcrypt_module_open') &&
	($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, ""))
	) {
	$iv_size = mcrypt_enc_get_iv_size($td);
	$iv = substr($cipher, 0, $iv_size);

	// session corruption? (#1485970)
	if (strlen($iv) < $iv_size) {
	return '';
	}

	$cipher = substr($cipher, $iv_size);
	mcrypt_generic_init($td, $this->config->get_crypto_key($key), $iv);
	$clear = mdecrypt_generic($td, $cipher);
	mcrypt_generic_deinit($td);
	mcrypt_module_close($td);
	}
	else {
	@include_once 'des.inc';

	if (function_exists('des')) {
	$des_iv_size = 8;
	$iv = substr($cipher, 0, $des_iv_size);
	$cipher = substr($cipher, $des_iv_size);
	$clear = des($this->config->get_crypto_key($key), $cipher, 0, 1, $iv);
	}
	else {
	self::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Could not perform decryption; make sure Mcrypt is installed or lib/des.inc is available"
	), true, true);
	}
	}

	/*-
	* Trim PHP's padding and the canary byte; see note in
	* rcube::encrypt() and http://php.net/mcrypt_generic#68082
	*/
	$clear = substr(rtrim($clear, "\0"), 0, -1);

	return $clear;
	}


	/**
	* Generates encryption initialization vector (IV)
	*
	* @param int Vector size
	*
	* @return string Vector string
	*/
	private function create_iv($size)
	{
	// mcrypt_create_iv() can be slow when system lacks entrophy
	// we'll generate IV vector manually
	$iv = '';
	for ($i = 0; $i < $size; $i++) {
	$iv .= chr(mt_rand(0, 255));
	}

	return $iv;
	}


	/**
	* Build a valid URL to this instance of Roundcube
	*
	* @param mixed Either a string with the action or url parameters as key-value pairs
	* @return string Valid application URL
	*/
	public function url($p)
	{
	// STUB: should be overloaded by the application
	return '';
	}


	/**
	* Function to be executed in script shutdown
	* Registered with register_shutdown_function()
	*/
	public function shutdown()
	{
	foreach ($this->shutdown_functions as $function) {
	call_user_func($function);
	}

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

	foreach ($this->caches as $cache) {
	if (is_object($cache)) {
	$cache->close();
	}
	}

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


	/**
	* Registers shutdown function to be executed on shutdown.
	* The functions will be executed before destroying any
	* objects like smtp, imap, session, etc.
	*
	* @param callback Function callback
	*/
	public function add_shutdown_function($function)
	{
	$this->shutdown_functions[] = $function;
	}


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

	// merge values into one array
	foreach ($args as $arg) {
	$values += (array)$arg;
	}

	preg_match_all('/({(-?)([a-z]\w*)})/', $cmd, $matches, PREG_SET_ORDER);
	foreach ($matches as $tags) {
	list(, $tag, $option, $key) = $tags;
	$parts = array();

	if ($option) {
	foreach ((array)$values["-$key"] as $key => $value) {
	if ($value === true \|\| $value === false \|\| $value === null) {
	$parts[] = $value ? $key : "";
	}
	else {
	foreach ((array)$value as $val) {
	$parts[] = "$key " . escapeshellarg($val);
	}
	}
	}
	}
	else {
	foreach ((array)$values[$key] as $value) {
	$parts[] = escapeshellarg($value);
	}
	}

	$replacements[$tag] = join(" ", $parts);
	}

	// use strtr behaviour of going through source string once
	$cmd = strtr($cmd, $replacements);

	return (string)shell_exec($cmd);
	}


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

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

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

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


	/**
	* Append a line to a logfile in the logs directory.
	* Date will be added automatically to the line.
	*
	* @param $name name of log file
	* @param line Line to append
	*/
	public static function write_log($name, $line)
	{
	if (!is_string($line)) {
	$line = var_export($line, true);
	}

	$date_format = self::$instance ? self::$instance->config->get('log_date_format') : null;
	$log_driver = self::$instance ? self::$instance->config->get('log_driver') : null;

	if (empty($date_format)) {
	$date_format = 'd-M-Y H:i:s O';
	}

	$date = date($date_format);

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

	if ($log_driver == 'syslog') {
	$prio = $name == 'errors' ? LOG_ERR : LOG_INFO;
	syslog($prio, $line);
	return true;
	}

	// log_driver == 'file' is assumed here

	$line = sprintf("[%s]: %s\n", $date, $line);
	$log_dir = self::$instance ? self::$instance->config->get('log_dir') : null;

	if (empty($log_dir)) {
	$log_dir = INSTALL_PATH . 'logs';
	}

	// try to open specific log file for writing
	$logfile = $log_dir.'/'.$name;

	if ($fp = @fopen($logfile, 'a')) {
	fwrite($fp, $line);
	fflush($fp);
	fclose($fp);
	return true;
	}

	trigger_error("Error writing to log file $logfile; Please check permissions", E_USER_WARNING);
	return false;
	}


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

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

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

	// display error page and terminate script
	if ($terminate && is_object(self::$instance->output)) {
	self::$instance->output->raise_error($arg['code'], $arg['message']);
	}
	}


	/**
	* Report error according to configured debug_level
	*
	* @param array Named parameters
	* @see self::raise_error()
	*/
	public static function log_bug($arg_arr)
	{
	$program = strtoupper($arg_arr['type']);
	$level = self::get_instance()->config->get('debug_level');

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

	// write error to local log file
	if (($level & 1) \|\| !empty($arg_arr['fatal'])) {
	if ($_SERVER['REQUEST_METHOD'] == 'POST') {
	$post_query = '?_task='.urlencode($_POST['_task']).'&_action='.urlencode($_POST['_action']);
	}
	else {
	$post_query = '';
	}

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

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

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

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

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

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


	/**
	* Returns current time (with microseconds).
	*
	* @return float Current time in seconds since the Unix
	*/
	public static function timer()
	{
	return microtime(true);
	}


	/**
	* Logs time difference according to provided timer
	*
	* @param float $timer Timer (self::timer() result)
	* @param string $label Log line prefix
	* @param string $dest Log file name
	*
	* @see self::timer()
	*/
	public static function print_timer($timer, $label = 'Timer', $dest = 'console')
	{
	static $print_count = 0;

	$print_count++;
	$now = self::timer();
	$diff = $now - $timer;

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

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


	/**
	* Getter for logged user ID.
	*
	* @return mixed User identifier
	*/
	public function get_user_id()
	{
	if (is_object($this->user)) {
	return $this->user->ID;
	}
	else if (isset($_SESSION['user_id'])) {
	return $_SESSION['user_id'];
	}

	return null;
	}


	/**
	* Getter for logged user name.
	*
	* @return string User name
	*/
	public function get_user_name()
	{
	if (is_object($this->user)) {
	return $this->user->get_username();
	}

	return null;
	}
	}


	/**
	* Lightweight plugin API class serving as a dummy if plugins are not enabled
	*
	* @package Core
	*/
	class rcube_dummy_plugin_api
	{
	/**
	* Triggers a plugin hook.
	* @see rcube_plugin_api::exec_hook()
	*/
	public function exec_hook($hook, $args = array())
	{
	return $args;
	}
	}
	diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
	index 0a8f0e364..a071ee354 100644
	--- a/program/include/rcube_output_html.php
	+++ b/program/include/rcube_output_html.php
	@@ -1,1638 +1,1643 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcubeoutput_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 View
	*/
	class rcube_output_html extends rcube_output
	{
	public $type = 'html';

	protected $message = null;
	protected $js_env = array();
	protected $js_labels = array();
	protected $js_commands = array();
	protected $plugin_skin_path;
	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);

	// add common javascripts
	$this->add_script('var '.rcmail::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(rcmail::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);

	return $valid;
	}


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


	/**
	* 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(rcmail::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)
	{
	$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)
	{
	$skin_path = $this->config->get('skin_path');
	$plugin = false;
	$realname = $name;
	$temp = explode('.', $name, 2);

	$this->plugin_skin_path = null;
	$this->template_name = $realname;

	if (count($temp) > 1) {
	$plugin = $temp[0];
	$name = $temp[1];
	$skin_dir = $plugin . '/skins/' . $this->config->get('skin');
	$skin_path = $this->plugin_skin_path = $this->app->plugins->dir . $skin_dir;

	// fallback to default skin
	if (!is_dir($skin_path)) {
	$skin_dir = $plugin . '/skins/default';
	$skin_path = $this->plugin_skin_path = $this->app->plugins->dir . $skin_dir;
	}
	}

	$path = "$skin_path/templates/$name.html";

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

	// read template file
	if (($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, true);
	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']);

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

	// 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 .= rcmail::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.'.rcmail::JS_OBJECT_NAME.') parent.' : '') . rcmail::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
	* @return string
	*/
	public function abs_url($str)
	{
	if ($str[0] == '/')
	return $this->config->get('skin_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 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'] = Q($this->config->get('skin_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]];
	}


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


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

	// show a label
	case 'label':
	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']) : (get_boolean((string)$attrib['html']) ? 'no' : '');

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

	return $label;
	}
	break;

	// include a file
	case 'include':
	if (!$this->plugin_skin_path \|\| !is_file($path = realpath($this->plugin_skin_path . $attrib['file'])))
	$path = realpath(($attrib['skin_path'] ? $attrib['skin_path'] : $this->config->get('skin_path')).$attrib['file']);

	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);
	return $this->parse_xml($incl);
	}
	break;

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

	// 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(INSTALL_PATH . '.svn/entries')) {
	if (preg_match('/Revision:\s(\d+)/', @shell_exec('svn info'), $regs))
	$ver .= ' [SVN r'.$regs[1].']';
	}
	else if (is_file(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');",
	rcmail::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("%s.command('switch-task','%s',null,event); return false", rcmail::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' && !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)",
	rcmail::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);
	}

	$this->base_path = $base_path;

	// correct absolute paths in images and other tags
	// add timestamp to .js and .css filename
	$output = preg_replace_callback(
	'!(src\|href\|background)=(["\']?)([a-z0-9/_.-]+)(["\'\s>])!i',
	array($this, 'file_callback'), $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 != RCMAIL_CHARSET) {
	echo rcube_charset::convert($hook['content'], RCMAIL_CHARSET, $this->charset);
	}
	else {
	echo $hook['content'];
	}
	}
	}


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


	/* *********** 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 (!$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_dst = new html_hiddenfield(array('name' => '_dstactive', 'id' => 'rcmlogindst', '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_dst->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);
	}

	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' => rcmail::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 = RCMAIL_CONFIG_DIR . '/' . $file;
	if (is_readable($fn)) {
	$content = file_get_contents($fn);
	$content = $this->parse_conditions($content);
	$content = $this->parse_xml($content);
	break;
	}
	}

	return $content;
	}

	}
	diff --git a/program/include/rcube_utils.php b/program/include/rcube_utils.php
	index d1a8315ec..9f18b79c4 100644
	--- a/program/include/rcube_utils.php
	+++ b/program/include/rcube_utils.php
	@@ -1,833 +1,838 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_utils.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-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: \|
	\| Utility class providing common functions \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Utility class providing common functions
	*
	* @package Core
	*/
	class rcube_utils
	{
	// define constants for input reading
	const INPUT_GET = 0x0101;
	const INPUT_POST = 0x0102;
	const INPUT_GPC = 0x0103;

	/**
	* Helper method to set a cookie with the current path and host settings
	*
	* @param string Cookie name
	* @param string Cookie value
	* @param string Expiration time
	*/
	public static function setcookie($name, $value, $exp = 0)
	{
	if (headers_sent()) {
	return;
	}

	$cookie = session_get_cookie_params();
	$secure = $cookie['secure'] \|\| self::https_check();

	setcookie($name, $value, $exp, $cookie['path'], $cookie['domain'], $secure, true);
	}

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

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

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

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

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

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

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

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

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

	+ // last domain part
	+ if (preg_match('/[^a-zA-Z]/', array_pop($domain_array))) {
	+ return false;
	+ }
	+
	$rcube = rcube::get_instance();

	if (!$dns_check \|\| !$rcube->config->get('email_dns_check')) {
	return true;
	}

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

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

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

	return false;
	}

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


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

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

	$encode_arr = $html_encode_arr;

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

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

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

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

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

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

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

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

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

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

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

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


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

	if ($source == self::INPUT_GET) {
	if (isset($_GET[$fname])) {
	$value = $_GET[$fname];
	}
	}
	else if ($source == self::INPUT_POST) {
	if (isset($_POST[$fname])) {
	$value = $_POST[$fname];
	}
	}
	else if ($source == self::INPUT_GPC) {
	if (isset($_POST[$fname])) {
	$value = $_POST[$fname];
	}
	else if (isset($_GET[$fname])) {
	$value = $_GET[$fname];
	}
	else if (isset($_COOKIE[$fname])) {
	$value = $_COOKIE[$fname];
	}
	}

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


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

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

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

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

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

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

	// remove invalid characters (#1488124)
	if ($output_charset == 'UTF-8') {
	$value = rcube_charset::clean($value);
	}

	// convert to internal charset
	if ($charset && $output_charset) {
	$value = rcube_charset::convert($value, $output_charset, $charset);
	}

	return $value;
	}


	/**
	* Convert array of request parameters (prefixed with _)
	* to a regular array with non-prefixed keys.
	*
	* @param int $mode Source to get value from (GPC)
	* @param string $ignore PCRE expression to skip parameters by name
	*
	* @return array Hash array with all request parameters
	*/
	public static function request2param($mode = null, $ignore = 'task\|action')
	{
	$out = array();
	$src = $mode == self::INPUT_GET ? $_GET : ($mode == self::INPUT_POST ? $_POST : $_REQUEST);

	foreach ($src as $key => $value) {
	$fname = $key[0] == '_' ? substr($key, 1) : $key;
	if ($ignore && !preg_match('/^(' . $ignore . ')$/', $fname)) {
	$out[$fname] = self::get_input_value($key, $mode);
	}
	}

	return $out;
	}


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


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

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

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

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

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

	return $out;
	}


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

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

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

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

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

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

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

	return $styles;
	}


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

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

	return strtolower(join(" ", $classes));
	}


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

	return $out;
	}


	/**
	* preg_replace_callback callback for xss_entity_decode
	*
	* @param array $matches Result from preg_replace_callback
	*
	* @return string Decoded entity
	*/
	public static function xss_entity_decode_callback($matches)
	{
	return chr(hexdec($matches[1]));
	}


	/**
	* Check if we can process not exceeding memory_limit
	*
	* @param integer Required amount of memory
	*
	* @return boolean True if memory won't be exceeded, False otherwise
	*/
	public static function mem_check($need)
	{
	$mem_limit = parse_bytes(ini_get('memory_limit'));
	$memory = function_exists('memory_get_usage') ? memory_get_usage() : 1610241024; // safe value: 16MB

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


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

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

	return false;
	}


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

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


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

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

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

	return $address;
	}


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

	return $hdrs[$key];
	}

	/**
	* Explode quoted string
	*
	* @param string Delimiter expression string for preg_match()
	* @param string Input string
	*
	* @return array String items
	*/
	public static function explode_quoted_string($delimiter, $string)
	{
	$result = array();
	$strlen = strlen($string);

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

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

	return $result;
	}


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

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

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

	return $ts;
	}


	/*
	* Idn_to_ascii wrapper.
	* Intl/Idn modules version of this function doesn't work with e-mail address
	*/
	public static function idn_to_ascii($str)
	{
	return self::idn_convert($str, true);
	}


	/*
	* Idn_to_ascii wrapper.
	* Intl/Idn modules version of this function doesn't work with e-mail address
	*/
	public static function idn_to_utf8($str)
	{
	return self::idn_convert($str, false);
	}


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

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

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

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

	/**
	* Split the given string into word tokens
	*
	* @param string Input to tokenize
	* @return array List of tokens
	*/
	public static function tokenize_string($str)
	{
	return explode(" ", preg_replace(
	array('/[\s;\/+-]+/i', '/(\d)[-.\s]+(\d)/', '/\s\w{1,3}\s/u'),
	array(' ', '\\1\\2', ' '),
	$str));
	}

	/**
	* Normalize the given string for fulltext search.
	* Currently only optimized for Latin-1 characters; to be extended
	*
	* @param string Input string (UTF-8)
	* @param boolean True to return list of words as array
	* @return mixed Normalized string or a list of normalized tokens
	*/
	public static function normalize_string($str, $as_array = false)
	{
	// split by words
	$arr = self::tokenize_string($str);

	foreach ($arr as $i => $part) {
	if (utf8_encode(utf8_decode($part)) == $part) { // is latin-1 ?
	$arr[$i] = utf8_encode(strtr(strtolower(strtr(utf8_decode($part),
	'ÇçäâàåéêëèïîìÅÉöôòüûùÿøØáíóúñÑÁÂÀãÃÊËÈÍÎÏÓÔõÕÚÛÙýÝ',
	'ccaaaaeeeeiiiaeooouuuyooaiounnaaaaaeeeiiioooouuuyy')),
	array('ß' => 'ss', 'ae' => 'a', 'oe' => 'o', 'ue' => 'u')));
	}
	else
	$arr[$i] = mb_strtolower($part);
	}

	return $as_array ? $arr : join(" ", $arr);
	}

	}
	diff --git a/program/js/app.js b/program/js/app.js
	index e8bb6c1a7..9ca16b39c 100644
	--- a/program/js/app.js
	+++ b/program/js/app.js
	@@ -1,6621 +1,6629 @@
	/*
	+-----------------------------------------------------------------------+
	\| 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.env = { recipients_separator:',', recipients_delimiter:', ' };
	this.labels = {};
	this.buttons = {};
	this.buttons_sel = {};
	this.gui_objects = {};
	this.gui_containers = {};
	this.commands = {};
	this.command_handlers = {};
	this.onloads = [];
	this.messages = {};
	this.group2expand = {};

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

	// webmail client settings
	this.dblclick_time = 500;
	this.message_time = 4000;

	this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');

	// default environment vars
	this.env.keep_alive = 60; // seconds
	this.env.request_timeout = 180; // seconds
	this.env.draft_autosave = 0; // seconds
	this.env.comm_path = './';
	this.env.blankpage = 'program/resources/blank.gif';

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

	$(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)
	{
	if (!this.buttons[command])
	this.buttons[command] = [];

	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;

	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('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', 'switch-task', true);

	if (this.env.permaurl)
	this.enable_command('permaurl', 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', 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'];

	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'];

	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
	var dt = new Date(),
	tz = dt.getTimezoneOffset() / -60,
	stdtz = dt.getStdTimezoneOffset() / -60;

	$('#rcmlogintz').val(stdtz);
	$('#rcmlogindst').val(tz > stdtz ? 1 : 0);

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

	// 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':
	location.href = '?_task=settings&_action=about';
	break;

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

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

	case 'open':
	if (uid = this.get_single_uid()) {
	obj.href = '?_task='+this.env.task+'&_action=show&_mbox='+urlencode(this.env.mailbox)+'&_uid='+uid;
	return true;
	}
	break;

	case 'list':
	if (props && props != '')
	this.reset_qsearch();
	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, sort_col = props;

	if (this.env.sort_col==sort_col)
	sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
	else
	sort_order = '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)
	this.expunge_mailbox(this.env.mailbox);
	break;

	case 'purge':
	case 'empty-mailbox':
	if (this.env.messagecount)
	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.goto_url('compose', { _draft_uid: uid, _mbox: this.env.mailbox }, true);
	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 ? '_draft_uid' : '_uid'] = cid;
	this.goto_url('compose', url, true);
	}
	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, this.env.mimetypes)>=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 'checkmail':
	this.check_for_recent(true);
	break;

	case 'compose':
	url = this.url('mail/compose');

	if (this.task == 'mail') {
	url += '&_mbox='+urlencode(this.env.mailbox);
	if (props)
	url += '&_to='+urlencode(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 = this.get_task_url('mail', url);
	this.redirect(url + '&_to='+urlencode(props));
	break;
	}

	// 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='+urlencode(props);

	this.redirect(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;
	}

	// re-set keep-alive timeout
	this.start_keepalive();

	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.goto_url('compose', url, true);
	}
	break;

	case 'forward-attachment':
	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))
	url._attachment = 1;
	this.goto_url('compose', url, true);
	}
	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, li, 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) {
	if (!rcube_mouse_is_over(e, list.list.parentNode))
	list.blur();
	else
	list.focus();
	model = this.env.mailboxes;
	}
	else if (list = this.contact_list) {
	if (!rcube_mouse_is_over(e, list.list.parentNode))
	list.blur();
	else
	list.focus();
	model = this.env.contactfolders;
	}
	else if (this.ksearch_value) {
	this.ksearch_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);
	// 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));

	// 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() && window.frames && window.frames[this.env.contentframe]) {
	if (window.frames[this.env.contentframe].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.goto_url('compose', { _draft_uid: uid, _mbox: this.env.mailbox }, true);
	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;
	};


	/*********************************************************/
	/******* (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 doble-clicks on a row
	this.show_message = function(id, safe, preview)
	{
	if (!id)
	return;

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

	if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
	target = window.frames[this.env.contentframe];
	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 (preview && String(target.location.href).indexOf(url) >= 0)
	this.show_contentframe(true);
	else {
	this.location_href(this.env.comm_path+url, target, true);

	// mark as read and change mbox unread counter
	if (preview && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read >= 0) {
	this.preview_read_timer = setTimeout(function() {
	ref.set_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 frm, win;
	if (this.env.contentframe && (frm = $('#'+this.env.contentframe)) && frm.length) {
	if (!show && (win = window.frames[this.env.contentframe])) {
	if (win.location && win.location.href.indexOf(this.env.blankpage)<0)
	win.location.href = this.env.blankpage;
	}
	else if (!bw.safari && !bw.konq)
	frm[show ? 'show' : 'hide']();
	}

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

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

	// 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 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 (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
	target = window.frames[this.env.contentframe];
	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.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)))
	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]);
	}
	}

	post_data._uid = this.uids_to_list(a_uids);

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

	// 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)))
	return;

	var lock = false,
	add_post = {_target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};

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

	// 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()) : [];

	// 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_childs(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))
	return;

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

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

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

	if (this.env.uid)
	a_uids[0] = this.env.uid;
	else {
	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);
	};

	// set a specific flag to one or more messages
	this.mark_message = function(flag, uid)
	{
	var a_uids = [], r_uids = [], len, n, id,
	selection = this.message_list ? this.message_list.get_selection() : [];

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

	if (!this.message_list)
	r_uids = a_uids;
	else
	for (n=0, len=a_uids.length; n<len; n++) {
	id = a_uids[n];
	if ((flag=='read' && this.message_list.rows[id].unread)
	\|\| (flag=='unread' && !this.message_list.rows[id].unread)
	\|\| (flag=='delete' && !this.message_list.rows[id].deleted)
	\|\| (flag=='undelete' && this.message_list.rows[id].deleted)
	\|\| (flag=='flagged' && !this.message_list.rows[id].flagged)
	\|\| (flag=='unflagged' && this.message_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},
	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.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},
	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.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'},
	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'},
	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
	\|\| 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 *******/
	/*********************************************************/

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

	// 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.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 (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;

	// get file input field, count files on capable browser
	var i, size = 0, field = $('input[type=file]', form).get(0),
	files = field.files ? field.files.length : field.value ? 1 : 0;

	// create hidden iframe and post upload form
	if (files) {
	// check file size
	if (field.files && this.env.max_filesize && this.env.filesizeerror) {
	for (i=0; i<files; i++)
	size += field.files[i].size;
	if (size && 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' + (files > 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);
	// 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 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 (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
	target = window.frames[this.env.contentframe];
	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 url = {}, target = window;

	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
	url._framed = 1;
	target = window.frames[this.env.contentframe];
	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 url = {_form: 1, _action: 'search'}, target = window;

	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
	url._framed = 1;
	target = window.frames[this.env.contentframe];
	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 id = list.get_single_selection(), target = window,
	url = {_action: 'edit-prefs', _section: id};

	if (id) {
	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
	url._framed = 1;
	target = window.frames[this.env.contentframe];
	}
	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 target = window,
	url = {_action: action, _iid: id};

	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
	url._framed = 1;
	target = window.frames[this.env.contentframe];
	document.getElementById(this.env.contentframe).style.visibility = 'inherit';
	}

	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 target = window,
	url = '&_action=edit-folder&_mbox='+urlencode(folder);

	if (path)
	url += '&_path='+urlencode(path);

	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
	target = window.frames[this.env.contentframe];
	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 false;
	}

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

	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 = {};
	};

	// 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;
	// if we have links for sorting, it's a bit more complicated...
	if (cell.firstChild && cell.firstChild.tagName.toLowerCase()=='a') {
	cell = cell.firstChild;
	cell.onclick = function(){ return rcmail.command('sort', this.__col, this); };
	cell.__col = col;
	}
	cell.innerHTML = this.get_label(col == 'fromto' ? smart_col : col);
	}
	}
	}

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

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

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

	// 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) {
	// 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', 'sort', '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 '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', 'sort', (this.env.messagecount > 0));
	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});
	};

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

	// re-send keep-alive requests after 30 seconds
	if (action == 'keep-alive')
	setTimeout(function(){ ref.keep_alive(); }, 30000);
	else if (action == 'check-recent')
	setTimeout(function(){ ref.check_for_recent(false); }, 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/check-recent signal
	this.start_keepalive = function()
	{
	if (!this.env.keep_alive \|\| this.env.framed)
	return;

	if (this._int)
	clearInterval(this._int);

	if (this.task == 'mail' && this.gui_objects.mailboxlist)
	this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
	else if (this.task != 'login' && this.env.action != 'print')
	this._int = setInterval(function(){ ref.keep_alive(); }, this.env.keep_alive * 1000);
	};

	// sends keep-alive signal
	this.keep_alive = function()
	{
	if (!this.busy)
	this.http_request('keep-alive');
	};

	// sends request to check for recent messages
	this.check_for_recent = function(refresh)
	{
	if (this.busy)
	return;

	var lock, url = {_mbox: this.env.mailbox};

	if (refresh) {
	lock = this.set_busy(true, 'checkingmail');
	url._refresh = 1;
	// reset check-recent interval
	this.start_keepalive();
	}

	if (this.gui_objects.messagelist)
	url._list = 1;
	if (this.gui_objects.quotadisplay)
	url._quota = 1;
	if (this.env.search_request)
	url._search = this.env.search_request;

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


	/********************************************************/
	/******* 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;
	else 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;
	}
	else
	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/js/common.js b/program/js/common.js
	index fdef3453e..a08387ecb 100644
	--- a/program/js/common.js
	+++ b/program/js/common.js
	@@ -1,824 +1,825 @@
	/*
	+-----------------------------------------------------------------------+
	\| Roundcube common js library \|
	\| \|
	\| This file is part of the Roundcube web development suite \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// Constants
	var CONTROL_KEY = 1;
	var SHIFT_KEY = 2;
	var CONTROL_SHIFT_KEY = 3;


	/**
	* Default browser check class
	* @constructor
	*/
	function roundcube_browser()
	{
	var n = navigator;

	this.ver = parseFloat(n.appVersion);
	this.appver = n.appVersion;
	this.agent = n.userAgent;
	this.agent_lc = n.userAgent.toLowerCase();
	this.name = n.appName;
	this.vendor = n.vendor ? n.vendor : '';
	this.vendver = n.vendorSub ? parseFloat(n.vendorSub) : 0;
	this.product = n.product ? n.product : '';
	this.platform = String(n.platform).toLowerCase();
	this.lang = (n.language) ? n.language.substring(0,2) :
	(n.browserLanguage) ? n.browserLanguage.substring(0,2) :
	(n.systemLanguage) ? n.systemLanguage.substring(0,2) : 'en';

	this.win = (this.platform.indexOf('win') >= 0);
	this.mac = (this.platform.indexOf('mac') >= 0);
	this.linux = (this.platform.indexOf('linux') >= 0);
	this.unix = (this.platform.indexOf('unix') >= 0);

	this.dom = document.getElementById ? true : false;
	this.dom2 = (document.addEventListener && document.removeEventListener);

	this.ie = (document.all && !window.opera);
	this.ie4 = (this.ie && !this.dom);
	this.ie5 = (this.dom && this.appver.indexOf('MSIE 5')>0);
	this.ie8 = (this.dom && this.appver.indexOf('MSIE 8')>0);
	this.ie9 = (this.dom && this.appver.indexOf('MSIE 9')>0);
	this.ie7 = (this.dom && this.appver.indexOf('MSIE 7')>0);
	this.ie6 = (this.dom && !this.ie8 && !this.ie7 && this.appver.indexOf('MSIE 6')>0);

	this.ns = ((this.ver < 5 && this.name == 'Netscape') \|\| (this.ver >= 5 && this.vendor.indexOf('Netscape') >= 0));
	this.chrome = (this.agent_lc.indexOf('chrome') > 0);
	this.safari = (!this.chrome && (this.agent_lc.indexOf('safari') > 0 \|\| this.agent_lc.indexOf('applewebkit') > 0));
	this.konq = (this.agent_lc.indexOf('konqueror') > 0);
	this.mz = (this.dom && !this.ie && !this.ns && !this.chrome && !this.safari && !this.konq && this.agent.indexOf('Mozilla') >= 0);
	this.iphone = (this.safari && this.agent_lc.indexOf('iphone') > 0);
	this.ipad = (this.safari && this.agent_lc.indexOf('ipad') > 0);
	this.opera = window.opera ? true : false;

	if (this.opera && window.RegExp)
	this.vendver = (/opera(\s\|\/)([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$2) : -1;
	else if (this.chrome && window.RegExp)
	this.vendver = (/chrome\/([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0;
	else if (!this.vendver && this.safari)
	this.vendver = (/(safari\|applewebkit)\/([0-9]+)/.test(this.agent_lc)) ? parseInt(RegExp.$2) : 0;
	else if ((!this.vendver && this.mz) \|\| this.agent.indexOf('Camino')>0)
	this.vendver = (/rv:([0-9\.]+)/.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
	else if (this.ie && window.RegExp)
	this.vendver = (/msie\s+([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0;
	else if (this.konq && window.RegExp)
	this.vendver = (/khtml\/([0-9\.]+)/.test(this.agent_lc)) ? parseFloat(RegExp.$1) : 0;

	// get real language out of safari's user agent
	if (this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/.test(this.agent_lc)))
	this.lang = RegExp.$1;

	this.mobile = this.agent_lc.match(/iphone\|ipad\|ipod\|android\|blackberry\|iemobile\|opera mini\|opera mobi/);
	this.dhtml = ((this.ie4 && this.win) \|\| this.ie5 \|\| this.ie6 \|\| this.ns4 \|\| this.mz);
	this.vml = (this.win && this.ie && this.dom && !this.opera);
	this.pngalpha = (this.mz \|\| (this.opera && this.vendver >= 6) \|\| (this.ie && this.mac && this.vendver >= 5) \|\|
	(this.ie && this.win && this.vendver >= 5.5) \|\| this.safari);
	this.opacity = (this.mz \|\| (this.ie && this.vendver >= 5.5 && !this.opera) \|\| (this.safari && this.vendver >= 100));
	this.cookies = n.cookieEnabled;

	// test for XMLHTTP support
	this.xmlhttp_test = function()
	{
	var activeX_test = new Function("try{var o=new ActiveXObject('Microsoft.XMLHTTP');return true;}catch(err){return false;}");
	this.xmlhttp = (window.XMLHttpRequest \|\| (window.ActiveXObject && activeX_test()));
	return this.xmlhttp;
	};

	// set class names to html tag according to the current user agent detection
	// this allows browser-specific css selectors like "html.chrome .someclass"
	this.set_html_class = function()
	{
	var classname = ' js';

	if (this.ie)
	classname += ' ie ie'+parseInt(this.vendver);
	else if (this.opera)
	classname += ' opera';
	else if (this.konq)
	classname += ' konqueror';
	else if (this.safari)
	classname += ' chrome';
	else if (this.chrome)
	classname += ' chrome';
	else if (this.mz)
	classname += ' mozilla';

	if (this.iphone)
	classname += ' iphone';
	else if (this.ipad)
	classname += ' ipad';
	else if (this.safari \|\| this.chrome)
	classname += ' webkit';

	if (this.mobile)
	classname += ' mobile';

	if (document.documentElement)
	document.documentElement.className += classname;
	};
	};


	// static functions for DOM event handling
	var rcube_event = {

	/**
	* returns the event target element
	*/
	get_target: function(e)
	{
	e = e \|\| window.event;
	return e && e.target ? e.target : e.srcElement;
	},

	/**
	* returns the event key code
	*/
	get_keycode: function(e)
	{
	e = e \|\| window.event;
	return e && e.keyCode ? e.keyCode : (e && e.which ? e.which : 0);
	},

	/**
	* returns the event key code
	*/
	get_button: function(e)
	{
	e = e \|\| window.event;
	return e && e.button !== undefined ? e.button : (e && e.which ? e.which : 0);
	},

	/**
	* returns modifier key (constants defined at top of file)
	*/
	get_modifier: function(e)
	{
	var opcode = 0;
	e = e \|\| window.event;

	if (bw.mac && e)
	opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
	else if (e)
	opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);

	return opcode;
	},

	/**
	* Return absolute mouse position of an event
	*/
	get_mouse_pos: function(e)
	{
	if (!e) e = window.event;
	var mX = (e.pageX) ? e.pageX : e.clientX,
	mY = (e.pageY) ? e.pageY : e.clientY;

	if (document.body && document.all) {
	mX += document.body.scrollLeft;
	mY += document.body.scrollTop;
	}

	if (e._offset) {
	mX += e._offset.left;
	mY += e._offset.top;
	}

	return { x:mX, y:mY };
	},

	/**
	* Add an object method as event listener to a certain element
	*/
	add_listener: function(p)
	{
	if (!p.object \|\| !p.method) // not enough arguments
	return;
	if (!p.element)
	p.element = document;

	if (!p.object._rc_events)
	p.object._rc_events = [];

	var key = p.event + '*' + p.method;
	if (!p.object._rc_events[key])
	p.object._rc_events[key] = function(e){ return p.object[p.method](e); };

	if (p.element.addEventListener)
	p.element.addEventListener(p.event, p.object._rc_events[key], false);
	else if (p.element.attachEvent) {
	// IE allows multiple events with the same function to be applied to the same object
	// forcibly detach the event, then attach
	p.element.detachEvent('on'+p.event, p.object._rc_events[key]);
	p.element.attachEvent('on'+p.event, p.object._rc_events[key]);
	}
	else
	p.element['on'+p.event] = p.object._rc_events[key];
	},

	/**
	* Remove event listener
	*/
	remove_listener: function(p)
	{
	if (!p.element)
	p.element = document;

	var key = p.event + '*' + p.method;
	if (p.object && p.object._rc_events && p.object._rc_events[key]) {
	if (p.element.removeEventListener)
	p.element.removeEventListener(p.event, p.object._rc_events[key], false);
	else if (p.element.detachEvent)
	p.element.detachEvent('on'+p.event, p.object._rc_events[key]);
	else
	p.element['on'+p.event] = null;
	}
	},

	/**
	* Prevent event propagation and bubbeling
	*/
	cancel: function(evt)
	{
	var e = evt ? evt : window.event;
	if (e.preventDefault)
	e.preventDefault();
	if (e.stopPropagation)
	e.stopPropagation();

	e.cancelBubble = true;
	e.returnValue = false;
	return false;
	},

	touchevent: function(e)
	{
	return { pageX:e.pageX, pageY:e.pageY, offsetX:e.pageX - e.target.offsetLeft, offsetY:e.pageY - e.target.offsetTop, target:e.target, istouch:true };
	}

	};


	/**
	* rcmail objects event interface
	*/
	function rcube_event_engine()
	{
	this._events = {};
	};

	rcube_event_engine.prototype = {

	/**
	* Setter for object event handlers
	*
	* @param {String} Event name
	* @param {Function} Handler function
	* @return Listener ID (used to remove this handler later on)
	*/
	addEventListener: function(evt, func, obj)
	{
	if (!this._events)
	this._events = {};
	if (!this._events[evt])
	this._events[evt] = [];

	var e = {func:func, obj:obj ? obj : window};
	this._events[evt][this._events[evt].length] = e;
	},

	/**
	* Removes a specific event listener
	*
	* @param {String} Event name
	* @param {Int} Listener ID to remove
	*/
	removeEventListener: function(evt, func, obj)
	{
	if (obj === undefined)
	obj = window;

	for (var h,i=0; this._events && this._events[evt] && i < this._events[evt].length; i++)
	if ((h = this._events[evt][i]) && h.func == func && h.obj == obj)
	this._events[evt][i] = null;
	},

	/**
	* This will execute all registered event handlers
	*
	* @param {String} Event to trigger
	* @param {Object} Event object/arguments
	*/
	triggerEvent: function(evt, e)
	{
	var ret, h;
	if (e === undefined)
	e = this;
	else if (typeof e === 'object')
	e.event = evt;

	if (this._events && this._events[evt] && !this._event_exec) {
	this._event_exec = true;
	for (var i=0; i < this._events[evt].length; i++) {
	if ((h = this._events[evt][i])) {
	if (typeof h.func === 'function')
	ret = h.func.call ? h.func.call(h.obj, e) : h.func(e);
	else if (typeof h.obj[h.func] === 'function')
	ret = h.obj[h.func](e);

	// cancel event execution
	if (ret !== undefined && !ret)
	break;
	}
	}
	if (ret && ret.event) {
	try {
	delete ret.event;
	} catch (err) {
	// IE6-7 doesn't support deleting HTMLFormElement attributes (#1488017)
	$(ret).removeAttr('event');
	}
	}
	}

	this._event_exec = false;
	if (e.event) {
	try {
	delete e.event;
	} catch (err) {
	// IE6-7 doesn't support deleting HTMLFormElement attributes (#1488017)
	$(e).removeAttr('event');
	}
	}

	return ret;
	}

	}; // end rcube_event_engine.prototype



	/**
	* Roundcube generic layer (floating box) class
	*
	* @constructor
	*/
	function rcube_layer(id, attributes)
	{
	this.name = id;

	// create a new layer in the current document
	this.create = function(arg)
	{
	var l = (arg.x) ? arg.x : 0,
	t = (arg.y) ? arg.y : 0,
	w = arg.width,
	h = arg.height,
	z = arg.zindex,
	vis = arg.vis,
	parent = arg.parent,
	obj = document.createElement('DIV');

	obj.id = this.name;
	obj.style.position = 'absolute';
	obj.style.visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden';
	obj.style.left = l+'px';
	obj.style.top = t+'px';
	if (w)
	obj.style.width = w.toString().match(/\%$/) ? w : w+'px';
	if (h)
	obj.style.height = h.toString().match(/\%$/) ? h : h+'px';
	if (z)
	obj.style.zIndex = z;

	if (parent)
	parent.appendChild(obj);
	else
	document.body.appendChild(obj);

	this.elm = obj;
	};

	// create new layer
	if (attributes != null) {
	this.create(attributes);
	this.name = this.elm.id;
	}
	else // just refer to the object
	this.elm = document.getElementById(id);

	if (!this.elm)
	return false;


	// ******* layer object properties *******

	this.css = this.elm.style;
	this.event = this.elm;
	this.width = this.elm.offsetWidth;
	this.height = this.elm.offsetHeight;
	this.x = parseInt(this.elm.offsetLeft);
	this.y = parseInt(this.elm.offsetTop);
	this.visible = (this.css.visibility=='visible' \|\| this.css.visibility=='show' \|\| this.css.visibility=='inherit') ? true : false;


	// ******* layer object methods *******

	// move the layer to a specific position
	this.move = function(x, y)
	{
	this.x = x;
	this.y = y;
	this.css.left = Math.round(this.x)+'px';
	this.css.top = Math.round(this.y)+'px';
	};

	// change the layers width and height
	this.resize = function(w,h)
	{
	this.css.width = w+'px';
	this.css.height = h+'px';
	this.width = w;
	this.height = h;
	};

	// show or hide the layer
	this.show = function(a)
	{
	if(a == 1) {
	this.css.visibility = 'visible';
	this.visible = true;
	}
	else if(a == 2) {
	this.css.visibility = 'inherit';
	this.visible = true;
	}
	else {
	this.css.visibility = 'hidden';
	this.visible = false;
	}
	};

	// write new content into a Layer
	this.write = function(cont)
	{
	this.elm.innerHTML = cont;
	};

	};


	// check if input is a valid email address
	// By Cal Henderson <cal@iamcal.com>
	// http://code.iamcal.com/php/rfc822/
	function rcube_check_email(input, inline)
	{
	if (input && window.RegExp) {
	var qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]',
	dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]',
	atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+',
	quoted_pair = '\\x5c[\\x00-\\x7f]',
	quoted_string = '\\x22('+qtext+'\|'+quoted_pair+')*\\x22',
	// Use simplified domain matching, because we need to allow Unicode characters here
	// So, e-mail address should be validated also on server side after idn_to_ascii() use
	//domain_literal = '\\x5b('+dtext+'\|'+quoted_pair+')*\\x5d',
	//sub_domain = '('+atom+'\|'+domain_literal+')',
	// allow punycode/unicode top-level domain
	domain = '([^@\\x2e]+\\x2e)+([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}\|xn--[a-z0-9]{2,})',
	// ICANN e-mail test (http://idn.icann.org/E-mail_test)
	icann_domains = [
	'\\u0645\\u062b\\u0627\\u0644\\x2e\\u0625\\u062e\\u062a\\u0628\\u0627\\u0631',
	'\\u4f8b\\u5b50\\x2e\\u6d4b\\u8bd5',
	'\\u4f8b\\u5b50\\x2e\\u6e2c\\u8a66',
	'\\u03c0\\u03b1\\u03c1\\u03ac\\u03b4\\u03b5\\u03b9\\u03b3\\u03bc\\u03b1\\x2e\\u03b4\\u03bf\\u03ba\\u03b9\\u03bc\\u03ae',
	'\\u0909\\u0926\\u093e\\u0939\\u0930\\u0923\\x2e\\u092a\\u0930\\u0940\\u0915\\u094d\\u0937\\u093e',
	'\\u4f8b\\u3048\\x2e\\u30c6\\u30b9\\u30c8',
	'\\uc2e4\\ub840\\x2e\\ud14c\\uc2a4\\ud2b8',
	'\\u0645\\u062b\\u0627\\u0644\\x2e\\u0622\\u0632\\u0645\\u0627\\u06cc\\u0634\u06cc',
	'\\u043f\\u0440\\u0438\\u043c\\u0435\\u0440\\x2e\\u0438\\u0441\\u043f\\u044b\\u0442\\u0430\\u043d\\u0438\\u0435',
	'\\u0b89\\u0ba4\\u0bbe\\u0bb0\\u0ba3\\u0bae\\u0bcd\\x2e\\u0baa\\u0bb0\\u0bbf\\u0b9f\\u0bcd\\u0b9a\\u0bc8',
	'\\u05d1\\u05f2\\u05b7\\u05e9\\u05e4\\u05bc\\u05d9\\u05dc\\x2e\\u05d8\\u05e2\\u05e1\\u05d8'
	],
	icann_addr = 'mailtest\\x40('+icann_domains.join('\|')+')',
	word = '('+atom+'\|'+quoted_string+')',
	delim = '[,;\s\n]',
	local_part = word+'(\\x2e'+word+')*',
	addr_spec = '(('+local_part+'\\x40'+domain+')\|('+icann_addr+'))',
	reg1 = inline ? new RegExp('(^\|<\|'+delim+')'+addr_spec+'($\|>\|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i');

	return reg1.test(input) ? true : false;
	}

	return false;
	};


	// recursively copy an object
	function rcube_clone_object(obj)
	{
	var out = {};

	for (var key in obj) {
	if (obj[key] && typeof obj[key] === 'object')
	out[key] = clone_object(obj[key]);
	else
	out[key] = obj[key];
	}

	return out;
	};

	// make a string URL safe (and compatible with PHP's rawurlencode())
	function urlencode(str)
	{
	if (window.encodeURIComponent)
	return encodeURIComponent(str).replace('*', '%2A');

	return escape(str)
	.replace('+', '%2B')
	.replace('*', '%2A')
	.replace('/', '%2F')
	.replace('@', '%40');
	};


	// get any type of html objects by id/name
	function rcube_find_object(id, d)
	{
	var n, f, obj, e;
	if(!d) d = document;

	if(d.getElementsByName && (e = d.getElementsByName(id)))
	obj = e[0];
	if(!obj && d.getElementById)
	obj = d.getElementById(id);
	if(!obj && d.all)
	obj = d.all[id];

	if(!obj && d.images.length)
	obj = d.images[id];

	if (!obj && d.forms.length) {
	for (f=0; f<d.forms.length; f++) {
	if(d.forms[f].name == id)
	obj = d.forms[f];
	else if(d.forms[f].elements[id])
	obj = d.forms[f].elements[id];
	}
	}

	if (!obj && d.layers) {
	if (d.layers[id]) obj = d.layers[id];
	for (n=0; !obj && n<d.layers.length; n++)
	obj = rcube_find_object(id, d.layers[n].document);
	}

	return obj;
	};

	// determine whether the mouse is over the given object or not
	function rcube_mouse_is_over(ev, obj)
	{
	var mouse = rcube_event.get_mouse_pos(ev),
	pos = $(obj).offset();

	return ((mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) &&
	(mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight)));
	};


	// cookie functions by GoogieSpell
	function setCookie(name, value, expires, path, domain, secure)
	{
	var curCookie = name + "=" + escape(value) +
	(expires ? "; expires=" + expires.toGMTString() : "") +
	(path ? "; path=" + path : "") +
	(domain ? "; domain=" + domain : "") +
	(secure ? "; secure" : "");
	document.cookie = curCookie;
	};

	function getCookie(name)
	{
	var dc = document.cookie,
	prefix = name + "=",
	begin = dc.indexOf("; " + prefix);

	if (begin == -1) {
	begin = dc.indexOf(prefix);
	if (begin != 0)
	return null;
	}
	else {
	begin += 2;
	}

	var end = dc.indexOf(";", begin);
	if (end == -1)
	end = dc.length;

	return unescape(dc.substring(begin + prefix.length, end));
	};

	+// deprecated aliases, to be removed, use rcmail.set_cookie/rcmail.get_cookie
	roundcube_browser.prototype.set_cookie = setCookie;
	roundcube_browser.prototype.get_cookie = getCookie;

	// tiny replacement for Firebox functionality
	function rcube_console()
	{
	this.log = function(msg)
	{
	var box = rcube_find_object('dbgconsole');

	if (box) {
	if (msg.charAt(msg.length-1)=='\n')
	msg += '--------------------------------------\n';
	else
	msg += '\n--------------------------------------\n';

	// Konqueror doesn't allow to just change the value of hidden element
	if (bw.konq) {
	box.innerText += msg;
	box.value = box.innerText;
	} else
	box.value += msg;
	}
	};

	this.reset = function()
	{
	var box = rcube_find_object('dbgconsole');
	if (box)
	box.innerText = box.value = '';
	};
	};

	var bw = new roundcube_browser();
	bw.set_html_class();


	// Add escape() method to RegExp object
	// http://dev.rubyonrails.org/changeset/7271
	RegExp.escape = function(str)
	{
	return String(str).replace(/([.*+?^=!:${}()\|[\]\/\\])/g, '\\$1');
	};

	// Extend Date prototype to detect Standard timezone without DST
	// from http://www.michaelapproved.com/articles/timezone-detect-and-ignore-daylight-saving-time-dst/
	Date.prototype.getStdTimezoneOffset = function()
	{
	var m = 12,
	d = new Date(null, m, 1),
	tzo = d.getTimezoneOffset();

	while (--m) {
	d.setUTCMonth(m);
	if (tzo != d.getTimezoneOffset()) {
	return Math.max(tzo, d.getTimezoneOffset());
	}
	}

	return tzo;
	}

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

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

	return obj;
	}
	}

	// jQuery plugin to emulate HTML5 placeholder attributes on input elements
	jQuery.fn.placeholder = function(text) {
	return this.each(function() {
	var elem = $(this);
	this.title = text;

	if ('placeholder' in this) {
	elem.attr('placeholder', text); // Try HTML5 placeholder attribute first
	}
	else { // Fallback to Javascript emulation of placeholder
	this._placeholder = text;
	elem.blur(function(e) {
	if ($.trim(elem.val()) == "")
	elem.val(text);
	elem.triggerHandler('change');
	})
	.focus(function(e) {
	if ($.trim(elem.val()) == text)
	elem.val("");
	elem.triggerHandler('change');
	})
	.change(function(e) {
	var active = elem.val() == text;
	elem[(active ? 'addClass' : 'removeClass')]('placeholder').attr('spellcheck', active);
	});

	if (this != document.activeElement) // Do not blur currently focused element
	elem.blur();
	}
	});
	};


	// This code was written by Tyler Akins and has been placed in the
	// public domain. It would be nice if you left this header intact.
	// Base64 code from Tyler Akins -- http://rumkin.com
	var Base64 = (function () {
	var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";

	var obj = {
	/**
	* Encodes a string in base64
	* @param {String} input The string to encode in base64.
	*/
	encode: function (input) {
	if (typeof(window.btoa) === 'function')
	return btoa(input);

	var chr1, chr2, chr3, enc1, enc2, enc3, enc4, i = 0, output = '', len = input.length;

	do {
	chr1 = input.charCodeAt(i++);
	chr2 = input.charCodeAt(i++);
	chr3 = input.charCodeAt(i++);

	enc1 = chr1 >> 2;
	enc2 = ((chr1 & 3) << 4) \| (chr2 >> 4);
	enc3 = ((chr2 & 15) << 2) \| (chr3 >> 6);
	enc4 = chr3 & 63;

	if (isNaN(chr2))
	enc3 = enc4 = 64;
	else if (isNaN(chr3))
	enc4 = 64;

	output = output
	+ keyStr.charAt(enc1) + keyStr.charAt(enc2)
	+ keyStr.charAt(enc3) + keyStr.charAt(enc4);
	} while (i < len);

	return output;
	},

	/**
	* Decodes a base64 string.
	* @param {String} input The string to decode.
	*/
	decode: function (input) {
	if (typeof(window.atob) === 'function')
	return atob(input);

	var chr1, chr2, chr3, enc1, enc2, enc3, enc4, len, i = 0, output = '';

	// remove all characters that are not A-Z, a-z, 0-9, +, /, or =
	input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
	len = input.length;

	do {
	enc1 = keyStr.indexOf(input.charAt(i++));
	enc2 = keyStr.indexOf(input.charAt(i++));
	enc3 = keyStr.indexOf(input.charAt(i++));
	enc4 = keyStr.indexOf(input.charAt(i++));

	chr1 = (enc1 << 2) \| (enc2 >> 4);
	chr2 = ((enc2 & 15) << 4) \| (enc3 >> 2);
	chr3 = ((enc3 & 3) << 6) \| enc4;

	output = output + String.fromCharCode(chr1);

	if (enc3 != 64)
	output = output + String.fromCharCode(chr2);
	if (enc4 != 64)
	output = output + String.fromCharCode(chr3);
	} while (i < len);

	return output;
	}
	};

	return obj;
	})();
	diff --git a/program/js/googiespell.js b/program/js/googiespell.js
	index 9f1b41bb2..478858bac 100644
	--- a/program/js/googiespell.js
	+++ b/program/js/googiespell.js
	@@ -1,1135 +1,1135 @@
	/*
	+-----------------------------------------------------------------------+
	\| Roundcube SpellCheck script \|
	\| jQuery'fied spell checker based on GoogieSpell 4.0 \|
	\| (which was published under GPL "version 2 or any later version") \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2006 Amir Salihefendic \|
	\| Copyright (C) 2009 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: 4mir Salihefendic <amix@amix.dk> \|
	\| Aleksander Machniak - <alec [at] alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	var GOOGIE_CUR_LANG,
	GOOGIE_DEFAULT_LANG = 'en';

	function GoogieSpell(img_dir, server_url, has_dict)
	{
	var ref = this,
	- cookie_value = getCookie('language');
	+ cookie_value = rcmail.get_cookie('language');

	GOOGIE_CUR_LANG = cookie_value != null ? cookie_value : GOOGIE_DEFAULT_LANG;

	this.array_keys = function(arr) {
	var res = [];
	for (var key in arr) { res.push([key]); }
	return res;
	}

	this.img_dir = img_dir;
	this.server_url = server_url;

	this.org_lang_to_word = {
	"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"
	};
	this.lang_to_word = this.org_lang_to_word;
	this.langlist_codes = this.array_keys(this.lang_to_word);
	this.show_change_lang_pic = true;
	this.change_lang_pic_placement = 'right';
	this.report_state_change = true;

	this.ta_scroll_top = 0;
	this.el_scroll_top = 0;

	this.lang_chck_spell = "Check spelling";
	this.lang_revert = "Revert to";
	this.lang_close = "Close";
	this.lang_rsm_edt = "Resume editing";
	this.lang_no_error_found = "No spelling errors found";
	this.lang_no_suggestions = "No suggestions";
	this.lang_learn_word = "Add to dictionary";

	this.show_spell_img = false; // roundcube mod.
	this.decoration = true;
	this.use_close_btn = false;
	this.edit_layer_dbl_click = true;
	this.report_ta_not_found = true;

	// Extensions
	this.custom_ajax_error = null;
	this.custom_no_spelling_error = null;
	this.custom_menu_builder = []; // Should take an eval function and a build menu function
	this.custom_item_evaulator = null; // Should take an eval function and a build menu function
	this.extra_menu_items = [];
	this.custom_spellcheck_starter = null;
	this.main_controller = true;
	this.has_dictionary = has_dict;

	// Observers
	this.lang_state_observer = null;
	this.spelling_state_observer = null;
	this.show_menu_observer = null;
	this.all_errors_fixed_observer = null;

	// Focus links - used to give the text box focus
	this.use_focus = false;
	this.focus_link_t = null;
	this.focus_link_b = null;

	// Counters
	this.cnt_errors = 0;
	this.cnt_errors_fixed = 0;

	// Set document's onclick to hide the language and error menu
	$(document).bind('click', function(e) {
	var target = $(e.target);
	if(target.attr('googie_action_btn') != '1' && ref.isLangWindowShown())
	ref.hideLangWindow();
	if(target.attr('googie_action_btn') != '1' && ref.isErrorWindowShown())
	ref.hideErrorWindow();
	});


	this.decorateTextarea = function(id)
	{
	this.text_area = typeof id === 'string' ? document.getElementById(id) : id;

	if (this.text_area) {
	if (!this.spell_container && this.decoration) {
	var table = document.createElement('table'),
	tbody = document.createElement('tbody'),
	tr = document.createElement('tr'),
	spell_container = document.createElement('td'),
	r_width = this.isDefined(this.force_width) ? this.force_width : this.text_area.offsetWidth,
	r_height = this.isDefined(this.force_height) ? this.force_height : 16;

	tr.appendChild(spell_container);
	tbody.appendChild(tr);
	$(table).append(tbody).insertBefore(this.text_area).width('100%').height(r_height);
	$(spell_container).height(r_height).width(r_width).css('text-align', 'right');

	this.spell_container = spell_container;
	}

	this.checkSpellingState();
	}
	else if (this.report_ta_not_found)
	alert('Text area not found');
	};

	//////
	// API Functions (the ones that you can call)
	/////
	this.setSpellContainer = function(id)
	{
	this.spell_container = typeof id === 'string' ? document.getElementById(id) : id;
	};

	this.setLanguages = function(lang_dict)
	{
	this.lang_to_word = lang_dict;
	this.langlist_codes = this.array_keys(lang_dict);
	};

	this.setCurrentLanguage = function(lan_code)
	{
	GOOGIE_CUR_LANG = lan_code;

	//Set cookie
	var now = new Date();
	now.setTime(now.getTime() + 365 * 24 * 60 * 60 * 1000);
	- setCookie('language', lan_code, now);
	+ rcmail.set_cookie('language', lan_code, now);
	};

	this.setForceWidthHeight = function(width, height)
	{
	// Set to null if you want to use one of them
	this.force_width = width;
	this.force_height = height;
	};

	this.setDecoration = function(bool)
	{
	this.decoration = bool;
	};

	this.dontUseCloseButtons = function()
	{
	this.use_close_btn = false;
	};

	this.appendNewMenuItem = function(name, call_back_fn, checker)
	{
	this.extra_menu_items.push([name, call_back_fn, checker]);
	};

	this.appendCustomMenuBuilder = function(eval_fn, builder)
	{
	this.custom_menu_builder.push([eval_fn, builder]);
	};

	this.setFocus = function()
	{
	try {
	this.focus_link_b.focus();
	this.focus_link_t.focus();
	return true;
	}
	catch(e) {
	return false;
	}
	};


	//////
	// Set functions (internal)
	/////
	this.setStateChanged = function(current_state)
	{
	this.state = current_state;
	if (this.spelling_state_observer != null && this.report_state_change)
	this.spelling_state_observer(current_state, this);
	};

	this.setReportStateChange = function(bool)
	{
	this.report_state_change = bool;
	};


	//////
	// Request functions
	/////
	this.getUrl = function()
	{
	return this.server_url + GOOGIE_CUR_LANG;
	};

	this.escapeSpecial = function(val)
	{
	return val ? val.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">") : '';
	};

	this.createXMLReq = function (text)
	{
	return '<?xml version="1.0" encoding="utf-8" ?>'
	+ '<spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1">'
	+ '<text>' + text + '</text></spellrequest>';
	};

	this.spellCheck = function(ignore)
	{
	this.prepare(ignore);

	var req_text = this.escapeSpecial(this.orginal_text),
	ref = this;

	$.ajax({ type: 'POST', url: this.getUrl(), data: this.createXMLReq(req_text), dataType: 'text',
	error: function(o) {
	if (ref.custom_ajax_error)
	ref.custom_ajax_error(ref);
	else
	alert('An error was encountered on the server. Please try again later.');
	if (ref.main_controller) {
	$(ref.spell_span).remove();
	ref.removeIndicator();
	}
	ref.checkSpellingState();
	},
	success: function(data) {
	ref.processData(data);
	if (!ref.results.length) {
	if (!ref.custom_no_spelling_error)
	ref.flashNoSpellingErrorState();
	else
	ref.custom_no_spelling_error(ref);
	}
	ref.removeIndicator();
	}
	});
	};

	this.learnWord = function(word, id)
	{
	word = this.escapeSpecial(word.innerHTML);

	var ref = this,
	req_text = '<?xml version="1.0" encoding="utf-8" ?><learnword><text>' + word + '</text></learnword>';

	$.ajax({ type: 'POST', url: this.getUrl(), data: req_text, dataType: 'text',
	error: function(o) {
	if (ref.custom_ajax_error)
	ref.custom_ajax_error(ref);
	else
	alert('An error was encountered on the server. Please try again later.');
	},
	success: function(data) {
	}
	});
	};


	//////
	// Spell checking functions
	/////
	this.prepare = function(ignore, no_indicator)
	{
	this.cnt_errors_fixed = 0;
	this.cnt_errors = 0;
	this.setStateChanged('checking_spell');

	if (!no_indicator && this.main_controller)
	this.appendIndicator(this.spell_span);

	this.error_links = [];
	this.ta_scroll_top = this.text_area.scrollTop;
	this.ignore = ignore;
	this.hideLangWindow();

	if ($(this.text_area).val() == '' \|\| ignore) {
	if (!this.custom_no_spelling_error)
	this.flashNoSpellingErrorState();
	else
	this.custom_no_spelling_error(this);
	this.removeIndicator();
	return;
	}

	this.createEditLayer(this.text_area.offsetWidth, this.text_area.offsetHeight);
	this.createErrorWindow();
	$('body').append(this.error_window);

	try { netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead"); }
	catch (e) { }

	if (this.main_controller)
	$(this.spell_span).unbind('click');

	this.orginal_text = $(this.text_area).val();
	};

	this.parseResult = function(r_text)
	{
	// Returns an array: result[item] -> ['attrs'], ['suggestions']
	var re_split_attr_c = /\w+="(\d+\|true)"/g,
	re_split_text = /\t/g,
	matched_c = r_text.match(/<c[^>]>[^<]<\/c>/g),
	results = [];

	if (matched_c == null)
	return results;

	for (var i=0, len=matched_c.length; i < len; i++) {
	var item = [];
	this.errorFound();

	// Get attributes
	item['attrs'] = [];
	var c_attr, val,
	split_c = matched_c[i].match(re_split_attr_c);
	for (var j=0; j < split_c.length; j++) {
	c_attr = split_c[j].split(/=/);
	val = c_attr[1].replace(/"/g, '');
	item['attrs'][c_attr[0]] = val != 'true' ? parseInt(val) : val;
	}

	// Get suggestions
	item['suggestions'] = [];
	var only_text = matched_c[i].replace(/<[^>]*>/g, ''),
	split_t = only_text.split(re_split_text);
	for (var k=0; k < split_t.length; k++) {
	if(split_t[k] != '')
	item['suggestions'].push(split_t[k]);
	}
	results.push(item);
	}

	return results;
	};

	this.processData = function(data)
	{
	this.results = this.parseResult(data);
	if (this.results.length) {
	this.showErrorsInIframe();
	this.resumeEditingState();
	}
	};

	//////
	// Error menu functions
	/////
	this.createErrorWindow = function()
	{
	this.error_window = document.createElement('div');
	$(this.error_window).addClass('googie_window popupmenu').attr('googie_action_btn', '1');
	};

	this.isErrorWindowShown = function()
	{
	return $(this.error_window).is(':visible');
	};

	this.hideErrorWindow = function()
	{
	$(this.error_window).hide();
	$(this.error_window_iframe).hide();
	};

	this.updateOrginalText = function(offset, old_value, new_value, id)
	{
	var part_1 = this.orginal_text.substring(0, offset),
	part_2 = this.orginal_text.substring(offset+old_value.length),
	add_2_offset = new_value.length - old_value.length;

	this.orginal_text = part_1 + new_value + part_2;
	$(this.text_area).val(this.orginal_text);
	for (var j=0, len=this.results.length; j<len; j++) {
	// Don't edit the offset of the current item
	if (j != id && j > id)
	this.results[j]['attrs']['o'] += add_2_offset;
	}
	};

	this.saveOldValue = function(elm, old_value) {
	elm.is_changed = true;
	elm.old_value = old_value;
	};

	this.createListSeparator = function()
	{
	var td = document.createElement('td'),
	tr = document.createElement('tr');

	$(td).html(' ').attr('googie_action_btn', '1')
	.css({'cursor': 'default', 'font-size': '3px', 'border-top': '1px solid #ccc', 'padding-top': '3px'});
	tr.appendChild(td);

	return tr;
	};

	this.correctError = function(id, elm, l_elm, rm_pre_space)
	{
	var old_value = elm.innerHTML,
	new_value = l_elm.nodeType == 3 ? l_elm.nodeValue : l_elm.innerHTML,
	offset = this.results[id]['attrs']['o'];

	if (rm_pre_space) {
	var pre_length = elm.previousSibling.innerHTML;
	elm.previousSibling.innerHTML = pre_length.slice(0, pre_length.length-1);
	old_value = " " + old_value;
	offset--;
	}

	this.hideErrorWindow();
	this.updateOrginalText(offset, old_value, new_value, id);

	$(elm).html(new_value).css('color', 'green').attr('is_corrected', true);

	this.results[id]['attrs']['l'] = new_value.length;

	if (!this.isDefined(elm.old_value))
	this.saveOldValue(elm, old_value);

	this.errorFixed();
	};

	this.ignoreError = function(elm, id)
	{
	// @TODO: ignore all same words
	$(elm).removeAttr('class').css('color', '').unbind();
	this.hideErrorWindow();
	};

	this.showErrorWindow = function(elm, id)
	{
	if (this.show_menu_observer)
	this.show_menu_observer(this);

	var ref = this,
	pos = $(elm).offset(),
	table = document.createElement('table'),
	list = document.createElement('tbody');

	$(this.error_window).html('');
	$(table).addClass('googie_list').attr('googie_action_btn', '1');

	// Check if we should use custom menu builder, if not we use the default
	var changed = false;
	for (var k=0; k<this.custom_menu_builder.length; k++) {
	var eb = this.custom_menu_builder[k];
	if (eb[0](this.results[id])) {
	changed = eb[1](this, list, elm);
	break;
	}
	}

	if (!changed) {
	// Build up the result list
	var suggestions = this.results[id]['suggestions'],
	offset = this.results[id]['attrs']['o'],
	len = this.results[id]['attrs']['l'],
	row, item, dummy;

	// [Add to dictionary] button
	if (this.has_dictionary && !$(elm).attr('is_corrected')) {
	row = document.createElement('tr'),
	item = document.createElement('td'),
	dummy = document.createElement('span');

	$(dummy).text(this.lang_learn_word);
	$(item).attr('googie_action_btn', '1').css('cursor', 'default')
	.mouseover(ref.item_onmouseover)
	.mouseout(ref.item_onmouseout)
	.click(function(e) {
	ref.learnWord(elm, id);
	ref.ignoreError(elm, id);
	});

	item.appendChild(dummy);
	row.appendChild(item);
	list.appendChild(row);
	}
	/*
	if (suggestions.length == 0) {
	row = document.createElement('tr'),
	item = document.createElement('td'),
	dummy = document.createElement('span');

	$(dummy).text(this.lang_no_suggestions);
	$(item).attr('googie_action_btn', '1').css('cursor', 'default');

	item.appendChild(dummy);
	row.appendChild(item);
	list.appendChild(row);
	}
	*/
	for (var i=0, len=suggestions.length; i < len; i++) {
	row = document.createElement('tr'),
	item = document.createElement('td'),
	dummy = document.createElement('span');

	$(dummy).html(suggestions[i]);

	$(item).mouseover(this.item_onmouseover).mouseout(this.item_onmouseout)
	.click(function(e) { ref.correctError(id, elm, e.target.firstChild) });

	item.appendChild(dummy);
	row.appendChild(item);
	list.appendChild(row);
	}

	// The element is changed, append the revert
	if (elm.is_changed && elm.innerHTML != elm.old_value) {
	var old_value = elm.old_value,
	revert_row = document.createElement('tr'),
	revert = document.createElement('td'),
	rev_span = document.createElement('span');

	$(rev_span).addClass('googie_list_revert').html(this.lang_revert + ' ' + old_value);

	$(revert).mouseover(this.item_onmouseover).mouseout(this.item_onmouseout)
	.click(function(e) {
	ref.updateOrginalText(offset, elm.innerHTML, old_value, id);
	$(elm).removeAttr('is_corrected').css('color', '#b91414').html(old_value);
	ref.hideErrorWindow();
	});

	revert.appendChild(rev_span);
	revert_row.appendChild(revert);
	list.appendChild(revert_row);
	}

	// Append the edit box
	var edit_row = document.createElement('tr'),
	edit = document.createElement('td'),
	edit_input = document.createElement('input'),
	ok_pic = document.createElement('img'),
	edit_form = document.createElement('form');

	var onsub = function () {
	if (edit_input.value != '') {
	if (!ref.isDefined(elm.old_value))
	ref.saveOldValue(elm, elm.innerHTML);

	ref.updateOrginalText(offset, elm.innerHTML, edit_input.value, id);
	$(elm).attr('is_corrected', true).css('color', 'green').html(edit_input.value);
	ref.hideErrorWindow();
	}
	return false;
	};

	$(edit_input).width(120).css({'margin': 0, 'padding': 0});
	$(edit_input).val(elm.innerHTML).attr('googie_action_btn', '1');
	$(edit).css('cursor', 'default').attr('googie_action_btn', '1');

	$(ok_pic).attr('src', this.img_dir + 'ok.gif')
	.width(32).height(16)
	.css({'cursor': 'pointer', 'margin-left': '2px', 'margin-right': '2px'})
	.click(onsub);

	$(edit_form).attr('googie_action_btn', '1')
	.css({'margin': 0, 'padding': 0, 'cursor': 'default', 'white-space': 'nowrap'})
	.submit(onsub);

	edit_form.appendChild(edit_input);
	edit_form.appendChild(ok_pic);
	edit.appendChild(edit_form);
	edit_row.appendChild(edit);
	list.appendChild(edit_row);

	// Append extra menu items
	if (this.extra_menu_items.length > 0)
	list.appendChild(this.createListSeparator());

	var loop = function(i) {
	if (i < ref.extra_menu_items.length) {
	var e_elm = ref.extra_menu_items[i];

	if (!e_elm[2] \|\| e_elm[2](elm, ref)) {
	var e_row = document.createElement('tr'),
	e_col = document.createElement('td');

	$(e_col).html(e_elm[0])
	.mouseover(ref.item_onmouseover)
	.mouseout(ref.item_onmouseout)
	.click(function() { return e_elm[1](elm, ref) });

	e_row.appendChild(e_col);
	list.appendChild(e_row);
	}
	loop(i+1);
	}
	};

	loop(0);
	loop = null;

	//Close button
	if (this.use_close_btn) {
	list.appendChild(this.createCloseButton(this.hideErrorWindow));
	}
	}

	table.appendChild(list);
	this.error_window.appendChild(table);

	// calculate and set position
	var height = $(this.error_window).height(),
	width = $(this.error_window).width(),
	pageheight = $(document).height(),
	pagewidth = $(document).width(),
	top = pos.top + height + 20 < pageheight ? pos.top + 20 : pos.top - height,
	left = pos.left + width < pagewidth ? pos.left : pos.left - width;

	$(this.error_window).css({'top': top+'px', 'left': left+'px'}).show();

	// Dummy for IE - dropdown bug fix
	if ($.browser.msie) {
	if (!this.error_window_iframe) {
	var iframe = $('<iframe>').css({'position': 'absolute', 'z-index': -1});
	$('body').append(iframe);
	this.error_window_iframe = iframe;
	}

	$(this.error_window_iframe)
	.css({'top': this.error_window.offsetTop, 'left': this.error_window.offsetLeft,
	'width': this.error_window.offsetWidth, 'height': this.error_window.offsetHeight})
	.show();
	}
	};


	//////
	// Edit layer (the layer where the suggestions are stored)
	//////
	this.createEditLayer = function(width, height)
	{
	this.edit_layer = document.createElement('div');
	$(this.edit_layer).addClass('googie_edit_layer').attr('id', 'googie_edit_layer')
	.width('auto').height(height);

	if (this.text_area.nodeName.toLowerCase() != 'input' \|\| $(this.text_area).val() == '') {
	$(this.edit_layer).css('overflow', 'auto').height(height-4);
	} else {
	$(this.edit_layer).css('overflow', 'hidden');
	}

	var ref = this;

	if (this.edit_layer_dbl_click) {
	$(this.edit_layer).dblclick(function(e) {
	if (e.target.className != 'googie_link' && !ref.isErrorWindowShown()) {
	ref.resumeEditing();
	var fn1 = function() {
	$(ref.text_area).focus();
	fn1 = null;
	};
	window.setTimeout(fn1, 10);
	}
	return false;
	});
	}
	};

	this.resumeEditing = function()
	{
	this.setStateChanged('ready');

	if (this.edit_layer)
	this.el_scroll_top = this.edit_layer.scrollTop;

	this.hideErrorWindow();

	if (this.main_controller)
	$(this.spell_span).removeClass().addClass('googie_no_style');

	if (!this.ignore) {
	if (this.use_focus) {
	$(this.focus_link_t).remove();
	$(this.focus_link_b).remove();
	}

	$(this.edit_layer).remove();
	$(this.text_area).show();

	if (this.el_scroll_top != undefined)
	this.text_area.scrollTop = this.el_scroll_top;
	}
	this.checkSpellingState(false);
	};

	this.createErrorLink = function(text, id)
	{
	var elm = document.createElement('span'),
	ref = this,
	d = function (e) {
	ref.showErrorWindow(elm, id);
	d = null;
	return false;
	};

	$(elm).html(text).addClass('googie_link').click(d).removeAttr('is_corrected')
	.attr({'googie_action_btn' : '1', 'g_id' : id});

	return elm;
	};

	this.createPart = function(txt_part)
	{
	if (txt_part == " ")
	return document.createTextNode(" ");

	txt_part = this.escapeSpecial(txt_part);
	txt_part = txt_part.replace(/\n/g, "<br>");
	txt_part = txt_part.replace(/ /g, "  ");
	txt_part = txt_part.replace(/^ /g, " ");
	txt_part = txt_part.replace(/ $/g, " ");

	var span = document.createElement('span');
	$(span).html(txt_part);
	return span;
	};

	this.showErrorsInIframe = function()
	{
	var output = document.createElement('div'),
	pointer = 0,
	results = this.results;

	if (results.length > 0) {
	for (var i=0, length=results.length; i < length; i++) {
	var offset = results[i]['attrs']['o'],
	len = results[i]['attrs']['l'],
	part_1_text = this.orginal_text.substring(pointer, offset),
	part_1 = this.createPart(part_1_text);

	output.appendChild(part_1);
	pointer += offset - pointer;

	// If the last child was an error, then insert some space
	var err_link = this.createErrorLink(this.orginal_text.substr(offset, len), i);
	this.error_links.push(err_link);
	output.appendChild(err_link);
	pointer += len;
	}

	// Insert the rest of the orginal text
	var part_2_text = this.orginal_text.substr(pointer, this.orginal_text.length),
	part_2 = this.createPart(part_2_text);

	output.appendChild(part_2);
	}
	else
	output.innerHTML = this.orginal_text;

	$(output).css('text-align', 'left');

	var me = this;
	if (this.custom_item_evaulator)
	$.map(this.error_links, function(elm){me.custom_item_evaulator(me, elm)});

	$(this.edit_layer).append(output);

	// Hide text area and show edit layer
	$(this.text_area).hide();
	$(this.edit_layer).insertBefore(this.text_area);

	if (this.use_focus) {
	this.focus_link_t = this.createFocusLink('focus_t');
	this.focus_link_b = this.createFocusLink('focus_b');

	$(this.focus_link_t).insertBefore(this.edit_layer);
	$(this.focus_link_b).insertAfter(this.edit_layer);
	}

	// this.edit_layer.scrollTop = this.ta_scroll_top;
	};


	//////
	// Choose language menu
	//////
	this.createLangWindow = function()
	{
	this.language_window = document.createElement('div');
	$(this.language_window).addClass('googie_window popupmenu')
	.width(100).attr('googie_action_btn', '1');

	// Build up the result list
	var table = document.createElement('table'),
	list = document.createElement('tbody'),
	ref = this,
	row, item, span;

	$(table).addClass('googie_list').width('100%');
	this.lang_elms = [];

	for (i=0; i < this.langlist_codes.length; i++) {
	row = document.createElement('tr');
	item = document.createElement('td');
	span = document.createElement('span');

	$(span).text(this.lang_to_word[this.langlist_codes[i]]);
	this.lang_elms.push(item);

	$(item).attr('googieId', this.langlist_codes[i])
	.bind('click', function(e) {
	ref.deHighlightCurSel();
	ref.setCurrentLanguage($(this).attr('googieId'));

	if (ref.lang_state_observer != null) {
	ref.lang_state_observer();
	}

	ref.highlightCurSel();
	ref.hideLangWindow();
	})
	.bind('mouseover', function(e) {
	if (this.className != "googie_list_selected")
	this.className = "googie_list_onhover";
	})
	.bind('mouseout', function(e) {
	if (this.className != "googie_list_selected")
	this.className = "googie_list_onout";
	});

	item.appendChild(span);
	row.appendChild(item);
	list.appendChild(row);
	}

	// Close button
	if (this.use_close_btn) {
	list.appendChild(this.createCloseButton(function () { ref.hideLangWindow.apply(ref) }));
	}

	this.highlightCurSel();

	table.appendChild(list);
	this.language_window.appendChild(table);
	};

	this.isLangWindowShown = function()
	{
	return $(this.language_window).is(':visible');
	};

	this.hideLangWindow = function()
	{
	$(this.language_window).hide();
	$(this.switch_lan_pic).removeClass().addClass('googie_lang_3d_on');
	};

	this.showLangWindow = function(elm)
	{
	if (this.show_menu_observer)
	this.show_menu_observer(this);

	this.createLangWindow();
	$('body').append(this.language_window);

	var pos = $(elm).offset(),
	height = $(elm).height(),
	width = $(elm).width(),
	h = $(this.language_window).height(),
	pageheight = $(document).height(),
	left = this.change_lang_pic_placement == 'right' ?
	pos.left - 100 + width : pos.left + width,
	top = pos.top + h < pageheight ? pos.top + height : pos.top - h - 4;

	$(this.language_window).css({'top' : top+'px','left' : left+'px'}).show();

	this.highlightCurSel();
	};

	this.deHighlightCurSel = function()
	{
	$(this.lang_cur_elm).removeClass().addClass('googie_list_onout');
	};

	this.highlightCurSel = function()
	{
	if (GOOGIE_CUR_LANG == null)
	GOOGIE_CUR_LANG = GOOGIE_DEFAULT_LANG;
	for (var i=0; i < this.lang_elms.length; i++) {
	if ($(this.lang_elms[i]).attr('googieId') == GOOGIE_CUR_LANG) {
	this.lang_elms[i].className = 'googie_list_selected';
	this.lang_cur_elm = this.lang_elms[i];
	}
	else {
	this.lang_elms[i].className = 'googie_list_onout';
	}
	}
	};

	this.createChangeLangPic = function()
	{
	var img = $('<img>')
	.attr({src: this.img_dir + 'change_lang.gif', 'alt': 'Change language', 'googie_action_btn': '1'}),
	switch_lan = document.createElement('span');
	ref = this;

	$(switch_lan).addClass('googie_lang_3d_on')
	.append(img)
	.bind('click', function(e) {
	var elm = this.tagName.toLowerCase() == 'img' ? this.parentNode : this;
	if($(elm).hasClass('googie_lang_3d_click')) {
	elm.className = 'googie_lang_3d_on';
	ref.hideLangWindow();
	}
	else {
	elm.className = 'googie_lang_3d_click';
	ref.showLangWindow(elm);
	}
	});

	return switch_lan;
	};

	this.createSpellDiv = function()
	{
	var span = document.createElement('span');

	$(span).addClass('googie_check_spelling_link').text(this.lang_chck_spell);

	if (this.show_spell_img) {
	$(span).append(' ').append($('<img>').attr('src', this.img_dir + 'spellc.gif'));
	}
	return span;
	};


	//////
	// State functions
	/////
	this.flashNoSpellingErrorState = function(on_finish)
	{
	this.setStateChanged('no_error_found');

	var ref = this;
	if (this.main_controller) {
	var no_spell_errors;
	if (on_finish) {
	var fn = function() {
	on_finish();
	ref.checkSpellingState();
	};
	no_spell_errors = fn;
	}
	else
	no_spell_errors = function () { ref.checkSpellingState() };

	var rsm = $('<span>').text(this.lang_no_error_found);

	$(this.switch_lan_pic).hide();
	$(this.spell_span).empty().append(rsm)
	.removeClass().addClass('googie_check_spelling_ok');

	window.setTimeout(no_spell_errors, 1000);
	}
	};

	this.resumeEditingState = function()
	{
	this.setStateChanged('resume_editing');

	//Change link text to resume
	if (this.main_controller) {
	var rsm = $('<span>').text(this.lang_rsm_edt);
	var ref = this;

	$(this.switch_lan_pic).hide();
	$(this.spell_span).empty().unbind().append(rsm)
	.bind('click', function() { ref.resumeEditing() })
	.removeClass().addClass('googie_resume_editing');
	}

	try { this.edit_layer.scrollTop = this.ta_scroll_top; }
	catch (e) {};
	};

	this.checkSpellingState = function(fire)
	{
	if (fire)
	this.setStateChanged('ready');

	if (this.show_change_lang_pic)
	this.switch_lan_pic = this.createChangeLangPic();
	else
	this.switch_lan_pic = document.createElement('span');

	var span_chck = this.createSpellDiv(),
	ref = this;

	if (this.custom_spellcheck_starter)
	$(span_chck).bind('click', function(e) { ref.custom_spellcheck_starter() });
	else {
	$(span_chck).bind('click', function(e) { ref.spellCheck() });
	}

	if (this.main_controller) {
	if (this.change_lang_pic_placement == 'left') {
	$(this.spell_container).empty().append(this.switch_lan_pic).append(' ').append(span_chck);
	} else {
	$(this.spell_container).empty().append(span_chck).append(' ').append(this.switch_lan_pic);
	}
	}

	this.spell_span = span_chck;
	};


	//////
	// Misc. functions
	/////
	this.isDefined = function(o)
	{
	return (o !== undefined && o !== null)
	};

	this.errorFixed = function()
	{
	this.cnt_errors_fixed++;
	if (this.all_errors_fixed_observer)
	if (this.cnt_errors_fixed == this.cnt_errors) {
	this.hideErrorWindow();
	this.all_errors_fixed_observer();
	}
	};

	this.errorFound = function()
	{
	this.cnt_errors++;
	};

	this.createCloseButton = function(c_fn)
	{
	return this.createButton(this.lang_close, 'googie_list_close', c_fn);
	};

	this.createButton = function(name, css_class, c_fn)
	{
	var btn_row = document.createElement('tr'),
	btn = document.createElement('td'),
	spn_btn;

	if (css_class) {
	spn_btn = document.createElement('span');
	$(spn_btn).addClass(css_class).html(name);
	} else {
	spn_btn = document.createTextNode(name);
	}

	$(btn).bind('click', c_fn)
	.bind('mouseover', this.item_onmouseover)
	.bind('mouseout', this.item_onmouseout);

	btn.appendChild(spn_btn);
	btn_row.appendChild(btn);

	return btn_row;
	};

	this.removeIndicator = function(elm)
	{
	//$(this.indicator).remove();
	// roundcube mod.
	if (window.rcmail)
	rcmail.set_busy(false, null, this.rc_msg_id);
	};

	this.appendIndicator = function(elm)
	{
	// modified by roundcube
	if (window.rcmail)
	this.rc_msg_id = rcmail.set_busy(true, 'checking');
	/*
	this.indicator = document.createElement('img');
	$(this.indicator).attr('src', this.img_dir + 'indicator.gif')
	.css({'margin-right': '5px', 'text-decoration': 'none'}).width(16).height(16);

	if (elm)
	$(this.indicator).insertBefore(elm);
	else
	$('body').append(this.indicator);
	*/
	}

	this.createFocusLink = function(name)
	{
	var link = document.createElement('a');
	$(link).attr({'href': 'javascript:;', 'name': name});
	return link;
	};

	this.item_onmouseover = function(e)
	{
	if (this.className != 'googie_list_revert' && this.className != 'googie_list_close')
	this.className = 'googie_list_onhover';
	else
	this.parentNode.className = 'googie_list_onhover';
	};

	this.item_onmouseout = function(e)
	{
	if (this.className != 'googie_list_revert' && this.className != 'googie_list_close')
	this.className = 'googie_list_onout';
	else
	this.parentNode.className = 'googie_list_onout';
	};


	};
	diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
	index 94bae1974..6085b3898 100644
	--- a/program/localization/en_US/labels.inc
	+++ b/program/localization/en_US/labels.inc
	@@ -1,522 +1,519 @@
	<?php

	/*
	-
	+-----------------------------------------------------------------------+
	\| language/en_US/labels.inc \|
	\| \|
	\| Language file 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. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	-
	- @version $Id$
	-
	*/

	$labels = array();

	// login page
	$labels['welcome'] = 'Welcome to $product';
	$labels['username'] = 'Username';
	$labels['password'] = 'Password';
	$labels['server'] = 'Server';
	$labels['login'] = 'Login';

	// taskbar
	$labels['logout'] = 'Logout';
	$labels['mail'] = 'Mail';
	$labels['settings'] = 'Settings';
	$labels['addressbook'] = 'Address Book';

	// mailbox names
	$labels['inbox'] = 'Inbox';
	$labels['drafts'] = 'Drafts';
	$labels['sent'] = 'Sent';
	$labels['trash'] = 'Trash';
	$labels['junk'] = 'Junk';

	// message listing
	$labels['subject'] = 'Subject';
	$labels['from'] = 'From';
	$labels['to'] = 'To';
	$labels['cc'] = 'Cc';
	$labels['bcc'] = 'Bcc';
	$labels['replyto'] = 'Reply-To';
	$labels['followupto'] = 'Followup-To';
	$labels['date'] = 'Date';
	$labels['size'] = 'Size';
	$labels['priority'] = 'Priority';
	$labels['organization'] = 'Organization';
	$labels['readstatus'] = 'Read status';
	$labels['listoptions'] = 'List options...';

	$labels['mailboxlist'] = 'Folders';
	$labels['messagesfromto'] = 'Messages $from to $to of $count';
	$labels['threadsfromto'] = 'Threads $from to $to of $count';
	$labels['messagenrof'] = 'Message $nr of $count';
	$labels['fromtoshort'] = '$from – $to of $count';

	$labels['copy'] = 'Copy';
	$labels['move'] = 'Move';
	$labels['moveto'] = 'Move to...';
	$labels['download'] = 'Download';

	$labels['filename'] = 'File name';
	$labels['filesize'] = 'File size';

	$labels['addtoaddressbook'] = 'Add to address book';

	// weekdays short
	$labels['sun'] = 'Sun';
	$labels['mon'] = 'Mon';
	$labels['tue'] = 'Tue';
	$labels['wed'] = 'Wed';
	$labels['thu'] = 'Thu';
	$labels['fri'] = 'Fri';
	$labels['sat'] = 'Sat';

	// weekdays long
	$labels['sunday'] = 'Sunday';
	$labels['monday'] = 'Monday';
	$labels['tuesday'] = 'Tuesday';
	$labels['wednesday'] = 'Wednesday';
	$labels['thursday'] = 'Thursday';
	$labels['friday'] = 'Friday';
	$labels['saturday'] = 'Saturday';

	// months short
	$labels['jan'] = 'Jan';
	$labels['feb'] = 'Feb';
	$labels['mar'] = 'Mar';
	$labels['apr'] = 'Apr';
	$labels['may'] = 'May';
	$labels['jun'] = 'Jun';
	$labels['jul'] = 'Jul';
	$labels['aug'] = 'Aug';
	$labels['sep'] = 'Sep';
	$labels['oct'] = 'Oct';
	$labels['nov'] = 'Nov';
	$labels['dec'] = 'Dec';

	// months long
	$labels['longjan'] = 'January';
	$labels['longfeb'] = 'February';
	$labels['longmar'] = 'March';
	$labels['longapr'] = 'April';
	$labels['longmay'] = 'May';
	$labels['longjun'] = 'June';
	$labels['longjul'] = 'July';
	$labels['longaug'] = 'August';
	$labels['longsep'] = 'September';
	$labels['longoct'] = 'October';
	$labels['longnov'] = 'November';
	$labels['longdec'] = 'December';

	$labels['today'] = 'Today';

	// toolbar buttons
	$labels['refresh'] = 'Refresh';
	$labels['checkmail'] = 'Check for new messages';
	$labels['compose'] = 'Compose';
	$labels['writenewmessage'] = 'Create a new message';
	$labels['reply'] = 'Reply';
	$labels['replytomessage'] = 'Reply to sender';
	$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
	$labels['replyall'] = 'Reply all';
	$labels['replylist'] = 'Reply list';
	$labels['forward'] = 'Forward';
	$labels['forwardinline'] = 'Forward inline';
	$labels['forwardattachment'] = 'Forward as attachment';
	$labels['forwardmessage'] = 'Forward the message';
	$labels['deletemessage'] = 'Delete message';
	$labels['movemessagetotrash'] = 'Move message to trash';
	$labels['printmessage'] = 'Print this message';
	$labels['previousmessage'] = 'Show previous message';
	$labels['firstmessage'] = 'Show first message';
	$labels['nextmessage'] = 'Show next message';
	$labels['lastmessage'] = 'Show last message';
	$labels['backtolist'] = 'Back to message list';
	$labels['viewsource'] = 'Show source';
	$labels['mark'] = 'Mark';
	$labels['markmessages'] = 'Mark messages';
	$labels['markread'] = 'As read';
	$labels['markunread'] = 'As unread';
	$labels['markflagged'] = 'As flagged';
	$labels['markunflagged'] = 'As unflagged';
	$labels['moreactions'] = 'More actions...';
	$labels['more'] = 'More';
	$labels['back'] = 'Back';
	$labels['options'] = 'Options';

	$labels['select'] = 'Select';
	$labels['all'] = 'All';
	$labels['none'] = 'None';
	$labels['currpage'] = 'Current page';
	$labels['unread'] = 'Unread';
	$labels['flagged'] = 'Flagged';
	$labels['unanswered'] = 'Unanswered';
	$labels['deleted'] = 'Deleted';
	+$labels['undeleted'] = 'Not deleted';
	$labels['invert'] = 'Invert';
	$labels['filter'] = 'Filter';
	$labels['list'] = 'List';
	$labels['threads'] = 'Threads';
	$labels['expand-all'] = 'Expand All';
	$labels['expand-unread'] = 'Expand Unread';
	$labels['collapse-all'] = 'Collapse All';
	$labels['threaded'] = 'Threaded';

	$labels['autoexpand_threads'] = 'Expand message threads';
	$labels['do_expand'] = 'all threads';
	$labels['expand_only_unread'] = 'only with unread messages';
	$labels['fromto'] = 'From/To';
	$labels['flag'] = 'Flag';
	$labels['attachment'] = 'Attachment';
	$labels['nonesort'] = 'None';
	$labels['sentdate'] = 'Sent date';
	$labels['arrival'] = 'Arrival date';
	$labels['asc'] = 'ascending';
	$labels['desc'] = 'descending';
	$labels['listcolumns'] = 'List columns';
	$labels['listsorting'] = 'Sorting column';
	$labels['listorder'] = 'Sorting order';
	$labels['listmode'] = 'List view mode';

	$labels['folderactions'] = 'Folder actions...';
	$labels['compact'] = 'Compact';
	$labels['empty'] = 'Empty';

	$labels['quota'] = 'Disk usage';
	$labels['unknown'] = 'unknown';
	$labels['unlimited'] = 'unlimited';

	$labels['quicksearch'] = 'Quick search';
	$labels['resetsearch'] = 'Reset search';
	$labels['searchmod'] = 'Search modifiers';
	$labels['msgtext'] = 'Entire message';

	$labels['openinextwin'] = 'Open in new window';
	$labels['emlsave'] = 'Download (.eml)';

	// message compose
	$labels['editasnew'] = 'Edit as new';
	$labels['savemessage'] = 'Save as draft';
	$labels['sendmessage'] = 'Send message';
	$labels['addattachment'] = 'Attach a file';
	$labels['charset'] = 'Charset';
	$labels['editortype'] = 'Editor type';
	$labels['returnreceipt'] = 'Return receipt';
	$labels['dsn'] = 'Delivery status notification';
	$labels['mailreplyintro'] = 'On $date, $sender wrote:';
	$labels['originalmessage'] = 'Original Message';

	$labels['editidents'] = 'Edit identities';
	$labels['spellcheck'] = 'Spell';
	$labels['checkspelling'] = 'Check spelling';
	$labels['resumeediting'] = 'Resume editing';
	$labels['revertto'] = 'Revert to';

	$labels['attach'] = 'Attach';
	$labels['attachments'] = 'Attachments';
	$labels['upload'] = 'Upload';
	$labels['uploadprogress'] = '$percent ($current from $total)';
	$labels['close'] = 'Close';
	$labels['messageoptions'] = 'Message options...';

	$labels['low'] = 'Low';
	$labels['lowest'] = 'Lowest';
	$labels['normal'] = 'Normal';
	$labels['high'] = 'High';
	$labels['highest'] = 'Highest';

	$labels['nosubject'] = '(no subject)';
	$labels['showimages'] = 'Display images';
	$labels['alwaysshow'] = 'Always show images from $sender';
	$labels['isdraft'] = 'This is a draft message.';

	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'Plain text';
	$labels['savesentmessagein'] = 'Save sent message in';
	$labels['dontsave'] = 'don\'t save';
	$labels['maxuploadsize'] = 'Maximum allowed file size is $size';

	$labels['addcc'] = 'Add Cc';
	$labels['addbcc'] = 'Add Bcc';
	$labels['addreplyto'] = 'Add Reply-To';
	$labels['addfollowupto'] = 'Add Followup-To';

	// mdn
	$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
	$labels['receiptread'] = 'Return Receipt (read)';
	$labels['yourmessage'] = 'This is a Return Receipt for your message';
	$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';

	// address boook
	$labels['name'] = 'Display Name';
	$labels['firstname'] = 'First Name';
	$labels['surname'] = 'Last Name';
	$labels['middlename'] = 'Middle Name';
	$labels['nameprefix'] = 'Prefix';
	$labels['namesuffix'] = 'Suffix';
	$labels['nickname'] = 'Nickname';
	$labels['jobtitle'] = 'Job Title';
	$labels['department'] = 'Department';
	$labels['gender'] = 'Gender';
	$labels['maidenname'] = 'Maiden Name';
	$labels['email'] = 'Email';
	$labels['phone'] = 'Phone';
	$labels['address'] = 'Address';
	$labels['street'] = 'Street';
	$labels['locality'] = 'City';
	$labels['zipcode'] = 'ZIP Code';
	$labels['region'] = 'State/Province';
	$labels['country'] = 'Country';
	$labels['birthday'] = 'Birthday';
	$labels['anniversary'] = 'Anniversary';
	$labels['website'] = 'Website';
	$labels['instantmessenger'] = 'IM';
	$labels['notes'] = 'Notes';
	$labels['male'] = 'male';
	$labels['female'] = 'female';
	$labels['manager'] = 'Manager';
	$labels['assistant'] = 'Assistant';
	$labels['spouse'] = 'Spouse';
	$labels['allfields'] = 'All fields';
	$labels['search'] = 'Search';
	$labels['advsearch'] = 'Advanced Search';
	$labels['advanced'] = 'Advanced';
	$labels['other'] = 'Other';

	$labels['typehome'] = 'Home';
	$labels['typework'] = 'Work';
	$labels['typeother'] = 'Other';
	$labels['typemobile'] = 'Mobile';
	$labels['typemain'] = 'Main';
	$labels['typehomefax'] = 'Home Fax';
	$labels['typeworkfax'] = 'Work Fax';
	$labels['typecar'] = 'Car';
	$labels['typepager'] = 'Pager';
	$labels['typevideo'] = 'Video';
	$labels['typeassistant'] = 'Assistant';
	$labels['typehomepage'] = 'Home Page';
	$labels['typeblog'] = 'Blog';
	$labels['typeprofile'] = 'Profile';

	$labels['addfield'] = 'Add field...';
	$labels['addcontact'] = 'Add new contact';
	$labels['editcontact'] = 'Edit contact';
	$labels['contacts'] = 'Contacts';
	$labels['contactproperties'] = 'Contact properties';
	$labels['personalinfo'] = 'Personal information';

	$labels['edit'] = 'Edit';
	$labels['cancel'] = 'Cancel';
	$labels['save'] = 'Save';
	$labels['delete'] = 'Delete';
	$labels['rename'] = 'Rename';
	$labels['addphoto'] = 'Add';
	$labels['replacephoto'] = 'Replace';
	$labels['uploadphoto'] = 'Upload photo';

	$labels['newcontact'] = 'Create new contact card';
	$labels['deletecontact'] = 'Delete selected contacts';
	$labels['composeto'] = 'Compose mail to';
	$labels['contactsfromto'] = 'Contacts $from to $to of $count';
	$labels['print'] = 'Print';
	$labels['export'] = 'Export';
	$labels['exportvcards'] = 'Export contacts in vCard format';
	$labels['newcontactgroup'] = 'Create new contact group';
	$labels['grouprename'] = 'Rename group';
	$labels['groupdelete'] = 'Delete group';
	$labels['groupremoveselected'] = 'Remove selected contacts from group';

	$labels['previouspage'] = 'Show previous page';
	$labels['firstpage'] = 'Show first page';
	$labels['nextpage'] = 'Show next page';
	$labels['lastpage'] = 'Show last page';

	$labels['group'] = 'Group';
	$labels['groups'] = 'Groups';
	$labels['personaladrbook'] = 'Personal Addresses';

	$labels['searchsave'] = 'Save search';
	$labels['searchdelete'] = 'Delete search';

	$labels['import'] = 'Import';
	$labels['importcontacts'] = 'Import contacts';
	$labels['importfromfile'] = 'Import from file:';
	$labels['importtarget'] = 'Add new contacts to address book:';
	$labels['importreplace'] = 'Replace the entire address book';
	$labels['importtext'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.';
	$labels['done'] = 'Done';

	// settings
	$labels['settingsfor'] = 'Settings for';
	$labels['about'] = 'About';
	$labels['preferences'] = 'Preferences';
	$labels['userpreferences'] = 'User preferences';
	$labels['editpreferences'] = 'Edit user preferences';

	$labels['identities'] = 'Identities';
	$labels['manageidentities'] = 'Manage identities for this account';
	$labels['newidentity'] = 'New identity';

	$labels['newitem'] = 'New item';
	$labels['edititem'] = 'Edit item';

	$labels['preferhtml'] = 'Display HTML';
	$labels['defaultcharset'] = 'Default Character Set';
	$labels['htmlmessage'] = 'HTML Message';
	$labels['dateformat'] = 'Date format';
	$labels['timeformat'] = 'Time format';
	$labels['prettydate'] = 'Pretty dates';
	$labels['setdefault'] = 'Set default';
	$labels['autodetect'] = 'Auto';
	$labels['language'] = 'Language';
	$labels['timezone'] = 'Time zone';
	$labels['pagesize'] = 'Rows per page';
	$labels['signature'] = 'Signature';
	$labels['dstactive'] = 'Daylight saving time';
	$labels['htmleditor'] = 'Compose HTML messages';
	$labels['htmlonreply'] = 'on reply to HTML message only';
	$labels['htmlsignature'] = 'HTML signature';
	$labels['previewpane'] = 'Show preview pane';
	$labels['skin'] = 'Interface skin';
	$labels['logoutclear'] = 'Clear Trash on logout';
	$labels['logoutcompact'] = 'Compact Inbox on logout';
	$labels['uisettings'] = 'User Interface';
	$labels['serversettings'] = 'Server Settings';
	$labels['mailboxview'] = 'Mailbox View';
	$labels['mdnrequests'] = 'On request for return receipt';
	$labels['askuser'] = 'ask me';
	$labels['autosend'] = 'send receipt';
	$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
	$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
	$labels['ignore'] = 'ignore';
	$labels['readwhendeleted'] = 'Mark the message as read on delete';
	$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
	$labels['skipdeleted'] = 'Do not show deleted messages';
	$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
	$labels['deletejunk'] = 'Directly delete messages in Junk';
	$labels['showremoteimages'] = 'Display remote inline images';
	$labels['fromknownsenders'] = 'from known senders';
	$labels['always'] = 'always';
	$labels['showinlineimages'] = 'Display attached images below the message';
	$labels['autosavedraft'] = 'Automatically save draft';
	$labels['everynminutes'] = 'every $n minute(s)';
	$labels['keepalive'] = 'Check for new messages on';
	$labels['never'] = 'never';
	$labels['immediately'] = 'immediately';
	$labels['messagesdisplaying'] = 'Displaying Messages';
	$labels['messagescomposition'] = 'Composing Messages';
	$labels['mimeparamfolding'] = 'Attachment names';
	$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
	$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
	$labels['2047folding'] = 'Full RFC 2047 (other)';
	$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
	$labels['advancedoptions'] = 'Advanced options';
	$labels['focusonnewmessage'] = 'Focus browser window on new message';
	$labels['checkallfolders'] = 'Check all folders for new messages';
	$labels['displaynext'] = 'After message delete/move display the next message';
	$labels['defaultfont'] = 'Default font of HTML message';
	$labels['mainoptions'] = 'Main Options';
	$labels['browseroptions'] = 'Browser Options';
	$labels['section'] = 'Section';
	$labels['maintenance'] = 'Maintenance';
	$labels['newmessage'] = 'New Message';
	$labels['signatureoptions'] = 'Signature Options';
	$labels['whenreplying'] = 'When replying';
	$labels['replytopposting'] = 'start new message above original';
	$labels['replybottomposting'] = 'start new message below original';
	$labels['replyremovesignature'] = 'When replying remove original signature from message';
	$labels['autoaddsignature'] = 'Automatically add signature';
	$labels['newmessageonly'] = 'new message only';
	$labels['replyandforwardonly'] = 'replies and forwards only';
	$labels['replysignaturepos'] = 'When replying or forwarding place signature';
	$labels['belowquote'] = 'below the quote';
	$labels['abovequote'] = 'above the quote';
	$labels['insertsignature'] = 'Insert signature';
	$labels['previewpanemarkread'] = 'Mark previewed messages as read';
	$labels['afternseconds'] = 'after $n seconds';
	$labels['reqmdn'] = 'Always request a return receipt';
	$labels['reqdsn'] = 'Always request a delivery status notification';
	$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
	$labels['defaultaddressbook'] = 'Add new contacts to the selected addressbook';
	$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
	$labels['listnamedisplay'] = 'List contacts as';
	$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
	$labels['spellcheckoptions'] = 'Spellcheck Options';
	$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
	$labels['spellcheckignorenums'] = 'Ignore words with numbers';
	$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
	$labels['addtodict'] = 'Add to dictionary';
	$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
	$labels['forwardmode'] = 'Messages forwarding';
	$labels['inline'] = 'inline';
	$labels['asattachment'] = 'as attachment';

	$labels['folder'] = 'Folder';
	$labels['folders'] = 'Folders';
	$labels['foldername'] = 'Folder name';
	$labels['subscribed'] = 'Subscribed';
	$labels['messagecount'] = 'Messages';
	$labels['create'] = 'Create';
	$labels['createfolder'] = 'Create new folder';
	$labels['managefolders'] = 'Manage folders';
	$labels['specialfolders'] = 'Special Folders';
	$labels['properties'] = 'Properties';
	$labels['folderproperties'] = 'Folder properties';
	$labels['parentfolder'] = 'Parent folder';
	$labels['location'] = 'Location';
	$labels['info'] = 'Information';
	$labels['getfoldersize'] = 'Click to get folder size';
	$labels['changesubscription'] = 'Click to change subscription';
	$labels['foldertype'] = 'Folder Type';
	$labels['personalfolder'] = 'Private Folder';
	$labels['otherfolder'] = 'Other User\'s Folder';
	$labels['sharedfolder'] = 'Public Folder';

	$labels['sortby'] = 'Sort by';
	$labels['sortasc'] = 'Sort ascending';
	$labels['sortdesc'] = 'Sort descending';
	$labels['undo'] = 'Undo';

	$labels['plugin'] = 'Plugin';
	$labels['version'] = 'Version';
	$labels['source'] = 'Source';
	$labels['license'] = 'License';
	$labels['support'] = 'Get support';

	// units
	$labels['B'] = 'B';
	$labels['KB'] = 'KB';
	$labels['MB'] = 'MB';
	$labels['GB'] = 'GB';

	// character sets
	$labels['unicode'] = 'Unicode';
	$labels['english'] = 'English';
	$labels['westerneuropean'] = 'Western European';
	$labels['easterneuropean'] = 'Eastern European';
	$labels['southeasterneuropean'] = 'South-Eastern European';
	$labels['baltic'] = 'Baltic';
	$labels['cyrillic'] = 'Cyrillic';
	$labels['arabic'] = 'Arabic';
	$labels['greek'] = 'Greek';
	$labels['hebrew'] = 'Hebrew';
	$labels['turkish'] = 'Turkish';
	$labels['nordic'] = 'Nordic';
	$labels['thai'] = 'Thai';
	$labels['celtic'] = 'Celtic';
	$labels['vietnamese'] = 'Vietnamese';
	$labels['japanese'] = 'Japanese';
	$labels['korean'] = 'Korean';
	$labels['chinese'] = 'Chinese';

	?>
	diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
	index 92da1f6ef..d5ffcaa61 100644
	--- a/program/localization/pl_PL/labels.inc
	+++ b/program/localization/pl_PL/labels.inc
	@@ -1,450 +1,451 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| localization/pl_PL/labels.inc \|
	\| \|
	\| Language file of the Roundcube Webmail client \|
	\| Copyright (C) 2012, The Roundcube Dev Team \|
	\| Licensed under the GNU General Public License \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	$labels = array();
	$labels['welcome'] = 'Witamy w $product';
	$labels['username'] = 'Nazwa';
	$labels['password'] = 'Hasło';
	$labels['server'] = 'Serwer';
	$labels['login'] = 'Zaloguj';
	$labels['logout'] = 'Wyloguj';
	$labels['mail'] = 'Poczta';
	$labels['settings'] = 'Ustawienia';
	$labels['addressbook'] = 'Książka adresowa';
	$labels['inbox'] = 'Odebrane';
	$labels['drafts'] = 'Kopie robocze';
	$labels['sent'] = 'Wysłane';
	$labels['trash'] = 'Kosz';
	$labels['junk'] = 'Spam';
	$labels['subject'] = 'Temat';
	$labels['from'] = 'Od';
	$labels['to'] = 'Do';
	$labels['cc'] = 'Kopia';
	$labels['bcc'] = 'Ukryta kopia';
	$labels['replyto'] = 'Odpowiedź do';
	$labels['followupto'] = 'Kontynuacja do';
	$labels['date'] = 'Data';
	$labels['size'] = 'Rozmiar';
	$labels['priority'] = 'Priorytet';
	$labels['organization'] = 'Organizacja';
	$labels['readstatus'] = 'Przeczytano';
	$labels['listoptions'] = 'Opcje listy...';
	$labels['mailboxlist'] = 'Foldery';
	$labels['folders'] = 'Foldery';
	$labels['messagesfromto'] = 'Wiadomości od $from do $to z $count';
	$labels['threadsfromto'] = 'Wątki od $from do $to z $count';
	$labels['messagenrof'] = 'Wiadomość $nr z $count';
	$labels['fromtoshort'] = '$from - $to z $count';
	$labels['copy'] = 'Kopiuj';
	$labels['move'] = 'Przenieś';
	$labels['moveto'] = 'Przenieś do...';
	$labels['download'] = 'Pobierz';
	$labels['filename'] = 'Nazwa pliku';
	$labels['filesize'] = 'Rozmiar pliku';
	$labels['addtoaddressbook'] = 'Dodaj do książki adresowej';
	$labels['sun'] = 'Nd';
	$labels['mon'] = 'Pn';
	$labels['tue'] = 'Wt';
	$labels['wed'] = 'Śr';
	$labels['thu'] = 'Czw';
	$labels['fri'] = 'Pt';
	$labels['sat'] = 'Sb';
	$labels['sunday'] = 'Niedziela';
	$labels['monday'] = 'Poniedziałek';
	$labels['tuesday'] = 'Wtorek';
	$labels['wednesday'] = 'Środa';
	$labels['thursday'] = 'Czwartek';
	$labels['friday'] = 'Piątek';
	$labels['saturday'] = 'Sobota';
	$labels['jan'] = 'sty';
	$labels['feb'] = 'lut';
	$labels['mar'] = 'mar';
	$labels['apr'] = 'kwi';
	$labels['may'] = 'maj';
	$labels['longmay'] = 'maj';
	$labels['jun'] = 'cze';
	$labels['jul'] = 'lip';
	$labels['aug'] = 'sie';
	$labels['sep'] = 'wrz';
	$labels['oct'] = 'paź';
	$labels['nov'] = 'lis';
	$labels['dec'] = 'gru';
	$labels['longjan'] = 'styczeń';
	$labels['longfeb'] = 'luty';
	$labels['longmar'] = 'marzec';
	$labels['longapr'] = 'kwiecień';
	$labels['longjun'] = 'czerwiec';
	$labels['longjul'] = 'lipiec';
	$labels['longaug'] = 'sierpień';
	$labels['longsep'] = 'wrzesień';
	$labels['longoct'] = 'październik';
	$labels['longnov'] = 'listopad';
	$labels['longdec'] = 'grudzień';
	$labels['today'] = 'Dzisiaj';
	$labels['refresh'] = 'Odśwież';
	$labels['checkmail'] = 'Sprawdź skrzynkę';
	$labels['compose'] = 'Utwórz';
	$labels['writenewmessage'] = 'Utwórz nową wiadomość';
	$labels['reply'] = 'Odpowiedz';
	$labels['replytomessage'] = 'Odpowiedz nadawcy';
	$labels['replytoallmessage'] = 'Odpowiedz wszystkim';
	$labels['replyall'] = 'Odpowiedz wszystkim';
	$labels['replylist'] = 'Odpowiedz na listę';
	$labels['forward'] = 'Przekaż';
	$labels['forwardinline'] = 'Prześlij w treści';
	$labels['forwardattachment'] = 'Prześlij jako załącznik';
	$labels['forwardmessage'] = 'Prześlij dalej';
	$labels['deletemessage'] = 'Usuń wiadomości';
	$labels['movemessagetotrash'] = 'Przenieś wiadomości do Kosza';
	$labels['printmessage'] = 'Drukuj wiadomość';
	$labels['previousmessage'] = 'Poprzednia wiadomość';
	$labels['firstmessage'] = 'Pierwsza wiadomość';
	$labels['nextmessage'] = 'Następna wiadomość';
	$labels['lastmessage'] = 'Ostatnia wiadomość';
	$labels['backtolist'] = 'Pokaż listę wiadomości';
	$labels['viewsource'] = 'Pokaż źródło';
	$labels['mark'] = 'Oznacz';
	$labels['markmessages'] = 'Oznacz wiadomości';
	$labels['markread'] = 'Jako przeczytane';
	$labels['markunread'] = 'Jako nieprzeczytane';
	$labels['markflagged'] = 'Jako oflagowane';
	$labels['markunflagged'] = 'Jako nieoflagowane';
	$labels['moreactions'] = 'Więcej akcji...';
	$labels['more'] = 'Więcej';
	$labels['back'] = 'Wstecz';
	$labels['options'] = 'Ustawienia';
	$labels['select'] = 'Zaznacz';
	$labels['all'] = 'Wszystkie';
	$labels['none'] = 'Brak';
	$labels['nonesort'] = 'Brak';
	$labels['currpage'] = 'Bieżąca strona';
	$labels['unread'] = 'Nieprzeczytane';
	$labels['flagged'] = 'Oznaczone';
	$labels['unanswered'] = 'Bez odpowiedzi';
	$labels['deleted'] = 'Usunięte';
	+$labels['undeleted'] = 'Nieusunięte';
	$labels['invert'] = 'Odwróć';
	$labels['filter'] = 'Filtr';
	$labels['list'] = 'Lista';
	$labels['threads'] = 'Wątki';
	$labels['expand-all'] = 'Rozwiń wszystkie';
	$labels['expand-unread'] = 'Rozwiń nieprzeczytane';
	$labels['collapse-all'] = 'Zwiń wszystkie';
	$labels['threaded'] = 'Powątkowane';
	$labels['autoexpand_threads'] = 'Rozwijaj wątki';
	$labels['do_expand'] = 'wszystkie';
	$labels['expand_only_unread'] = 'tylko nieprzeczytane';
	$labels['fromto'] = 'Od/Do';
	$labels['flag'] = 'Flaga';
	$labels['attachment'] = 'Załącznik';
	$labels['sentdate'] = 'Data wysyłki';
	$labels['arrival'] = 'Data odbioru';
	$labels['asc'] = 'rosnąco';
	$labels['desc'] = 'malejąco';
	$labels['listcolumns'] = 'Kolumny';
	$labels['listsorting'] = 'Porządek sortowania';
	$labels['listorder'] = 'Kierunek sortowania';
	$labels['listmode'] = 'Typ listy';
	$labels['folderactions'] = 'Działania na folderach...';
	$labels['compact'] = 'Porządkuj';
	$labels['empty'] = 'Opróżnij';
	$labels['quota'] = 'Użyte miejsce';
	$labels['unknown'] = 'nieznane';
	$labels['unlimited'] = 'bez limitu';
	$labels['quicksearch'] = 'Szybkie wyszukiwanie';
	$labels['resetsearch'] = 'Wyczyść filtr';
	$labels['searchmod'] = 'Parametry wyszukiwania';
	$labels['msgtext'] = 'Cała wiadomość';
	$labels['openinextwin'] = 'Otwórz w nowym oknie';
	$labels['emlsave'] = 'Pobierz (.eml)';
	$labels['editasnew'] = 'Edytuj jako nową';
	$labels['savemessage'] = 'Zapisz kopię roboczą';
	$labels['sendmessage'] = 'Wyślij teraz';
	$labels['addattachment'] = 'Dołącz plik';
	$labels['charset'] = 'Kodowanie znaków';
	$labels['editortype'] = 'Typ edytora';
	$labels['returnreceipt'] = 'Potwierdzenie odbioru';
	$labels['dsn'] = 'Status dostarczenia (DSN)';
	$labels['mailreplyintro'] = 'W dniu $date, $sender napisał(a):';
	$labels['originalmessage'] = 'Wiadomość oryginalna';
	$labels['editidents'] = 'Edytuj tożsamości';
	$labels['spellcheck'] = 'Pisownia';
	$labels['checkspelling'] = 'Sprawdź pisownię';
	$labels['resumeediting'] = 'Zakończ sprawdzanie pisowni';
	$labels['revertto'] = 'Powróć do';
	$labels['attach'] = 'Załącz';
	$labels['attachments'] = 'Załączniki';
	$labels['upload'] = 'Prześlij';
	$labels['uploadprogress'] = '$percent ($current z $total)';
	$labels['close'] = 'Zamknij';
	$labels['messageoptions'] = 'Opcje wiadomości...';
	$labels['low'] = 'Bardzo niski';
	$labels['lowest'] = 'Niski';
	$labels['normal'] = 'Normalny';
	$labels['high'] = 'Wysoki';
	$labels['highest'] = 'Bardzo wysoki';
	$labels['nosubject'] = '(brak tematu)';
	$labels['showimages'] = 'Wyświetl obrazki';
	$labels['alwaysshow'] = 'Zawsze wyświetlaj obrazki od $sender';
	$labels['isdraft'] = 'To jest kopia robocza wiadomości.';
	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'Zwykły tekst';
	$labels['savesentmessagein'] = 'Zapisz wiadomość w';
	$labels['dontsave'] = 'nie zapisuj';
	$labels['maxuploadsize'] = 'Maksymalny rozmiar pliku to $size';
	$labels['addcc'] = 'Dodaj Cc';
	$labels['addbcc'] = 'Dodaj Bcc';
	$labels['addreplyto'] = 'Dodaj Reply-To';
	$labels['addfollowupto'] = 'Dodaj Followup-To';
	$labels['mdnrequest'] = 'Nadawca zażądał potwierdzenia przeczytania tej wiadomości. Czy chcesz go powiadomić?';
	$labels['receiptread'] = 'Potwierdzenie otrzymania';
	$labels['yourmessage'] = 'To jest potwierdzenie dostarczenia Twojej wiadomości';
	$labels['receiptnote'] = 'Uwaga: To potwierdzenie dostarczenia wiadomości oznacza tylko, że wiadomość została wyświetlona na komputerze adresata. Nie ma żadnej gwarancji, że odbiorca przeczytał czy też zrozumiał treść wiadomości.';
	$labels['name'] = 'Nazwa';
	$labels['firstname'] = 'Imię';
	$labels['surname'] = 'Nazwisko';
	$labels['middlename'] = 'Drugie imię';
	$labels['nameprefix'] = 'Prefiks';
	$labels['namesuffix'] = 'Sufiks';
	$labels['nickname'] = 'Pseudonim';
	$labels['jobtitle'] = 'Zawód';
	$labels['department'] = 'Oddział';
	$labels['gender'] = 'Płeć';
	$labels['maidenname'] = 'N. panieńskie';
	$labels['email'] = 'E-Mail';
	$labels['phone'] = 'Telefon';
	$labels['address'] = 'Adres';
	$labels['street'] = 'Ulica';
	$labels['locality'] = 'Miasto';
	$labels['zipcode'] = 'Kod';
	$labels['region'] = 'Region';
	$labels['country'] = 'Kraj';
	$labels['birthday'] = 'Urodziny';
	$labels['anniversary'] = 'Jubileusz';
	$labels['website'] = 'Strona internetowa';
	$labels['instantmessenger'] = 'Komunikator';
	$labels['notes'] = 'Notatki';
	$labels['male'] = 'mężczyzna';
	$labels['female'] = 'kobieta';
	$labels['manager'] = 'Kierownik';
	$labels['assistant'] = 'Asystent';
	$labels['typeassistant'] = 'Asystent';
	$labels['spouse'] = 'Małżonek';
	$labels['allfields'] = 'Wszystkie pola';
	$labels['search'] = 'Szukaj';
	$labels['advsearch'] = 'Wyszukiwanie zaawansowane';
	$labels['advanced'] = 'Zaawansowane';
	$labels['other'] = 'Inne';
	$labels['typeother'] = 'Inne';
	$labels['typehome'] = 'Dom';
	$labels['typework'] = 'Praca';
	$labels['typemobile'] = 'Komórkowy';
	$labels['typemain'] = 'Główny';
	$labels['typehomefax'] = 'Fax domowy';
	$labels['typeworkfax'] = 'Fax firmowy';
	$labels['typecar'] = 'Samochód';
	$labels['typepager'] = 'Pager';
	$labels['typevideo'] = 'Wideo';
	$labels['typehomepage'] = 'Strona domowa';
	$labels['typeblog'] = 'Blog';
	$labels['typeprofile'] = 'Profil';
	$labels['addfield'] = 'Dodaj pole...';
	$labels['addcontact'] = 'Dodaj nowy kontakt do książki adresowej';
	$labels['editcontact'] = 'Edytuj kontakt';
	$labels['contacts'] = 'Kontakty';
	$labels['contactproperties'] = 'Właściwości';
	$labels['personalinfo'] = 'Informacje osobiste';
	$labels['edit'] = 'Edytuj';
	$labels['cancel'] = 'Anuluj';
	$labels['save'] = 'Zapisz';
	$labels['delete'] = 'Usuń';
	$labels['rename'] = 'Zmień nazwę';
	$labels['addphoto'] = 'Dodaj';
	$labels['replacephoto'] = 'Zamień';
	$labels['uploadphoto'] = 'Wyślij zdjęcie';
	$labels['newcontact'] = 'Dodaj nowy kontakt';
	$labels['deletecontact'] = 'Usuń zaznaczone kontakty';
	$labels['composeto'] = 'Utwórz wiadomość do wybranych kontaktów';
	$labels['contactsfromto'] = 'Kontakty od $from do $to z $count';
	$labels['print'] = 'Drukuj';
	$labels['export'] = 'Eksportuj';
	$labels['exportvcards'] = 'Eksport kontaktów w formacie vCard';
	$labels['newcontactgroup'] = 'Utwórz nową grupę';
	$labels['grouprename'] = 'Zmień nazwę grupy';
	$labels['groupdelete'] = 'Usuń grupę';
	$labels['groupremoveselected'] = 'Usuń wybrane kontakty z grupy';
	$labels['previouspage'] = 'Poprzednia strona';
	$labels['firstpage'] = 'Pierwsza strona';
	$labels['nextpage'] = 'Następna strona';
	$labels['lastpage'] = 'Ostatnia strona';
	$labels['group'] = 'Grupa';
	$labels['groups'] = 'Grupy';
	$labels['personaladrbook'] = 'Kontakty osobiste';
	$labels['searchsave'] = 'Zapisz wyszukiwanie';
	$labels['searchdelete'] = 'Usuń wyszukiwanie';
	$labels['import'] = 'Importuj';
	$labels['importcontacts'] = 'Import kontaktów';
	$labels['importfromfile'] = 'Import z pliku:';
	$labels['importtarget'] = 'Dodaj nowe kontakty do książki adresowej:';
	$labels['importreplace'] = 'Zastąp całą książkę adresową';
	$labels['importtext'] = 'Możesz dodać kontakty z istniejącej książki adresowej.<br/>Aktualnie możliwy jest import kontaktów w formacie <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
	$labels['done'] = 'Wykonane';
	$labels['settingsfor'] = 'Ustawienia dla';
	$labels['about'] = 'O programie';
	$labels['preferences'] = 'Preferencje';
	$labels['userpreferences'] = 'Preferencje użytkownika';
	$labels['editpreferences'] = 'Edytuj preferencje';
	$labels['identities'] = 'Tożsamości';
	$labels['manageidentities'] = 'Zarządzaj tożsamościami';
	$labels['newidentity'] = 'Nowa tożsamość';
	$labels['newitem'] = 'Nowy';
	$labels['edititem'] = 'Edytuj';
	$labels['preferhtml'] = 'Domyślny HTML';
	$labels['defaultcharset'] = 'Domyślny zestaw znaków';
	$labels['htmlmessage'] = 'Wiadomość HTML';
	$labels['dateformat'] = 'Format daty';
	$labels['timeformat'] = 'Format czasu';
	$labels['prettydate'] = 'Ładne daty';
	$labels['setdefault'] = 'Domyślna';
	$labels['autodetect'] = '- wybór automatyczny -';
	$labels['language'] = 'Język';
	$labels['timezone'] = 'Strefa czasowa';
	$labels['pagesize'] = 'Liczba wierszy na stronie';
	$labels['signature'] = 'Podpis';
	$labels['dstactive'] = 'Czas letni';
	$labels['htmleditor'] = 'Twórz wiadomości HTML';
	$labels['htmlonreply'] = 'tylko w odpowiedzi na wiadomość HTML';
	$labels['htmlsignature'] = 'Podpis w HTML';
	$labels['previewpane'] = 'Pokaż podgląd wiadomości';
	$labels['skin'] = 'Wygląd interfejsu';
	$labels['logoutclear'] = 'Przy wylogowaniu opróżnij Kosz';
	$labels['logoutcompact'] = 'Przy wylogowaniu porządkuj folder Odebrane';
	$labels['uisettings'] = 'Interfejs użytkownika';
	$labels['serversettings'] = 'Ustawienia serwera';
	$labels['mailboxview'] = 'Widok skrzynki pocztowej';
	$labels['mdnrequests'] = 'Na żadanie potwierdzenia odbioru';
	$labels['askuser'] = 'pytaj mnie';
	$labels['autosend'] = 'wyślij potwierdzenie';
	$labels['autosendknown'] = 'wyślij potwierdzenie tylko do moich kontaktów, pytaj o pozostałe';
	$labels['autosendknownignore'] = 'wyślij potwierdzenie tylko do moich kontaktów, pozostałe ignoruj';
	$labels['ignore'] = 'ignoruj';
	$labels['readwhendeleted'] = 'Podczas usuwania oznacz wiadomość jako przeczytaną';
	$labels['flagfordeletion'] = 'Oznacz wiadomość do usunięcia zamiast ją usuwać';
	$labels['skipdeleted'] = 'Ukryj wiadomości oznaczone do usunięcia';
	$labels['deletealways'] = 'Usuń wiadomości, gdy przenoszenie do Kosza zawiedzie';
	$labels['deletejunk'] = 'Kasuj wiadomości bezpośrednio w folderze Spam';
	$labels['showremoteimages'] = 'Wyświetlaj obrazki w wiadomościach';
	$labels['fromknownsenders'] = 'od znanych nadawców';
	$labels['always'] = 'zawsze';
	$labels['showinlineimages'] = 'Wyświetlaj załączone obrazki pod treścią wiadomości';
	$labels['autosavedraft'] = 'Automatycznie zapisuj tworzoną wiadomość';
	$labels['everynminutes'] = 'co $n minut(y)';
	$labels['keepalive'] = 'Sprawdzaj czy nadeszły nowe wiadomości';
	$labels['never'] = 'nigdy';
	$labels['immediately'] = 'natychmiast';
	$labels['messagesdisplaying'] = 'Wyświetlanie wiadomości';
	$labels['messagescomposition'] = 'Tworzenie wiadomości';
	$labels['mimeparamfolding'] = 'Stosuj nazwy załączników zgodne z';
	$labels['2231folding'] = 'RFC 2231 (Thunderbird)';
	$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
	$labels['2047folding'] = 'RFC 2047 (przestarzałe)';
	$labels['force7bit'] = 'Używaj kodowania MIME dla znaków 8-bitowych';
	$labels['advancedoptions'] = 'opcje zaawansowane';
	$labels['focusonnewmessage'] = 'Informuj przeglądarkę o nowej wiadomości';
	$labels['checkallfolders'] = 'Sprawdzaj czy nadeszły nowe wiadomości we wszystkich folderach';
	$labels['displaynext'] = 'Po usunięciu/przeniesieniu wiadomości wyświetl następną';
	$labels['defaultfont'] = 'Czcionka wiadomości HTML';
	$labels['mainoptions'] = 'Opcje główne';
	$labels['browseroptions'] = 'Opcje przeglądarki';
	$labels['section'] = 'Sekcja';
	$labels['maintenance'] = 'Konserwacja';
	$labels['newmessage'] = 'Nowa wiadomość';
	$labels['signatureoptions'] = 'Opcje podpisów';
	$labels['whenreplying'] = 'Podczas odpowiadania rozpocznij wiadomość';
	$labels['replytopposting'] = 'powyżej cytowanej treści';
	$labels['replybottomposting'] = 'poniżej cytowanej treści';
	$labels['replyremovesignature'] = 'Podczas odpowiedzi usuń podpis z cytowanej treści';
	$labels['autoaddsignature'] = 'Automatycznie wstaw podpis';
	$labels['newmessageonly'] = 'tylko dla nowych wiadomości';
	$labels['replyandforwardonly'] = 'tylko dla przekazywania i odpowiedzi';
	$labels['replysignaturepos'] = 'Podczas odpowiedzi wstaw podpis';
	$labels['belowquote'] = 'poniżej cytowanej treści';
	$labels['abovequote'] = 'ponad cytowaną treścią';
	$labels['insertsignature'] = 'Wstaw podpis';
	$labels['previewpanemarkread'] = 'Oznacz podglądane wiadomości jako przeczytane';
	$labels['afternseconds'] = 'po $n sekundach';
	$labels['reqmdn'] = 'Zawsze żądaj potwierdzenia odbioru';
	$labels['reqdsn'] = 'Zawsze żądaj statusu dostarczenia (DSN)';
	$labels['replysamefolder'] = 'Umieszczaj odpowiedzi w folderze wiadomości, na którą odpowiadam';
	$labels['defaultaddressbook'] = 'Nowe kontakty dodawaj do wybranej książki adresowej';
	$labels['autocompletesingle'] = 'Nie pokazuj alternatywnych adresów przy autouzupełnianiu';
	$labels['listnamedisplay'] = 'Wyświetl kontakty jako';
	$labels['spellcheckbeforesend'] = 'Przed wysłaniem wiadomości sprawdzaj pisownię';
	$labels['spellcheckoptions'] = 'Opcje sprawdzania pisowni';
	$labels['spellcheckignoresyms'] = 'Ignoruj słowa zawierające symbole';
	$labels['spellcheckignorenums'] = 'Ignoruj słowa zawierające cyfry';
	$labels['spellcheckignorecaps'] = 'Ignoruj słowa pisane wielkimi literami';
	$labels['addtodict'] = 'Dodaj do słownika';
	$labels['mailtoprotohandler'] = 'Zainstaluj obsługę linków mailto:';
	$labels['folder'] = 'Folder';
	$labels['foldername'] = 'Nazwa folderu';
	$labels['subscribed'] = 'Zasubskrybowany';
	$labels['messagecount'] = 'Wiadomości';
	$labels['create'] = 'Utwórz';
	$labels['createfolder'] = 'Utwórz nowy folder';
	$labels['managefolders'] = 'Zarządzaj folderami';
	$labels['specialfolders'] = 'Foldery specjalne';
	$labels['properties'] = 'Właściwości';
	$labels['folderproperties'] = 'Właściwości folderu';
	$labels['parentfolder'] = 'Folder nadrzędny';
	$labels['location'] = 'Położenie';
	$labels['info'] = 'Informacje';
	$labels['getfoldersize'] = 'Kliknij aby pobrać rozmiar folderu';
	$labels['changesubscription'] = 'Kliknij aby zmienić subskrypcję';
	$labels['foldertype'] = 'Typ folderu';
	$labels['personalfolder'] = 'Folder prywatny';
	$labels['otherfolder'] = 'Folder innego użytkownika';
	$labels['sharedfolder'] = 'Folder współdzielony';
	$labels['sortby'] = 'Sortuj wg';
	$labels['sortasc'] = 'Rosnąco';
	$labels['sortdesc'] = 'Malejąco';
	$labels['undo'] = 'Cofnij';
	$labels['plugin'] = 'Wtyczka';
	$labels['version'] = 'Wersja';
	$labels['source'] = 'Źródła';
	$labels['license'] = 'Licencja';
	$labels['support'] = 'Wsparcie techniczne';
	$labels['B'] = 'B';
	$labels['KB'] = 'KB';
	$labels['MB'] = 'MB';
	$labels['GB'] = 'GB';
	$labels['unicode'] = 'uniwersalny';
	$labels['english'] = 'angielski';
	$labels['westerneuropean'] = 'zachodnioeuropejski';
	$labels['easterneuropean'] = 'wschodnioeuropejski';
	$labels['southeasterneuropean'] = 'południowo-wschodnioeuropejski';
	$labels['baltic'] = 'bałtycki';
	$labels['cyrillic'] = 'cyrylica';
	$labels['arabic'] = 'arabski';
	$labels['greek'] = 'grecki';
	$labels['hebrew'] = 'hebrajski';
	$labels['turkish'] = 'turecki';
	$labels['nordic'] = 'nordycki';
	$labels['thai'] = 'tajski';
	$labels['celtic'] = 'celtycki';
	$labels['vietnamese'] = 'wietnamski';
	$labels['japanese'] = 'japoński';
	$labels['korean'] = 'koreański';
	$labels['chinese'] = 'chiński';

	diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
	index 3d65eacb1..7f0b4db5b 100644
	--- a/program/steps/mail/func.inc
	+++ b/program/steps/mail/func.inc
	@@ -1,1776 +1,1778 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2010, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Provide webmail functionality and GUI objects \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

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

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

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

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

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

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

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

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

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

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

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

	$threading = (bool) $RCMAIL->storage->get_threading();

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

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

	if (!empty($_SESSION['browser_caps']))
	$OUTPUT->set_env('browser_capabilities', $_SESSION['browser_caps']);

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

	$OUTPUT->set_pagetitle(rcmail_localize_foldername($RCMAIL->storage->mod_folder($mbox_name)));
	}

	/**
	* Returns 'to' if current folder is configured Sent or Drafts
	* or their subfolders, otherwise returns 'from'.
	*
	* @return string Column name
	*/
	function rcmail_message_list_smart_column_name()
	{
	global $RCMAIL;

	$delim = $RCMAIL->storage->get_hierarchy_delimiter();
	$mbox = $RCMAIL->storage->get_folder();
	$sent_mbox = $RCMAIL->config->get('sent_mbox');
	$drafts_mbox = $RCMAIL->config->get('drafts_mbox');

	if (strpos($mbox.$delim, $sent_mbox.$delim) === 0 \|\| strpos($mbox.$delim, $drafts_mbox.$delim) === 0) {
	return 'to';
	}

	return 'from';
	}

	/**
	* Returns configured messages list sorting column name
	* The name is context-sensitive, which means if sorting is set to 'fromto'
	* it will return 'from' or 'to' according to current folder type.
	*
	* @return string Column name
	*/
	function rcmail_sort_column()
	{
	global $RCMAIL;

	if (isset($_SESSION['sort_col'])) {
	$column = $_SESSION['sort_col'];
	}
	else {
	$column = $RCMAIL->config->get('message_sort_col');
	}

	// get name of smart From/To column in folder context
	if ($column == 'fromto') {
	$column = rcmail_message_list_smart_column_name();
	}

	return $column;
	}

	/**
	* Returns configured message list sorting order
	*
	* @return string Sorting order (ASC\|DESC)
	*/
	function rcmail_sort_order()
	{
	global $RCMAIL;

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

	return $RCMAIL->config->get('message_sort_order');
	}

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

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

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

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

	// save some variables for use in ajax list
	$_SESSION['list_attrib'] = $attrib;
	// make sure 'threads' and 'subject' columns are present
	if (!in_array('subject', $a_show_cols))
	array_unshift($a_show_cols, 'subject');
	if (!in_array('threads', $a_show_cols))
	array_unshift($a_show_cols, 'threads');

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

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

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

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

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


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

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

	$mbox = $RCMAIL->storage->get_folder();

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

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

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

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

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

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

	// get name of smart From/To column in folder context
	if (($f = array_search('fromto', $a_show_cols)) !== false) {
	$smart_col = rcmail_message_list_smart_column_name();
	}

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

	if (empty($a_headers))
	return;

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

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

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

	// format each col; similar as in rcmail_message_list()
	foreach ($a_show_cols as $col) {
	$col_name = $col == 'fromto' ? $smart_col : $col;

	if (in_array($col_name, array('from', 'to', 'cc', 'replyto')))
	$cont = Q(rcmail_address_string($header->$col_name, 3, false, null, $header->charset), 'show');
	else if ($col == 'subject') {
	$cont = trim(rcube_mime::decode_header($header->$col, $header->charset));
	if (!$cont) $cont = rcube_label('nosubject');
	$cont = Q($cont);
	}
	else if ($col == 'size')
	$cont = show_bytes($header->$col);
	else if ($col == 'date')
	$cont = format_date($header->date);
	else
	$cont = Q($header->$col);

	$a_msg_cols[$col] = $cont;
	}

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

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

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

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

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


	/*
	* Creates <THEAD> for message list table
	*/
	function rcmail_message_list_head($attrib, $a_show_cols)
	{
	$skin_path = $_SESSION['skin_path'];
	$image_tag = html::img(array('src' => "%s%s", 'alt' => "%s"));

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

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

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

	$cells = array();

	// get name of smart From/To column in folder context
	if (($f = array_search('fromto', $a_show_cols)) !== false) {
	$smart_col = rcmail_message_list_smart_column_name();
	}

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

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

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

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

	return $cells;
	}


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

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

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

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

	return html::iframe($attrib);
	}


	function rcmail_messagecount_display($attrib)
	{
	global $RCMAIL;

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

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

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

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


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

	if ($page === NULL) {
	$page = $RCMAIL->storage->get_page();
	}

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

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

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

	return Q($out);
	}


	function rcmail_mailbox_name_display($attrib)
	{
	global $RCMAIL;

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

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

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


	function rcmail_get_mailbox_name_text()
	{
	global $RCMAIL;
	return rcmail_localize_foldername($RCMAIL->storage->get_folder());
	}


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

	$old_unseen = rcmail_get_unseen_count($mbox_name);

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

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

	rcmail_set_unseen_count($mbox_name, $unseen);

	return $unseen;
	}


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

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

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


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


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

	if (!$message->is_safe
	&& ($show_images = $RCMAIL->config->get('show_images'))
	&& $message->has_html_part()
	) {
	switch ($show_images) {
	case 1: // known senders only
	// get default addressbook, like in addcontact.inc
	$CONTACTS = $RCMAIL->get_address_book(-1, true);

	if ($CONTACTS) {
	$result = $CONTACTS->search('email', $message->sender['mailto'], 1, false);
	if ($result->count) {
	$message->set_safe(true);
	}
	}
	break;

	case 2: // always
	$message->set_safe(true);
	break;
	}
	}
	}


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return $html;
	}


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

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

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

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

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

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

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


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

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

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

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

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

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

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

	$quote_level = $q;
	}

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

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

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

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

	return $body;
	}


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

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

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

	default:
	$out = '';
	}

	return $out;
	}


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

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

	return $matches[1].$tagname;
	}


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	if ($value && $labels_map[$value])
	return rcube_label($labels_map[$value]);

	return '';
	}

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	// Content-Type: image/*...
	if (rcmail_part_image_type($attach_prop)) {
	$out .= html::tag('hr') . html::p(array('align' => "center"),
	html::img(array(
	'src' => $MESSAGE->get_part_url($attach_prop->mime_id, true),
	'title' => $attach_prop->filename,
	'alt' => $attach_prop->filename,
	)));
	}
	}
	}

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

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

	function rcmail_part_image_type($part)
	{
	$rcmail = rcmail::get_instance();

	// Skip TIFF images if browser doesn't support this format...
	$tiff_support = !empty($_SESSION['browser_caps']) && !empty($_SESSION['browser_caps']['tif']);
	// until we can convert them to JPEG
	$tiff_support = $tiff_support \|\| $rcmail->config->get('im_convert_path');

	// Content-type regexp
	$mime_regex = $tiff_support ? '/^image\//i' : '/^image\/(?!tif)/i';

	// Content-Type: image/*...
	if (preg_match($mime_regex, $part->mimetype)) {
	return $part->mimetype;
	}

	// Many clients use application/octet-stream, we'll detect mimetype
	// by checking filename extension

	// Supported image filename extensions to image type map
	$types = array(
	'jpg' => 'image/jpeg',
	'jpeg' => 'image/jpeg',
	'png' => 'image/png',
	'gif' => 'image/gif',
	'bmp' => 'image/bmp',
	);
	if ($tiff_support) {
	$types['tif'] = 'image/tiff';
	$types['tiff'] = 'image/tiff';
	}

	if ($part->filename
	&& preg_match('/^application\/octet-stream$/i', $part->mimetype)
	&& preg_match('/\.([^.])$/i', $part->filename, $m)
	&& ($extension = strtolower($m[1]))
	&& isset($types[$extension])
	) {
	return $types[$extension];
	}
	}

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

	return $body;
	}


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

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

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

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

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

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

	$attributes = array();

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

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

	return $body;
	}


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

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

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

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

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

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


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

	$a_parts = rcube_mime::decode_address_list($input, null, true, $default_charset);

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

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

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

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

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

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

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

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

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

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

	return $out;
	}


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

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

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

	return $out;
	}


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

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


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

	return $info;
	}


	function rcmail_message_part_controls($attrib)
	{
	global $MESSAGE, $RCMAIL;

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

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

	$filename = $part->filename;
	if (empty($filename) && $attach_prop->mimetype == 'text/html') {
	$filename = rcube_label('htmlmessage');
	}

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

	$table->add('title', Q(rcube_label('filesize')));
	$table->add('header', Q($RCMAIL->message_part_size($part)));

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



	function rcmail_message_part_frame($attrib)
	{
	global $MESSAGE;

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

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

	return html::iframe($attrib);
	}


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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return false;
	}


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

	return $name;
	}

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

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

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

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

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

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

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

	return $out;
	}

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

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

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

	// register action aliases
	$RCMAIL->register_action_map(array(
	'preview' => 'show.inc',
	'print' => 'show.inc',
	'moveto' => 'move_del.inc',
	'delete' => 'move_del.inc',
	'send' => 'sendmail.inc',
	'expunge' => 'folders.inc',
	'purge' => 'folders.inc',
	'remove-attachment' => 'attachments.inc',
	'display-attachment' => 'attachments.inc',
	'upload' => 'attachments.inc',
	'group-expand' => 'autocomplete.inc',
	));
	diff --git a/skins/classic/splitter.js b/skins/classic/splitter.js
	index 59ebb5151..3f1c97302 100644
	--- a/skins/classic/splitter.js
	+++ b/skins/classic/splitter.js
	@@ -1,203 +1,203 @@

	/**
	* Roundcube splitter GUI class
	*
	* @constructor
	*/
	function rcube_splitter(attrib)
	{
	this.p1id = attrib.p1;
	this.p2id = attrib.p2;
	this.id = attrib.id ? attrib.id : this.p1id + '_' + this.p2id + '_splitter';
	this.orientation = attrib.orientation;
	this.horizontal = (this.orientation == 'horizontal' \|\| this.orientation == 'h');
	this.offset = bw.ie6 ? 2 : 0;
	this.pos = attrib.start ? attrib.start * 1 : 0;
	this.relative = attrib.relative ? true : false;
	this.drag_active = false;
	this.callback = attrib.callback;

	this.init = function()
	{
	this.p1 = document.getElementById(this.p1id);
	this.p2 = document.getElementById(this.p2id);

	// create and position the handle for this splitter
	this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
	this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();

	if (this.horizontal) {
	var top = this.p1pos.top + this.p1.offsetHeight;
	this.layer = new rcube_layer(this.id, {x: 0, y: top, height: 10,
	width: '100%', vis: 1, parent: this.p1.parentNode});
	}
	else {
	var left = this.p1pos.left + this.p1.offsetWidth;
	this.layer = new rcube_layer(this.id, {x: left, y: 0, width: 10,
	height: '100%', vis: 1, parent: this.p1.parentNode});
	}

	this.elm = this.layer.elm;
	this.elm.className = 'splitter '+(this.horizontal ? 'splitter-h' : 'splitter-v');
	this.elm.unselectable = 'on';

	// add the mouse event listeners
	rcube_event.add_listener({element: this.elm, event:'mousedown', object:this, method:'onDragStart'});
	if (bw.ie)
	rcube_event.add_listener({element: window, event:'resize', object:this, method:'onResize'});

	// read saved position from cookie
	- var cookie = bw.get_cookie(this.id);
	+ var cookie = rcmail.get_cookie(this.id);
	if (cookie && !isNaN(cookie)) {
	this.pos = parseFloat(cookie);
	this.resize();
	}
	else if (this.pos) {
	this.resize();
	this.set_cookie();
	}
	};

	/**
	* Set size and position of all DOM objects
	* according to the saved splitter position
	*/
	this.resize = function()
	{
	if (this.horizontal) {
	var lh = this.layer.height - this.offset * 2;
	this.p1.style.height = Math.floor(this.pos - this.p1pos.top - lh / 2) + 'px';
	this.p2.style.top = Math.ceil(this.pos + lh / 2) + 'px';
	this.layer.move(this.layer.x, Math.round(this.pos - lh / 2 + 1));
	if (bw.ie) {
	var new_height = parseInt(this.p2.parentNode.offsetHeight, 10) - parseInt(this.p2.style.top, 10) - (bw.ie8 ? 2 : 0);
	this.p2.style.height = (new_height > 0 ? new_height : 0) + 'px';
	}
	}
	else {
	this.p1.style.width = Math.floor(this.pos - this.p1pos.left - this.layer.width / 2) + 'px';
	this.p2.style.left = Math.ceil(this.pos + this.layer.width / 2) + 'px';
	this.layer.move(Math.round(this.pos - this.layer.width / 2 + 1), this.layer.y);
	if (bw.ie) {
	var new_width = parseInt(this.p2.parentNode.offsetWidth, 10) - parseInt(this.p2.style.left, 10) ;
	this.p2.style.width = (new_width > 0 ? new_width : 0) + 'px';
	}
	}
	$(this.p2).resize();
	$(this.p1).resize();
	};

	/**
	* Handler for mousedown events
	*/
	this.onDragStart = function(e)
	{
	// disable text selection while dragging the splitter
	if (bw.konq \|\| bw.chrome \|\| bw.safari)
	document.body.style.webkitUserSelect = 'none';

	this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
	this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
	this.drag_active = true;

	// start listening to mousemove events
	rcube_event.add_listener({element:document, event:'mousemove', object:this, method:'onDrag'});
	rcube_event.add_listener({element:document, event:'mouseup', object:this, method:'onDragStop'});

	// enable dragging above iframes
	$('iframe').each(function() {
	$('<div class="iframe-splitter-fix"></div>')
	.css({background: '#fff',
	width: this.offsetWidth+'px', height: this.offsetHeight+'px',
	position: 'absolute', opacity: '0.001', zIndex: 1000
	})
	.css($(this).offset())
	.appendTo('body');
	});
	};

	/**
	* Handler for mousemove events
	*/
	this.onDrag = function(e)
	{
	if (!this.drag_active)
	return false;

	var pos = rcube_event.get_mouse_pos(e);

	if (this.relative) {
	var parent = $(this.p1.parentNode).offset();
	pos.x -= parent.left;
	pos.y -= parent.top;
	}

	if (this.horizontal) {
	if (((pos.y - this.layer.height * 1.5) > this.p1pos.top) && ((pos.y + this.layer.height * 1.5) < (this.p2pos.top + this.p2.offsetHeight))) {
	this.pos = pos.y;
	this.resize();
	}
	}
	else {
	if (((pos.x - this.layer.width * 1.5) > this.p1pos.left) && ((pos.x + this.layer.width * 1.5) < (this.p2pos.left + this.p2.offsetWidth))) {
	this.pos = pos.x;
	this.resize();
	}
	}

	this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
	this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
	return false;
	};

	/**
	* Handler for mouseup events
	*/
	this.onDragStop = function(e)
	{
	// resume the ability to highlight text
	if (bw.konq \|\| bw.chrome \|\| bw.safari)
	document.body.style.webkitUserSelect = 'auto';

	// cancel the listening for drag events
	rcube_event.remove_listener({element:document, event:'mousemove', object:this, method:'onDrag'});
	rcube_event.remove_listener({element:document, event:'mouseup', object:this, method:'onDragStop'});
	this.drag_active = false;

	// remove temp divs
	$('div.iframe-splitter-fix').each(function() { this.parentNode.removeChild(this); });

	this.set_cookie();

	if (typeof this.callback == 'function')
	this.callback(this);

	return bw.safari ? true : rcube_event.cancel(e);
	};

	/**
	* Handler for window resize events
	*/
	this.onResize = function(e)
	{
	if (this.horizontal) {
	var new_height = parseInt(this.p2.parentNode.offsetHeight, 10) - parseInt(this.p2.style.top, 10) - (bw.ie8 ? 2 : 0);
	this.p2.style.height = (new_height > 0 ? new_height : 0) +'px';
	}
	else {
	var new_width = parseInt(this.p2.parentNode.offsetWidth, 10) - parseInt(this.p2.style.left, 10);
	this.p2.style.width = (new_width > 0 ? new_width : 0) + 'px';
	}
	};

	/**
	* Saves splitter position in cookie
	*/
	this.set_cookie = function()
	{
	var exp = new Date();
	exp.setYear(exp.getFullYear() + 1);
	- bw.set_cookie(this.id, this.pos, exp);
	+ rcmail.set_cookie(this.id, this.pos, exp);
	};

	} // end class rcube_splitter
	diff --git a/skins/larry/ui.js b/skins/larry/ui.js
	index b6056b6ee..ca1680759 100644
	--- a/skins/larry/ui.js
	+++ b/skins/larry/ui.js
	@@ -1,1150 +1,1150 @@
	/**
	* Roundcube functions for default skin interface
	*
	* Copyright (c) 2011, The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*/


	function rcube_mail_ui()
	{
	var env = {};
	var popups = {};
	var popupconfig = {
	forwardmenu: { editable:1 },
	searchmenu: { editable:1, callback:searchmenu },
	listoptions: { editable:1 },
	dragmessagemenu: { sticky:1 },
	groupmenu: { above:1 },
	mailboxmenu: { above:1 },
	composeoptionsmenu: { editable:1, overlap:1 },
	spellmenu: { callback: spellmenu },
	// toggle: #1486823, #1486930
	'attachment-form': { editable:1, above:1, toggle:!bw.ie&&!bw.linux },
	'upload-form': { editable:1, toggle:!bw.ie&&!bw.linux }
	};

	var me = this;
	var mailviewsplit;
	var compose_headers = {};

	// export public methods
	this.set = setenv;
	this.init = init;
	this.init_tabs = init_tabs;
	this.show_about = show_about;
	this.show_popup = show_popup;
	this.set_searchmod = set_searchmod;
	this.show_uploadform = show_uploadform;
	this.show_header_row = show_header_row;
	this.hide_header_row = hide_header_row;


	/**
	*
	*/
	function setenv(key, val)
	{
	env[key] = val;
	}

	/**
	* Initialize UI
	* Called on document.ready
	*/
	function init()
	{
	rcmail.addEventListener('message', message_displayed);

	/* mail task */
	if (rcmail.env.task == 'mail') {
	rcmail.addEventListener('menu-open', show_listoptions);
	rcmail.addEventListener('menu-save', save_listoptions);
	rcmail.addEventListener('responseafterlist', function(e){ switch_view_mode(rcmail.env.threading ? 'thread' : 'list') });

	var dragmenu = $('#dragmessagemenu');
	if (dragmenu.length) {
	rcmail.gui_object('message_dragmenu', 'dragmessagemenu');
	popups.dragmessagemenu = dragmenu;
	}

	if (rcmail.env.action == 'show' \|\| rcmail.env.action == 'preview') {
	layout_messageview();
	rcmail.addEventListener('aftershow-headers', function() { layout_messageview(); });
	rcmail.addEventListener('afterhide-headers', function() { layout_messageview(); });
	$('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); return false });
	}
	else if (rcmail.env.action == 'compose') {
	rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 200); });
	rcmail.addEventListener('aftersend-attachment', show_uploadform);
	rcmail.addEventListener('add-recipient', function(p){ show_header_row(p.field, true); });
	layout_composeview();

	// Show input elements with non-empty value
	var field, fields = ['cc', 'bcc', 'replyto', 'followupto'];
	for (var f=0; f < fields.length; f++) {
	if ((field = $('#_'+fields[f])) && field.length && field.val() != '')
	show_header_row(fields[f], true);
	}

	$('#composeoptionstoggle').parent().click(function(){
	$('#composeoptionstoggle').toggleClass('enabled');
	$('#composeoptions').toggle();
	layout_composeview();
	return false;
	}).css('cursor', 'pointer');

	new rcube_splitter({ id:'composesplitterv', p1:'#composeview-left', p2:'#composeview-right',
	orientation:'v', relative:true, start:248, min:170, size:12, render:layout_composeview }).init();
	}
	else if (rcmail.env.action == 'list' \|\| !rcmail.env.action) {
	var previewframe = $('#mailpreviewframe').is(':visible');
	$('#mailpreviewtoggle').addClass(previewframe ? 'enabled' : 'closed').click(function(e){ toggle_preview_pane(e); return false });
	$('#maillistmode').addClass(rcmail.env.threading ? '' : 'selected').click(function(e){ switch_view_mode('list'); return false });
	$('#mailthreadmode').addClass(rcmail.env.threading ? 'selected' : '').click(function(e){ switch_view_mode('thread'); return false });

	mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom',
	orientation:'h', relative:true, start:310, min:150, size:12, offset:4 });
	if (previewframe)
	mailviewsplit.init();

	new rcube_scroller('#folderlist-content', '#folderlist-header', '#folderlist-footer');

	rcmail.addEventListener('setquota', update_quota);
	}

	if ($('#mailview-left').length) {
	new rcube_splitter({ id:'mailviewsplitterv', p1:'#mailview-left', p2:'#mailview-right',
	orientation:'v', relative:true, start:226, min:150, size:12, callback:render_mailboxlist, render:resize_leftcol }).init();
	}
	}
	/* settings task */
	else if (rcmail.env.task == 'settings') {
	rcmail.addEventListener('init', function(){
	var tab = '#settingstabpreferences';
	if (rcmail.env.action)
	tab = '#settingstab' + (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action.replace(/\./g, ''));

	$(tab).addClass('selected')
	.children().first().removeAttr('onclick').click(function() { return false; });
	});

	if (rcmail.env.action == 'folders') {
	new rcube_splitter({ id:'folderviewsplitter', p1:'#folderslist', p2:'#folder-details',
	orientation:'v', relative:true, start:266, min:180, size:12 }).init();

	new rcube_scroller('#folderslist-content', '#folderslist-header', '#folderslist-footer');

	rcmail.addEventListener('setquota', update_quota);
	}
	else if (rcmail.env.action == 'identities') {
	new rcube_splitter({ id:'identviewsplitter', p1:'#identitieslist', p2:'#identity-details',
	orientation:'v', relative:true, start:266, min:180, size:12 }).init();
	}
	else if (rcmail.env.action == 'preferences') {
	new rcube_splitter({ id:'prefviewsplitter', p1:'#sectionslist', p2:'#preferences-box',
	orientation:'v', relative:true, start:266, min:180, size:12 }).init();
	}
	}
	/* addressbook task */
	else if (rcmail.env.task == 'addressbook') {
	rcmail.addEventListener('afterupload-photo', show_uploadform);

	if (rcmail.env.action == '') {
	new rcube_splitter({ id:'addressviewsplitterd', p1:'#addressview-left', p2:'#addressview-right',
	orientation:'v', relative:true, start:226, min:150, size:12, render:resize_leftcol }).init();
	new rcube_splitter({ id:'addressviewsplitter', p1:'#addresslist', p2:'#contacts-box',
	orientation:'v', relative:true, start:286, min:270, size:12 }).init();

	new rcube_scroller('#directorylist-content', '#directorylist-header', '#directorylist-footer');
	}
	}

	// turn a group of fieldsets into tabs
	$('.tabbed').each(function(idx, elem){ init_tabs(elem); })

	// decorate select elements
	$('select.decorated').each(function(){
	if (bw.opera) {
	$(this).removeClass('decorated');
	return;
	}

	var select = $(this),
	height = Math.max(select.height(), 26) - 2,
	width = select.width() - 22,
	title = $('option', this).first().text();

	if ($('option:selected', this).val() != '')
	title = $('option:selected', this).text();

	var overlay = $('<a class="menuselector"><span class="handle">' + title + '</span></a>')
	.css('position', 'absolute')
	.offset(select.position())
	.insertAfter(select);

	overlay.children().width(width).height(height).css('line-height', (height - 1) + 'px');

	select.change(function() {
	var val = $('option:selected', this).text();
	$(this).next().children().html(val);
	});

	var parent = select.parent();
	if (parent.css('position') != 'absolute')
	parent.css('position', 'relative');

	// re-set original select width to fix click action and options width in some browsers
	select.width(overlay.width());
	});

	$(document.body)
	.bind('mouseup', body_mouseup)
	.bind('keyup', function(e){
	if (e.keyCode == 27) {
	for (var id in popups) {
	if (popups[id].is(':visible'))
	show_popup(id, false);
	}
	}
	});

	$('iframe').load(function(e){
	// this = iframe
	var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
	$(doc).mouseup(body_mouseup);
	})
	.contents().mouseup(body_mouseup);

	// don't use $(window).resize() due to some unwanted side-effects
	window.onresize = resize;
	resize();
	}

	/**
	* Handler for mouse-up events on the document body.
	* This will close all open popup menus
	*/
	function body_mouseup(e)
	{
	var config, obj, target = e.target;
	if (target.className == 'inner')
	target = e.target.parentNode;
	for (var id in popups) {
	obj = popups[id];
	config = popupconfig[id];
	if (obj.is(':visible')
	&& target.id != id+'link'
	&& !config.toggle
	&& (!config.editable \|\| !target_overlaps(target, obj.get(0)))
	&& (!config.sticky \|\| !rcube_mouse_is_over(e, obj.get(0)))
	) {
	var myid = id+'';
	window.setTimeout(function(){ show_popupmenu(myid, false) }, 10);
	}
	}
	}

	/**
	* Update UI on window resize
	*/
	function resize()
	{
	if (rcmail.env.task == 'mail' && (rcmail.env.action == 'show' \|\| rcmail.env.action == 'preview')) {
	layout_messageview();
	}
	if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
	layout_composeview();
	}

	// make iframe footer buttons float if scrolling is active
	$('body.iframe .footerleft').each(function(){
	var footer = $(this),
	body = $(document.body),
	floating = footer.hasClass('floating'),
	overflow = body.outerHeight(true) > $(window).height();
	if (overflow != floating) {
	var action = overflow ? 'addClass' : 'removeClass';
	footer[action]('floating');
	body[action]('floatingbuttons');
	}
	})

	}

	/**
	* Triggered when a new user message is displayed
	*/
	function message_displayed(p)
	{
	// show a popup dialog on errors
	if (p.type == 'error' && rcmail.env.task != 'login') {
	if (!me.messagedialog) {
	me.messagedialog = $('<div>').addClass('popupdialog');
	}

	var pos = $(p.object).offset();
	pos.top -= (rcmail.env.task == 'login' ? 20 : 160);
	me.messagedialog.dialog('close');
	me.messagedialog.html(p.message)
	.dialog({
	resizable: false,
	closeOnEscape: true,
	dialogClass: 'popupmessage ' + p.type,
	title: env.errortitle,
	close: function() {
	me.messagedialog.dialog('destroy').hide();
	},
	position: ['center', pos.top],
	hide: { effect:'drop', direction:'down' },
	width: 420,
	minHeight: 90
	}).show();

	window.setTimeout(function(){ me.messagedialog.dialog('close'); }, Math.max(2000, p.timeout / 2));
	}
	}


	/**
	* Adjust UI objects of the mail view screen
	*/
	function layout_messageview()
	{
	$('#messagecontent').css('top', ($('#messageheader').outerHeight() + 10) + 'px');
	$('#message-objects div a').addClass('button');

	if (!$('#attachment-list li').length) {
	$('div.rightcol').hide();
	$('div.leftcol').css('margin-right', '0');
	}
	}


	function render_mailboxlist(splitter)
	{
	// TODO: implement smart shortening of long folder names
	}


	function resize_leftcol(splitter)
	{
	// STUB
	}


	function layout_composeview()
	{
	var body = $('#composebody'),
	form = $('#compose-content'),
	bottom = $('#composeview-bottom'),
	w, h;

	bottom.css('height', (form.height() - bottom.position().top) + 'px');

	w = body.parent().width() - 5;
	h = body.parent().height() - 16;
	body.width(w).height(h);

	$('#composebody_tbl').width((w+8)+'px').height('').css('margin-top', '1px');
	$('#composebody_ifr').width((w+8)+'px').height((h-40)+'px');
	$('#googie_edit_layer').height(h+'px');

	var abooks = $('#directorylist');
	$('#compose-contacts .scroller').css('top', abooks.position().top + abooks.outerHeight());
	}


	function update_quota(p)
	{
	var step = 24, step_count = 20,
	y = p.total ? Math.ceil(p.percent / 100 * step_count) * step : 0;

	// never show full-circle if quota is close to 100% but below.
	if (p.total && y == step * step_count && p.percent < 100)
	y -= step;

	$('#quotadisplay').css('background-position', '0 -'+y+'px');
	}


	/**
	* Trigger for popup menus
	*/
	function show_popup(popup, show, config)
	{
	// auto-register menu object
	if (config \|\| !popupconfig[popup])
	popupconfig[popup] = $.extend(popupconfig[popup] \|\| {}, config);

	var visible = show_popupmenu(popup, show),
	config = popupconfig[popup];
	if (typeof config.callback == 'function')
	config.callback(visible);
	}

	/**
	* Show/hide a specific popup menu
	*/
	function show_popupmenu(popup, show)
	{
	var obj = popups[popup],
	config = popupconfig[popup],
	ref = $('#'+popup+'link'),
	above = config.above;

	if (!obj) {
	obj = popups[popup] = $('#'+popup);
	obj.appendTo(document.body); // move them to top for proper absolute positioning
	}

	if (!obj \|\| !obj.length)
	return false;

	if (typeof show == 'undefined')
	show = obj.is(':visible') ? false : true;
	else if (config.toggle && show && obj.is(':visible'))
	show = false;

	if (show && ref) {
	var parent = ref.parent(),
	win = $(window),
	pos;

	if (parent.hasClass('dropbutton'))
	ref = parent;

	pos = ref.offset();
	ref.offsetHeight = ref.outerHeight();
	if (!above && pos.top + ref.offsetHeight + obj.height() > win.height())
	above = true;
	if (pos.left + obj.width() > win.width())
	pos.left = win.width() - obj.width() - 12;

	obj.css({ left:pos.left, top:(pos.top + (above ? -obj.height() : ref.offsetHeight)) });
	}

	obj[show?'show':'hide']();

	// hide drop-down elements on buggy browsers
	if (bw.ie6 && config.overlap) {
	$('select').css('visibility', show?'hidden':'inherit');
	$('select', obj).css('visibility', 'inherit');
	}

	return show;
	}

	/**
	*
	*/
	function target_overlaps(target, elem)
	{
	while (target.parentNode) {
	if (target.parentNode == elem)
	return true;
	target = target.parentNode;
	}
	return false;
	}


	/**
	* Show/hide the preview pane
	*/
	function toggle_preview_pane(e)
	{
	var button = $(e.target),
	frame = $('#mailpreviewframe'),
	visible = !frame.is(':visible'),
	- splitter = mailviewsplit.pos \|\| parseInt(bw.get_cookie('mailviewsplitter') \|\| 320),
	+ splitter = mailviewsplit.pos \|\| parseInt(rcmail.get_cookie('mailviewsplitter') \|\| 320),
	topstyles, bottomstyles, uid;

	frame.toggle();
	button.removeClass().addClass(visible ? 'enabled' : 'closed');

	if (visible) {
	$('#mailview-top').removeClass('fullheight').css({ bottom:'auto' });
	$('#mailview-bottom').css({ height:'auto' });

	rcmail.env.contentframe = 'messagecontframe';
	if (uid = rcmail.message_list.get_single_selection())
	rcmail.show_message(uid, false, true);

	// let the splitter set the correct size and position
	if (mailviewsplit.handle) {
	mailviewsplit.handle.show();
	mailviewsplit.resize();
	}
	else
	mailviewsplit.init();
	}
	else {
	rcmail.env.contentframe = null;
	rcmail.show_contentframe(false);

	$('#mailview-top').addClass('fullheight').css({ height:'auto', bottom:'28px' });
	$('#mailview-bottom').css({ top:'auto', height:'26px' });

	if (mailviewsplit.handle)
	mailviewsplit.handle.hide();
	}

	if (visible && uid && rcmail.message_list)
	rcmail.message_list.scrollto(uid);

	rcmail.command('save-pref', { name:'preview_pane', value:(visible?1:0) });
	}


	/**
	* Switch between short and full headers display in message preview
	*/
	function toggle_preview_headers(button)
	{
	$('#preview-shortheaders').toggle();
	var full = $('#preview-allheaders').toggle(),
	button = $('a#previewheaderstoggle');

	// add toggle button to full headers table
	if (full.is(':visible'))
	button.attr('href', '#hide').removeClass('add').addClass('remove')
	else
	button.attr('href', '#details').removeClass('remove').addClass('add')
	}


	/**
	*
	*/
	function switch_view_mode(mode)
	{
	if (rcmail.env.threading != (mode == 'thread'))
	rcmail.set_list_options(null, undefined, undefined, mode == 'thread' ? 1 : 0);

	$('#maillistmode, #mailthreadmode').removeClass('selected');
	$('#mail'+mode+'mode').addClass('selected');
	}


	/** popup callbacks **/

	function searchmenu(show)
	{
	if (show && rcmail.env.search_mods) {
	var n, all,
	obj = popups['searchmenu'],
	list = $('input:checkbox[name="s_mods[]"]', obj),
	mbox = rcmail.env.mailbox,
	mods = rcmail.env.search_mods;

	if (rcmail.env.task == 'mail') {
	mods = mods[mbox] ? mods[mbox] : mods['*'];
	all = 'text';
	}
	else {
	all = '*';
	}

	if (mods[all])
	list.map(function() {
	this.checked = true;
	this.disabled = this.value != all;
	});
	else {
	list.prop('disabled', false).prop('checked', false);
	for (n in mods)
	$('#s_mod_' + n).prop('checked', true);
	}
	}
	}


	function spellmenu(show)
	{
	var link, li,
	lang = rcmail.spellcheck_lang(),
	menu = popups.spellmenu,
	ul = $('ul', menu);

	if (!ul.length) {
	ul = $('<ul class="toolbarmenu selectable">');

	for (i in rcmail.env.spell_langs) {
	li = $('<li>');
	link = $('<a href="#"></a>').text(rcmail.env.spell_langs[i])
	.addClass('active').data('lang', i)
	.click(function() {
	rcmail.spellcheck_lang_set($(this).data('lang'));
	});

	link.appendTo(li);
	li.appendTo(ul);
	}

	ul.appendTo(menu);
	}

	// select current language
	$('li', ul).each(function() {
	var el = $('a', this);
	if (el.data('lang') == lang)
	el.addClass('selected');
	else if (el.hasClass('selected'))
	el.removeClass('selected');
	});
	}


	/**
	*
	*/
	function show_listoptions()
	{
	var $dialog = $('#listoptions');

	// close the dialog
	if ($dialog.is(':visible')) {
	$dialog.dialog('close');
	return;
	}

	// set form values
	$('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
	$('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
	$('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
	$('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false);
	$('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true);

	// set checkboxes
	$('input[name="list_col[]"]').each(function() {
	$(this).prop('checked', $.inArray(this.value, rcmail.env.coltypes) != -1);
	});

	$dialog.dialog({
	modal: true,
	resizable: false,
	closeOnEscape: true,
	title: null,
	close: function() {
	$dialog.dialog('destroy').hide();
	},
	width: 650
	}).show();
	}


	/**
	*
	*/
	function save_listoptions()
	{
	$('#listoptions').dialog('close');

	var sort = $('input[name="sort_col"]:checked').val(),
	ord = $('input[name="sort_ord"]:checked').val(),
	thread = $('input[name="view"]:checked').val(),
	cols = $('input[name="list_col[]"]:checked')
	.map(function(){ return this.value; }).get();

	rcmail.set_list_options(cols, sort, ord, thread == 'thread' ? 1 : 0);
	}


	/**
	*
	*/
	function set_searchmod(elem)
	{
	var all, m, task = rcmail.env.task,
	mods = rcmail.env.search_mods,
	mbox = rcmail.env.mailbox;

	if (!mods)
	mods = {};

	if (task == 'mail') {
	if (!mods[mbox])
	mods[mbox] = rcube_clone_object(mods['*']);
	m = mods[mbox];
	all = 'text';
	}
	else { //addressbook
	m = mods;
	all = '*';
	}

	if (!elem.checked)
	delete(m[elem.value]);
	else
	m[elem.value] = 1;

	// mark all fields
	if (elem.value != all)
	return;

	$('input:checkbox[name="s_mods[]"]').map(function() {
	if (this == elem)
	return;

	this.checked = true;
	if (elem.checked) {
	this.disabled = true;
	delete m[this.value];
	}
	else {
	this.disabled = false;
	m[this.value] = 1;
	}
	});
	}


	function show_uploadform()
	{
	var $dialog = $('#upload-dialog');

	// close the dialog
	if ($dialog.is(':visible')) {
	$dialog.dialog('close');
	return;
	}

	// add icons to clone file input field
	if (rcmail.env.action == 'compose' && !$dialog.data('extended')) {
	$('<a>')
	.addClass('iconlink add')
	.attr('href', '#add')
	.html('Add')
	.appendTo($('input[type="file"]', $dialog).parent())
	.click(add_uploadfile);
	$dialog.data('extended', true);
	}

	$dialog.dialog({
	modal: true,
	resizable: false,
	closeOnEscape: true,
	title: $dialog.attr('title'),
	close: function() {
	try { $('#upload-dialog form').get(0).reset(); }
	catch(e){ } // ignore errors

	$dialog.dialog('destroy').hide();
	$('div.addline', $dialog).remove();
	},
	width: 480
	}).show();

	if (!document.all)
	$('input[type=file]', $dialog).first().click();
	}

	function add_uploadfile(e)
	{
	var div = $(this).parent();
	var clone = div.clone().addClass('addline').insertAfter(div);
	clone.children('.iconlink').click(add_uploadfile);
	clone.children('input').val('');

	if (!document.all)
	$('input[type=file]', clone).click();
	}


	/**
	*
	*/
	function show_header_row(which, updated)
	{
	var row = $('#compose-' + which);
	if (row.is(':visible'))
	return; // nothing to be done here

	if (compose_headers[which] && !updated)
	$('#_' + which).val(compose_headers[which]);

	row.show();
	$('#' + which + '-link').hide();
	layout_composeview();
	return false;
	}

	/**
	*
	*/
	function hide_header_row(which)
	{
	// copy and clear field value
	var field = $('#_' + which);
	compose_headers[which] = field.val();
	field.val('');

	$('#compose-' + which).hide();
	$('#' + which + '-link').show();
	layout_composeview();
	return false;
	}


	/**
	* Fieldsets-to-tabs converter
	*/
	function init_tabs(elem, current)
	{
	var content = $(elem),
	id = content.get(0).id,
	fs = content.children('fieldset');

	if (!fs.length)
	return;

	if (!id) {
	id = 'rcmtabcontainer';
	content.attr('id', id);
	}

	// first hide not selected tabs
	current = current \|\| 0;
	fs.each(function(idx) { if (idx != current) $(this).hide(); });

	// create tabs container
	var tabs = $('<div>').addClass('tabsbar').prependTo(content);

	// convert fildsets into tabs
	fs.each(function(idx) {
	var tab, a, elm = $(this), legend = elm.children('legend');

	// create a tab
	a = $('<a>').text(legend.text()).attr('href', '#');
	tab = $('<span>').attr({'id': 'tab'+idx, 'class': 'tablink'})
	.click(function() { show_tab(id, idx); return false })

	// remove legend
	legend.remove();
	// style fieldset
	elm.addClass('tab');
	// style selected tab
	if (idx == current)
	tab.addClass('selected');

	// add the tab to container
	tab.append(a).appendTo(tabs);
	});
	}

	function show_tab(id, index)
	{
	var fs = $('#'+id).children('fieldset');

	fs.each(function(idx) {
	// Show/hide fieldset (tab content)
	$(this)[index==idx ? 'show' : 'hide']();
	// Select/unselect tab
	$('#tab'+idx).toggleClass('selected', idx==index);
	});
	}

	/**
	* Show about page as jquery UI dialog
	*/
	function show_about(elem)
	{
	var frame = $('<iframe>').attr('id', 'aboutframe')
	.attr('src', rcmail.url('settings/about'))
	.attr('frameborder', '0')
	.appendTo(document.body);

	var h = Math.floor($(window).height() * 0.75);
	var buttons = {};
	var supportln = $('#supportlink');
	if (supportln.length && (env.supporturl = supportln.attr('href')))
	buttons[supportln.html()] = function(e){ env.supporturl.indexOf('mailto:') < 0 ? window.open(env.supporturl) : location.href = env.supporturl };

	frame.dialog({
	modal: true,
	resizable: false,
	closeOnEscape: true,
	title: elem ? elem.title \|\| elem.innerHTML : null,
	close: function() {
	frame.dialog('destroy').remove();
	},
	buttons: buttons,
	width: 640,
	height: h
	}).width(640);
	}
	}


	/**
	* Roundcube Scroller class
	*/
	function rcube_scroller(list, top, bottom)
	{
	var ref = this;

	this.list = $(list);
	this.top = $(top);
	this.bottom = $(bottom);
	this.step_size = 6;
	this.step_time = 20;
	this.delay = 500;

	this.top
	.mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); })
	.mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });

	this.bottom
	.mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); })
	.mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });

	this.scroll = function(dir)
	{
	var ref = this, size = this.step_size;

	if (!rcmail.drag_active)
	return;

	if (dir == 'down')
	size *= -1;

	this.list.get(0).scrollTop += size;
	this.ts = window.setTimeout(function() { ref.scroll(dir); }, this.step_time);
	};
	};


	/**
	* Roundcube UI splitter class
	*
	* @constructor
	*/
	function rcube_splitter(p)
	{
	this.p = p;
	this.id = p.id;
	this.horizontal = (p.orientation == 'horizontal' \|\| p.orientation == 'h');
	this.halfsize = (p.size !== undefined ? p.size : 10) / 2;
	this.pos = p.start \|\| 0;
	this.min = p.min \|\| 20;
	this.offset = p.offset \|\| 0;
	this.relative = p.relative ? true : false;
	this.drag_active = false;
	this.render = p.render;
	this.callback = p.callback;

	var me = this;
	rcube_splitter._instances[this.id] = me;

	this.init = function()
	{
	this.p1 = $(this.p.p1);
	this.p2 = $(this.p.p2);

	// check if referenced elements exist, otherwise abort
	if (!this.p1.length \|\| !this.p2.length)
	return;

	// create and position the handle for this splitter
	this.p1pos = this.relative ? this.p1.position() : this.p1.offset();
	this.p2pos = this.relative ? this.p2.position() : this.p2.offset();
	this.handle = $('<div>')
	.attr('id', this.id)
	.attr('unselectable', 'on')
	.addClass('splitter ' + (this.horizontal ? 'splitter-h' : 'splitter-v'))
	.appendTo(this.p1.parent())
	.bind('mousedown', onDragStart);

	if (this.horizontal) {
	var top = this.p1pos.top + this.p1.outerHeight();
	this.handle.css({ left:'0px', top:top+'px' });
	}
	else {
	var left = this.p1pos.left + this.p1.outerWidth();
	this.handle.css({ left:left+'px', top:'0px' });
	}

	// listen to window resize on IE
	if (bw.ie)
	$(window).resize(onResize);

	// read saved position from cookie
	- var cookie = bw.get_cookie(this.id);
	+ var cookie = rcmail.get_cookie(this.id);
	if (cookie && !isNaN(cookie)) {
	this.pos = parseFloat(cookie);
	this.resize();
	}
	else if (this.pos) {
	this.resize();
	this.set_cookie();
	}
	};

	/**
	* Set size and position of all DOM objects
	* according to the saved splitter position
	*/
	this.resize = function()
	{
	if (this.horizontal) {
	this.p1.css('height', Math.floor(this.pos - this.p1pos.top - this.halfsize) + 'px');
	this.p2.css('top', Math.ceil(this.pos + this.halfsize + 2) + 'px');
	this.handle.css('top', Math.round(this.pos - this.halfsize + this.offset)+'px');
	if (bw.ie) {
	var new_height = parseInt(this.p2.parent().outerHeight(), 10) - parseInt(this.p2.css('top'), 10) - (bw.ie8 ? 2 : 0);
	this.p2.css('height', (new_height > 0 ? new_height : 0) + 'px');
	}
	}
	else {
	this.p1.css('width', Math.floor(this.pos - this.p1pos.left - this.halfsize) + 'px');
	this.p2.css('left', Math.ceil(this.pos + this.halfsize) + 'px');
	this.handle.css('left', Math.round(this.pos - this.halfsize + this.offset + 3)+'px');
	if (bw.ie) {
	var new_width = parseInt(this.p2.parent().outerWidth(), 10) - parseInt(this.p2.css('left'), 10) ;
	this.p2.css('width', (new_width > 0 ? new_width : 0) + 'px');
	}
	}

	this.p2.resize();
	this.p1.resize();

	// also resize iframe covers
	if (this.drag_active) {
	$('iframe').each(function(i, elem) {
	var pos = $(this).offset();
	$('#iframe-splitter-fix-'+i).css({ top: pos.top+'px', left: pos.left+'px', width:elem.offsetWidth+'px', height: elem.offsetHeight+'px' });
	});
	}

	if (typeof this.render == 'function')
	this.render(this);
	};

	/**
	* Handler for mousedown events
	*/
	function onDragStart(e)
	{
	// disable text selection while dragging the splitter
	if (bw.konq \|\| bw.chrome \|\| bw.safari)
	document.body.style.webkitUserSelect = 'none';

	me.p1pos = me.relative ? me.p1.position() : me.p1.offset();
	me.p2pos = me.relative ? me.p2.position() : me.p2.offset();
	me.drag_active = true;

	// start listening to mousemove events
	$(document).bind('mousemove.'+this.id, onDrag).bind('mouseup.'+this.id, onDragStop);

	// enable dragging above iframes
	$('iframe').each(function(i, elem) {
	$('<div>')
	.attr('id', 'iframe-splitter-fix-'+i)
	.addClass('iframe-splitter-fix')
	.css({ background: '#fff',
	width: elem.offsetWidth+'px', height: elem.offsetHeight+'px',
	position: 'absolute', opacity: '0.001', zIndex: 1000
	})
	.css($(this).offset())
	.appendTo('body');
	});
	};

	/**
	* Handler for mousemove events
	*/
	function onDrag(e)
	{
	if (!me.drag_active)
	return false;

	var pos = rcube_event.get_mouse_pos(e);

	if (me.relative) {
	var parent = me.p1.parent().offset();
	pos.x -= parent.left;
	pos.y -= parent.top;
	}

	if (me.horizontal) {
	if (((pos.y - me.halfsize) > me.p1pos.top) && ((pos.y + me.halfsize) < (me.p2pos.top + me.p2.outerHeight()))) {
	me.pos = Math.max(me.min, pos.y - me.offset);
	me.resize();
	}
	}
	else {
	if (((pos.x - me.halfsize) > me.p1pos.left) && ((pos.x + me.halfsize) < (me.p2pos.left + me.p2.outerWidth()))) {
	me.pos = Math.max(me.min, pos.x - me.offset);
	me.resize();
	}
	}

	me.p1pos = me.relative ? me.p1.position() : me.p1.offset();
	me.p2pos = me.relative ? me.p2.position() : me.p2.offset();
	return false;
	};

	/**
	* Handler for mouseup events
	*/
	function onDragStop(e)
	{
	// resume the ability to highlight text
	if (bw.konq \|\| bw.chrome \|\| bw.safari)
	document.body.style.webkitUserSelect = 'auto';

	// cancel the listening for drag events
	$(document).unbind('.'+me.id);
	me.drag_active = false;

	// remove temp divs
	$('div.iframe-splitter-fix').remove();

	me.set_cookie();

	if (typeof me.callback == 'function')
	me.callback(me);

	return bw.safari ? true : rcube_event.cancel(e);
	};

	/**
	* Handler for window resize events
	*/
	function onResize(e)
	{
	if (me.horizontal) {
	var new_height = parseInt(me.p2.parent().outerHeight(), 10) - parseInt(me.p2[0].style.top, 10) - (bw.ie8 ? 2 : 0);
	me.p2.css('height', (new_height > 0 ? new_height : 0) +'px');
	}
	else {
	var new_width = parseInt(me.p2.parent().outerWidth(), 10) - parseInt(me.p2[0].style.left, 10);
	me.p2.css('width', (new_width > 0 ? new_width : 0) + 'px');
	}
	};

	/**
	* Saves splitter position in cookie
	*/
	this.set_cookie = function()
	{
	var exp = new Date();
	exp.setYear(exp.getFullYear() + 1);
	- bw.set_cookie(this.id, this.pos, exp);
	+ rcmail.set_cookie(this.id, this.pos, exp);
	};

	} // end class rcube_splitter


	// static getter for splitter instances
	rcube_splitter._instances = {};

	rcube_splitter.get_instance = function(id)
	{
	return rcube_splitter._instances[id];
	};
	diff --git a/tests/Utils.php b/tests/Utils.php
	new file mode 100644
	index 000000000..648b39989
	--- /dev/null
	+++ b/tests/Utils.php
	@@ -0,0 +1,74 @@
	+<?php
	+
	+/**
	+ * Test class to test rcube_utils class
	+ *
	+ * @package Tests
	+ */
	+class Utils extends PHPUnit_Framework_TestCase
	+{
	+
	+ /**
	+ * Valid email addresses for test_valid_email()
	+ */
	+ function data_valid_email()
	+ {
	+ return array(
	+ array('email@domain.com', 'Valid email'),
	+ array('firstname.lastname@domain.com', 'Email contains dot in the address field'),
	+ array('email@subdomain.domain.com', 'Email contains dot with subdomain'),
	+ array('firstname+lastname@domain.com', 'Plus sign is considered valid character'),
	+ array('email@123.123.123.123', 'Domain is valid IP address'),
	+ array('email@[123.123.123.123]', 'Square bracket around IP address is considered valid'),
	+ array('"email"@domain.com', 'Quotes around email is considered valid'),
	+ array('1234567890@domain.com', 'Digits in address are valid'),
	+ array('email@domain-one.com', 'Dash in domain name is valid'),
	+ array('_______@domain.com', 'Underscore in the address field is valid'),
	+ array('email@domain.name', '.name is valid Top Level Domain name'),
	+ array('email@domain.co.jp', 'Dot in Top Level Domain name also considered valid (use co.jp as example here)'),
	+ array('firstname-lastname@domain.com', 'Dash in address field is valid'),
	+ );
	+ }
	+
	+ /**
	+ * Invalid email addresses for test_invalid_email()
	+ */
	+ function data_invalid_email()
	+ {
	+ return array(
	+ array('plainaddress', 'Missing @ sign and domain'),
	+ array('#@%^%#$@#$@#.com', 'Garbage'),
	+ array('@domain.com', 'Missing username'),
	+ array('Joe Smith <email@domain.com>', 'Encoded html within email is invalid'),
	+ array('email.domain.com', 'Missing @'),
	+ array('email@domain@domain.com', 'Two @ sign'),
	+ array('.email@domain.com', 'Leading dot in address is not allowed'),
	+ array('email.@domain.com', 'Trailing dot in address is not allowed'),
	+ array('email..email@domain.com', 'Multiple dots'),
	+ array('あいうえお@domain.com', 'Unicode char as address'),
	+ array('email@domain.com (Joe Smith)', 'Text followed email is not allowed'),
	+ array('email@domain', 'Missing top level domain (.com/.net/.org/etc)'),
	+ array('email@-domain.com', 'Leading dash in front of domain is invalid'),
	+// array('email@domain.web', '.web is not a valid top level domain'),
	+ array('email@111.222.333.44444', 'Invalid IP format'),
	+ array('email@domain..com', 'Multiple dot in the domain portion is invalid'),
	+ );
	+ }
	+
	+ /**
	+ * @dataProvider data_valid_email
	+ */
	+ function test_valid_email($email, $title)
	+ {
	+ $this->assertTrue(rcube_utils::check_email($email, false), $title);
	+ }
	+
	+ /**
	+ * @dataProvider data_invalid_email
	+ */
	+ function test_invalid_email($email, $title)
	+ {
	+ $this->assertFalse(rcube_utils::check_email($email, false), $title);
	+ }
	+
	+}
	diff --git a/tests/phpunit.xml b/tests/phpunit.xml
	index 4a3b883cf..cfd066e29 100644
	--- a/tests/phpunit.xml
	+++ b/tests/phpunit.xml
	@@ -1,13 +1,14 @@
	<phpunit backupGlobals="false"
	bootstrap="bootstrap.php"
	colors="true">
	<testsuites>
	<testsuite name="All Tests">
	<file>HtmlToText.php</file>
	<file>MailDecode.php</file>
	<file>MailFunc.php</file>
	<file>ModCss.php</file>
	+ <file>Utils.php</file>
	<file>VCards.php</file>
	</testsuite>
	</testsuites>
	</phpunit>

File Metadata

Mime Type: text/x-diff
Expires: Thu, Feb 5, 2:54 PM (2 h, 49 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 427895
Default Alt Text: (651 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions