No OneTemporary
Actions

Size

226 KB

Referenced Files

None

Subscribers

None

View Options

This document is not UTF8. It was detected as ISO-8859-1 (Latin 1) and converted to UTF8 for display.

	diff --git a/CHANGELOG b/CHANGELOG
	index 8e9dcb3c7..3a14694c9 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,1421 +1,1423 @@
	CHANGELOG Roundcube Webmail
	===========================

	+- Add full headers view in message preview window (#1488538)
	+- Fix message display page issues - unified with message preview (#1488590, #1488642)
	- Fix identity selection on reply (#1488101)
	- Add option to enable HTML editor on forwarding (#1488517)
	- Add option to not include original message on reply, rename option top_posting to reply_mode (#1485149)
	- 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/program/steps/mail/func.inc b/program/steps/mail/func.inc
	index 7f0b4db5b..6f451e14f 100644
	--- a/program/steps/mail/func.inc
	+++ b/program/steps/mail/func.inc
	@@ -1,1778 +1,1783 @@
	<?php

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

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

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

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

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

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

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

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

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

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

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

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

	$threading = (bool) $RCMAIL->storage->get_threading();

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

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

	if (!empty($_SESSION['browser_caps']))
	$OUTPUT->set_env('browser_capabilities', $_SESSION['browser_caps']);

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

	$OUTPUT->set_pagetitle(rcmail_localize_foldername($RCMAIL->storage->mod_folder($mbox_name)));
	}

	/**
	* Returns 'to' if current folder is configured Sent or Drafts
	* or their subfolders, otherwise returns 'from'.
	*
	* @return string Column name
	*/
	function rcmail_message_list_smart_column_name()
	{
	global $RCMAIL;

	$delim = $RCMAIL->storage->get_hierarchy_delimiter();
	$mbox = $RCMAIL->storage->get_folder();
	$sent_mbox = $RCMAIL->config->get('sent_mbox');
	$drafts_mbox = $RCMAIL->config->get('drafts_mbox');

	if (strpos($mbox.$delim, $sent_mbox.$delim) === 0 \|\| strpos($mbox.$delim, $drafts_mbox.$delim) === 0) {
	return 'to';
	}

	return 'from';
	}

	/**
	* Returns configured messages list sorting column name
	* The name is context-sensitive, which means if sorting is set to 'fromto'
	* it will return 'from' or 'to' according to current folder type.
	*
	* @return string Column name
	*/
	function rcmail_sort_column()
	{
	global $RCMAIL;

	if (isset($_SESSION['sort_col'])) {
	$column = $_SESSION['sort_col'];
	}
	else {
	$column = $RCMAIL->config->get('message_sort_col');
	}

	// get name of smart From/To column in folder context
	if ($column == 'fromto') {
	$column = rcmail_message_list_smart_column_name();
	}

	return $column;
	}

	/**
	* Returns configured message list sorting order
	*
	* @return string Sorting order (ASC\|DESC)
	*/
	function rcmail_sort_order()
	{
	global $RCMAIL;

	if (isset($_SESSION['sort_order'])) {
	return $_SESSION['sort_order'];
	}

	return $RCMAIL->config->get('message_sort_order');
	}

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

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

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

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

	// save some variables for use in ajax list
	$_SESSION['list_attrib'] = $attrib;
	// make sure 'threads' and 'subject' columns are present
	if (!in_array('subject', $a_show_cols))
	array_unshift($a_show_cols, 'subject');
	if (!in_array('threads', $a_show_cols))
	array_unshift($a_show_cols, 'threads');

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

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

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

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

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


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

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

	$mbox = $RCMAIL->storage->get_folder();

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

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

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

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

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

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

	// get name of smart From/To column in folder context
	if (($f = array_search('fromto', $a_show_cols)) !== false) {
	$smart_col = rcmail_message_list_smart_column_name();
	}

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

	if (empty($a_headers))
	return;

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

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

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

	// format each col; similar as in rcmail_message_list()
	foreach ($a_show_cols as $col) {
	$col_name = $col == 'fromto' ? $smart_col : $col;

	if (in_array($col_name, array('from', 'to', 'cc', 'replyto')))
	$cont = Q(rcmail_address_string($header->$col_name, 3, false, null, $header->charset), 'show');
	else if ($col == 'subject') {
	$cont = trim(rcube_mime::decode_header($header->$col, $header->charset));
	if (!$cont) $cont = rcube_label('nosubject');
	$cont = Q($cont);
	}
	else if ($col == 'size')
	$cont = show_bytes($header->$col);
	else if ($col == 'date')
	$cont = format_date($header->date);
	else
	$cont = Q($header->$col);

	$a_msg_cols[$col] = $cont;
	}

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

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

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

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

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


	/*
	* Creates <THEAD> for message list table
	*/
	function rcmail_message_list_head($attrib, $a_show_cols)
	{
	$skin_path = $_SESSION['skin_path'];
	$image_tag = html::img(array('src' => "%s%s", 'alt' => "%s"));

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

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

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

	$cells = array();

	// get name of smart From/To column in folder context
	if (($f = array_search('fromto', $a_show_cols)) !== false) {
	$smart_col = rcmail_message_list_smart_column_name();
	}

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

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

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

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

	return $cells;
	}


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

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

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

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

	return html::iframe($attrib);
	}


	function rcmail_messagecount_display($attrib)
	{
	global $RCMAIL;

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

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

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

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


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

	if ($page === NULL) {
	$page = $RCMAIL->storage->get_page();
	}

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

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

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

	return Q($out);
	}


	function rcmail_mailbox_name_display($attrib)
	{
	global $RCMAIL;

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

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

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


	function rcmail_get_mailbox_name_text()
	{
	global $RCMAIL;
	return rcmail_localize_foldername($RCMAIL->storage->get_folder());
	}


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

	$old_unseen = rcmail_get_unseen_count($mbox_name);

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

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

	rcmail_set_unseen_count($mbox_name, $unseen);

	return $unseen;
	}


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

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

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


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


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

	if (!$message->is_safe
	&& ($show_images = $RCMAIL->config->get('show_images'))
	&& $message->has_html_part()
	) {
	switch ($show_images) {
	case 1: // known senders only
	// get default addressbook, like in addcontact.inc
	$CONTACTS = $RCMAIL->get_address_book(-1, true);

	if ($CONTACTS) {
	$result = $CONTACTS->search('email', $message->sender['mailto'], 1, false);
	if ($result->count) {
	$message->set_safe(true);
	}
	}
	break;

	case 2: // always
	$message->set_safe(true);
	break;
	}
	}
	}


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return $html;
	}


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

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

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

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

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

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

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


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

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

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

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

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

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

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

	$quote_level = $q;
	}

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

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

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

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

	return $body;
	}


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

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

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

	default:
	$out = '';
	}

	return $out;
	}


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

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

	return $matches[1].$tagname;
	}


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

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

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

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

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

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

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

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

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

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

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

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

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

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

	/**
	* Convert Priority header value into a localized string
	*/
	function rcmail_localized_priority($value)
	{
	$labels_map = array(
	'1' => 'highest',
	'2' => 'high',
	'3' => 'normal',
	'4' => 'low',
	'5' => 'lowest',
	);

	if ($value && $labels_map[$value])
	return rcube_label($labels_map[$value]);

	return '';
	}

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

	$html = html::div(array('id' => "all-headers", 'class' => "all", 'style' => 'display:none'), html::div(array('id' => 'headers-source'), ''));
	- $html .= html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('show-headers','',this)"), '');
	+
	+ if (!get_boolean($attrib['no-switch'])) {
	+ $html .= html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('show-headers','',this)"), '');
	+ }
	+
	+ unset($attrib['no-switch']);

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

	- return html::div($attrib, $html);
	+ return count($attrib) > 1 ? html::div($attrib, $html) : $html;
	}


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	// Content-Type: image/*...
	if (rcmail_part_image_type($attach_prop)) {
	$out .= html::tag('hr') . html::p(array('align' => "center"),
	html::img(array(
	'src' => $MESSAGE->get_part_url($attach_prop->mime_id, true),
	'title' => $attach_prop->filename,
	'alt' => $attach_prop->filename,
	)));
	}
	}
	}

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

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

	function rcmail_part_image_type($part)
	{
	$rcmail = rcmail::get_instance();

	// Skip TIFF images if browser doesn't support this format...
	$tiff_support = !empty($_SESSION['browser_caps']) && !empty($_SESSION['browser_caps']['tif']);
	// until we can convert them to JPEG
	$tiff_support = $tiff_support \|\| $rcmail->config->get('im_convert_path');

	// Content-type regexp
	$mime_regex = $tiff_support ? '/^image\//i' : '/^image\/(?!tif)/i';

	// Content-Type: image/*...
	if (preg_match($mime_regex, $part->mimetype)) {
	return $part->mimetype;
	}

	// Many clients use application/octet-stream, we'll detect mimetype
	// by checking filename extension

	// Supported image filename extensions to image type map
	$types = array(
	'jpg' => 'image/jpeg',
	'jpeg' => 'image/jpeg',
	'png' => 'image/png',
	'gif' => 'image/gif',
	'bmp' => 'image/bmp',
	);
	if ($tiff_support) {
	$types['tif'] = 'image/tiff';
	$types['tiff'] = 'image/tiff';
	}

	if ($part->filename
	&& preg_match('/^application\/octet-stream$/i', $part->mimetype)
	&& preg_match('/\.([^.])$/i', $part->filename, $m)
	&& ($extension = strtolower($m[1]))
	&& isset($types[$extension])
	) {
	return $types[$extension];
	}
	}

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

	return $body;
	}


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

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

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

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

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

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

	$attributes = array();

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

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

	return $body;
	}


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

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

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

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

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

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


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

	$a_parts = rcube_mime::decode_address_list($input, null, true, $default_charset);

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

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

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

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

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

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

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

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

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

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

	return $out;
	}


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

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

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

	return $out;
	}


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

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


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

	return $info;
	}


	function rcmail_message_part_controls($attrib)
	{
	global $MESSAGE, $RCMAIL;

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

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

	$filename = $part->filename;
	if (empty($filename) && $attach_prop->mimetype == 'text/html') {
	$filename = rcube_label('htmlmessage');
	}

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

	$table->add('title', Q(rcube_label('filesize')));
	$table->add('header', Q($RCMAIL->message_part_size($part)));

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



	function rcmail_message_part_frame($attrib)
	{
	global $MESSAGE;

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

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

	return html::iframe($attrib);
	}


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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return false;
	}


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

	return $name;
	}

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

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

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

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

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

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

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

	return $out;
	}

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

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

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

	// register action aliases
	$RCMAIL->register_action_map(array(
	'preview' => 'show.inc',
	'print' => 'show.inc',
	'moveto' => 'move_del.inc',
	'delete' => 'move_del.inc',
	'send' => 'sendmail.inc',
	'expunge' => 'folders.inc',
	'purge' => 'folders.inc',
	'remove-attachment' => 'attachments.inc',
	'display-attachment' => 'attachments.inc',
	'upload' => 'attachments.inc',
	'group-expand' => 'autocomplete.inc',
	));
	diff --git a/skins/larry/ie7hacks.css b/skins/larry/ie7hacks.css
	index 024c35bb2..935a504fe 100644
	--- a/skins/larry/ie7hacks.css
	+++ b/skins/larry/ie7hacks.css
	@@ -1,185 +1,185 @@
	/**
	* Roundcube webmail CSS hacks for IE 7
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*/

	/* #1488618 */
	#mainscreen {
	height: expression((parseInt(document.documentElement.clientHeight)-108)+'px');
	}
	#mainscreen.offset {
	height: expression((parseInt(document.documentElement.clientHeight)-150)+'px');
	}

	input.button {
	display: inline;
	font-size: 90%;
	}

	a.iconbutton,
	a.deletebutton,
	.boxpagenav a.icon,
	.pagenav a.button span.inner,
	.boxfooter .listbutton .inner,
	.attachmentslist li a.delete,
	.attachmentslist li a.cancelupload,
	-#messagepreviewheader .iconlink {
	+#messageheader .iconlink {
	/* workaround for text-indent which also offsets the background image */
	text-indent: 0;
	font-size: 0;
	line-height: 0;
	overflow: hidden;
	text-align: right;
	text-decoration: none;
	}

	.boxpagenav a.icon {
	color: #bbd3da;
	}

	.pagenav a.button,
	.pagenav a.button span.inner,
	-#messagepreviewheader .iconlink,
	+#messageheader .iconlink,
	#uploadform a.iconlink {
	display: inline;
	}

	.pagenavbuttons {
	top: 4px;
	}

	.dropbutton .dropbuttontip {
	right: -2px;
	}

	#login-form #message div {
	float: left;
	display: block;
	width: 200px;
	margin-left: 130px;
	white-space: nowrap;
	text-align: left;
	}

	-#messagepreviewheader .iconlink {
	+#messageheader .iconlink {
	color: #fff;
	height: 14px;
	}

	#uploadform a.iconlink {
	text-indent: 0px;
	}

	.boxfooter .countdisplay {
	top: -12px;
	}

	ul.toolbarmenu li a {
	width: 140px;
	}

	#threadselectmenu li a {
	width: 160px;
	}

	#messagemenu li a {
	width: 170px;
	}

	#rcmKSearchpane {
	width: 400px;
	}
	#rcmKSearchpane ul li {
	width: 380px;
	text-overflow: ellipsis;
	}


	table.listing,
	table.records-table {
	display: block;
	width: auto;
	border-collapse: expression('separate', cellSpacing = '0');
	}

	.records-table tbody td span {
	white-space: nowrap;
	}

	table.listing {
	width: 100%;
	}

	ul.toolbarmenu li label {
	margin: 0;
	padding: 3px 8px;
	}

	#quicksearchbar input {
	padding-top: 4px;
	padding-bottom: 2px;
	}

	#messagelistfooter #listcontrols,
	#messagelistfooter #listselectors,
	#messagelistfooter #countcontrols,
	.pagenav .countdisplay {
	display: inline;
	}

	#messagelistfooter #countcontrols {
	position: relative;
	top: -4px;
	}

	#messagecontframe,
	#preferences-frame {
	position: absolute;
	left: 0;
	right: 0;
	top: 0;
	bottom: 0;
	}

	#composeoptionsbox {
	padding-top: 2px;
	}

	#composeoptionstoggle {
	display: inline;
	top: 3px;
	}

	.propform {
	margin: 0;
	}

	.propform fieldset legend {
	color: #333;
	margin-left: -5px;
	padding-left: 0;
	}

	.contactfieldgroup legend {
	margin-left: -14px;
	}

	.contactfieldcontent .contactfieldbutton {
	top: -6px;
	}

	.tabsbar {
	height: 15px;
	padding-bottom: 15px;
	}

	.tabsbar .tablink {
	padding: 0 1px 0 0;
	}

	diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css
	index 288202111..bba93dc33 100644
	--- a/skins/larry/iehacks.css
	+++ b/skins/larry/iehacks.css
	@@ -1,161 +1,161 @@
	/**
	* Roundcube webmail CSS hacks for IE < 9
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*
	* $Id$
	*/

	input.button {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
	}

	.formbuttons input.button {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7b7b7b', endColorstr='#606060', GradientType=0);
	}

	.formbuttons input.button:active {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5c5c5c', endColorstr='#7b7b7b', GradientType=0);
	}

	input.button.mainaction {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#505050', endColorstr='#2a2e31', GradientType=0);
	}

	input.button.mainaction:active {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#2a2e31', endColorstr='#505050', GradientType=0);
	}

	a.button {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
	}

	a.button.pressed,
	a.button:active,
	input.button:active {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e6e6e6', endColorstr='#f9f9f9', GradientType=0);
	}

	.pagenav.dark a.button {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d8d8d8', endColorstr='#bababa', GradientType=0);
	}

	.pagenav.dark a.button.pressed {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bababa', endColorstr='#d8d8d8', GradientType=0);
	}

	#message.statusbar {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eaeaea', endColorstr='#c8c8c8', GradientType=0);
	}

	.ui-dialog.popupmessage .ui-dialog-titlebar {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e3e3e3', endColorstr='#cfcfcf', GradientType=0);
	}

	.ui-dialog.popupmessage .ui-widget-content {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dcdcdc', GradientType=0);
	}

	#topnav {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#404040', endColorstr='#060606', GradientType=0);
	}

	.records-table tr.selected td {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', GradientType=0);
	}

	.contentbox .boxtitle,
	body.iframe .boxtitle {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dfdfdf', GradientType=0);
	}

	#login-form input.button {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e2e2e2', GradientType=0);
	}

	#login-form input.button:active {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dcdcdc', endColorstr='#f9f9f9', GradientType=0);
	}

	.toolbar a.button {
	filter: none;
	}

	a.menuselector {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#dddddd', GradientType=0);
	}

	a.menuselector:active {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#f8f8f8', GradientType=0);
	}

	.googie_list td.googie_list_onhover,
	ul.toolbarmenu li a.active:hover,
	#rcmKSearchpane ul li.selected {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00aad6', endColorstr='#008fc9', GradientType=0);
	}

	.tabsbar .tablink {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#d3d3d3 50%, #f8f8f8', GradientType=0);
	}

	.tabsbar .selected a {
	background-color: #fff;
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#efefef', GradientType=0);
	}

	.toolbar a.button.disabled,
	.boxpagenav a.icon.disabled,
	.pagenav a.button.disabled span.inner,
	.boxfooter .listbutton.disabled .inner,
	.dropbutton a.button.disabled + .dropbuttontip {
	background-image: url(images/buttons.gif);
	}

	/* addressbook.css */

	.contactfieldgroup {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7f7f7', endColorstr='#eeeeee', GradientType=0);
	}

	.contactfieldgroup legend {
	margin: -8px -8px 8px -8px;
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0f0f0', endColorstr='#d6d6d6', GradientType=0);
	}


	/* mail.css */

	#messagelistfooter {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb', endColorstr='#c6c6c6', GradientType=0);
	}

	#mailboxlist li.mailbox .unreadcount {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#82acb5', endColorstr='#6a939f', GradientType=0);
	}

	#mailboxlist li.mailbox.selected > a .unreadcount {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#005d76', endColorstr='#004558', GradientType=0);
	}

	-#messageheader, #partheader, #composeheaders {
	+#partheader, #composeheaders {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e9e9e9', GradientType=0);
	}

	#previewheaderstoggle {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbfbfb', endColorstr='#e9e9e9', GradientType=1);
	}

	#composeoptionsbox {
	border-top: 1px solid #999;
	}

	#messagelist tbody tr td span.branch div {
	float: left;
	height: 18px;
	}
	diff --git a/skins/larry/images/contactpic_32px.png b/skins/larry/images/contactpic_32px.png
	index 276f1974f..25a81418d 100644
	Binary files a/skins/larry/images/contactpic_32px.png and b/skins/larry/images/contactpic_32px.png differ
	diff --git a/skins/larry/images/contactpic_48px.png b/skins/larry/images/contactpic_48px.png
	new file mode 100644
	index 000000000..9cd3bceaf
	Binary files /dev/null and b/skins/larry/images/contactpic_48px.png differ
	diff --git a/skins/larry/mail.css b/skins/larry/mail.css
	index 4fff24307..d2ff11808 100644
	--- a/skins/larry/mail.css
	+++ b/skins/larry/mail.css
	@@ -1,1319 +1,1313 @@
	/**
	* Roundcube webmail styles for the Email section
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	* Screendesign by FLINT / Büro für Gestaltung, bueroflint.com
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*
	* $Id$
	*/

	#mailview-left {
	position: absolute;
	top: 0;
	left: 0;
	width: 220px;
	bottom: 0;
	z-index: 2;
	}

	#mailview-right {
	position: absolute;
	top: 0;
	left: 232px;
	right: 0;
	bottom: 0;
	z-index: 3;
	}

	#mailview-top {
	position: absolute;
	top: 42px;
	left: 0;
	width: 100%;
	bottom: 28px;
	}

	-#mailview-top.fullheight {
	- border-radius: 4px 4px 0 0;
	-}
	-
	#mailview-bottom {
	position: absolute;
	left: 0;
	bottom: 0;
	width: 100%;
	height: 26px;
	}

	+#mailview-top.fullheight {
	+ border-radius: 4px 4px 0 0;
	+}
	+
	#folderlist-header {
	width: 100%;
	height: 12px;
	top: 32px;
	}

	#mailboxcontainer,
	#messagelistcontainer {
	position: absolute;
	top: 42px;
	left: 0;
	width: 100%;
	bottom: 0;
	}

	#messagelistcontainer {
	top: 0;
	bottom: 30px;
	overflow: auto;
	}

	#messagelistfooter {
	position: absolute;
	bottom: 0;
	left: 0;
	right: 0;
	height: 22px;
	padding: 4px 6px;
	border-top: 1px solid #ddd;
	background: #ebebeb;
	background: -moz-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ebebeb), color-stop(100%,#c6c6c6));
	background: -o-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
	background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
	background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
	border-radius: 0 0 4px 4px;
	}

	#mailview-top.fullheight #messagelistfooter {
	border-radius: 0;
	}

	#messagelistfooter.rightalign {
	text-align: right;
	}

	#messagelistfooter #countcontrols {
	display: inline-block;
	}

	#messagelistfooter #listcontrols,
	#messagelistfooter #listselectors {
	display: inline-block;
	margin-right: 2em;
	vertical-align: middle;
	}

	#messagelistfooter #listselectors .menuselector {
	margin-top: -2px;
	}

	a.iconbutton.listmode {
	width: 26px;
	height: 20px;
	background-position: 0 -477px;
	}

	a.iconbutton.threadmode {
	width: 26px;
	height: 20px;
	background-position: 0 -497px;
	}

	a.iconbutton.listmode.selected {
	background-position: -26px -477px;
	}

	a.iconbutton.threadmode.selected {
	background-position: -26px -497px;
	}

	#mailboxlist li.mailbox {
	position: relative;
	background-repeat: no-repeat;
	background-position: 6px 2px;
	}

	#mailboxlist li:first-child {
	border-radius: 4px 4px 0 0;
	}

	#mailboxlist li.mailbox a {
	padding-left: 36px;
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	background-image: url(images/listicons.png);
	background-repeat: no-repeat;
	background-position: 6px 3px;
	}

	#mailboxlist li.mailbox.unread a {
	padding-right: 36px;
	}

	#mailboxlist li.mailbox.selected > a {
	background-position: 6px -21px;
	}

	#mailboxlist li.mailbox.inbox > a {
	background-position: 6px -189px;
	}

	#mailboxlist li.mailbox.inbox.selected > a {
	background-position: 6px -213px;
	}

	#mailboxlist li.mailbox.drafts > a {
	background-position: 6px -238px;
	}

	#mailboxlist li.mailbox.drafts.selected > a {
	background-position: 6px -262px;
	}

	#mailboxlist li.mailbox.sent > a {
	background-position: 6px -286px;
	}

	#mailboxlist li.mailbox.sent.selected > a {
	background-position: 6px -310px;
	}

	#mailboxlist li.mailbox.junk > a {
	background-position: 6px -334px;
	}

	#mailboxlist li.mailbox.junk.selected > a {
	background-position: 6px -358px;
	}

	#mailboxlist li.mailbox.trash > a {
	background-position: 6px -382px;
	}

	#mailboxlist li.mailbox.trash.selected > a {
	background-position: 6px -406px;
	}

	#mailboxlist li.mailbox.archive > a {
	background-position: 6px -1699px;
	}

	#mailboxlist li.mailbox.archive.selected > a {
	background-position: 6px -1723px;
	}

	#mailboxlist li.unread {
	font-weight: bold;
	}

	#mailboxlist li.virtual > a {
	color: #aaa;
	}

	#mailboxlist li.recent > a {
	color: #017cb4;
	}

	#mailboxlist li.mailbox ul {
	list-style: none;
	margin: 0;
	padding: 0;
	border-top: 1px solid #bbd3da;
	}

	#mailboxlist li.mailbox ul li {
	padding-left: 26px;
	}

	#mailboxlist li.mailbox ul li a {
	background-position: 6px -93px;
	}

	#mailboxlist li.mailbox ul li.selected > a {
	background-position: 6px -117px;
	}

	#mailboxlist li.mailbox ul li:last-child {
	border-bottom: 0;
	}

	#mailboxlist li.mailbox div.collapsed,
	#mailboxlist li.mailbox div.expanded {
	position: absolute;
	top: 13px;
	left: 19px;
	width: 13px;
	height: 13px;
	background: url(images/listicons.png) -3px -144px no-repeat;
	cursor: pointer;
	}

	#mailboxlist li.mailbox div.expanded {
	background-position: -3px -168px;
	}

	#mailboxlist li.mailbox.selected > div.collapsed {
	background-position: -23px -144px;
	}

	#mailboxlist li.mailbox.selected > div.expanded {
	background-position: -23px -168px;
	}


	#mailboxlist li.mailbox ul li div.collapsed,
	#mailboxlist li.mailbox ul li div.expanded {
	left: 43px;
	top: 14px;
	}

	#mailboxlist li.mailbox .unreadcount {
	position: absolute;
	top: 3px;
	right: 6px;
	min-width: 1.8em;
	padding: 2px 4px;
	background: #82acb5;
	background: -moz-linear-gradient(top, #82acb5 0%, #6a939f 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#82acb5), color-stop(100%,#6a939f));
	background: -o-linear-gradient(top, #82acb5 0%, #6a939f 100%);
	background: -ms-linear-gradient(top, #82acb5 0%, #6a939f 100%);
	background: linear-gradient(top, #82acb5 0%, #6a939f 100%);
	box-shadow: inset 0 1px 1px 0 #536d72;
	-o-box-shadow: inset 0 1px 1px 0 #536d72;
	-webkit-box-shadow: inset 0 1px 1px 0 #536d72;
	-moz-box-shadow: inset 0 1px 1px 0 #536d72;
	border-radius: 9px;
	color: #fff;
	text-align: center;
	font-weight: bold;
	text-shadow: none;
	}

	#mailboxlist li.mailbox.selected > a .unreadcount {
	background: #005d76;
	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
	background: linear-gradient(top, #005d76 0%, #004558 100%);
	box-shadow: inset 0 1px 1px 0 #003645;
	-o-box-shadow: inset 0 1px 1px 0 #003645;
	-webkit-box-shadow: inset 0 1px 1px 0 #003645;
	-moz-box-shadow: inset 0 1px 1px 0 #003645;
	}

	#mailboxlist li.mailbox.recent > a .unreadcount {
	background: #017cb4;
	background: -moz-linear-gradient(top, #017cb4 0%, #006ca4 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#017cb4), color-stop(100%,#006ca4));
	background: -o-linear-gradient(top, #017cb4 0%, #006ca4 100%);
	background: -ms-linear-gradient(top, #017cb4 0%, #006ca4 100%);
	background: linear-gradient(top, #017cb4 0%, #006ca4 100%);
	box-shadow: inset 0 1px 1px 0 #005080;
	-o-box-shadow: inset 0 1px 1px 0 #005080;
	-webkit-box-shadow: inset 0 1px 1px 0 #005080;
	-moz-box-shadow: inset 0 1px 1px 0 #005080;
	}

	#searchfilter {
	position: absolute;
	right: 256px;
	width: auto;
	top: 7px;
	}

	#searchfilter select {
	height: 26px;
	}

	#mailview-left select.mailboxlist {
	position: relative;
	top: 10px;
	width: 100%;
	}

	#messagetoolbar {
	position: absolute;
	top: -6px;
	right: 390px;
	left: 0;
	height: 40px;
	white-space: nowrap;
	z-index: 10;
	}

	#messagetoolbar.fullwidth {
	right: 0;
	}

	#messagetoolbar .toolbarselect {
	position: absolute;
	bottom: 6px;
	right: 3px;
	}

	#messagesearchtools {
	position: absolute;
	right: 0;
	top: 0;
	width: 240px;
	}

	#mailpreviewtoggle {
	display: block;
	position: absolute;
	top: 6px;
	right: 4px;
	width: 20px;
	height: 18px;
	background: url(images/buttons.png) -3px -458px no-repeat;
	}

	#mailpreviewtoggle.enabled {
	background-position: -28px -458px;
	}


	/* message list */

	#messagelist thead td:first-child {
	border-radius: 4px 0 0 0;
	}

	#messagelist thead td:last-child {
	border-radius: 0 4px 0 0;
	}

	#messagelist tr td.attachment,
	#messagelist tr td.threads,
	#messagelist tr td.status,
	#messagelist tr td.flag,
	#messagelist tr td.priority {
	width: 20px;
	padding: 2px 3px;
	}

	.webkit #messagelist tr td.attachment,
	.webkit #messagelist tr td.threads,
	.webkit #messagelist tr td.status,
	.webkit #messagelist tr td.flag,
	.webkit #messagelist tr td.priority {
	width: 26px;
	}

	#messagelist tr td.threads {
	width: 26px;
	}

	.webkit #messagelist tr td.threads {
	width: 30px;
	}

	#messagelist tr td.threads,
	#messagelist tr td.threads + td {
	border-left: 0;
	}


	#messagelist tr td.size {
	width: 60px;
	text-align: right;
	}

	#messagelist tr td.fromto,
	#messagelist tr td.from,
	#messagelist tr td.to,
	#messagelist tr td.cc,
	#messagelist tr td.replyto {
	width: 200px;
	}

	#messagelist tr td.date {
	width: 125px;
	}

	#messagelist tr.message {
	/* background-color: #fff; */
	}

	#messagelist tr.thread.expanded td {
	background-color: #ededed;
	}

	#messagelist tr.unread {
	font-weight: bold;
	/* background-color: #fff; */
	}

	#messagelist tr.flagged td,
	#messagelist tr.flagged td a {
	color: #f30;
	}

	#messagelist thead tr td.sortedASC a,
	#messagelist thead tr td.sortedDESC a {
	color: #004458;
	text-decoration: underline;
	background: url(images/listicons.png) right -912px no-repeat;
	}

	#messagelist thead tr td.sortedASC a {
	background-position: right -944px;
	}

	#messagelist td img {
	vertical-align: middle;
	display: inline-block;
	}

	#messagelist tbody td a {
	color: #333;
	text-decoration: none;
	white-space: nowrap;
	cursor: default;
	}

	#messagelist tbody tr td.flag,
	#messagelist tbody tr td.status,
	#messagelist tbody tr td.subject span.status {
	cursor: pointer;
	}

	#messagelist tr td.flag span,
	#messagelist tr td.status span,
	#messagelist tr td.attachment span,
	#messagelist tr td.priority span {
	display: block;
	width: 20px;
	}

	#messagelist tr td div.collapsed,
	#messagelist tr td div.expanded,
	#messagelist tr td.threads div.listmenu,
	#messagelist tr td.attachment span.attachment,
	#messagelist tr td.attachment span.report,
	#messagelist tr td.priority span.priority,
	#messagelist tr td.priority span.prio1,
	#messagelist tr td.priority span.prio2,
	#messagelist tr td.priority span.prio3,
	#messagelist tr td.priority span.prio4,
	#messagelist tr td.priority span.prio5,
	#messagelist tr td.flag span.flagged,
	#messagelist tr td.flag span.unflagged,
	#messagelist tr td.flag span.unflagged:hover,
	#messagelist tr td.status span.status,
	#messagelist tr td.status span.msgicon,
	#messagelist tr td.status span.deleted,
	#messagelist tr td.status span.unread,
	#messagelist tr td.status span.unreadchildren,
	#messagelist tr td.subject span.msgicon,
	#messagelist tr td.subject span.deleted,
	#messagelist tr td.subject span.unread,
	#messagelist tr td.subject span.replied,
	#messagelist tr td.subject span.forwarded,
	#messagelist tr td.subject span.unreadchildren {
	display: inline-block;
	vertical-align: middle;
	height: 18px;
	width: 20px;
	padding: 0;
	background: url(images/listicons.png) -100px 0 no-repeat;
	}

	#messagelist tbody tr td.attachment span.attachment {
	background-position: 0 -996px;
	}

	#messagelist thead tr td.attachment span.attachment {
	background-position: -24px -997px;
	}

	#messagelist tbody tr td.attachment span.report {
	background-position: -24px -1116px;
	}

	#messagelist tr td.priority span.prio5 {
	background-position: 0 -1905px;
	}

	#messagelist tr td.priority span.prio4 {
	background-position: 0 -1885px;
	}

	#messagelist tr td.priority span.prio2 {
	background-position: 0 -1865px;
	}

	#messagelist tr td.priority span.prio1 {
	background-position: 0 -1845px;
	}

	#messagelist tbody tr td.flag span.flagged {
	background-position: 0 -1036px;
	}

	#messagelist thead tr td.flag span.flagged {
	background-position: -24px -1036px;
	}

	#messagelist tr td.status span.msgicon:hover {
	background-position: -23px -1056px;
	}

	#messagelist tr td.flag span.unflagged:hover {
	background-position: -23px -1076px;
	}

	#messagelist tr td.subject span.msgicon,
	#messagelist tr td.subject span.unreadchildren {
	background-position: 0 -1056px;
	margin: 0 1px 0 0;
	width: 24px;
	}

	#messagelist tr td.subject span.replied {
	background-position: 0 -1076px;
	}

	#messagelist tr td.subject span.forwarded {
	background-position: 0 -1096px;
	}

	#messagelist tr td.subject span.replied.forwarded {
	background-position: 0 -1116px;
	}

	#messagelist tr td.status span.msgicon,
	#messagelist tr td.flag span.unflagged,
	#messagelist tr td.status span.unreadchildren {
	background-position: 0 1056px; /* no icon */
	}
	/*
	#messagelist tr td.status span.msgicon:hover {
	background-position: 0 -272px;
	}
	*/
	#messagelist tr td.status span.deleted,
	#messagelist tr td.status span.deleted:hover,
	#messagelist tr td.subject span.deleted {
	background-position: -22px -1096px;
	}

	#messagelist tr td.status span.status,
	#messagelist tr td.status span.unread,
	#messagelist tr td.subject span.unread,
	#messagelist tr td.status span.unread:hover {
	background-position: 0 -1016px;
	}

	#messagelist thead tr td.status span.status {
	background-position: -24px -1016px;
	}

	#messagelist tr td div.collapsed {
	background-position: 0 -1136px;
	cursor: pointer;
	}

	#messagelist tr td div.expanded {
	background-position: 0 -1156px;
	cursor: pointer;
	}

	#messagelist tr td.threads div.listmenu {
	background-position: 0 -976px;
	cursor: pointer;
	width: 26px;
	}

	#messagelist thead tr td.subject,
	#messagelist tbody tr td.subject {
	width: 99%;
	white-space: nowrap;
	}

	#messagelist tbody tr td.subject a {
	cursor: default;
	vertical-align: middle; /* #1487091 */
	}

	/* thread parent message with unread children */
	#messagelist tbody tr.unroot td.subject a {
	text-decoration: underline;
	}

	/** tree indicators **/

	#messagelist tbody tr td span.branch div {
	display: inline-block;
	}

	#messagelist tbody tr td span.branch div.tree {
	width: 15px;
	}

	#listoptions ul.proplist {
	min-width: 16em;
	}

	/** message view **/

	#mailpreviewframe {
	display: none;
	position: absolute;
	top: 0;
	left: 0;
	width: 100%;
	bottom: 28px;
	}

	#messagecontframe {
	border: 0;
	border-radius: 4px 4px 0 0;
	}

	#messagecontent {
	position: absolute;
	- top: 140px;
	+ top: 0;
	left: 0;
	width: 100%;
	- bottom: 0;
	+ bottom: 28px;
	overflow: auto;
	border-radius: 4px 4px 0 0;
	}

	-#messageheader,
	#partheader,
	#composeheaders {
	position: relative;
	padding: 3px 0;
	background: #f9f9f9;
	background: -moz-linear-gradient(top, #fff 0%, #e9e9e9 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fff), color-stop(100%,#e9e9e9));
	background: -o-linear-gradient(top, #fff 0%, #e9e9e9 100%);
	background: -ms-linear-gradient(top, #fff 0%, #e9e9e9 100%);
	background: linear-gradient(top, #fff 0%, #e9e9e9 100%);
	}

	h2.subject {
	font-size: 15px;
	margin: 0 15em 0 0;
	padding: 4px 8px 2px 8px;
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	h3.subject {
	font-size: 14px;
	- margin: 0 8em 0 0;
	+ margin: 0 13em 0 0;
	padding: 8px 8px 4px 8px;
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.headers-table td {
	color: #666;
	padding: 2px 8px;
	}

	.headers-table td.header {
	font-weight: bold;
	}

	.headers-table td.header a {
	color: #666;
	text-decoration: none;
	}

	.headers-table td.header a:hover {
	text-decoration: underline;
	}

	.headers-table td.subject {
	color: #333;
	font-size: 110%;
	font-weight: bold;
	}

	.headers-table td.header span {
	white-space: nowrap;
	}

	.rcmaddcontact {
	position: relative;
	top: 1px;
	margin-left: 0.5em;
	}

	.rcmaddcontact imp {
	width: 20px;
	height: 13px;
	}

	#preview-allheaders {
	display: none;
	}

	#preview-allheaders td.header-title,
	#preview-shortheaders td.header-title {
	padding-left: 0;
	}

	#preview-shortheaders td.header {
	padding-right: 18px;
	}

	#previewheaderstoggle {
	display: block;
	position: absolute;
	top: 0;
	left: 0;
	bottom: 0;
	width: 18px;
	padding: 0;
	outline: none;
	background: #f2f2f2;
	background: -moz-linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
	background: -webkit-gradient(linear, left top, right top, color-stop(0,#fbfbfb), color-stop(100%,#e9e9e9));
	background: -o-linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
	background: -ms-linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
	background: linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
	border-right: 1px solid #dfdfdf;
	+ border-radius: 3px 0 0 0; /* for Opera */
	}

	#previewheaderstoggle .iconlink {
	display: inline-block;
	position: absolute;
	top: 8px;
	left: 0;
	width: 18px;
	height: 16px;
	background: url(images/buttons.png) -27px -242px no-repeat;
	}

	#previewheaderstoggle.remove .iconlink {
	top: auto;
	- bottom: 5px;
	+ bottom: 15px;
	background-position: -5px -242px;
	}

	-div.more-headers {
	- cursor: pointer;
	- height: 10px;
	- background: url(images/buttons.png) center -1619px no-repeat;
	+#previewheaderstoggle .iconlink.allheaders {
	+ display: none;
	}

	-div.hide-headers {
	- background-position: center -1629px;
	+#previewheaderstoggle.remove .iconlink.allheaders {
	+ top: auto;
	+ bottom: 2px;
	+ display: inline-block;
	+ background-position: -27px -242px;
	}

	#all-headers {
	position: relative;
	- margin: 0 10px;
	+ margin: 2px 0;
	padding: 0;
	height: 180px;
	- border: 1px solid #bbb;
	- border-radius: 4px;
	- background: #fff;
	+ background-color: #f0f0f0;
	}

	#headers-source {
	display: none;
	position: absolute;
	top: 0;
	left: 0;
	right: 0;
	bottom: 0;
	- padding: 2px 5px;
	+ padding: 0;
	overflow: auto;
	text-align: left;
	- color: #333;
	+ color: #666;
	}

	-#messagepreviewheader {
	+#messageheader {
	position: relative;
	height: auto;
	margin: 0 8px 0 0;
	- padding: 0 0 6px 72px;
	+ padding: 0 0 0 72px;
	border-bottom: 2px solid #f0f0f0;
	}

	-#messagepreviewheader h3.subject {
	+#messagecontent #messageheader {
	+ padding: 0 0 0 90px;
	+ min-height: 68px;
	+}
	+
	+#messageheader h3.subject {
	padding: 8px 8px 2px 0;
	}

	-#messagepreviewheader #contactphoto {
	+#messageheader #contactphoto {
	display: block;
	position: absolute;
	top: 11px;
	left: 30px;
	width: 32px;
	height: 32px;
	overflow: hidden;
	background: url(images/contactpic_32px.png) center center no-repeat #fff;
	border-radius: 3px;
	}

	-#messagepreviewheader #contactphoto img {
	+#messageheader #contactphoto img {
	width: 32px;
	height: auto;
	border-radius: 3px;
	}

	-#messageheader #contactphoto {
	- display: block;
	- position: absolute;
	- top: 40px;
	- right: 10px;
	+#messagecontent #messageheader #contactphoto {
	+ top: 11px;
	+ left: 31px;
	width: 48px;
	height: 48px;
	- overflow: hidden;
	+ background: url(images/contactpic_48px.png) center center no-repeat #fff;
	border-radius: 4px;
	}

	-#messageheader #contactphoto img {
	+#messagecontent #messageheader #contactphoto img {
	width: 48px;
	height: auto;
	border-radius: 4px;
	}

	-#messagepreviewheader #countcontrols,
	#messageheader #countcontrols {
	position: absolute;
	top: 8px;
	- right: 8px;
	- width: 20em;
	+ right: 0;
	text-align: right;
	white-space: nowrap;
	}

	-#messageheader .pagenav .countdisplay {
	- min-width: 0;
	- padding-right: 0.5em;
	- white-space: nowrap;
	-}
	-
	#messagecontent .leftcol,
	#messagepreview .leftcol {
	margin-right: 252px;
	overflow-x: auto;
	}

	#messagecontent .rightcol,
	#messagepreview .rightcol {
	float: right;
	/*
	position: absolute;
	top: 10px;
	right: 10px;
	height: 90%;
	*/
	width: 230px;
	margin: 8px;
	min-height: 200px;
	background: #f0f0f0;
	padding: 8px;
	}

	#messagebody {
	margin: 8px;
	}

	#message-objects div,
	#messagebody span.part-notice {
	margin: 8px;
	}

	#message-objects div.notice,
	#message-buttons div.notice {
	display: block;
	color: #960;
	border: 1px solid #ffdf0e;
	background-color: #fef893;
	background-position: 5px -85px;
	padding: 6px 12px 4px 30px;
	white-space: normal;
	}

	#message-objects div a.button,
	#messagebody span.part-notice a.button {
	margin-left: 10px;
	}

	div.message-part,
	div.message-htmlpart {
	padding: 0 2px 10px 2px;
	border-top: 2px solid #f0f0f0;
	}

	#messagebody div:first-child {
	border-top: 0;
	}

	div.message-part pre,
	div.message-htmlpart pre,
	div.message-part div.pre {
	margin: 0px;
	padding: 0px;
	font-family: monospace;
	font-size: 12px;
	white-space: -moz-pre-wrap !important;
	white-space: pre-wrap !important;
	white-space: pre;
	}

	div.message-part span.sig {
	color: #666666;
	}

	div.message-part blockquote {
	color: blue;
	border-left: 2px solid blue;
	border-right: 2px solid blue;
	background-color: #F6F6F6;
	margin: 2px 0px 2px 0px;
	padding: 1px 8px 1px 10px;
	}

	div.message-part blockquote blockquote {
	color: green;
	border-left: 2px solid green;
	border-right: 2px solid green;
	}

	div.message-part blockquote blockquote blockquote {
	color: #990000;
	border-left: 2px solid #bb0000;
	border-right: 2px solid #bb0000;
	}

	#messagebody > hr {
	color: #fff;
	background: #fff;
	border: 0;
	border-bottom: 2px solid #f0f0f0;
	}

	#messagebody > p > img {
	max-width: 80%;
	}

	#messagepartcontainer {
	position: absolute;
	top: 60px;
	left: 0px;
	right: 0px;
	bottom: 0px;
	}

	#messagepartframe {
	border: 0;
	}

	/* message composition */

	#composeview-left {
	position: absolute;
	top: 0;
	left: 0;
	width: 250px;
	bottom: 0;
	}

	#composeview-right {
	position: absolute;
	top: 0;
	left: 262px;
	right: 0;
	bottom: 0;
	}

	#compose-contacts {
	position: absolute;
	top: 42px;
	left: 0;
	width: 100%;
	bottom: 0;
	}

	#compose-contacts #directorylist {
	border-bottom: 4px solid #c7e3ef;
	}

	#compose-contacts .scroller {
	top: 65px;
	border-top: 1px solid #fff;
	}

	#contacts-table {
	table-layout: fixed;
	}

	#contacts-table td {
	width: 100%;
	}

	#contacts-table td span {
	display: block;
	}

	#compose-contacts li a, #contacts-table td {
	background: url(images/listicons.png) -100px 0 no-repeat;
	overflow: hidden;
	padding-left: 36px;
	text-overflow: ellipsis;
	}

	#contacts-table tr:first-child td {
	border-top: 0;
	}

	#compose-contacts li.addressbook a {
	background-position: 6px -766px;
	}

	#compose-contacts li.addressbook.selected a {
	background-position: 6px -791px;
	}

	#contacts-table td.contactgroup {
	background-position: 6px -1555px;
	}

	#contacts-table tr.unfocused td.contactgroup,
	#contacts-table tr.selected td.contactgroup {
	background-position: 6px -1579px;
	}

	#contacts-table td.contact {
	background-position: 6px -1603px;
	}

	#contacts-table tr.unfocused td.contact,
	#contacts-table tr.selected td.contact {
	background-position: 6px -1627px;
	}


	#compose-content {
	position: absolute;
	top: 42px;
	left: 0;
	width: 100%;
	bottom: 28px;
	border-bottom-left-radius: 0;
	border-bottom-right-radius: 0;
	overflow: hidden;
	}

	#composeheaders {
	border-radius: 4px 4px 0 0;
	-webkit-box-shadow: 0 2px 3px 0 #999;
	-moz-box-shadow: 0 2px 3px 0 #999;
	box-shadow: 0 2px 3px 0 #999;
	}

	#composebuttons {
	position: absolute;
	top: 8px;
	right: 8px;
	width: auto;
	white-space: nowrap;
	z-index: 100;
	}

	.compose-headers {
	width: 99%;
	margin: 4px 0;
	}

	.compose-headers td {
	padding: 4px 4px 4px 8px;
	}

	.compose-headers td.title {
	width: 11%;
	white-space: nowrap;
	}

	.compose-headers td.title label {
	float: left;
	}

	.compose-headers td.title a.iconbutton {
	float: right;
	position: relative;
	top: -2px;
	width: 15px;
	}

	.compose-headers td.editfield {
	width: 90%;
	padding-left: 4px;
	}

	.compose-headers td.editfield a.iconlink {
	margin-left: 0.5em;
	}

	.compose-headers td.formlinks {
	padding: 0 4px;
	}

	.compose-headers td.top {
	vertical-align: top;
	padding-top: 10px;
	}

	.compose-headers td textarea,
	.compose-headers td input {
	width: 100%;
	resize: none;
	}

	#compose-cc, #compose-bcc, #compose-replyto, #compose-followupto {
	display: none;
	}

	#composeoptionsbox {
	padding: 4px 8px 0 8px;
	background: #d2d2d2;
	border-bottom: 1px solid #e8e8e8;
	-webkit-box-shadow: 0 2px 3px 0 #999;
	-moz-box-shadow: 0 2px 3px 0 #999;
	box-shadow: 0 2px 3px 0 #999;
	white-space: nowrap;
	}

	#composeoptions {
	display: none;
	padding: 2px 0;
	white-space: normal;
	}

	.composeoption {
	padding-right: 22px;
	white-space: nowrap;
	}

	#composeoptions .composeoption {
	display: inline-block;
	padding: 4px 28px 4px 0;
	}

	#composeoptions .composeoption:last-child {
	padding-right: 4px;
	}

	#composeoptionstoggle {
	display: inline-block;
	position: relative;
	top: -1px;
	left: 6px;
	width: 20px;
	height: 18px;
	background: url(images/buttons.png) -3px -1640px no-repeat;
	text-decoration: none;
	}

	#composeoptionstoggle.enabled {
	background-position: -28px -1640px;
	}

	#composeview-bottom {
	position: relative;
	width: 100%;
	height: 200px;
	}

	#composebodycontainer {
	position: absolute;
	top: 0;
	left: 0;
	right: 260px;
	bottom: 0;
	}

	#composebody {
	position: absolute;
	top: 1px;
	left: 0;
	bottom: 0;
	width: 99%;
	border: 0;
	border-radius: 0;
	padding: 8px 0 8px 8px;
	box-shadow: none;
	resize: none;
	font-family: monospace;
	font-size: 9pt;
	outline: none;
	}

	#composebody:active,
	#composebody:focus {
	}

	#compose-attachments {
	position: absolute;
	right: 0;
	top: 1px;
	bottom: 0;
	width: 240px;
	background: #f0f0f0;
	border-style: solid;
	border-color: #f0f0f0 #f0f0f0 #f0f0f0 #ddd;
	border-width: 1px;
	padding: 8px;
	overflow: auto;
	}

	#compose-attachments.droptarget {
	background-image: url(images/filedrop.png);
	background-position: center bottom;
	background-repeat: no-repeat;
	}

	#compose-attachments.droptarget.hover,
	#compose-attachments.droptarget.active {
	border-color: #019bc6;
	box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
	-moz-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
	-webkit-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
	-o-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
	}

	#compose-attachments.droptarget.hover {
	background-color: #d9ecf4;
	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	}

	.defaultSkin table.mceLayout,
	.defaultSkin table.mceLayout tr.mceLast td {
	border: 0 !important;
	}

	#composebody_toolbargroup {
	border-bottom: 1px solid #ddd;
	}

	#uploadform a.iconlink {
	margin-left: 1em;
	text-indent: -5000px;
	}

	#uploadform form div {
	margin: 4px 0;
	}

	diff --git a/skins/larry/svggradients.css b/skins/larry/svggradients.css
	index 143fb375f..4f1dd8a05 100644
	--- a/skins/larry/svggradients.css
	+++ b/skins/larry/svggradients.css
	@@ -1,178 +1,178 @@
	/**
	* Roundcube webmail SVG-based gradients for IE 9
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*
	* $Id$
	*/

	input.button {
	background-image: url(svggradient.php?c=f9f9f9;e6e6e6);
	}

	.formbuttons input.button {
	background-image: url(svggradient.php?c=7b7b7b;606060);
	}

	.formbuttons input.button:active {
	background-image: url(svggradient.php?c=5c5c5c;7b7b7b);
	}

	input.button.mainaction {
	background-image: url(svggradient.php?c=505050;2a2e31);
	}

	input.button.mainaction:active {
	background-image: url(svggradient.php?c=2a2e31;505050);
	}

	a.button {
	background-image: url(svggradient.php?c=f9f9f9;e6e6e6);
	}

	a.button.pressed,
	a.button:active,
	input.button:active {
	background-image: url(svggradient.php?c=e6e6e6;f9f9f9);
	}

	.pagenav.dark a.button {
	background-image: url(svggradient.php?c=d8d8d8;bababa);
	}

	.pagenav.dark a.button.pressed {
	background-image: url(svggradient.php?c=bababa;d8d8d8);
	}

	#message.statusbar {
	background-image: url(svggradient.php?c=eaeaea;c8c8c8);
	}

	.ui-dialog.popupmessage .ui-dialog-titlebar {
	background-image: url(svggradient.php?c=e3e3e3;cfcfcf);
	}

	.ui-dialog.popupmessage .ui-widget-content {
	background-image: url(svggradient.php?c=eeeeee;dcdcdc);
	}

	#topnav {
	background-image: url(svggradient.php?c=404040;060606);
	}

	.records-table tr.selected td {
	background-image: url(svggradient.php?c=019bc6;017cb4);
	}

	.contentbox .boxtitle,
	body.iframe .boxtitle {
	background-image: url(svggradient.php?c=eeeeee;dfdfdf);
	/* background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20preserveAspectRatio%3D%22none%22%20version%3D%221.0%22%20width%3D%22100%25%22%20height%3D%22100%25%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%22mLG1%22%20x1%3D%220%25%22%20y1%3D%220%25%22%20x2%3D%220%25%22%20y2%3D%22100%25%22%20spreadMethod%3D%22pad%22%3E%3Cstop%20offset%3D%220%25%22%20stop-color%3D%22%23eeeeee%22%20stop-opacity%3D%221%22/%3E%3Cstop%20offset%3D%22100%25%22%20stop-color%3D%22%23dfdfdf%22%20stop-opacity%3D%221%22/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20style%3D%22fill%3Aurl%28%23mLG1%29%3B%22/%3E%3C/svg%3E);*/
	}

	#login-form input.button {
	background-image: url(svggradient.php?c=f9f9f9;e2e2e2);
	}

	#login-form input.button:active {
	background-image: url(svggradient.php?c=dcdcdc;f9f9f9);
	}

	.toolbar a.button {
	filter: none;
	}

	a.menuselector {
	background-image: url(svggradient.php?c=f8f8f8;dddddd);
	}

	a.menuselector:active {
	background-image: url(svggradient.php?c=dddddd;f8f8f8);
	}

	.googie_list td.googie_list_onhover,
	ul.toolbarmenu li a.active:hover,
	#rcmKSearchpane ul li.selected {
	background-image: url(svggradient.php?c=00aad6;008fc9);
	}

	.tabsbar .tablink {
	background-image: url(svggradient.php?c=f8f8f8;d3d3d3,50;f8f8f8);
	outline: none;
	}

	.tabsbar .tablink.selected a {
	background-image: url(svggradient.php?c=ffffff;efefef);
	outline: none;
	}


	/* addressbook.css */

	.contactfieldgroup {
	background-image: url(svggradient.php?c=f7f7f7;eeeeee);
	}

	.contactfieldgroup legend {
	background-image: url(svggradient.php?c=f0f0f0;d6d6d6);
	}


	/* mail.css */

	#mailboxlist li.mailbox .unreadcount {
	background-image: url(svggradient.php?c=82acb5;6a939f);
	}

	#mailboxlist li.mailbox.selected .unreadcount {
	background-image: url(svggradient.php?c=005d76;004558);
	}

	-#messageheader, #partheader, #composeheaders {
	+#partheader, #composeheaders {
	background-image: url(svggradient.php?c=ffffff;e9e9e9);
	}

	#previewheaderstoggle {
	background-image: url(svggradient.php?c=fbfbfb;e9e9e9&h=1);
	}

	#messagelistfooter {
	background-image: url(svggradient.php?c=ebebeb;c6c6c6);
	}

	/* jqueryui theme */

	.ui-menu .ui-menu-item a.ui-state-hover,
	.ui-menu .ui-menu-item a.ui-state-active {
	background-image: url(svggradient.php?c=00aad6;008fc9) !important;
	}

	.ui-button.ui-state-default {
	background-image: url(svggradient.php?c=f9f9f9;e6e6e6) !important;
	}

	.ui-button.ui-state-active {
	background-image: url(svggradient.php?c=e6e6e6;f9f9f9) !important;
	}

	.ui-tabs .ui-tabs-nav li {
	background-image: url(svggradient.php?c=f8f8f8;d3d3d3,50;d3d3d3) !important;
	}

	.ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
	background-image: url(svggradient.php?c=fafafa,40;e4e4e4) !important;
	}

	.ui-datepicker td a.ui-state-default {
	background-image: url(svggradient.php?c=e6e6e6;d6d6d6) !important;
	}

	.ui-datepicker td a.ui-state-active {
	background-image: url(svggradient.php?c=00acd4;008fc7) !important;
	}

	diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
	index 1becd711a..89b7bd808 100644
	--- a/skins/larry/templates/message.html
	+++ b/skins/larry/templates/message.html
	@@ -1,75 +1,90 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	</head>
	<body class="noscroll">

	<roundcube:include file="/includes/header.html" />

	<div id="mainscreen">

	<!-- toolbar -->
	<div id="messagetoolbar" class="toolbar fullwidth">
	<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
	<span class="spacer"></span>
	<roundcube:include file="/includes/mailtoolbar.html" />
	<div class="toolbarselect">
	<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mailboxlist decorated" folder_filter="mail" />
	</div>
	</div>

	<div id="mailview-left">

	<!-- folders list -->
	<div id="mailboxcontainer" class="uibox listbox">
	-<div class="scroller">
	-<roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" />
	-</div>
	+ <div class="scroller">
	+ <roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" />
	+ </div>
	</div>

	-</div>
	+</div><!-- end mailview-left -->
	+
	+<div id="mailview-right" class="uibox" style="top: 42px">
	+
	+<div id="messagecontent">
	+
	+<div id="messageheader">
	+<h3 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h3>
	+
	+<a href="#details" id="previewheaderstoggle"><span class="iconlink"></span><span id="headerstoggleall" class="iconlink allheaders"></span></a>

	-<div id="mailview-right">
	+<div id="contactphoto"><roundcube:object name="contactphoto" /></div>

	-<div id="mailview-top">
	-<div id="messageheader" class="uibox">
	-<h2 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h2>
	-<roundcube:object name="messageHeaders" class="headers-table" addicon="/images/addcontact.png" exclude="subject" />
	-<roundcube:object name="messageFullHeaders" id="full-headers" />
	+<table class="headers-table" id="preview-shortheaders"><tbody><tr>
	+<roundcube:if condition="env:mailbox == config:drafts_mbox \|\| env:mailbox == config:sent_mbox">
	+ <td class="header-title"><roundcube:label name="to" /></td>
	+ <td class="header from"><roundcube:object name="messageHeaders" valueOf="to" addicon="/images/addcontact.png" /></td>
	+<roundcube:else />
	+ <td class="header-title"><roundcube:label name="from" /></td>
	+ <td class="header from"><roundcube:object name="messageHeaders" valueOf="from" addicon="/images/addcontact.png" /></td>
	+<roundcube:endif />
	+ <td class="header-title"><roundcube:label name="date" /></td>
	+ <td class="header from"><roundcube:object name="messageHeaders" valueOf="date" /></td>
	+</tr></tbody></table>
	+
	+<roundcube:object name="messageHeaders" id="preview-allheaders" class="headers-table" addicon="/images/addcontact.png" exclude="subject,replyto" />
	+<roundcube:object name="messageFullHeaders" no-switch="true" />

	<!-- record navigation -->
	<div id="countcontrols" class="pagenav">
	<roundcube:object name="messageCountDisplay" class="countdisplay" />
	<roundcube:button command="previousmessage" type="link" class="button prevpage disabled" classAct="button prevpage" classSel="button prevpage pressed" innerClass="inner" title="previousmessage" content="&lt;" />
	<roundcube:button command="nextmessage" type="link" class="button nextpage disabled" classAct="button nextpage" classSel="button nextpage pressed" innerClass="inner" title="nextmessage" content="&gt;" />
	</div>

	-<div id="contactphoto"><roundcube:object name="contactphoto" /></div>
	-</div>
	+</div><!-- end messageheader -->

	-<div id="messagecontent" class="uibox">
	-<div class="rightcol">
	-<roundcube:object name="messageAttachments" id="attachment-list" class="attachmentslist" />
	-</div>
	-<div class="leftcol">
	-<roundcube:object name="messageObjects" id="message-objects" />
	-<roundcube:object name="messageBody" id="messagebody" />
	-</div>
	+<div id="messagepreview">
	+ <div class="rightcol">
	+ <roundcube:object name="messageAttachments" id="attachment-list" class="attachmentslist" />
	+ </div>
	+ <div class="leftcol">
	+ <roundcube:object name="messageObjects" id="message-objects" />
	+ <roundcube:object name="messageBody" id="messagebody" />
	+ </div>
	</div>

	-</div><!-- end mailview-top -->
	+</div><!-- end messagecontent -->

	-<div id="mailview-bottom" class="uibox">
	<roundcube:object name="message" id="message" class="statusbar" />
	-</div>

	</div><!-- end mailview-right -->

	</div><!-- end mainscreen -->

	<roundcube:include file="/includes/footer.html" />

	</body>
	</html>
	diff --git a/skins/larry/templates/messageerror.html b/skins/larry/templates/messageerror.html
	index 70181f174..2f5243200 100644
	--- a/skins/larry/templates/messageerror.html
	+++ b/skins/larry/templates/messageerror.html
	@@ -1,54 +1,52 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	</head>
	<roundcube:if condition="env:action != 'show'" />
	<body class="iframe fullheight">

	<div id="mainscreen" class="watermark" style="top:0"></div>

	<roundcube:else />
	<body>

	<roundcube:include file="/includes/header.html" />

	<div id="mainscreen">

	<div id="mailview-left">

	<!-- folders list -->
	<div id="mailboxcontainer" class="uibox listbox">
	<div class="scroller">
	<roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" />
	</div>
	</div>

	</div>

	-<div id="mailview-right">
	-
	<!-- toolbar -->
	<div id="messagetoolbar" class="fullwidth">
	<div id="mailtoolbar" class="toolbar">
	<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
	</div>
	</div>

	-<div id="mailview-top" class="uibox watermark"></div>
	+<div id="mailview-right" class="uibox" style="top: 42px">

	-<div id="mailview-bottom" class="uibox">
	- <roundcube:object name="message" id="message" class="statusbar" />
	-</div>
	+<div id="messagecontent" class="watermark"></div>
	+
	+<roundcube:object name="message" id="message" class="statusbar" />

	</div><!-- end mailview-right -->

	</div><!-- end mainscreen -->

	<roundcube:include file="/includes/footer.html" />

	<roundcube:endif />

	</body>
	</html>
	diff --git a/skins/larry/templates/messagepreview.html b/skins/larry/templates/messagepreview.html
	index b53683ec1..74c414b0d 100644
	--- a/skins/larry/templates/messagepreview.html
	+++ b/skins/larry/templates/messagepreview.html
	@@ -1,55 +1,56 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	</head>
	<body class="iframe fullheight">

	-<div id="messagepreviewheader">
	+<div id="messageheader">
	<h3 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h3>

	-<a href="#details" id="previewheaderstoggle"><span class="iconlink"></span></a>
	+<a href="#details" id="previewheaderstoggle"><span class="iconlink"></span><span id="headerstoggleall" class="iconlink allheaders"></a>
	<div id="contactphoto"><roundcube:object name="contactphoto" /></div>

	<table class="headers-table" id="preview-shortheaders"><tbody><tr>
	<roundcube:if condition="env:mailbox == config:drafts_mbox \|\| env:mailbox == config:sent_mbox">
	<td class="header-title"><roundcube:label name="to" /></td>
	<td class="header from"><roundcube:object name="messageHeaders" valueOf="to" addicon="/images/addcontact.png" /></td>
	<roundcube:else />
	<td class="header-title"><roundcube:label name="from" /></td>
	<td class="header from"><roundcube:object name="messageHeaders" valueOf="from" addicon="/images/addcontact.png" /></td>
	<roundcube:endif />
	<td class="header-title"><roundcube:label name="date" /></td>
	<td class="header from"><roundcube:object name="messageHeaders" valueOf="date" /></td>
	</tr></tbody></table>

	<roundcube:object name="messageHeaders" id="preview-allheaders" class="headers-table" addicon="/images/addcontact.png" exclude="subject,replyto" />
	+<roundcube:object name="messageFullHeaders" no-switch="true" />

	<!-- record navigation -->
	<div id="countcontrols" class="pagenav">
	<roundcube:if condition="env:mailbox != config:drafts_mbox">
	<roundcube:button command="reply" type="link" class="button reply" classSel="button reply pressed" innerClass="inner" title="replytomessage" content="<-" />
	<roundcube:button command="reply-all" type="link" class="button replyall" classSel="button replyall pressed" innerClass="inner" title="replytoallmessage" content="<<-" />
	<roundcube:button command="forward" type="link" class="button forward" classSel="button forward pressed" innerClass="inner" title="forwardmessage" content="->" />

	<roundcube:endif />
	<roundcube:button command="permaurl" type="link" class="button extwin" classSel="button extwin pressed" innerClass="inner" title="openinextwin" content="[]" target="_blank" />
	</div>

	</div>

	<div id="messagepreview">
	<div class="rightcol">
	<roundcube:object name="messageAttachments" id="attachment-list" class="attachmentslist" />
	</div>
	<div class="leftcol">
	<roundcube:object name="messageObjects" id="message-objects" />
	<roundcube:object name="messageBody" id="messagebody" />
	</div>
	</div>

	<roundcube:include file="/includes/footer.html" />

	</body>
	</html>
	diff --git a/skins/larry/ui.js b/skins/larry/ui.js
	index ca1680759..176c93b7d 100644
	--- a/skins/larry/ui.js
	+++ b/skins/larry/ui.js
	@@ -1,1150 +1,1166 @@
	/**
	* Roundcube functions for default skin interface
	*
	* Copyright (c) 2011, The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*/


	function rcube_mail_ui()
	{
	var env = {};
	var popups = {};
	var popupconfig = {
	forwardmenu: { editable:1 },
	searchmenu: { editable:1, callback:searchmenu },
	listoptions: { editable:1 },
	dragmessagemenu: { sticky:1 },
	groupmenu: { above:1 },
	mailboxmenu: { above:1 },
	composeoptionsmenu: { editable:1, overlap:1 },
	spellmenu: { callback: spellmenu },
	// toggle: #1486823, #1486930
	'attachment-form': { editable:1, above:1, toggle:!bw.ie&&!bw.linux },
	'upload-form': { editable:1, toggle:!bw.ie&&!bw.linux }
	};

	var me = this;
	var mailviewsplit;
	var compose_headers = {};

	// export public methods
	this.set = setenv;
	this.init = init;
	this.init_tabs = init_tabs;
	this.show_about = show_about;
	this.show_popup = show_popup;
	this.set_searchmod = set_searchmod;
	this.show_uploadform = show_uploadform;
	this.show_header_row = show_header_row;
	this.hide_header_row = hide_header_row;


	/**
	*
	*/
	function setenv(key, val)
	{
	env[key] = val;
	}

	/**
	* Initialize UI
	* Called on document.ready
	*/
	function init()
	{
	rcmail.addEventListener('message', message_displayed);

	/* mail task */
	if (rcmail.env.task == 'mail') {
	rcmail.addEventListener('menu-open', show_listoptions);
	rcmail.addEventListener('menu-save', save_listoptions);
	rcmail.addEventListener('responseafterlist', function(e){ switch_view_mode(rcmail.env.threading ? 'thread' : 'list') });

	var dragmenu = $('#dragmessagemenu');
	if (dragmenu.length) {
	rcmail.gui_object('message_dragmenu', 'dragmessagemenu');
	popups.dragmessagemenu = dragmenu;
	}

	if (rcmail.env.action == 'show' \|\| rcmail.env.action == 'preview') {
	layout_messageview();
	- rcmail.addEventListener('aftershow-headers', function() { layout_messageview(); });
	- rcmail.addEventListener('afterhide-headers', function() { layout_messageview(); });
	- $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); return false });
	+ $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); return false; });
	+ $('#headerstoggleall').click(function(e){ toggle_all_headers(this); return false; });
	}
	else if (rcmail.env.action == 'compose') {
	rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 200); });
	rcmail.addEventListener('aftersend-attachment', show_uploadform);
	rcmail.addEventListener('add-recipient', function(p){ show_header_row(p.field, true); });
	layout_composeview();

	// Show input elements with non-empty value
	var field, fields = ['cc', 'bcc', 'replyto', 'followupto'];
	for (var f=0; f < fields.length; f++) {
	if ((field = $('#_'+fields[f])) && field.length && field.val() != '')
	show_header_row(fields[f], true);
	}

	$('#composeoptionstoggle').parent().click(function(){
	$('#composeoptionstoggle').toggleClass('enabled');
	$('#composeoptions').toggle();
	layout_composeview();
	return false;
	}).css('cursor', 'pointer');

	new rcube_splitter({ id:'composesplitterv', p1:'#composeview-left', p2:'#composeview-right',
	orientation:'v', relative:true, start:248, min:170, size:12, render:layout_composeview }).init();
	}
	else if (rcmail.env.action == 'list' \|\| !rcmail.env.action) {
	var previewframe = $('#mailpreviewframe').is(':visible');
	$('#mailpreviewtoggle').addClass(previewframe ? 'enabled' : 'closed').click(function(e){ toggle_preview_pane(e); return false });
	$('#maillistmode').addClass(rcmail.env.threading ? '' : 'selected').click(function(e){ switch_view_mode('list'); return false });
	$('#mailthreadmode').addClass(rcmail.env.threading ? 'selected' : '').click(function(e){ switch_view_mode('thread'); return false });

	mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom',
	orientation:'h', relative:true, start:310, min:150, size:12, offset:4 });
	if (previewframe)
	mailviewsplit.init();

	new rcube_scroller('#folderlist-content', '#folderlist-header', '#folderlist-footer');

	rcmail.addEventListener('setquota', update_quota);
	}

	if ($('#mailview-left').length) {
	new rcube_splitter({ id:'mailviewsplitterv', p1:'#mailview-left', p2:'#mailview-right',
	orientation:'v', relative:true, start:226, min:150, size:12, callback:render_mailboxlist, render:resize_leftcol }).init();
	}
	}
	/* settings task */
	else if (rcmail.env.task == 'settings') {
	rcmail.addEventListener('init', function(){
	var tab = '#settingstabpreferences';
	if (rcmail.env.action)
	tab = '#settingstab' + (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action.replace(/\./g, ''));

	$(tab).addClass('selected')
	.children().first().removeAttr('onclick').click(function() { return false; });
	});

	if (rcmail.env.action == 'folders') {
	new rcube_splitter({ id:'folderviewsplitter', p1:'#folderslist', p2:'#folder-details',
	orientation:'v', relative:true, start:266, min:180, size:12 }).init();

	new rcube_scroller('#folderslist-content', '#folderslist-header', '#folderslist-footer');

	rcmail.addEventListener('setquota', update_quota);
	}
	else if (rcmail.env.action == 'identities') {
	new rcube_splitter({ id:'identviewsplitter', p1:'#identitieslist', p2:'#identity-details',
	orientation:'v', relative:true, start:266, min:180, size:12 }).init();
	}
	else if (rcmail.env.action == 'preferences') {
	new rcube_splitter({ id:'prefviewsplitter', p1:'#sectionslist', p2:'#preferences-box',
	orientation:'v', relative:true, start:266, min:180, size:12 }).init();
	}
	}
	/* addressbook task */
	else if (rcmail.env.task == 'addressbook') {
	rcmail.addEventListener('afterupload-photo', show_uploadform);

	if (rcmail.env.action == '') {
	new rcube_splitter({ id:'addressviewsplitterd', p1:'#addressview-left', p2:'#addressview-right',
	orientation:'v', relative:true, start:226, min:150, size:12, render:resize_leftcol }).init();
	new rcube_splitter({ id:'addressviewsplitter', p1:'#addresslist', p2:'#contacts-box',
	orientation:'v', relative:true, start:286, min:270, size:12 }).init();

	new rcube_scroller('#directorylist-content', '#directorylist-header', '#directorylist-footer');
	}
	}

	// turn a group of fieldsets into tabs
	$('.tabbed').each(function(idx, elem){ init_tabs(elem); })

	// decorate select elements
	$('select.decorated').each(function(){
	if (bw.opera) {
	$(this).removeClass('decorated');
	return;
	}

	var select = $(this),
	height = Math.max(select.height(), 26) - 2,
	width = select.width() - 22,
	title = $('option', this).first().text();

	if ($('option:selected', this).val() != '')
	title = $('option:selected', this).text();

	var overlay = $('<a class="menuselector"><span class="handle">' + title + '</span></a>')
	.css('position', 'absolute')
	.offset(select.position())
	.insertAfter(select);

	overlay.children().width(width).height(height).css('line-height', (height - 1) + 'px');

	select.change(function() {
	var val = $('option:selected', this).text();
	$(this).next().children().html(val);
	});

	var parent = select.parent();
	if (parent.css('position') != 'absolute')
	parent.css('position', 'relative');

	// re-set original select width to fix click action and options width in some browsers
	select.width(overlay.width());
	});

	$(document.body)
	.bind('mouseup', body_mouseup)
	.bind('keyup', function(e){
	if (e.keyCode == 27) {
	for (var id in popups) {
	if (popups[id].is(':visible'))
	show_popup(id, false);
	}
	}
	});

	$('iframe').load(function(e){
	// this = iframe
	var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
	$(doc).mouseup(body_mouseup);
	})
	.contents().mouseup(body_mouseup);

	// don't use $(window).resize() due to some unwanted side-effects
	window.onresize = resize;
	resize();
	}

	/**
	* Handler for mouse-up events on the document body.
	* This will close all open popup menus
	*/
	function body_mouseup(e)
	{
	var config, obj, target = e.target;
	if (target.className == 'inner')
	target = e.target.parentNode;
	for (var id in popups) {
	obj = popups[id];
	config = popupconfig[id];
	if (obj.is(':visible')
	&& target.id != id+'link'
	&& !config.toggle
	&& (!config.editable \|\| !target_overlaps(target, obj.get(0)))
	&& (!config.sticky \|\| !rcube_mouse_is_over(e, obj.get(0)))
	) {
	var myid = id+'';
	window.setTimeout(function(){ show_popupmenu(myid, false) }, 10);
	}
	}
	}

	/**
	* Update UI on window resize
	*/
	function resize()
	{
	if (rcmail.env.task == 'mail' && (rcmail.env.action == 'show' \|\| rcmail.env.action == 'preview')) {
	layout_messageview();
	}
	if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
	layout_composeview();
	}

	// make iframe footer buttons float if scrolling is active
	$('body.iframe .footerleft').each(function(){
	var footer = $(this),
	body = $(document.body),
	floating = footer.hasClass('floating'),
	overflow = body.outerHeight(true) > $(window).height();
	if (overflow != floating) {
	var action = overflow ? 'addClass' : 'removeClass';
	footer[action]('floating');
	body[action]('floatingbuttons');
	}
	})

	}

	/**
	* Triggered when a new user message is displayed
	*/
	function message_displayed(p)
	{
	// show a popup dialog on errors
	if (p.type == 'error' && rcmail.env.task != 'login') {
	if (!me.messagedialog) {
	me.messagedialog = $('<div>').addClass('popupdialog');
	}

	var pos = $(p.object).offset();
	pos.top -= (rcmail.env.task == 'login' ? 20 : 160);
	me.messagedialog.dialog('close');
	me.messagedialog.html(p.message)
	.dialog({
	resizable: false,
	closeOnEscape: true,
	dialogClass: 'popupmessage ' + p.type,
	title: env.errortitle,
	close: function() {
	me.messagedialog.dialog('destroy').hide();
	},
	position: ['center', pos.top],
	hide: { effect:'drop', direction:'down' },
	width: 420,
	minHeight: 90
	}).show();

	window.setTimeout(function(){ me.messagedialog.dialog('close'); }, Math.max(2000, p.timeout / 2));
	}
	}


	/**
	* Adjust UI objects of the mail view screen
	*/
	function layout_messageview()
	{
	- $('#messagecontent').css('top', ($('#messageheader').outerHeight() + 10) + 'px');
	$('#message-objects div a').addClass('button');

	if (!$('#attachment-list li').length) {
	$('div.rightcol').hide();
	$('div.leftcol').css('margin-right', '0');
	}
	}


	function render_mailboxlist(splitter)
	{
	// TODO: implement smart shortening of long folder names
	}


	function resize_leftcol(splitter)
	{
	// STUB
	}


	function layout_composeview()
	{
	var body = $('#composebody'),
	form = $('#compose-content'),
	bottom = $('#composeview-bottom'),
	w, h;

	bottom.css('height', (form.height() - bottom.position().top) + 'px');

	w = body.parent().width() - 5;
	h = body.parent().height() - 16;
	body.width(w).height(h);

	$('#composebody_tbl').width((w+8)+'px').height('').css('margin-top', '1px');
	$('#composebody_ifr').width((w+8)+'px').height((h-40)+'px');
	$('#googie_edit_layer').height(h+'px');

	var abooks = $('#directorylist');
	$('#compose-contacts .scroller').css('top', abooks.position().top + abooks.outerHeight());
	}


	function update_quota(p)
	{
	var step = 24, step_count = 20,
	y = p.total ? Math.ceil(p.percent / 100 * step_count) * step : 0;

	// never show full-circle if quota is close to 100% but below.
	if (p.total && y == step * step_count && p.percent < 100)
	y -= step;

	$('#quotadisplay').css('background-position', '0 -'+y+'px');
	}


	/**
	* Trigger for popup menus
	*/
	function show_popup(popup, show, config)
	{
	// auto-register menu object
	if (config \|\| !popupconfig[popup])
	popupconfig[popup] = $.extend(popupconfig[popup] \|\| {}, config);

	var visible = show_popupmenu(popup, show),
	config = popupconfig[popup];
	if (typeof config.callback == 'function')
	config.callback(visible);
	}

	/**
	* Show/hide a specific popup menu
	*/
	function show_popupmenu(popup, show)
	{
	var obj = popups[popup],
	config = popupconfig[popup],
	ref = $('#'+popup+'link'),
	above = config.above;

	if (!obj) {
	obj = popups[popup] = $('#'+popup);
	obj.appendTo(document.body); // move them to top for proper absolute positioning
	}

	if (!obj \|\| !obj.length)
	return false;

	if (typeof show == 'undefined')
	show = obj.is(':visible') ? false : true;
	else if (config.toggle && show && obj.is(':visible'))
	show = false;

	if (show && ref) {
	var parent = ref.parent(),
	win = $(window),
	pos;

	if (parent.hasClass('dropbutton'))
	ref = parent;

	pos = ref.offset();
	ref.offsetHeight = ref.outerHeight();
	if (!above && pos.top + ref.offsetHeight + obj.height() > win.height())
	above = true;
	if (pos.left + obj.width() > win.width())
	pos.left = win.width() - obj.width() - 12;

	obj.css({ left:pos.left, top:(pos.top + (above ? -obj.height() : ref.offsetHeight)) });
	}

	obj[show?'show':'hide']();

	// hide drop-down elements on buggy browsers
	if (bw.ie6 && config.overlap) {
	$('select').css('visibility', show?'hidden':'inherit');
	$('select', obj).css('visibility', 'inherit');
	}

	return show;
	}

	/**
	*
	*/
	function target_overlaps(target, elem)
	{
	while (target.parentNode) {
	if (target.parentNode == elem)
	return true;
	target = target.parentNode;
	}
	return false;
	}


	/**
	* Show/hide the preview pane
	*/
	function toggle_preview_pane(e)
	{
	var button = $(e.target),
	frame = $('#mailpreviewframe'),
	visible = !frame.is(':visible'),
	splitter = mailviewsplit.pos \|\| parseInt(rcmail.get_cookie('mailviewsplitter') \|\| 320),
	topstyles, bottomstyles, uid;

	frame.toggle();
	button.removeClass().addClass(visible ? 'enabled' : 'closed');

	if (visible) {
	$('#mailview-top').removeClass('fullheight').css({ bottom:'auto' });
	$('#mailview-bottom').css({ height:'auto' });

	rcmail.env.contentframe = 'messagecontframe';
	if (uid = rcmail.message_list.get_single_selection())
	rcmail.show_message(uid, false, true);

	// let the splitter set the correct size and position
	if (mailviewsplit.handle) {
	mailviewsplit.handle.show();
	mailviewsplit.resize();
	}
	else
	mailviewsplit.init();
	}
	else {
	rcmail.env.contentframe = null;
	rcmail.show_contentframe(false);

	$('#mailview-top').addClass('fullheight').css({ height:'auto', bottom:'28px' });
	$('#mailview-bottom').css({ top:'auto', height:'26px' });

	if (mailviewsplit.handle)
	mailviewsplit.handle.hide();
	}

	if (visible && uid && rcmail.message_list)
	rcmail.message_list.scrollto(uid);

	rcmail.command('save-pref', { name:'preview_pane', value:(visible?1:0) });
	}


	/**
	* Switch between short and full headers display in message preview
	*/
	function toggle_preview_headers(button)
	{
	$('#preview-shortheaders').toggle();
	var full = $('#preview-allheaders').toggle(),
	- button = $('a#previewheaderstoggle');
	+ button = $('#previewheaderstoggle');
	+
	+ if (!$('#headerstoggleall').length)
	+ $('#all-headers').toggle();

	// add toggle button to full headers table
	- if (full.is(':visible'))
	- button.attr('href', '#hide').removeClass('add').addClass('remove')
	- else
	- button.attr('href', '#details').removeClass('remove').addClass('add')
	+ if (full.is(':visible')) {
	+ button.attr('href', '#hide').removeClass('add').addClass('remove');
	+ }
	+ else {
	+ button.attr('href', '#details').removeClass('remove').addClass('add');
	+ }
	+ }
	+
	+
	+ /**
	+ * Show/hide all message headers
	+ */
	+ function toggle_all_headers(button)
	+ {
	+ rcmail.command('show-headers', '', button);
	+ $(button).remove();
	+ $('#previewheaderstoggle span').css({bottom: '5px'});
	+
	+ return false;
	}


	/**
	*
	*/
	function switch_view_mode(mode)
	{
	if (rcmail.env.threading != (mode == 'thread'))
	rcmail.set_list_options(null, undefined, undefined, mode == 'thread' ? 1 : 0);

	$('#maillistmode, #mailthreadmode').removeClass('selected');
	$('#mail'+mode+'mode').addClass('selected');
	}


	/** popup callbacks **/

	function searchmenu(show)
	{
	if (show && rcmail.env.search_mods) {
	var n, all,
	obj = popups['searchmenu'],
	list = $('input:checkbox[name="s_mods[]"]', obj),
	mbox = rcmail.env.mailbox,
	mods = rcmail.env.search_mods;

	if (rcmail.env.task == 'mail') {
	mods = mods[mbox] ? mods[mbox] : mods['*'];
	all = 'text';
	}
	else {
	all = '*';
	}

	if (mods[all])
	list.map(function() {
	this.checked = true;
	this.disabled = this.value != all;
	});
	else {
	list.prop('disabled', false).prop('checked', false);
	for (n in mods)
	$('#s_mod_' + n).prop('checked', true);
	}
	}
	}


	function spellmenu(show)
	{
	var link, li,
	lang = rcmail.spellcheck_lang(),
	menu = popups.spellmenu,
	ul = $('ul', menu);

	if (!ul.length) {
	ul = $('<ul class="toolbarmenu selectable">');

	for (i in rcmail.env.spell_langs) {
	li = $('<li>');
	link = $('<a href="#"></a>').text(rcmail.env.spell_langs[i])
	.addClass('active').data('lang', i)
	.click(function() {
	rcmail.spellcheck_lang_set($(this).data('lang'));
	});

	link.appendTo(li);
	li.appendTo(ul);
	}

	ul.appendTo(menu);
	}

	// select current language
	$('li', ul).each(function() {
	var el = $('a', this);
	if (el.data('lang') == lang)
	el.addClass('selected');
	else if (el.hasClass('selected'))
	el.removeClass('selected');
	});
	}


	/**
	*
	*/
	function show_listoptions()
	{
	var $dialog = $('#listoptions');

	// close the dialog
	if ($dialog.is(':visible')) {
	$dialog.dialog('close');
	return;
	}

	// set form values
	$('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
	$('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
	$('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
	$('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false);
	$('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true);

	// set checkboxes
	$('input[name="list_col[]"]').each(function() {
	$(this).prop('checked', $.inArray(this.value, rcmail.env.coltypes) != -1);
	});

	$dialog.dialog({
	modal: true,
	resizable: false,
	closeOnEscape: true,
	title: null,
	close: function() {
	$dialog.dialog('destroy').hide();
	},
	width: 650
	}).show();
	}


	/**
	*
	*/
	function save_listoptions()
	{
	$('#listoptions').dialog('close');

	var sort = $('input[name="sort_col"]:checked').val(),
	ord = $('input[name="sort_ord"]:checked').val(),
	thread = $('input[name="view"]:checked').val(),
	cols = $('input[name="list_col[]"]:checked')
	.map(function(){ return this.value; }).get();

	rcmail.set_list_options(cols, sort, ord, thread == 'thread' ? 1 : 0);
	}


	/**
	*
	*/
	function set_searchmod(elem)
	{
	var all, m, task = rcmail.env.task,
	mods = rcmail.env.search_mods,
	mbox = rcmail.env.mailbox;

	if (!mods)
	mods = {};

	if (task == 'mail') {
	if (!mods[mbox])
	mods[mbox] = rcube_clone_object(mods['*']);
	m = mods[mbox];
	all = 'text';
	}
	else { //addressbook
	m = mods;
	all = '*';
	}

	if (!elem.checked)
	delete(m[elem.value]);
	else
	m[elem.value] = 1;

	// mark all fields
	if (elem.value != all)
	return;

	$('input:checkbox[name="s_mods[]"]').map(function() {
	if (this == elem)
	return;

	this.checked = true;
	if (elem.checked) {
	this.disabled = true;
	delete m[this.value];
	}
	else {
	this.disabled = false;
	m[this.value] = 1;
	}
	});
	}


	function show_uploadform()
	{
	var $dialog = $('#upload-dialog');

	// close the dialog
	if ($dialog.is(':visible')) {
	$dialog.dialog('close');
	return;
	}

	// add icons to clone file input field
	if (rcmail.env.action == 'compose' && !$dialog.data('extended')) {
	$('<a>')
	.addClass('iconlink add')
	.attr('href', '#add')
	.html('Add')
	.appendTo($('input[type="file"]', $dialog).parent())
	.click(add_uploadfile);
	$dialog.data('extended', true);
	}

	$dialog.dialog({
	modal: true,
	resizable: false,
	closeOnEscape: true,
	title: $dialog.attr('title'),
	close: function() {
	try { $('#upload-dialog form').get(0).reset(); }
	catch(e){ } // ignore errors

	$dialog.dialog('destroy').hide();
	$('div.addline', $dialog).remove();
	},
	width: 480
	}).show();

	if (!document.all)
	$('input[type=file]', $dialog).first().click();
	}

	function add_uploadfile(e)
	{
	var div = $(this).parent();
	var clone = div.clone().addClass('addline').insertAfter(div);
	clone.children('.iconlink').click(add_uploadfile);
	clone.children('input').val('');

	if (!document.all)
	$('input[type=file]', clone).click();
	}


	/**
	*
	*/
	function show_header_row(which, updated)
	{
	var row = $('#compose-' + which);
	if (row.is(':visible'))
	return; // nothing to be done here

	if (compose_headers[which] && !updated)
	$('#_' + which).val(compose_headers[which]);

	row.show();
	$('#' + which + '-link').hide();
	layout_composeview();
	return false;
	}

	/**
	*
	*/
	function hide_header_row(which)
	{
	// copy and clear field value
	var field = $('#_' + which);
	compose_headers[which] = field.val();
	field.val('');

	$('#compose-' + which).hide();
	$('#' + which + '-link').show();
	layout_composeview();
	return false;
	}


	/**
	* Fieldsets-to-tabs converter
	*/
	function init_tabs(elem, current)
	{
	var content = $(elem),
	id = content.get(0).id,
	fs = content.children('fieldset');

	if (!fs.length)
	return;

	if (!id) {
	id = 'rcmtabcontainer';
	content.attr('id', id);
	}

	// first hide not selected tabs
	current = current \|\| 0;
	fs.each(function(idx) { if (idx != current) $(this).hide(); });

	// create tabs container
	var tabs = $('<div>').addClass('tabsbar').prependTo(content);

	// convert fildsets into tabs
	fs.each(function(idx) {
	var tab, a, elm = $(this), legend = elm.children('legend');

	// create a tab
	a = $('<a>').text(legend.text()).attr('href', '#');
	tab = $('<span>').attr({'id': 'tab'+idx, 'class': 'tablink'})
	.click(function() { show_tab(id, idx); return false })

	// remove legend
	legend.remove();
	// style fieldset
	elm.addClass('tab');
	// style selected tab
	if (idx == current)
	tab.addClass('selected');

	// add the tab to container
	tab.append(a).appendTo(tabs);
	});
	}

	function show_tab(id, index)
	{
	var fs = $('#'+id).children('fieldset');

	fs.each(function(idx) {
	// Show/hide fieldset (tab content)
	$(this)[index==idx ? 'show' : 'hide']();
	// Select/unselect tab
	$('#tab'+idx).toggleClass('selected', idx==index);
	});
	}

	/**
	* Show about page as jquery UI dialog
	*/
	function show_about(elem)
	{
	var frame = $('<iframe>').attr('id', 'aboutframe')
	.attr('src', rcmail.url('settings/about'))
	.attr('frameborder', '0')
	.appendTo(document.body);

	var h = Math.floor($(window).height() * 0.75);
	var buttons = {};
	var supportln = $('#supportlink');
	if (supportln.length && (env.supporturl = supportln.attr('href')))
	buttons[supportln.html()] = function(e){ env.supporturl.indexOf('mailto:') < 0 ? window.open(env.supporturl) : location.href = env.supporturl };

	frame.dialog({
	modal: true,
	resizable: false,
	closeOnEscape: true,
	title: elem ? elem.title \|\| elem.innerHTML : null,
	close: function() {
	frame.dialog('destroy').remove();
	},
	buttons: buttons,
	width: 640,
	height: h
	}).width(640);
	}
	}


	/**
	* Roundcube Scroller class
	*/
	function rcube_scroller(list, top, bottom)
	{
	var ref = this;

	this.list = $(list);
	this.top = $(top);
	this.bottom = $(bottom);
	this.step_size = 6;
	this.step_time = 20;
	this.delay = 500;

	this.top
	.mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); })
	.mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });

	this.bottom
	.mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); })
	.mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });

	this.scroll = function(dir)
	{
	var ref = this, size = this.step_size;

	if (!rcmail.drag_active)
	return;

	if (dir == 'down')
	size *= -1;

	this.list.get(0).scrollTop += size;
	this.ts = window.setTimeout(function() { ref.scroll(dir); }, this.step_time);
	};
	};


	/**
	* Roundcube UI splitter class
	*
	* @constructor
	*/
	function rcube_splitter(p)
	{
	this.p = p;
	this.id = p.id;
	this.horizontal = (p.orientation == 'horizontal' \|\| p.orientation == 'h');
	this.halfsize = (p.size !== undefined ? p.size : 10) / 2;
	this.pos = p.start \|\| 0;
	this.min = p.min \|\| 20;
	this.offset = p.offset \|\| 0;
	this.relative = p.relative ? true : false;
	this.drag_active = false;
	this.render = p.render;
	this.callback = p.callback;

	var me = this;
	rcube_splitter._instances[this.id] = me;

	this.init = function()
	{
	this.p1 = $(this.p.p1);
	this.p2 = $(this.p.p2);

	// check if referenced elements exist, otherwise abort
	if (!this.p1.length \|\| !this.p2.length)
	return;

	// create and position the handle for this splitter
	this.p1pos = this.relative ? this.p1.position() : this.p1.offset();
	this.p2pos = this.relative ? this.p2.position() : this.p2.offset();
	this.handle = $('<div>')
	.attr('id', this.id)
	.attr('unselectable', 'on')
	.addClass('splitter ' + (this.horizontal ? 'splitter-h' : 'splitter-v'))
	.appendTo(this.p1.parent())
	.bind('mousedown', onDragStart);

	if (this.horizontal) {
	var top = this.p1pos.top + this.p1.outerHeight();
	this.handle.css({ left:'0px', top:top+'px' });
	}
	else {
	var left = this.p1pos.left + this.p1.outerWidth();
	this.handle.css({ left:left+'px', top:'0px' });
	}

	// listen to window resize on IE
	if (bw.ie)
	$(window).resize(onResize);

	// read saved position from cookie
	var cookie = rcmail.get_cookie(this.id);
	if (cookie && !isNaN(cookie)) {
	this.pos = parseFloat(cookie);
	this.resize();
	}
	else if (this.pos) {
	this.resize();
	this.set_cookie();
	}
	};

	/**
	* Set size and position of all DOM objects
	* according to the saved splitter position
	*/
	this.resize = function()
	{
	if (this.horizontal) {
	this.p1.css('height', Math.floor(this.pos - this.p1pos.top - this.halfsize) + 'px');
	this.p2.css('top', Math.ceil(this.pos + this.halfsize + 2) + 'px');
	this.handle.css('top', Math.round(this.pos - this.halfsize + this.offset)+'px');
	if (bw.ie) {
	var new_height = parseInt(this.p2.parent().outerHeight(), 10) - parseInt(this.p2.css('top'), 10) - (bw.ie8 ? 2 : 0);
	this.p2.css('height', (new_height > 0 ? new_height : 0) + 'px');
	}
	}
	else {
	this.p1.css('width', Math.floor(this.pos - this.p1pos.left - this.halfsize) + 'px');
	this.p2.css('left', Math.ceil(this.pos + this.halfsize) + 'px');
	this.handle.css('left', Math.round(this.pos - this.halfsize + this.offset + 3)+'px');
	if (bw.ie) {
	var new_width = parseInt(this.p2.parent().outerWidth(), 10) - parseInt(this.p2.css('left'), 10) ;
	this.p2.css('width', (new_width > 0 ? new_width : 0) + 'px');
	}
	}

	this.p2.resize();
	this.p1.resize();

	// also resize iframe covers
	if (this.drag_active) {
	$('iframe').each(function(i, elem) {
	var pos = $(this).offset();
	$('#iframe-splitter-fix-'+i).css({ top: pos.top+'px', left: pos.left+'px', width:elem.offsetWidth+'px', height: elem.offsetHeight+'px' });
	});
	}

	if (typeof this.render == 'function')
	this.render(this);
	};

	/**
	* Handler for mousedown events
	*/
	function onDragStart(e)
	{
	// disable text selection while dragging the splitter
	if (bw.konq \|\| bw.chrome \|\| bw.safari)
	document.body.style.webkitUserSelect = 'none';

	me.p1pos = me.relative ? me.p1.position() : me.p1.offset();
	me.p2pos = me.relative ? me.p2.position() : me.p2.offset();
	me.drag_active = true;

	// start listening to mousemove events
	$(document).bind('mousemove.'+this.id, onDrag).bind('mouseup.'+this.id, onDragStop);

	// enable dragging above iframes
	$('iframe').each(function(i, elem) {
	$('<div>')
	.attr('id', 'iframe-splitter-fix-'+i)
	.addClass('iframe-splitter-fix')
	.css({ background: '#fff',
	width: elem.offsetWidth+'px', height: elem.offsetHeight+'px',
	position: 'absolute', opacity: '0.001', zIndex: 1000
	})
	.css($(this).offset())
	.appendTo('body');
	});
	};

	/**
	* Handler for mousemove events
	*/
	function onDrag(e)
	{
	if (!me.drag_active)
	return false;

	var pos = rcube_event.get_mouse_pos(e);

	if (me.relative) {
	var parent = me.p1.parent().offset();
	pos.x -= parent.left;
	pos.y -= parent.top;
	}

	if (me.horizontal) {
	if (((pos.y - me.halfsize) > me.p1pos.top) && ((pos.y + me.halfsize) < (me.p2pos.top + me.p2.outerHeight()))) {
	me.pos = Math.max(me.min, pos.y - me.offset);
	me.resize();
	}
	}
	else {
	if (((pos.x - me.halfsize) > me.p1pos.left) && ((pos.x + me.halfsize) < (me.p2pos.left + me.p2.outerWidth()))) {
	me.pos = Math.max(me.min, pos.x - me.offset);
	me.resize();
	}
	}

	me.p1pos = me.relative ? me.p1.position() : me.p1.offset();
	me.p2pos = me.relative ? me.p2.position() : me.p2.offset();
	return false;
	};

	/**
	* Handler for mouseup events
	*/
	function onDragStop(e)
	{
	// resume the ability to highlight text
	if (bw.konq \|\| bw.chrome \|\| bw.safari)
	document.body.style.webkitUserSelect = 'auto';

	// cancel the listening for drag events
	$(document).unbind('.'+me.id);
	me.drag_active = false;

	// remove temp divs
	$('div.iframe-splitter-fix').remove();

	me.set_cookie();

	if (typeof me.callback == 'function')
	me.callback(me);

	return bw.safari ? true : rcube_event.cancel(e);
	};

	/**
	* Handler for window resize events
	*/
	function onResize(e)
	{
	if (me.horizontal) {
	var new_height = parseInt(me.p2.parent().outerHeight(), 10) - parseInt(me.p2[0].style.top, 10) - (bw.ie8 ? 2 : 0);
	me.p2.css('height', (new_height > 0 ? new_height : 0) +'px');
	}
	else {
	var new_width = parseInt(me.p2.parent().outerWidth(), 10) - parseInt(me.p2[0].style.left, 10);
	me.p2.css('width', (new_width > 0 ? new_width : 0) + 'px');
	}
	};

	/**
	* Saves splitter position in cookie
	*/
	this.set_cookie = function()
	{
	var exp = new Date();
	exp.setYear(exp.getFullYear() + 1);
	rcmail.set_cookie(this.id, this.pos, exp);
	};

	} // end class rcube_splitter


	// static getter for splitter instances
	rcube_splitter._instances = {};

	rcube_splitter.get_instance = function(id)
	{
	return rcube_splitter._instances[id];
	};

File Metadata

Mime Type: text/x-diff
Expires: Wed, Feb 4, 3:43 AM (8 h, 15 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 427493
Default Alt Text: (226 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions