No OneTemporary
Actions

Size

283 KB

Referenced Files

None

Subscribers

None

View Options

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

	diff --git a/plugins/help/skins/classic/help.css b/plugins/help/skins/classic/help.css
	index c45b8f0b0..0c296b128 100644
	--- a/plugins/help/skins/classic/help.css
	+++ b/plugins/help/skins/classic/help.css
	@@ -1,43 +1,43 @@
	/*** Roundcube\|Mail Help task styles ***/

	#taskbar a.button-help
	{
	background-image: url('help.gif');
	}

	.extwin #tabsbar
	{
	top: 21px;
	left: 20px;
	right: 100px;
	border-bottom: 0;
	}

	-.closelink {
	+.helpwin .closelink {
	position: absolute;
	top: 20px;
	right: 20px;
	}

	.help-box
	{
	overflow: auto;
	background-color: #F2F2F2;
	}

	#helplicense, #helpabout
	{
	width: 46em;
	padding: 1em 2em;
	}

	#helplicense a, #helpabout a
	{
	color: #900;
	}

	#helpabout
	{
	margin: 0 auto;
	}

	diff --git a/plugins/help/skins/classic/templates/help.html b/plugins/help/skins/classic/templates/help.html
	index 3d5b22869..bb20c51e3 100644
	--- a/plugins/help/skins/classic/templates/help.html
	+++ b/plugins/help/skins/classic/templates/help.html
	@@ -1,41 +1,41 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	<link rel="stylesheet" type="text/css" href="/this/help.css" />
	<script type="text/javascript">
	function help_init_settings_tabs()
	{
	var action, tab = '#helptabindex';
	if (window.rcmail && (action = rcmail.env.action)) {
	tab = '#helptab' + (action ? action : 'index');
	}
	$(tab).addClass('tablink-selected');
	}
	</script>
	</head>
	<roundcube:if condition="env:extwin" />
	-<body class="extwin">
	+<body class="extwin helpwin">
	<roundcube:object name="message" id="message" />
	<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
	<roundcube:else />
	-<body>
	+<body class="helpwin">
	<roundcube:include file="/includes/taskbar.html" />
	<roundcube:include file="/includes/header.html" />
	<roundcube:endif />

	<div id="tabsbar">
	<span id="helptabindex" class="tablink"><roundcube:object name="tablink" action="index" type="link" label="help.help" title="help.help" /></span>
	<span id="helptababout" class="tablink"><roundcube:object name="tablink" action="about" type="link" label="help.about" title="help.about" class="tablink" /></span>
	<span id="helptablicense" class="tablink"><roundcube:object name="tablink" action="license" type="link" label="help.license" title="help.license" class="tablink" /></span>
	<roundcube:container name="helptabs" id="helptabsbar" />
	<script type="text/javascript"> if (window.rcmail) rcmail.add_onload(help_init_settings_tabs);</script>
	</div>

	<div id="mainscreen" class="box help-box">
	<roundcube:object name="helpcontent" id="helpcontentframe" width="100%" height="100%" frameborder="0" src="/watermark.html" />
	</div>

	</body>
	</html>
	diff --git a/plugins/jqueryui/themes/classic/jquery-ui-1.10.4.custom.css b/plugins/jqueryui/themes/classic/jquery-ui-1.10.4.custom.css
	index 318cc7ebf..4ead5aaf2 100755
	--- a/plugins/jqueryui/themes/classic/jquery-ui-1.10.4.custom.css
	+++ b/plugins/jqueryui/themes/classic/jquery-ui-1.10.4.custom.css
	@@ -1,1220 +1,1223 @@
	/*! jQuery UI - v1.10.4 - 2014-06-17
	* http://jqueryui.com
	* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
	* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande%2C%20Verdana%2C%20Arial%2C%20Helvetica%2C%20sans-serif&fwDefault=normal&fsDefault=1em&cornerRadius=0&bgColorHeader=f4f4f4&bgTextureHeader=highlight_hard&bgImgOpacityHeader=90&borderColorHeader=999999&fcHeader=333333&iconColorHeader=333333&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=000000&iconColorContent=000000&bgColorDefault=e6e6e7&bgTextureDefault=highlight_hard&bgImgOpacityDefault=90&borderColorDefault=aaaaaa&fcDefault=000000&iconColorDefault=666666&bgColorHover=e6e6e7&bgTextureHover=highlight_hard&bgImgOpacityHover=90&borderColorHover=999999&fcHover=000000&iconColorHover=333333&bgColorActive=a3a3a3&bgTextureActive=highlight_hard&bgImgOpacityActive=90&borderColorActive=a4a4a4&fcActive=000000&iconColorActive=333333&bgColorHighlight=cc3333&bgTextureHighlight=flat&bgImgOpacityHighlight=90&borderColorHighlight=cc3333&fcHighlight=ffffff&iconColorHighlight=dddddd&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cc3333&fcError=cc3333&iconColorError=cc3333&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=35&thicknessShadow=6px&offsetTopShadow=-6px&offsetLeftShadow=-6px&cornerRadiusShadow=6px&ctl=themeroller
	* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */

	/* Layout helpers
	----------------------------------*/
	.ui-helper-hidden {
	display: none;
	}
	.ui-helper-hidden-accessible {
	border: 0;
	clip: rect(0 0 0 0);
	height: 1px;
	margin: -1px;
	overflow: hidden;
	padding: 0;
	position: absolute;
	width: 1px;
	}
	.ui-helper-reset {
	margin: 0;
	padding: 0;
	border: 0;
	outline: 0;
	line-height: 1.3;
	text-decoration: none;
	font-size: 100%;
	list-style: none;
	}
	.ui-helper-clearfix:before,
	.ui-helper-clearfix:after {
	content: "";
	display: table;
	border-collapse: collapse;
	}
	.ui-helper-clearfix:after {
	clear: both;
	}
	.ui-helper-clearfix {
	min-height: 0; /* support: IE7 */
	}
	.ui-helper-zfix {
	width: 100%;
	height: 100%;
	top: 0;
	left: 0;
	position: absolute;
	opacity: 0;
	filter:Alpha(Opacity=0);
	}

	.ui-front {
	z-index: 100;
	}


	/* Interaction Cues
	----------------------------------*/
	.ui-state-disabled {
	cursor: default !important;
	}


	/* Icons
	----------------------------------*/

	/* states and images */
	.ui-icon {
	display: block;
	text-indent: -99999px;
	overflow: hidden;
	background-repeat: no-repeat;
	}


	/* Misc visuals
	----------------------------------*/

	/* Overlays */
	.ui-widget-overlay {
	position: fixed;
	top: 0;
	left: 0;
	width: 100%;
	height: 100%;
	}
	.ui-resizable {
	position: relative;
	}
	.ui-resizable-handle {
	position: absolute;
	font-size: 0.1px;
	display: block;
	}
	.ui-resizable-disabled .ui-resizable-handle,
	.ui-resizable-autohide .ui-resizable-handle {
	display: none;
	}
	.ui-resizable-n {
	cursor: n-resize;
	height: 7px;
	width: 100%;
	top: -5px;
	left: 0;
	}
	.ui-resizable-s {
	cursor: s-resize;
	height: 7px;
	width: 100%;
	bottom: -5px;
	left: 0;
	}
	.ui-resizable-e {
	cursor: e-resize;
	width: 7px;
	right: -5px;
	top: 0;
	height: 100%;
	}
	.ui-resizable-w {
	cursor: w-resize;
	width: 7px;
	left: -5px;
	top: 0;
	height: 100%;
	}
	.ui-resizable-se {
	cursor: se-resize;
	width: 12px;
	height: 12px;
	right: 1px;
	bottom: 1px;
	}
	.ui-resizable-sw {
	cursor: sw-resize;
	width: 9px;
	height: 9px;
	left: -5px;
	bottom: -5px;
	}
	.ui-resizable-nw {
	cursor: nw-resize;
	width: 9px;
	height: 9px;
	left: -5px;
	top: -5px;
	}
	.ui-resizable-ne {
	cursor: ne-resize;
	width: 9px;
	height: 9px;
	right: -5px;
	top: -5px;
	}
	.ui-selectable-helper {
	position: absolute;
	z-index: 100;
	border: 1px dotted black;
	}
	.ui-accordion .ui-accordion-header {
	display: block;
	cursor: pointer;
	position: relative;
	margin-top: 2px;
	padding: .5em .5em .5em .7em;
	min-height: 0; /* support: IE7 */
	}
	.ui-accordion .ui-accordion-icons {
	padding-left: 2.2em;
	}
	.ui-accordion .ui-accordion-noicons {
	padding-left: .7em;
	}
	.ui-accordion .ui-accordion-icons .ui-accordion-icons {
	padding-left: 2.2em;
	}
	.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
	position: absolute;
	left: .5em;
	top: 50%;
	margin-top: -8px;
	}
	.ui-accordion .ui-accordion-content {
	padding: 1em 2.2em;
	border-top: 0;
	overflow: auto;
	}
	.ui-autocomplete {
	position: absolute;
	top: 0;
	left: 0;
	cursor: default;
	}
	.ui-button {
	display: inline-block;
	position: relative;
	padding: 0;
	line-height: normal;
	margin-right: .1em;
	cursor: pointer;
	vertical-align: middle;
	text-align: center;
	overflow: visible; /* removes extra width in IE */
	}
	.ui-button,
	.ui-button:link,
	.ui-button:visited,
	.ui-button:hover,
	.ui-button:active {
	text-decoration: none;
	}
	/* to make room for the icon, a width needs to be set here */
	.ui-button-icon-only {
	width: 2.2em;
	}
	/* button elements seem to need a little more width */
	button.ui-button-icon-only {
	width: 2.4em;
	}
	.ui-button-icons-only {
	width: 3.4em;
	}
	button.ui-button-icons-only {
	width: 3.7em;
	}

	button.ui-button-text-only,
	a.ui-button-text-only {
	background-image: url("images/buttongradient.png") !important;
	}

	/* button text element */
	.ui-button .ui-button-text {
	display: block;
	line-height: normal;
	}
	.ui-button-text-only .ui-button-text {
	padding: .3em 1em;
	}
	.ui-button-icon-only .ui-button-text,
	.ui-button-icons-only .ui-button-text {
	padding: .4em;
	text-indent: -9999999px;
	}
	.ui-button-text-icon-primary .ui-button-text,
	.ui-button-text-icons .ui-button-text {
	padding: .4em 1em .4em 2.1em;
	}
	.ui-button-text-icon-secondary .ui-button-text,
	.ui-button-text-icons .ui-button-text {
	padding: .4em 2.1em .4em 1em;
	}
	.ui-button-text-icons .ui-button-text {
	padding-left: 2.1em;
	padding-right: 2.1em;
	}
	/* no icon support for input elements, provide padding by default */
	input.ui-button {
	padding: .4em 1em;
	}

	/* button icon element(s) */
	.ui-button-icon-only .ui-icon,
	.ui-button-text-icon-primary .ui-icon,
	.ui-button-text-icon-secondary .ui-icon,
	.ui-button-text-icons .ui-icon,
	.ui-button-icons-only .ui-icon {
	position: absolute;
	top: 50%;
	margin-top: -8px;
	}
	.ui-button-icon-only .ui-icon {
	left: 50%;
	margin-left: -8px;
	}
	.ui-button-text-icon-primary .ui-button-icon-primary,
	.ui-button-text-icons .ui-button-icon-primary,
	.ui-button-icons-only .ui-button-icon-primary {
	left: .5em;
	}
	.ui-button-text-icon-secondary .ui-button-icon-secondary,
	.ui-button-text-icons .ui-button-icon-secondary,
	.ui-button-icons-only .ui-button-icon-secondary {
	right: .5em;
	}

	/* button sets */
	.ui-buttonset {
	margin-right: 7px;
	}
	.ui-buttonset .ui-button {
	margin-left: 0;
	margin-right: -.3em;
	}

	/* workarounds */
	/* reset extra padding in Firefox, see h5bp.com/l */
	input.ui-button::-moz-focus-inner,
	button.ui-button::-moz-focus-inner {
	border: 0;
	padding: 0;
	}
	.ui-datepicker {
	width: 17em;
	padding: .2em .2em 0;
	display: none;
	box-shadow: 1px 1px 18px #999;
	-moz-box-shadow: 1px 1px 12px #999;
	-webkit-box-shadow: #999 1px 1px 12px;
	}
	.ui-datepicker .ui-datepicker-header {
	position: relative;
	padding: .2em 0;
	}
	.ui-datepicker .ui-datepicker-prev,
	.ui-datepicker .ui-datepicker-next {
	position: absolute;
	top: 2px;
	width: 1.8em;
	height: 1.8em;
	}
	.ui-datepicker .ui-datepicker-prev-hover,
	.ui-datepicker .ui-datepicker-next-hover {
	top: 1px;
	}
	.ui-datepicker .ui-datepicker-prev {
	left: 2px;
	}
	.ui-datepicker .ui-datepicker-next {
	right: 2px;
	}
	.ui-datepicker .ui-datepicker-prev-hover {
	left: 1px;
	}
	.ui-datepicker .ui-datepicker-next-hover {
	right: 1px;
	}
	.ui-datepicker .ui-datepicker-prev span,
	.ui-datepicker .ui-datepicker-next span {
	display: block;
	position: absolute;
	left: 50%;
	margin-left: -8px;
	top: 50%;
	margin-top: -8px;
	}
	.ui-datepicker .ui-datepicker-title {
	margin: 0 2.3em;
	line-height: 1.8em;
	text-align: center;
	}
	.ui-datepicker .ui-datepicker-title select {
	font-size: 1em;
	margin: 1px 0;
	}
	.ui-datepicker select.ui-datepicker-month,
	.ui-datepicker select.ui-datepicker-year {
	width: 49%;
	}
	.ui-datepicker table {
	width: 100%;
	font-size: .9em;
	border-collapse: collapse;
	margin: 0 0 .4em;
	}
	.ui-datepicker th {
	padding: .7em .3em;
	text-align: center;
	font-weight: bold;
	border: 0;
	}
	.ui-datepicker td {
	border: 0;
	padding: 1px;
	}
	.ui-datepicker td span,
	.ui-datepicker td a {
	display: block;
	padding: .2em;
	text-align: right;
	text-decoration: none;
	}
	.ui-datepicker td.ui-datepicker-current-day .ui-state-active {
	background:#c33;
	border-color:#a22;
	color:#fff;
	}
	.ui-datepicker .ui-datepicker-buttonpane {
	background-image: none;
	margin: .7em 0 0 0;
	padding: 0 .2em;
	border-left: 0;
	border-right: 0;
	border-bottom: 0;
	}
	.ui-datepicker .ui-datepicker-buttonpane button {
	float: right;
	margin: .5em .2em .4em;
	cursor: default;
	padding: .2em .6em .3em .6em;
	width: auto;
	overflow: visible;
	}
	.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
	float: left;
	}

	/* with multiple calendars */
	.ui-datepicker.ui-datepicker-multi {
	width: auto;
	}
	.ui-datepicker-multi .ui-datepicker-group {
	float: left;
	}
	.ui-datepicker-multi .ui-datepicker-group table {
	width: 95%;
	margin: 0 auto .4em;
	}
	.ui-datepicker-multi-2 .ui-datepicker-group {
	width: 50%;
	}
	.ui-datepicker-multi-3 .ui-datepicker-group {
	width: 33.3%;
	}
	.ui-datepicker-multi-4 .ui-datepicker-group {
	width: 25%;
	}
	.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
	.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
	border-left-width: 0;
	}
	.ui-datepicker-multi .ui-datepicker-buttonpane {
	clear: left;
	}
	.ui-datepicker-row-break {
	clear: both;
	width: 100%;
	font-size: 0;
	}

	/* RTL support */
	.ui-datepicker-rtl {
	direction: rtl;
	}
	.ui-datepicker-rtl .ui-datepicker-prev {
	right: 2px;
	left: auto;
	}
	.ui-datepicker-rtl .ui-datepicker-next {
	left: 2px;
	right: auto;
	}
	.ui-datepicker-rtl .ui-datepicker-prev:hover {
	right: 1px;
	left: auto;
	}
	.ui-datepicker-rtl .ui-datepicker-next:hover {
	left: 1px;
	right: auto;
	}
	.ui-datepicker-rtl .ui-datepicker-buttonpane {
	clear: right;
	}
	.ui-datepicker-rtl .ui-datepicker-buttonpane button {
	float: left;
	}
	.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
	.ui-datepicker-rtl .ui-datepicker-group {
	float: right;
	}
	.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
	.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
	border-right-width: 0;
	border-left-width: 1px;
	}
	.ui-dialog {
	overflow: hidden;
	position: absolute;
	top: 0;
	left: 0;
	padding: .2em;
	outline: 0;
	-webkit-box-shadow: #999 1px 1px 12px;
	-moz-box-shadow: 1px 1px 12px #999;
	box-shadow: 1px 1px 18px #999;
	}
	.ui-dialog .ui-dialog-titlebar {
	padding: .4em 1em;
	position: relative;
	}
	.ui-dialog .ui-dialog-title {
	float: left;
	margin: .1em 0;
	white-space: nowrap;
	width: 90%;
	overflow: hidden;
	text-overflow: ellipsis;
	}
	.ui-dialog .ui-dialog-titlebar-close {
	position: absolute;
	right: .3em;
	top: 50%;
	width: 20px;
	margin: -10px 0 0 0;
	padding: 1px;
	height: 20px;
	}
	+.no-close .ui-dialog-titlebar-close {
	+ display: none !important;
	+}
	.ui-dialog .ui-dialog-content {
	position: relative;
	border: 0;
	padding: .5em 1em;
	background: none;
	overflow: auto;
	}
	.ui-dialog .ui-dialog-buttonpane {
	text-align: left;
	border-width: 1px 0 0 0;
	background-image: none;
	margin-top: .5em;
	padding: .3em 1em .5em .4em;
	}
	.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
	float: right;
	}
	.ui-dialog .ui-dialog-buttonpane button {
	margin: .5em .4em .5em 0;
	cursor: default;
	}
	.ui-dialog .ui-resizable-se {
	width: 12px;
	height: 12px;
	right: -5px;
	bottom: -5px;
	background-position: 16px 16px;
	}
	.ui-draggable .ui-dialog-titlebar {
	cursor: move;
	}
	.ui-menu {
	list-style: none;
	padding: 2px;
	margin: 0;
	display: block;
	outline: none;
	-webkit-box-shadow: #999 1px 1px 12px;
	-moz-box-shadow: 1px 1px 12px #999;
	box-shadow: 1px 1px 18px #999;
	}
	.ui-menu .ui-menu {
	margin-top: -3px;
	position: absolute;
	}
	.ui-menu .ui-menu-item {
	margin: 0;
	padding: 0;
	width: 100%;
	/* support: IE10, see #8844 */
	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
	}
	.ui-menu .ui-menu-divider {
	margin: 5px -2px 5px -2px;
	height: 0;
	font-size: 0;
	line-height: 0;
	border-width: 1px 0 0 0;
	}
	.ui-menu .ui-menu-item a {
	text-decoration: none;
	display: block;
	padding: 2px .4em;
	line-height: 1.5;
	min-height: 0; /* support: IE7 */
	font-weight: normal;
	}
	.ui-menu .ui-menu-item a.ui-state-focus,
	.ui-menu .ui-menu-item a.ui-state-active {
	font-weight: normal;
	margin: -1px;
	background: #c33;
	border-color: #a22;
	color: #fff;
	}

	.ui-menu .ui-state-disabled {
	font-weight: normal;
	margin: .4em 0 .2em;
	line-height: 1.5;
	}
	.ui-menu .ui-state-disabled a {
	cursor: default;
	}

	/* icon support */
	.ui-menu-icons {
	position: relative;
	}
	.ui-menu-icons .ui-menu-item a {
	position: relative;
	padding-left: 2em;
	}

	/* left-aligned */
	.ui-menu .ui-icon {
	position: absolute;
	top: .2em;
	left: .2em;
	}

	/* right-aligned */
	.ui-menu .ui-menu-icon {
	position: static;
	float: right;
	}
	.ui-progressbar {
	height: 2em;
	text-align: left;
	overflow: hidden;
	}
	.ui-progressbar .ui-progressbar-value {
	margin: -1px;
	height: 100%;
	}
	.ui-progressbar .ui-progressbar-overlay {
	background: url("images/animated-overlay.gif");
	height: 100%;
	filter: alpha(opacity=25);
	opacity: 0.25;
	}
	.ui-progressbar-indeterminate .ui-progressbar-value {
	background-image: none;
	}
	.ui-slider {
	position: relative;
	text-align: left;
	}
	.ui-slider .ui-slider-handle {
	position: absolute;
	z-index: 2;
	width: 1.2em;
	height: 1.2em;
	cursor: default;
	}
	.ui-slider .ui-slider-range {
	position: absolute;
	z-index: 1;
	font-size: .7em;
	display: block;
	border: 0;
	background-position: 0 0;
	}

	/* For IE8 - See #6727 */
	.ui-slider.ui-state-disabled .ui-slider-handle,
	.ui-slider.ui-state-disabled .ui-slider-range {
	filter: inherit;
	}

	.ui-slider-horizontal {
	height: .8em;
	}
	.ui-slider-horizontal .ui-slider-handle {
	top: -.3em;
	margin-left: -.6em;
	}
	.ui-slider-horizontal .ui-slider-range {
	top: 0;
	height: 100%;
	}
	.ui-slider-horizontal .ui-slider-range-min {
	left: 0;
	}
	.ui-slider-horizontal .ui-slider-range-max {
	right: 0;
	}

	.ui-slider-vertical {
	width: .8em;
	height: 100px;
	}
	.ui-slider-vertical .ui-slider-handle {
	left: -.3em;
	margin-left: 0;
	margin-bottom: -.6em;
	}
	.ui-slider-vertical .ui-slider-range {
	left: 0;
	width: 100%;
	}
	.ui-slider-vertical .ui-slider-range-min {
	bottom: 0;
	}
	.ui-slider-vertical .ui-slider-range-max {
	top: 0;
	}
	.ui-spinner {
	position: relative;
	display: inline-block;
	overflow: hidden;
	padding: 0;
	vertical-align: middle;
	}
	.ui-spinner-input {
	border: none;
	background: none;
	color: inherit;
	padding: 0;
	margin: .2em 0;
	vertical-align: middle;
	margin-left: .4em;
	margin-right: 22px;
	}
	.ui-spinner-button {
	width: 16px;
	height: 50%;
	font-size: .5em;
	padding: 0;
	margin: 0;
	text-align: center;
	position: absolute;
	cursor: default;
	display: block;
	overflow: hidden;
	right: 0;
	}
	/* more specificity required here to override default borders */
	.ui-spinner a.ui-spinner-button {
	border-top: none;
	border-bottom: none;
	border-right: none;
	}
	/* vertically center icon */
	.ui-spinner .ui-icon {
	position: absolute;
	margin-top: -8px;
	top: 50%;
	left: 0;
	}
	.ui-spinner-up {
	top: 0;
	}
	.ui-spinner-down {
	bottom: 0;
	}

	/* TR overrides */
	.ui-spinner .ui-icon-triangle-1-s {
	/* need to fix icons sprite */
	background-position: -65px -16px;
	}
	.ui-tabs {
	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
	padding: .2em;
	}
	.ui-tabs .ui-tabs-nav {
	margin: 0;
	padding: .2em .2em 0;
	}
	.ui-tabs .ui-tabs-nav li {
	list-style: none;
	float: left;
	position: relative;
	top: 0;
	margin: 0;
	border-bottom-width: 0;
	padding: 0;
	white-space: nowrap;
	-webkit-border-top-left-radius: 2px;
	-moz-border-radius-topleft: 2px;
	border-top-left-radius: 2px;
	-webkit-border-top-right-radius: 2px;
	-moz-border-radius-topright: 2px;
	border-top-right-radius: 2px;
	}
	.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
	float: left;
	padding: .3em 1em;
	text-decoration: none;
	}
	.ui-tabs .ui-tabs-nav li.ui-tabs-active {
	margin-bottom: -1px;
	padding-bottom: 1px;
	}
	.ui-dialog .ui-tabs-nav li.ui-tabs-active {
	background: #fff;
	}
	.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
	.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
	.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
	cursor: text;
	}
	.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
	cursor: pointer;
	}
	.ui-tabs .ui-tabs-panel {
	display: block;
	border-width: 0;
	padding: 1em 1.4em;
	background: none;
	}
	.ui-tooltip {
	padding: 8px;
	position: absolute;
	z-index: 9999;
	max-width: 300px;
	-webkit-box-shadow: 0 0 5px #aaa;
	box-shadow: 0 0 5px #aaa;
	}
	body .ui-tooltip {
	border-width: 2px;
	}

	/* Component containers
	----------------------------------*/
	.ui-widget {
	font-family: Lucida Grande, Verdana, Arial, Helvetica, sans-serif;
	font-size: 1em;
	}
	.ui-widget .ui-widget {
	font-size: 1em;
	}
	.ui-widget input,
	.ui-widget select,
	.ui-widget textarea,
	.ui-widget button {
	font-family: Lucida Grande, Verdana, Arial, Helvetica, sans-serif;
	font-size: 1em;
	}
	.ui-widget-content {
	border: 1px solid #aaaaaa;
	background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;
	color: #000000;
	}
	.ui-widget-content a {
	color: #000000;
	}
	.ui-widget-header {
	border: 1px solid #999999;
	border-width: 0 0 1px 0;
	background: #f4f4f4 url("images/listheader.png") 50% 50% repeat;
	color: #333333;
	font-weight: bold;
	margin: -0.2em -0.2em 0 -0.2em;
	}
	.ui-widget-header a {
	color: #333333;
	}

	/* Interaction states
	----------------------------------*/
	.ui-state-default,
	.ui-widget-content .ui-state-default,
	.ui-widget-header .ui-state-default {
	border: 1px solid #aaaaaa;
	background: #e6e6e7 url("images/ui-bg_highlight-hard_90_e6e6e7_1x100.png") 50% 50% repeat-x;
	font-weight: normal;
	color: #000000;
	}
	.ui-state-default a,
	.ui-state-default a:link,
	.ui-state-default a:visited {
	color: #000000;
	text-decoration: none;
	}
	.ui-state-hover,
	.ui-widget-content .ui-state-hover,
	.ui-widget-header .ui-state-hover,
	.ui-state-focus,
	.ui-widget-content .ui-state-focus,
	.ui-widget-header .ui-state-focus {
	border: 1px solid #999999;
	background: #e6e6e7 url("images/ui-bg_highlight-hard_90_e6e6e7_1x100.png") 50% 50% repeat-x;
	font-weight: normal;
	color: #000000;
	}
	.ui-state-focus,
	.ui-widget-content .ui-state-focus {
	border: 1px solid #c33;
	color: #a00;
	}
	.ui-tabs-nav .ui-state-focus {
	border: 1px solid #a4a4a4;
	color: #000;
	}
	.ui-state-hover a,
	.ui-state-hover a:hover,
	.ui-state-hover a:link,
	.ui-state-hover a:visited,
	.ui-state-focus a,
	.ui-state-focus a:hover,
	.ui-state-focus a:link,
	.ui-state-focus a:visited {
	color: #000000;
	text-decoration: none;
	}
	.ui-state-active,
	.ui-widget-content .ui-state-active,
	.ui-widget-header .ui-state-active {
	border: 1px solid #a4a4a4;
	background: #a3a3a3 url("images/ui-bg_highlight-hard_90_a3a3a3_1x100.png") 50% 50% repeat-x;
	font-weight: normal;
	color: #000000;
	}
	.ui-state-active a,
	.ui-state-active a:link,
	.ui-state-active a:visited {
	color: #000000;
	text-decoration: none;
	}

	/* Interaction Cues
	----------------------------------*/
	.ui-state-highlight,
	.ui-widget-content .ui-state-highlight,
	.ui-widget-header .ui-state-highlight {
	border: 1px solid #cc3333;
	background: #cc3333 url("images/ui-bg_flat_90_cc3333_40x100.png") 50% 50% repeat-x;
	color: #ffffff;
	}
	.ui-state-highlight a,
	.ui-widget-content .ui-state-highlight a,
	.ui-widget-header .ui-state-highlight a {
	color: #ffffff;
	}
	.ui-state-error,
	.ui-widget-content .ui-state-error,
	.ui-widget-header .ui-state-error {
	border: 1px solid #cc3333;
	background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
	color: #cc3333;
	}
	.ui-state-error a,
	.ui-widget-content .ui-state-error a,
	.ui-widget-header .ui-state-error a {
	color: #cc3333;
	}
	.ui-state-error-text,
	.ui-widget-content .ui-state-error-text,
	.ui-widget-header .ui-state-error-text {
	color: #cc3333;
	}
	.ui-priority-primary,
	.ui-widget-content .ui-priority-primary,
	.ui-widget-header .ui-priority-primary {
	font-weight: bold;
	}
	.ui-priority-secondary,
	.ui-widget-content .ui-priority-secondary,
	.ui-widget-header .ui-priority-secondary {
	opacity: .6;
	filter:Alpha(Opacity=60);
	font-weight: normal;
	}
	.ui-state-disabled,
	.ui-widget-content .ui-state-disabled,
	.ui-widget-header .ui-state-disabled {
	opacity: .35;
	filter:Alpha(Opacity=35);
	background-image: none;
	}
	.ui-state-disabled .ui-icon {
	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
	}

	/* Icons
	----------------------------------*/

	/* states and images */
	.ui-icon {
	width: 16px;
	height: 16px;
	}
	.ui-icon,
	.ui-widget-content .ui-icon {
	background-image: url("images/ui-icons_000000_256x240.png");
	}
	.ui-widget-header .ui-icon {
	background-image: url("images/ui-icons_333333_256x240.png");
	}
	.ui-state-default .ui-icon {
	background-image: url("images/ui-icons_666666_256x240.png");
	}
	.ui-state-hover .ui-icon,
	.ui-state-focus .ui-icon {
	background-image: url("images/ui-icons_333333_256x240.png");
	}
	.ui-state-active .ui-icon {
	background-image: url("images/ui-icons_333333_256x240.png");
	}
	.ui-state-highlight .ui-icon {
	background-image: url("images/ui-icons_dddddd_256x240.png");
	}
	.ui-state-error .ui-icon,
	.ui-state-error-text .ui-icon {
	background-image: url("images/ui-icons_cc3333_256x240.png");
	}

	/* positioning */
	.ui-icon-blank { background-position: 16px 16px; }
	.ui-icon-carat-1-n { background-position: 0 0; }
	.ui-icon-carat-1-ne { background-position: -16px 0; }
	.ui-icon-carat-1-e { background-position: -32px 0; }
	.ui-icon-carat-1-se { background-position: -48px 0; }
	.ui-icon-carat-1-s { background-position: -64px 0; }
	.ui-icon-carat-1-sw { background-position: -80px 0; }
	.ui-icon-carat-1-w { background-position: -96px 0; }
	.ui-icon-carat-1-nw { background-position: -112px 0; }
	.ui-icon-carat-2-n-s { background-position: -128px 0; }
	.ui-icon-carat-2-e-w { background-position: -144px 0; }
	.ui-icon-triangle-1-n { background-position: 0 -16px; }
	.ui-icon-triangle-1-ne { background-position: -16px -16px; }
	.ui-icon-triangle-1-e { background-position: -32px -16px; }
	.ui-icon-triangle-1-se { background-position: -48px -16px; }
	.ui-icon-triangle-1-s { background-position: -64px -16px; }
	.ui-icon-triangle-1-sw { background-position: -80px -16px; }
	.ui-icon-triangle-1-w { background-position: -96px -16px; }
	.ui-icon-triangle-1-nw { background-position: -112px -16px; }
	.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
	.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
	.ui-icon-arrow-1-n { background-position: 0 -32px; }
	.ui-icon-arrow-1-ne { background-position: -16px -32px; }
	.ui-icon-arrow-1-e { background-position: -32px -32px; }
	.ui-icon-arrow-1-se { background-position: -48px -32px; }
	.ui-icon-arrow-1-s { background-position: -64px -32px; }
	.ui-icon-arrow-1-sw { background-position: -80px -32px; }
	.ui-icon-arrow-1-w { background-position: -96px -32px; }
	.ui-icon-arrow-1-nw { background-position: -112px -32px; }
	.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
	.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
	.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
	.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
	.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
	.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
	.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
	.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
	.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
	.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
	.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
	.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
	.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
	.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
	.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
	.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
	.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
	.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
	.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
	.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
	.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
	.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
	.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
	.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
	.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
	.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
	.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
	.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
	.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
	.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
	.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
	.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
	.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
	.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
	.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
	.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
	.ui-icon-arrow-4 { background-position: 0 -80px; }
	.ui-icon-arrow-4-diag { background-position: -16px -80px; }
	.ui-icon-extlink { background-position: -32px -80px; }
	.ui-icon-newwin { background-position: -48px -80px; }
	.ui-icon-refresh { background-position: -64px -80px; }
	.ui-icon-shuffle { background-position: -80px -80px; }
	.ui-icon-transfer-e-w { background-position: -96px -80px; }
	.ui-icon-transferthick-e-w { background-position: -112px -80px; }
	.ui-icon-folder-collapsed { background-position: 0 -96px; }
	.ui-icon-folder-open { background-position: -16px -96px; }
	.ui-icon-document { background-position: -32px -96px; }
	.ui-icon-document-b { background-position: -48px -96px; }
	.ui-icon-note { background-position: -64px -96px; }
	.ui-icon-mail-closed { background-position: -80px -96px; }
	.ui-icon-mail-open { background-position: -96px -96px; }
	.ui-icon-suitcase { background-position: -112px -96px; }
	.ui-icon-comment { background-position: -128px -96px; }
	.ui-icon-person { background-position: -144px -96px; }
	.ui-icon-print { background-position: -160px -96px; }
	.ui-icon-trash { background-position: -176px -96px; }
	.ui-icon-locked { background-position: -192px -96px; }
	.ui-icon-unlocked { background-position: -208px -96px; }
	.ui-icon-bookmark { background-position: -224px -96px; }
	.ui-icon-tag { background-position: -240px -96px; }
	.ui-icon-home { background-position: 0 -112px; }
	.ui-icon-flag { background-position: -16px -112px; }
	.ui-icon-calendar { background-position: -32px -112px; }
	.ui-icon-cart { background-position: -48px -112px; }
	.ui-icon-pencil { background-position: -64px -112px; }
	.ui-icon-clock { background-position: -80px -112px; }
	.ui-icon-disk { background-position: -96px -112px; }
	.ui-icon-calculator { background-position: -112px -112px; }
	.ui-icon-zoomin { background-position: -128px -112px; }
	.ui-icon-zoomout { background-position: -144px -112px; }
	.ui-icon-search { background-position: -160px -112px; }
	.ui-icon-wrench { background-position: -176px -112px; }
	.ui-icon-gear { background-position: -192px -112px; }
	.ui-icon-heart { background-position: -208px -112px; }
	.ui-icon-star { background-position: -224px -112px; }
	.ui-icon-link { background-position: -240px -112px; }
	.ui-icon-cancel { background-position: 0 -128px; }
	.ui-icon-plus { background-position: -16px -128px; }
	.ui-icon-plusthick { background-position: -32px -128px; }
	.ui-icon-minus { background-position: -48px -128px; }
	.ui-icon-minusthick { background-position: -64px -128px; }
	.ui-icon-close { background-position: -80px -128px; }
	.ui-icon-closethick { background-position: -96px -128px; }
	.ui-icon-key { background-position: -112px -128px; }
	.ui-icon-lightbulb { background-position: -128px -128px; }
	.ui-icon-scissors { background-position: -144px -128px; }
	.ui-icon-clipboard { background-position: -160px -128px; }
	.ui-icon-copy { background-position: -176px -128px; }
	.ui-icon-contact { background-position: -192px -128px; }
	.ui-icon-image { background-position: -208px -128px; }
	.ui-icon-video { background-position: -224px -128px; }
	.ui-icon-script { background-position: -240px -128px; }
	.ui-icon-alert { background-position: 0 -144px; }
	.ui-icon-info { background-position: -16px -144px; }
	.ui-icon-notice { background-position: -32px -144px; }
	.ui-icon-help { background-position: -48px -144px; }
	.ui-icon-check { background-position: -64px -144px; }
	.ui-icon-bullet { background-position: -80px -144px; }
	.ui-icon-radio-on { background-position: -96px -144px; }
	.ui-icon-radio-off { background-position: -112px -144px; }
	.ui-icon-pin-w { background-position: -128px -144px; }
	.ui-icon-pin-s { background-position: -144px -144px; }
	.ui-icon-play { background-position: 0 -160px; }
	.ui-icon-pause { background-position: -16px -160px; }
	.ui-icon-seek-next { background-position: -32px -160px; }
	.ui-icon-seek-prev { background-position: -48px -160px; }
	.ui-icon-seek-end { background-position: -64px -160px; }
	.ui-icon-seek-start { background-position: -80px -160px; }
	/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
	.ui-icon-seek-first { background-position: -80px -160px; }
	.ui-icon-stop { background-position: -96px -160px; }
	.ui-icon-eject { background-position: -112px -160px; }
	.ui-icon-volume-off { background-position: -128px -160px; }
	.ui-icon-volume-on { background-position: -144px -160px; }
	.ui-icon-power { background-position: 0 -176px; }
	.ui-icon-signal-diag { background-position: -16px -176px; }
	.ui-icon-signal { background-position: -32px -176px; }
	.ui-icon-battery-0 { background-position: -48px -176px; }
	.ui-icon-battery-1 { background-position: -64px -176px; }
	.ui-icon-battery-2 { background-position: -80px -176px; }
	.ui-icon-battery-3 { background-position: -96px -176px; }
	.ui-icon-circle-plus { background-position: 0 -192px; }
	.ui-icon-circle-minus { background-position: -16px -192px; }
	.ui-icon-circle-close { background-position: -32px -192px; }
	.ui-icon-circle-triangle-e { background-position: -48px -192px; }
	.ui-icon-circle-triangle-s { background-position: -64px -192px; }
	.ui-icon-circle-triangle-w { background-position: -80px -192px; }
	.ui-icon-circle-triangle-n { background-position: -96px -192px; }
	.ui-icon-circle-arrow-e { background-position: -112px -192px; }
	.ui-icon-circle-arrow-s { background-position: -128px -192px; }
	.ui-icon-circle-arrow-w { background-position: -144px -192px; }
	.ui-icon-circle-arrow-n { background-position: -160px -192px; }
	.ui-icon-circle-zoomin { background-position: -176px -192px; }
	.ui-icon-circle-zoomout { background-position: -192px -192px; }
	.ui-icon-circle-check { background-position: -208px -192px; }
	.ui-icon-circlesmall-plus { background-position: 0 -208px; }
	.ui-icon-circlesmall-minus { background-position: -16px -208px; }
	.ui-icon-circlesmall-close { background-position: -32px -208px; }
	.ui-icon-squaresmall-plus { background-position: -48px -208px; }
	.ui-icon-squaresmall-minus { background-position: -64px -208px; }
	.ui-icon-squaresmall-close { background-position: -80px -208px; }
	.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
	.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
	.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
	.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
	.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
	.ui-icon-grip-diagonal-se { background-position: -80px -224px; }


	/* Misc visuals
	----------------------------------*/

	/* Corner radius */
	.ui-corner-all,
	.ui-corner-top,
	.ui-corner-left,
	.ui-corner-tl {
	border-top-left-radius: 0;
	}
	.ui-corner-all,
	.ui-corner-top,
	.ui-corner-right,
	.ui-corner-tr {
	border-top-right-radius: 0;
	}
	.ui-corner-all,
	.ui-corner-bottom,
	.ui-corner-left,
	.ui-corner-bl {
	border-bottom-left-radius: 0;
	}
	.ui-corner-all,
	.ui-corner-bottom,
	.ui-corner-right,
	.ui-corner-br {
	border-bottom-right-radius: 0;
	}

	/* Overlays */
	.ui-widget-overlay {
	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
	opacity: .3;
	filter: Alpha(Opacity=30);
	}
	.ui-widget-shadow {
	margin: -6px 0 0 -6px;
	padding: 6px;
	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
	opacity: .35;
	filter: Alpha(Opacity=35);
	border-radius: 6px;
	}
	diff --git a/plugins/jqueryui/themes/classic/roundcube-custom.diff b/plugins/jqueryui/themes/classic/roundcube-custom.diff
	index 3e5091492..8e99e1879 100644
	--- a/plugins/jqueryui/themes/classic/roundcube-custom.diff
	+++ b/plugins/jqueryui/themes/classic/roundcube-custom.diff
	@@ -1,164 +1,174 @@
	--- jquery-ui-1.10.4.custom.orig.css 2014-06-17 00:44:04.000000000 +0200
	-+++ jquery-ui-1.10.4.custom.css 2014-06-17 13:16:34.000000000 +0200
	++++ jquery-ui-1.10.4.custom.css 2014-07-31 08:55:11.000000000 +0200
	@@ -226,13 +226,18 @@
	width: 3.7em;
	}

	+button.ui-button-text-only,
	+a.ui-button-text-only {
	+ background-image: url("images/buttongradient.png") !important;
	+}
	+
	/* button text element */
	.ui-button .ui-button-text {
	display: block;
	line-height: normal;
	}
	.ui-button-text-only .ui-button-text {
	- padding: .4em 1em;
	+ padding: .3em 1em;
	}
	.ui-button-icon-only .ui-button-text,
	.ui-button-icons-only .ui-button-text {
	@@ -301,6 +306,9 @@
	width: 17em;
	padding: .2em .2em 0;
	display: none;
	+ box-shadow: 1px 1px 18px #999;
	+ -moz-box-shadow: 1px 1px 12px #999;
	+ -webkit-box-shadow: #999 1px 1px 12px;
	}
	.ui-datepicker .ui-datepicker-header {
	position: relative;
	@@ -374,6 +382,11 @@
	text-align: right;
	text-decoration: none;
	}
	+.ui-datepicker td.ui-datepicker-current-day .ui-state-active {
	+ background:#c33;
	+ border-color:#a22;
	+ color:#fff;
	+}
	.ui-datepicker .ui-datepicker-buttonpane {
	background-image: none;
	margin: .7em 0 0 0;
	@@ -385,7 +398,7 @@
	.ui-datepicker .ui-datepicker-buttonpane button {
	float: right;
	margin: .5em .2em .4em;
	- cursor: pointer;
	+ cursor: default;
	padding: .2em .6em .3em .6em;
	width: auto;
	overflow: visible;
	@@ -469,6 +482,9 @@
	left: 0;
	padding: .2em;
	outline: 0;
	+ -webkit-box-shadow: #999 1px 1px 12px;
	+ -moz-box-shadow: 1px 1px 12px #999;
	+ box-shadow: 1px 1px 18px #999;
	}
	.ui-dialog .ui-dialog-titlebar {
	padding: .4em 1em;
	-@@ -510,7 +526,7 @@
	+@@ -491,6 +507,9 @@
	+ padding: 1px;
	+ height: 20px;
	+ }
	++.no-close .ui-dialog-titlebar-close {
	++ display: none !important;
	++}
	+ .ui-dialog .ui-dialog-content {
	+ position: relative;
	+ border: 0;
	+@@ -510,7 +529,7 @@
	}
	.ui-dialog .ui-dialog-buttonpane button {
	margin: .5em .4em .5em 0;
	- cursor: pointer;
	+ cursor: default;
	}
	.ui-dialog .ui-resizable-se {
	width: 12px;
	-@@ -528,6 +544,9 @@
	+@@ -528,6 +547,9 @@
	margin: 0;
	display: block;
	outline: none;
	+ -webkit-box-shadow: #999 1px 1px 12px;
	+ -moz-box-shadow: 1px 1px 12px #999;
	+ box-shadow: 1px 1px 18px #999;
	}
	.ui-menu .ui-menu {
	margin-top: -3px;
	-@@ -559,6 +578,9 @@
	+@@ -559,6 +581,9 @@
	.ui-menu .ui-menu-item a.ui-state-active {
	font-weight: normal;
	margin: -1px;
	+ background: #c33;
	+ border-color: #a22;
	+ color: #fff;
	}

	.ui-menu .ui-state-disabled {
	-@@ -740,20 +762,29 @@
	+@@ -740,20 +765,29 @@
	float: left;
	position: relative;
	top: 0;
	- margin: 1px .2em 0 0;
	+ margin: 0;
	border-bottom-width: 0;
	padding: 0;
	white-space: nowrap;
	+ -webkit-border-top-left-radius: 2px;
	+ -moz-border-radius-topleft: 2px;
	+ border-top-left-radius: 2px;
	+ -webkit-border-top-right-radius: 2px;
	+ -moz-border-radius-topright: 2px;
	+ border-top-right-radius: 2px;
	}
	.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
	float: left;
	- padding: .5em 1em;
	+ padding: .3em 1em;
	text-decoration: none;
	}
	.ui-tabs .ui-tabs-nav li.ui-tabs-active {
	margin-bottom: -1px;
	padding-bottom: 1px;
	}
	+.ui-dialog .ui-tabs-nav li.ui-tabs-active {
	+ background: #fff;
	+}
	.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
	.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
	.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
	-@@ -806,9 +837,11 @@
	+@@ -806,9 +840,11 @@
	}
	.ui-widget-header {
	border: 1px solid #999999;
	- background: #f4f4f4 url("images/ui-bg_highlight-hard_90_f4f4f4_1x100.png") 50% 50% repeat-x;
	+ border-width: 0 0 1px 0;
	+ background: #f4f4f4 url("images/listheader.png") 50% 50% repeat;
	color: #333333;
	font-weight: bold;
	+ margin: -0.2em -0.2em 0 -0.2em;
	}
	.ui-widget-header a {
	color: #333333;
	-@@ -841,6 +874,15 @@
	+@@ -841,6 +877,15 @@
	font-weight: normal;
	color: #000000;
	}
	+.ui-state-focus,
	+.ui-widget-content .ui-state-focus {
	+ border: 1px solid #c33;
	+ color: #a00;
	+}
	+.ui-tabs-nav .ui-state-focus {
	+ border: 1px solid #a4a4a4;
	+ color: #000;
	+}
	.ui-state-hover a,
	.ui-state-hover a:hover,
	.ui-state-hover a:link,
	-@@ -906,8 +948,8 @@
	+@@ -906,8 +951,8 @@
	.ui-priority-secondary,
	.ui-widget-content .ui-priority-secondary,
	.ui-widget-header .ui-priority-secondary {
	- opacity: .7;
	- filter:Alpha(Opacity=70);
	+ opacity: .6;
	+ filter:Alpha(Opacity=60);
	font-weight: normal;
	}
	.ui-state-disabled,
	diff --git a/plugins/jqueryui/themes/larry/jquery-ui-1.10.4.custom.css b/plugins/jqueryui/themes/larry/jquery-ui-1.10.4.custom.css
	index 2311d3ed0..b399d3eaf 100755
	--- a/plugins/jqueryui/themes/larry/jquery-ui-1.10.4.custom.css
	+++ b/plugins/jqueryui/themes/larry/jquery-ui-1.10.4.custom.css
	@@ -1,1508 +1,1511 @@
	/*! jQuery UI - v1.10.4 - 2014-06-17
	* http://jqueryui.com
	* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
	* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.0em&cornerRadius=5px&bgColorHeader=e4e4e4&bgTextureHeader=highlight_soft&bgImgOpacityHeader=90&borderColorHeader=fafafa&fcHeader=666666&iconColorHeader=004458&bgColorContent=fafafa&bgTextureContent=highlight_soft&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=33333&iconColorContent=004458&bgColorDefault=f8f8f8&bgTextureDefault=highlight_hard&bgImgOpacityDefault=75&borderColorDefault=cccccc&fcDefault=666666&iconColorDefault=004458&bgColorHover=eaeaea&bgTextureHover=highlight_hard&bgImgOpacityHover=75&borderColorHover=aaaaaa&fcHover=333333&iconColorHover=004458&bgColorActive=ffffff&bgTextureActive=highlight_hard&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=333333&iconColorActive=004458&bgColorHighlight=b0ccd7&bgTextureHighlight=highlight_hard&bgImgOpacityHighlight=55&borderColorHighlight=a3a3a3&fcHighlight=004458&iconColorHighlight=004458&bgColorError=fef1ec&bgTextureError=flat&bgImgOpacityError=95&borderColorError=d7211e&fcError=d64040&iconColorError=d7211e&bgColorOverlay=333333&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=50&bgColorShadow=666666&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=20&thicknessShadow=6px&offsetTopShadow=-6px&offsetLeftShadow=-6px&cornerRadiusShadow=8px
	* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */

	/* Layout helpers
	----------------------------------*/
	.ui-helper-hidden {
	display: none;
	}
	.ui-helper-hidden-accessible {
	border: 0;
	clip: rect(0 0 0 0);
	height: 1px;
	margin: -1px;
	overflow: hidden;
	padding: 0;
	position: absolute;
	width: 1px;
	}
	.ui-helper-reset {
	margin: 0;
	padding: 0;
	border: 0;
	outline: 0;
	line-height: 1.3;
	text-decoration: none;
	font-size: 100%;
	list-style: none;
	}
	.ui-helper-clearfix:before,
	.ui-helper-clearfix:after {
	content: "";
	display: table;
	border-collapse: collapse;
	}
	.ui-helper-clearfix:after {
	clear: both;
	}
	.ui-helper-clearfix {
	min-height: 0; /* support: IE7 */
	}
	.ui-helper-zfix {
	width: 100%;
	height: 100%;
	top: 0;
	left: 0;
	position: absolute;
	opacity: 0;
	filter:Alpha(Opacity=0);
	}

	.ui-front {
	z-index: 100;
	}


	/* Interaction Cues
	----------------------------------*/
	.ui-state-disabled {
	cursor: default !important;
	}


	/* Icons
	----------------------------------*/

	/* states and images */
	.ui-icon {
	display: block;
	text-indent: -99999px;
	overflow: hidden;
	background-repeat: no-repeat;
	}


	/* Misc visuals
	----------------------------------*/

	/* Overlays */
	.ui-widget-overlay {
	position: fixed;
	top: 0;
	left: 0;
	width: 100%;
	height: 100%;
	}
	.ui-resizable {
	position: relative;
	}
	.ui-resizable-handle {
	position: absolute;
	font-size: 0.1px;
	display: block;
	}
	.ui-resizable-disabled .ui-resizable-handle,
	.ui-resizable-autohide .ui-resizable-handle {
	display: none;
	}
	.ui-resizable-n {
	cursor: n-resize;
	height: 7px;
	width: 100%;
	top: -5px;
	left: 0;
	}
	.ui-resizable-s {
	cursor: s-resize;
	height: 7px;
	width: 100%;
	bottom: -5px;
	left: 0;
	}
	.ui-resizable-e {
	cursor: e-resize;
	width: 7px;
	right: -5px;
	top: 0;
	height: 100%;
	}
	.ui-resizable-w {
	cursor: w-resize;
	width: 7px;
	left: -5px;
	top: 0;
	height: 100%;
	}
	.ui-resizable-se {
	cursor: se-resize;
	width: 12px;
	height: 12px;
	right: 1px;
	bottom: 1px;
	}
	.ui-resizable-sw {
	cursor: sw-resize;
	width: 9px;
	height: 9px;
	left: -5px;
	bottom: -5px;
	}
	.ui-resizable-nw {
	cursor: nw-resize;
	width: 9px;
	height: 9px;
	left: -5px;
	top: -5px;
	}
	.ui-resizable-ne {
	cursor: ne-resize;
	width: 9px;
	height: 9px;
	right: -5px;
	top: -5px;
	}
	.ui-selectable-helper {
	position: absolute;
	z-index: 100;
	border: 1px dotted black;
	}
	.ui-accordion .ui-accordion-header {
	display: block;
	cursor: pointer;
	position: relative;
	margin-top: 2px;
	padding: .5em .5em .5em .7em;
	min-height: 0; /* support: IE7 */
	}
	.ui-accordion .ui-accordion-icons {
	padding-left: 2.2em;
	}
	.ui-accordion .ui-accordion-noicons {
	padding-left: .7em;
	}
	.ui-accordion .ui-accordion-icons .ui-accordion-icons {
	padding-left: 2.2em;
	}
	.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
	position: absolute;
	left: .5em;
	top: 50%;
	margin-top: -8px;
	}
	.ui-accordion .ui-accordion-content {
	padding: 1em 2.2em;
	border-top: 0;
	overflow: auto;
	}
	.ui-autocomplete {
	position: absolute;
	top: 0;
	left: 0;
	cursor: default;
	}
	.ui-button {
	display: inline-block;
	position: relative;
	padding: 0;
	line-height: normal;
	margin-right: .1em;
	cursor: pointer;
	vertical-align: middle;
	text-align: center;
	overflow: visible; /* removes extra width in IE */
	}
	.ui-button,
	.ui-button:link,
	.ui-button:visited,
	.ui-button:hover,
	.ui-button:active {
	text-decoration: none;
	}
	/* to make room for the icon, a width needs to be set here */
	.ui-button-icon-only {
	width: 2.2em;
	}
	/* button elements seem to need a little more width */
	button.ui-button-icon-only {
	width: 2.4em;
	}
	.ui-button-icons-only {
	width: 3.4em;
	}
	button.ui-button-icons-only {
	width: 3.7em;
	}

	/* button text element */
	.ui-button .ui-button-text {
	display: block;
	line-height: normal;
	}
	.ui-button-text-only .ui-button-text {
	padding: .4em 1em;
	}
	.ui-button-icon-only .ui-button-text,
	.ui-button-icons-only .ui-button-text {
	padding: .4em;
	text-indent: -9999999px;
	width: 1px;
	overflow: hidden;
	}
	.ui-button-text-icon-primary .ui-button-text,
	.ui-button-text-icons .ui-button-text {
	padding: .4em 1em .4em 2.1em;
	}
	.ui-button-text-icon-secondary .ui-button-text,
	.ui-button-text-icons .ui-button-text {
	padding: .4em 2.1em .4em 1em;
	}
	.ui-button-text-icons .ui-button-text {
	padding-left: 2.1em;
	padding-right: 2.1em;
	}
	/* no icon support for input elements, provide padding by default */
	input.ui-button {
	padding: .4em 1em;
	}

	/* button icon element(s) */
	.ui-button-icon-only .ui-icon,
	.ui-button-text-icon-primary .ui-icon,
	.ui-button-text-icon-secondary .ui-icon,
	.ui-button-text-icons .ui-icon,
	.ui-button-icons-only .ui-icon {
	position: absolute;
	top: 50%;
	margin-top: -8px;
	}
	.ui-button-icon-only .ui-icon {
	left: 50%;
	margin-left: -8px;
	}
	.ui-button-text-icon-primary .ui-button-icon-primary,
	.ui-button-text-icons .ui-button-icon-primary,
	.ui-button-icons-only .ui-button-icon-primary {
	left: .5em;
	}
	.ui-button-text-icon-secondary .ui-button-icon-secondary,
	.ui-button-text-icons .ui-button-icon-secondary,
	.ui-button-icons-only .ui-button-icon-secondary {
	right: .5em;
	}

	/* button sets */
	.ui-buttonset {
	margin-right: 7px;
	}
	.ui-buttonset .ui-button {
	margin-left: 0;
	margin-right: -.3em;
	}

	/* workarounds */
	/* reset extra padding in Firefox, see h5bp.com/l */
	input.ui-button::-moz-focus-inner,
	button.ui-button::-moz-focus-inner {
	border: 0;
	padding: 0;
	}
	.ui-datepicker {
	width: 17em;
	padding: .2em .2em 0;
	display: none;
	}
	.ui-datepicker .ui-datepicker-header {
	position: relative;
	padding: .2em 0;
	}
	.ui-datepicker .ui-datepicker-prev,
	.ui-datepicker .ui-datepicker-next {
	position: absolute;
	top: 2px;
	width: 1.8em;
	height: 1.8em;
	}
	.ui-datepicker .ui-datepicker-prev-hover,
	.ui-datepicker .ui-datepicker-next-hover {
	top: 1px;
	}
	.ui-datepicker .ui-datepicker-prev {
	left: 2px;
	}
	.ui-datepicker .ui-datepicker-next {
	right: 2px;
	}
	.ui-datepicker .ui-datepicker-prev-hover {
	left: 1px;
	}
	.ui-datepicker .ui-datepicker-next-hover {
	right: 1px;
	}
	.ui-datepicker .ui-datepicker-prev span,
	.ui-datepicker .ui-datepicker-next span {
	display: block;
	position: absolute;
	left: 50%;
	margin-left: -8px;
	top: 50%;
	margin-top: -8px;
	}
	.ui-datepicker .ui-datepicker-title {
	margin: 0 2.3em;
	line-height: 1.8em;
	text-align: center;
	}
	.ui-datepicker .ui-datepicker-title select {
	font-size: 1em;
	margin: 1px 0;
	}
	.ui-datepicker select.ui-datepicker-month,
	.ui-datepicker select.ui-datepicker-year {
	width: 49%;
	}
	.ui-datepicker table {
	width: 100%;
	font-size: .9em;
	border-collapse: collapse;
	margin: 0 0 .4em;
	}
	.ui-datepicker th {
	padding: .7em .3em;
	text-align: center;
	font-weight: bold;
	border: 0;
	}
	.ui-datepicker td {
	border: 0;
	padding: 1px;
	}
	.ui-datepicker td span,
	.ui-datepicker td a {
	display: block;
	padding: .2em;
	text-align: right;
	text-decoration: none;
	}
	.ui-datepicker .ui-datepicker-buttonpane {
	background-image: none;
	margin: .7em 0 0 0;
	padding: 0 .2em;
	border-left: 0;
	border-right: 0;
	border-bottom: 0;
	}
	.ui-datepicker .ui-datepicker-buttonpane button {
	float: right;
	margin: .5em .2em .4em;
	cursor: pointer;
	padding: .2em .6em .3em .6em;
	width: auto;
	overflow: visible;
	}
	.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
	float: left;
	}

	/* with multiple calendars */
	.ui-datepicker.ui-datepicker-multi {
	width: auto;
	}
	.ui-datepicker-multi .ui-datepicker-group {
	float: left;
	}
	.ui-datepicker-multi .ui-datepicker-group table {
	width: 95%;
	margin: 0 auto .4em;
	}
	.ui-datepicker-multi-2 .ui-datepicker-group {
	width: 50%;
	}
	.ui-datepicker-multi-3 .ui-datepicker-group {
	width: 33.3%;
	}
	.ui-datepicker-multi-4 .ui-datepicker-group {
	width: 25%;
	}
	.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
	.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
	border-left-width: 0;
	}
	.ui-datepicker-multi .ui-datepicker-buttonpane {
	clear: left;
	}
	.ui-datepicker-row-break {
	clear: both;
	width: 100%;
	font-size: 0;
	}

	/* RTL support */
	.ui-datepicker-rtl {
	direction: rtl;
	}
	.ui-datepicker-rtl .ui-datepicker-prev {
	right: 2px;
	left: auto;
	}
	.ui-datepicker-rtl .ui-datepicker-next {
	left: 2px;
	right: auto;
	}
	.ui-datepicker-rtl .ui-datepicker-prev:hover {
	right: 1px;
	left: auto;
	}
	.ui-datepicker-rtl .ui-datepicker-next:hover {
	left: 1px;
	right: auto;
	}
	.ui-datepicker-rtl .ui-datepicker-buttonpane {
	clear: right;
	}
	.ui-datepicker-rtl .ui-datepicker-buttonpane button {
	float: left;
	}
	.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
	.ui-datepicker-rtl .ui-datepicker-group {
	float: right;
	}
	.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
	.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
	border-right-width: 0;
	border-left-width: 1px;
	}
	.ui-dialog {
	position: absolute;
	top: 0;
	left: 0;
	padding: 3px;
	background: #fff;
	border-radius: 6px !important;
	border: 0 !important;
	outline: 0;
	-webkit-box-shadow: #666 1px 1px 12px;
	-moz-box-shadow: 1px 1px 12px #666;
	box-shadow: 1px 1px 18px #666;
	}
	.ui-dialog .ui-dialog-titlebar {
	padding: 15px 1em 8px 1em;
	position: relative;
	border: 0;
	border-radius: 5px 5px 0 0;
	}
	.ui-dialog .ui-dialog-title {
	float: left;
	margin: .1em 16px .1em 0;
	font-size: 1.3em;
	text-shadow: 1px 1px 1px #fff;
	white-space: nowrap;
	width: 90%;
	overflow: hidden;
	text-overflow: ellipsis;
	}
	.ui-dialog .ui-dialog-titlebar-close {
	position: absolute;
	right: -15px;
	top: -15px;
	width: 30px;
	margin: 0;
	padding: 0;
	height: 30px;
	z-index: 99999;
	border-width: 0 !important;
	background: none !important;
	filter: none !important;
	-webkit-box-shadow: none !important;
	-moz-box-shadow: none !important;
	-o-box-shadow: none !important;
	box-shadow: none !important;
	}
	.ui-dialog .ui-dialog-titlebar-close.ui-state-focus {
	outline: 2px solid #4fadd5;
	}
	.ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick {
	top: 0;
	left: 0;
	margin: 0;
	width: 30px;
	height: 30px;
	background: url("images/ui-dialog-close.png") 0 0 no-repeat;
	}
	+.no-close .ui-dialog-titlebar-close {
	+ display: none !important;
	+}
	.ui-dialog .ui-dialog-content {
	position: relative;
	border: 0;
	padding: 1.5em 1em 0.5em 1em;
	background: none;
	overflow: auto;
	}
	.ui-dialog .ui-widget-content {
	border: 0;
	}
	.ui-dialog .ui-dialog-buttonpane {
	text-align: left;
	border-width: 1px 0 0 0;
	background-image: none;
	border-color: #ddd;
	border-style: solid;
	margin: 0;
	padding: .3em 1em .5em .8em;
	}
	.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
	float: left;
	}
	.ui-dialog .ui-dialog-buttonpane button {
	margin: .5em .4em .5em 0;
	cursor: pointer;
	}
	.ui-dialog .ui-resizable-se {
	width: 14px;
	height: 14px;
	right: 3px;
	bottom: 3px;
	background-position: -80px -224px;
	}
	.ui-draggable .ui-dialog-titlebar {
	cursor: move;
	}
	.ui-menu {
	list-style: none;
	padding: 0;
	margin: 0;
	display: block;
	outline: none;
	background: #444;
	border: 1px solid #999;
	border-radius: 4px !important;
	-webkit-box-shadow: 0 2px 6px 0 #333;
	-moz-box-shadow: 0 2px 6px 0 #333;
	-o-box-shadow: 0 2px 6px 0 #333;
	box-shadow: 0 2px 6px 0 #333;
	}
	.ui-menu .ui-menu {
	margin-top: -3px;
	position: absolute;
	}
	.ui-menu .ui-menu-item {
	margin: 0;
	padding: 0;
	width: 100%;
	/* support: IE10, see #8844 */
	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
	color: #fff;
	white-space: nowrap;
	border-top: 1px solid #5a5a5a;
	border-bottom: 1px solid #333;
	}
	.ui-menu .ui-menu-item:first-child {
	border-top: 0;
	}
	.ui-menu .ui-menu-item:last-child {
	border-bottom: 0;
	}
	.ui-menu .ui-menu-divider {
	margin: 5px -2px 5px -2px;
	height: 0;
	font-size: 0;
	line-height: 0;
	border-width: 1px 0 0 0;
	}
	.ui-menu .ui-menu-item a {
	text-decoration: none;
	display: block;
	padding: 6px 10px 4px 10px;
	line-height: 1.5;
	min-height: 0; /* support: IE7 */
	font-weight: normal;
	border: 0;
	margin: 0;
	border-radius: 0;
	color: #fff;
	background: #444;
	text-shadow: 0px 1px 1px #333;
	}
	.ui-menu .ui-menu-item a.ui-state-focus,
	.ui-menu .ui-menu-item a.ui-state-active {
	font-weight: normal;
	background: #00aad6;
	background: -moz-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00aad6), color-stop(100%,#008fc9));
	background: -o-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	background: -ms-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	background: linear-gradient(top, #00aad6 0%, #008fc9 100%);
	}

	.ui-menu .ui-state-disabled {
	font-weight: normal;
	margin: .4em 0 .2em;
	line-height: 1.5;
	}
	.ui-menu .ui-state-disabled a {
	cursor: default;
	}

	/* icon support */
	.ui-menu-icons {
	position: relative;
	}
	.ui-menu-icons .ui-menu-item a {
	position: relative;
	padding-left: 2em;
	}

	/* left-aligned */
	.ui-menu .ui-icon {
	position: absolute;
	top: .2em;
	left: .2em;
	}

	/* right-aligned */
	.ui-menu .ui-menu-icon {
	position: static;
	float: right;
	}
	.ui-progressbar {
	height: 2em;
	text-align: left;
	overflow: hidden;
	}
	.ui-progressbar .ui-progressbar-value {
	margin: -1px;
	height: 100%;
	}
	.ui-progressbar .ui-progressbar-overlay {
	background: url("images/animated-overlay.gif");
	height: 100%;
	filter: alpha(opacity=25);
	opacity: 0.25;
	}
	.ui-progressbar-indeterminate .ui-progressbar-value {
	background-image: none;
	}
	.ui-slider {
	position: relative;
	text-align: left;
	}
	.ui-slider .ui-slider-handle {
	position: absolute;
	z-index: 2;
	width: 1.2em;
	height: 1.2em;
	cursor: default;
	}
	.ui-slider .ui-slider-range {
	position: absolute;
	z-index: 1;
	font-size: .7em;
	display: block;
	border: 0;
	background: #019bc6;
	background: -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
	background: -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	background: -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	background: linear-gradient(top, #019bc6 0%, #017cb4 100%);
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', GradientType=0);
	}

	/* For IE8 - See #6727 */
	.ui-slider.ui-state-disabled .ui-slider-handle,
	.ui-slider.ui-state-disabled .ui-slider-range {
	filter: inherit;
	}

	.ui-slider-horizontal {
	height: .8em;
	}
	.ui-slider-horizontal .ui-slider-handle {
	top: -.3em;
	margin-left: -.6em;
	}
	.ui-slider-horizontal .ui-slider-range {
	top: 0;
	height: 100%;
	}
	.ui-slider-horizontal .ui-slider-range-min {
	left: 0;
	}
	.ui-slider-horizontal .ui-slider-range-max {
	right: 0;
	}

	.ui-slider-vertical {
	width: .8em;
	height: 100px;
	}
	.ui-slider-vertical .ui-slider-handle {
	left: -.3em;
	margin-left: 0;
	margin-bottom: -.6em;
	}
	.ui-slider-vertical .ui-slider-range {
	left: 0;
	width: 100%;
	}
	.ui-slider-vertical .ui-slider-range-min {
	bottom: 0;
	}
	.ui-slider-vertical .ui-slider-range-max {
	top: 0;
	}
	.ui-spinner {
	position: relative;
	display: inline-block;
	overflow: hidden;
	padding: 0;
	vertical-align: middle;
	}
	.ui-spinner-input {
	border: none;
	background: none;
	color: inherit;
	padding: 0;
	margin: .2em 0;
	vertical-align: middle;
	margin-left: .4em;
	margin-right: 22px;
	}
	.ui-spinner-button {
	width: 16px;
	height: 50%;
	font-size: .5em;
	padding: 0;
	margin: 0;
	text-align: center;
	position: absolute;
	cursor: default;
	display: block;
	overflow: hidden;
	right: 0;
	}
	/* more specificity required here to override default borders */
	.ui-spinner a.ui-spinner-button {
	border-top: none;
	border-bottom: none;
	border-right: none;
	}
	/* vertically center icon */
	.ui-spinner .ui-icon {
	position: absolute;
	margin-top: -8px;
	top: 50%;
	left: 0;
	}
	.ui-spinner-up {
	top: 0;
	}
	.ui-spinner-down {
	bottom: 0;
	}

	/* TR overrides */
	.ui-spinner .ui-icon-triangle-1-s {
	/* need to fix icons sprite */
	background-position: -65px -16px;
	}
	.ui-tabs {
	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
	padding: .2em;
	}
	.ui-tabs .ui-tabs-nav {
	margin: 0; padding: 0;
	border: 0;
	background: transparent;
	filter: none;
	height: 44px;
	}
	.ui-tabs .ui-tabs-nav li {
	list-style: none;
	position: relative;
	display: inline-block;
	top: 0;
	margin: 0;
	border: 0 !important;
	padding: 0 1px 0 0;
	white-space: nowrap;
	background: #f8f8f8;
	background: -moz-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(50%,#d3d3d3), color-stop(100%,#f8f8f8));
	background: -webkit-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: -o-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: -ms-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#d3d3d3', GradientType=0);
	}
	.ui-tabs .ui-tabs-nav li:last-child {
	background: none;
	}
	.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
	display: inline-block;
	padding: 15px;
	text-decoration: none;
	font-size: 12px;
	color: #999;
	background: #fafafa;
	border-right: 1px solid #fafafa;
	}
	.ui-tabs .ui-tabs-nav li.ui-tabs-active {
	margin-bottom: -1px;
	padding-bottom: 1px;
	}
	.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
	.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
	.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
	cursor: text;
	}
	.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
	outline: none;
	color: #004458;
	background: #efefef;
	background: -moz-linear-gradient(top, #fafafa 40%, #e4e4e4 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(40%,#fff), color-stop(100%,#e4e4e4));
	background: -o-linear-gradient(top, #fafafa 40%, #e4e4e4 100%);
	background: -ms-linear-gradient(top, #fafafa 40%, #e4e4e4 100%);
	background: linear-gradient(top, #fafafa 40%, #e4e4e4 100%);
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafa', endColorstr='#e4e4e4', GradientType=0);
	}
	.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
	cursor: pointer;
	}
	.ui-tabs .ui-tabs-panel {
	display: block;
	border-width: 0;
	padding: 0.5em 1em;
	margin-top: 0.2em;
	background: #efefef;
	}
	.ui-tooltip {
	padding: 8px;
	position: absolute;
	z-index: 9999;
	max-width: 300px;
	-webkit-box-shadow: 0 0 5px #aaa;
	box-shadow: 0 0 5px #aaa;
	}
	body .ui-tooltip {
	border-width: 2px;
	}

	/* Component containers
	----------------------------------*/
	.ui-widget {
	font-family: Lucida Grande,Verdana,Arial,sans-serif;
	font-size: 1.0em;
	}
	.ui-widget .ui-widget {
	font-size: 1em;
	}
	.ui-widget input,
	.ui-widget select,
	.ui-widget textarea,
	.ui-widget button {
	font-family: Lucida Grande,Verdana,Arial,sans-serif;
	font-size: 1em;
	}
	.ui-widget-content {
	border: 1px solid #aaaaaa;
	background: #fafafa;
	color: #333333;
	}
	.ui-widget-content a {
	color: #0186ba;
	}
	.ui-widget-header {
	border: 1px solid #fafafa;
	background: #e4e4e4;
	background: -moz-linear-gradient(top, #f2f2f2 0%, #e4e4e4 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f2f2), color-stop(100%,#e4e4e4));
	background: -o-linear-gradient(top, #f2f2f2 0%, #e4e4e4 100%);
	background: -ms-linear-gradient(top, #f2f2f2 0%, #e4e4e4 100%);
	background: linear-gradient(top, #f2f2f2 0%, #e4e4e4 100%);
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e4e4e4', GradientType=0);
	color: #666666;
	font-weight: bold;
	}
	.ui-widget-header a {
	color: #666666;
	}

	/* Interaction states
	----------------------------------*/
	.ui-state-default,
	.ui-widget-content .ui-state-default,
	.ui-widget-header .ui-state-default {
	border: 1px solid #cccccc;
	background: #f8f8f8;
	font-weight: bold;
	color: #666666;
	}
	.ui-state-default a,
	.ui-state-default a:link,
	.ui-state-default a:visited {
	color: #666666;
	text-decoration: none;
	}
	.ui-state-hover,
	.ui-widget-content .ui-state-hover,
	.ui-widget-header .ui-state-hover,
	.ui-state-focus,
	.ui-widget-content .ui-state-focus,
	.ui-widget-header .ui-state-focus {
	border: 1px solid #aaaaaa;
	background: #eaeaea;
	font-weight: bold;
	color: #333333;
	}
	.ui-state-hover a,
	.ui-state-hover a:hover,
	.ui-state-hover a:link,
	.ui-state-hover a:visited,
	.ui-state-focus a,
	.ui-state-focus a:hover,
	.ui-state-focus a:link,
	.ui-state-focus a:visited {
	color: #333333;
	text-decoration: none;
	}
	.ui-state-active,
	.ui-widget-content .ui-state-active,
	.ui-widget-header .ui-state-active {
	border: 1px solid #aaaaaa;
	background: #ffffff;
	font-weight: bold;
	color: #333333;
	}
	.ui-state-active a,
	.ui-state-active a:link,
	.ui-state-active a:visited {
	color: #333333;
	text-decoration: none;
	}

	/* Interaction Cues
	----------------------------------*/
	.ui-state-highlight,
	.ui-widget-content .ui-state-highlight,
	.ui-widget-header .ui-state-highlight {
	border: 1px solid #a3a3a3;
	background: #b0ccd7;
	color: #004458;
	}
	.ui-state-highlight a,
	.ui-widget-content .ui-state-highlight a,
	.ui-widget-header .ui-state-highlight a {
	color: #004458;
	}
	.ui-state-error,
	.ui-widget-content .ui-state-error,
	.ui-widget-header .ui-state-error {
	border: 1px solid #d7211e;
	background: #fef1ec;
	color: #d64040;
	}
	.ui-state-error a,
	.ui-widget-content .ui-state-error a,
	.ui-widget-header .ui-state-error a {
	color: #d64040;
	}
	.ui-state-error-text,
	.ui-widget-content .ui-state-error-text,
	.ui-widget-header .ui-state-error-text {
	color: #d64040;
	}
	.ui-priority-primary,
	.ui-widget-content .ui-priority-primary,
	.ui-widget-header .ui-priority-primary {
	font-weight: bold;
	}
	.ui-priority-secondary,
	.ui-widget-content .ui-priority-secondary,
	.ui-widget-header .ui-priority-secondary {
	opacity: .7;
	filter:Alpha(Opacity=70);
	font-weight: normal;
	}
	.ui-state-disabled,
	.ui-widget-content .ui-state-disabled,
	.ui-widget-header .ui-state-disabled {
	opacity: .35;
	filter:Alpha(Opacity=35);
	background-image: none;
	}
	.ui-state-disabled .ui-icon {
	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
	}

	/* Icons
	----------------------------------*/

	/* states and images */
	.ui-icon {
	width: 16px;
	height: 16px;
	}
	.ui-icon,
	.ui-widget-content .ui-icon {
	background-image: url("images/ui-icons_004458_256x240.png");
	}
	.ui-widget-header .ui-icon {
	background-image: url("images/ui-icons_004458_256x240.png");
	}
	.ui-state-default .ui-icon {
	background-image: url("images/ui-icons_004458_256x240.png");
	}
	.ui-state-hover .ui-icon,
	.ui-state-focus .ui-icon {
	background-image: url("images/ui-icons_004458_256x240.png");
	}
	.ui-state-active .ui-icon {
	background-image: url("images/ui-icons_004458_256x240.png");
	}
	.ui-state-highlight .ui-icon {
	background-image: url("images/ui-icons_004458_256x240.png");
	}
	.ui-state-error .ui-icon,
	.ui-state-error-text .ui-icon {
	background-image: url("images/ui-icons_d7211e_256x240.png");
	}

	/* positioning */
	.ui-icon-blank { background-position: 16px 16px; }
	.ui-icon-carat-1-n { background-position: 0 0; }
	.ui-icon-carat-1-ne { background-position: -16px 0; }
	.ui-icon-carat-1-e { background-position: -32px 0; }
	.ui-icon-carat-1-se { background-position: -48px 0; }
	.ui-icon-carat-1-s { background-position: -64px 0; }
	.ui-icon-carat-1-sw { background-position: -80px 0; }
	.ui-icon-carat-1-w { background-position: -96px 0; }
	.ui-icon-carat-1-nw { background-position: -112px 0; }
	.ui-icon-carat-2-n-s { background-position: -128px 0; }
	.ui-icon-carat-2-e-w { background-position: -144px 0; }
	.ui-icon-triangle-1-n { background-position: 0 -16px; }
	.ui-icon-triangle-1-ne { background-position: -16px -16px; }
	.ui-icon-triangle-1-e { background-position: -32px -16px; }
	.ui-icon-triangle-1-se { background-position: -48px -16px; }
	.ui-icon-triangle-1-s { background-position: -64px -16px; }
	.ui-icon-triangle-1-sw { background-position: -80px -16px; }
	.ui-icon-triangle-1-w { background-position: -96px -16px; }
	.ui-icon-triangle-1-nw { background-position: -112px -16px; }
	.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
	.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
	.ui-icon-arrow-1-n { background-position: 0 -32px; }
	.ui-icon-arrow-1-ne { background-position: -16px -32px; }
	.ui-icon-arrow-1-e { background-position: -32px -32px; }
	.ui-icon-arrow-1-se { background-position: -48px -32px; }
	.ui-icon-arrow-1-s { background-position: -64px -32px; }
	.ui-icon-arrow-1-sw { background-position: -80px -32px; }
	.ui-icon-arrow-1-w { background-position: -96px -32px; }
	.ui-icon-arrow-1-nw { background-position: -112px -32px; }
	.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
	.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
	.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
	.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
	.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
	.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
	.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
	.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
	.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
	.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
	.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
	.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
	.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
	.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
	.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
	.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
	.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
	.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
	.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
	.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
	.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
	.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
	.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
	.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
	.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
	.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
	.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
	.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
	.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
	.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
	.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
	.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
	.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
	.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
	.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
	.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
	.ui-icon-arrow-4 { background-position: 0 -80px; }
	.ui-icon-arrow-4-diag { background-position: -16px -80px; }
	.ui-icon-extlink { background-position: -32px -80px; }
	.ui-icon-newwin { background-position: -48px -80px; }
	.ui-icon-refresh { background-position: -64px -80px; }
	.ui-icon-shuffle { background-position: -80px -80px; }
	.ui-icon-transfer-e-w { background-position: -96px -80px; }
	.ui-icon-transferthick-e-w { background-position: -112px -80px; }
	.ui-icon-folder-collapsed { background-position: 0 -96px; }
	.ui-icon-folder-open { background-position: -16px -96px; }
	.ui-icon-document { background-position: -32px -96px; }
	.ui-icon-document-b { background-position: -48px -96px; }
	.ui-icon-note { background-position: -64px -96px; }
	.ui-icon-mail-closed { background-position: -80px -96px; }
	.ui-icon-mail-open { background-position: -96px -96px; }
	.ui-icon-suitcase { background-position: -112px -96px; }
	.ui-icon-comment { background-position: -128px -96px; }
	.ui-icon-person { background-position: -144px -96px; }
	.ui-icon-print { background-position: -160px -96px; }
	.ui-icon-trash { background-position: -176px -96px; }
	.ui-icon-locked { background-position: -192px -96px; }
	.ui-icon-unlocked { background-position: -208px -96px; }
	.ui-icon-bookmark { background-position: -224px -96px; }
	.ui-icon-tag { background-position: -240px -96px; }
	.ui-icon-home { background-position: 0 -112px; }
	.ui-icon-flag { background-position: -16px -112px; }
	.ui-icon-calendar { background-position: -32px -112px; }
	.ui-icon-cart { background-position: -48px -112px; }
	.ui-icon-pencil { background-position: -64px -112px; }
	.ui-icon-clock { background-position: -80px -112px; }
	.ui-icon-disk { background-position: -96px -112px; }
	.ui-icon-calculator { background-position: -112px -112px; }
	.ui-icon-zoomin { background-position: -128px -112px; }
	.ui-icon-zoomout { background-position: -144px -112px; }
	.ui-icon-search { background-position: -160px -112px; }
	.ui-icon-wrench { background-position: -176px -112px; }
	.ui-icon-gear { background-position: -192px -112px; }
	.ui-icon-heart { background-position: -208px -112px; }
	.ui-icon-star { background-position: -224px -112px; }
	.ui-icon-link { background-position: -240px -112px; }
	.ui-icon-cancel { background-position: 0 -128px; }
	.ui-icon-plus { background-position: -16px -128px; }
	.ui-icon-plusthick { background-position: -32px -128px; }
	.ui-icon-minus { background-position: -48px -128px; }
	.ui-icon-minusthick { background-position: -64px -128px; }
	.ui-icon-close { background-position: -80px -128px; }
	.ui-icon-closethick { background-position: -96px -128px; }
	.ui-icon-key { background-position: -112px -128px; }
	.ui-icon-lightbulb { background-position: -128px -128px; }
	.ui-icon-scissors { background-position: -144px -128px; }
	.ui-icon-clipboard { background-position: -160px -128px; }
	.ui-icon-copy { background-position: -176px -128px; }
	.ui-icon-contact { background-position: -192px -128px; }
	.ui-icon-image { background-position: -208px -128px; }
	.ui-icon-video { background-position: -224px -128px; }
	.ui-icon-script { background-position: -240px -128px; }
	.ui-icon-alert { background-position: 0 -144px; }
	.ui-icon-info { background-position: -16px -144px; }
	.ui-icon-notice { background-position: -32px -144px; }
	.ui-icon-help { background-position: -48px -144px; }
	.ui-icon-check { background-position: -64px -144px; }
	.ui-icon-bullet { background-position: -80px -144px; }
	.ui-icon-radio-on { background-position: -96px -144px; }
	.ui-icon-radio-off { background-position: -112px -144px; }
	.ui-icon-pin-w { background-position: -128px -144px; }
	.ui-icon-pin-s { background-position: -144px -144px; }
	.ui-icon-play { background-position: 0 -160px; }
	.ui-icon-pause { background-position: -16px -160px; }
	.ui-icon-seek-next { background-position: -32px -160px; }
	.ui-icon-seek-prev { background-position: -48px -160px; }
	.ui-icon-seek-end { background-position: -64px -160px; }
	.ui-icon-seek-start { background-position: -80px -160px; }
	/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
	.ui-icon-seek-first { background-position: -80px -160px; }
	.ui-icon-stop { background-position: -96px -160px; }
	.ui-icon-eject { background-position: -112px -160px; }
	.ui-icon-volume-off { background-position: -128px -160px; }
	.ui-icon-volume-on { background-position: -144px -160px; }
	.ui-icon-power { background-position: 0 -176px; }
	.ui-icon-signal-diag { background-position: -16px -176px; }
	.ui-icon-signal { background-position: -32px -176px; }
	.ui-icon-battery-0 { background-position: -48px -176px; }
	.ui-icon-battery-1 { background-position: -64px -176px; }
	.ui-icon-battery-2 { background-position: -80px -176px; }
	.ui-icon-battery-3 { background-position: -96px -176px; }
	.ui-icon-circle-plus { background-position: 0 -192px; }
	.ui-icon-circle-minus { background-position: -16px -192px; }
	.ui-icon-circle-close { background-position: -32px -192px; }
	.ui-icon-circle-triangle-e { background-position: -48px -192px; }
	.ui-icon-circle-triangle-s { background-position: -64px -192px; }
	.ui-icon-circle-triangle-w { background-position: -80px -192px; }
	.ui-icon-circle-triangle-n { background-position: -96px -192px; }
	.ui-icon-circle-arrow-e { background-position: -112px -192px; }
	.ui-icon-circle-arrow-s { background-position: -128px -192px; }
	.ui-icon-circle-arrow-w { background-position: -144px -192px; }
	.ui-icon-circle-arrow-n { background-position: -160px -192px; }
	.ui-icon-circle-zoomin { background-position: -176px -192px; }
	.ui-icon-circle-zoomout { background-position: -192px -192px; }
	.ui-icon-circle-check { background-position: -208px -192px; }
	.ui-icon-circlesmall-plus { background-position: 0 -208px; }
	.ui-icon-circlesmall-minus { background-position: -16px -208px; }
	.ui-icon-circlesmall-close { background-position: -32px -208px; }
	.ui-icon-squaresmall-plus { background-position: -48px -208px; }
	.ui-icon-squaresmall-minus { background-position: -64px -208px; }
	.ui-icon-squaresmall-close { background-position: -80px -208px; }
	.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
	.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
	.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
	.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
	.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
	.ui-icon-grip-diagonal-se { background-position: -80px -224px; }


	/* Misc visuals
	----------------------------------*/

	/* Corner radius */
	.ui-corner-all,
	.ui-corner-top,
	.ui-corner-left,
	.ui-corner-tl {
	border-top-left-radius: 5px;
	}
	.ui-corner-all,
	.ui-corner-top,
	.ui-corner-right,
	.ui-corner-tr {
	border-top-right-radius: 5px;
	}
	.ui-corner-all,
	.ui-corner-bottom,
	.ui-corner-left,
	.ui-corner-bl {
	border-bottom-left-radius: 5px;
	}
	.ui-corner-all,
	.ui-corner-bottom,
	.ui-corner-right,
	.ui-corner-br {
	border-bottom-right-radius: 5px;
	}

	/* Overlays */
	.ui-widget-overlay {
	background: #333333;
	opacity: .5;
	filter: Alpha(Opacity=50);
	}
	.ui-widget-shadow {
	margin: -6px 0 0 -6px;
	padding: 6px;
	background: #666666;
	opacity: .2;
	filter: Alpha(Opacity=20);
	border-radius: 8px;
	}

	/* Roundcube button styling */
	.ui-button.ui-state-default {
	display: inline-block;
	margin: 0 2px;
	padding: 1px 2px;
	text-shadow: 0px 1px 1px #fff;
	border: 1px solid #c6c6c6;
	border-radius: 4px;
	background: #f7f7f7;
	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
	-webkit-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-moz-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-o-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	text-decoration: none;
	outline: none;
	}

	.ui-button.mainaction {
	color: #ededed;
	text-shadow: 0px 1px 1px #333;
	border-color: #1f262c;
	background: #505050;
	background: -moz-linear-gradient(top, #505050 0%, #2a2e31 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#505050), color-stop(100%,#2a2e31));
	background: -o-linear-gradient(top, #505050 0%, #2a2e31 100%);
	background: -ms-linear-gradient(top, #505050 0%, #2a2e31 100%);
	background: linear-gradient(top, #505050 0%, #2a2e31 100%);
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#505050', endColorstr='#2a2e31', GradientType=0);
	-moz-box-shadow: inset 0 1px 0 0 #777;
	-webkit-box-shadow: inset 0 1px 0 0 #777;
	-o-box-shadow: inset 0 1px 0 0 #777;
	box-shadow: inset 0 1px 0 0 #777;
	}

	.ui-button.ui-state-focus {
	color: #525252;
	border-color: #4fadd5;
	-moz-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	-webkit-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	-o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	}

	.ui-button.ui-state-active {
	color: #525252;
	border-color: #aaa;
	background: #e6e6e6;
	background: -moz-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e6e6e6), color-stop(100%,#f9f9f9));
	background: -o-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	background: -ms-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	background: linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e6e6e6', endColorstr='#f9f9f9', GradientType=0);
	}

	.ui-button.ui-state-focus.mainaction,
	.ui-button.ui-state-hover.mainaction {
	color: #fff;
	}

	.ui-button.ui-state-focus.mainaction {
	border-color: #1f262c;
	-moz-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6), inset 0 1px 0 0 #777;
	-webkit-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6), inset 0 1px 0 0 #777;
	-o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6), inset 0 1px 0 0 #777;
	box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6), inset 0 1px 0 0 #777;
	}

	.ui-button.ui-state-active.mainaction {
	color: #fff;
	background: #515151;
	background: -moz-linear-gradient(top, #2a2e31 0%, #505050 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2a2e31), color-stop(100%,#505050));
	background: -o-linear-gradient(top, #2a2e31 0%, #505050 100%);
	background: -ms-linear-gradient(top, #2a2e31 0%, #505050 100%);
	background: linear-gradient(top, #2a2e31 0%, #505050 100%);
	}

	.ui-button[disabled],
	.ui-button[disabled]:hover,
	.ui-button.mainaction[disabled] {
	color: #aaa !important;
	}

	/* Roundcube's specific Datepicker style override */
	.ui-datepicker {
	min-width: 20em;
	padding: 0;
	display: none;
	border: 0;
	border-radius: 3px;
	-webkit-box-shadow: #666 1px 1px 10px;
	-moz-box-shadow: 1px 1px 10px #666;
	box-shadow: 1px 1px 16px #666;
	}
	.ui-datepicker .ui-datepicker-header {
	padding: .3em 0;
	border-radius: 3px 3px 0 0;
	border: 0;
	background: #3a3a3a;
	filter: none;
	color: #fff;
	text-shadow: 0px 1px 1px #000;
	}
	.ui-datepicker .ui-datepicker-prev,
	.ui-datepicker .ui-datepicker-next {
	border: 0;
	background: none;
	}
	.ui-datepicker .ui-datepicker-header .ui-icon {
	background: url("images/ui-icons-datepicker.png") 0 0 no-repeat;
	}
	.ui-datepicker .ui-datepicker-header .ui-icon-circle-triangle-w {
	background-position: 0 2px;
	}
	.ui-datepicker .ui-datepicker-header .ui-icon-circle-triangle-e {
	background-position: -14px 2px;
	}
	.ui-datepicker .ui-datepicker-prev-hover,
	.ui-datepicker .ui-datepicker-next-hover {
	top: 2px;
	border: 0;
	background: none;
	}
	.ui-datepicker .ui-datepicker-prev,
	.ui-datepicker .ui-datepicker-prev-hover {
	left: 2px;
	}
	.ui-datepicker .ui-datepicker-next,
	.ui-datepicker .ui-datepicker-next-hover {
	right: 2px;
	}
	.ui-datepicker select.ui-datepicker-month,
	.ui-datepicker select.ui-datepicker-year {
	border: 0;
	background: #3a3a3a;
	outline: none;
	color: #fff;
	font-weight: bold;
	width: auto;
	margin-right: 4px;
	padding-right: 4px;
	}
	.ui-datepicker .ui-datepicker-title select::-ms-expand {
	display: none;
	}
	.ie10 .ui-datepicker .ui-datepicker-title select,
	.webkit .ui-datepicker .ui-datepicker-title select,
	.mozilla .ui-datepicker .ui-datepicker-title select {
	background-image: url("images/ui-icons-datepicker.png");
	background-position: right -18px;
	background-repeat: no-repeat;
	padding-right: 14px;
	-webkit-appearance: none;
	-moz-appearance: none;
	appearance: none;
	}
	.mozilla .ui-datepicker .ui-datepicker-title select {
	background-position: right -17px;
	text-indent: 0.01px;
	text-overflow: '';
	padding-right: 0;
	}
	.ui-datepicker .ui-datepicker-month:focus,
	.ui-datepicker .ui-datepicker-year:focus {
	outline: 1px solid #4fadd5;
	}
	.ui-datepicker table {
	margin: 0;
	border-spacing: 0;
	}
	.ui-datepicker table:focus {
	outline: 2px solid #4fadd5;
	outline-offset: -2px;
	}
	.ui-datepicker td {
	border: 1px solid #bbb;
	padding: 0;
	}
	.ui-datepicker td span, .ui-datepicker td a {
	border: 0;
	padding: .3em;
	text-shadow: 0px 1px 1px #fff;
	}
	.ui-datepicker td a.ui-state-default {
	border: 0px solid #fff;
	border-top-width: 1px;
	border-left-width: 1px;
	background: #e6e6e6;
	background: -moz-linear-gradient(top, #e6e6e6 0%, #d6d6d6 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e6e6e6), color-stop(100%,#d6d6d6));
	background: -o-linear-gradient(top, #e6e6e6 0%, #d6d6d6 100%);
	background: -ms-linear-gradient(top, #e6e6e6 0%, #d6d6d6 100%);
	background: linear-gradient(top, #e6e6e6 0%, #d6d6d6 100%);
	}
	.ui-datepicker td a.ui-priority-secondary {
	background: #eee;
	}
	.ui-datepicker td a.ui-state-active {
	color: #fff;
	border-color: #0286ac !important;
	text-shadow: 0px 1px 1px #00516e !important;
	background: #00acd4 !important;
	background: -moz-linear-gradient(top, #00acd4 0%, #008fc7 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00acd4), color-stop(100%,#008fc7));
	background: -o-linear-gradient(top, #00acd4 0%, #008fc7 100%);
	background: -ms-linear-gradient(top, #00acd4 0%, #008fc7 100%);
	background: linear-gradient(top, #00acd4 0%, #008fc7 100%);
	}
	.ui-datepicker .ui-state-highlight {
	color: #0081c2;
	}
	.ui-datepicker td.ui-datepicker-days-cell-over a.ui-state-default {
	color: #fff;
	border-color: rgba(73,180,210,0.7);
	background: rgba(73,180,210,0.7);
	text-shadow: 0px 1px 1px #666;
	}
	diff --git a/plugins/jqueryui/themes/larry/jquery-ui-css.diff b/plugins/jqueryui/themes/larry/jquery-ui-css.diff
	index f494d15d9..cce990679 100644
	--- a/plugins/jqueryui/themes/larry/jquery-ui-css.diff
	+++ b/plugins/jqueryui/themes/larry/jquery-ui-css.diff
	@@ -1,597 +1,600 @@
	--- jquery-ui-1.10.4.custom.orig.css 2014-06-17 00:47:00.000000000 +0200
	-+++ jquery-ui-1.10.4.custom.css 2014-07-09 10:42:44.000000000 +0200
	++++ jquery-ui-1.10.4.custom.css 2014-07-31 08:54:40.000000000 +0200
	@@ -238,6 +238,8 @@
	.ui-button-icons-only .ui-button-text {
	padding: .4em;
	text-indent: -9999999px;
	+ width: 1px;
	+ overflow: hidden;
	}
	.ui-button-text-icon-primary .ui-button-text,
	.ui-button-text-icons .ui-button-text {
	@@ -463,20 +465,29 @@
	border-left-width: 1px;
	}
	.ui-dialog {
	- overflow: hidden;
	position: absolute;
	top: 0;
	left: 0;
	- padding: .2em;
	+ padding: 3px;
	+ background: #fff;
	+ border-radius: 6px !important;
	+ border: 0 !important;
	outline: 0;
	+ -webkit-box-shadow: #666 1px 1px 12px;
	+ -moz-box-shadow: 1px 1px 12px #666;
	+ box-shadow: 1px 1px 18px #666;
	}
	.ui-dialog .ui-dialog-titlebar {
	- padding: .4em 1em;
	+ padding: 15px 1em 8px 1em;
	position: relative;
	+ border: 0;
	+ border-radius: 5px 5px 0 0;
	}
	.ui-dialog .ui-dialog-title {
	float: left;
	- margin: .1em 0;
	+ margin: .1em 16px .1em 0;
	+ font-size: 1.3em;
	+ text-shadow: 1px 1px 1px #fff;
	white-space: nowrap;
	width: 90%;
	overflow: hidden;
	-@@ -484,50 +495,81 @@
	+@@ -484,50 +495,84 @@
	}
	.ui-dialog .ui-dialog-titlebar-close {
	position: absolute;
	- right: .3em;
	- top: 50%;
	- width: 20px;
	- margin: -10px 0 0 0;
	- padding: 1px;
	- height: 20px;
	+ right: -15px;
	+ top: -15px;
	+ width: 30px;
	+ margin: 0;
	+ padding: 0;
	+ height: 30px;
	+ z-index: 99999;
	+ border-width: 0 !important;
	+ background: none !important;
	+ filter: none !important;
	+ -webkit-box-shadow: none !important;
	+ -moz-box-shadow: none !important;
	+ -o-box-shadow: none !important;
	+ box-shadow: none !important;
	+}
	+.ui-dialog .ui-dialog-titlebar-close.ui-state-focus {
	+ outline: 2px solid #4fadd5;
	+}
	+.ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick {
	+ top: 0;
	+ left: 0;
	+ margin: 0;
	+ width: 30px;
	+ height: 30px;
	+ background: url("images/ui-dialog-close.png") 0 0 no-repeat;
	++}
	++.no-close .ui-dialog-titlebar-close {
	++ display: none !important;
	}
	.ui-dialog .ui-dialog-content {
	position: relative;
	border: 0;
	- padding: .5em 1em;
	+ padding: 1.5em 1em 0.5em 1em;
	background: none;
	overflow: auto;
	}
	+.ui-dialog .ui-widget-content {
	+ border: 0;
	+}
	.ui-dialog .ui-dialog-buttonpane {
	text-align: left;
	border-width: 1px 0 0 0;
	background-image: none;
	- margin-top: .5em;
	- padding: .3em 1em .5em .4em;
	+ border-color: #ddd;
	+ border-style: solid;
	+ margin: 0;
	+ padding: .3em 1em .5em .8em;
	}
	.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
	- float: right;
	+ float: left;
	}
	.ui-dialog .ui-dialog-buttonpane button {
	margin: .5em .4em .5em 0;
	cursor: pointer;
	}
	.ui-dialog .ui-resizable-se {
	- width: 12px;
	- height: 12px;
	- right: -5px;
	- bottom: -5px;
	- background-position: 16px 16px;
	+ width: 14px;
	+ height: 14px;
	+ right: 3px;
	+ bottom: 3px;
	+ background-position: -80px -224px;
	}
	.ui-draggable .ui-dialog-titlebar {
	cursor: move;
	}
	.ui-menu {
	list-style: none;
	- padding: 2px;
	+ padding: 0;
	margin: 0;
	display: block;
	outline: none;
	+ background: #444;
	+ border: 1px solid #999;
	+ border-radius: 4px !important;
	+ -webkit-box-shadow: 0 2px 6px 0 #333;
	+ -moz-box-shadow: 0 2px 6px 0 #333;
	+ -o-box-shadow: 0 2px 6px 0 #333;
	+ box-shadow: 0 2px 6px 0 #333;
	}
	.ui-menu .ui-menu {
	margin-top: -3px;
	-@@ -539,6 +581,16 @@
	+@@ -539,6 +584,16 @@
	width: 100%;
	/* support: IE10, see #8844 */
	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
	+ color: #fff;
	+ white-space: nowrap;
	+ border-top: 1px solid #5a5a5a;
	+ border-bottom: 1px solid #333;
	+}
	+.ui-menu .ui-menu-item:first-child {
	+ border-top: 0;
	+}
	+.ui-menu .ui-menu-item:last-child {
	+ border-bottom: 0;
	}
	.ui-menu .ui-menu-divider {
	margin: 5px -2px 5px -2px;
	-@@ -550,15 +602,26 @@
	+@@ -550,15 +605,26 @@
	.ui-menu .ui-menu-item a {
	text-decoration: none;
	display: block;
	- padding: 2px .4em;
	+ padding: 6px 10px 4px 10px;
	line-height: 1.5;
	min-height: 0; /* support: IE7 */
	font-weight: normal;
	+ border: 0;
	+ margin: 0;
	+ border-radius: 0;
	+ color: #fff;
	+ background: #444;
	+ text-shadow: 0px 1px 1px #333;
	}
	.ui-menu .ui-menu-item a.ui-state-focus,
	.ui-menu .ui-menu-item a.ui-state-active {
	font-weight: normal;
	- margin: -1px;
	+ background: #00aad6;
	+ background: -moz-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00aad6), color-stop(100%,#008fc9));
	+ background: -o-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	+ background: -ms-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	+ background: linear-gradient(top, #00aad6 0%, #008fc9 100%);
	}

	.ui-menu .ui-state-disabled {
	-@@ -626,7 +689,13 @@
	+@@ -626,7 +692,13 @@
	font-size: .7em;
	display: block;
	border: 0;
	- background-position: 0 0;
	+ background: #019bc6;
	+ background: -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
	+ background: -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	+ background: -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	+ background: linear-gradient(top, #019bc6 0%, #017cb4 100%);
	+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', GradientType=0);
	}

	/* For IE8 - See #6727 */
	-@@ -732,23 +801,41 @@
	+@@ -732,23 +804,41 @@
	padding: .2em;
	}
	.ui-tabs .ui-tabs-nav {
	- margin: 0;
	- padding: .2em .2em 0;
	+ margin: 0; padding: 0;
	+ border: 0;
	+ background: transparent;
	+ filter: none;
	+ height: 44px;
	}
	.ui-tabs .ui-tabs-nav li {
	list-style: none;
	- float: left;
	position: relative;
	+ display: inline-block;
	top: 0;
	- margin: 1px .2em 0 0;
	- border-bottom-width: 0;
	- padding: 0;
	+ margin: 0;
	+ border: 0 !important;
	+ padding: 0 1px 0 0;
	white-space: nowrap;
	+ background: #f8f8f8;
	+ background: -moz-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(50%,#d3d3d3), color-stop(100%,#f8f8f8));
	+ background: -webkit-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	+ background: -o-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	+ background: -ms-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	+ background: linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#d3d3d3', GradientType=0);
	+}
	+.ui-tabs .ui-tabs-nav li:last-child {
	+ background: none;
	}
	.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
	- float: left;
	- padding: .5em 1em;
	+ display: inline-block;
	+ padding: 15px;
	text-decoration: none;
	+ font-size: 12px;
	+ color: #999;
	+ background: #fafafa;
	+ border-right: 1px solid #fafafa;
	}
	.ui-tabs .ui-tabs-nav li.ui-tabs-active {
	margin-bottom: -1px;
	-@@ -759,14 +846,26 @@
	+@@ -759,14 +849,26 @@
	.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
	cursor: text;
	}
	+.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
	+ outline: none;
	+ color: #004458;
	+ background: #efefef;
	+ background: -moz-linear-gradient(top, #fafafa 40%, #e4e4e4 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(40%,#fff), color-stop(100%,#e4e4e4));
	+ background: -o-linear-gradient(top, #fafafa 40%, #e4e4e4 100%);
	+ background: -ms-linear-gradient(top, #fafafa 40%, #e4e4e4 100%);
	+ background: linear-gradient(top, #fafafa 40%, #e4e4e4 100%);
	+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafa', endColorstr='#e4e4e4', GradientType=0);
	+}
	.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
	cursor: pointer;
	}
	.ui-tabs .ui-tabs-panel {
	display: block;
	border-width: 0;
	- padding: 1em 1.4em;
	- background: none;
	+ padding: 0.5em 1em;
	+ margin-top: 0.2em;
	+ background: #efefef;
	}
	.ui-tooltip {
	padding: 8px;
	-@@ -798,15 +897,21 @@
	+@@ -798,15 +900,21 @@
	}
	.ui-widget-content {
	border: 1px solid #aaaaaa;
	- background: #fafafa url("images/ui-bg_highlight-soft_75_fafafa_1x100.png") 50% top repeat-x;
	- color: 33333;
	+ background: #fafafa;
	+ color: #333333;
	}
	.ui-widget-content a {
	- color: 33333;
	+ color: #0186ba;
	}
	.ui-widget-header {
	border: 1px solid #fafafa;
	- background: #e4e4e4 url("images/ui-bg_highlight-soft_90_e4e4e4_1x100.png") 50% 50% repeat-x;
	+ background: #e4e4e4;
	+ background: -moz-linear-gradient(top, #f2f2f2 0%, #e4e4e4 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f2f2), color-stop(100%,#e4e4e4));
	+ background: -o-linear-gradient(top, #f2f2f2 0%, #e4e4e4 100%);
	+ background: -ms-linear-gradient(top, #f2f2f2 0%, #e4e4e4 100%);
	+ background: linear-gradient(top, #f2f2f2 0%, #e4e4e4 100%);
	+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e4e4e4', GradientType=0);
	color: #666666;
	font-weight: bold;
	}
	-@@ -820,7 +925,7 @@
	+@@ -820,7 +928,7 @@
	.ui-widget-content .ui-state-default,
	.ui-widget-header .ui-state-default {
	border: 1px solid #cccccc;
	- background: #f8f8f8 url("images/ui-bg_highlight-hard_75_f8f8f8_1x100.png") 50% 50% repeat-x;
	+ background: #f8f8f8;
	font-weight: bold;
	color: #666666;
	}
	-@@ -837,7 +942,7 @@
	+@@ -837,7 +945,7 @@
	.ui-widget-content .ui-state-focus,
	.ui-widget-header .ui-state-focus {
	border: 1px solid #aaaaaa;
	- background: #eaeaea url("images/ui-bg_highlight-hard_75_eaeaea_1x100.png") 50% 50% repeat-x;
	+ background: #eaeaea;
	font-weight: bold;
	color: #333333;
	}
	-@@ -856,7 +961,7 @@
	+@@ -856,7 +964,7 @@
	.ui-widget-content .ui-state-active,
	.ui-widget-header .ui-state-active {
	border: 1px solid #aaaaaa;
	- background: #ffffff url("images/ui-bg_highlight-hard_65_ffffff_1x100.png") 50% 50% repeat-x;
	+ background: #ffffff;
	font-weight: bold;
	color: #333333;
	}
	-@@ -873,7 +978,7 @@
	+@@ -873,7 +981,7 @@
	.ui-widget-content .ui-state-highlight,
	.ui-widget-header .ui-state-highlight {
	border: 1px solid #a3a3a3;
	- background: #b0ccd7 url("images/ui-bg_highlight-hard_55_b0ccd7_1x100.png") 50% top repeat-x;
	+ background: #b0ccd7;
	color: #004458;
	}
	.ui-state-highlight a,
	-@@ -885,7 +990,7 @@
	+@@ -885,7 +993,7 @@
	.ui-widget-content .ui-state-error,
	.ui-widget-header .ui-state-error {
	border: 1px solid #d7211e;
	- background: #fef1ec url("images/ui-bg_flat_95_fef1ec_40x100.png") 50% 50% repeat-x;
	+ background: #fef1ec;
	color: #d64040;
	}
	.ui-state-error a,
	-@@ -1164,15 +1269,240 @@
	+@@ -1164,15 +1272,240 @@

	/* Overlays */
	.ui-widget-overlay {
	- background: #333333 url("images/ui-bg_flat_0_333333_40x100.png") 50% 50% repeat-x;
	+ background: #333333;
	opacity: .5;
	filter: Alpha(Opacity=50);
	}
	.ui-widget-shadow {
	margin: -6px 0 0 -6px;
	padding: 6px;
	- background: #666666 url("images/ui-bg_flat_0_666666_40x100.png") 50% 50% repeat-x;
	+ background: #666666;
	opacity: .2;
	filter: Alpha(Opacity=20);
	border-radius: 8px;
	}
	+
	+/* Roundcube button styling */
	+.ui-button.ui-state-default {
	+ display: inline-block;
	+ margin: 0 2px;
	+ padding: 1px 2px;
	+ text-shadow: 0px 1px 1px #fff;
	+ border: 1px solid #c6c6c6;
	+ border-radius: 4px;
	+ background: #f7f7f7;
	+ background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
	+ background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	+ background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	+ background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
	+ -webkit-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	+ -moz-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	+ -o-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	+ box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	+ text-decoration: none;
	+ outline: none;
	+}
	+
	+.ui-button.mainaction {
	+ color: #ededed;
	+ text-shadow: 0px 1px 1px #333;
	+ border-color: #1f262c;
	+ background: #505050;
	+ background: -moz-linear-gradient(top, #505050 0%, #2a2e31 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#505050), color-stop(100%,#2a2e31));
	+ background: -o-linear-gradient(top, #505050 0%, #2a2e31 100%);
	+ background: -ms-linear-gradient(top, #505050 0%, #2a2e31 100%);
	+ background: linear-gradient(top, #505050 0%, #2a2e31 100%);
	+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#505050', endColorstr='#2a2e31', GradientType=0);
	+ -moz-box-shadow: inset 0 1px 0 0 #777;
	+ -webkit-box-shadow: inset 0 1px 0 0 #777;
	+ -o-box-shadow: inset 0 1px 0 0 #777;
	+ box-shadow: inset 0 1px 0 0 #777;
	+}
	+
	+.ui-button.ui-state-focus {
	+ color: #525252;
	+ border-color: #4fadd5;
	+ -moz-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	+ -webkit-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	+ -o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	+ box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	+}
	+
	+.ui-button.ui-state-active {
	+ color: #525252;
	+ border-color: #aaa;
	+ background: #e6e6e6;
	+ background: -moz-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e6e6e6), color-stop(100%,#f9f9f9));
	+ background: -o-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	+ background: -ms-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	+ background: linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e6e6e6', endColorstr='#f9f9f9', GradientType=0);
	+}
	+
	+.ui-button.ui-state-focus.mainaction,
	+.ui-button.ui-state-hover.mainaction {
	+ color: #fff;
	+}
	+
	+.ui-button.ui-state-focus.mainaction {
	+ border-color: #1f262c;
	+ -moz-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6), inset 0 1px 0 0 #777;
	+ -webkit-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6), inset 0 1px 0 0 #777;
	+ -o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6), inset 0 1px 0 0 #777;
	+ box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6), inset 0 1px 0 0 #777;
	+}
	+
	+.ui-button.ui-state-active.mainaction {
	+ color: #fff;
	+ background: #515151;
	+ background: -moz-linear-gradient(top, #2a2e31 0%, #505050 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2a2e31), color-stop(100%,#505050));
	+ background: -o-linear-gradient(top, #2a2e31 0%, #505050 100%);
	+ background: -ms-linear-gradient(top, #2a2e31 0%, #505050 100%);
	+ background: linear-gradient(top, #2a2e31 0%, #505050 100%);
	+}
	+
	+.ui-button[disabled],
	+.ui-button[disabled]:hover,
	+.ui-button.mainaction[disabled] {
	+ color: #aaa !important;
	+}
	+
	+/* Roundcube's specific Datepicker style override */
	+.ui-datepicker {
	+ min-width: 20em;
	+ padding: 0;
	+ display: none;
	+ border: 0;
	+ border-radius: 3px;
	+ -webkit-box-shadow: #666 1px 1px 10px;
	+ -moz-box-shadow: 1px 1px 10px #666;
	+ box-shadow: 1px 1px 16px #666;
	+}
	+.ui-datepicker .ui-datepicker-header {
	+ padding: .3em 0;
	+ border-radius: 3px 3px 0 0;
	+ border: 0;
	+ background: #3a3a3a;
	+ filter: none;
	+ color: #fff;
	+ text-shadow: 0px 1px 1px #000;
	+}
	+.ui-datepicker .ui-datepicker-prev,
	+.ui-datepicker .ui-datepicker-next {
	+ border: 0;
	+ background: none;
	+}
	+.ui-datepicker .ui-datepicker-header .ui-icon {
	+ background: url("images/ui-icons-datepicker.png") 0 0 no-repeat;
	+}
	+.ui-datepicker .ui-datepicker-header .ui-icon-circle-triangle-w {
	+ background-position: 0 2px;
	+}
	+.ui-datepicker .ui-datepicker-header .ui-icon-circle-triangle-e {
	+ background-position: -14px 2px;
	+}
	+.ui-datepicker .ui-datepicker-prev-hover,
	+.ui-datepicker .ui-datepicker-next-hover {
	+ top: 2px;
	+ border: 0;
	+ background: none;
	+}
	+.ui-datepicker .ui-datepicker-prev,
	+.ui-datepicker .ui-datepicker-prev-hover {
	+ left: 2px;
	+}
	+.ui-datepicker .ui-datepicker-next,
	+.ui-datepicker .ui-datepicker-next-hover {
	+ right: 2px;
	+}
	+.ui-datepicker select.ui-datepicker-month,
	+.ui-datepicker select.ui-datepicker-year {
	+ border: 0;
	+ background: #3a3a3a;
	+ outline: none;
	+ color: #fff;
	+ font-weight: bold;
	+ width: auto;
	+ margin-right: 4px;
	+ padding-right: 4px;
	+}
	+.ui-datepicker .ui-datepicker-title select::-ms-expand {
	+ display: none;
	+}
	+.ie10 .ui-datepicker .ui-datepicker-title select,
	+.webkit .ui-datepicker .ui-datepicker-title select,
	+.mozilla .ui-datepicker .ui-datepicker-title select {
	+ background-image: url("images/ui-icons-datepicker.png");
	+ background-position: right -18px;
	+ background-repeat: no-repeat;
	+ padding-right: 14px;
	+ -webkit-appearance: none;
	+ -moz-appearance: none;
	+ appearance: none;
	+}
	+.mozilla .ui-datepicker .ui-datepicker-title select {
	+ background-position: right -17px;
	+ text-indent: 0.01px;
	+ text-overflow: '';
	+ padding-right: 0;
	+}
	+.ui-datepicker .ui-datepicker-month:focus,
	+.ui-datepicker .ui-datepicker-year:focus {
	+ outline: 1px solid #4fadd5;
	+}
	+.ui-datepicker table {
	+ margin: 0;
	+ border-spacing: 0;
	+}
	+.ui-datepicker table:focus {
	+ outline: 2px solid #4fadd5;
	+ outline-offset: -2px;
	+}
	+.ui-datepicker td {
	+ border: 1px solid #bbb;
	+ padding: 0;
	+}
	+.ui-datepicker td span, .ui-datepicker td a {
	+ border: 0;
	+ padding: .3em;
	+ text-shadow: 0px 1px 1px #fff;
	+}
	+.ui-datepicker td a.ui-state-default {
	+ border: 0px solid #fff;
	+ border-top-width: 1px;
	+ border-left-width: 1px;
	+ background: #e6e6e6;
	+ background: -moz-linear-gradient(top, #e6e6e6 0%, #d6d6d6 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e6e6e6), color-stop(100%,#d6d6d6));
	+ background: -o-linear-gradient(top, #e6e6e6 0%, #d6d6d6 100%);
	+ background: -ms-linear-gradient(top, #e6e6e6 0%, #d6d6d6 100%);
	+ background: linear-gradient(top, #e6e6e6 0%, #d6d6d6 100%);
	+}
	+.ui-datepicker td a.ui-priority-secondary {
	+ background: #eee;
	+}
	+.ui-datepicker td a.ui-state-active {
	+ color: #fff;
	+ border-color: #0286ac !important;
	+ text-shadow: 0px 1px 1px #00516e !important;
	+ background: #00acd4 !important;
	+ background: -moz-linear-gradient(top, #00acd4 0%, #008fc7 100%);
	+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00acd4), color-stop(100%,#008fc7));
	+ background: -o-linear-gradient(top, #00acd4 0%, #008fc7 100%);
	+ background: -ms-linear-gradient(top, #00acd4 0%, #008fc7 100%);
	+ background: linear-gradient(top, #00acd4 0%, #008fc7 100%);
	+}
	+.ui-datepicker .ui-state-highlight {
	+ color: #0081c2;
	+}
	+.ui-datepicker td.ui-datepicker-days-cell-over a.ui-state-default {
	+ color: #fff;
	+ border-color: rgba(73,180,210,0.7);
	+ background: rgba(73,180,210,0.7);
	+ text-shadow: 0px 1px 1px #666;
	+}
	diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
	index 9a07711c2..79a8973db 100644
	--- a/program/lib/Roundcube/rcube_imap.php
	+++ b/program/lib/Roundcube/rcube_imap.php
	@@ -1,4515 +1,4515 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| Copyright (C) 2011-2012, Kolab Systems AG \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| IMAP Storage Engine \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

	/**
	* Interface class for accessing an IMAP server
	*
	* @package Framework
	* @subpackage Storage
	* @author Thomas Bruederli <roundcube@gmail.com>
	* @author Aleksander Machniak <alec@alec.pl>
	*/
	class rcube_imap extends rcube_storage
	{
	/**
	* Instance of rcube_imap_generic
	*
	* @var rcube_imap_generic
	*/
	public $conn;

	/**
	* Instance of rcube_imap_cache
	*
	* @var rcube_imap_cache
	*/
	protected $mcache;

	/**
	* Instance of rcube_cache
	*
	* @var rcube_cache
	*/
	protected $cache;

	/**
	* Internal (in-memory) cache
	*
	* @var array
	*/
	protected $icache = array();

	protected $list_page = 1;
	protected $delimiter;
	protected $namespace;
	protected $sort_field = '';
	protected $sort_order = 'DESC';
	protected $struct_charset;
	protected $uid_id_map = array();
	protected $msg_headers = array();
	protected $search_set;
	protected $search_string = '';
	protected $search_charset = '';
	protected $search_sort_field = '';
	protected $search_threads = false;
	protected $search_sorted = false;
	protected $options = array('auth_type' => 'check');
	protected $caching = false;
	protected $messages_caching = false;
	protected $threading = false;


	/**
	* Object constructor.
	*/
	public function __construct()
	{
	$this->conn = new rcube_imap_generic();

	// Set namespace and delimiter from session,
	// so some methods would work before connection
	if (isset($_SESSION['imap_namespace'])) {
	$this->namespace = $_SESSION['imap_namespace'];
	}
	if (isset($_SESSION['imap_delimiter'])) {
	$this->delimiter = $_SESSION['imap_delimiter'];
	}
	}


	/**
	* Magic getter for backward compat.
	*
	* @deprecated.
	*/
	public function __get($name)
	{
	if (isset($this->{$name})) {
	return $this->{$name};
	}
	}


	/**
	* Connect to an IMAP server
	*
	* @param string $host Host to connect
	* @param string $user Username for IMAP account
	* @param string $pass Password for IMAP account
	* @param integer $port Port to connect to
	* @param string $use_ssl SSL schema (either ssl or tls) or null if plain connection
	*
	* @return boolean True on success, False on failure
	*/
	public function connect($host, $user, $pass, $port=143, $use_ssl=null)
	{
	// check for OpenSSL support in PHP build
	if ($use_ssl && extension_loaded('openssl')) {
	$this->options['ssl_mode'] = $use_ssl == 'imaps' ? 'ssl' : $use_ssl;
	}
	else if ($use_ssl) {
	rcube::raise_error(array('code' => 403, 'type' => 'imap',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "OpenSSL not available"), true, false);
	$port = 143;
	}

	$this->options['port'] = $port;

	if ($this->options['debug']) {
	$this->set_debug(true);

	$this->options['ident'] = array(
	'name' => 'Roundcube',
	'version' => RCUBE_VERSION,
	'php' => PHP_VERSION,
	'os' => PHP_OS,
	'command' => $_SERVER['REQUEST_URI'],
	);
	}

	$attempt = 0;
	do {
	$data = rcube::get_instance()->plugins->exec_hook('storage_connect',
	array_merge($this->options, array('host' => $host, 'user' => $user,
	'attempt' => ++$attempt)));

	if (!empty($data['pass'])) {
	$pass = $data['pass'];
	}

	$this->conn->connect($data['host'], $data['user'], $pass, $data);
	} while(!$this->conn->connected() && $data['retry']);

	$config = array(
	'host' => $data['host'],
	'user' => $data['user'],
	'password' => $pass,
	'port' => $port,
	'ssl' => $use_ssl,
	);

	$this->options = array_merge($this->options, $config);
	$this->connect_done = true;

	if ($this->conn->connected()) {
	// get namespace and delimiter
	$this->set_env();
	return true;
	}
	// write error log
	else if ($this->conn->error) {
	if ($pass && $user) {
	$message = sprintf("Login failed for %s from %s. %s",
	$user, rcube_utils::remote_ip(), $this->conn->error);

	rcube::raise_error(array('code' => 403, 'type' => 'imap',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => $message), true, false);
	}
	}

	return false;
	}


	/**
	* Close IMAP connection.
	* Usually done on script shutdown
	*/
	public function close()
	{
	$this->conn->closeConnection();
	if ($this->mcache) {
	$this->mcache->close();
	}
	}


	/**
	* Check connection state, connect if not connected.
	*
	* @return bool Connection state.
	*/
	public function check_connection()
	{
	// Establish connection if it wasn't done yet
	if (!$this->connect_done && !empty($this->options['user'])) {
	return $this->connect(
	$this->options['host'],
	$this->options['user'],
	$this->options['password'],
	$this->options['port'],
	$this->options['ssl']
	);
	}

	return $this->is_connected();
	}


	/**
	* Checks IMAP connection.
	*
	* @return boolean TRUE on success, FALSE on failure
	*/
	public function is_connected()
	{
	return $this->conn->connected();
	}


	/**
	* Returns code of last error
	*
	* @return int Error code
	*/
	public function get_error_code()
	{
	return $this->conn->errornum;
	}


	/**
	* Returns text of last error
	*
	* @return string Error string
	*/
	public function get_error_str()
	{
	return $this->conn->error;
	}


	/**
	* Returns code of last command response
	*
	* @return int Response code
	*/
	public function get_response_code()
	{
	switch ($this->conn->resultcode) {
	case 'NOPERM':
	return self::NOPERM;
	case 'READ-ONLY':
	return self::READONLY;
	case 'TRYCREATE':
	return self::TRYCREATE;
	case 'INUSE':
	return self::INUSE;
	case 'OVERQUOTA':
	return self::OVERQUOTA;
	case 'ALREADYEXISTS':
	return self::ALREADYEXISTS;
	case 'NONEXISTENT':
	return self::NONEXISTENT;
	case 'CONTACTADMIN':
	return self::CONTACTADMIN;
	default:
	return self::UNKNOWN;
	}
	}


	/**
	* Activate/deactivate debug mode
	*
	* @param boolean $dbg True if IMAP conversation should be logged
	*/
	public function set_debug($dbg = true)
	{
	$this->options['debug'] = $dbg;
	$this->conn->setDebug($dbg, array($this, 'debug_handler'));
	}


	/**
	* Set internal folder reference.
	* All operations will be perfomed on this folder.
	*
	* @param string $folder Folder name
	*/
	public function set_folder($folder)
	{
	$this->folder = $folder;
	}


	/**
	* Save a search result for future message listing methods
	*
	* @param array $set Search set, result from rcube_imap::get_search_set():
	* 0 - searching criteria, string
	* 1 - search result, rcube_result_index\|rcube_result_thread
	* 2 - searching character set, string
	* 3 - sorting field, string
	* 4 - true if sorted, bool
	*/
	public function set_search_set($set)
	{
	$set = (array)$set;

	$this->search_string = $set[0];
	$this->search_set = $set[1];
	$this->search_charset = $set[2];
	$this->search_sort_field = $set[3];
	$this->search_sorted = $set[4];
	$this->search_threads = is_a($this->search_set, 'rcube_result_thread');

	if (is_a($this->search_set, 'rcube_result_multifolder')) {
	$this->set_threading(false);
	}
	}


	/**
	* Return the saved search set as hash array
	*
	* @return array Search set
	*/
	public function get_search_set()
	{
	if (empty($this->search_set)) {
	return null;
	}

	return array(
	$this->search_string,
	$this->search_set,
	$this->search_charset,
	$this->search_sort_field,
	$this->search_sorted,
	);
	}


	/**
	* Returns the IMAP server's capability.
	*
	* @param string $cap Capability name
	*
	* @return mixed Capability value or TRUE if supported, FALSE if not
	*/
	public function get_capability($cap)
	{
	$cap = strtoupper($cap);
	$sess_key = "STORAGE_$cap";

	if (!isset($_SESSION[$sess_key])) {
	if (!$this->check_connection()) {
	return false;
	}

	$_SESSION[$sess_key] = $this->conn->getCapability($cap);
	}

	return $_SESSION[$sess_key];
	}


	/**
	* Checks the PERMANENTFLAGS capability of the current folder
	* and returns true if the given flag is supported by the IMAP server
	*
	* @param string $flag Permanentflag name
	*
	* @return boolean True if this flag is supported
	*/
	public function check_permflag($flag)
	{
	$flag = strtoupper($flag);
	$perm_flags = $this->get_permflags($this->folder);
	$imap_flag = $this->conn->flags[$flag];

	return $imap_flag && !empty($perm_flags) && in_array_nocase($imap_flag, $perm_flags);
	}


	/**
	* Returns PERMANENTFLAGS of the specified folder
	*
	* @param string $folder Folder name
	*
	* @return array Flags
	*/
	public function get_permflags($folder)
	{
	if (!strlen($folder)) {
	return array();
	}

	if (!$this->check_connection()) {
	return array();
	}

	if ($this->conn->select($folder)) {
	$permflags = $this->conn->data['PERMANENTFLAGS'];
	}
	else {
	return array();
	}

	if (!is_array($permflags)) {
	$permflags = array();
	}

	return $permflags;
	}


	/**
	* Returns the delimiter that is used by the IMAP server for folder separation
	*
	* @return string Delimiter string
	* @access public
	*/
	public function get_hierarchy_delimiter()
	{
	return $this->delimiter;
	}


	/**
	* Get namespace
	*
	* @param string $name Namespace array index: personal, other, shared, prefix
	*
	* @return array Namespace data
	*/
	public function get_namespace($name = null)
	{
	$ns = $this->namespace;

	if ($name) {
	return isset($ns[$name]) ? $ns[$name] : null;
	}

	unset($ns['prefix']);
	return $ns;
	}


	/**
	* Sets delimiter and namespaces
	*/
	protected function set_env()
	{
	if ($this->delimiter !== null && $this->namespace !== null) {
	return;
	}

	$config = rcube::get_instance()->config;
	$imap_personal = $config->get('imap_ns_personal');
	$imap_other = $config->get('imap_ns_other');
	$imap_shared = $config->get('imap_ns_shared');
	$imap_delimiter = $config->get('imap_delimiter');

	if (!$this->check_connection()) {
	return;
	}

	$ns = $this->conn->getNamespace();

	// Set namespaces (NAMESPACE supported)
	if (is_array($ns)) {
	$this->namespace = $ns;
	}
	else {
	$this->namespace = array(
	'personal' => NULL,
	'other' => NULL,
	'shared' => NULL,
	);
	}

	if ($imap_delimiter) {
	$this->delimiter = $imap_delimiter;
	}
	if (empty($this->delimiter)) {
	$this->delimiter = $this->namespace['personal'][0][1];
	}
	if (empty($this->delimiter)) {
	$this->delimiter = $this->conn->getHierarchyDelimiter();
	}
	if (empty($this->delimiter)) {
	$this->delimiter = '/';
	}

	// Overwrite namespaces
	if ($imap_personal !== null) {
	$this->namespace['personal'] = NULL;
	foreach ((array)$imap_personal as $dir) {
	$this->namespace['personal'][] = array($dir, $this->delimiter);
	}
	}
	if ($imap_other !== null) {
	$this->namespace['other'] = NULL;
	foreach ((array)$imap_other as $dir) {
	if ($dir) {
	$this->namespace['other'][] = array($dir, $this->delimiter);
	}
	}
	}
	if ($imap_shared !== null) {
	$this->namespace['shared'] = NULL;
	foreach ((array)$imap_shared as $dir) {
	if ($dir) {
	$this->namespace['shared'][] = array($dir, $this->delimiter);
	}
	}
	}

	// Find personal namespace prefix for mod_folder()
	// Prefix can be removed when there is only one personal namespace
	if (is_array($this->namespace['personal']) && count($this->namespace['personal']) == 1) {
	$this->namespace['prefix'] = $this->namespace['personal'][0][0];
	}

	$_SESSION['imap_namespace'] = $this->namespace;
	$_SESSION['imap_delimiter'] = $this->delimiter;
	}


	/**
	* Get message count for a specific folder
	*
	* @param string $folder Folder name
	* @param string $mode Mode for count [ALL\|THREADS\|UNSEEN\|RECENT\|EXISTS]
	* @param boolean $force Force reading from server and update cache
	* @param boolean $status Enables storing folder status info (max UID/count),
	* required for folder_status()
	*
	* @return int Number of messages
	*/
	public function count($folder='', $mode='ALL', $force=false, $status=true)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	return $this->countmessages($folder, $mode, $force, $status);
	}


	/**
	* protected method for getting nr of messages
	*
	* @param string $folder Folder name
	* @param string $mode Mode for count [ALL\|THREADS\|UNSEEN\|RECENT\|EXISTS]
	* @param boolean $force Force reading from server and update cache
	* @param boolean $status Enables storing folder status info (max UID/count),
	* required for folder_status()
	*
	* @return int Number of messages
	* @see rcube_imap::count()
	*/
	protected function countmessages($folder, $mode='ALL', $force=false, $status=true)
	{
	$mode = strtoupper($mode);

	// count search set, assume search set is always up-to-date (don't check $force flag)
	if ($this->search_string && $folder == $this->folder && ($mode == 'ALL' \|\| $mode == 'THREADS')) {
	if ($mode == 'ALL') {
	return $this->search_set->count_messages();
	}
	else {
	return $this->search_set->count();
	}
	}

	// EXISTS is a special alias for ALL, it allows to get the number
	// of all messages in a folder also when search is active and with
	// any skip_deleted setting

	$a_folder_cache = $this->get_cache('messagecount');

	// return cached value
	if (!$force && is_array($a_folder_cache[$folder]) && isset($a_folder_cache[$folder][$mode])) {
	return $a_folder_cache[$folder][$mode];
	}

	if (!is_array($a_folder_cache[$folder])) {
	$a_folder_cache[$folder] = array();
	}

	if ($mode == 'THREADS') {
	$res = $this->threads($folder);
	$count = $res->count();

	if ($status) {
	$msg_count = $res->count_messages();
	$this->set_folder_stats($folder, 'cnt', $msg_count);
	$this->set_folder_stats($folder, 'maxuid', $msg_count ? $this->id2uid($msg_count, $folder) : 0);
	}
	}
	// Need connection here
	else if (!$this->check_connection()) {
	return 0;
	}
	// RECENT count is fetched a bit different
	else if ($mode == 'RECENT') {
	$count = $this->conn->countRecent($folder);
	}
	// use SEARCH for message counting
	else if ($mode != 'EXISTS' && !empty($this->options['skip_deleted'])) {
	$search_str = "ALL UNDELETED";
	$keys = array('COUNT');

	if ($mode == 'UNSEEN') {
	$search_str .= " UNSEEN";
	}
	else {
	if ($this->messages_caching) {
	$keys[] = 'ALL';
	}
	if ($status) {
	$keys[] = 'MAX';
	}
	}

	// @TODO: if $mode == 'ALL' we could try to use cache index here

	// get message count using (E)SEARCH
	// not very performant but more precise (using UNDELETED)
	$index = $this->conn->search($folder, $search_str, true, $keys);
	$count = $index->count();

	if ($mode == 'ALL') {
	// Cache index data, will be used in index_direct()
	$this->icache['undeleted_idx'] = $index;

	if ($status) {
	$this->set_folder_stats($folder, 'cnt', $count);
	$this->set_folder_stats($folder, 'maxuid', $index->max());
	}
	}
	}
	else {
	if ($mode == 'UNSEEN') {
	$count = $this->conn->countUnseen($folder);
	}
	else {
	$count = $this->conn->countMessages($folder);
	if ($status && $mode == 'ALL') {
	$this->set_folder_stats($folder, 'cnt', $count);
	$this->set_folder_stats($folder, 'maxuid', $count ? $this->id2uid($count, $folder) : 0);
	}
	}
	}

	$a_folder_cache[$folder][$mode] = (int)$count;

	// write back to cache
	$this->update_cache('messagecount', $a_folder_cache);

	return (int)$count;
	}


	/**
	* Public method for listing message flags
	*
	* @param string $folder Folder name
	* @param array $uids Message UIDs
	* @param int $mod_seq Optional MODSEQ value (of last flag update)
	*
	* @return array Indexed array with message flags
	*/
	public function list_flags($folder, $uids, $mod_seq = null)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	if (!$this->check_connection()) {
	return array();
	}

	// @TODO: when cache was synchronized in this request
	// we might already have asked for flag updates, use it.

	$flags = $this->conn->fetch($folder, $uids, true, array('FLAGS'), $mod_seq);
	$result = array();

	if (!empty($flags)) {
	foreach ($flags as $message) {
	$result[$message->uid] = $message->flags;
	}
	}

	return $result;
	}


	/**
	* Public method for listing headers
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param string $sort_field Header field to sort by
	* @param string $sort_order Sort order [ASC\|DESC]
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	*/
	public function list_messages($folder='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	return $this->_list_messages($folder, $page, $sort_field, $sort_order, $slice);
	}


	/**
	* protected method for listing message headers
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param string $sort_field Header field to sort by
	* @param string $sort_order Sort order [ASC\|DESC]
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	* @see rcube_imap::list_messages
	*/
	protected function _list_messages($folder='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
	{
	if (!strlen($folder)) {
	return array();
	}

	$this->set_sort_order($sort_field, $sort_order);
	$page = $page ? $page : $this->list_page;

	// use saved message set
	- if ($this->search_string && $folder == $this->folder) {
	+ if ($this->search_string) {
	return $this->list_search_messages($folder, $page, $slice);
	}

	if ($this->threading) {
	return $this->list_thread_messages($folder, $page, $slice);
	}

	// get UIDs of all messages in the folder, sorted
	$index = $this->index($folder, $this->sort_field, $this->sort_order);

	if ($index->is_empty()) {
	return array();
	}

	$from = ($page-1) * $this->page_size;
	$to = $from + $this->page_size;

	$index->slice($from, $to - $from);

	if ($slice) {
	$index->slice(-$slice, $slice);
	}

	// fetch reqested messages headers
	$a_index = $index->get();
	$a_msg_headers = $this->fetch_headers($folder, $a_index);

	return array_values($a_msg_headers);
	}


	/**
	* protected method for listing message headers using threads
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	* @see rcube_imap::list_messages
	*/
	protected function list_thread_messages($folder, $page, $slice=0)
	{
	// get all threads (not sorted)
	if ($mcache = $this->get_mcache_engine()) {
	$threads = $mcache->get_thread($folder);
	}
	else {
	$threads = $this->threads($folder);
	}

	return $this->fetch_thread_headers($folder, $threads, $page, $slice);
	}

	/**
	* Method for fetching threads data
	*
	* @param string $folder Folder name
	*
	* @return rcube_imap_thread Thread data object
	*/
	function threads($folder)
	{
	if ($mcache = $this->get_mcache_engine()) {
	// don't store in self's internal cache, cache has it's own internal cache
	return $mcache->get_thread($folder);
	}

	if (!empty($this->icache['threads'])) {
	if ($this->icache['threads']->get_parameters('MAILBOX') == $folder) {
	return $this->icache['threads'];
	}
	}

	// get all threads
	$result = $this->threads_direct($folder);

	// add to internal (fast) cache
	return $this->icache['threads'] = $result;
	}


	/**
	* Method for direct fetching of threads data
	*
	* @param string $folder Folder name
	*
	* @return rcube_imap_thread Thread data object
	*/
	function threads_direct($folder)
	{
	if (!$this->check_connection()) {
	return new rcube_result_thread();
	}

	// get all threads
	return $this->conn->thread($folder, $this->threading,
	$this->options['skip_deleted'] ? 'UNDELETED' : '', true);
	}


	/**
	* protected method for fetching threaded messages headers
	*
	* @param string $folder Folder name
	* @param rcube_result_thread $threads Threads data object
	* @param int $page List page number
	* @param int $slice Number of threads to slice
	*
	* @return array Messages headers
	*/
	protected function fetch_thread_headers($folder, $threads, $page, $slice=0)
	{
	// Sort thread structure
	$this->sort_threads($threads);

	$from = ($page-1) * $this->page_size;
	$to = $from + $this->page_size;

	$threads->slice($from, $to - $from);

	if ($slice) {
	$threads->slice(-$slice, $slice);
	}

	// Get UIDs of all messages in all threads
	$a_index = $threads->get();

	// fetch reqested headers from server
	$a_msg_headers = $this->fetch_headers($folder, $a_index);

	unset($a_index);

	// Set depth, has_children and unread_children fields in headers
	$this->set_thread_flags($a_msg_headers, $threads);

	return array_values($a_msg_headers);
	}


	/**
	* protected method for setting threaded messages flags:
	* depth, has_children and unread_children
	*
	* @param array $headers Reference to headers array indexed by message UID
	* @param rcube_result_thread $threads Threads data object
	*
	* @return array Message headers array indexed by message UID
	*/
	protected function set_thread_flags(&$headers, $threads)
	{
	$parents = array();

	list ($msg_depth, $msg_children) = $threads->get_thread_data();

	foreach ($headers as $uid => $header) {
	$depth = $msg_depth[$uid];
	$parents = array_slice($parents, 0, $depth);

	if (!empty($parents)) {
	$headers[$uid]->parent_uid = end($parents);
	if (empty($header->flags['SEEN']))
	$headers[$parents[0]]->unread_children++;
	}
	array_push($parents, $uid);

	$headers[$uid]->depth = $depth;
	$headers[$uid]->has_children = $msg_children[$uid];
	}
	}


	/**
	* protected method for listing a set of message headers (search results)
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	*/
	protected function list_search_messages($folder, $page, $slice=0)
	{
	if (!strlen($folder) \|\| empty($this->search_set) \|\| $this->search_set->is_empty()) {
	return array();
	}

	// gather messages from a multi-folder search
	if ($this->search_set->multi) {
	$page_size = $this->page_size;
	$sort_field = $this->sort_field;
	$search_set = $this->search_set;

	// prepare paging
	$cnt = $search_set->count();
	$from = ($page-1) * $page_size;
	$to = $from + $page_size;
	$slice_length = min($page_size, $cnt - $from);

	// fetch resultset headers, sort and slice them
	if (!empty($sort_field)) {
	$this->sort_field = null;
	$this->page_size = 1000; // fetch up to 1000 matching messages per folder
	$this->threading = false;

	$a_msg_headers = array();
	foreach ($search_set->sets as $resultset) {
	if (!$resultset->is_empty()) {
	$this->search_set = $resultset;
	$this->search_threads = $resultset instanceof rcube_result_thread;
	$a_msg_headers = array_merge($a_msg_headers, $this->list_search_messages($resultset->get_parameters('MAILBOX'), 1));
	}
	}

	// sort headers
	if (!empty($a_msg_headers)) {
	$a_msg_headers = $this->conn->sortHeaders($a_msg_headers, $sort_field, $this->sort_order);
	}

	// store (sorted) message index
	$search_set->set_message_index($a_msg_headers, $sort_field, $this->sort_order);

	// only return the requested part of the set
	$a_msg_headers = array_slice(array_values($a_msg_headers), $from, $slice_length);
	}
	else {
	if ($this->sort_order != $search_set->get_parameters('ORDER')) {
	$search_set->revert();
	}

	// slice resultset first...
	$fetch = array();
	foreach (array_slice($search_set->get(), $from, $slice_length) as $msg_id) {
	list($uid, $folder) = explode('-', $msg_id, 2);
	$fetch[$folder][] = $uid;
	}

	// ... and fetch the requested set of headers
	$a_msg_headers = array();
	foreach ($fetch as $folder => $a_index) {
	$a_msg_headers = array_merge($a_msg_headers, array_values($this->fetch_headers($folder, $a_index)));
	}
	}

	if ($slice) {
	$a_msg_headers = array_slice($a_msg_headers, -$slice, $slice);
	}

	// restore members
	$this->sort_field = $sort_field;
	$this->page_size = $page_size;
	$this->search_set = $search_set;

	return $a_msg_headers;
	}

	// use saved messages from searching
	if ($this->threading) {
	return $this->list_search_thread_messages($folder, $page, $slice);
	}

	// search set is threaded, we need a new one
	if ($this->search_threads) {
	$this->search('', $this->search_string, $this->search_charset, $this->sort_field);
	}

	$index = clone $this->search_set;
	$from = ($page-1) * $this->page_size;
	$to = $from + $this->page_size;

	// return empty array if no messages found
	if ($index->is_empty()) {
	return array();
	}

	// quickest method (default sorting)
	if (!$this->search_sort_field && !$this->sort_field) {
	$got_index = true;
	}
	// sorted messages, so we can first slice array and then fetch only wanted headers
	else if ($this->search_sorted) { // SORT searching result
	$got_index = true;
	// reset search set if sorting field has been changed
	if ($this->sort_field && $this->search_sort_field != $this->sort_field) {
	$this->search('', $this->search_string, $this->search_charset, $this->sort_field);

	$index = clone $this->search_set;

	// return empty array if no messages found
	if ($index->is_empty()) {
	return array();
	}
	}
	}

	if ($got_index) {
	if ($this->sort_order != $index->get_parameters('ORDER')) {
	$index->revert();
	}

	// get messages uids for one page
	$index->slice($from, $to-$from);

	if ($slice) {
	$index->slice(-$slice, $slice);
	}

	// fetch headers
	$a_index = $index->get();
	$a_msg_headers = $this->fetch_headers($folder, $a_index);

	return array_values($a_msg_headers);
	}

	// SEARCH result, need sorting
	$cnt = $index->count();

	// 300: experimantal value for best result
	if (($cnt > 300 && $cnt > $this->page_size) \|\| !$this->sort_field) {
	// use memory less expensive (and quick) method for big result set
	$index = clone $this->index('', $this->sort_field, $this->sort_order);
	// get messages uids for one page...
	$index->slice($from, min($cnt-$from, $this->page_size));

	if ($slice) {
	$index->slice(-$slice, $slice);
	}

	// ...and fetch headers
	$a_index = $index->get();
	$a_msg_headers = $this->fetch_headers($folder, $a_index);

	return array_values($a_msg_headers);
	}
	else {
	// for small result set we can fetch all messages headers
	$a_index = $index->get();
	$a_msg_headers = $this->fetch_headers($folder, $a_index, false);

	// return empty array if no messages found
	if (!is_array($a_msg_headers) \|\| empty($a_msg_headers)) {
	return array();
	}

	if (!$this->check_connection()) {
	return array();
	}

	// if not already sorted
	$a_msg_headers = $this->conn->sortHeaders(
	$a_msg_headers, $this->sort_field, $this->sort_order);

	// only return the requested part of the set
	$slice_length = min($this->page_size, $cnt - ($to > $cnt ? $from : $to));
	$a_msg_headers = array_slice(array_values($a_msg_headers), $from, $slice_length);

	if ($slice) {
	$a_msg_headers = array_slice($a_msg_headers, -$slice, $slice);
	}

	return $a_msg_headers;
	}
	}


	/**
	* protected method for listing a set of threaded message headers (search results)
	*
	* @param string $folder Folder name
	* @param int $page Current page to list
	* @param int $slice Number of slice items to extract from result array
	*
	* @return array Indexed array with message header objects
	* @see rcube_imap::list_search_messages()
	*/
	protected function list_search_thread_messages($folder, $page, $slice=0)
	{
	// update search_set if previous data was fetched with disabled threading
	if (!$this->search_threads) {
	if ($this->search_set->is_empty()) {
	return array();
	}
	$this->search('', $this->search_string, $this->search_charset, $this->sort_field);
	}

	return $this->fetch_thread_headers($folder, clone $this->search_set, $page, $slice);
	}


	/**
	* Fetches messages headers (by UID)
	*
	* @param string $folder Folder name
	* @param array $msgs Message UIDs
	* @param bool $sort Enables result sorting by $msgs
	* @param bool $force Disables cache use
	*
	* @return array Messages headers indexed by UID
	*/
	function fetch_headers($folder, $msgs, $sort = true, $force = false)
	{
	if (empty($msgs)) {
	return array();
	}

	if (!$force && ($mcache = $this->get_mcache_engine())) {
	$headers = $mcache->get_messages($folder, $msgs);
	}
	else if (!$this->check_connection()) {
	return array();
	}
	else {
	// fetch reqested headers from server
	$headers = $this->conn->fetchHeaders(
	$folder, $msgs, true, false, $this->get_fetch_headers());
	}

	if (empty($headers)) {
	return array();
	}

	foreach ($headers as $h) {
	$h->folder = $folder;
	$a_msg_headers[$h->uid] = $h;
	}

	if ($sort) {
	// use this class for message sorting
	$sorter = new rcube_message_header_sorter();
	$sorter->set_index($msgs);
	$sorter->sort_headers($a_msg_headers);
	}

	return $a_msg_headers;
	}


	/**
	* Returns current status of a folder (compared to the last time use)
	*
	* We compare the maximum UID to determine the number of
	* new messages because the RECENT flag is not reliable.
	*
	* @param string $folder Folder name
	* @param array $diff Difference data
	*
	* @return int Folder status
	*/
	public function folder_status($folder = null, &$diff = array())
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}
	$old = $this->get_folder_stats($folder);

	// refresh message count -> will update
	$this->countmessages($folder, 'ALL', true);

	$result = 0;

	if (empty($old)) {
	return $result;
	}

	$new = $this->get_folder_stats($folder);

	// got new messages
	if ($new['maxuid'] > $old['maxuid']) {
	$result += 1;
	// get new message UIDs range, that can be used for example
	// to get the data of these messages
	$diff['new'] = ($old['maxuid'] + 1 < $new['maxuid'] ? ($old['maxuid']+1).':' : '') . $new['maxuid'];
	}
	// some messages has been deleted
	if ($new['cnt'] < $old['cnt']) {
	$result += 2;
	}

	// @TODO: optional checking for messages flags changes (?)
	// @TODO: UIDVALIDITY checking

	return $result;
	}


	/**
	* Stores folder statistic data in session
	* @TODO: move to separate DB table (cache?)
	*
	* @param string $folder Folder name
	* @param string $name Data name
	* @param mixed $data Data value
	*/
	protected function set_folder_stats($folder, $name, $data)
	{
	$_SESSION['folders'][$folder][$name] = $data;
	}


	/**
	* Gets folder statistic data
	*
	* @param string $folder Folder name
	*
	* @return array Stats data
	*/
	protected function get_folder_stats($folder)
	{
	if ($_SESSION['folders'][$folder]) {
	return (array) $_SESSION['folders'][$folder];
	}

	return array();
	}


	/**
	* Return sorted list of message UIDs
	*
	* @param string $folder Folder to get index from
	* @param string $sort_field Sort column
	* @param string $sort_order Sort order [ASC, DESC]
	* @param bool $no_threads Get not threaded index
	* @param bool $no_search Get index not limited to search result (optionally)
	*
	* @return rcube_result_index\|rcube_result_thread List of messages (UIDs)
	*/
	public function index($folder = '', $sort_field = NULL, $sort_order = NULL,
	$no_threads = false, $no_search = false
	) {
	if (!$no_threads && $this->threading) {
	return $this->thread_index($folder, $sort_field, $sort_order);
	}

	$this->set_sort_order($sort_field, $sort_order);

	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	// we have a saved search result, get index from there
	if ($this->search_string) {
	if ($this->search_set->is_empty()) {
	return new rcube_result_index($folder, '* SORT');
	}

	if ($this->search_set instanceof rcube_result_multifolder) {
	$index = $this->search_set;
	$index->folder = $folder;
	// TODO: handle changed sorting
	}
	// search result is an index with the same sorting?
	else if (($this->search_set instanceof rcube_result_index)
	&& ((!$this->sort_field && !$this->search_sorted) \|\|
	($this->search_sorted && $this->search_sort_field == $this->sort_field))
	) {
	$index = $this->search_set;
	}
	// $no_search is enabled when we are not interested in
	// fetching index for search result, e.g. to sort
	// threaded search result we can use full mailbox index.
	// This makes possible to use index from cache
	else if (!$no_search) {
	if (!$this->sort_field) {
	// No sorting needed, just build index from the search result
	// @TODO: do we need to sort by UID here?
	$search = $this->search_set->get_compressed();
	$index = new rcube_result_index($folder, '* ESEARCH ALL ' . $search);
	}
	else {
	$index = $this->index_direct($folder, $this->search_charset,
	$this->sort_field, $this->search_set);
	}
	}

	if (isset($index)) {
	if ($this->sort_order != $index->get_parameters('ORDER')) {
	$index->revert();
	}

	return $index;
	}
	}

	// check local cache
	if ($mcache = $this->get_mcache_engine()) {
	return $mcache->get_index($folder, $this->sort_field, $this->sort_order);
	}

	// fetch from IMAP server
	return $this->index_direct($folder, $this->sort_field, $this->sort_order);
	}


	/**
	* Return sorted list of message UIDs ignoring current search settings.
	* Doesn't uses cache by default.
	*
	* @param string $folder Folder to get index from
	* @param string $sort_field Sort column
	* @param string $sort_order Sort order [ASC, DESC]
	* @param rcube_result_* $search Optional messages set to limit the result
	*
	* @return rcube_result_index Sorted list of message UIDs
	*/
	public function index_direct($folder, $sort_field = null, $sort_order = null, $search = null)
	{
	if (!empty($search)) {
	$search = $this->search_set->get_compressed();
	}

	// use message index sort as default sorting
	if (!$sort_field) {
	// use search result from count() if possible
	if (empty($search) && $this->options['skip_deleted']
	&& !empty($this->icache['undeleted_idx'])
	&& $this->icache['undeleted_idx']->get_parameters('ALL') !== null
	&& $this->icache['undeleted_idx']->get_parameters('MAILBOX') == $folder
	) {
	$index = $this->icache['undeleted_idx'];
	}
	else if (!$this->check_connection()) {
	return new rcube_result_index();
	}
	else {
	$query = $this->options['skip_deleted'] ? 'UNDELETED' : '';
	if ($search) {
	$query = trim($query . ' UID ' . $search);
	}

	$index = $this->conn->search($folder, $query, true);
	}
	}
	else if (!$this->check_connection()) {
	return new rcube_result_index();
	}
	// fetch complete message index
	else {
	if ($this->get_capability('SORT')) {
	$query = $this->options['skip_deleted'] ? 'UNDELETED' : '';
	if ($search) {
	$query = trim($query . ' UID ' . $search);
	}

	$index = $this->conn->sort($folder, $sort_field, $query, true);
	}

	if (empty($index) \|\| $index->is_error()) {
	$index = $this->conn->index($folder, $search ? $search : "1:*",
	$sort_field, $this->options['skip_deleted'],
	$search ? true : false, true);
	}
	}

	if ($sort_order != $index->get_parameters('ORDER')) {
	$index->revert();
	}

	return $index;
	}


	/**
	* Return index of threaded message UIDs
	*
	* @param string $folder Folder to get index from
	* @param string $sort_field Sort column
	* @param string $sort_order Sort order [ASC, DESC]
	*
	* @return rcube_result_thread Message UIDs
	*/
	public function thread_index($folder='', $sort_field=NULL, $sort_order=NULL)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	// we have a saved search result, get index from there
	if ($this->search_string && $this->search_threads && $folder == $this->folder) {
	$threads = $this->search_set;
	}
	else {
	// get all threads (default sort order)
	$threads = $this->threads($folder);
	}

	$this->set_sort_order($sort_field, $sort_order);
	$this->sort_threads($threads);

	return $threads;
	}


	/**
	* Sort threaded result, using THREAD=REFS method if available.
	* If not, use any method and re-sort the result in THREAD=REFS way.
	*
	* @param rcube_result_thread $threads Threads result set
	*/
	protected function sort_threads($threads)
	{
	if ($threads->is_empty()) {
	return;
	}

	// THREAD=ORDEREDSUBJECT: sorting by sent date of root message
	// THREAD=REFERENCES: sorting by sent date of root message
	// THREAD=REFS: sorting by the most recent date in each thread

	if ($this->threading != 'REFS' \|\| ($this->sort_field && $this->sort_field != 'date')) {
	$sortby = $this->sort_field ? $this->sort_field : 'date';
	$index = $this->index($this->folder, $sortby, $this->sort_order, true, true);

	if (!$index->is_empty()) {
	$threads->sort($index);
	}
	}
	else if ($this->sort_order != $threads->get_parameters('ORDER')) {
	$threads->revert();
	}
	}


	/**
	* Invoke search request to IMAP server
	*
	* @param string $folder Folder name to search in
	* @param string $search Search criteria
	* @param string $charset Search charset
	* @param string $sort_field Header field to sort by
	*
	* @return rcube_result_index Search result object
	* @todo: Search criteria should be provided in non-IMAP format, eg. array
	*/
	public function search($folder = '', $search = 'ALL', $charset = null, $sort_field = null)
	{
	if (!$search) {
	$search = 'ALL';
	}

	if ((is_array($folder) && empty($folder)) \|\| (!is_array($folder) && !strlen($folder))) {
	$folder = $this->folder;
	}

	$plugin = rcube::get_instance()->plugins->exec_hook('imap_search_before', array(
	'folder' => $folder,
	'search' => $search,
	'charset' => $charset,
	'sort_field' => $sort_field,
	'threading' => $this->threading,
	));

	$folder = $plugin['folder'];
	$search = $plugin['search'];
	$charset = $plugin['charset'];
	$sort_field = $plugin['sort_field'];
	$results = $plugin['result'];

	// multi-folder search
	if (!$results && is_array($folder) && count($folder) > 1 && $search != 'ALL') {
	// connect IMAP to have all the required classes and settings loaded
	$this->check_connection();

	// disable threading
	$this->threading = false;

	$searcher = new rcube_imap_search($this->options, $this->conn);

	// set limit to not exceed the client's request timeout
	$searcher->set_timelimit(60);

	// continue existing incomplete search
	if (!empty($this->search_set) && $this->search_set->incomplete && $search == $this->search_string) {
	$searcher->set_results($this->search_set);
	}

	// execute the search
	$results = $searcher->exec(
	$folder,
	$search,
	$charset ? $charset : $this->default_charset,
	$sort_field && $this->get_capability('SORT') ? $sort_field : null,
	$this->threading
	);
	}
	else if (!$results) {
	$folder = is_array($folder) ? $folder[0] : $folder;
	$search = is_array($search) ? $search[$folder] : $search;
	$results = $this->search_index($folder, $search, $charset, $sort_field);
	}

	$sorted = $this->threading \|\| $this->search_sorted \|\| $plugin['search_sorted'] ? true : false;

	$this->set_search_set(array($search, $results, $charset, $sort_field, $sorted));

	return $results;
	}


	/**
	* Direct (real and simple) SEARCH request (without result sorting and caching).
	*
	* @param string $mailbox Mailbox name to search in
	* @param string $str Search string
	*
	* @return rcube_result_index Search result (UIDs)
	*/
	public function search_once($folder = null, $str = 'ALL')
	{
	if (!$this->check_connection()) {
	return new rcube_result_index();
	}

	if (!$str) {
	$str = 'ALL';
	}

	// multi-folder search
	if (is_array($folder) && count($folder) > 1) {
	$searcher = new rcube_imap_search($this->options, $this->conn);
	$index = $searcher->exec($folder, $str, $this->default_charset);
	}
	else {
	$folder = is_array($folder) ? $folder[0] : $folder;
	if (!strlen($folder)) {
	$folder = $this->folder;
	}
	$index = $this->conn->search($folder, $str, true);
	}

	return $index;
	}


	/**
	* protected search method
	*
	* @param string $folder Folder name
	* @param string $criteria Search criteria
	* @param string $charset Charset
	* @param string $sort_field Sorting field
	*
	* @return rcube_result_index\|rcube_result_thread Search results (UIDs)
	* @see rcube_imap::search()
	*/
	protected function search_index($folder, $criteria='ALL', $charset=NULL, $sort_field=NULL)
	{
	if (!$this->check_connection()) {
	if ($this->threading) {
	return new rcube_result_thread();
	}
	else {
	return new rcube_result_index();
	}
	}

	if ($this->options['skip_deleted'] && !preg_match('/UNDELETED/', $criteria)) {
	$criteria = 'UNDELETED '.$criteria;
	}

	// unset CHARSET if criteria string is ASCII, this way
	// SEARCH won't be re-sent after "unsupported charset" response
	if ($charset && $charset != 'US-ASCII' && is_ascii($criteria)) {
	$charset = 'US-ASCII';
	}

	if ($this->threading) {
	$threads = $this->conn->thread($folder, $this->threading, $criteria, true, $charset);

	// Error, try with US-ASCII (RFC5256: SORT/THREAD must support US-ASCII and UTF-8,
	// but I've seen that Courier doesn't support UTF-8)
	if ($threads->is_error() && $charset && $charset != 'US-ASCII') {
	$threads = $this->conn->thread($folder, $this->threading,
	self::convert_criteria($criteria, $charset), true, 'US-ASCII');
	}

	return $threads;
	}

	if ($sort_field && $this->get_capability('SORT')) {
	$charset = $charset ? $charset : $this->default_charset;
	$messages = $this->conn->sort($folder, $sort_field, $criteria, true, $charset);

	// Error, try with US-ASCII (RFC5256: SORT/THREAD must support US-ASCII and UTF-8,
	// but I've seen Courier with disabled UTF-8 support)
	if ($messages->is_error() && $charset && $charset != 'US-ASCII') {
	$messages = $this->conn->sort($folder, $sort_field,
	self::convert_criteria($criteria, $charset), true, 'US-ASCII');
	}

	if (!$messages->is_error()) {
	$this->search_sorted = true;
	return $messages;
	}
	}

	$messages = $this->conn->search($folder,
	($charset && $charset != 'US-ASCII' ? "CHARSET $charset " : '') . $criteria, true);

	// Error, try with US-ASCII (some servers may support only US-ASCII)
	if ($messages->is_error() && $charset && $charset != 'US-ASCII') {
	$messages = $this->conn->search($folder,
	self::convert_criteria($criteria, $charset), true);
	}

	$this->search_sorted = false;

	return $messages;
	}


	/**
	* Converts charset of search criteria string
	*
	* @param string $str Search string
	* @param string $charset Original charset
	* @param string $dest_charset Destination charset (default US-ASCII)
	*
	* @return string Search string
	*/
	public static function convert_criteria($str, $charset, $dest_charset='US-ASCII')
	{
	// convert strings to US_ASCII
	if (preg_match_all('/\{([0-9]+)\}\r\n/', $str, $matches, PREG_OFFSET_CAPTURE)) {
	$last = 0; $res = '';
	foreach ($matches[1] as $m) {
	$string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n
	$string = substr($str, $string_offset - 1, $m[0]);
	$string = rcube_charset::convert($string, $charset, $dest_charset);

	if ($string === false \|\| !strlen($string)) {
	continue;
	}

	$res .= substr($str, $last, $m[1] - $last - 1) . rcube_imap_generic::escape($string);
	$last = $m[0] + $string_offset - 1;
	}

	if ($last < strlen($str)) {
	$res .= substr($str, $last, strlen($str)-$last);
	}
	}
	// strings for conversion not found
	else {
	$res = $str;
	}

	return $res;
	}


	/**
	* Refresh saved search set
	*
	* @return array Current search set
	*/
	public function refresh_search()
	{
	if (!empty($this->search_string)) {
	$this->search(
	is_object($this->search_set) ? $this->search_set->get_parameters('MAILBOX') : '',
	$this->search_string,
	$this->search_charset,
	$this->search_sort_field
	);
	}

	return $this->get_search_set();
	}

	/**
	* Flag certain result subsets as 'incomplete'.
	* For subsequent refresh_search() calls to only refresh the updated parts.
	*/
	protected function set_search_dirty($folder)
	{
	if ($this->search_set && is_a($this->search_set, 'rcube_result_multifolder')) {
	if ($subset = $this->search_set->get_set($folder)) {
	$subset->incomplete = $this->search_set->incomplete = true;
	}
	}
	}


	/**
	* Return message headers object of a specific message
	*
	* @param int $id Message UID
	* @param string $folder Folder to read from
	* @param bool $force True to skip cache
	*
	* @return rcube_message_header Message headers
	*/
	public function get_message_headers($uid, $folder = null, $force = false)
	{
	// decode combined UID-folder identifier
	if (preg_match('/^\d+-.+/', $uid)) {
	list($uid, $folder) = explode('-', $uid, 2);
	}

	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	// get cached headers
	if (!$force && $uid && ($mcache = $this->get_mcache_engine())) {
	$headers = $mcache->get_message($folder, $uid);
	}
	else if (!$this->check_connection()) {
	$headers = false;
	}
	else {
	$headers = $this->conn->fetchHeader(
	$folder, $uid, true, true, $this->get_fetch_headers());

	if (is_object($headers))
	$headers->folder = $folder;
	}

	return $headers;
	}


	/**
	* Fetch message headers and body structure from the IMAP server and build
	* an object structure similar to the one generated by PEAR::Mail_mimeDecode
	*
	* @param int $uid Message UID to fetch
	* @param string $folder Folder to read from
	*
	* @return object rcube_message_header Message data
	*/
	public function get_message($uid, $folder = null)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	// decode combined UID-folder identifier
	if (preg_match('/^\d+-.+/', $uid)) {
	list($uid, $folder) = explode('-', $uid, 2);
	}

	// Check internal cache
	if (!empty($this->icache['message'])) {
	if (($headers = $this->icache['message']) && $headers->uid == $uid) {
	return $headers;
	}
	}

	$headers = $this->get_message_headers($uid, $folder);

	// message doesn't exist?
	if (empty($headers)) {
	return null;
	}

	// structure might be cached
	if (!empty($headers->structure)) {
	return $headers;
	}

	$this->msg_uid = $uid;

	if (!$this->check_connection()) {
	return $headers;
	}

	if (empty($headers->bodystructure)) {
	$headers->bodystructure = $this->conn->getStructure($folder, $uid, true);
	}

	$structure = $headers->bodystructure;

	if (empty($structure)) {
	return $headers;
	}

	// set message charset from message headers
	if ($headers->charset) {
	$this->struct_charset = $headers->charset;
	}
	else {
	$this->struct_charset = $this->structure_charset($structure);
	}

	$headers->ctype = @strtolower($headers->ctype);

	// Here we can recognize malformed BODYSTRUCTURE and
	// 1. [@TODO] parse the message in other way to create our own message structure
	// 2. or just show the raw message body.
	// Example of structure for malformed MIME message:
	// ("text" "plain" NIL NIL NIL "7bit" 2154 70 NIL NIL NIL)
	if ($headers->ctype && !is_array($structure[0]) && $headers->ctype != 'text/plain'
	&& strtolower($structure[0].'/'.$structure[1]) == 'text/plain'
	) {
	// A special known case "Content-type: text" (#1488968)
	if ($headers->ctype == 'text') {
	$structure[1] = 'plain';
	$headers->ctype = 'text/plain';
	}
	// we can handle single-part messages, by simple fix in structure (#1486898)
	else if (preg_match('/^(text\|application)\/(.*)/', $headers->ctype, $m)) {
	$structure[0] = $m[1];
	$structure[1] = $m[2];
	}
	else {
	// Try to parse the message using Mail_mimeDecode package
	// We need a better solution, Mail_mimeDecode parses message
	// in memory, which wouldn't work for very big messages,
	// (it uses up to 10x more memory than the message size)
	// it's also buggy and not actively developed
	if ($headers->size && rcube_utils::mem_check($headers->size * 10)) {
	$raw_msg = $this->get_raw_body($uid);
	$struct = rcube_mime::parse_message($raw_msg);
	}
	else {
	return $headers;
	}
	}
	}

	if (empty($struct)) {
	$struct = $this->structure_part($structure, 0, '', $headers);
	}

	// some workarounds on simple messages...
	if (empty($struct->parts)) {
	// ...don't trust given content-type
	if (!empty($headers->ctype)) {
	$struct->mime_id = '1';
	$struct->mimetype = strtolower($headers->ctype);
	list($struct->ctype_primary, $struct->ctype_secondary) = explode('/', $struct->mimetype);
	}

	// ...and charset (there's a case described in #1488968 where invalid content-type
	// results in invalid charset in BODYSTRUCTURE)
	if (!empty($headers->charset) && $headers->charset != $struct->ctype_parameters['charset']) {
	$struct->charset = $headers->charset;
	$struct->ctype_parameters['charset'] = $headers->charset;
	}
	}

	$headers->structure = $struct;

	return $this->icache['message'] = $headers;
	}


	/**
	* Build message part object
	*
	* @param array $part
	* @param int $count
	* @param string $parent
	*/
	protected function structure_part($part, $count=0, $parent='', $mime_headers=null)
	{
	$struct = new rcube_message_part;
	$struct->mime_id = empty($parent) ? (string)$count : "$parent.$count";

	// multipart
	if (is_array($part[0])) {
	$struct->ctype_primary = 'multipart';

	/* RFC3501: BODYSTRUCTURE fields of multipart part
	part1 array
	part2 array
	part3 array
	....
	1. subtype
	2. parameters (optional)
	3. description (optional)
	4. language (optional)
	5. location (optional)
	*/

	// find first non-array entry
	for ($i=1; $i<count($part); $i++) {
	if (!is_array($part[$i])) {
	$struct->ctype_secondary = strtolower($part[$i]);
	break;
	}
	}

	$struct->mimetype = 'multipart/'.$struct->ctype_secondary;

	// build parts list for headers pre-fetching
	for ($i=0; $i<count($part); $i++) {
	if (!is_array($part[$i])) {
	break;
	}
	// fetch message headers if message/rfc822
	// or named part (could contain Content-Location header)
	if (!is_array($part[$i][0])) {
	$tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
	if (strtolower($part[$i][0]) == 'message' && strtolower($part[$i][1]) == 'rfc822') {
	$mime_part_headers[] = $tmp_part_id;
	}
	else if (in_array('name', (array)$part[$i][2]) && empty($part[$i][3])) {
	$mime_part_headers[] = $tmp_part_id;
	}
	}
	}

	// pre-fetch headers of all parts (in one command for better performance)
	// @TODO: we could do this before _structure_part() call, to fetch
	// headers for parts on all levels
	if ($mime_part_headers) {
	$mime_part_headers = $this->conn->fetchMIMEHeaders($this->folder,
	$this->msg_uid, $mime_part_headers);
	}

	$struct->parts = array();
	for ($i=0, $count=0; $i<count($part); $i++) {
	if (!is_array($part[$i])) {
	break;
	}
	$tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
	$struct->parts[] = $this->structure_part($part[$i], ++$count, $struct->mime_id,
	$mime_part_headers[$tmp_part_id]);
	}

	return $struct;
	}

	/* RFC3501: BODYSTRUCTURE fields of non-multipart part
	0. type
	1. subtype
	2. parameters
	3. id
	4. description
	5. encoding
	6. size
	-- text
	7. lines
	-- message/rfc822
	7. envelope structure
	8. body structure
	9. lines
	--
	x. md5 (optional)
	x. disposition (optional)
	x. language (optional)
	x. location (optional)
	*/

	// regular part
	$struct->ctype_primary = strtolower($part[0]);
	$struct->ctype_secondary = strtolower($part[1]);
	$struct->mimetype = $struct->ctype_primary.'/'.$struct->ctype_secondary;

	// read content type parameters
	if (is_array($part[2])) {
	$struct->ctype_parameters = array();
	for ($i=0; $i<count($part[2]); $i+=2) {
	$struct->ctype_parameters[strtolower($part[2][$i])] = $part[2][$i+1];
	}

	if (isset($struct->ctype_parameters['charset'])) {
	$struct->charset = $struct->ctype_parameters['charset'];
	}
	}

	// #1487700: workaround for lack of charset in malformed structure
	if (empty($struct->charset) && !empty($mime_headers) && $mime_headers->charset) {
	$struct->charset = $mime_headers->charset;
	}

	// read content encoding
	if (!empty($part[5])) {
	$struct->encoding = strtolower($part[5]);
	$struct->headers['content-transfer-encoding'] = $struct->encoding;
	}

	// get part size
	if (!empty($part[6])) {
	$struct->size = intval($part[6]);
	}

	// read part disposition
	$di = 8;
	if ($struct->ctype_primary == 'text') {
	$di += 1;
	}
	else if ($struct->mimetype == 'message/rfc822') {
	$di += 3;
	}

	if (is_array($part[$di]) && count($part[$di]) == 2) {
	$struct->disposition = strtolower($part[$di][0]);

	if (is_array($part[$di][1])) {
	for ($n=0; $n<count($part[$di][1]); $n+=2) {
	$struct->d_parameters[strtolower($part[$di][1][$n])] = $part[$di][1][$n+1];
	}
	}
	}

	// get message/rfc822's child-parts
	if (is_array($part[8]) && $di != 8) {
	$struct->parts = array();
	for ($i=0, $count=0; $i<count($part[8]); $i++) {
	if (!is_array($part[8][$i])) {
	break;
	}
	$struct->parts[] = $this->structure_part($part[8][$i], ++$count, $struct->mime_id);
	}
	}

	// get part ID
	if (!empty($part[3])) {
	$struct->content_id = $part[3];
	$struct->headers['content-id'] = $part[3];

	if (empty($struct->disposition)) {
	$struct->disposition = 'inline';
	}
	}

	// fetch message headers if message/rfc822 or named part (could contain Content-Location header)
	if ($struct->ctype_primary == 'message' \|\| ($struct->ctype_parameters['name'] && !$struct->content_id)) {
	if (empty($mime_headers)) {
	$mime_headers = $this->conn->fetchPartHeader(
	$this->folder, $this->msg_uid, true, $struct->mime_id);
	}

	if (is_string($mime_headers)) {
	$struct->headers = rcube_mime::parse_headers($mime_headers) + $struct->headers;
	}
	else if (is_object($mime_headers)) {
	$struct->headers = get_object_vars($mime_headers) + $struct->headers;
	}

	// get real content-type of message/rfc822
	if ($struct->mimetype == 'message/rfc822') {
	// single-part
	if (!is_array($part[8][0])) {
	$struct->real_mimetype = strtolower($part[8][0] . '/' . $part[8][1]);
	}
	// multi-part
	else {
	for ($n=0; $n<count($part[8]); $n++) {
	if (!is_array($part[8][$n])) {
	break;
	}
	}
	$struct->real_mimetype = 'multipart/' . strtolower($part[8][$n]);
	}
	}

	if ($struct->ctype_primary == 'message' && empty($struct->parts)) {
	if (is_array($part[8]) && $di != 8) {
	$struct->parts[] = $this->structure_part($part[8], ++$count, $struct->mime_id);
	}
	}
	}

	// normalize filename property
	$this->set_part_filename($struct, $mime_headers);

	return $struct;
	}


	/**
	* Set attachment filename from message part structure
	*
	* @param rcube_message_part $part Part object
	* @param string $headers Part's raw headers
	*/
	protected function set_part_filename(&$part, $headers=null)
	{
	if (!empty($part->d_parameters['filename'])) {
	$filename_mime = $part->d_parameters['filename'];
	}
	else if (!empty($part->d_parameters['filename*'])) {
	$filename_encoded = $part->d_parameters['filename*'];
	}
	else if (!empty($part->ctype_parameters['name*'])) {
	$filename_encoded = $part->ctype_parameters['name*'];
	}
	// RFC2231 value continuations
	// TODO: this should be rewrited to support RFC2231 4.1 combinations
	else if (!empty($part->d_parameters['filename*0'])) {
	$i = 0;
	while (isset($part->d_parameters['filename*'.$i])) {
	$filename_mime .= $part->d_parameters['filename*'.$i];
	$i++;
	}
	// some servers (eg. dovecot-1.x) have no support for parameter value continuations
	// we must fetch and parse headers "manually"
	if ($i<2) {
	if (!$headers) {
	$headers = $this->conn->fetchPartHeader(
	$this->folder, $this->msg_uid, true, $part->mime_id);
	}
	$filename_mime = '';
	$i = 0;
	while (preg_match('/filename\'.$i.'\s=\s"([^"\n;]+)[";]*/', $headers, $matches)) {
	$filename_mime .= $matches[1];
	$i++;
	}
	}
	}
	else if (!empty($part->d_parameters['filename0'])) {
	$i = 0;
	while (isset($part->d_parameters['filename'.$i.''])) {
	$filename_encoded .= $part->d_parameters['filename'.$i.''];
	$i++;
	}
	if ($i<2) {
	if (!$headers) {
	$headers = $this->conn->fetchPartHeader(
	$this->folder, $this->msg_uid, true, $part->mime_id);
	}
	$filename_encoded = '';
	$i = 0; $matches = array();
	while (preg_match('/filename\'.$i.'\\s=\s"([^"\n;]+)[";]/', $headers, $matches)) {
	$filename_encoded .= $matches[1];
	$i++;
	}
	}
	}
	else if (!empty($part->ctype_parameters['name*0'])) {
	$i = 0;
	while (isset($part->ctype_parameters['name*'.$i])) {
	$filename_mime .= $part->ctype_parameters['name*'.$i];
	$i++;
	}
	if ($i<2) {
	if (!$headers) {
	$headers = $this->conn->fetchPartHeader(
	$this->folder, $this->msg_uid, true, $part->mime_id);
	}
	$filename_mime = '';
	$i = 0; $matches = array();
	while (preg_match('/\s+name\'.$i.'\s=\s"([^"\n;]+)[";]*/', $headers, $matches)) {
	$filename_mime .= $matches[1];
	$i++;
	}
	}
	}
	else if (!empty($part->ctype_parameters['name0'])) {
	$i = 0;
	while (isset($part->ctype_parameters['name'.$i.''])) {
	$filename_encoded .= $part->ctype_parameters['name'.$i.''];
	$i++;
	}
	if ($i<2) {
	if (!$headers) {
	$headers = $this->conn->fetchPartHeader(
	$this->folder, $this->msg_uid, true, $part->mime_id);
	}
	$filename_encoded = '';
	$i = 0; $matches = array();
	while (preg_match('/\s+name\'.$i.'\\s=\s"([^"\n;]+)[";]/', $headers, $matches)) {
	$filename_encoded .= $matches[1];
	$i++;
	}
	}
	}
	// read 'name' after rfc2231 parameters as it may contains truncated filename (from Thunderbird)
	else if (!empty($part->ctype_parameters['name'])) {
	$filename_mime = $part->ctype_parameters['name'];
	}
	// Content-Disposition
	else if (!empty($part->headers['content-description'])) {
	$filename_mime = $part->headers['content-description'];
	}
	else {
	return;
	}

	// decode filename
	if (!empty($filename_mime)) {
	if (!empty($part->charset)) {
	$charset = $part->charset;
	}
	else if (!empty($this->struct_charset)) {
	$charset = $this->struct_charset;
	}
	else {
	$charset = rcube_charset::detect($filename_mime, $this->default_charset);
	}

	$part->filename = rcube_mime::decode_mime_string($filename_mime, $charset);
	}
	else if (!empty($filename_encoded)) {
	// decode filename according to RFC 2231, Section 4
	if (preg_match("/^([^'])'[^']'(.*)$/", $filename_encoded, $fmatches)) {
	$filename_charset = $fmatches[1];
	$filename_encoded = $fmatches[2];
	}

	$part->filename = rcube_charset::convert(urldecode($filename_encoded), $filename_charset);
	}
	}


	/**
	* Get charset name from message structure (first part)
	*
	* @param array $structure Message structure
	*
	* @return string Charset name
	*/
	protected function structure_charset($structure)
	{
	while (is_array($structure)) {
	if (is_array($structure[2]) && $structure[2][0] == 'charset') {
	return $structure[2][1];
	}
	$structure = $structure[0];
	}
	}


	/**
	* Fetch message body of a specific message from the server
	*
	* @param int Message UID
	* @param string Part number
	* @param rcube_message_part Part object created by get_structure()
	* @param mixed True to print part, resource to write part contents in
	* @param resource File pointer to save the message part
	* @param boolean Disables charset conversion
	* @param int Only read this number of bytes
	* @param boolean Enables formatting of text/* parts bodies
	*
	* @return string Message/part body if not printed
	*/
	public function get_message_part($uid, $part=1, $o_part=NULL, $print=NULL, $fp=NULL, $skip_charset_conv=false, $max_bytes=0, $formatted=true)
	{
	if (!$this->check_connection()) {
	return null;
	}

	// get part data if not provided
	if (!is_object($o_part)) {
	$structure = $this->conn->getStructure($this->folder, $uid, true);
	$part_data = rcube_imap_generic::getStructurePartData($structure, $part);

	$o_part = new rcube_message_part;
	$o_part->ctype_primary = $part_data['type'];
	$o_part->encoding = $part_data['encoding'];
	$o_part->charset = $part_data['charset'];
	$o_part->size = $part_data['size'];
	}

	if ($o_part && $o_part->size) {
	$formatted = $formatted && $o_part->ctype_primary == 'text';
	$body = $this->conn->handlePartBody($this->folder, $uid, true,
	$part ? $part : 'TEXT', $o_part->encoding, $print, $fp, $formatted, $max_bytes);
	}

	if ($fp \|\| $print) {
	return true;
	}

	// convert charset (if text or message part)
	if ($body && preg_match('/^(text\|message)$/', $o_part->ctype_primary)) {
	// Remove NULL characters if any (#1486189)
	if ($formatted && strpos($body, "\x00") !== false) {
	$body = str_replace("\x00", '', $body);
	}

	if (!$skip_charset_conv) {
	if (!$o_part->charset \|\| strtoupper($o_part->charset) == 'US-ASCII') {
	// try to extract charset information from HTML meta tag (#1488125)
	if ($o_part->ctype_secondary == 'html' && preg_match('/<meta[^>]+charset=([a-z0-9-_]+)/i', $body, $m)) {
	$o_part->charset = strtoupper($m[1]);
	}
	else {
	$o_part->charset = $this->default_charset;
	}
	}
	$body = rcube_charset::convert($body, $o_part->charset);
	}
	}

	return $body;
	}


	/**
	* Returns the whole message source as string (or saves to a file)
	*
	* @param int $uid Message UID
	* @param resource $fp File pointer to save the message
	*
	* @return string Message source string
	*/
	public function get_raw_body($uid, $fp=null)
	{
	if (!$this->check_connection()) {
	return null;
	}

	return $this->conn->handlePartBody($this->folder, $uid,
	true, null, null, false, $fp);
	}


	/**
	* Returns the message headers as string
	*
	* @param int $uid Message UID
	*
	* @return string Message headers string
	*/
	public function get_raw_headers($uid)
	{
	if (!$this->check_connection()) {
	return null;
	}

	return $this->conn->fetchPartHeader($this->folder, $uid, true);
	}


	/**
	* Sends the whole message source to stdout
	*
	* @param int $uid Message UID
	* @param bool $formatted Enables line-ending formatting
	*/
	public function print_raw_body($uid, $formatted = true)
	{
	if (!$this->check_connection()) {
	return;
	}

	$this->conn->handlePartBody($this->folder, $uid, true, null, null, true, null, $formatted);
	}


	/**
	* Set message flag to one or several messages
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $flag Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
	* @param string $folder Folder name
	* @param boolean $skip_cache True to skip message cache clean up
	*
	* @return boolean Operation status
	*/
	public function set_flag($uids, $flag, $folder=null, $skip_cache=false)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	if (!$this->check_connection()) {
	return false;
	}

	$flag = strtoupper($flag);
	list($uids, $all_mode) = $this->parse_uids($uids);

	if (strpos($flag, 'UN') === 0) {
	$result = $this->conn->unflag($folder, $uids, substr($flag, 2));
	}
	else {
	$result = $this->conn->flag($folder, $uids, $flag);
	}

	if ($result && !$skip_cache) {
	// reload message headers if cached
	// update flags instead removing from cache
	if ($mcache = $this->get_mcache_engine()) {
	$status = strpos($flag, 'UN') !== 0;
	$mflag = preg_replace('/^UN/', '', $flag);
	$mcache->change_flag($folder, $all_mode ? null : explode(',', $uids),
	$mflag, $status);
	}

	// clear cached counters
	if ($flag == 'SEEN' \|\| $flag == 'UNSEEN') {
	$this->clear_messagecount($folder, 'SEEN');
	$this->clear_messagecount($folder, 'UNSEEN');
	}
	else if ($flag == 'DELETED' \|\| $flag == 'UNDELETED') {
	$this->clear_messagecount($folder, 'DELETED');
	// remove cached messages
	if ($this->options['skip_deleted']) {
	$this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
	}
	}

	$this->set_search_dirty($folder);
	}

	return $result;
	}


	/**
	* Append a mail message (source) to a specific folder
	*
	* @param string $folder Target folder
	* @param string\|array $message The message source string or filename
	* or array (of strings and file pointers)
	* @param string $headers Headers string if $message contains only the body
	* @param boolean $is_file True if $message is a filename
	* @param array $flags Message flags
	* @param mixed $date Message internal date
	* @param bool $binary Enables BINARY append
	*
	* @return int\|bool Appended message UID or True on success, False on error
	*/
	public function save_message($folder, &$message, $headers='', $is_file=false, $flags = array(), $date = null, $binary = false)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	if (!$this->check_connection()) {
	return false;
	}

	// make sure folder exists
	if (!$this->folder_exists($folder)) {
	return false;
	}

	$date = $this->date_format($date);

	if ($is_file) {
	$saved = $this->conn->appendFromFile($folder, $message, $headers, $flags, $date, $binary);
	}
	else {
	$saved = $this->conn->append($folder, $message, $flags, $date, $binary);
	}

	if ($saved) {
	// increase messagecount of the target folder
	$this->set_messagecount($folder, 'ALL', 1);

	rcube::get_instance()->plugins->exec_hook('message_saved', array(
	'folder' => $folder,
	'message' => $message,
	'headers' => $headers,
	'is_file' => $is_file,
	'flags' => $flags,
	'date' => $date,
	'binary' => $binary,
	'result' => $saved,
	));
	}

	return $saved;
	}


	/**
	* Move a message from one folder to another
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $to_mbox Target folder
	* @param string $from_mbox Source folder
	*
	* @return boolean True on success, False on error
	*/
	public function move_message($uids, $to_mbox, $from_mbox='')
	{
	if (!strlen($from_mbox)) {
	$from_mbox = $this->folder;
	}

	if ($to_mbox === $from_mbox) {
	return false;
	}

	list($uids, $all_mode) = $this->parse_uids($uids);

	// exit if no message uids are specified
	if (empty($uids)) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	$config = rcube::get_instance()->config;
	$to_trash = $to_mbox == $config->get('trash_mbox');

	// flag messages as read before moving them
	if ($to_trash && $config->get('read_when_deleted')) {
	// don't flush cache (4th argument)
	$this->set_flag($uids, 'SEEN', $from_mbox, true);
	}

	// move messages
	$moved = $this->conn->move($uids, $from_mbox, $to_mbox);

	if ($moved) {
	$this->clear_messagecount($from_mbox);
	$this->clear_messagecount($to_mbox);

	$this->set_search_dirty($from_mbox);
	$this->set_search_dirty($to_mbox);
	}
	// moving failed
	else if ($to_trash && $config->get('delete_always', false)) {
	$moved = $this->delete_message($uids, $from_mbox);
	}

	if ($moved) {
	// unset threads internal cache
	unset($this->icache['threads']);

	// remove message ids from search set
	if ($this->search_set && $from_mbox == $this->folder) {
	// threads are too complicated to just remove messages from set
	if ($this->search_threads \|\| $all_mode) {
	$this->refresh_search();
	}
	else if (!$this->search_set->incomplete) {
	$this->search_set->filter(explode(',', $uids), $this->folder);
	}
	}

	// remove cached messages
	// @TODO: do cache update instead of clearing it
	$this->clear_message_cache($from_mbox, $all_mode ? null : explode(',', $uids));
	}

	return $moved;
	}


	/**
	* Copy a message from one folder to another
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $to_mbox Target folder
	* @param string $from_mbox Source folder
	*
	* @return boolean True on success, False on error
	*/
	public function copy_message($uids, $to_mbox, $from_mbox='')
	{
	if (!strlen($from_mbox)) {
	$from_mbox = $this->folder;
	}

	list($uids, $all_mode) = $this->parse_uids($uids);

	// exit if no message uids are specified
	if (empty($uids)) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	// copy messages
	$copied = $this->conn->copy($uids, $from_mbox, $to_mbox);

	if ($copied) {
	$this->clear_messagecount($to_mbox);
	}

	return $copied;
	}


	/**
	* Mark messages as deleted and expunge them
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $folder Source folder
	*
	* @return boolean True on success, False on error
	*/
	public function delete_message($uids, $folder='')
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	list($uids, $all_mode) = $this->parse_uids($uids);

	// exit if no message uids are specified
	if (empty($uids)) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	$deleted = $this->conn->flag($folder, $uids, 'DELETED');

	if ($deleted) {
	// send expunge command in order to have the deleted message
	// really deleted from the folder
	$this->expunge_message($uids, $folder, false);
	$this->clear_messagecount($folder);
	unset($this->uid_id_map[$folder]);

	// unset threads internal cache
	unset($this->icache['threads']);

	$this->set_search_dirty($folder);

	// remove message ids from search set
	if ($this->search_set && $folder == $this->folder) {
	// threads are too complicated to just remove messages from set
	if ($this->search_threads \|\| $all_mode) {
	$this->refresh_search();
	}
	else if (!$this->search_set->incomplete) {
	$this->search_set->filter(explode(',', $uids));
	}
	}

	// remove cached messages
	$this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
	}

	return $deleted;
	}


	/**
	* Send IMAP expunge command and clear cache
	*
	* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
	* @param string $folder Folder name
	* @param boolean $clear_cache False if cache should not be cleared
	*
	* @return boolean True on success, False on failure
	*/
	public function expunge_message($uids, $folder = null, $clear_cache = true)
	{
	if ($uids && $this->get_capability('UIDPLUS')) {
	list($uids, $all_mode) = $this->parse_uids($uids);
	}
	else {
	$uids = null;
	}

	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	if (!$this->check_connection()) {
	return false;
	}

	// force folder selection and check if folder is writeable
	// to prevent a situation when CLOSE is executed on closed
	// or EXPUNGE on read-only folder
	$result = $this->conn->select($folder);
	if (!$result) {
	return false;
	}

	if (!$this->conn->data['READ-WRITE']) {
	$this->conn->setError(rcube_imap_generic::ERROR_READONLY, "Folder is read-only");
	return false;
	}

	// CLOSE(+SELECT) should be faster than EXPUNGE
	if (empty($uids) \|\| $all_mode) {
	$result = $this->conn->close();
	}
	else {
	$result = $this->conn->expunge($folder, $uids);
	}

	if ($result && $clear_cache) {
	$this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
	$this->clear_messagecount($folder);
	}

	return $result;
	}


	/* --------------------------------
	* folder managment
	* --------------------------------*/

	/**
	* Public method for listing subscribed folders.
	*
	* @param string $root Optional root folder
	* @param string $name Optional name pattern
	* @param string $filter Optional filter
	* @param string $rights Optional ACL requirements
	* @param bool $skip_sort Enable to return unsorted list (for better performance)
	*
	* @return array List of folders
	*/
	public function list_folders_subscribed($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
	{
	$cache_key = $root.':'.$name;
	if (!empty($filter)) {
	$cache_key .= ':'.(is_string($filter) ? $filter : serialize($filter));
	}
	$cache_key .= ':'.$rights;
	$cache_key = 'mailboxes.'.md5($cache_key);

	// get cached folder list
	$a_mboxes = $this->get_cache($cache_key);
	if (is_array($a_mboxes)) {
	return $a_mboxes;
	}

	// Give plugins a chance to provide a list of folders
	$data = rcube::get_instance()->plugins->exec_hook('storage_folders',
	array('root' => $root, 'name' => $name, 'filter' => $filter, 'mode' => 'LSUB'));

	if (isset($data['folders'])) {
	$a_mboxes = $data['folders'];
	}
	else {
	$a_mboxes = $this->list_folders_subscribed_direct($root, $name);
	}

	if (!is_array($a_mboxes)) {
	return array();
	}

	// filter folders list according to rights requirements
	if ($rights && $this->get_capability('ACL')) {
	$a_mboxes = $this->filter_rights($a_mboxes, $rights);
	}

	// INBOX should always be available
	if ((!$filter \|\| $filter == 'mail') && !in_array('INBOX', $a_mboxes)) {
	array_unshift($a_mboxes, 'INBOX');
	}

	// sort folders (always sort for cache)
	if (!$skip_sort \|\| $this->cache) {
	$a_mboxes = $this->sort_folder_list($a_mboxes);
	}

	// write folders list to cache
	$this->update_cache($cache_key, $a_mboxes);

	return $a_mboxes;
	}


	/**
	* Method for direct folders listing (LSUB)
	*
	* @param string $root Optional root folder
	* @param string $name Optional name pattern
	*
	* @return array List of subscribed folders
	* @see rcube_imap::list_folders_subscribed()
	*/
	public function list_folders_subscribed_direct($root='', $name='*')
	{
	if (!$this->check_connection()) {
	return null;
	}

	$config = rcube::get_instance()->config;

	// Server supports LIST-EXTENDED, we can use selection options
	// #1486225: Some dovecot versions returns wrong result using LIST-EXTENDED
	$list_extended = !$config->get('imap_force_lsub') && $this->get_capability('LIST-EXTENDED');
	if ($list_extended) {
	// This will also set folder options, LSUB doesn't do that
	$a_folders = $this->conn->listMailboxes($root, $name,
	NULL, array('SUBSCRIBED'));
	}
	else {
	// retrieve list of folders from IMAP server using LSUB
	$a_folders = $this->conn->listSubscribed($root, $name);
	}

	if (!is_array($a_folders)) {
	return array();
	}

	// #1486796: some server configurations doesn't return folders in all namespaces
	if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
	$this->list_folders_update($a_folders, ($list_extended ? 'ext-' : '') . 'subscribed');
	}

	if ($list_extended) {
	// unsubscribe non-existent folders, remove from the list
	if (is_array($a_folders) && $name == '*' && !empty($this->conn->data['LIST'])) {
	foreach ($a_folders as $idx => $folder) {
	if (($opts = $this->conn->data['LIST'][$folder])
	&& in_array('\\NonExistent', $opts)
	) {
	$this->conn->unsubscribe($folder);
	unset($a_folders[$idx]);
	}
	}
	}
	}
	else {
	// unsubscribe non-existent folders, remove them from the list
	if (is_array($a_folders) && !empty($a_folders) && $name == '*') {
	$existing = $this->list_folders($root, $name);
	$nonexisting = array_diff($a_folders, $existing);
	$a_folders = array_diff($a_folders, $nonexisting);

	foreach ($nonexisting as $folder) {
	$this->conn->unsubscribe($folder);
	}
	}
	}

	return $a_folders;
	}


	/**
	* Get a list of all folders available on the server
	*
	* @param string $root IMAP root dir
	* @param string $name Optional name pattern
	* @param mixed $filter Optional filter
	* @param string $rights Optional ACL requirements
	* @param bool $skip_sort Enable to return unsorted list (for better performance)
	*
	* @return array Indexed array with folder names
	*/
	public function list_folders($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
	{
	$cache_key = $root.':'.$name;
	if (!empty($filter)) {
	$cache_key .= ':'.(is_string($filter) ? $filter : serialize($filter));
	}
	$cache_key .= ':'.$rights;
	$cache_key = 'mailboxes.list.'.md5($cache_key);

	// get cached folder list
	$a_mboxes = $this->get_cache($cache_key);
	if (is_array($a_mboxes)) {
	return $a_mboxes;
	}

	// Give plugins a chance to provide a list of folders
	$data = rcube::get_instance()->plugins->exec_hook('storage_folders',
	array('root' => $root, 'name' => $name, 'filter' => $filter, 'mode' => 'LIST'));

	if (isset($data['folders'])) {
	$a_mboxes = $data['folders'];
	}
	else {
	// retrieve list of folders from IMAP server
	$a_mboxes = $this->list_folders_direct($root, $name);
	}

	if (!is_array($a_mboxes)) {
	$a_mboxes = array();
	}

	// INBOX should always be available
	if ((!$filter \|\| $filter == 'mail') && !in_array('INBOX', $a_mboxes)) {
	array_unshift($a_mboxes, 'INBOX');
	}

	// cache folder attributes
	if ($root == '' && $name == '*' && empty($filter) && !empty($this->conn->data)) {
	$this->update_cache('mailboxes.attributes', $this->conn->data['LIST']);
	}

	// filter folders list according to rights requirements
	if ($rights && $this->get_capability('ACL')) {
	$a_mboxes = $this->filter_rights($a_mboxes, $rights);
	}

	// filter folders and sort them
	if (!$skip_sort) {
	$a_mboxes = $this->sort_folder_list($a_mboxes);
	}

	// write folders list to cache
	$this->update_cache($cache_key, $a_mboxes);

	return $a_mboxes;
	}


	/**
	* Method for direct folders listing (LIST)
	*
	* @param string $root Optional root folder
	* @param string $name Optional name pattern
	*
	* @return array List of folders
	* @see rcube_imap::list_folders()
	*/
	public function list_folders_direct($root='', $name='*')
	{
	if (!$this->check_connection()) {
	return null;
	}

	$result = $this->conn->listMailboxes($root, $name);

	if (!is_array($result)) {
	return array();
	}

	$config = rcube::get_instance()->config;

	// #1486796: some server configurations doesn't return folders in all namespaces
	if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
	$this->list_folders_update($result);
	}

	return $result;
	}


	/**
	* Fix folders list by adding folders from other namespaces.
	* Needed on some servers eg. Courier IMAP
	*
	* @param array $result Reference to folders list
	* @param string $type Listing type (ext-subscribed, subscribed or all)
	*/
	protected function list_folders_update(&$result, $type = null)
	{
	$namespace = $this->get_namespace();
	$search = array();

	// build list of namespace prefixes
	foreach ((array)$namespace as $ns) {
	if (is_array($ns)) {
	foreach ($ns as $ns_data) {
	if (strlen($ns_data[0])) {
	$search[] = $ns_data[0];
	}
	}
	}
	}

	if (!empty($search)) {
	// go through all folders detecting namespace usage
	foreach ($result as $folder) {
	foreach ($search as $idx => $prefix) {
	if (strpos($folder, $prefix) === 0) {
	unset($search[$idx]);
	}
	}
	if (empty($search)) {
	break;
	}
	}

	// get folders in hidden namespaces and add to the result
	foreach ($search as $prefix) {
	if ($type == 'ext-subscribed') {
	$list = $this->conn->listMailboxes('', $prefix . '*', null, array('SUBSCRIBED'));
	}
	else if ($type == 'subscribed') {
	$list = $this->conn->listSubscribed('', $prefix . '*');
	}
	else {
	$list = $this->conn->listMailboxes('', $prefix . '*');
	}

	if (!empty($list)) {
	$result = array_merge($result, $list);
	}
	}
	}
	}


	/**
	* Filter the given list of folders according to access rights
	*
	* For performance reasons we assume user has full rights
	* on all personal folders.
	*/
	protected function filter_rights($a_folders, $rights)
	{
	$regex = '/('.$rights.')/';

	foreach ($a_folders as $idx => $folder) {
	if ($this->folder_namespace($folder) == 'personal') {
	continue;
	}

	$myrights = join('', (array)$this->my_rights($folder));

	if ($myrights !== null && !preg_match($regex, $myrights)) {
	unset($a_folders[$idx]);
	}
	}

	return $a_folders;
	}


	/**
	* Get mailbox quota information
	*
	* @param string $folder Folder name
	*
	* @return mixed Quota info or False if not supported
	*/
	public function get_quota($folder = null)
	{
	if ($this->get_capability('QUOTA') && $this->check_connection()) {
	return $this->conn->getQuota($folder);
	}

	return false;
	}


	/**
	* Get folder size (size of all messages in a folder)
	*
	* @param string $folder Folder name
	*
	* @return int Folder size in bytes, False on error
	*/
	public function folder_size($folder)
	{
	if (!$this->check_connection()) {
	return 0;
	}

	// @TODO: could we try to use QUOTA here?
	$result = $this->conn->fetchHeaderIndex($folder, '1:*', 'SIZE', false);

	if (is_array($result)) {
	$result = array_sum($result);
	}

	return $result;
	}


	/**
	* Subscribe to a specific folder(s)
	*
	* @param array $folders Folder name(s)
	*
	* @return boolean True on success
	*/
	public function subscribe($folders)
	{
	// let this common function do the main work
	return $this->change_subscription($folders, 'subscribe');
	}


	/**
	* Unsubscribe folder(s)
	*
	* @param array $a_mboxes Folder name(s)
	*
	* @return boolean True on success
	*/
	public function unsubscribe($folders)
	{
	// let this common function do the main work
	return $this->change_subscription($folders, 'unsubscribe');
	}


	/**
	* Create a new folder on the server and register it in local cache
	*
	* @param string $folder New folder name
	* @param boolean $subscribe True if the new folder should be subscribed
	* @param string $type Optional folder type (junk, trash, drafts, sent, archive)
	*
	* @return boolean True on success
	*/
	public function create_folder($folder, $subscribe = false, $type = null)
	{
	if (!$this->check_connection()) {
	return false;
	}

	$result = $this->conn->createFolder($folder, $type ? array("\\" . ucfirst($type)) : null);

	// try to subscribe it
	if ($result) {
	// clear cache
	$this->clear_cache('mailboxes', true);

	if ($subscribe) {
	$this->subscribe($folder);
	}
	}

	return $result;
	}


	/**
	* Set a new name to an existing folder
	*
	* @param string $folder Folder to rename
	* @param string $new_name New folder name
	*
	* @return boolean True on success
	*/
	public function rename_folder($folder, $new_name)
	{
	if (!strlen($new_name)) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	$delm = $this->get_hierarchy_delimiter();

	// get list of subscribed folders
	if ((strpos($folder, '%') === false) && (strpos($folder, '*') === false)) {
	$a_subscribed = $this->list_folders_subscribed('', $folder . $delm . '*');
	$subscribed = $this->folder_exists($folder, true);
	}
	else {
	$a_subscribed = $this->list_folders_subscribed();
	$subscribed = in_array($folder, $a_subscribed);
	}

	$result = $this->conn->renameFolder($folder, $new_name);

	if ($result) {
	// unsubscribe the old folder, subscribe the new one
	if ($subscribed) {
	$this->conn->unsubscribe($folder);
	$this->conn->subscribe($new_name);
	}

	// check if folder children are subscribed
	foreach ($a_subscribed as $c_subscribed) {
	if (strpos($c_subscribed, $folder.$delm) === 0) {
	$this->conn->unsubscribe($c_subscribed);
	$this->conn->subscribe(preg_replace('/^'.preg_quote($folder, '/').'/',
	$new_name, $c_subscribed));

	// clear cache
	$this->clear_message_cache($c_subscribed);
	}
	}

	// clear cache
	$this->clear_message_cache($folder);
	$this->clear_cache('mailboxes', true);
	}

	return $result;
	}


	/**
	* Remove folder from server
	*
	* @param string $folder Folder name
	*
	* @return boolean True on success
	*/
	function delete_folder($folder)
	{
	$delm = $this->get_hierarchy_delimiter();

	if (!$this->check_connection()) {
	return false;
	}

	// get list of folders
	if ((strpos($folder, '%') === false) && (strpos($folder, '*') === false)) {
	$sub_mboxes = $this->list_folders('', $folder . $delm . '*');
	}
	else {
	$sub_mboxes = $this->list_folders();
	}

	// send delete command to server
	$result = $this->conn->deleteFolder($folder);

	if ($result) {
	// unsubscribe folder
	$this->conn->unsubscribe($folder);

	foreach ($sub_mboxes as $c_mbox) {
	if (strpos($c_mbox, $folder.$delm) === 0) {
	$this->conn->unsubscribe($c_mbox);
	if ($this->conn->deleteFolder($c_mbox)) {
	$this->clear_message_cache($c_mbox);
	}
	}
	}

	// clear folder-related cache
	$this->clear_message_cache($folder);
	$this->clear_cache('mailboxes', true);
	}

	return $result;
	}


	/**
	* Detect special folder associations stored in storage backend
	*/
	public function get_special_folders($forced = false)
	{
	$result = parent::get_special_folders();

	if (isset($this->icache['special-use'])) {
	return array_merge($result, $this->icache['special-use']);
	}

	if (!$forced \|\| !$this->get_capability('SPECIAL-USE')) {
	return $result;
	}

	if (!$this->check_connection()) {
	return $result;
	}

	$types = array_map(function($value) { return "\\" . ucfirst($value); }, rcube_storage::$folder_types);
	$special = array();

	// request \Subscribed flag in LIST response as performance improvement for folder_exists()
	$folders = $this->conn->listMailboxes('', '*', array('SUBSCRIBED'), array('SPECIAL-USE'));

	if (!empty($folders)) {
	foreach ($folders as $folder) {
	if ($flags = $this->conn->data['LIST'][$folder]) {
	foreach ($types as $type) {
	if (in_array($type, $flags)) {
	$type = strtolower(substr($type, 1));
	$special[$type] = $folder;
	}
	}
	}
	}
	}

	$this->icache['special-use'] = $special;
	unset($this->icache['special-folders']);

	return array_merge($result, $special);
	}


	/**
	* Set special folder associations stored in storage backend
	*/
	public function set_special_folders($specials)
	{
	if (!$this->get_capability('SPECIAL-USE') \|\| !$this->get_capability('METADATA')) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	$folders = $this->get_special_folders(true);
	$old = (array) $this->icache['special-use'];

	foreach ($specials as $type => $folder) {
	if (in_array($type, rcube_storage::$folder_types)) {
	$old_folder = $old[$type];
	if ($old_folder !== $folder) {
	// unset old-folder metadata
	if ($old_folder !== null) {
	$this->delete_metadata($old_folder, array('/private/specialuse'));
	}
	// set new folder metadata
	if ($folder) {
	$this->set_metadata($folder, array('/private/specialuse' => "\\" . ucfirst($type)));
	}
	}
	}
	}

	$this->icache['special-use'] = $specials;
	unset($this->icache['special-folders']);

	return true;
	}


	/**
	* Checks if folder exists and is subscribed
	*
	* @param string $folder Folder name
	* @param boolean $subscription Enable subscription checking
	*
	* @return boolean TRUE or FALSE
	*/
	public function folder_exists($folder, $subscription = false)
	{
	if ($folder == 'INBOX') {
	return true;
	}

	$key = $subscription ? 'subscribed' : 'existing';

	if (is_array($this->icache[$key]) && in_array($folder, $this->icache[$key])) {
	return true;
	}

	if (!$this->check_connection()) {
	return false;
	}

	if ($subscription) {
	// It's possible we already called LIST command, check LIST data
	if (!empty($this->conn->data['LIST']) && !empty($this->conn->data['LIST'][$folder])
	&& in_array('\\Subscribed', $this->conn->data['LIST'][$folder])
	) {
	$a_folders = array($folder);
	}
	else {
	$a_folders = $this->conn->listSubscribed('', $folder);
	}
	}
	else {
	// It's possible we already called LIST command, check LIST data
	if (!empty($this->conn->data['LIST']) && isset($this->conn->data['LIST'][$folder])) {
	$a_folders = array($folder);
	}
	else {
	$a_folders = $this->conn->listMailboxes('', $folder);
	}
	}

	if (is_array($a_folders) && in_array($folder, $a_folders)) {
	$this->icache[$key][] = $folder;
	return true;
	}

	return false;
	}


	/**
	* Returns the namespace where the folder is in
	*
	* @param string $folder Folder name
	*
	* @return string One of 'personal', 'other' or 'shared'
	*/
	public function folder_namespace($folder)
	{
	if ($folder == 'INBOX') {
	return 'personal';
	}

	foreach ($this->namespace as $type => $namespace) {
	if (is_array($namespace)) {
	foreach ($namespace as $ns) {
	if ($len = strlen($ns[0])) {
	if (($len > 1 && $folder == substr($ns[0], 0, -1))
	\|\| strpos($folder, $ns[0]) === 0
	) {
	return $type;
	}
	}
	}
	}
	}

	return 'personal';
	}


	/**
	* Modify folder name according to namespace.
	* For output it removes prefix of the personal namespace if it's possible.
	* For input it adds the prefix. Use it before creating a folder in root
	* of the folders tree.
	*
	* @param string $folder Folder name
	* @param string $mode Mode name (out/in)
	*
	* @return string Folder name
	*/
	public function mod_folder($folder, $mode = 'out')
	{
	if (!strlen($folder)) {
	return $folder;
	}

	$prefix = $this->namespace['prefix']; // see set_env()
	$prefix_len = strlen($prefix);

	if (!$prefix_len) {
	return $folder;
	}

	// remove prefix for output
	if ($mode == 'out') {
	if (substr($folder, 0, $prefix_len) === $prefix) {
	return substr($folder, $prefix_len);
	}
	}
	// add prefix for input (e.g. folder creation)
	else {
	return $prefix . $folder;
	}

	return $folder;
	}


	/**
	* Gets folder attributes from LIST response, e.g. \Noselect, \Noinferiors
	*
	* @param string $folder Folder name
	* @param bool $force Set to True if attributes should be refreshed
	*
	* @return array Options list
	*/
	public function folder_attributes($folder, $force=false)
	{
	// get attributes directly from LIST command
	if (!empty($this->conn->data['LIST']) && is_array($this->conn->data['LIST'][$folder])) {
	$opts = $this->conn->data['LIST'][$folder];
	}
	// get cached folder attributes
	else if (!$force) {
	$opts = $this->get_cache('mailboxes.attributes');
	$opts = $opts[$folder];
	}

	if (!is_array($opts)) {
	if (!$this->check_connection()) {
	return array();
	}

	$this->conn->listMailboxes('', $folder);
	$opts = $this->conn->data['LIST'][$folder];
	}

	return is_array($opts) ? $opts : array();
	}


	/**
	* Gets connection (and current folder) data: UIDVALIDITY, EXISTS, RECENT,
	* PERMANENTFLAGS, UIDNEXT, UNSEEN
	*
	* @param string $folder Folder name
	*
	* @return array Data
	*/
	public function folder_data($folder)
	{
	if (!strlen($folder)) {
	$folder = $this->folder !== null ? $this->folder : 'INBOX';
	}

	if ($this->conn->selected != $folder) {
	if (!$this->check_connection()) {
	return array();
	}

	if ($this->conn->select($folder)) {
	$this->folder = $folder;
	}
	else {
	return null;
	}
	}

	$data = $this->conn->data;

	// add (E)SEARCH result for ALL UNDELETED query
	if (!empty($this->icache['undeleted_idx'])
	&& $this->icache['undeleted_idx']->get_parameters('MAILBOX') == $folder
	) {
	$data['UNDELETED'] = $this->icache['undeleted_idx'];
	}

	return $data;
	}


	/**
	* Returns extended information about the folder
	*
	* @param string $folder Folder name
	*
	* @return array Data
	*/
	public function folder_info($folder)
	{
	if ($this->icache['options'] && $this->icache['options']['name'] == $folder) {
	return $this->icache['options'];
	}

	// get cached metadata
	$cache_key = 'mailboxes.folder-info.' . $folder;
	$cached = $this->get_cache($cache_key);

	if (is_array($cached)) {
	return $cached;
	}

	$acl = $this->get_capability('ACL');
	$namespace = $this->get_namespace();
	$options = array();

	// check if the folder is a namespace prefix
	if (!empty($namespace)) {
	$mbox = $folder . $this->delimiter;
	foreach ($namespace as $ns) {
	if (!empty($ns)) {
	foreach ($ns as $item) {
	if ($item[0] === $mbox) {
	$options['is_root'] = true;
	break 2;
	}
	}
	}
	}
	}
	// check if the folder is other user virtual-root
	if (!$options['is_root'] && !empty($namespace) && !empty($namespace['other'])) {
	$parts = explode($this->delimiter, $folder);
	if (count($parts) == 2) {
	$mbox = $parts[0] . $this->delimiter;
	foreach ($namespace['other'] as $item) {
	if ($item[0] === $mbox) {
	$options['is_root'] = true;
	break;
	}
	}
	}
	}

	$options['name'] = $folder;
	$options['attributes'] = $this->folder_attributes($folder, true);
	$options['namespace'] = $this->folder_namespace($folder);
	$options['special'] = $this->is_special_folder($folder);

	// Set 'noselect' flag
	if (is_array($options['attributes'])) {
	foreach ($options['attributes'] as $attrib) {
	$attrib = strtolower($attrib);
	if ($attrib == '\noselect' \|\| $attrib == '\nonexistent') {
	$options['noselect'] = true;
	}
	}
	}
	else {
	$options['noselect'] = true;
	}

	// Get folder rights (MYRIGHTS)
	if ($acl && ($rights = $this->my_rights($folder))) {
	$options['rights'] = $rights;
	}

	// Set 'norename' flag
	if (!empty($options['rights'])) {
	$options['norename'] = !in_array('x', $options['rights']) && !in_array('d', $options['rights']);

	if (!$options['noselect']) {
	$options['noselect'] = !in_array('r', $options['rights']);
	}
	}
	else {
	$options['norename'] = $options['is_root'] \|\| $options['namespace'] != 'personal';
	}

	// update caches
	$this->icache['options'] = $options;
	$this->update_cache($cache_key, $options);

	return $options;
	}


	/**
	* Synchronizes messages cache.
	*
	* @param string $folder Folder name
	*/
	public function folder_sync($folder)
	{
	if ($mcache = $this->get_mcache_engine()) {
	$mcache->synchronize($folder);
	}
	}


	/**
	* Get message header names for rcube_imap_generic::fetchHeader(s)
	*
	* @return string Space-separated list of header names
	*/
	protected function get_fetch_headers()
	{
	if (!empty($this->options['fetch_headers'])) {
	$headers = explode(' ', $this->options['fetch_headers']);
	}
	else {
	$headers = array();
	}

	if ($this->messages_caching \|\| $this->options['all_headers']) {
	$headers = array_merge($headers, $this->all_headers);
	}

	return $headers;
	}


	/* -----------------------------------------
	* ACL and METADATA/ANNOTATEMORE methods
	* ----------------------------------------*/

	/**
	* Changes the ACL on the specified folder (SETACL)
	*
	* @param string $folder Folder name
	* @param string $user User name
	* @param string $acl ACL string
	*
	* @return boolean True on success, False on failure
	* @since 0.5-beta
	*/
	public function set_acl($folder, $user, $acl)
	{
	if (!$this->get_capability('ACL')) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	$this->clear_cache('mailboxes.folder-info.' . $folder);

	return $this->conn->setACL($folder, $user, $acl);
	}


	/**
	* Removes any <identifier,rights> pair for the
	* specified user from the ACL for the specified
	* folder (DELETEACL)
	*
	* @param string $folder Folder name
	* @param string $user User name
	*
	* @return boolean True on success, False on failure
	* @since 0.5-beta
	*/
	public function delete_acl($folder, $user)
	{
	if (!$this->get_capability('ACL')) {
	return false;
	}

	if (!$this->check_connection()) {
	return false;
	}

	return $this->conn->deleteACL($folder, $user);
	}


	/**
	* Returns the access control list for folder (GETACL)
	*
	* @param string $folder Folder name
	*
	* @return array User-rights array on success, NULL on error
	* @since 0.5-beta
	*/
	public function get_acl($folder)
	{
	if (!$this->get_capability('ACL')) {
	return null;
	}

	if (!$this->check_connection()) {
	return null;
	}

	return $this->conn->getACL($folder);
	}


	/**
	* Returns information about what rights can be granted to the
	* user (identifier) in the ACL for the folder (LISTRIGHTS)
	*
	* @param string $folder Folder name
	* @param string $user User name
	*
	* @return array List of user rights
	* @since 0.5-beta
	*/
	public function list_rights($folder, $user)
	{
	if (!$this->get_capability('ACL')) {
	return null;
	}

	if (!$this->check_connection()) {
	return null;
	}

	return $this->conn->listRights($folder, $user);
	}


	/**
	* Returns the set of rights that the current user has to
	* folder (MYRIGHTS)
	*
	* @param string $folder Folder name
	*
	* @return array MYRIGHTS response on success, NULL on error
	* @since 0.5-beta
	*/
	public function my_rights($folder)
	{
	if (!$this->get_capability('ACL')) {
	return null;
	}

	if (!$this->check_connection()) {
	return null;
	}

	return $this->conn->myRights($folder);
	}


	/**
	* Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
	*
	* @param string $folder Folder name (empty for server metadata)
	* @param array $entries Entry-value array (use NULL value as NIL)
	*
	* @return boolean True on success, False on failure
	* @since 0.5-beta
	*/
	public function set_metadata($folder, $entries)
	{
	if (!$this->check_connection()) {
	return false;
	}

	$this->clear_cache('mailboxes.metadata.', true);

	if ($this->get_capability('METADATA') \|\|
	(!strlen($folder) && $this->get_capability('METADATA-SERVER'))
	) {
	return $this->conn->setMetadata($folder, $entries);
	}
	else if ($this->get_capability('ANNOTATEMORE') \|\| $this->get_capability('ANNOTATEMORE2')) {
	foreach ((array)$entries as $entry => $value) {
	list($ent, $attr) = $this->md2annotate($entry);
	$entries[$entry] = array($ent, $attr, $value);
	}
	return $this->conn->setAnnotation($folder, $entries);
	}

	return false;
	}


	/**
	* Unsets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
	*
	* @param string $folder Folder name (empty for server metadata)
	* @param array $entries Entry names array
	*
	* @return boolean True on success, False on failure
	* @since 0.5-beta
	*/
	public function delete_metadata($folder, $entries)
	{
	if (!$this->check_connection()) {
	return false;
	}

	$this->clear_cache('mailboxes.metadata.', true);

	if ($this->get_capability('METADATA') \|\|
	(!strlen($folder) && $this->get_capability('METADATA-SERVER'))
	) {
	return $this->conn->deleteMetadata($folder, $entries);
	}
	else if ($this->get_capability('ANNOTATEMORE') \|\| $this->get_capability('ANNOTATEMORE2')) {
	foreach ((array)$entries as $idx => $entry) {
	list($ent, $attr) = $this->md2annotate($entry);
	$entries[$idx] = array($ent, $attr, NULL);
	}
	return $this->conn->setAnnotation($folder, $entries);
	}

	return false;
	}


	/**
	* Returns IMAP metadata/annotations (GETMETADATA/GETANNOTATION)
	*
	* @param string $folder Folder name (empty for server metadata)
	* @param array $entries Entries
	* @param array $options Command options (with MAXSIZE and DEPTH keys)
	*
	* @return array Metadata entry-value hash array on success, NULL on error
	* @since 0.5-beta
	*/
	public function get_metadata($folder, $entries, $options=array())
	{
	$entries = (array)$entries;

	// create cache key
	// @TODO: this is the simplest solution, but we do the same with folders list
	// maybe we should store data per-entry and merge on request
	sort($options);
	sort($entries);
	$cache_key = 'mailboxes.metadata.' . $folder;
	$cache_key .= '.' . md5(serialize($options).serialize($entries));

	// get cached data
	$cached_data = $this->get_cache($cache_key);

	if (is_array($cached_data)) {
	return $cached_data;
	}

	if (!$this->check_connection()) {
	return null;
	}

	if ($this->get_capability('METADATA') \|\|
	(!strlen($folder) && $this->get_capability('METADATA-SERVER'))
	) {
	$res = $this->conn->getMetadata($folder, $entries, $options);
	}
	else if ($this->get_capability('ANNOTATEMORE') \|\| $this->get_capability('ANNOTATEMORE2')) {
	$queries = array();
	$res = array();

	// Convert entry names
	foreach ($entries as $entry) {
	list($ent, $attr) = $this->md2annotate($entry);
	$queries[$attr][] = $ent;
	}

	// @TODO: Honor MAXSIZE and DEPTH options
	foreach ($queries as $attrib => $entry) {
	if ($result = $this->conn->getAnnotation($folder, $entry, $attrib)) {
	$res = array_merge_recursive($res, $result);
	}
	}
	}

	if (isset($res)) {
	$this->update_cache($cache_key, $res);
	return $res;
	}

	return null;
	}


	/**
	* Converts the METADATA extension entry name into the correct
	* entry-attrib names for older ANNOTATEMORE version.
	*
	* @param string $entry Entry name
	*
	* @return array Entry-attribute list, NULL if not supported (?)
	*/
	protected function md2annotate($entry)
	{
	if (substr($entry, 0, 7) == '/shared') {
	return array(substr($entry, 7), 'value.shared');
	}
	else if (substr($entry, 0, 8) == '/private') {
	return array(substr($entry, 8), 'value.priv');
	}

	// @TODO: log error
	return null;
	}


	/* --------------------------------
	* internal caching methods
	* --------------------------------*/

	/**
	* Enable or disable indexes caching
	*
	* @param string $type Cache type (@see rcube::get_cache)
	*/
	public function set_caching($type)
	{
	if ($type) {
	$this->caching = $type;
	}
	else {
	if ($this->cache) {
	$this->cache->close();
	}
	$this->cache = null;
	$this->caching = false;
	}
	}

	/**
	* Getter for IMAP cache object
	*/
	protected function get_cache_engine()
	{
	if ($this->caching && !$this->cache) {
	$rcube = rcube::get_instance();
	$ttl = $rcube->config->get('imap_cache_ttl', '10d');
	$this->cache = $rcube->get_cache('IMAP', $this->caching, $ttl);
	}

	return $this->cache;
	}

	/**
	* Returns cached value
	*
	* @param string $key Cache key
	*
	* @return mixed
	*/
	public function get_cache($key)
	{
	if ($cache = $this->get_cache_engine()) {
	return $cache->get($key);
	}
	}

	/**
	* Update cache
	*
	* @param string $key Cache key
	* @param mixed $data Data
	*/
	public function update_cache($key, $data)
	{
	if ($cache = $this->get_cache_engine()) {
	$cache->set($key, $data);
	}
	}

	/**
	* Clears the cache.
	*
	* @param string $key Cache key name or pattern
	* @param boolean $prefix_mode Enable it to clear all keys starting
	* with prefix specified in $key
	*/
	public function clear_cache($key = null, $prefix_mode = false)
	{
	if ($cache = $this->get_cache_engine()) {
	$cache->remove($key, $prefix_mode);
	}
	}


	/* --------------------------------
	* message caching methods
	* --------------------------------*/

	/**
	* Enable or disable messages caching
	*
	* @param boolean $set Flag
	* @param int $mode Cache mode
	*/
	public function set_messages_caching($set, $mode = null)
	{
	if ($set) {
	$this->messages_caching = true;

	if ($mode && ($cache = $this->get_mcache_engine())) {
	$cache->set_mode($mode);
	}
	}
	else {
	if ($this->mcache) {
	$this->mcache->close();
	}
	$this->mcache = null;
	$this->messages_caching = false;
	}
	}


	/**
	* Getter for messages cache object
	*/
	protected function get_mcache_engine()
	{
	if ($this->messages_caching && !$this->mcache) {
	$rcube = rcube::get_instance();
	if (($dbh = $rcube->get_dbh()) && ($userid = $rcube->get_user_id())) {
	$ttl = $rcube->config->get('messages_cache_ttl', '10d');
	$threshold = $rcube->config->get('messages_cache_threshold', 50);
	$this->mcache = new rcube_imap_cache(
	$dbh, $this, $userid, $this->options['skip_deleted'], $ttl, $threshold);
	}
	}

	return $this->mcache;
	}


	/**
	* Clears the messages cache.
	*
	* @param string $folder Folder name
	* @param array $uids Optional message UIDs to remove from cache
	*/
	protected function clear_message_cache($folder = null, $uids = null)
	{
	if ($mcache = $this->get_mcache_engine()) {
	$mcache->clear($folder, $uids);
	}
	}


	/**
	* Delete outdated cache entries
	*/
	function cache_gc()
	{
	rcube_imap_cache::gc();
	}


	/* --------------------------------
	* protected methods
	* --------------------------------*/

	/**
	* Validate the given input and save to local properties
	*
	* @param string $sort_field Sort column
	* @param string $sort_order Sort order
	*/
	protected function set_sort_order($sort_field, $sort_order)
	{
	if ($sort_field != null) {
	$this->sort_field = asciiwords($sort_field);
	}
	if ($sort_order != null) {
	$this->sort_order = strtoupper($sort_order) == 'DESC' ? 'DESC' : 'ASC';
	}
	}


	/**
	* Sort folders first by default folders and then in alphabethical order
	*
	* @param array $a_folders Folders list
	* @param bool $skip_default Skip default folders handling
	*
	* @return array Sorted list
	*/
	public function sort_folder_list($a_folders, $skip_default = false)
	{
	$specials = array_merge(array('INBOX'), array_values($this->get_special_folders()));
	$folders = array();

	// convert names to UTF-8 and skip folders starting with '.'
	foreach ($a_folders as $folder) {
	if ($folder[0] != '.') {
	// for better performance skip encoding conversion
	// if the string does not look like UTF7-IMAP
	$folders[$folder] = strpos($folder, '&') === false ? $folder : rcube_charset::convert($folder, 'UTF7-IMAP');
	}
	}

	// sort folders
	// asort($folders, SORT_LOCALE_STRING) is not properly sorting case sensitive names
	uasort($folders, array($this, 'sort_folder_comparator'));

	$folders = array_keys($folders);

	if ($skip_default) {
	return $folders;
	}

	// force the type of folder name variable (#1485527)
	$folders = array_map('strval', $folders);
	$out = array();

	// finally we must put special folders on top and rebuild the list
	// to move their subfolders where they belong...
	$specials = array_unique(array_intersect($specials, $folders));
	$folders = array_merge($specials, array_diff($folders, $specials));

	$this->sort_folder_specials(null, $folders, $specials, $out);

	return $out;
	}

	/**
	* Recursive function to put subfolders of special folders in place
	*/
	protected function sort_folder_specials($folder, &$list, &$specials, &$out)
	{
	while (list($key, $name) = each($list)) {
	if ($folder === null \|\| strpos($name, $folder.$this->delimiter) === 0) {
	$out[] = $name;
	unset($list[$key]);

	if (!empty($specials) && ($found = array_search($name, $specials)) !== false) {
	unset($specials[$found]);
	$this->sort_folder_specials($name, $list, $specials, $out);
	}
	}
	}

	reset($list);
	}

	/**
	* Callback for uasort() that implements correct
	* locale-aware case-sensitive sorting
	*/
	protected function sort_folder_comparator($str1, $str2)
	{
	$path1 = explode($this->delimiter, $str1);
	$path2 = explode($this->delimiter, $str2);

	foreach ($path1 as $idx => $folder1) {
	$folder2 = $path2[$idx];

	if ($folder1 === $folder2) {
	continue;
	}

	return strcoll($folder1, $folder2);
	}
	}


	/**
	* Find UID of the specified message sequence ID
	*
	* @param int $id Message (sequence) ID
	* @param string $folder Folder name
	*
	* @return int Message UID
	*/
	public function id2uid($id, $folder = null)
	{
	if (!strlen($folder)) {
	$folder = $this->folder;
	}

	if ($uid = array_search($id, (array)$this->uid_id_map[$folder])) {
	return $uid;
	}

	if (!$this->check_connection()) {
	return null;
	}

	$uid = $this->conn->ID2UID($folder, $id);

	$this->uid_id_map[$folder][$uid] = $id;

	return $uid;
	}


	/**
	* Subscribe/unsubscribe a list of folders and update local cache
	*/
	protected function change_subscription($folders, $mode)
	{
	$updated = false;

	if (!empty($folders)) {
	if (!$this->check_connection()) {
	return false;
	}

	foreach ((array)$folders as $i => $folder) {
	$folders[$i] = $folder;

	if ($mode == 'subscribe') {
	$updated = $this->conn->subscribe($folder);
	}
	else if ($mode == 'unsubscribe') {
	$updated = $this->conn->unsubscribe($folder);
	}
	}
	}

	// clear cached folders list(s)
	if ($updated) {
	$this->clear_cache('mailboxes', true);
	}

	return $updated;
	}


	/**
	* Increde/decrese messagecount for a specific folder
	*/
	protected function set_messagecount($folder, $mode, $increment)
	{
	if (!is_numeric($increment)) {
	return false;
	}

	$mode = strtoupper($mode);
	$a_folder_cache = $this->get_cache('messagecount');

	if (!is_array($a_folder_cache[$folder]) \|\| !isset($a_folder_cache[$folder][$mode])) {
	return false;
	}

	// add incremental value to messagecount
	$a_folder_cache[$folder][$mode] += $increment;

	// there's something wrong, delete from cache
	if ($a_folder_cache[$folder][$mode] < 0) {
	unset($a_folder_cache[$folder][$mode]);
	}

	// write back to cache
	$this->update_cache('messagecount', $a_folder_cache);

	return true;
	}


	/**
	* Remove messagecount of a specific folder from cache
	*/
	protected function clear_messagecount($folder, $mode=null)
	{
	$a_folder_cache = $this->get_cache('messagecount');

	if (is_array($a_folder_cache[$folder])) {
	if ($mode) {
	unset($a_folder_cache[$folder][$mode]);
	}
	else {
	unset($a_folder_cache[$folder]);
	}
	$this->update_cache('messagecount', $a_folder_cache);
	}
	}


	/**
	* Converts date string/object into IMAP date/time format
	*/
	protected function date_format($date)
	{
	if (empty($date)) {
	return null;
	}

	if (!is_object($date) \|\| !is_a($date, 'DateTime')) {
	try {
	$timestamp = rcube_utils::strtotime($date);
	$date = new DateTime("@".$timestamp);
	}
	catch (Exception $e) {
	return null;
	}
	}

	return $date->format('d-M-Y H:i:s O');
	}


	/**
	* This is our own debug handler for the IMAP connection
	* @access public
	*/
	public function debug_handler(&$imap, $message)
	{
	rcube::write_log('imap', $message);
	}


	/**
	* Deprecated methods (to be removed)
	*/

	public function decode_address_list($input, $max = null, $decode = true, $fallback = null)
	{
	return rcube_mime::decode_address_list($input, $max, $decode, $fallback);
	}

	public function decode_header($input, $fallback = null)
	{
	return rcube_mime::decode_mime_string((string)$input, $fallback);
	}

	public static function decode_mime_string($input, $fallback = null)
	{
	return rcube_mime::decode_mime_string($input, $fallback);
	}

	public function mime_decode($input, $encoding = '7bit')
	{
	return rcube_mime::decode($input, $encoding);
	}

	public static function explode_header_string($separator, $str, $remove_comments = false)
	{
	return rcube_mime::explode_header_string($separator, $str, $remove_comments);
	}

	public function select_mailbox($mailbox)
	{
	// do nothing
	}

	public function set_mailbox($folder)
	{
	$this->set_folder($folder);
	}

	public function get_mailbox_name()
	{
	return $this->get_folder();
	}

	public function list_headers($folder='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
	{
	return $this->list_messages($folder, $page, $sort_field, $sort_order, $slice);
	}

	public function get_headers($uid, $folder = null, $force = false)
	{
	return $this->get_message_headers($uid, $folder, $force);
	}

	public function mailbox_status($folder = null)
	{
	return $this->folder_status($folder);
	}

	public function message_index($folder = '', $sort_field = NULL, $sort_order = NULL)
	{
	return $this->index($folder, $sort_field, $sort_order);
	}

	public function message_index_direct($folder, $sort_field = null, $sort_order = null)
	{
	return $this->index_direct($folder, $sort_field, $sort_order);
	}

	public function list_mailboxes($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
	{
	return $this->list_folders_subscribed($root, $name, $filter, $rights, $skip_sort);
	}

	public function list_unsubscribed($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
	{
	return $this->list_folders($root, $name, $filter, $rights, $skip_sort);
	}

	public function get_mailbox_size($folder)
	{
	return $this->folder_size($folder);
	}

	public function create_mailbox($folder, $subscribe=false)
	{
	return $this->create_folder($folder, $subscribe);
	}

	public function rename_mailbox($folder, $new_name)
	{
	return $this->rename_folder($folder, $new_name);
	}

	function delete_mailbox($folder)
	{
	return $this->delete_folder($folder);
	}

	function clear_mailbox($folder = null)
	{
	return $this->clear_folder($folder);
	}

	public function mailbox_exists($folder, $subscription=false)
	{
	return $this->folder_exists($folder, $subscription);
	}

	public function mailbox_namespace($folder)
	{
	return $this->folder_namespace($folder);
	}

	public function mod_mailbox($folder, $mode = 'out')
	{
	return $this->mod_folder($folder, $mode);
	}

	public function mailbox_attributes($folder, $force=false)
	{
	return $this->folder_attributes($folder, $force);
	}

	public function mailbox_data($folder)
	{
	return $this->folder_data($folder);
	}

	public function mailbox_info($folder)
	{
	return $this->folder_info($folder);
	}

	public function mailbox_sync($folder)
	{
	return $this->folder_sync($folder);
	}

	public function expunge($folder='', $clear_cache=true)
	{
	return $this->expunge_folder($folder, $clear_cache);
	}

	}
	diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
	index 00999ba50..39e27fc7f 100644
	--- a/program/lib/Roundcube/rcube_utils.php
	+++ b/program/lib/Roundcube/rcube_utils.php
	@@ -1,1085 +1,1085 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-2012, The Roundcube Dev Team \|
	\| Copyright (C) 2011-2012, Kolab Systems AG \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Utility class providing common functions \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <alec@alec.pl> \|
	+-----------------------------------------------------------------------+
	*/

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

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

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

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

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

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

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

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

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

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

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

	// Validate domain part
	if (preg_match('/^\[((IPv6:[0-9a-f:.]+)\|([0-9.]+))\]$/i', $domain_part, $matches)) {
	return self::check_ip(preg_replace('/^IPv6:/i', '', $matches[1])); // valid IPv4 or IPv6 address
	}
	else {
	// If not an IP address
	$domain_array = explode('.', $domain_part);
	// Not enough parts to be a valid domain
	if (sizeof($domain_array) < 2) {
	return false;
	}

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

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

	$rcube = rcube::get_instance();

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

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

	// find MX record(s)
	if (!function_exists('getmxrr') \|\| getmxrr($domain_part, $mx_records)) {
	return true;
	}

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

	return false;
	}


	/**
	* Validates IPv4 or IPv6 address
	*
	* @param string $ip IP address in v4 or v6 format
	*
	* @return bool True if the address is valid
	*/
	public static function check_ip($ip)
	{
	// IPv6, but there's no build-in IPv6 support
	if (strpos($ip, ':') !== false && !defined('AF_INET6')) {
	$parts = explode(':', $ip);
	$count = count($parts);

	if ($count > 8 \|\| $count < 2) {
	return false;
	}

	foreach ($parts as $idx => $part) {
	$length = strlen($part);
	if (!$length) {
	// there can be only one ::
	if ($found_empty) {
	return false;
	}
	$found_empty = true;
	}
	// last part can be an IPv4 address
	else if ($idx == $count - 1) {
	if (!preg_match('/^[0-9a-f]{1,4}$/i', $part)) {
	return @inet_pton($part) !== false;
	}
	}
	else if (!preg_match('/^[0-9a-f]{1,4}$/i', $part)) {
	return false;
	}
	}

	return true;
	}

	return @inet_pton($ip) !== false;
	}


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


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

	if (!is_string($str)) {
	$str = strval($str);
	}

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

	$encode_arr = $html_encode_arr;

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

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

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

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

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

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

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

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

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

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

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


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

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

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


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

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

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

	// strip slashes if magic_quotes enabled
	if (get_magic_quotes_gpc() \|\| get_magic_quotes_runtime()) {
	$value = stripslashes($value);
	}

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

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

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

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

	return $value;
	}


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

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

	return $out;
	}


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


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

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

	if (preg_match("/$evilexpr/i", $stripped)) {
	return '/* evil! */';
	}

	$strict_url_regexp = '!url\s*$[ "\'](https?:)//[a-z0-9/._+-]+["\' ]$!Uims';

	// cut out all contents between { and }
	while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos))) {
	$nested = strpos($source, '{', $pos+1);
	if ($nested && $nested < $pos2) // when dealing with nested blocks (e.g. @media), take the inner one
	$pos = $nested;
	$length = $pos2 - $pos - 1;
	$styles = substr($source, $pos+1, $length);

	// check every line of a style block...
	if ($allow_remote) {
	$a_styles = preg_split('/;[\r\n]*/', $styles, -1, PREG_SPLIT_NO_EMPTY);

	foreach ($a_styles as $line) {
	$stripped = preg_replace('/[^a-z\(:;]/i', '', $line);
	// ... and only allow strict url() values
	if (stripos($stripped, 'url(') && !preg_match($strict_url_regexp, $line)) {
	$a_styles = array('/* evil! */');
	break;
	}
	}

	$styles = join(";\n", $a_styles);
	}

	$key = $replacements->add($styles);
	$repl = $replacements->get_replacement($key);
	$source = substr_replace($source, $repl, $pos+1, $length);
	$last_pos = $pos2 - ($length - strlen($repl));
	}

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

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

	return $source;
	}


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

	list($primary, $secondary) = explode('/', $mimetype);

	$classes = array($primary ? $primary : 'unknown');

	if ($secondary) {
	$classes[] = $secondary;
	}

	if (preg_match('/\.([a-z0-9]+)$/', $filename, $m)) {
	if (!in_array($m[1], $classes)) {
	$classes[] = $m[1];
	}
	}

	return join(" ", $classes);
	}


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

	return $out;
	}


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


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

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


	/**
	* Check if working in SSL mode
	*
	* @param integer $port HTTPS port number
	* @param boolean $use_https Enables 'use_https' option checking
	*
	* @return boolean
	*/
	public static function https_check($port=null, $use_https=true)
	{
	if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') {
	return true;
	}
	if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO'])
	&& strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https'
	&& in_array($_SERVER['REMOTE_ADDR'], rcube::get_instance()->config->get('proxy_whitelist', array()))) {
	return true;
	}
	if ($port && $_SERVER['SERVER_PORT'] == $port) {
	return true;
	}
	if ($use_https && rcube::get_instance()->config->get('use_https')) {
	return true;
	}

	return false;
	}


	/**
	* Replaces hostname variables.
	*
	* @param string $name Hostname
	* @param string $host Optional IMAP hostname
	*
	* @return string Hostname
	*/
	public static function parse_host($name, $host = '')
	{
	if (!is_string($name)) {
	return $name;
	}

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

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


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

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

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

	return $address;
	}


	/**
	* Returns the real remote IP address
	*
	* @return string Remote IP address
	*/
	public static function remote_addr()
	{
	// Check if any of the headers are set first to improve performance
	if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) \|\| !empty($_SERVER['HTTP_X_REAL_IP'])) {
	$proxy_whitelist = rcube::get_instance()->config->get('proxy_whitelist', array());
	if (in_array($_SERVER['REMOTE_ADDR'], $proxy_whitelist)) {
	if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
	foreach(array_reverse(explode(',', $_SERVER['HTTP_X_FORWARDED_FOR'])) as $forwarded_ip) {
	if (!in_array($forwarded_ip, $proxy_whitelist)) {
	return $forwarded_ip;
	}
	}
	}

	if (!empty($_SERVER['HTTP_X_REAL_IP'])) {
	return $_SERVER['HTTP_X_REAL_IP'];
	}
	}
	}

	if (!empty($_SERVER['REMOTE_ADDR'])) {
	return $_SERVER['REMOTE_ADDR'];
	}

	return '';
	}

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

	return $hdrs[$key];
	}

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

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

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

	return $result;
	}


	/**
	* Improved equivalent to strtotime()
	*
	* @param string $date Date string
	*
	* @return int Unix timestamp
	*/
	public static function strtotime($date)
	{
	$date = self::clean_datestr($date);

	// unix timestamp
	if (is_numeric($date)) {
	return (int) $date;
	}

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

	return (int) $ts;
	}

	/**
	* Date parsing function that turns the given value into a DateTime object
	*
	* @param string $date Date string
	*
	* @return object DateTime instance or false on failure
	*/
	- public static function anytodatetime($date)
	+ public static function anytodatetime($date, $timezone = null)
	{
	if (is_object($date) && is_a($date, 'DateTime')) {
	return $date;
	}

	$dt = false;
	$date = self::clean_datestr($date);

	// try to parse string with DateTime first
	if (!empty($date)) {
	try {
	- $dt = new DateTime($date);
	+ $dt = new DateTime($date, $timezone);
	}
	catch (Exception $e) {
	// ignore
	}
	}

	// try our advanced strtotime() method
	if (!$dt && ($timestamp = self::strtotime($date))) {
	try {
	$dt = new DateTime("@".$timestamp);
	}
	catch (Exception $e) {
	// ignore
	}
	}

	return $dt;
	}

	/**
	* Clean up date string for strtotime() input
	*
	* @param string $date Date string
	*
	* @return string Date string
	*/
	public static function clean_datestr($date)
	{
	$date = trim($date);

	// check for MS Outlook vCard date format YYYYMMDD
	if (preg_match('/^([12][90]\d\d)([01]\d)([0123]\d)$/', $date, $m)) {
	return sprintf('%04d-%02d-%02d 00:00:00', intval($m[1]), intval($m[2]), intval($m[3]));
	}

	// Clean malformed data
	$date = preg_replace(
	array(
	'/GMT\s*([+-][0-9]+)/', // support non-standard "GMTXXXX" literal
	'/[^a-z0-9\x20\x09:+-\/]/i', // remove any invalid characters
	'/\s(Mon\|Tue\|Wed\|Thu\|Fri\|Sat\|Sun)\s/i', // remove weekday names
	),
	array(
	'\\1',
	'',
	'',
	), $date);

	$date = trim($date);

	// try to fix dd/mm vs. mm/dd discrepancy, we can't do more here
	if (preg_match('/^(\d{1,2})[.\/-](\d{1,2})[.\/-](\d{4})$/', $date, $m)) {
	$mdy = $m[2] > 12 && $m[1] <= 12;
	$day = $mdy ? $m[2] : $m[1];
	$month = $mdy ? $m[1] : $m[2];
	$date = sprintf('%04d-%02d-%02d 00:00:00', intval($m[3]), $month, $day);
	}
	// I've found that YYYY.MM.DD is recognized wrong, so here's a fix
	else if (preg_match('/^(\d{4})\.(\d{1,2})\.(\d{1,2})$/', $date)) {
	$date = str_replace('.', '-', $date) . ' 00:00:00';
	}

	return $date;
	}

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


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


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

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

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

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

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

	/**
	* Normalize the given string for fulltext search.
	* Currently only optimized for ISO-8859-1 and ISO-8859-2 characters; to be extended
	*
	* @param string Input string (UTF-8)
	* @param boolean True to return list of words as array
	*
	* @return mixed Normalized string or a list of normalized tokens
	*/
	public static function normalize_string($str, $as_array = false)
	{
	// replace 4-byte unicode characters with '?' character,
	// these are not supported in default utf-8 charset on mysql,
	// the chance we'd need them in searching is very low
	$str = preg_replace('/('
	. '\xF0[\x90-\xBF][\x80-\xBF]{2}'
	. '\|[\xF1-\xF3][\x80-\xBF]{3}'
	. '\|\xF4[\x80-\x8F][\x80-\xBF]{2}'
	. ')/', '?', $str);

	// split by words
	$arr = self::tokenize_string($str);

	// detect character set
	if (utf8_encode(utf8_decode($str)) == $str) {
	// ISO-8859-1 (or ASCII)
	preg_match_all('/./u', 'äâàåáãæçéêëèïîìíñöôòøõóüûùúýÿ', $keys);
	preg_match_all('/./', 'aaaaaaaceeeeiiiinoooooouuuuyy', $values);

	$mapping = array_combine($keys[0], $values[0]);
	$mapping = array_merge($mapping, array('ß' => 'ss', 'ae' => 'a', 'oe' => 'o', 'ue' => 'u'));
	}
	else if (rcube_charset::convert(rcube_charset::convert($str, 'UTF-8', 'ISO-8859-2'), 'ISO-8859-2', 'UTF-8') == $str) {
	// ISO-8859-2
	preg_match_all('/./u', 'ąáâäćçčéęëěíîłľĺńňóôöŕřśšşťţůúűüźžżý', $keys);
	preg_match_all('/./', 'aaaaccceeeeiilllnnooorrsssttuuuuzzzy', $values);

	$mapping = array_combine($keys[0], $values[0]);
	$mapping = array_merge($mapping, array('ß' => 'ss', 'ae' => 'a', 'oe' => 'o', 'ue' => 'u'));
	}

	foreach ($arr as $i => $part) {
	$part = mb_strtolower($part);

	if (!empty($mapping)) {
	$part = strtr($part, $mapping);
	}

	$arr[$i] = $part;
	}

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

	/**
	* Parse commandline arguments into a hash array
	*
	* @param array $aliases Argument alias names
	*
	* @return array Argument values hash
	*/
	public static function get_opt($aliases = array())
	{
	$args = array();

	for ($i=1; $i < count($_SERVER['argv']); $i++) {
	$arg = $_SERVER['argv'][$i];
	$value = true;
	$key = null;

	if ($arg[0] == '-') {
	$key = preg_replace('/^-+/', '', $arg);
	$sp = strpos($arg, '=');
	if ($sp > 0) {
	$key = substr($key, 0, $sp - 2);
	$value = substr($arg, $sp+1);
	}
	else if (strlen($_SERVER['argv'][$i+1]) && $_SERVER['argv'][$i+1][0] != '-') {
	$value = $_SERVER['argv'][++$i];
	}

	$args[$key] = is_string($value) ? preg_replace(array('/^["\']/', '/["\']$/'), '', $value) : $value;
	}
	else {
	$args[] = $arg;
	}

	if ($alias = $aliases[$key]) {
	$args[$alias] = $args[$key];
	}
	}

	return $args;
	}

	/**
	* Safe password prompt for command line
	* from http://blogs.sitepoint.com/2009/05/01/interactive-cli-password-prompt-in-php/
	*
	* @return string Password
	*/
	public static function prompt_silent($prompt = "Password:")
	{
	if (preg_match('/^win/i', PHP_OS)) {
	$vbscript = sys_get_temp_dir() . 'prompt_password.vbs';
	$vbcontent = 'wscript.echo(InputBox("' . addslashes($prompt) . '", "", "password here"))';
	file_put_contents($vbscript, $vbcontent);

	$command = "cscript //nologo " . escapeshellarg($vbscript);
	$password = rtrim(shell_exec($command));
	unlink($vbscript);

	return $password;
	}
	else {
	$command = "/usr/bin/env bash -c 'echo OK'";
	if (rtrim(shell_exec($command)) !== 'OK') {
	echo $prompt;
	$pass = trim(fgets(STDIN));
	echo chr(8)."\r" . $prompt . str_repeat("*", strlen($pass))."\n";
	return $pass;
	}

	$command = "/usr/bin/env bash -c 'read -s -p \"" . addslashes($prompt) . "\" mypassword && echo \$mypassword'";
	$password = rtrim(shell_exec($command));
	echo "\n";
	return $password;
	}
	}

	/**
	* Find out if the string content means true or false
	*
	* @param string $str Input value
	*
	* @return boolean Boolean value
	*/
	public static function get_boolean($str)
	{
	$str = strtolower($str);

	return !in_array($str, array('false', '0', 'no', 'off', 'nein', ''), true);
	}

	/**
	* OS-dependent absolute path detection
	*/
	public static function is_absolute_path($path)
	{
	if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
	return (bool) preg_match('!^[a-z]:[\\\\/]!i', $path);
	}
	else {
	return $path[0] == DIRECTORY_SEPARATOR;
	}
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 1:30 AM (9 h, 49 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 165409
Default Alt Text: (283 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions