No OneTemporary
Actions

Size

277 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 05540a5a4..f48ace4e8 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,1418 +1,1419 @@
	CHANGELOG Roundcube Webmail
	===========================

	+- Add option to not include original message on reply, rename option top_posting to reply_mode (#1485149)
	- Fix Larry's messages list filter in IE (#1488632)
	- Fix more IE issues by disabling Compat. mode with X-UA-Compatible meta tag (#1488626)
	- Fix setting locales under Solaris - use additional .UTF-8 suffix (#1488628)
	- Fix email address validation for addresses with IP address in domain part
	- Fix Larry skin issues in IE7 compat. mode (#1488618)
	- Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed
	- 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 504593028..69a6ea279 100644
	--- a/config/main.inc.php.dist
	+++ b/config/main.inc.php.dist
	@@ -1,857 +1,860 @@
	<?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, sum of: 1 = log; 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
	$rcmail_config['session_domain'] = '';

	// 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:
	+// -1 - don't cite the original message
	+// 0 - place cursor below the original message
	+// 1 - place cursor above original message (top posting)
	+$rcmail_config['reply_mode'] = 0;

	// 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/installer/rcube_install.php b/installer/rcube_install.php
	index bfb111f1d..5af871346 100644
	--- a/installer/rcube_install.php
	+++ b/installer/rcube_install.php
	@@ -1,728 +1,729 @@
	<?php

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


	/**
	* Class to control the installation process of the Roundcube Webmail package
	*
	* @category Install
	* @package Roundcube
	* @author Thomas Bruederli
	*/
	class rcube_install
	{
	var $step;
	var $is_post = false;
	var $failures = 0;
	var $config = array();
	var $configured = false;
	var $last_error = null;
	var $db_map = array('pgsql' => 'postgres', 'mysqli' => 'mysql', 'sqlsrv' => 'mssql');
	var $email_pattern = '([a-z0-9][a-z0-9\-\.\+\_]@[a-z0-9]([a-z0-9\-][.]?)[a-z0-9])';
	var $bool_config_props = array();

	var $obsolete_config = array('db_backend', 'double_auth');
	var $replaced_config = array(
	- 'skin_path' => 'skin',
	- 'locale_string' => 'language',
	- 'multiple_identities' => 'identities_level',
	+ 'skin_path' => 'skin',
	+ 'locale_string' => 'language',
	+ 'multiple_identities' => 'identities_level',
	'addrbook_show_images' => 'show_images',
	- 'imap_root' => 'imap_ns_personal',
	- 'pagesize' => 'mail_pagesize',
	+ 'imap_root' => 'imap_ns_personal',
	+ 'pagesize' => 'mail_pagesize',
	'default_imap_folders' => 'default_folders',
	+ 'top_posting' => 'reply_mode',
	);

	// these config options are required for a working system
	var $required_config = array(
	'db_dsnw', 'db_table_contactgroups', 'db_table_contactgroupmembers',
	'des_key', 'session_lifetime', 'support_url',
	);

	// list of supported database drivers
	var $supported_dbs = array(
	'MySQL' => 'pdo_mysql',
	'PostgreSQL' => 'pdo_pgsql',
	'SQLite' => 'pdo_sqlite',
	'SQLite (v2)' => 'pdo_sqlite2',
	'SQL Server (SQLSRV)' => 'pdo_sqlsrv',
	'SQL Server (DBLIB)' => 'pdo_dblib',
	);


	/**
	* Constructor
	*/
	function rcube_install()
	{
	$this->step = intval($_REQUEST['_step']);
	$this->is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
	}

	/**
	* Singleton getter
	*/
	function get_instance()
	{
	static $inst;

	if (!$inst)
	$inst = new rcube_install();

	return $inst;
	}

	/**
	* Read the default config files and store properties
	*/
	function load_defaults()
	{
	$this->_load_config('.php.dist');
	}


	/**
	* Read the local config files and store properties
	*/
	function load_config()
	{
	$this->config = array();
	$this->_load_config('.php');
	$this->configured = !empty($this->config);
	}

	/**
	* Read the default config file and store properties
	* @access private
	*/
	function _load_config($suffix)
	{
	if (is_readable($main_inc = RCMAIL_CONFIG_DIR . '/main.inc' . $suffix)) {
	include($main_inc);
	if (is_array($rcmail_config))
	$this->config += $rcmail_config;
	}
	if (is_readable($db_inc = RCMAIL_CONFIG_DIR . '/db.inc'. $suffix)) {
	include($db_inc);
	if (is_array($rcmail_config))
	$this->config += $rcmail_config;
	}
	}


	/**
	* Getter for a certain config property
	*
	* @param string Property name
	* @param string Default value
	* @return string The property value
	*/
	function getprop($name, $default = '')
	{
	$value = $this->config[$name];

	if ($name == 'des_key' && !$this->configured && !isset($_REQUEST["_$name"]))
	$value = rcube_install::random_key(24);

	return $value !== null && $value !== '' ? $value : $default;
	}


	/**
	* Take the default config file and replace the parameters
	* with the submitted form data
	*
	* @param string Which config file (either 'main' or 'db')
	* @return string The complete config file content
	*/
	function create_config($which, $force = false)
	{
	$out = @file_get_contents(RCMAIL_CONFIG_DIR . "/{$which}.inc.php.dist");

	if (!$out)
	return '[Warning: could not read the config template file]';

	foreach ($this->config as $prop => $default) {

	$is_default = !isset($_POST["_$prop"]);
	$value = !$is_default \|\| $this->bool_config_props[$prop] ? $_POST["_$prop"] : $default;

	// convert some form data
	if ($prop == 'debug_level' && !$is_default) {
	if (is_array($value)) {
	$val = 0;
	foreach ($value as $dbgval)
	$val += intval($dbgval);
	$value = $val;
	}
	}
	else if ($which == 'db' && $prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
	if ($_POST['_dbtype'] == 'sqlite')
	$value = sprintf('%s://%s?mode=0646', $_POST['_dbtype'], $_POST['_dbname']{0} == '/' ? '/' . $_POST['_dbname'] : $_POST['_dbname']);
	else if ($_POST['_dbtype'])
	$value = sprintf('%s://%s:%s@%s/%s', $_POST['_dbtype'],
	rawurlencode($_POST['_dbuser']), rawurlencode($_POST['_dbpass']), $_POST['_dbhost'], $_POST['_dbname']);
	}
	else if ($prop == 'smtp_auth_type' && $value == '0') {
	$value = '';
	}
	else if ($prop == 'default_host' && is_array($value)) {
	$value = rcube_install::_clean_array($value);
	if (count($value) <= 1)
	$value = $value[0];
	}
	else if ($prop == 'mail_pagesize' \|\| $prop == 'addressbook_pagesize') {
	$value = max(2, intval($value));
	}
	else if ($prop == 'smtp_user' && !empty($_POST['_smtp_user_u'])) {
	$value = '%u';
	}
	else if ($prop == 'smtp_pass' && !empty($_POST['_smtp_user_u'])) {
	$value = '%p';
	}
	else if ($prop == 'default_folders') {
	$value = array();
	foreach ($this->config['default_folders'] as $_folder) {
	switch ($_folder) {
	case 'Drafts': $_folder = $this->config['drafts_mbox']; break;
	case 'Sent': $_folder = $this->config['sent_mbox']; break;
	case 'Junk': $_folder = $this->config['junk_mbox']; break;
	case 'Trash': $_folder = $this->config['trash_mbox']; break;
	}
	if (!in_array($_folder, $value))
	$value[] = $_folder;
	}
	}
	else if (is_bool($default)) {
	$value = (bool)$value;
	}
	else if (is_numeric($value)) {
	$value = intval($value);
	}

	// skip this property
	if (!$force && !$this->configured && ($value == $default))
	continue;

	// save change
	$this->config[$prop] = $value;

	// replace the matching line in config file
	$out = preg_replace(
	'/(\$rcmail_config\[\''.preg_quote($prop).'\'\])\s+=\s+(.+);/Uie',
	"'\\1 = ' . rcube_install::_dump_var(\$value, \$prop) . ';'",
	$out);
	}

	return trim($out);
	}


	/**
	* Check the current configuration for missing properties
	* and deprecated or obsolete settings
	*
	* @return array List with problems detected
	*/
	function check_config()
	{
	$this->config = array();
	$this->load_defaults();
	$defaults = $this->config;

	$this->load_config();
	if (!$this->configured)
	return null;

	$out = $seen = array();
	$required = array_flip($this->required_config);

	// iterate over the current configuration
	foreach ($this->config as $prop => $value) {
	if ($replacement = $this->replaced_config[$prop]) {
	$out['replaced'][] = array('prop' => $prop, 'replacement' => $replacement);
	$seen[$replacement] = true;
	}
	else if (!$seen[$prop] && in_array($prop, $this->obsolete_config)) {
	$out['obsolete'][] = array('prop' => $prop);
	$seen[$prop] = true;
	}
	}

	// iterate over default config
	foreach ($defaults as $prop => $value) {
	if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) \|\| strlen($this->config[$prop])))
	$out['missing'][] = array('prop' => $prop);
	}

	// check config dependencies and contradictions
	if ($this->config['enable_spellcheck'] && $this->config['spellcheck_engine'] == 'pspell') {
	if (!extension_loaded('pspell')) {
	$out['dependencies'][] = array('prop' => 'spellcheck_engine',
	'explain' => 'This requires the <tt>pspell</tt> extension which could not be loaded.');
	}
	else if (!empty($this->config['spellcheck_languages'])) {
	foreach ($this->config['spellcheck_languages'] as $lang => $descr)
	if (!@pspell_new($lang))
	$out['dependencies'][] = array('prop' => 'spellcheck_languages',
	'explain' => "You are missing pspell support for language $lang ($descr)");
	}
	}

	if ($this->config['log_driver'] == 'syslog') {
	if (!function_exists('openlog')) {
	$out['dependencies'][] = array('prop' => 'log_driver',
	'explain' => 'This requires the <tt>sylog</tt> extension which could not be loaded.');
	}
	if (empty($this->config['syslog_id'])) {
	$out['dependencies'][] = array('prop' => 'syslog_id',
	'explain' => 'Using <tt>syslog</tt> for logging requires a syslog ID to be configured');
	}
	}

	// check ldap_public sources having global_search enabled
	if (is_array($this->config['ldap_public']) && !is_array($this->config['autocomplete_addressbooks'])) {
	foreach ($this->config['ldap_public'] as $ldap_public) {
	if ($ldap_public['global_search']) {
	$out['replaced'][] = array('prop' => 'ldap_public::global_search', 'replacement' => 'autocomplete_addressbooks');
	break;
	}
	}
	}

	return $out;
	}


	/**
	* Merge the current configuration with the defaults
	* and copy replaced values to the new options.
	*/
	function merge_config()
	{
	$current = $this->config;
	$this->config = array();
	$this->load_defaults();

	foreach ($this->replaced_config as $prop => $replacement) {
	if (isset($current[$prop])) {
	if ($prop == 'skin_path')
	$this->config[$replacement] = preg_replace('#skins/(\w+)/?$#', '\\1', $current[$prop]);
	else if ($prop == 'multiple_identities')
	$this->config[$replacement] = $current[$prop] ? 2 : 0;
	else
	$this->config[$replacement] = $current[$prop];
	}
	unset($current[$prop]);
	}

	foreach ($this->obsolete_config as $prop) {
	unset($current[$prop]);
	}

	// add all ldap_public sources having global_search enabled to autocomplete_addressbooks
	if (is_array($current['ldap_public'])) {
	foreach ($current['ldap_public'] as $key => $ldap_public) {
	if ($ldap_public['global_search']) {
	$this->config['autocomplete_addressbooks'][] = $key;
	unset($current['ldap_public'][$key]['global_search']);
	}
	}
	}

	if ($current['keep_alive'] && $current['session_lifetime'] < $current['keep_alive'])
	$current['session_lifetime'] = max(10, ceil($current['keep_alive'] / 60) * 2);

	$this->config = array_merge($this->config, $current);

	foreach ((array)$current['ldap_public'] as $key => $values) {
	$this->config['ldap_public'][$key] = $current['ldap_public'][$key];
	}
	}

	/**
	* Compare the local database schema with the reference schema
	* required for this version of Roundcube
	*
	* @param boolean True if the schema schould be updated
	* @return boolean True if the schema is up-to-date, false if not or an error occured
	*/
	function db_schema_check($DB, $update = false)
	{
	if (!$this->configured)
	return false;

	// read reference schema from mysql.initial.sql
	$db_schema = $this->db_read_schema(INSTALL_PATH . 'SQL/mysql.initial.sql');
	$errors = array();

	// check list of tables
	$existing_tables = $DB->list_tables();

	foreach ($db_schema as $table => $cols) {
	$table = !empty($this->config['db_table_'.$table]) ? $this->config['db_table_'.$table] : $table;
	if (!in_array($table, $existing_tables)) {
	$errors[] = "Missing table '".$table."'";
	}
	else { // compare cols
	$db_cols = $DB->list_cols($table);
	$diff = array_diff(array_keys($cols), $db_cols);
	if (!empty($diff))
	$errors[] = "Missing columns in table '$table': " . join(',', $diff);
	}
	}

	return !empty($errors) ? $errors : false;
	}

	/**
	* Utility function to read database schema from an .sql file
	*/
	private function db_read_schema($schemafile)
	{
	$lines = file($schemafile);
	$table_block = false;
	$schema = array();
	foreach ($lines as $line) {
	if (preg_match('/^\s*create table `?([a-z0-9_]+)`?/i', $line, $m)) {
	$table_block = $m[1];
	}
	else if ($table_block && preg_match('/^\s*`?([a-z0-9_-]+)`?\s+([a-z]+)/', $line, $m)) {
	$col = $m[1];
	if (!in_array(strtoupper($col), array('PRIMARY','KEY','INDEX','UNIQUE','CONSTRAINT','REFERENCES','FOREIGN'))) {
	$schema[$table_block][$col] = $m[2];
	}
	}
	}

	return $schema;
	}


	/**
	* Getter for the last error message
	*
	* @return string Error message or null if none exists
	*/
	function get_error()
	{
	return $this->last_error['message'];
	}


	/**
	* Return a list with all imap hosts configured
	*
	* @return array Clean list with imap hosts
	*/
	function get_hostlist()
	{
	$default_hosts = (array)$this->getprop('default_host');
	$out = array();

	foreach ($default_hosts as $key => $name) {
	if (!empty($name))
	$out[] = rcube_parse_host(is_numeric($key) ? $name : $key);
	}

	return $out;
	}

	/**
	* Create a HTML dropdown to select a previous version of Roundcube
	*/
	function versions_select($attrib = array())
	{
	$select = new html_select($attrib);
	$select->add(array(
	'0.1-stable', '0.1.1',
	'0.2-alpha', '0.2-beta', '0.2-stable',
	'0.3-stable', '0.3.1',
	'0.4-beta', '0.4.2',
	'0.5-beta', '0.5', '0.5.1',
	'0.6-beta', '0.6',
	'0.7-beta', '0.7', '0.7.1', '0.7.2',
	'0.8-beta', '0.8-rc', '0.8.0',
	));
	return $select;
	}

	/**
	* Return a list with available subfolders of the skin directory
	*/
	function list_skins()
	{
	$skins = array();
	$skindir = INSTALL_PATH . 'skins/';
	foreach (glob($skindir . '*') as $path) {
	if (is_dir($path) && is_readable($path)) {
	$skins[] = substr($path, strlen($skindir));
	}
	}
	return $skins;
	}

	/**
	* Display OK status
	*
	* @param string Test name
	* @param string Confirm message
	*/
	function pass($name, $message = '')
	{
	echo Q($name) . ':  <span class="success">OK</span>';
	$this->_showhint($message);
	}


	/**
	* Display an error status and increase failure count
	*
	* @param string Test name
	* @param string Error message
	* @param string URL for details
	*/
	function fail($name, $message = '', $url = '')
	{
	$this->failures++;

	echo Q($name) . ':  <span class="fail">NOT OK</span>';
	$this->_showhint($message, $url);
	}


	/**
	* Display an error status for optional settings/features
	*
	* @param string Test name
	* @param string Error message
	* @param string URL for details
	*/
	function optfail($name, $message = '', $url = '')
	{
	echo Q($name) . ':  <span class="na">NOT OK</span>';
	$this->_showhint($message, $url);
	}


	/**
	* Display warning status
	*
	* @param string Test name
	* @param string Warning message
	* @param string URL for details
	*/
	function na($name, $message = '', $url = '')
	{
	echo Q($name) . ':  <span class="na">NOT AVAILABLE</span>';
	$this->_showhint($message, $url);
	}


	function _showhint($message, $url = '')
	{
	$hint = Q($message);

	if ($url)
	$hint .= ($hint ? '; ' : '') . 'See <a href="' . Q($url) . '" target="_blank">' . Q($url) . '</a>';

	if ($hint)
	echo '<span class="indent">(' . $hint . ')</span>';
	}


	static function _clean_array($arr)
	{
	$out = array();

	foreach (array_unique($arr) as $k => $val) {
	if (!empty($val)) {
	if (is_numeric($k))
	$out[] = $val;
	else
	$out[$k] = $val;
	}
	}

	return $out;
	}


	static function _dump_var($var, $name=null) {
	// special values
	switch ($name) {
	case 'syslog_facility':
	$list = array(32 => 'LOG_AUTH', 80 => 'LOG_AUTHPRIV', 72 => ' LOG_CRON',
	24 => 'LOG_DAEMON', 0 => 'LOG_KERN', 128 => 'LOG_LOCAL0',
	136 => 'LOG_LOCAL1', 144 => 'LOG_LOCAL2', 152 => 'LOG_LOCAL3',
	160 => 'LOG_LOCAL4', 168 => 'LOG_LOCAL5', 176 => 'LOG_LOCAL6',
	184 => 'LOG_LOCAL7', 48 => 'LOG_LPR', 16 => 'LOG_MAIL',
	56 => 'LOG_NEWS', 40 => 'LOG_SYSLOG', 8 => 'LOG_USER', 64 => 'LOG_UUCP');
	if ($val = $list[$var])
	return $val;
	break;
	}


	if (is_array($var)) {
	if (empty($var)) {
	return 'array()';
	}
	else { // check if all keys are numeric
	$isnum = true;
	foreach ($var as $key => $value) {
	if (!is_numeric($key)) {
	$isnum = false;
	break;
	}
	}

	if ($isnum)
	return 'array(' . join(', ', array_map(array('rcube_install', '_dump_var'), $var)) . ')';
	}
	}

	return var_export($var, true);
	}


	/**
	* Initialize the database with the according schema
	*
	* @param object rcube_db Database connection
	* @return boolen True on success, False on error
	*/
	function init_db($DB)
	{
	$engine = isset($this->db_map[$DB->db_provider]) ? $this->db_map[$DB->db_provider] : $DB->db_provider;

	// read schema file from /SQL/*
	$fname = INSTALL_PATH . "SQL/$engine.initial.sql";
	if ($sql = @file_get_contents($fname)) {
	$this->exec_sql($sql, $DB);
	}
	else {
	$this->fail('DB Schema', "Cannot read the schema file: $fname");
	return false;
	}

	if ($err = $this->get_error()) {
	$this->fail('DB Schema', "Error creating database schema: $err");
	return false;
	}

	return true;
	}


	/**
	* Update database with SQL statements from SQL/*.update.sql
	*
	* @param object rcube_db Database connection
	* @param string Version to update from
	* @return boolen True on success, False on error
	*/
	function update_db($DB, $version)
	{
	$version = strtolower($version);
	$engine = isset($this->db_map[$DB->db_provider]) ? $this->db_map[$DB->db_provider] : $DB->db_provider;

	// read schema file from /SQL/*
	$fname = INSTALL_PATH . "SQL/$engine.update.sql";
	if ($lines = @file($fname, FILE_SKIP_EMPTY_LINES)) {
	$from = false; $sql = '';
	foreach ($lines as $line) {
	$is_comment = preg_match('/^--/', $line);
	if (!$from && $is_comment && preg_match('/from version\s([0-9.]+[a-z-]*)/', $line, $m)) {
	$v = strtolower($m[1]);
	if ($v == $version \|\| version_compare($version, $v, '<='))
	$from = true;
	}
	if ($from && !$is_comment)
	$sql .= $line. "\n";
	}

	if ($sql)
	$this->exec_sql($sql, $DB);
	}
	else {
	$this->fail('DB Schema', "Cannot read the update file: $fname");
	return false;
	}

	if ($err = $this->get_error()) {
	$this->fail('DB Schema', "Error updating database: $err");
	return false;
	}

	return true;
	}


	/**
	* Execute the given SQL queries on the database connection
	*
	* @param string SQL queries to execute
	* @param object rcube_db Database connection
	* @return boolen True on success, False on error
	*/
	function exec_sql($sql, $DB)
	{
	$buff = '';
	foreach (explode("\n", $sql) as $line) {
	if (preg_match('/^--/', $line) \|\| trim($line) == '')
	continue;

	$buff .= $line . "\n";
	if (preg_match('/(;\|^GO)$/', trim($line))) {
	$DB->query($buff);
	$buff = '';
	if ($DB->is_error())
	break;
	}
	}

	return !$DB->is_error();
	}


	/**
	* Handler for Roundcube errors
	*/
	function raise_error($p)
	{
	$this->last_error = $p;
	}


	/**
	* Generarte a ramdom string to be used as encryption key
	*
	* @param int Key length
	* @return string The generated random string
	* @static
	*/
	function random_key($length)
	{
	$alpha = 'ABCDEFGHIJKLMNOPQERSTUVXYZabcdefghijklmnopqrtsuvwxyz0123456789+*%&?!$-_=';
	$out = '';

	for ($i=0; $i < $length; $i++)
	$out .= $alpha{rand(0, strlen($alpha)-1)};

	return $out;
	}

	}

	diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
	index e2997906c..41acc80dd 100644
	--- a/program/include/rcube_config.php
	+++ b/program/include/rcube_config.php
	@@ -1,414 +1,415 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_config.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-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 read configuration settings \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	/**
	* Configuration class for Roundcube
	*
	* @package Core
	*/
	class rcube_config
	{
	const DEFAULT_SKIN = 'larry';

	private $prop = array();
	private $errors = array();
	private $userprefs = array();

	/**
	* Renamed options
	*
	* @var array
	*/
	private $legacy_props = array(
	// new name => old name
	'default_folders' => 'default_imap_folders',
	'mail_pagesize' => 'pagesize',
	'addressbook_pagesize' => 'pagesize',
	+ 'reply_mode' => 'top_posting',
	);


	/**
	* Object constructor
	*/
	public function __construct()
	{
	$this->load();

	// Defaults, that we do not require you to configure,
	// but contain information that is used in various
	// locations in the code:
	$this->set('contactlist_fields', array('name', 'firstname', 'surname', 'email'));
	}


	/**
	* Load config from local config file
	*
	* @todo Remove global $CONFIG
	*/
	private function load()
	{
	// load main config file
	if (!$this->load_from_file(RCMAIL_CONFIG_DIR . '/main.inc.php'))
	$this->errors[] = 'main.inc.php was not found.';

	// load database config
	if (!$this->load_from_file(RCMAIL_CONFIG_DIR . '/db.inc.php'))
	$this->errors[] = 'db.inc.php was not found.';

	// load host-specific configuration
	$this->load_host_config();

	// set skin (with fallback to old 'skin_path' property)
	if (empty($this->prop['skin'])) {
	if (!empty($this->prop['skin_path'])) {
	$this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
	}
	else {
	$this->prop['skin'] = self::DEFAULT_SKIN;
	}
	}

	// larry is the new default skin :-)
	if ($this->prop['skin'] == 'default')
	$this->prop['skin'] = self::DEFAULT_SKIN;

	// fix paths
	$this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
	$this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : INSTALL_PATH . 'temp';

	// fix default imap folders encoding
	foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
	$this->prop[$folder] = rcube_charset::convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF7-IMAP');

	if (!empty($this->prop['default_folders']))
	foreach ($this->prop['default_folders'] as $n => $folder)
	$this->prop['default_folders'][$n] = rcube_charset::convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');

	// set PHP error logging according to config
	if ($this->prop['debug_level'] & 1) {
	ini_set('log_errors', 1);

	if ($this->prop['log_driver'] == 'syslog') {
	ini_set('error_log', 'syslog');
	}
	else {
	ini_set('error_log', $this->prop['log_dir'].'/errors');
	}
	}

	// enable display_errors in 'show' level, but not for ajax requests
	ini_set('display_errors', intval(empty($_REQUEST['_remote']) && ($this->prop['debug_level'] & 4)));

	// set timezone auto settings values
	if ($this->prop['timezone'] == 'auto') {
	$this->prop['_timezone_value'] = $this->client_timezone();
	}
	else if (is_numeric($this->prop['timezone'])) {
	$this->prop['timezone'] = timezone_name_from_abbr("", $this->prop['timezone'] * 3600, 0);
	}

	// remove deprecated properties
	unset($this->prop['dst_active']);

	// export config data
	$GLOBALS['CONFIG'] = &$this->prop;
	}

	/**
	* Load a host-specific config file if configured
	* This will merge the host specific configuration with the given one
	*/
	private function load_host_config()
	{
	$fname = null;

	if (is_array($this->prop['include_host_config'])) {
	$fname = $this->prop['include_host_config'][$_SERVER['HTTP_HOST']];
	}
	else if (!empty($this->prop['include_host_config'])) {
	$fname = preg_replace('/[^a-z0-9\.\-_]/i', '', $_SERVER['HTTP_HOST']) . '.inc.php';
	}

	if ($fname) {
	$this->load_from_file(RCMAIL_CONFIG_DIR . '/' . $fname);
	}
	}


	/**
	* Read configuration from a file
	* and merge with the already stored config values
	*
	* @param string $fpath Full path to the config file to be loaded
	* @return booelan True on success, false on failure
	*/
	public function load_from_file($fpath)
	{
	if (is_file($fpath) && is_readable($fpath)) {
	// use output buffering, we don't need any output here
	ob_start();
	include($fpath);
	ob_end_clean();

	if (is_array($rcmail_config)) {
	$this->prop = array_merge($this->prop, $rcmail_config, $this->userprefs);
	return true;
	}
	}

	return false;
	}


	/**
	* Getter for a specific config parameter
	*
	* @param string $name Parameter name
	* @param mixed $def Default value if not set
	* @return mixed The requested config value
	*/
	public function get($name, $def = null)
	{
	if (isset($this->prop[$name])) {
	$result = $this->prop[$name];
	}
	else if (isset($this->legacy_props[$name])) {
	return $this->get($this->legacy_props[$name], $def);
	}
	else {
	$result = $def;
	}

	$rcube = rcube::get_instance();

	if ($name == 'timezone' && isset($this->prop['_timezone_value']))
	$result = $this->prop['_timezone_value'];

	$plugin = $rcube->plugins->exec_hook('config_get', array(
	'name' => $name, 'default' => $def, 'result' => $result));

	return $plugin['result'];
	}


	/**
	* Setter for a config parameter
	*
	* @param string $name Parameter name
	* @param mixed $value Parameter value
	*/
	public function set($name, $value)
	{
	$this->prop[$name] = $value;
	}


	/**
	* Override config options with the given values (eg. user prefs)
	*
	* @param array $prefs Hash array with config props to merge over
	*/
	public function merge($prefs)
	{
	$this->prop = array_merge($this->prop, $prefs, $this->userprefs);
	}


	/**
	* Merge the given prefs over the current config
	* and make sure that they survive further merging.
	*
	* @param array $prefs Hash array with user prefs
	*/
	public function set_user_prefs($prefs)
	{
	// Honor the dont_override setting for any existing user preferences
	$dont_override = $this->get('dont_override');
	if (is_array($dont_override) && !empty($dont_override)) {
	foreach ($dont_override as $key) {
	unset($prefs[$key]);
	}
	}

	// convert user's timezone into the new format
	if (is_numeric($prefs['timezone'])) {
	$prefs['timezone'] = timezone_name_from_abbr('', $prefs['timezone'] * 3600, 0);
	}

	// larry is the new default skin :-)
	if ($prefs['skin'] == 'default') {
	$prefs['skin'] = self::DEFAULT_SKIN;
	}

	$this->userprefs = $prefs;
	$this->prop = array_merge($this->prop, $prefs);

	// override timezone settings with client values
	if ($this->prop['timezone'] == 'auto') {
	$this->prop['_timezone_value'] = isset($_SESSION['timezone']) ? $this->client_timezone() : $this->prop['_timezone_value'];
	}
	else if (isset($this->prop['_timezone_value']))
	unset($this->prop['_timezone_value']);
	}


	/**
	* Getter for all config options
	*
	* @return array Hash array containg all config properties
	*/
	public function all()
	{
	return $this->prop;
	}

	/**
	* Special getter for user's timezone offset including DST
	*
	* @return float Timezone offset (in hours)
	* @deprecated
	*/
	public function get_timezone()
	{
	if ($tz = $this->get('timezone')) {
	try {
	$tz = new DateTimeZone($tz);
	return $tz->getOffset(new DateTime('now')) / 3600;
	}
	catch (Exception $e) {
	}
	}

	return 0;
	}

	/**
	* Return requested DES crypto key.
	*
	* @param string $key Crypto key name
	* @return string Crypto key
	*/
	public function get_crypto_key($key)
	{
	// Bomb out if the requested key does not exist
	if (!array_key_exists($key, $this->prop)) {
	rcube::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Request for unconfigured crypto key \"$key\""
	), true, true);
	}

	$key = $this->prop[$key];

	// Bomb out if the configured key is not exactly 24 bytes long
	if (strlen($key) != 24) {
	rcube::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Configured crypto key '$key' is not exactly 24 bytes long"
	), true, true);
	}

	return $key;
	}


	/**
	* Try to autodetect operating system and find the correct line endings
	*
	* @return string The appropriate mail header delimiter
	*/
	public function header_delimiter()
	{
	// use the configured delimiter for headers
	if (!empty($this->prop['mail_header_delimiter'])) {
	$delim = $this->prop['mail_header_delimiter'];
	if ($delim == "\n" \|\| $delim == "\r\n")
	return $delim;
	else
	rcube::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid mail_header_delimiter setting"
	), true, false);
	}

	$php_os = strtolower(substr(PHP_OS, 0, 3));

	if ($php_os == 'win')
	return "\r\n";

	if ($php_os == 'mac')
	return "\r\n";

	return "\n";
	}


	/**
	* Return the mail domain configured for the given host
	*
	* @param string $host IMAP host
	* @param boolean $encode If true, domain name will be converted to IDN ASCII
	* @return string Resolved SMTP host
	*/
	public function mail_domain($host, $encode=true)
	{
	$domain = $host;

	if (is_array($this->prop['mail_domain'])) {
	if (isset($this->prop['mail_domain'][$host]))
	$domain = $this->prop['mail_domain'][$host];
	}
	else if (!empty($this->prop['mail_domain'])) {
	$domain = rcube_utils::parse_host($this->prop['mail_domain']);
	}

	if ($encode) {
	$domain = rcube_utils::idn_to_ascii($domain);
	}

	return $domain;
	}


	/**
	* Getter for error state
	*
	* @return mixed Error message on error, False if no errors
	*/
	public function get_error()
	{
	return empty($this->errors) ? false : join("\n", $this->errors);
	}


	/**
	* Internal getter for client's (browser) timezone identifier
	*/
	private function client_timezone()
	{
	return isset($_SESSION['timezone']) ? timezone_name_from_abbr("", $_SESSION['timezone'] * 3600, 0) : date_default_timezone_get();
	}

	}
	diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
	index 6085b3898..88de277ac 100644
	--- a/program/localization/en_US/labels.inc
	+++ b/program/localization/en_US/labels.inc
	@@ -1,519 +1,520 @@
	<?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> \|
	+-----------------------------------------------------------------------+
	*/

	$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['replyempty'] = 'do not quote the original message';
	+$labels['replytopposting'] = 'start new message above the quote';
	+$labels['replybottomposting'] = 'start new message below the quote';
	$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/steps/mail/compose.inc b/program/steps/mail/compose.inc
	index 56f4a052b..c243c887e 100644
	--- a/program/steps/mail/compose.inc
	+++ b/program/steps/mail/compose.inc
	@@ -1,1646 +1,1647 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/compose.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Compose a new mail message with all headers and attachments \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// define constants for message compose mode
	define('RCUBE_COMPOSE_REPLY', 0x0106);
	define('RCUBE_COMPOSE_FORWARD', 0x0107);
	define('RCUBE_COMPOSE_DRAFT', 0x0108);
	define('RCUBE_COMPOSE_EDIT', 0x0109);

	$MESSAGE_FORM = null;
	$COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GET);
	$COMPOSE = null;

	if ($COMPOSE_ID && $_SESSION['compose_data_'.$COMPOSE_ID])
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];

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

	// Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or
	// if a compose-ID is given (i.e. when the compose step is opened in a new window/tab).
	if (!is_array($COMPOSE))
	{
	// Infinite redirect prevention in case of broken session (#1487028)
	if ($COMPOSE_ID)
	raise_error(array('code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid compose ID"), true, true);

	$COMPOSE_ID = uniqid(mt_rand());
	$_SESSION['compose_data_'.$COMPOSE_ID] = array(
	'id' => $COMPOSE_ID,
	'param' => request2param(RCUBE_INPUT_GET),
	'mailbox' => $RCMAIL->storage->get_folder(),
	);
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];

	// process values like "mailto:foo@bar.com?subject=new+message&cc=another"
	if ($COMPOSE['param']['to']) {
	// #1486037: remove "mailto:" prefix
	$COMPOSE['param']['to'] = preg_replace('/^mailto:/i', '', $COMPOSE['param']['to']);
	$mailto = explode('?', $COMPOSE['param']['to']);
	if (count($mailto) > 1) {
	$COMPOSE['param']['to'] = $mailto[0];
	parse_str($mailto[1], $query);
	foreach ($query as $f => $val)
	$COMPOSE['param'][$f] = $val;
	}
	}

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

	// pipe compose parameters thru plugins
	$plugin = $RCMAIL->plugins->exec_hook('message_compose', $COMPOSE);
	$COMPOSE['param'] = array_merge($COMPOSE['param'], $plugin['param']);

	// add attachments listed by message_compose hook
	if (is_array($plugin['attachments'])) {
	foreach ($plugin['attachments'] as $attach) {
	// we have structured data
	if (is_array($attach)) {
	$attachment = $attach;
	}
	// only a file path is given
	else {
	$filename = basename($attach);
	$attachment = array(
	'group' => $COMPOSE_ID,
	'name' => $filename,
	'mimetype' => rc_mime_content_type($attach, $filename),
	'path' => $attach,
	);
	}

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

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

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

	// redirect to a unique URL with all parameters stored in session
	$OUTPUT->redirect(array(
	'_action' => 'compose',
	'_id' => $COMPOSE['id'],
	'_search' => $_REQUEST['_search'],
	));
	}


	// add some labels to client
	$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'cancel',
	'nobodywarning', 'notsentwarning', 'notuploadedwarning', 'savingmessage', 'sendingmessage',
	'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'uploadingmany',
	'fileuploaderror', 'sendmessage');

	$OUTPUT->set_env('compose_id', $COMPOSE['id']);

	// add config parameters to client script
	if (!empty($CONFIG['drafts_mbox'])) {
	$OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
	$OUTPUT->set_env('draft_autosave', $CONFIG['draft_autosave']);
	}
	// set current mailbox in client environment
	$OUTPUT->set_env('mailbox', $RCMAIL->storage->get_folder());
	$OUTPUT->set_env('sig_above', $RCMAIL->config->get('sig_above', false));
	-$OUTPUT->set_env('top_posting', $RCMAIL->config->get('top_posting', false));
	+$OUTPUT->set_env('top_posting', intval($RCMAIL->config->get('reply_mode')) > 0);
	$OUTPUT->set_env('recipients_separator', trim($RCMAIL->config->get('recipients_separator', ',')));

	// default font for HTML editor
	$font = rcube_fontdefs($RCMAIL->config->get('default_font', 'Verdana'));
	if ($font && !is_array($font)) {
	$OUTPUT->set_env('default_font', $font);
	}

	// get reference message and set compose mode
	if ($msg_uid = $COMPOSE['param']['draft_uid']) {
	$RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
	$compose_mode = RCUBE_COMPOSE_DRAFT;
	}
	else if ($msg_uid = $COMPOSE['param']['reply_uid'])
	$compose_mode = RCUBE_COMPOSE_REPLY;
	else if ($msg_uid = $COMPOSE['param']['forward_uid'])
	$compose_mode = RCUBE_COMPOSE_FORWARD;
	else if ($msg_uid = $COMPOSE['param']['uid'])
	$compose_mode = RCUBE_COMPOSE_EDIT;

	$config_show_sig = $RCMAIL->config->get('show_sig', 1);
	if ($config_show_sig == 1)
	$OUTPUT->set_env('show_sig', true);
	else if ($config_show_sig == 2 && (empty($compose_mode) \|\| $compose_mode == RCUBE_COMPOSE_EDIT \|\| $compose_mode == RCUBE_COMPOSE_DRAFT))
	$OUTPUT->set_env('show_sig', true);
	else if ($config_show_sig == 3 && ($compose_mode == RCUBE_COMPOSE_REPLY \|\| $compose_mode == RCUBE_COMPOSE_FORWARD))
	$OUTPUT->set_env('show_sig', true);
	else
	$OUTPUT->set_env('show_sig', false);

	// set line length for body wrapping
	$LINE_LENGTH = $RCMAIL->config->get('line_length', 72);

	if (!empty($msg_uid))
	{
	// similar as in program/steps/mail/show.inc
	// re-set 'prefer_html' to have possibility to use html part for compose
	$CONFIG['prefer_html'] = $CONFIG['prefer_html'] \|\| $CONFIG['htmleditor'] \|\| $compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT;
	$MESSAGE = new rcube_message($msg_uid);

	// make sure message is marked as read
	if ($MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN']))
	$RCMAIL->storage->set_flag($msg_uid, 'SEEN');

	if (!empty($MESSAGE->headers->charset))
	$RCMAIL->storage->set_charset($MESSAGE->headers->charset);

	if ($compose_mode == RCUBE_COMPOSE_REPLY)
	{
	$COMPOSE['reply_uid'] = $msg_uid;
	$COMPOSE['reply_msgid'] = $MESSAGE->headers->messageID;
	$COMPOSE['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID);

	if (!empty($COMPOSE['param']['all']))
	$MESSAGE->reply_all = $COMPOSE['param']['all'];

	$OUTPUT->set_env('compose_mode', 'reply');

	// Save the sent message in the same folder of the message being replied to
	if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $COMPOSE['mailbox'])
	&& rcmail_check_sent_folder($sent_folder, false)
	) {
	$COMPOSE['param']['sent_mbox'] = $sent_folder;
	}
	}
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
	{
	if ($MESSAGE->headers->others['x-draft-info'])
	{
	// get reply_uid/forward_uid to flag the original message when sending
	$info = rcmail_draftinfo_decode($MESSAGE->headers->others['x-draft-info']);

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

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

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

	if ($MESSAGE->headers->in_reply_to)
	$COMPOSE['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>';

	$COMPOSE['references'] = $MESSAGE->headers->references;
	}
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
	{
	$COMPOSE['forward_uid'] = $msg_uid;
	$OUTPUT->set_env('compose_mode', 'forward');

	if (!empty($COMPOSE['param']['attachment']))
	$MESSAGE->forward_attachment = true;
	}
	}
	else {
	$MESSAGE = new stdClass();
	}

	$MESSAGE->compose = array();

	// get user's identities
	$MESSAGE->identities = $RCMAIL->user->list_identities();
	if (count($MESSAGE->identities))
	{
	foreach ($MESSAGE->identities as $idx => $ident) {
	$ident['email'] = format_email($ident['email']);
	$email = format_email(rcube_idn_to_utf8($ident['email']));

	$MESSAGE->identities[$idx]['email_ascii'] = $ident['email'];
	$MESSAGE->identities[$idx]['ident'] = format_email_recipient($ident['email'], $ident['name']);
	$MESSAGE->identities[$idx]['email'] = $email;
	}
	}

	// Set From field value
	if (!empty($_POST['_from'])) {
	$MESSAGE->compose['from'] = get_input_value('_from', RCUBE_INPUT_POST);
	}
	else if (!empty($COMPOSE['param']['from'])) {
	$MESSAGE->compose['from'] = $COMPOSE['param']['from'];
	}
	else if (count($MESSAGE->identities)) {
	$a_recipients = array();
	$a_names = array();

	// extract all recipients of the reply-message
	if (is_object($MESSAGE->headers) && in_array($compose_mode, array(RCUBE_COMPOSE_REPLY, RCUBE_COMPOSE_FORWARD)))
	{
	$a_to = rcube_mime::decode_address_list($MESSAGE->headers->to, null, true, $MESSAGE->headers->charset);
	foreach ($a_to as $addr) {
	if (!empty($addr['mailto'])) {
	$a_recipients[] = format_email($addr['mailto']);
	$a_names[] = $addr['name'];
	}
	}

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

	$from_idx = null;
	$default_identity = null;
	$return_path = $MESSAGE->headers->others['return-path'];

	// Select identity
	foreach ($MESSAGE->identities as $idx => $ident) {
	// save default identity ID
	if ($ident['standard']) {
	$default_identity = $idx;
	}

	// use From header
	if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
	if ($MESSAGE->headers->from == $ident['ident']) {
	$from_idx = $idx;
	break;
	}
	}
	// reply to yourself
	else if ($compose_mode == RCUBE_COMPOSE_REPLY && $MESSAGE->headers->from == $ident['ident']) {
	$from_idx = $idx;
	break;
	}
	// use replied message recipients
	else if (($found = array_search($ident['email_ascii'], $a_recipients)) !== false) {
	// match identity name, prefer default identity
	if ($from_idx === null \|\| ($a_names[$found] && $ident['name'] && $a_names[$found] == $ident['name'])) {
	$from_idx = $idx;
	}
	}
	}

	// Fallback using Return-Path
	if ($from_idx === null && $return_path) {
	foreach ($MESSAGE->identities as $idx => $ident) {
	if (strpos($return_path, str_replace('@', '=', $ident['email_ascii']).'@') !== false) {
	$from_idx = $idx;
	break;
	}
	}
	}

	// Still no ID, use default/first identity
	if ($from_idx === null) {
	$from_idx = $default_identity !== null ? $default_identity : key(reset($MESSAGE->identities));
	}

	$ident = $MESSAGE->identities[$from_idx];
	$from_id = $ident['identity_id'];

	$MESSAGE->compose['from_email'] = $ident['email'];
	$MESSAGE->compose['from'] = $from_id;
	}

	// Set other headers
	$a_recipients = array();
	$parts = array('to', 'cc', 'bcc', 'replyto', 'followupto');
	$separator = trim($RCMAIL->config->get('recipients_separator', ',')) . ' ';

	foreach ($parts as $header) {
	$fvalue = '';
	$decode_header = true;

	// we have a set of recipients stored is session
	if ($header == 'to' && ($mailto_id = $COMPOSE['param']['mailto'])
	&& $_SESSION['mailto'][$mailto_id]
	) {
	$fvalue = urldecode($_SESSION['mailto'][$mailto_id]);
	$decode_header = false;

	// make session to not grow up too much
	unset($_SESSION['mailto'][$mailto_id]);
	$COMPOSE['param']['to'] = $fvalue;
	}
	else if (!empty($_POST['_'.$header])) {
	$fvalue = get_input_value('_'.$header, RCUBE_INPUT_POST, TRUE);
	}
	else if (!empty($COMPOSE['param'][$header])) {
	$fvalue = $COMPOSE['param'][$header];
	}
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	// get recipent address(es) out of the message headers
	if ($header == 'to') {
	$mailfollowup = $MESSAGE->headers->others['mail-followup-to'];
	$mailreplyto = $MESSAGE->headers->others['mail-reply-to'];

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

	// Reply to message sent by yourself (#1487074)
	if (!empty($ident) && $fvalue == $ident['ident']) {
	$fvalue = $MESSAGE->headers->to;
	}
	}
	// add recipient of original message if reply to all
	else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') {
	if ($v = $MESSAGE->headers->to)
	$fvalue .= $v;
	if ($v = $MESSAGE->headers->cc)
	$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
	}
	}
	else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
	// get drafted headers
	if ($header=='to' && !empty($MESSAGE->headers->to))
	$fvalue = $MESSAGE->get_header('to');
	else if ($header=='cc' && !empty($MESSAGE->headers->cc))
	$fvalue = $MESSAGE->get_header('cc');
	else if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
	$fvalue = $MESSAGE->get_header('bcc');
	else if ($header=='replyto' && !empty($MESSAGE->headers->others['mail-reply-to']))
	$fvalue = $MESSAGE->get_header('mail-reply-to');
	else if ($header=='replyto' && !empty($MESSAGE->headers->replyto))
	$fvalue = $MESSAGE->get_header('reply-to');
	else if ($header=='followupto' && !empty($MESSAGE->headers->others['mail-followup-to']))
	$fvalue = $MESSAGE->get_header('mail-followup-to');
	}

	// split recipients and put them back together in a unique way
	if (!empty($fvalue) && in_array($header, array('to', 'cc', 'bcc'))) {
	$to_addresses = rcube_mime::decode_address_list($fvalue, null, $decode_header, $MESSAGE->headers->charset);
	$fvalue = array();

	foreach ($to_addresses as $addr_part) {
	if (empty($addr_part['mailto']))
	continue;

	$mailto = format_email(rcube_idn_to_utf8($addr_part['mailto']));

	if (!in_array($mailto, $a_recipients)
	&& ($header == 'to' \|\| empty($MESSAGE->compose['from_email']) \|\| $mailto != $MESSAGE->compose['from_email'])
	) {
	if ($addr_part['name'] && $addr_part['mailto'] != $addr_part['name'])
	$string = format_email_recipient($mailto, $addr_part['name']);
	else
	$string = $mailto;

	$fvalue[] = $string;
	$a_recipients[] = $addr_part['mailto'];
	}
	}

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

	$MESSAGE->compose[$header] = $fvalue;
	}
	unset($a_recipients);

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


	/**** compose mode functions ******/

	function rcmail_compose_headers($attrib)
	{
	global $MESSAGE;

	list($form_start, $form_end) = get_form_tags($attrib);

	$out = '';
	$part = strtolower($attrib['part']);

	switch ($part)
	{
	case 'from':
	return $form_start . rcmail_compose_header_from($attrib);

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

	$allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex');
	$field_type = 'html_textarea';
	break;

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

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

	$allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
	$field_type = 'html_inputfield';
	break;
	}

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

	// create teaxtarea object
	$input = new $field_type($field_attrib);
	$out = $input->show($MESSAGE->compose[$param]);
	}

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

	// configure autocompletion
	rcube_autocomplete_init();

	return $out;
	}


	function rcmail_compose_header_from($attrib)
	{
	global $MESSAGE, $OUTPUT, $RCMAIL, $compose_mode;

	// pass the following attributes to the form class
	$field_attrib = array('name' => '_from');
	foreach ($attrib as $attr => $value)
	if (in_array($attr, array('id', 'class', 'style', 'size', 'tabindex')))
	$field_attrib[$attr] = $value;

	if (count($MESSAGE->identities))
	{
	$a_signatures = array();
	$separator = $RCMAIL->config->get('sig_above')
	&& ($compose_mode == RCUBE_COMPOSE_REPLY \|\| $compose_mode == RCUBE_COMPOSE_FORWARD) ? '---' : '-- ';

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

	// create SELECT element
	foreach ($MESSAGE->identities as $sql_arr)
	{
	$identity_id = $sql_arr['identity_id'];
	$select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $identity_id);

	// add signature to array
	if (!empty($sql_arr['signature']) && empty($COMPOSE['param']['nosig']))
	{
	$text = $html = $sql_arr['signature'];

	if ($sql_arr['html_signature']) {
	$h2t = new html2text($sql_arr['signature'], false, false);
	$text = trim($h2t->get_text());
	}
	else {
	$html = htmlentities($html, ENT_NOQUOTES, RCMAIL_CHARSET);
	}

	if (!preg_match('/^--[ -]\r?\n/m', $text)) {
	$text = $separator . "\n" . $text;
	$html = $separator . "<br>" . $html;
	}

	if (!$sql_arr['html_signature']) {
	$html = "<pre>" . $html . "</pre>";
	}

	$a_signatures[$identity_id]['text'] = $text;
	$a_signatures[$identity_id]['html'] = $html;
	}
	}

	$out = $select_from->show($MESSAGE->compose['from']);

	// add signatures to client
	$OUTPUT->set_env('signatures', $a_signatures);
	}
	// no identities, display text input field
	else {
	$field_attrib['class'] = 'from_address';
	$input_from = new html_inputfield($field_attrib);
	$out = $input_from->show($MESSAGE->compose['from']);
	}

	return $out;
	}


	function rcmail_compose_editor_mode()
	{
	global $RCMAIL, $MESSAGE, $compose_mode;
	static $useHtml;

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

	$html_editor = intval($RCMAIL->config->get('htmleditor'));

	if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT) {
	$useHtml = $MESSAGE->has_html_part(false);
	}
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	$useHtml = ($html_editor == 1 \|\| ($html_editor == 2 && $MESSAGE->has_html_part(false)));
	}
	else { // RCUBE_COMPOSE_FORWARD or NEW
	$useHtml = ($html_editor == 1);
	}

	return $useHtml;
	}


	function rcmail_prepare_message_body()
	{
	global $RCMAIL, $MESSAGE, $COMPOSE, $compose_mode, $LINE_LENGTH, $HTML_MODE;

	// use posted message body
	if (!empty($_POST['_message'])) {
	$body = get_input_value('_message', RCUBE_INPUT_POST, true);
	$isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);
	}
	else if ($COMPOSE['param']['body']) {
	$body = $COMPOSE['param']['body'];
	$isHtml = false;
	}
	// forward as attachment
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $MESSAGE->forward_attachment) {
	$isHtml = rcmail_compose_editor_mode();
	$body = '';
	if (empty($COMPOSE['attachments']))
	rcmail_write_forward_attachment($MESSAGE);
	}
	// reply/edit/draft/forward
	- else if ($compose_mode) {
	+ else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY \|\| $RCMAIL->config->get('reply_mode') != -1)) {
	$isHtml = rcmail_compose_editor_mode();

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

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

	// compose reply-body
	if ($compose_mode == RCUBE_COMPOSE_REPLY)
	$body = rcmail_create_reply_body($body, $isHtml);
	// forward message body inline
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
	$body = rcmail_create_forward_body($body, $isHtml);
	// load draft message body
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT)
	$body = rcmail_create_draft_body($body, $isHtml);
	}
	else { // new message
	$isHtml = rcmail_compose_editor_mode();
	}

	$plugin = $RCMAIL->plugins->exec_hook('message_compose_body',
	array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode));
	$body = $plugin['body'];
	unset($plugin);

	// add blocked.gif attachment (#1486516)
	if ($isHtml && preg_match('#<img src="\./program/resources/blocked\.gif"#', $body)) {
	if ($attachment = rcmail_save_image('program/resources/blocked.gif', 'image/gif')) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
	$body = preg_replace('#\./program/resources/blocked\.gif#', $url, $body);
	}
	}

	$HTML_MODE = $isHtml;

	return $body;
	}

	function rcmail_compose_part_body($part, $isHtml = false)
	{
	global $RCMAIL, $MESSAGE, $compose_mode;

	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	if (!rcmail_mem_check($part->size * 10)) {
	return '';
	}

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

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

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

	$body = $part->body;

	if ($isHtml) {
	if ($part->ctype_secondary == 'html') {
	}
	else {
	// try to remove the signature
	if ($RCMAIL->config->get('strip_existing_sig', true)) {
	$body = rcmail_remove_signature($body);
	}
	// add HTML formatting
	$body = rcmail_plain_body($body);
	if ($body) {
	$body = '<pre>' . $body . '</pre>';
	}
	}
	}
	else {
	if ($part->ctype_secondary == 'html') {
	// use html part if it has been used for message (pre)viewing
	// decrease line length for quoting
	$len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
	$txt = new html2text($body, false, true, $len);
	$body = $txt->get_text();
	}
	else {
	if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
	$body = rcube_mime::unfold_flowed($body);
	}

	// try to remove the signature
	if ($RCMAIL->config->get('strip_existing_sig', true)) {
	$body = rcmail_remove_signature($body);
	}
	}
	}

	return $body;
	}

	function rcmail_compose_body($attrib)
	{
	global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode, $LINE_LENGTH, $HTML_MODE, $MESSAGE_BODY;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

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

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

	$isHtml = $HTML_MODE;

	$out = $form_start ? "$form_start\n" : '';

	$saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE->headers->messageID) : ''));
	$out .= $saveid->show();

	$drafttoggle = new html_hiddenfield(array('name' => '_draft', 'value' => 'yes'));
	$out .= $drafttoggle->show();

	$msgtype = new html_hiddenfield(array('name' => '_is_html', 'value' => ($isHtml?"1":"0")));
	$out .= $msgtype->show();

	// If desired, set this textarea to be editable by TinyMCE
	if ($isHtml) {
	$MESSAGE_BODY = htmlentities($MESSAGE_BODY, ENT_NOQUOTES, RCMAIL_CHARSET);
	$attrib['class'] = 'mce_editor';
	$attrib['is_escaped'] = true;
	$textarea = new html_textarea($attrib);
	$out .= $textarea->show($MESSAGE_BODY);
	}
	else {
	$textarea = new html_textarea($attrib);
	$out .= $textarea->show('');
	// quote plain text, inject into textarea
	$table = get_html_translation_table(HTML_SPECIALCHARS);
	$MESSAGE_BODY = strtr($MESSAGE_BODY, $table);
	$out = substr($out, 0, -11) . $MESSAGE_BODY . '</textarea>';
	}

	$out .= $form_end ? "\n$form_end" : '';

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

	// include HTML editor
	rcube_html_editor();

	// Set language list
	if (!empty($CONFIG['enable_spellcheck'])) {
	$engine = $RCMAIL->config->get('spellcheck_engine','googie');
	$dictionary = (bool) $RCMAIL->config->get('spellcheck_dictionary');
	$spellcheck_langs = (array) $RCMAIL->config->get('spellcheck_languages',
	array('da'=>'Dansk', 'de'=>'Deutsch', 'en' => 'English', 'es'=>'Español',
	'fr'=>'Français', 'it'=>'Italiano', 'nl'=>'Nederlands', 'pl'=>'Polski',
	'pt'=>'Português', 'ru'=>'Русский', 'fi'=>'Suomi', 'sv'=>'Svenska'));

	// googie works only with two-letter codes
	if ($engine == 'googie') {
	$lang = strtolower(substr($_SESSION['language'], 0, 2));

	$spellcheck_langs_googie = array();
	foreach ($spellcheck_langs as $key => $name)
	$spellcheck_langs_googie[strtolower(substr($key,0,2))] = $name;
	$spellcheck_langs = $spellcheck_langs_googie;
	}
	else {
	$lang = $_SESSION['language'];

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

	if (!$spellcheck_langs[$lang])
	$lang = 'en';

	$OUTPUT->set_env('spell_langs', $spellcheck_langs);
	$OUTPUT->set_env('spell_lang', $lang);

	$editor_lang_set = array();
	foreach ($spellcheck_langs as $key => $name) {
	$editor_lang_set[] = ($key == $lang ? '+' : '') . JQ($name).'='.JQ($key);
	}

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

	$OUTPUT->add_label('checking');
	$OUTPUT->set_env('spellcheck_langs', join(',', $editor_lang_set));
	}

	$out .= "\n".'<iframe name="savetarget" src="program/resources/blank.gif" style="width:0;height:0;border:none;visibility:hidden;"></iframe>';

	return $out;
	}


	function rcmail_create_reply_body($body, $bodyIsHtml)
	{
	global $RCMAIL, $MESSAGE, $LINE_LENGTH;

	// build reply prefix
	$from = array_pop(rcube_mime::decode_address_list($MESSAGE->get_header('from'), 1, false, $MESSAGE->headers->charset));
	$prefix = rcube_label(array(
	'name' => 'mailreplyintro',
	'vars' => array(
	'date' => format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long')),
	'sender' => $from['name'] ? $from['name'] : rcube_idn_to_utf8($from['mailto']),
	)
	));

	if (!$bodyIsHtml) {
	$body = preg_replace('/\r?\n/', "\n", $body);

	// soft-wrap and quote message text
	$body = rcmail_wrap_and_quote(rtrim($body, "\n"), $LINE_LENGTH);

	$prefix .= "\n";
	$suffix = '';

	- if ($RCMAIL->config->get('top_posting'))
	+ if (intval($RCMAIL->config->get('reply_mode')) > 0) { // top-posting
	$prefix = "\n\n\n" . $prefix;
	+ }
	}
	else {
	// save inline images to files
	$cid_map = rcmail_write_inline_attachments($MESSAGE);
	// set is_safe flag (we need this for html body washing)
	rcmail_check_safe($MESSAGE);
	// clean up html tags
	$body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map);

	// build reply (quote content)
	$prefix = '<p>' . Q($prefix) . "</p>\n";
	$prefix .= '<blockquote>';

	- if ($RCMAIL->config->get('top_posting')) {
	+ if (intval($RCMAIL->config->get('reply_mode')) > 0) { // top-posting
	$prefix = '<br>' . $prefix;
	$suffix = '</blockquote>';
	}
	else {
	$suffix = '</blockquote><p></p>';
	}
	}

	return $prefix.$body.$suffix;
	}


	function rcmail_create_forward_body($body, $bodyIsHtml)
	{
	global $RCMAIL, $MESSAGE, $COMPOSE;

	// add attachments
	if (!isset($COMPOSE['forward_attachments']) && is_array($MESSAGE->mime_parts))
	$cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);

	$date = format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long'));
	$charset = $RCMAIL->output->get_charset();

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

	if ($MESSAGE->headers->cc)
	$prefix .= rcube_label('cc') . ': ' . $MESSAGE->get_header('cc') . "\n";
	if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
	$prefix .= rcube_label('replyto') . ': ' . $MESSAGE->get_header('replyto') . "\n";

	$prefix .= "\n";
	}
	else
	{
	// set is_safe flag (we need this for html body washing)
	rcmail_check_safe($MESSAGE);
	// clean up html tags
	$body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map);

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

	if ($MESSAGE->headers->cc)
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	rcube_label('cc'),
	Q($MESSAGE->get_header('cc'), 'replace'));

	if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	rcube_label('replyto'),
	Q($MESSAGE->get_header('replyto'), 'replace'));

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

	return $prefix.$body;
	}


	function rcmail_create_draft_body($body, $bodyIsHtml)
	{
	global $MESSAGE, $OUTPUT, $COMPOSE;

	/**
	* add attachments
	* sizeof($MESSAGE->mime_parts can be 1 - e.g. attachment, but no text!
	*/
	if (empty($COMPOSE['forward_attachments'])
	&& is_array($MESSAGE->mime_parts)
	&& count($MESSAGE->mime_parts) > 0)
	{
	$cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);

	// replace cid with href in inline images links
	if ($cid_map)
	$body = str_replace(array_keys($cid_map), array_values($cid_map), $body);
	}

	return $body;
	}


	function rcmail_remove_signature($body)
	{
	global $RCMAIL;

	$body = str_replace("\r\n", "\n", $body);
	$len = strlen($body);
	$sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15);

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

	return $body;
	}


	function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
	{
	global $RCMAIL, $COMPOSE;

	$cid_map = $messages = array();
	foreach ((array)$message->mime_parts as $pid => $part)
	{
	if (($part->ctype_primary != 'message' \|\| !$bodyIsHtml) && $part->ctype_primary != 'multipart' &&
	($part->disposition == 'attachment' \|\| ($part->disposition == 'inline' && $bodyIsHtml) \|\| $part->filename)
	&& $part->mimetype != 'application/ms-tnef'
	) {
	$skip = false;
	if ($part->mimetype == 'message/rfc822') {
	$messages[] = $part->mime_id;
	} else if ($messages) {
	// skip attachments included in message/rfc822 attachment (#1486487)
	foreach ($messages as $mimeid)
	if (strpos($part->mime_id, $mimeid.'.') === 0) {
	$skip = true;
	break;
	}
	}

	if (!$skip && ($attachment = rcmail_save_attachment($message, $pid))) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	if ($bodyIsHtml && ($part->content_id \|\| $part->content_location)) {
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
	if ($part->content_id)
	$cid_map['cid:'.$part->content_id] = $url;
	else
	$cid_map[$part->content_location] = $url;
	}
	}
	}
	}

	$COMPOSE['forward_attachments'] = true;

	return $cid_map;
	}


	function rcmail_write_inline_attachments(&$message)
	{
	global $RCMAIL, $COMPOSE;

	$cid_map = array();
	foreach ((array)$message->mime_parts as $pid => $part) {
	if (($part->content_id \|\| $part->content_location) && $part->filename) {
	if ($attachment = rcmail_save_attachment($message, $pid)) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
	if ($part->content_id)
	$cid_map['cid:'.$part->content_id] = $url;
	else
	$cid_map[$part->content_location] = $url;
	}
	}
	}

	return $cid_map;
	}

	// Creates an attachment from the forwarded message
	function rcmail_write_forward_attachment(&$message)
	{
	global $RCMAIL, $COMPOSE;

	if (strlen($message->subject)) {
	$name = mb_substr($message->subject, 0, 64) . '.eml';
	}
	else {
	$name = 'message_rfc822.eml';
	}

	$mem_limit = parse_bytes(ini_get('memory_limit'));
	$curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 1610241024; // safe value: 16MB
	$data = $path = null;

	// don't load too big attachments into memory
	if ($mem_limit > 0 && $message->size > $mem_limit - $curr_mem) {
	$temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
	$path = tempnam($temp_dir, 'rcmAttmnt');
	if ($fp = fopen($path, 'w')) {
	$RCMAIL->storage->get_raw_body($message->uid, $fp);
	fclose($fp);
	} else
	return false;
	} else {
	$data = $RCMAIL->storage->get_raw_body($message->uid);
	}

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => $name,
	'mimetype' => 'message/rfc822',
	'data' => $data,
	'path' => $path,
	'size' => $path ? filesize($path) : strlen($data),
	);

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

	if ($attachment['status']) {
	unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	return true;
	} else if ($path) {
	@unlink($path);
	}

	return false;
	}


	function rcmail_save_attachment(&$message, $pid)
	{
	global $COMPOSE;

	$rcmail = rcmail::get_instance();
	$part = $message->mime_parts[$pid];
	$mem_limit = parse_bytes(ini_get('memory_limit'));
	$curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 1610241024; // safe value: 16MB
	$data = $path = null;

	// don't load too big attachments into memory
	if ($mem_limit > 0 && $part->size > $mem_limit - $curr_mem) {
	$temp_dir = unslashify($rcmail->config->get('temp_dir'));
	$path = tempnam($temp_dir, 'rcmAttmnt');
	if ($fp = fopen($path, 'w')) {
	$message->get_part_content($pid, $fp);
	fclose($fp);
	} else
	return false;
	} else {
	$data = $message->get_part_content($pid);
	}

	$mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
	$filename = $part->filename;
	if (!strlen($filename)) {
	if ($mimetype == 'text/html') {
	$filename = rcube_label('htmlmessage');
	}
	else {
	$filename = 'Part_'.$pid;
	}
	$filename .= '.' . $part->ctype_secondary;
	}

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => $filename,
	'mimetype' => $mimetype,
	'content_id' => $part->content_id,
	'data' => $data,
	'path' => $path,
	'size' => $path ? filesize($path) : strlen($data),
	);

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

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

	return false;
	}

	function rcmail_save_image($path, $mimetype='')
	{
	global $COMPOSE;

	// handle attachments in memory
	$data = file_get_contents($path);

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => rcmail_basename($path),
	'mimetype' => $mimetype ? $mimetype : rc_mime_content_type($path, $name),
	'data' => $data,
	'size' => strlen($data),
	);

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

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

	return false;
	}

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

	function rcmail_compose_subject($attrib)
	{
	global $MESSAGE, $COMPOSE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_subject';
	$attrib['spellcheck'] = 'true';
	$textfield = new html_inputfield($attrib);

	$subject = '';

	// use subject from post
	if (isset($_POST['_subject'])) {
	$subject = get_input_value('_subject', RCUBE_INPUT_POST, TRUE);
	}
	// create a reply-subject
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	if (preg_match('/^re:/i', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Re: '.$MESSAGE->subject;
	}
	// create a forward-subject
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
	if (preg_match('/^fwd:/i', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Fwd: '.$MESSAGE->subject;
	}
	// creeate a draft-subject
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT) {
	$subject = $MESSAGE->subject;
	}
	else if (!empty($COMPOSE['param']['subject'])) {
	$subject = $COMPOSE['param']['subject'];
	}

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

	return $out;
	}


	function rcmail_compose_attachment_list($attrib)
	{
	global $OUTPUT, $CONFIG, $COMPOSE;

	// add ID if not given
	if (!$attrib['id'])
	$attrib['id'] = 'rcmAttachmentList';

	$out = "\n";
	$jslist = array();

	if (is_array($COMPOSE['attachments'])) {
	if ($attrib['deleteicon']) {
	$button = html::img(array(
	'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
	'alt' => rcube_label('delete')
	));
	}
	else
	$button = Q(rcube_label('delete'));

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

	$out .= html::tag('li', array('id' => 'rcmfile'.$id, 'class' => rcmail_filetype2classname($a_prop['mimetype'], $a_prop['name'])),
	html::a(array(
	'href' => "#delete",
	'title' => rcube_label('delete'),
	'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id),
	'class' => 'delete'),
	$button) . Q($a_prop['name']));

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

	if ($attrib['deleteicon'])
	$COMPOSE['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
	if ($attrib['cancelicon'])
	$OUTPUT->set_env('cancelicon', $CONFIG['skin_path'] . $attrib['cancelicon']);
	if ($attrib['loadingicon'])
	$OUTPUT->set_env('loadingicon', $CONFIG['skin_path'] . $attrib['loadingicon']);

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

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


	function rcmail_compose_attachment_form($attrib)
	{
	global $OUTPUT;

	// set defaults
	$attrib += array('id' => 'rcmUploadbox', 'buttons' => 'yes');

	// Get filesize, enable upload progress bar
	$max_filesize = rcube_upload_init();

	$button = new html_inputfield(array('type' => 'button'));

	$out = html::div($attrib,
	$OUTPUT->form_tag(array('id' => $attrib['id'].'Frm', 'name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
	html::div(null, rcmail_compose_attachment_field(array('size' => $attrib['attachmentfieldsize']))) .
	html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
	(get_boolean($attrib['buttons']) ? html::div('buttons',
	$button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
	$button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
	) : '')
	)
	);

	$OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');
	return $out;
	}


	function rcmail_compose_attachment_field($attrib)
	{
	$attrib['type'] = 'file';
	$attrib['name'] = '_attachments[]';
	$attrib['multiple'] = 'multiple';

	$field = new html_inputfield($attrib);
	return $field->show();
	}


	function rcmail_priority_selector($attrib)
	{
	global $MESSAGE;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_priority';
	$selector = new html_select($attrib);

	$selector->add(array(rcube_label('lowest'),
	rcube_label('low'),
	rcube_label('normal'),
	rcube_label('high'),
	rcube_label('highest')),
	array(5, 4, 0, 2, 1));

	if (isset($_POST['_priority']))
	$sel = $_POST['_priority'];
	else if (intval($MESSAGE->headers->priority) != 3)
	$sel = intval($MESSAGE->headers->priority);
	else
	$sel = 0;

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

	return $out;
	}


	function rcmail_receipt_checkbox($attrib)
	{
	global $RCMAIL, $MESSAGE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

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

	$attrib['name'] = '_receipt';
	$attrib['value'] = '1';
	$checkbox = new html_checkbox($attrib);

	if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
	$mdn_default = (bool) $MESSAGE->headers->mdn_to;
	else
	$mdn_default = $RCMAIL->config->get('mdn_default');

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

	return $out;
	}


	function rcmail_dsn_checkbox($attrib)
	{
	global $RCMAIL;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

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

	$attrib['name'] = '_dsn';
	$attrib['value'] = '1';
	$checkbox = new html_checkbox($attrib);

	$out = $form_start ? "$form_start\n" : '';
	$out .= $checkbox->show($RCMAIL->config->get('dsn_default'));
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_editor_selector($attrib)
	{
	// determine whether HTML or plain text should be checked
	$useHtml = rcmail_compose_editor_mode();

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

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

	$attrib['onchange'] = "return rcmail_toggle_editor(this, '".$attrib['editorid']."', '_is_html')";

	$select = new html_select($attrib);

	$select->add(Q(rcube_label('htmltoggle')), 'html');
	$select->add(Q(rcube_label('plaintoggle')), 'plain');

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

	foreach ($choices as $value => $text) {
	$attrib['id'] = '_' . $value;
	$attrib['value'] = $value;
	$selector .= $radio->show($chosenvalue, $attrib) . html::label($attrib['id'], Q(rcube_label($text)));
	}

	return $selector;
	}


	function rcmail_store_target_selection($attrib)
	{
	global $COMPOSE;

	$attrib['name'] = '_store_target';
	$select = rcmail_mailbox_select(array_merge($attrib, array(
	'noselection' => '- '.rcube_label('dontsave').' -',
	'folder_filter' => 'mail',
	'folder_rights' => 'w',
	)));
	return $select->show($COMPOSE['param']['sent_mbox'], $attrib);
	}


	function rcmail_check_sent_folder($folder, $create=false)
	{
	global $RCMAIL;

	if ($RCMAIL->storage->folder_exists($folder, true)) {
	return true;
	}

	// folder may exist but isn't subscribed (#1485241)
	if ($create) {
	if (!$RCMAIL->storage->folder_exists($folder))
	return $RCMAIL->storage->create_folder($folder, true);
	else
	return $RCMAIL->storage->subscribe($folder);
	}

	return false;
	}


	function get_form_tags($attrib)
	{
	global $RCMAIL, $MESSAGE_FORM, $COMPOSE;

	$form_start = '';
	if (!$MESSAGE_FORM)
	{
	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
	$hiddenfields->add(array('name' => '_action', 'value' => 'send'));
	$hiddenfields->add(array('name' => '_id', 'value' => $COMPOSE['id']));
	$hiddenfields->add(array('name' => '_attachments'));

	$form_start = empty($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
	$form_start .= $hiddenfields->show();
	}

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

	if (!$MESSAGE_FORM)
	$RCMAIL->output->add_gui_object('messageform', $form_name);

	$MESSAGE_FORM = $form_name;

	return array($form_start, $form_end);
	}


	function rcmail_addressbook_list($attrib = array())
	{
	global $RCMAIL, $OUTPUT;

	$attrib += array('id' => 'rcmdirectorylist');

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

	foreach ($RCMAIL->get_address_sources() as $j => $source) {
	$id = strval(strlen($source['id']) ? $source['id'] : $j);
	$js_id = JQ($id);

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

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

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

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

	// return the contacts list as HTML table
	function rcmail_contacts_list($attrib = array())
	{
	global $OUTPUT;

	$attrib += array('id' => 'rcmAddressList');

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

	return rcube_table_output($attrib, array(), array('name'), 'ID');
	}


	/**
	* Register a certain container as active area to drop files onto
	*/
	function compose_file_drop_area($attrib)
	{
	global $OUTPUT;

	if ($attrib['id']) {
	$OUTPUT->add_gui_object('filedrop', $attrib['id']);
	$OUTPUT->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
	}
	}


	// register UI objects
	$OUTPUT->add_handlers(array(
	'composeheaders' => 'rcmail_compose_headers',
	'composesubject' => 'rcmail_compose_subject',
	'composebody' => 'rcmail_compose_body',
	'composeattachmentlist' => 'rcmail_compose_attachment_list',
	'composeattachmentform' => 'rcmail_compose_attachment_form',
	'composeattachment' => 'rcmail_compose_attachment_field',
	'filedroparea' => 'compose_file_drop_area',
	'priorityselector' => 'rcmail_priority_selector',
	'editorselector' => 'rcmail_editor_selector',
	'receiptcheckbox' => 'rcmail_receipt_checkbox',
	'dsncheckbox' => 'rcmail_dsn_checkbox',
	'storetarget' => 'rcmail_store_target_selection',
	'addressbooks' => 'rcmail_addressbook_list',
	'addresslist' => 'rcmail_contacts_list',
	));

	$OUTPUT->send('compose');
	diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
	index 3f5ef5390..6d548ef36 100644
	--- a/program/steps/settings/func.inc
	+++ b/program/steps/settings/func.inc
	@@ -1,971 +1,972 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Provide functionality for user's settings & preferences \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	if (!$OUTPUT->ajax_call)
	$OUTPUT->set_pagetitle(rcube_label('preferences'));


	// similar function as /steps/settings/identities.inc::rcmail_identity_frame()
	function rcmail_preferences_frame($attrib)
	{
	global $OUTPUT;

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

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

	$OUTPUT->set_env('contentframe', $attrib['name']);
	$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');

	return html::iframe($attrib);
	}


	function rcmail_sections_list($attrib)
	{
	global $RCMAIL;

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

	list($list, $cols) = rcmail_user_prefs();

	// create XHTML table
	$out = rcube_table_output($attrib, $list, $cols, 'id');

	// set client env
	$RCMAIL->output->add_gui_object('sectionslist', $attrib['id']);
	$RCMAIL->output->include_script('list.js');

	return $out;
	}


	function rcmail_identities_list($attrib)
	{
	global $OUTPUT, $RCMAIL;

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

	// get identities list and define 'mail' column
	$list = $RCMAIL->user->list_identities();
	foreach ($list as $idx => $row)
	$list[$idx]['mail'] = trim($row['name'] . ' <' . rcube_idn_to_utf8($row['email']) .'>');

	// get all identites from DB and define list of cols to be displayed
	$plugin = $RCMAIL->plugins->exec_hook('identities_list', array(
	'list' => $list,
	'cols' => array('mail')));

	// @TODO: use <UL> instead of <TABLE> for identities list
	// create XHTML table
	$out = rcube_table_output($attrib, $plugin['list'], $plugin['cols'], 'identity_id');

	// set client env
	$OUTPUT->add_gui_object('identitieslist', $attrib['id']);

	return $out;
	}


	// similar function as in /steps/addressbook/edit.inc
	function get_form_tags($attrib, $action, $id = null, $hidden = null)
	{
	global $EDIT_FORM, $RCMAIL;

	$form_start = $form_end = '';

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

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

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

	$EDIT_FORM = !empty($attrib['form']) ? $attrib['form'] : 'form';
	$RCMAIL->output->add_gui_object('editform', $EDIT_FORM);
	}

	return array($form_start, $form_end);
	}


	function rcmail_user_prefs($current=null)
	{
	global $RCMAIL;

	$sections['general'] = array('id' => 'general', 'section' => rcube_label('uisettings'));
	$sections['mailbox'] = array('id' => 'mailbox', 'section' => rcube_label('mailboxview'));
	$sections['compose'] = array('id' => 'compose', 'section' => rcube_label('messagescomposition'));
	$sections['mailview'] = array('id' => 'mailview','section' => rcube_label('messagesdisplaying'));
	$sections['addressbook'] = array('id' => 'addressbook','section' => rcube_label('addressbook'));
	$sections['folders'] = array('id' => 'folders', 'section' => rcube_label('specialfolders'));
	$sections['server'] = array('id' => 'server', 'section' => rcube_label('serversettings'));

	// hook + define list cols
	$plugin = $RCMAIL->plugins->exec_hook('preferences_sections_list',
	array('list' => $sections, 'cols' => array('section')));

	$sections = $plugin['list'];

	$config = $RCMAIL->config->all();
	$no_override = array_flip($RCMAIL->config->get('dont_override', array()));

	foreach ($sections as $idx => $sect) {

	if ($current && $sect['id'] != $current)
	continue;

	$blocks = array();

	switch ($sect['id']) {
	// general
	case 'general':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'browser' => array('name' => Q(rcube_label('browseroptions'))),
	);

	// language selection
	if (!isset($no_override['language'])) {
	$a_lang = $RCMAIL->list_languages();
	asort($a_lang);

	$field_id = 'rcmfd_lang';
	$select_lang = new html_select(array('name' => '_language', 'id' => $field_id));
	$select_lang->add(array_values($a_lang), array_keys($a_lang));

	$blocks['main']['options']['language'] = array(
	'title' => html::label($field_id, Q(rcube_label('language'))),
	'content' => $select_lang->show($RCMAIL->user->language),
	);
	}

	// timezone selection
	if (!isset($no_override['timezone'])) {
	$field_id = 'rcmfd_timezone';
	$select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id));
	$select_timezone->add(rcube_label('autodetect'), 'auto');

	$zones = array();
	foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
	try {
	$tz = new DateTimeZone($tzs);
	$date = new DateTime('2012-12-21', $tz);
	$offset = $date->format('Z') + 45000;
	$sortkey = sprintf('%06d.%s', $offset, $tzs);
	$zones[$sortkey] = array($tzs, $date->format('P'));
	}
	catch (Exception $e) {}
	}

	ksort($zones);
	foreach ($zones as $zone) {
	list($tzs, $offset) = $zone;
	$select_timezone->add('(GMT ' . $offset . ') ' . strtr($tzs, '_', ' '), $tzs);
	}

	if (is_numeric($config['timezone']))
	timezone_name_from_abbr("", $config['timezone'] * 3600, 0);

	$blocks['main']['options']['timezone'] = array(
	'title' => html::label($field_id, Q(rcube_label('timezone'))),
	'content' => $select_timezone->show((string)$config['timezone']),
	);
	}

	// date/time formatting
	if (!isset($no_override['time_format'])) {
	$reftime = mktime(7,30,0);
	$field_id = 'rcmfd_time_format';
	$select_time = new html_select(array('name' => '_time_format', 'id' => $field_id));
	foreach ((array)$RCMAIL->config->get('time_formats', array('G:i', 'H:i', 'g:i a', 'h:i A')) as $choice)
	$select_time->add(date($choice, $reftime), $choice);

	$blocks['main']['options']['time_format'] = array(
	'title' => html::label($field_id, Q(rcube_label('timeformat'))),
	'content' => $select_time->show($RCMAIL->config->get('time_format')),
	);
	}

	if (!isset($no_override['date_format'])) {
	$refdate = mktime(12,30,0,7,24);
	$field_id = 'rcmfd_date_format';
	$select_date = new html_select(array('name' => '_date_format', 'id' => $field_id));
	foreach ((array)$RCMAIL->config->get('date_formats', array('Y-m-d','d-m-Y','Y/m/d','m/d/Y','d/m/Y','d.m.Y','j.n.Y')) as $choice)
	$select_date->add(date($choice, $refdate), $choice);

	$blocks['main']['options']['date_format'] = array(
	'title' => html::label($field_id, Q(rcube_label('dateformat'))),
	'content' => $select_date->show($config['date_format']),
	);
	}

	// MM: Show checkbox for toggling 'pretty dates'
	if (!isset($no_override['prettydate'])) {
	$field_id = 'rcmfd_prettydate';
	$input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['prettydate'] = array(
	'title' => html::label($field_id, Q(rcube_label('prettydate'))),
	'content' => $input_prettydate->show($config['prettydate']?1:0),
	);
	}

	// show drop-down for available skins
	if (!isset($no_override['skin'])) {
	$skins = rcmail_get_skins();

	if (count($skins) > 1) {
	$field_id = 'rcmfd_skin';
	$input_skin = new html_select(array('name'=>'_skin', 'id'=>$field_id));

	foreach($skins as $skin)
	$input_skin->add($skin, $skin);

	$blocks['main']['options']['skin'] = array(
	'title' => html::label($field_id, Q(rcube_label('skin'))),
	'content' => $input_skin->show($config['skin']),
	);
	}
	}

	$product_name = $RCMAIL->config->get('product_name', 'Roundcube Webmail');
	$RCMAIL->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');",
	JS_OBJECT_NAME, JQ($product_name)), 'foot');

	$blocks['browser']['options']['mailtoprotohandler'] = array(
	'content' => html::a(array(
	'href' => '#',
	'id' => 'mailtoprotohandler'), Q(rcube_label('mailtoprotohandler'))),
	);

	break;

	// Mailbox view (mail screen)
	case 'mailbox':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'new_message' => array('name' => Q(rcube_label('newmessage'))),
	);

	// show config parameter for preview pane
	if (!isset($no_override['preview_pane'])) {
	$field_id = 'rcmfd_preview';
	$input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1,
	'onchange' => "$('#rcmfd_preview_pane_mark_read').prop('disabled', !this.checked)"));

	$blocks['main']['options']['preview_pane'] = array(
	'title' => html::label($field_id, Q(rcube_label('previewpane'))),
	'content' => $input_preview->show($config['preview_pane']?1:0),
	);
	}

	// show config parameter for preview pane auto mark as read delay
	if (!isset($no_override['preview_pane_mark_read'])) {
	// apply default if config option is not set at all
	$config['preview_pane_mark_read'] = $RCMAIL->config->get('preview_pane_mark_read', 0);

	$field_id = 'rcmfd_preview_pane_mark_read';
	$select_delay = new html_select(array('name' => '_preview_pane_mark_read', 'id' => $field_id,
	'disabled' => $config['preview_pane']?0:1));

	$select_delay->add(rcube_label('never'), '-1');
	$select_delay->add(rcube_label('immediately'), 0);
	foreach(array(5, 10, 20, 30) as $sec)
	$select_delay->add(rcube_label(array('name' => 'afternseconds', 'vars' => array('n' => $sec))), $sec);

	$blocks['main']['options']['preview_pane_mark_read'] = array(
	'title' => html::label($field_id, Q(rcube_label('previewpanemarkread'))),
	'content' => $select_delay->show(intval($config['preview_pane_mark_read'])),
	);
	}

	if (!isset($no_override['mdn_requests'])) {
	$field_id = 'rcmfd_mdn_requests';
	$select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
	$select_mdn_requests->add(rcube_label('askuser'), 0);
	$select_mdn_requests->add(rcube_label('autosend'), 1);
	$select_mdn_requests->add(rcube_label('autosendknown'), 3);
	$select_mdn_requests->add(rcube_label('autosendknownignore'), 4);
	$select_mdn_requests->add(rcube_label('ignore'), 2);

	$blocks['main']['options']['mdn_requests'] = array(
	'title' => html::label($field_id, Q(rcube_label('mdnrequests'))),
	'content' => $select_mdn_requests->show($config['mdn_requests']),
	);
	}

	$storage = $RCMAIL->get_storage();
	$threading_supported = $storage->get_capability('THREAD');

	if (!isset($no_override['autoexpand_threads']) && $threading_supported) {
	$field_id = 'rcmfd_autoexpand_threads';
	$select_autoexpand_threads = new html_select(array('name' => '_autoexpand_threads', 'id' => $field_id));
	$select_autoexpand_threads->add(rcube_label('never'), 0);
	$select_autoexpand_threads->add(rcube_label('do_expand'), 1);
	$select_autoexpand_threads->add(rcube_label('expand_only_unread'), 2);

	$blocks['main']['options']['autoexpand_threads'] = array(
	'title' => html::label($field_id, Q(rcube_label('autoexpand_threads'))),
	'content' => $select_autoexpand_threads->show($config['autoexpand_threads']),
	);
	}

	// show page size selection
	if (!isset($no_override['mail_pagesize'])) {
	$field_id = 'rcmfd_mail_pagesize';
	$input_pagesize = new html_inputfield(array('name' => '_mail_pagesize', 'id' => $field_id, 'size' => 5));

	$size = intval($config['mail_pagesize'] ? $config['mail_pagesize'] : $config['pagesize']);

	$blocks['main']['options']['pagesize'] = array(
	'title' => html::label($field_id, Q(rcube_label('pagesize'))),
	'content' => $input_pagesize->show($size ? $size : 50),
	);
	}

	if (!isset($no_override['keep_alive'])) {
	$field_id = 'rcmfd_keep_alive';
	$select_keep_alive = new html_select(array('name' => '_keep_alive', 'id' => $field_id));

	foreach(array(1, 3, 5, 10, 15, 30, 60) as $min)
	if((!$config['min_keep_alive'] \|\| $config['min_keep_alive'] <= $min * 60)
	&& (!$config['session_lifetime'] \|\| $config['session_lifetime'] > $min)) {
	$select_keep_alive->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min);
	}

	$blocks['new_message']['options']['keep_alive'] = array(
	'title' => html::label($field_id, Q(rcube_label('keepalive'))),
	'content' => $select_keep_alive->show($config['keep_alive']/60),
	);
	}

	if (!isset($no_override['check_all_folders'])) {
	$field_id = 'rcmfd_check_all_folders';
	$input_check_all = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));

	$blocks['new_message']['options']['check_all_folders'] = array(
	'title' => html::label($field_id, Q(rcube_label('checkallfolders'))),
	'content' => $input_check_all->show($config['check_all_folders']?1:0),
	);
	}

	break;

	// Message viewing
	case 'mailview':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	);

	// show checkbox for HTML/plaintext messages
	if (!isset($no_override['prefer_html'])) {
	$field_id = 'rcmfd_htmlmsg';
	$input_preferhtml = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
	'onchange' => "$('#rcmfd_show_images').prop('disabled', !this.checked).val(0)"));

	$blocks['main']['options']['prefer_html'] = array(
	'title' => html::label($field_id, Q(rcube_label('preferhtml'))),
	'content' => $input_preferhtml->show($config['prefer_html']?1:0),
	);
	}

	if (!isset($no_override['default_charset'])) {
	$field_id = 'rcmfd_default_charset';

	$blocks['main']['options']['default_charset'] = array(
	'title' => html::label($field_id, Q(rcube_label('defaultcharset'))),
	'content' => $RCMAIL->output->charset_selector(array(
	'name' => '_default_charset', 'selected' => $config['default_charset']
	))
	);
	}

	if (!isset($no_override['show_images'])) {
	$field_id = 'rcmfd_show_images';
	$input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id,
	'disabled' => !$config['prefer_html']));
	$input_show_images->add(rcube_label('never'), 0);
	$input_show_images->add(rcube_label('fromknownsenders'), 1);
	$input_show_images->add(rcube_label('always'), 2);

	$blocks['main']['options']['show_images'] = array(
	'title' => html::label($field_id, Q(rcube_label('showremoteimages'))),
	'content' => $input_show_images->show($config['prefer_html'] ? $config['show_images'] : 0),
	);
	}

	if (!isset($no_override['inline_images'])) {
	$field_id = 'rcmfd_inline_images';
	$input_inline_images = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['inline_images'] = array(
	'title' => html::label($field_id, Q(rcube_label('showinlineimages'))),
	'content' => $input_inline_images->show($config['inline_images']?1:0),
	);
	}

	// "display after delete" checkbox
	if (!isset($no_override['display_next'])) {
	$field_id = 'rcmfd_displaynext';
	$input_displaynext = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['display_next'] = array(
	'title' => html::label($field_id, Q(rcube_label('displaynext'))),
	'content' => $input_displaynext->show($config['display_next']?1:0),
	);
	}

	break;

	// Mail composition
	case 'compose':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))),
	'sig' => array('name' => Q(rcube_label('signatureoptions'))),
	);

	if (!isset($no_override['htmleditor'])) {
	$field_id = 'rcmfd_htmleditor';
	$select_htmleditor = new html_select(array('name' => '_htmleditor', 'id' => $field_id));
	$select_htmleditor->add(rcube_label('never'), 0);
	$select_htmleditor->add(rcube_label('always'), 1);
	$select_htmleditor->add(rcube_label('htmlonreply'), 2);

	$blocks['main']['options']['htmleditor'] = array(
	'title' => html::label($field_id, Q(rcube_label('htmleditor'))),
	'content' => $select_htmleditor->show(intval($config['htmleditor'])),
	);
	}

	if (!isset($no_override['draft_autosave'])) {
	$field_id = 'rcmfd_autosave';
	$select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));
	$select_autosave->add(rcube_label('never'), 0);
	foreach (array(1, 3, 5, 10) as $i => $min)
	$select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60);

	$blocks['main']['options']['draft_autosave'] = array(
	'title' => html::label($field_id, Q(rcube_label('autosavedraft'))),
	'content' => $select_autosave->show($config['draft_autosave']),
	);
	}

	if (!isset($no_override['mime_param_folding'])) {
	$field_id = 'rcmfd_param_folding';
	$select_param_folding = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));
	$select_param_folding->add(rcube_label('2231folding'), 0);
	$select_param_folding->add(rcube_label('miscfolding'), 1);
	$select_param_folding->add(rcube_label('2047folding'), 2);

	$blocks['main']['options']['mime_param_folding'] = array(
	'advanced' => true,
	'title' => html::label($field_id, Q(rcube_label('mimeparamfolding'))),
	'content' => $select_param_folding->show($config['mime_param_folding']),
	);
	}

	if (!isset($no_override['force_7bit'])) {
	$field_id = 'rcmfd_force_7bit';
	$input_7bit = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['force_7bit'] = array(
	'title' => html::label($field_id, Q(rcube_label('force7bit'))),
	'content' => $input_7bit->show($config['force_7bit']?1:0),
	);
	}

	if (!isset($no_override['mdn_default'])) {
	$field_id = 'rcmfd_mdn_default';
	$input_mdn = new html_checkbox(array('name' => '_mdn_default', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['mdn_default'] = array(
	'title' => html::label($field_id, Q(rcube_label('reqmdn'))),
	'content' => $input_mdn->show($config['mdn_default']?1:0),
	);
	}

	if (!isset($no_override['dsn_default'])) {
	$field_id = 'rcmfd_dsn_default';
	$input_dsn = new html_checkbox(array('name' => '_dsn_default', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['dsn_default'] = array(
	'title' => html::label($field_id, Q(rcube_label('reqdsn'))),
	'content' => $input_dsn->show($config['dsn_default']?1:0),
	);
	}

	if (!isset($no_override['reply_same_folder'])) {
	$field_id = 'rcmfd_reply_same_folder';
	$input_reply_same_folder = new html_checkbox(array('name' => '_reply_same_folder', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['reply_same_folder'] = array(
	'title' => html::label($field_id, Q(rcube_label('replysamefolder'))),
	'content' => $input_reply_same_folder->show($config['reply_same_folder']?1:0),
	);
	}

	- if (!isset($no_override['top_posting'])) {
	- $field_id = 'rcmfd_top_posting';
	- $select_replymode = new html_select(array('name' => '_top_posting', 'id' => $field_id,
	- 'onchange' => "\$('#rcmfd_sig_above').attr('disabled',this.selectedIndex==0)"));
	+ if (!isset($no_override['reply_mode'])) {
	+ $field_id = 'rcmfd_reply_mode';
	+ $select_replymode = new html_select(array('name' => '_reply_mode', 'id' => $field_id,
	+ 'onchange' => "\$('#rcmfd_sig_above').attr('disabled',this.selectedIndex<2)"));
	+ $select_replymode->add(rcube_label('replyempty'), -1);
	$select_replymode->add(rcube_label('replybottomposting'), 0);
	$select_replymode->add(rcube_label('replytopposting'), 1);

	- $blocks['main']['options']['top_posting'] = array(
	+ $blocks['main']['options']['reply_mode'] = array(
	'title' => html::label($field_id, Q(rcube_label('whenreplying'))),
	- 'content' => $select_replymode->show($config['top_posting']?1:0),
	+ 'content' => $select_replymode->show(intval($config['reply_mode'])),
	);
	}

	if (!isset($no_override['spellcheck_before_send']) && $config['enable_spellcheck']) {
	$field_id = 'rcmfd_spellcheck_before_send';
	$input_spellcheck = new html_checkbox(array('name' => '_spellcheck_before_send', 'id' => $field_id, 'value' => 1));

	$blocks['spellcheck']['options']['spellcheck_before_send'] = array(
	'title' => html::label($field_id, Q(rcube_label('spellcheckbeforesend'))),
	'content' => $input_spellcheck->show($config['spellcheck_before_send']?1:0),
	);
	}

	if ($config['enable_spellcheck']) {
	foreach (array('syms', 'nums', 'caps') as $key) {
	$key = 'spellcheck_ignore_'.$key;
	if (!isset($no_override[$key])) {
	$input_spellcheck = new html_checkbox(array('name' => '_'.$key, 'id' => 'rcmfd_'.$key, 'value' => 1));

	$blocks['spellcheck']['options'][$key] = array(
	'title' => html::label($field_id, Q(rcube_label(str_replace('_', '', $key)))),
	'content' => $input_spellcheck->show($config[$key]?1:0),
	);
	}
	}
	}

	if (!isset($no_override['show_sig'])) {
	$field_id = 'rcmfd_show_sig';
	$select_show_sig = new html_select(array('name' => '_show_sig', 'id' => $field_id));
	$select_show_sig->add(rcube_label('never'), 0);
	$select_show_sig->add(rcube_label('always'), 1);
	$select_show_sig->add(rcube_label('newmessageonly'), 2);
	$select_show_sig->add(rcube_label('replyandforwardonly'), 3);

	$blocks['sig']['options']['show_sig'] = array(
	'title' => html::label($field_id, Q(rcube_label('autoaddsignature'))),
	'content' => $select_show_sig->show($RCMAIL->config->get('show_sig', 1)),
	);
	}

	if (!isset($no_override['sig_above'])) {
	$field_id = 'rcmfd_sig_above';
	- $select_sigabove = new html_select(array('name' => '_sig_above', 'id' => $field_id, 'disabled' => !$config['top_posting']));
	+ $select_sigabove = new html_select(array('name' => '_sig_above', 'id' => $field_id, 'disabled' => $config['reply_mode'] < 1));
	$select_sigabove->add(rcube_label('belowquote'), 0);
	$select_sigabove->add(rcube_label('abovequote'), 1);

	$blocks['sig']['options']['sig_above'] = array(
	'title' => html::label($field_id, Q(rcube_label('replysignaturepos'))),
	'content' => $select_sigabove->show($config['sig_above']?1:0),
	);
	}

	if (!isset($no_override['strip_existing_sig'])) {
	$field_id = 'rcmfd_strip_existing_sig';
	$input_stripexistingsig = new html_checkbox(array('name' => '_strip_existing_sig', 'id' => $field_id, 'value' => 1));

	$blocks['sig']['options']['strip_existing_sig'] = array(
	'title' => html::label($field_id, Q(rcube_label('replyremovesignature'))),
	'content' => $input_stripexistingsig->show($config['strip_existing_sig']?1:0),
	);
	}

	if (!isset($no_override['forward_attachment'])) {
	$field_id = 'rcmfd_forward_attachment';
	$select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id));
	$select->add(rcube_label('inline'), 0);
	$select->add(rcube_label('asattachment'), 1);

	$blocks['main']['options']['forward_attachment'] = array(
	'title' => html::label($field_id, Q(rcube_label('forwardmode'))),
	'content' => $select->show(intval($config['forward_attachment'])),
	);
	}

	if (!isset($no_override['default_font'])) {
	$field_id = 'rcmfd_default_font';
	$fonts = rcube_fontdefs();
	$default_font = $config['default_font'] ? $config['default_font'] : 'Verdana';

	$select = '<select name="_default_font" id="'.$field_id.'">';
	foreach ($fonts as $fname => $font)
	$select .= '<option value="'.$fname.'"'
	. ($fname == $default_font ? ' selected="selected"' : '')
	. ' style=\'font-family: ' . $font . '\'>'
	. Q($fname) . '</option>';
	$select .= '</select>';

	$blocks['main']['options']['default_font'] = array(
	'title' => html::label($field_id, Q(rcube_label('defaultfont'))),
	'content' => $select
	);
	}

	break;


	// Addressbook config
	case 'addressbook':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	);

	if (!isset($no_override['default_addressbook'])
	&& ($books = $RCMAIL->get_address_sources(true))
	) {
	$field_id = 'rcmfd_default_addressbook';
	$select_abook = new html_select(array('name' => '_default_addressbook', 'id' => $field_id));

	foreach ($books as $book) {
	$select_abook->add($book['name'], $book['id']);
	}

	$blocks['main']['options']['default_addressbook'] = array(
	'title' => html::label($field_id, Q(rcube_label('defaultaddressbook'))),
	'content' => $select_abook->show($config['default_addressbook']),
	);
	}

	// show addressbook listing mode selection
	if (!isset($no_override['addressbook_name_listing'])) {
	$field_id = 'rcmfd_addressbook_name_listing';
	$select_listing = new html_select(array('name' => '_addressbook_name_listing', 'id' => $field_id));
	$select_listing->add(rcube_label('name'), 0);
	$select_listing->add(rcube_label('firstname') . ' ' . rcube_label('surname'), 1);
	$select_listing->add(rcube_label('surname') . ' ' . rcube_label('firstname'), 2);
	$select_listing->add(rcube_label('surname') . ', ' . rcube_label('firstname'), 3);

	$blocks['main']['options']['list_name_listing'] = array(
	'title' => html::label($field_id, Q(rcube_label('listnamedisplay'))),
	'content' => $select_listing->show($config['addressbook_name_listing']),
	);
	}

	// show addressbook sort column
	if (!isset($no_override['addressbook_sort_col'])) {
	$field_id = 'rcmfd_addressbook_sort_col';
	$select_sort = new html_select(array('name' => '_addressbook_sort_col', 'id' => $field_id));
	$select_sort->add(rcube_label('name'), 'name');
	$select_sort->add(rcube_label('firstname'), 'firstname');
	$select_sort->add(rcube_label('surname'), 'surname');

	$blocks['main']['options']['sort_col'] = array(
	'title' => html::label($field_id, Q(rcube_label('listsorting'))),
	'content' => $select_sort->show($config['addressbook_sort_col']),
	);
	}

	// show addressbook page size selection
	if (!isset($no_override['addressbook_pagesize'])) {
	$field_id = 'rcmfd_addressbook_pagesize';
	$input_pagesize = new html_inputfield(array('name' => '_addressbook_pagesize', 'id' => $field_id, 'size' => 5));

	$size = intval($config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize']);

	$blocks['main']['options']['pagesize'] = array(
	'title' => html::label($field_id, Q(rcube_label('pagesize'))),
	'content' => $input_pagesize->show($size ? $size : 50),
	);
	}

	if (!isset($no_override['autocomplete_single'])) {
	$field_id = 'rcmfd_autocomplete_single';
	$checkbox = new html_checkbox(array('name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['autocomplete_single'] = array(
	'title' => html::label($field_id, Q(rcube_label('autocompletesingle'))),
	'content' => $checkbox->show($config['autocomplete_single']?1:0),
	);
	}

	break;

	// Special IMAP folders
	case 'folders':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	);

	// Configure special folders
	if (!isset($no_override['default_folders'])) {
	// load folders list only when needed
	if ($current) {
	$select = rcmail_mailbox_select(array(
	'noselection' => '---',
	'realnames' => true,
	'maxlength' => 30,
	'folder_filter' => 'mail',
	'folder_rights' => 'w',
	// #1486114, #1488279
	'onchange' => "if ($(this).val() == 'INBOX') $(this).val('')",
	));
	}
	else // dummy select
	$select = new html_select();

	if (!isset($no_override['drafts_mbox']))
	$blocks['main']['options']['drafts_mbox'] = array(
	'title' => Q(rcube_label('drafts')),
	'content' => $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox")),
	);

	if (!isset($no_override['sent_mbox']))
	$blocks['main']['options']['sent_mbox'] = array(
	'title' => Q(rcube_label('sent')),
	'content' => $select->show($config['sent_mbox'], array('name' => "_sent_mbox")),
	);

	if (!isset($no_override['junk_mbox']))
	$blocks['main']['options']['junk_mbox'] = array(
	'title' => Q(rcube_label('junk')),
	'content' => $select->show($config['junk_mbox'], array('name' => "_junk_mbox")),
	);

	if (!isset($no_override['trash_mbox']))
	$blocks['main']['options']['trash_mbox'] = array(
	'title' => Q(rcube_label('trash')),
	'content' => $select->show($config['trash_mbox'], array('name' => "_trash_mbox")),
	);
	}

	break;

	// Server settings
	case 'server':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'maintenance' => array('name' => Q(rcube_label('maintenance'))),
	);

	if (!isset($no_override['read_when_deleted'])) {
	$field_id = 'rcmfd_read_deleted';
	$input_readdeleted = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['read_when_deleted'] = array(
	'title' => html::label($field_id, Q(rcube_label('readwhendeleted'))),
	'content' => $input_readdeleted->show($config['read_when_deleted']?1:0),
	);
	}

	if (!isset($no_override['flag_for_deletion'])) {
	$field_id = 'rcmfd_flag_for_deletion';
	$input_flagfordeletion = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['flag_for_deletion'] = array(
	'title' => html::label($field_id, Q(rcube_label('flagfordeletion'))),
	'content' => $input_flagfordeletion->show($config['flag_for_deletion']?1:0),
	);
	}

	// don't show deleted messages
	if (!isset($no_override['skip_deleted'])) {
	$field_id = 'rcmfd_skip_deleted';
	$input_purge = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['skip_deleted'] = array(
	'title' => html::label($field_id, Q(rcube_label('skipdeleted'))),
	'content' => $input_purge->show($config['skip_deleted']?1:0),
	);
	}

	if (!isset($no_override['delete_always'])) {
	$field_id = 'rcmfd_delete_always';
	$input_delete_always = new html_checkbox(array('name' => '_delete_always', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['delete_always'] = array(
	'title' => html::label($field_id, Q(rcube_label('deletealways'))),
	'content' => $input_delete_always->show($config['delete_always']?1:0),
	);
	}

	if (!isset($no_override['delete_junk'])) {
	$field_id = 'rcmfd_delete_junk';
	$input_delete_junk = new html_checkbox(array('name' => '_delete_junk', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['delete_junk'] = array(
	'title' => html::label($field_id, Q(rcube_label('deletejunk'))),
	'content' => $input_delete_junk->show($config['delete_junk']?1:0),
	);
	}

	// Trash purging on logout
	if (!isset($no_override['logout_purge'])) {
	$field_id = 'rcmfd_logout_purge';
	$input_purge = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));

	$blocks['maintenance']['options']['logout_purge'] = array(
	'title' => html::label($field_id, Q(rcube_label('logoutclear'))),
	'content' => $input_purge->show($config['logout_purge']?1:0),
	);
	}

	// INBOX compacting on logout
	if (!isset($no_override['logout_expunge'])) {
	$field_id = 'rcmfd_logout_expunge';
	$input_expunge = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));

	$blocks['maintenance']['options']['logout_expunge'] = array(
	'title' => html::label($field_id, Q(rcube_label('logoutcompact'))),
	'content' => $input_expunge->show($config['logout_expunge']?1:0),
	);
	}

	break;
	}

	$data = $RCMAIL->plugins->exec_hook('preferences_list', array('section' => $sect['id'], 'blocks' => $blocks));
	$found = false;

	// create output
	foreach ($data['blocks'] as $block) {
	if (!empty($block['content']) \|\| !empty($block['options'])) {
	$found = true;
	break;
	}
	}

	if (!$found)
	unset($sections[$idx]);
	else
	$sections[$idx]['blocks'] = $data['blocks'];
	}

	return array($sections, $plugin['cols']);
	}


	function rcmail_get_skins()
	{
	$path = 'skins';
	$skins = array();

	$dir = opendir($path);

	if (!$dir)
	return false;

	while (($file = readdir($dir)) !== false)
	{
	$filename = $path.'/'.$file;
	if (!preg_match('/^\./', $file) && is_dir($filename) && is_readable($filename))
	$skins[] = $file;
	}

	closedir($dir);

	return $skins;
	}


	function rcmail_folder_options($mailbox)
	{
	global $RCMAIL;

	$options = $RCMAIL->get_storage()->folder_info($mailbox);
	$options['protected'] = $options['is_root'] \|\| ($options['special'] && $RCMAIL->config->get('protect_default_folders'));

	return $options;
	}

	/**
	* Updates (or creates) folder row in the subscriptions table
	*
	* @param string $name Folder name
	* @param string $oldname Old folder name (for update)
	* @param bool $subscribe Checks subscription checkbox
	* @param string $class CSS class name for folder row
	*/
	function rcmail_update_folder_row($name, $oldname=null, $subscribe=false, $class_name=null)
	{
	global $RCMAIL, $OUTPUT;

	$default_folders = (array) $RCMAIL->config->get('default_folders');
	$protect_folders = $RCMAIL->config->get('protect_default_folders');

	$storage = $RCMAIL->get_storage();
	$delimiter = $storage->get_hierarchy_delimiter();
	$name_utf8 = rcube_charset_convert($name, 'UTF7-IMAP');
	$protected = $protect_folders && in_array($name, $default_folders);

	$foldersplit = explode($delimiter, $storage->mod_folder($name));
	$level = count($foldersplit) - 1;
	$display_name = str_repeat('    ', $level)
	. Q($protected ? rcmail_localize_foldername($name) : rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP'));

	if ($oldname === null)
	$OUTPUT->command('add_folder_row', $name_utf8, $display_name, $protected, $subscribe,
	false, $class_name);
	else
	$OUTPUT->command('replace_folder_row', rcube_charset_convert($oldname, 'UTF7-IMAP'),
	$name_utf8, $display_name, $protected, $class_name);
	}


	// register UI objects
	$OUTPUT->add_handlers(array(
	'prefsframe' => 'rcmail_preferences_frame',
	'sectionslist' => 'rcmail_sections_list',
	'identitieslist' => 'rcmail_identities_list',
	));

	// register action aliases
	$RCMAIL->register_action_map(array(
	'folders' => 'folders.inc',
	'rename-folder' => 'folders.inc',
	'delete-folder' => 'folders.inc',
	'subscribe' => 'folders.inc',
	'unsubscribe' => 'folders.inc',
	'purge' => 'folders.inc',
	'folder-size' => 'folders.inc',
	'add-identity' => 'edit_identity.inc',
	));
	diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
	index 88fa5298a..dc149929e 100644
	--- a/program/steps/settings/save_prefs.inc
	+++ b/program/steps/settings/save_prefs.inc
	@@ -1,216 +1,216 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/save_prefs.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Save user preferences to DB and to the current session \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$CURR_SECTION = get_input_value('_section', RCUBE_INPUT_POST);

	$a_user_prefs = array();

	// set options for specified section
	switch ($CURR_SECTION)
	{
	case 'general':
	$a_user_prefs = array(
	'language' => isset($_POST['_language']) ? get_input_value('_language', RCUBE_INPUT_POST) : $CONFIG['language'],
	'timezone' => isset($_POST['_timezone']) ? get_input_value('_timezone', RCUBE_INPUT_POST) : $CONFIG['timezone'],
	'date_format' => isset($_POST['_date_format']) ? get_input_value('_date_format', RCUBE_INPUT_POST) : $CONFIG['date_format'],
	'time_format' => isset($_POST['_time_format']) ? get_input_value('_time_format', RCUBE_INPUT_POST) : ($CONFIG['time_format'] ? $CONFIG['time_format'] : 'H:i'),
	'prettydate' => isset($_POST['_pretty_date']) ? TRUE : FALSE,
	'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
	);

	// compose derived date/time format strings
	if ((isset($_POST['_date_format']) \|\| isset($_POST['_time_format'])) && $a_user_prefs['date_format'] && $a_user_prefs['time_format']) {
	$a_user_prefs['date_short'] = 'D ' . $a_user_prefs['time_format'];
	$a_user_prefs['date_long'] = $a_user_prefs['date_format'] . ' ' . $a_user_prefs['time_format'];
	}

	break;

	case 'mailbox':
	$a_user_prefs = array(
	'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
	'preview_pane_mark_read' => isset($_POST['_preview_pane_mark_read']) ? intval($_POST['_preview_pane_mark_read']) : $CONFIG['preview_pane_mark_read'],
	'autoexpand_threads' => isset($_POST['_autoexpand_threads']) ? intval($_POST['_autoexpand_threads']) : 0,
	'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
	'keep_alive' => isset($_POST['_keep_alive']) ? intval($_POST['_keep_alive'])*60 : $CONFIG['keep_alive'],
	'check_all_folders' => isset($_POST['_check_all_folders']) ? TRUE : FALSE,
	'mail_pagesize' => is_numeric($_POST['_mail_pagesize']) ? max(2, intval($_POST['_mail_pagesize'])) : $CONFIG['mail_pagesize'],
	);

	break;

	case 'mailview':
	$a_user_prefs = array(
	'prefer_html' => isset($_POST['_prefer_html']) ? TRUE : FALSE,
	'inline_images' => isset($_POST['_inline_images']) ? TRUE : FALSE,
	'show_images' => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0,
	'display_next' => isset($_POST['_display_next']) ? TRUE : FALSE,
	'default_charset' => get_input_value('_default_charset', RCUBE_INPUT_POST),
	);

	break;

	case 'compose':
	$a_user_prefs = array(
	'htmleditor' => intval($_POST['_htmleditor']),
	'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
	'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
	'force_7bit' => isset($_POST['_force_7bit']) ? TRUE : FALSE,
	'mdn_default' => isset($_POST['_mdn_default']) ? TRUE : FALSE,
	'dsn_default' => isset($_POST['_dsn_default']) ? TRUE : FALSE,
	'reply_same_folder' => isset($_POST['_reply_same_folder']) ? TRUE : FALSE,
	'spellcheck_before_send' => isset($_POST['_spellcheck_before_send']) ? TRUE : FALSE,
	'spellcheck_ignore_syms' => isset($_POST['_spellcheck_ignore_syms']) ? TRUE : FALSE,
	'spellcheck_ignore_nums' => isset($_POST['_spellcheck_ignore_nums']) ? TRUE : FALSE,
	'spellcheck_ignore_caps' => isset($_POST['_spellcheck_ignore_caps']) ? TRUE : FALSE,
	'show_sig' => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1,
	- 'top_posting' => !empty($_POST['_top_posting']),
	+ 'reply_mode' => isset($_POST['_reply_mode']) ? intval($_POST['_reply_mode']) : 0,
	'strip_existing_sig' => isset($_POST['_strip_existing_sig']),
	- 'sig_above' => !empty($_POST['_sig_above']) && !empty($_POST['_top_posting']),
	+ 'sig_above' => !empty($_POST['_sig_above']) && $_POST['_reply_mode'] < 1,
	'default_font' => get_input_value('_default_font', RCUBE_INPUT_POST),
	'forward_attachment' => !empty($_POST['_forward_attachment']),
	);

	break;

	case 'addressbook':
	$a_user_prefs = array(
	'default_addressbook' => get_input_value('_default_addressbook', RCUBE_INPUT_POST, true),
	'autocomplete_single' => isset($_POST['_autocomplete_single']) ? TRUE : FALSE,
	'addressbook_sort_col' => get_input_value('_addressbook_sort_col', RCUBE_INPUT_POST),
	'addressbook_name_listing' => intval(get_input_value('_addressbook_name_listing', RCUBE_INPUT_POST)),
	'addressbook_pagesize' => is_numeric($_POST['_addressbook_pagesize']) ? max(2, intval($_POST['_addressbook_pagesize'])) : $CONFIG['addressbook_pagesize'],
	);

	break;

	case 'server':
	$a_user_prefs = array(
	'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE,
	'skip_deleted' => isset($_POST['_skip_deleted']) ? TRUE : FALSE,
	'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? TRUE : FALSE,
	'delete_always' => isset($_POST['_delete_always']) ? TRUE : FALSE,
	'delete_junk' => isset($_POST['_delete_junk']) ? TRUE : FALSE,
	'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE,
	'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
	);

	break;

	case 'folders':
	$a_user_prefs = array(
	'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST, true),
	'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST, true),
	'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST, true),
	'trash_mbox' => get_input_value('_trash_mbox', RCUBE_INPUT_POST, true),
	);

	break;
	}

	$plugin = rcmail::get_instance()->plugins->exec_hook('preferences_save',
	array('prefs' => $a_user_prefs, 'section' => $CURR_SECTION));

	$a_user_prefs = $plugin['prefs'];

	// don't override these parameters
	foreach ((array)$CONFIG['dont_override'] as $p)
	$a_user_prefs[$p] = $CONFIG[$p];


	// verify some options
	switch ($CURR_SECTION)
	{
	case 'general':

	// switch UI language
	if (isset($_POST['_language']) && $a_user_prefs['language'] != $_SESSION['language']) {
	$RCMAIL->load_language($a_user_prefs['language']);
	$OUTPUT->command('reload', 500);
	}

	// switch skin (if valid, otherwise unset the pref and fall back to default)
	if (!$OUTPUT->set_skin($a_user_prefs['skin']))
	unset($a_user_prefs['skin']);
	else if ($RCMAIL->config->get('skin') != $a_user_prefs['skin'])
	$OUTPUT->command('reload', 500);

	$a_user_prefs['timezone'] = (string) $a_user_prefs['timezone'];

	break;
	case 'mailbox':

	// force keep_alive
	if (isset($a_user_prefs['keep_alive'])) {
	$a_user_prefs['keep_alive'] = max(60, $CONFIG['min_keep_alive'], $a_user_prefs['keep_alive']);
	if (!empty($CONFIG['session_lifetime']))
	$a_user_prefs['keep_alive'] = min($CONFIG['session_lifetime']*60, $a_user_prefs['keep_alive']);
	}

	// force min size
	if ($a_user_prefs['mail_pagesize'] < 1)
	$a_user_prefs['mail_pagesize'] = 10;

	if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['mail_pagesize'] > $CONFIG['max_pagesize']))
	$a_user_prefs['mail_pagesize'] = (int) $CONFIG['max_pagesize'];

	break;
	case 'addressbook':

	// force min size
	if ($a_user_prefs['addressbook_pagesize'] < 1)
	$a_user_prefs['addressbook_pagesize'] = 10;

	if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['addressbook_pagesize'] > $CONFIG['max_pagesize']))
	$a_user_prefs['addressbook_pagesize'] = (int) $CONFIG['max_pagesize'];

	break;
	case 'folders':

	// special handling for 'default_folders'
	if (in_array('default_folders', (array)$CONFIG['dont_override'])) {
	foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p)
	$a_user_prefs[$p] = $CONFIG[$p];
	} else {
	$a_user_prefs['default_folders'] = array('INBOX');
	foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
	if ($a_user_prefs[$p])
	$a_user_prefs['default_folders'][] = $a_user_prefs[$p];
	}
	}

	break;
	}

	// Save preferences
	if (!$plugin['abort'])
	$saved = $RCMAIL->user->save_prefs($a_user_prefs);
	else
	$saved = $plugin['result'];

	if ($saved)
	$OUTPUT->show_message('successfullysaved', 'confirmation');
	else
	$OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');

	// display the form again
	rcmail_overwrite_action('edit-prefs');

File Metadata

Mime Type: text/x-diff
Expires: Wed, Feb 4, 9:08 AM (9 h, 20 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 427552
Default Alt Text: (277 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions