No OneTemporary
Actions

Size

161 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
	index 21c774b97..ba8fe2e40 100644
	--- a/program/localization/en_US/labels.inc
	+++ b/program/localization/en_US/labels.inc
	@@ -1,634 +1,634 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| localization/<lang>/labels.inc \|
	\| \|
	\| Localization file of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2013, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+

	For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
	*/

	$labels = array();

	// login page
	$labels['welcome'] = 'Welcome to $product';
	$labels['username'] = 'Username';
	$labels['password'] = 'Password';
	$labels['server'] = 'Server';
	$labels['login'] = 'Login';

	// taskbar
	$labels['logout'] = 'Logout';
	$labels['mail'] = 'Mail';
	$labels['settings'] = 'Settings';
	$labels['addressbook'] = 'Address Book';

	// mailbox names
	$labels['inbox'] = 'Inbox';
	$labels['drafts'] = 'Drafts';
	$labels['sent'] = 'Sent';
	$labels['trash'] = 'Trash';
	$labels['junk'] = 'Junk';
	$labels['show_real_foldernames'] = 'Show real names for special folders';

	// message listing
	$labels['subject'] = 'Subject';
	$labels['from'] = 'From';
	$labels['sender'] = 'Sender';
	$labels['to'] = 'To';
	$labels['cc'] = 'Cc';
	$labels['bcc'] = 'Bcc';
	$labels['replyto'] = 'Reply-To';
	$labels['followupto'] = 'Followup-To';
	$labels['date'] = 'Date';
	$labels['size'] = 'Size';
	$labels['priority'] = 'Priority';
	$labels['organization'] = 'Organization';
	$labels['readstatus'] = 'Read status';
	$labels['listoptions'] = 'List options...';

	$labels['mailboxlist'] = 'Folders';
	$labels['messagesfromto'] = 'Messages $from to $to of $count';
	$labels['threadsfromto'] = 'Threads $from to $to of $count';
	$labels['messagenrof'] = 'Message $nr of $count';
	$labels['fromtoshort'] = '$from – $to of $count';

	$labels['copy'] = 'Copy';
	$labels['move'] = 'Move';
	$labels['moveto'] = 'Move to...';
	$labels['copyto'] = 'Copy to...';
	$labels['download'] = 'Download';
	$labels['open'] = 'Open';
	$labels['showattachment'] = 'Show';
	$labels['showanyway'] = 'Show it anyway';

	$labels['filename'] = 'File name';
	$labels['filesize'] = 'File size';

	$labels['addtoaddressbook'] = 'Add to address book';

	// weekdays short
	$labels['sun'] = 'Sun';
	$labels['mon'] = 'Mon';
	$labels['tue'] = 'Tue';
	$labels['wed'] = 'Wed';
	$labels['thu'] = 'Thu';
	$labels['fri'] = 'Fri';
	$labels['sat'] = 'Sat';

	// weekdays long
	$labels['sunday'] = 'Sunday';
	$labels['monday'] = 'Monday';
	$labels['tuesday'] = 'Tuesday';
	$labels['wednesday'] = 'Wednesday';
	$labels['thursday'] = 'Thursday';
	$labels['friday'] = 'Friday';
	$labels['saturday'] = 'Saturday';

	// months short
	$labels['jan'] = 'Jan';
	$labels['feb'] = 'Feb';
	$labels['mar'] = 'Mar';
	$labels['apr'] = 'Apr';
	$labels['may'] = 'May';
	$labels['jun'] = 'Jun';
	$labels['jul'] = 'Jul';
	$labels['aug'] = 'Aug';
	$labels['sep'] = 'Sep';
	$labels['oct'] = 'Oct';
	$labels['nov'] = 'Nov';
	$labels['dec'] = 'Dec';

	// months long
	$labels['longjan'] = 'January';
	$labels['longfeb'] = 'February';
	$labels['longmar'] = 'March';
	$labels['longapr'] = 'April';
	$labels['longmay'] = 'May';
	$labels['longjun'] = 'June';
	$labels['longjul'] = 'July';
	$labels['longaug'] = 'August';
	$labels['longsep'] = 'September';
	$labels['longoct'] = 'October';
	$labels['longnov'] = 'November';
	$labels['longdec'] = 'December';

	$labels['today'] = 'Today';

	// toolbar buttons
	$labels['refresh'] = 'Refresh';
	$labels['checkmail'] = 'Check for new messages';
	$labels['compose'] = 'Compose';
	$labels['writenewmessage'] = 'Create a new message';
	$labels['reply'] = 'Reply';
	$labels['replytomessage'] = 'Reply to sender';
	$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
	$labels['replyall'] = 'Reply all';
	$labels['replylist'] = 'Reply list';
	$labels['forward'] = 'Forward';
	$labels['forwardinline'] = 'Forward inline';
	$labels['forwardattachment'] = 'Forward as attachment';
	$labels['forwardmessage'] = 'Forward the message';
	$labels['deletemessage'] = 'Delete message';
	$labels['movemessagetotrash'] = 'Move message to trash';
	$labels['printmessage'] = 'Print this message';
	$labels['previousmessage'] = 'Show previous message';
	$labels['firstmessage'] = 'Show first message';
	$labels['nextmessage'] = 'Show next message';
	$labels['lastmessage'] = 'Show last message';
	$labels['backtolist'] = 'Back to message list';
	$labels['viewsource'] = 'Show source';
	$labels['mark'] = 'Mark';
	$labels['markmessages'] = 'Mark messages';
	$labels['markread'] = 'As read';
	$labels['markunread'] = 'As unread';
	$labels['markflagged'] = 'As flagged';
	$labels['markunflagged'] = 'As unflagged';
	$labels['moreactions'] = 'More actions...';
	$labels['more'] = 'More';
	$labels['back'] = 'Back';
	$labels['options'] = 'Options';

	$labels['first'] = 'First';
	$labels['last'] = 'Last';
	$labels['previous'] = 'Previous';
	$labels['next'] = 'Next';
	$labels['select'] = 'Select';
	$labels['all'] = 'All';
	$labels['none'] = 'None';
	$labels['currpage'] = 'Current page';
	$labels['isread'] = 'Read';
	$labels['unread'] = 'Unread';
	$labels['flagged'] = 'Flagged';
	$labels['unflagged'] = 'Not Flagged';
	$labels['unanswered'] = 'Unanswered';
	$labels['withattachment'] = 'With attachment';
	$labels['deleted'] = 'Deleted';
	$labels['undeleted'] = 'Not deleted';
	$labels['replied'] = 'Replied';
	$labels['forwarded'] = 'Forwarded';
	$labels['invert'] = 'Invert';
	$labels['filter'] = 'Filter';
	$labels['list'] = 'List';
	$labels['threads'] = 'Threads';
	$labels['expand-all'] = 'Expand All';
	$labels['expand-unread'] = 'Expand Unread';
	$labels['collapse-all'] = 'Collapse All';
	$labels['threaded'] = 'Threaded';

	$labels['autoexpand_threads'] = 'Expand message threads';
	$labels['do_expand'] = 'all threads';
	$labels['expand_only_unread'] = 'only with unread messages';
	$labels['fromto'] = 'From/To';
	$labels['flag'] = 'Flag';
	$labels['attachment'] = 'Attachment';
	$labels['nonesort'] = 'None';
	$labels['sentdate'] = 'Sent date';
	$labels['arrival'] = 'Arrival date';
	$labels['asc'] = 'ascending';
	$labels['desc'] = 'descending';
	$labels['listcolumns'] = 'List columns';
	$labels['listsorting'] = 'Sorting column';
	$labels['listorder'] = 'Sorting order';
	$labels['listmode'] = 'List view mode';

	$labels['folderactions'] = 'Folder actions...';
	$labels['compact'] = 'Compact';
	$labels['empty'] = 'Empty';
	$labels['importmessages'] = 'Import messages';

	$labels['quota'] = 'Disk usage';
	$labels['unknown'] = 'unknown';
	$labels['unlimited'] = 'unlimited';

	$labels['quicksearch'] = 'Quick search';
	$labels['resetsearch'] = 'Reset search';
	$labels['searchmod'] = 'Search modifiers';
	$labels['msgtext'] = 'Entire message';
	$labels['body'] = 'Body';
	$labels['type'] = 'Type';
	$labels['namex'] = 'Name';
	$labels['searchscope'] = 'Scope';
	$labels['currentfolder'] = 'Current folder';
	$labels['subfolders'] = 'This and subfolders';
	$labels['allfolders'] = 'All folders';

	$labels['openinextwin'] = 'Open in new window';
	$labels['emlsave'] = 'Download (.eml)';
	$labels['changeformattext'] = 'Display in plain text format';
	$labels['changeformathtml'] = 'Display in HTML format';

	// message compose
	$labels['editasnew'] = 'Edit as new';
	$labels['send'] = 'Send';
	$labels['sendmessage'] = 'Send message';
	$labels['savemessage'] = 'Save as draft';
	$labels['addattachment'] = 'Attach a file';
	$labels['charset'] = 'Charset';
	$labels['editortype'] = 'Editor type';
	$labels['returnreceipt'] = 'Return receipt';
	$labels['dsn'] = 'Delivery status notification';
	$labels['mailreplyintro'] = 'On $date, $sender wrote:';
	$labels['originalmessage'] = 'Original Message';
	$labels['selectimage'] = 'Select image';
	$labels['addimage'] = 'Add image';
	$labels['selectmedia'] = 'Select movie';
	$labels['addmedia'] = 'Add movie';

	$labels['editidents'] = 'Edit identities';
	$labels['spellcheck'] = 'Spell';
	$labels['checkspelling'] = 'Check spelling';
	$labels['resumeediting'] = 'Resume editing';
	$labels['revertto'] = 'Revert to';

	$labels['restore'] = 'Restore';
	$labels['restoremessage'] = 'Restore message?';

	$labels['responses'] = 'Responses';
	$labels['insertresponse'] = 'Insert a response';
	$labels['manageresponses'] = 'Manage responses';
	-$labels['savenewresponse'] = 'Save new response';
	-$labels['editresponses'] = 'Edit responses';
	+$labels['newresponse'] = 'Create new response';
	+$labels['addresponse'] = 'Add response';
	$labels['editresponse'] = 'Edit response';
	+$labels['editresponses'] = 'Edit responses';
	$labels['responsename'] = 'Name';
	$labels['responsetext'] = 'Response Text';

	$labels['attach'] = 'Attach';
	$labels['attachments'] = 'Attachments';
	$labels['upload'] = 'Upload';
	$labels['uploadprogress'] = '$percent ($current from $total)';
	$labels['close'] = 'Close';
	$labels['messageoptions'] = 'Message options...';
	$labels['togglecomposeoptions'] = 'Toggle composition options';

	$labels['low'] = 'Low';
	$labels['lowest'] = 'Lowest';
	$labels['normal'] = 'Normal';
	$labels['high'] = 'High';
	$labels['highest'] = 'Highest';

	$labels['nosubject'] = '(no subject)';
	$labels['showimages'] = 'Display images';
	$labels['alwaysshow'] = 'Always show images from $sender';
	$labels['isdraft'] = 'This is a draft message.';
	$labels['andnmore'] = '$nr more...';
	$labels['togglemoreheaders'] = 'Show more message headers';
	$labels['togglefullheaders'] = 'Toggle raw message headers';

	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'Plain text';
	$labels['savesentmessagein'] = 'Save sent message in';
	$labels['dontsave'] = 'don\'t save';
	$labels['maxuploadsize'] = 'Maximum allowed file size is $size';

	$labels['addcc'] = 'Add Cc';
	$labels['addbcc'] = 'Add Bcc';
	$labels['addreplyto'] = 'Add Reply-To';
	$labels['addfollowupto'] = 'Add Followup-To';

	// mdn
	$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
	$labels['receiptread'] = 'Return Receipt (read)';
	$labels['yourmessage'] = 'This is a Return Receipt for your message';
	$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';

	// address boook
	$labels['name'] = 'Display Name';
	$labels['firstname'] = 'First Name';
	$labels['surname'] = 'Last Name';
	$labels['middlename'] = 'Middle Name';
	$labels['nameprefix'] = 'Prefix';
	$labels['namesuffix'] = 'Suffix';
	$labels['nickname'] = 'Nickname';
	$labels['jobtitle'] = 'Job Title';
	$labels['department'] = 'Department';
	$labels['gender'] = 'Gender';
	$labels['maidenname'] = 'Maiden Name';
	$labels['email'] = 'Email';
	$labels['phone'] = 'Phone';
	$labels['address'] = 'Address';
	$labels['street'] = 'Street';
	$labels['locality'] = 'City';
	$labels['zipcode'] = 'ZIP Code';
	$labels['region'] = 'State/Province';
	$labels['country'] = 'Country';
	$labels['birthday'] = 'Birthday';
	$labels['anniversary'] = 'Anniversary';
	$labels['website'] = 'Website';
	$labels['instantmessenger'] = 'IM';
	$labels['notes'] = 'Notes';
	$labels['male'] = 'male';
	$labels['female'] = 'female';
	$labels['manager'] = 'Manager';
	$labels['assistant'] = 'Assistant';
	$labels['spouse'] = 'Spouse';
	$labels['allfields'] = 'All fields';
	$labels['search'] = 'Search';
	$labels['searchfor'] = 'Search for "$q"';
	$labels['advsearch'] = 'Advanced Search';
	$labels['advanced'] = 'Advanced';
	$labels['other'] = 'Other';

	$labels['typehome'] = 'Home';
	$labels['typework'] = 'Work';
	$labels['typeother'] = 'Other';
	$labels['typemobile'] = 'Mobile';
	$labels['typemain'] = 'Main';
	$labels['typehomefax'] = 'Home Fax';
	$labels['typeworkfax'] = 'Work Fax';
	$labels['typecar'] = 'Car';
	$labels['typepager'] = 'Pager';
	$labels['typevideo'] = 'Video';
	$labels['typeassistant'] = 'Assistant';
	$labels['typehomepage'] = 'Home Page';
	$labels['typeblog'] = 'Blog';
	$labels['typeprofile'] = 'Profile';

	$labels['addfield'] = 'Add field...';
	-$labels['addcontact'] = 'Add new contact';
	+$labels['addcontact'] = 'Add contact';
	$labels['editcontact'] = 'Edit contact';
	$labels['contacts'] = 'Contacts';
	$labels['contactproperties'] = 'Contact properties';
	$labels['contactnameandorg'] = 'Name and Organization';
	$labels['personalinfo'] = 'Personal information';
	$labels['contactphoto'] = 'Contact photo';

	$labels['edit'] = 'Edit';
	$labels['cancel'] = 'Cancel';
	$labels['save'] = 'Save';
	$labels['delete'] = 'Delete';
	$labels['rename'] = 'Rename';
	$labels['addphoto'] = 'Add';
	$labels['replacephoto'] = 'Replace';
	$labels['uploadphoto'] = 'Upload photo';

	-$labels['newcontact'] = 'Create new contact card';
	+$labels['newcontact'] = 'Create new contact';
	$labels['deletecontact'] = 'Delete selected contacts';
	$labels['composeto'] = 'Compose mail to';
	$labels['contactsfromto'] = 'Contacts $from to $to of $count';
	$labels['print'] = 'Print';
	$labels['export'] = 'Export';
	$labels['exportall'] = 'Export all';
	$labels['exportsel'] = 'Export selected';
	$labels['exportvcards'] = 'Export contacts in vCard format';
	-$labels['newcontactgroup'] = 'Create new contact group';
	+$labels['newgroup'] = 'Create new group';
	$labels['grouprename'] = 'Rename group';
	$labels['groupdelete'] = 'Delete group';
	$labels['groupremoveselected'] = 'Remove selected contacts from group';
	$labels['uponelevel'] = 'Up one level';

	$labels['previouspage'] = 'Show previous page';
	$labels['firstpage'] = 'Show first page';
	$labels['nextpage'] = 'Show next page';
	$labels['lastpage'] = 'Show last page';

	$labels['group'] = 'Group';
	$labels['groups'] = 'Groups';
	$labels['listgroup'] = 'List group members';
	$labels['personaladrbook'] = 'Personal Addresses';

	$labels['searchsave'] = 'Save search';
	$labels['searchdelete'] = 'Delete search';

	$labels['import'] = 'Import';
	$labels['importcontacts'] = 'Import contacts';
	$labels['importfromfile'] = 'Import from file:';
	$labels['importtarget'] = 'Add contacts to';
	$labels['importreplace'] = 'Replace the entire address book';
	$labels['importgroups'] = 'Import group assignments';
	$labels['importgroupsall'] = 'All (create groups if necessary)';
	$labels['importgroupsexisting'] = 'Only for existing groups';
	$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
	$labels['done'] = 'Done';

	// settings
	$labels['settingsfor'] = 'Settings for';
	$labels['about'] = 'About';
	$labels['preferences'] = 'Preferences';
	$labels['userpreferences'] = 'User preferences';
	$labels['editpreferences'] = 'Edit user preferences';

	$labels['identities'] = 'Identities';
	-$labels['manageidentities'] = 'Manage identities for this account';
	-$labels['newidentity'] = 'New identity';
	-
	-$labels['newitem'] = 'New item';
	-$labels['edititem'] = 'Edit item';
	+$labels['manageidentities'] = 'Manage identities';
	+$labels['newidentity'] = 'Create new identity';
	+$labels['addidentity'] = 'Add identity';
	+$labels['editidentity'] = 'Edit identity';

	$labels['preferhtml'] = 'Display HTML';
	$labels['defaultcharset'] = 'Default Character Set';
	$labels['htmlmessage'] = 'HTML Message';
	$labels['messagepart'] = 'Part';
	$labels['digitalsig'] = 'Digital Signature';
	$labels['dateformat'] = 'Date format';
	$labels['timeformat'] = 'Time format';
	$labels['prettydate'] = 'Pretty dates';
	$labels['setdefault'] = 'Set default';
	$labels['autodetect'] = 'Auto';
	$labels['language'] = 'Language';
	$labels['timezone'] = 'Time zone';
	$labels['pagesize'] = 'Rows per page';
	$labels['signature'] = 'Signature';
	$labels['dstactive'] = 'Daylight saving time';
	$labels['showinextwin'] = 'Open message in a new window';
	$labels['composeextwin'] = 'Compose in a new window';
	$labels['htmleditor'] = 'Compose HTML messages';
	$labels['htmlonreply'] = 'on reply to HTML message';
	$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
	$labels['htmlsignature'] = 'HTML signature';
	$labels['showemail'] = 'Show email address with display name';
	$labels['previewpane'] = 'Show preview pane';
	$labels['skin'] = 'Interface skin';
	$labels['logoutclear'] = 'Clear Trash on logout';
	$labels['logoutcompact'] = 'Compact Inbox on logout';
	$labels['uisettings'] = 'User Interface';
	$labels['serversettings'] = 'Server Settings';
	$labels['mailboxview'] = 'Mailbox View';
	$labels['mdnrequests'] = 'On request for return receipt';
	$labels['askuser'] = 'ask me';
	$labels['autosend'] = 'send receipt';
	$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
	$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
	$labels['ignore'] = 'ignore';
	$labels['readwhendeleted'] = 'Mark the message as read on delete';
	$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
	$labels['skipdeleted'] = 'Do not show deleted messages';
	$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
	$labels['deletejunk'] = 'Directly delete messages in Junk';
	$labels['showremoteimages'] = 'Display remote inline images';
	$labels['fromknownsenders'] = 'from known senders';
	$labels['always'] = 'always';
	$labels['showinlineimages'] = 'Display attached images below the message';
	$labels['autosavedraft'] = 'Automatically save draft';
	$labels['everynminutes'] = 'every $n minute(s)';
	$labels['refreshinterval'] = 'Refresh (check for new messages, etc.)';
	$labels['never'] = 'never';
	$labels['immediately'] = 'immediately';
	$labels['messagesdisplaying'] = 'Displaying Messages';
	$labels['messagescomposition'] = 'Composing Messages';
	$labels['mimeparamfolding'] = 'Attachment names';
	$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
	$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
	$labels['2047folding'] = 'Full RFC 2047 (other)';
	$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
	$labels['advancedoptions'] = 'Advanced options';
	$labels['toggleadvancedoptions'] = 'Toggle advanced options';
	$labels['focusonnewmessage'] = 'Focus browser window on new message';
	$labels['checkallfolders'] = 'Check all folders for new messages';
	$labels['displaynext'] = 'After message delete/move display the next message';
	$labels['defaultfont'] = 'Default font of HTML message';
	$labels['mainoptions'] = 'Main Options';
	$labels['browseroptions'] = 'Browser Options';
	$labels['section'] = 'Section';
	$labels['maintenance'] = 'Maintenance';
	$labels['newmessage'] = 'New Message';
	$labels['signatureoptions'] = 'Signature Options';
	$labels['whenreplying'] = 'When replying';
	$labels['replyempty'] = 'do not quote the original message';
	$labels['replytopposting'] = 'start new message above the quote';
	$labels['replybottomposting'] = 'start new message below the quote';
	$labels['replyremovesignature'] = 'When replying remove original signature from message';
	$labels['autoaddsignature'] = 'Automatically add signature';
	$labels['newmessageonly'] = 'new message only';
	$labels['replyandforwardonly'] = 'replies and forwards only';
	$labels['insertsignature'] = 'Insert signature';
	$labels['previewpanemarkread'] = 'Mark previewed messages as read';
	$labels['afternseconds'] = 'after $n seconds';
	$labels['reqmdn'] = 'Always request a return receipt';
	$labels['reqdsn'] = 'Always request a delivery status notification';
	$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
	$labels['defaultabook'] = 'Default address book';
	$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
	$labels['listnamedisplay'] = 'List contacts as';
	$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
	$labels['spellcheckoptions'] = 'Spellcheck Options';
	$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
	$labels['spellcheckignorenums'] = 'Ignore words with numbers';
	$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
	$labels['addtodict'] = 'Add to dictionary';
	$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
	$labels['standardwindows'] = 'Handle popups as standard windows';
	$labels['forwardmode'] = 'Messages forwarding';
	$labels['inline'] = 'inline';
	$labels['asattachment'] = 'as attachment';
	$labels['replyallmode'] = 'Default action of [Reply all] button';
	$labels['replyalldefault'] = 'reply to all';
	$labels['replyalllist'] = 'reply to mailing list only (if found)';

	$labels['folder'] = 'Folder';
	$labels['folders'] = 'Folders';
	$labels['foldername'] = 'Folder name';
	$labels['subscribed'] = 'Subscribed';
	$labels['messagecount'] = 'Messages';
	$labels['create'] = 'Create';
	$labels['createfolder'] = 'Create new folder';
	$labels['managefolders'] = 'Manage folders';
	$labels['specialfolders'] = 'Special Folders';
	$labels['properties'] = 'Properties';
	$labels['folderproperties'] = 'Folder properties';
	$labels['parentfolder'] = 'Parent folder';
	$labels['location'] = 'Location';
	$labels['info'] = 'Information';
	$labels['getfoldersize'] = 'Click to get folder size';
	$labels['changesubscription'] = 'Click to change subscription';
	$labels['foldertype'] = 'Folder Type';
	$labels['personalfolder'] = 'Private Folder';
	$labels['otherfolder'] = 'Other User\'s Folder';
	$labels['sharedfolder'] = 'Public Folder';

	$labels['sortby'] = 'Sort by';
	$labels['sortasc'] = 'Sort ascending';
	$labels['sortdesc'] = 'Sort descending';
	$labels['undo'] = 'Undo';

	$labels['installedplugins'] = 'Installed plugins';
	$labels['plugin'] = 'Plugin';
	$labels['version'] = 'Version';
	$labels['source'] = 'Source';
	$labels['license'] = 'License';
	$labels['support'] = 'Get support';

	// units
	$labels['B'] = 'B';
	$labels['KB'] = 'KB';
	$labels['MB'] = 'MB';
	$labels['GB'] = 'GB';

	// character sets
	$labels['unicode'] = 'Unicode';
	$labels['english'] = 'English';
	$labels['westerneuropean'] = 'Western European';
	$labels['easterneuropean'] = 'Eastern European';
	$labels['southeasterneuropean'] = 'South-Eastern European';
	$labels['baltic'] = 'Baltic';
	$labels['cyrillic'] = 'Cyrillic';
	$labels['arabic'] = 'Arabic';
	$labels['greek'] = 'Greek';
	$labels['hebrew'] = 'Hebrew';
	$labels['turkish'] = 'Turkish';
	$labels['nordic'] = 'Nordic';
	$labels['thai'] = 'Thai';
	$labels['celtic'] = 'Celtic';
	$labels['vietnamese'] = 'Vietnamese';
	$labels['japanese'] = 'Japanese';
	$labels['korean'] = 'Korean';
	$labels['chinese'] = 'Chinese';

	// accessibility (voice-only) headings and descriptions
	$labels['arialabeltopnav'] = 'Window control';
	$labels['arialabeltasknav'] = 'Application tasks';
	$labels['arialabeltoolbar'] = 'Application toolbar';
	$labels['arialabelactivetask'] = 'Active task';
	$labels['arialabelmessagessearchfilter'] = 'Email listing filter';
	$labels['arialabelmailsearchform'] = 'Email message search form';
	$labels['arialabelcontactsearchform'] = 'Contacts search form';
	$labels['arialabelmailquicksearchbox'] = 'Email search input';
	$labels['arialabelquicksearchbox'] = 'Search input';
	$labels['arialabelfolderlist'] = 'Email folder selection';
	$labels['arialabelmessagelist'] = 'Email Messages Listing';
	$labels['arialabelmailpreviewframe'] = 'Message preview';
	$labels['arialabelmailboxmenu'] = 'Folder actions menu';
	$labels['arialabellistselectmenu'] = 'List selection menu';
	$labels['arialabelthreadselectmenu'] = 'Threads listing menu';
	$labels['arialabelmessagelistoptions'] = 'Message list display and sorting options';
	$labels['arialabelmailimportdialog'] = 'Message import dialog';
	$labels['arialabelmessagenav'] = 'Message navigation';
	$labels['arialabelmessagebody'] = 'Message Body';
	$labels['arialabelmessageactions'] = 'Message actions';
	$labels['arialabelcontactquicksearch'] = 'Contacts search form';
	$labels['arialabelcontactsearchbox'] = 'Contact search input';
	$labels['arialabelmessageheaders'] = 'Message headers';
	$labels['arialabelforwardingoptions'] = 'Forwarding options';
	$labels['arialabelreplyalloptions'] = 'Reply-all options';
	$labels['arialabelmoremessageactions'] = 'More message actions';
	$labels['arialabelmarkmessagesas'] = 'Mark selected messages as...';
	$labels['arialabelcomposeoptions'] = 'Composition options';
	$labels['arialabelresponsesmenu'] = 'Canned responses menu';
	$labels['arialabelattachmentuploadform'] = 'Attachment upload form';
	$labels['arialabelattachmentpreview'] = 'Attachment preview';
	$labels['ariasummarycomposecontacts'] = 'List of contacts and groups to select as recipients';
	$labels['arialabelcontactexportoptions'] = 'Contact export options';
	$labels['arialabelabookgroupoptions'] = 'Addressbook/group options';
	$labels['arialabelpreferencesform'] = 'Preferences form';
	$labels['arialabelidentityeditfrom'] = 'Identity edit form';
	$labels['arialabelresonseeditfrom'] = 'Response edit form';

	$labels['helplistnavigation'] = 'List keyboard navigation';
	$labels['helplistkeyboardnavigation'] = "Arrows up/down: Move row focus/selection.
	Space: Select focused row.
	Shift + up/down: Select additional row above/below.
	Ctrl + Space: Add focused row to selection/remove from selection.";
	$labels['helplistkeyboardnavmessages'] = "Arrows right/left: expand/collapse message thread (in threads mode only).
	Enter: Open the selected/focused message.
	Delete: Move selected messages to Trash.";
	$labels['helplistkeyboardnavcontacts'] = "Enter: Open the selected/focused contact.";

	?>
	diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
	index 0fc753056..27d26791b 100644
	--- a/program/steps/addressbook/edit.inc
	+++ b/program/steps/addressbook/edit.inc
	@@ -1,313 +1,315 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/edit.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2013, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Show edit form for a contact entry or to add a new one \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	if ($RCMAIL->action == 'edit') {
	// Get contact ID and source ID from request
	$cids = rcmail_get_cids();
	$source = key($cids);
	$cid = array_shift($cids[$source]);

	// Initialize addressbook
	$CONTACTS = rcmail_contact_source($source, true);

	// Contact edit
	if ($cid && ($record = $CONTACTS->get_record($cid, true))) {
	$OUTPUT->set_env('cid', $record['ID']);
	}

	// editing not allowed here
	if ($CONTACTS->readonly \|\| $record['readonly']) {
	$OUTPUT->show_message('sourceisreadonly');
	$RCMAIL->overwrite_action('show');
	return;
	}
	}
	else {
	$source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);

	if (strlen($source)) {
	$CONTACTS = $RCMAIL->get_address_book($source, true);
	}

	if (!$CONTACTS \|\| $CONTACTS->readonly) {
	$CONTACTS = $RCMAIL->get_address_book(-1, true);
	$source = $RCMAIL->get_address_book_id($CONTACTS);
	}

	// Initialize addressbook
	$CONTACTS = rcmail_contact_source($source, true);
	}

	$SOURCE_ID = $source;
	rcmail_set_sourcename($CONTACTS);


	$OUTPUT->add_handlers(array(
	'contactedithead' => 'rcmail_contact_edithead',
	'contacteditform' => 'rcmail_contact_editform',
	'contactphoto' => 'rcmail_contact_photo',
	'photouploadform' => 'rcmail_upload_photo_form',
	'sourceselector' => 'rcmail_source_selector',
	'filedroparea' => 'rcmail_photo_drop_area',
	));

	+$OUTPUT->set_pagetitle($RCMAIL->gettext(($RCMAIL->action == 'add' ? 'addcontact' : 'editcontact')));
	+
	if ($RCMAIL->action == 'add' && $OUTPUT->template_exists('contactadd')) {
	$OUTPUT->send('contactadd');
	}

	// this will be executed if no template for addcontact exists
	$OUTPUT->send('contactedit');



	function rcmail_get_edit_record()
	{
	global $RCMAIL, $CONTACTS;

	// check if we have a valid result
	if ($GLOBALS['EDIT_RECORD']) {
	$record = $GLOBALS['EDIT_RECORD'];
	}
	else if ($RCMAIL->action != 'add'
	&& !(($result = $CONTACTS->get_result()) && ($record = $result->first()))
	) {
	$RCMAIL->output->show_message('contactnotfound', 'error');
	return false;
	}

	return $record;
	}

	function rcmail_contact_edithead($attrib)
	{
	global $RCMAIL;

	// check if we have a valid result
	$record = rcmail_get_edit_record();
	$i_size = !empty($attrib['size']) ? $attrib['size'] : 20;

	$form = array(
	'head' => array(
	'name' => $RCMAIL->gettext('contactnameandorg'),
	'content' => array(
	'prefix' => array('size' => $i_size),
	'firstname' => array('size' => $i_size, 'visible' => true),
	'middlename' => array('size' => $i_size),
	'surname' => array('size' => $i_size, 'visible' => true),
	'suffix' => array('size' => $i_size),
	'name' => array('size' => 2*$i_size),
	'nickname' => array('size' => 2*$i_size),
	'organization' => array('size' => 2*$i_size),
	'department' => array('size' => 2*$i_size),
	'jobtitle' => array('size' => 2*$i_size),
	)
	)
	);

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

	// return the address edit form
	$out = rcmail_contact_form($form, $record, $attrib);

	return $form_start . $out . $form_end;
	}

	function rcmail_contact_editform($attrib)
	{
	global $RCMAIL, $CONTACT_COLTYPES;

	$record = rcmail_get_edit_record();

	// copy (parsed) address template to client
	if (preg_match_all('/\{([a-z0-9]+)\}([^{]*)/i', $RCMAIL->config->get('address_template', ''), $templ, PREG_SET_ORDER))
	$RCMAIL->output->set_env('address_template', $templ);

	$i_size = !empty($attrib['size']) ? $attrib['size'] : 40;
	$t_rows = !empty($attrib['textarearows']) ? $attrib['textarearows'] : 10;
	$t_cols = !empty($attrib['textareacols']) ? $attrib['textareacols'] : 40;

	$form = array(
	'contact' => array(
	'name' => $RCMAIL->gettext('properties'),
	'content' => array(
	'email' => array('size' => $i_size, 'visible' => true),
	'phone' => array('size' => $i_size, 'visible' => true),
	'address' => array('visible' => true),
	'website' => array('size' => $i_size),
	'im' => array('size' => $i_size),
	),
	),
	'personal' => array(
	'name' => $RCMAIL->gettext('personalinfo'),
	'content' => array(
	'gender' => array('visible' => true),
	'maidenname' => array('size' => $i_size),
	'birthday' => array('visible' => true),
	'anniversary' => array(),
	'manager' => array('size' => $i_size),
	'assistant' => array('size' => $i_size),
	'spouse' => array('size' => $i_size),
	),
	),
	);

	if (isset($CONTACT_COLTYPES['notes'])) {
	$form['notes'] = array(
	'name' => $RCMAIL->gettext('notes'),
	'content' => array(
	'notes' => array('size' => $t_cols, 'rows' => $t_rows, 'label' => false, 'visible' => true, 'limit' => 1),
	),
	'single' => true,
	);
	}

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

	// return the complete address edit form as table
	$out = rcmail_contact_form($form, $record, $attrib);

	return $form_start . $out . $form_end;
	}

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

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

	// find max filesize value
	$max_filesize = parse_bytes(ini_get('upload_max_filesize'));
	$max_postsize = parse_bytes(ini_get('post_max_size'));

	if ($max_postsize && $max_postsize < $max_filesize) {
	$max_filesize = $max_postsize;
	}
	$max_filesize = $RCMAIL->show_bytes($max_filesize);

	$hidden = new html_hiddenfield(array('name' => '_cid', 'value' => $GLOBALS['cid']));
	$input = new html_inputfield(array('type' => 'file', 'name' => '_photo', 'size' => $attrib['size']));
	$button = new html_inputfield(array('type' => 'button'));

	$content = $hidden->show() . html::div(null, $input->show())
	. html::div('hint', $RCMAIL->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))));

	if (rcube_utils::get_boolean($attrib['buttons'])) {
	$content .= html::div('buttons',
	$button->show($RCMAIL->gettext('close'), array(
	'class' => 'button',
	'onclick' => "$('#$attrib[id]').hide()"
	))
	. ' ' .
	$button->show($RCMAIL->gettext('upload'), array(
	'class' => 'button mainaction',
	'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('upload-photo', this.form)"
	))
	);
	}

	$out = html::div($attrib,
	$OUTPUT->form_tag(array(
	'id' => $attrib['id'] . 'Frm',
	'name' => 'uploadform',
	'method' => 'post',
	'enctype' => 'multipart/form-data'
	),
	$content
	)
	);

	$OUTPUT->add_label('addphoto','replacephoto');
	$OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');

	return $out;
	}

	// similar function as in /steps/settings/edit_identity.inc
	function get_form_tags($attrib)
	{
	global $CONTACTS, $EDIT_FORM, $RCMAIL, $SOURCE_ID;

	$form_start = $form_end = '';

	if (empty($EDIT_FORM)) {
	$hiddenfields = new html_hiddenfield();

	if ($RCMAIL->action == 'edit')
	$hiddenfields->add(array('name' => '_source', 'value' => $SOURCE_ID));
	$hiddenfields->add(array('name' => '_gid', 'value' => $CONTACTS->group_id));

	if (($result = $CONTACTS->get_result()) && ($record = $result->first()))
	$hiddenfields->add(array('name' => '_cid', 'value' => $record['ID']));

	$form_start = $RCMAIL->output->request_form(array(
	'name' => "form", 'method' => "post",
	'task' => $RCMAIL->task, 'action' => 'save',
	'request' => 'save.'.intval($record['ID']),
	'noclose' => true) + $attrib, $hiddenfields->show());
	$form_end = !strlen($attrib['form']) ? '</form>' : '';

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

	return array($form_start, $form_end);
	}

	function rcmail_source_selector($attrib)
	{
	global $RCMAIL, $SOURCE_ID;

	$sources_list = $RCMAIL->get_address_sources(true, true);

	if (count($sources_list) < 2) {
	$source = $sources_list[$SOURCE_ID];
	$hiddenfield = new html_hiddenfield(array('name' => '_source', 'value' => $SOURCE_ID));
	return html::span($attrib, $source['name'] . $hiddenfield->show());
	}

	$attrib['name'] = '_source';
	$attrib['is_escaped'] = true;
	$attrib['onchange'] = rcmail_output::JS_OBJECT_NAME . ".command('save', 'reload', this.form)";

	$select = new html_select($attrib);

	foreach ($sources_list as $source)
	$select->add($source['name'], $source['id']);

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


	/**
	* Register container as active area to drop photos onto
	*/
	function rcmail_photo_drop_area($attrib)
	{
	global $OUTPUT;

	if ($attrib['id']) {
	$OUTPUT->add_gui_object('filedrop', $attrib['id']);
	$OUTPUT->set_env('filedrop', array('action' => 'upload-photo', 'fieldname' => '_photo', 'single' => 1, 'filter' => '^image/.+'));
	}
	}
	diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
	index e43a7bb60..20f822027 100644
	--- a/program/steps/settings/edit_identity.inc
	+++ b/program/steps/settings/edit_identity.inc
	@@ -1,180 +1,180 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/edit_identity.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2013, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Show edit form for a identity record or to add a new one \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	define('IDENTITIES_LEVEL', intval($RCMAIL->config->get('identities_level', 0)));

	// edit-identity
	if (($_GET['_iid'] \|\| $_POST['_iid']) && $RCMAIL->action=='edit-identity') {
	$id = rcube_utils::get_input_value('_iid', rcube_utils::INPUT_GPC);
	$IDENTITY_RECORD = $RCMAIL->user->get_identity($id);

	if (is_array($IDENTITY_RECORD)) {
	$OUTPUT->set_env('iid', $IDENTITY_RECORD['identity_id']);
	}
	else {
	$OUTPUT->show_message('dberror', 'error');
	// go to identities page
	$RCMAIL->overwrite_action('identities');
	return;
	}
	}
	// add-identity
	else {
	if (IDENTITIES_LEVEL > 1) {
	$OUTPUT->show_message('opnotpermitted', 'error');
	// go to identities page
	$RCMAIL->overwrite_action('identities');
	return;
	}
	else if (IDENTITIES_LEVEL == 1) {
	$IDENTITY_RECORD['email'] = $RCMAIL->get_user_email();
	}
	}

	$OUTPUT->include_script('list.js');
	$OUTPUT->add_handler('identityform', 'rcube_identity_form');
	$OUTPUT->set_env('identities_level', IDENTITIES_LEVEL);
	$OUTPUT->add_label('deleteidentityconfirm');

	-$OUTPUT->set_pagetitle($RCMAIL->gettext(($RCMAIL->action == 'add-identity' ? 'newidentity' : 'edititem')));
	+$OUTPUT->set_pagetitle($RCMAIL->gettext(($RCMAIL->action == 'add-identity' ? 'addidentity' : 'editidentity')));

	if ($RCMAIL->action == 'add-identity' && $OUTPUT->template_exists('identityadd')) {
	$OUTPUT->send('identityadd');
	}

	$OUTPUT->send('identityedit');


	function rcube_identity_form($attrib)
	{
	global $IDENTITY_RECORD, $RCMAIL, $OUTPUT;

	// Add HTML editor script(s)
	$RCMAIL->html_editor('identity');

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

	$i_size = !empty($attrib['size']) ? $attrib['size'] : 40;
	$t_rows = !empty($attrib['textarearows']) ? $attrib['textarearows'] : 6;
	$t_cols = !empty($attrib['textareacols']) ? $attrib['textareacols'] : 40;

	// list of available cols
	$form = array(
	'addressing' => array(
	'name' => $RCMAIL->gettext('settings'),
	'content' => array(
	'name' => array('type' => 'text', 'size' => $i_size),
	'email' => array('type' => 'text', 'size' => $i_size),
	'organization' => array('type' => 'text', 'size' => $i_size),
	'reply-to' => array('type' => 'text', 'size' => $i_size),
	'bcc' => array('type' => 'text', 'size' => $i_size),
	'standard' => array('type' => 'checkbox', 'label' => $RCMAIL->gettext('setdefault')),
	)),
	'signature' => array(
	'name' => $RCMAIL->gettext('signature'),
	'content' => array(
	'signature' => array('type' => 'textarea', 'size' => $t_cols, 'rows' => $t_rows,
	'spellcheck' => true),
	'html_signature' => array('type' => 'checkbox',
	'label' => $RCMAIL->gettext('htmlsignature'),
	'onclick' => 'return rcmail.command(\'toggle-editor\', {id: \'rcmfd_signature\', html: this.checked}, \'\', event)'),
	))
	);

	// Enable TinyMCE editor
	if ($IDENTITY_RECORD['html_signature']) {
	$form['signature']['content']['signature']['class'] = 'mce_editor';
	$form['signature']['content']['signature']['is_escaped'] = true;

	// Correctly handle HTML entities in HTML editor (#1488483)
	$IDENTITY_RECORD['signature'] = htmlspecialchars($IDENTITY_RECORD['signature'], ENT_NOQUOTES, RCUBE_CHARSET);
	}

	// disable some field according to access level
	if (IDENTITIES_LEVEL == 1 \|\| IDENTITIES_LEVEL == 3) {
	$form['addressing']['content']['email']['disabled'] = true;
	$form['addressing']['content']['email']['class'] = 'disabled';
	}

	if (IDENTITIES_LEVEL == 4) {
	foreach($form['addressing']['content'] as $formfield => $value){
	$form['addressing']['content'][$formfield]['disabled'] = true;
	$form['addressing']['content'][$formfield]['class'] = 'disabled';
	}
	}

	$IDENTITY_RECORD['email'] = rcube_utils::idn_to_utf8($IDENTITY_RECORD['email']);

	// Allow plugins to modify identity form content
	$plugin = $RCMAIL->plugins->exec_hook('identity_form', array(
	'form' => $form, 'record' => $IDENTITY_RECORD));

	$form = $plugin['form'];
	$IDENTITY_RECORD = $plugin['record'];

	// Set form tags and hidden fields
	list($form_start, $form_end) = get_form_tags($attrib, 'save-identity',
	intval($IDENTITY_RECORD['identity_id']),
	array('name' => '_iid', 'value' => $IDENTITY_RECORD['identity_id']));

	unset($plugin);
	unset($attrib['form'], $attrib['id']);

	// return the complete edit form as table
	$out = "$form_start\n";

	foreach ($form as $fieldset) {
	if (empty($fieldset['content'])) {
	continue;
	}

	$content = '';
	if (is_array($fieldset['content'])) {
	$table = new html_table(array('cols' => 2));

	foreach ($fieldset['content'] as $col => $colprop) {
	$colprop['id'] = 'rcmfd_'.$col;

	$label = !empty($colprop['label']) ? $colprop['label'] :
	$RCMAIL->gettext(str_replace('-', '', $col));

	$value = !empty($colprop['value']) ? $colprop['value'] :
	rcube_output::get_edit_field($col, $IDENTITY_RECORD[$col], $colprop, $colprop['type']);

	$table->add('title', html::label($colprop['id'], rcube::Q($label)));
	$table->add(null, $value);
	}

	$content = $table->show($attrib);
	}
	else {
	$content = $fieldset['content'];
	}

	$content = html::tag('legend', null, rcube::Q($fieldset['name'])) . $content;
	$out .= html::tag('fieldset', null, $content) . "\n";
	}

	$out .= $form_end;

	return $out;
	}
	diff --git a/program/steps/settings/edit_response.inc b/program/steps/settings/edit_response.inc
	index 6d3c3dc41..10dec1096 100644
	--- a/program/steps/settings/edit_response.inc
	+++ b/program/steps/settings/edit_response.inc
	@@ -1,108 +1,108 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/edit_response.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2013, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Show edit form for a canned response record or to add a new one \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$responses = $RCMAIL->get_compose_responses();

	// edit-response
	if (($key = rcube_utils::get_input_value('_key', rcube_utils::INPUT_GPC))) {
	foreach ($responses as $i => $response) {
	if ($response['key'] == $key) {
	$RESPONSE_RECORD = $response;
	$RESPONSE_RECORD['index'] = $i;
	break;
	}
	}
	}

	// save response
	if ($RCMAIL->action == 'save-response' && isset($_POST['_name']) && !$RESPONSE_RECORD['static']) {
	$name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST));
	$text = trim(rcube_utils::get_input_value('_text', rcube_utils::INPUT_POST, true));

	if (!empty($name) && !empty($text)) {
	$dupes = 0;
	foreach ($responses as $i => $resp) {
	if ($RESPONSE_RECORD && $RESPONSE_RECORD['index'] === $i)
	continue;
	if (strcasecmp($name, preg_replace('/\s$\d+$$/', '', $resp['name'])) == 0)
	$dupes++;
	}
	if ($dupes) { // require a unique name
	$name .= ' (' . ++$dupes . ')';
	}

	$response = array('name' => $name, 'text' => $text, 'format' => 'text', 'key' => substr(md5($name), 0, 16));
	if ($RESPONSE_RECORD && $responses[$RESPONSE_RECORD['index']]) {
	$responses[$RESPONSE_RECORD['index']] = $response;
	}
	else {
	$responses[] = $response;
	}

	$responses = array_filter($responses, function($item){ return empty($item['static']); });
	if ($RCMAIL->user->save_prefs(array('compose_responses' => array_values($responses)))) {
	$RCMAIL->output->show_message('successfullysaved', 'confirmation');
	$RCMAIL->output->command('parent.update_response_row', $response, $key);
	$RCMAIL->overwrite_action('edit-response');
	$RESPONSE_RECORD = $response;
	}
	}
	else {
	$RCMAIL->output->show_message('formincomplete', 'error');
	}
	}

	$OUTPUT->set_env('readonly', !empty($RESPONSE_RECORD['static']));
	$OUTPUT->add_handler('responseform', 'rcube_response_form');
	-$OUTPUT->set_pagetitle($RCMAIL->gettext($RCMAIL->action == 'add-response' ? 'savenewresponse' : 'editresponse'));
	+$OUTPUT->set_pagetitle($RCMAIL->gettext($RCMAIL->action == 'add-response' ? 'addresponse' : 'editresponse'));

	$OUTPUT->send('responseedit');


	function rcube_response_form($attrib)
	{
	global $RCMAIL, $OUTPUT, $RESPONSE_RECORD;

	// Set form tags and hidden fields
	$disabled = !empty($RESPONSE_RECORD['static']);
	$key = $RESPONSE_RECORD['key'];
	list($form_start, $form_end) = get_form_tags($attrib, 'save-response', $key, array('name' => '_key', 'value' => $key));
	unset($attrib['form'], $attrib['id']);

	// return the complete edit form as table
	$out = "$form_start\n";

	$table = new html_table(array('cols' => 2));
	$label = $RCMAIL->gettext('responsename');

	$table->add('title', html::label('ffname', rcube::Q($RCMAIL->gettext('responsename'))));
	$table->add(null, rcube_output::get_edit_field('name', $RESPONSE_RECORD['name'],
	array('id' => 'ffname', 'size' => $attrib['size'], 'disabled' => $disabled), 'text'));

	$table->add('title', html::label('fftext', rcube::Q($RCMAIL->gettext('responsetext'))));
	$table->add(null, rcube_output::get_edit_field('text', $RESPONSE_RECORD['text'],
	array('id' => 'fftext', 'size' => $attrib['textareacols'], 'rows' => $attrib['textarearows'], 'disabled' => $disabled), 'textarea'));

	$out .= $table->show($attrib);
	$out .= $form_end;

	return $out;
	}
	diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
	index 8f9cf090f..89103ee44 100644
	--- a/program/steps/settings/func.inc
	+++ b/program/steps/settings/func.inc
	@@ -1,1379 +1,1379 @@
	<?php

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

	if (!$OUTPUT->ajax_call) {
	$OUTPUT->set_pagetitle($RCMAIL->gettext('preferences'));
	}

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

	// register action aliases
	$RCMAIL->register_action_map(array(
	'folders' => 'folders.inc',
	'rename-folder' => 'folders.inc',
	'delete-folder' => 'folders.inc',
	'subscribe' => 'folders.inc',
	'unsubscribe' => 'folders.inc',
	'purge' => 'folders.inc',
	'folder-size' => 'folders.inc',
	'add-identity' => 'edit_identity.inc',
	'add-response' => 'edit_response.inc',
	'save-response' => 'edit_response.inc',
	'delete-response' => 'responses.inc',
	));


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

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

	return $OUTPUT->frame($attrib, true);
	}


	function rcmail_sections_list($attrib)
	{
	global $RCMAIL;

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

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

	// create XHTML table
	$out = $RCMAIL->table_output($attrib, $list, $cols, 'id');

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

	return $out;
	}


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

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

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

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

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

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

	return $out;
	}


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

	$form_start = $form_end = '';

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

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

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

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

	return array($form_start, $form_end);
	}


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

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

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

	$sections = $plugin['list'];
	$config = $RCMAIL->config->all();
	$no_override = array_flip((array)$RCMAIL->config->get('dont_override'));

	foreach ($sections as $idx => $sect) {
	if ($current && $sect['id'] != $current) {
	continue;
	}

	$blocks = array();

	switch ($sect['id']) {

	// general
	case 'general':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'skin' => array('name' => rcube::Q($RCMAIL->gettext('skin'))),
	'browser' => array('name' => rcube::Q($RCMAIL->gettext('browseroptions'))),
	'advanced'=> array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	// language selection
	if (!isset($no_override['language'])) {
	if (!$current) {
	continue 2;
	}

	$a_lang = $RCMAIL->list_languages();
	asort($a_lang);

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

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

	// timezone selection
	if (!isset($no_override['timezone'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_timezone';
	$select = new html_select(array('name' => '_timezone', 'id' => $field_id));
	$select->add($RCMAIL->gettext('autodetect'), 'auto');

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

	ksort($zones);

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

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

	// date/time formatting
	if (!isset($no_override['time_format'])) {
	if (!$current) {
	continue 2;
	}

	$reftime = mktime(7,30,0);
	$defaults = array('G:i', 'H:i', 'g:i a', 'h:i A');
	$formats = (array)$RCMAIL->config->get('time_formats', $defaults);
	$field_id = 'rcmfd_time_format';
	$select = new html_select(array('name' => '_time_format', 'id' => $field_id));

	foreach ($formats as $choice) {
	$select->add(date($choice, $reftime), $choice);
	}

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

	if (!isset($no_override['date_format'])) {
	if (!$current) {
	continue 2;
	}

	$refdate = mktime(12,30,0,7,24);
	$defaults = array('Y-m-d','d-m-Y','Y/m/d','m/d/Y','d/m/Y','d.m.Y','j.n.Y');
	$formats = (array)$RCMAIL->config->get('date_formats', $defaults);
	$field_id = 'rcmfd_date_format';
	$select = new html_select(array('name' => '_date_format', 'id' => $field_id));

	foreach ($formats as $choice) {
	$select->add(date($choice, $refdate), $choice);
	}

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

	// Show checkbox for toggling 'pretty dates'
	if (!isset($no_override['prettydate'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_prettydate';
	$input = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));

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

	if (!isset($no_override['refresh_interval'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_refresh_interval';
	$select = new html_select(array('name' => '_refresh_interval', 'id' => $field_id));

	$select->add($RCMAIL->gettext('never'), 0);
	foreach (array(1, 3, 5, 10, 15, 30, 60) as $min) {
	if (!$config['min_refresh_interval'] \|\| $config['min_refresh_interval'] <= $min * 60) {
	$label = $RCMAIL->gettext(array('name' => 'everynminutes', 'vars' => array('n' => $min)));
	$select->add($label, $min);
	}
	}

	$blocks['main']['options']['refresh_interval'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('refreshinterval'))),
	'content' => $select->show($config['refresh_interval']/60),
	);
	}

	// show drop-down for available skins
	if (!isset($no_override['skin'])) {
	if (!$current) {
	continue 2;
	}

	$skins = rcmail_get_skins();

	if (count($skins) > 1) {
	$field_id = 'rcmfd_skin';
	$input = new html_radiobutton(array('name'=>'_skin'));

	foreach ($skins as $skin) {
	$thumbnail = "./skins/$skin/thumbnail.png";
	if (!is_file($thumbnail))
	$thumbnail = './program/resources/blank.gif';

	$skinname = ucfirst($skin);
	$author_link = $license_link = '';
	$meta = @json_decode(@file_get_contents("./skins/$skin/meta.json"), true);

	if (is_array($meta) && $meta['name']) {
	$skinname = $meta['name'];
	$author_link = $meta['url'] ? html::a(array('href' => $meta['url'], 'target' => '_blank'), rcube::Q($meta['author'])) : rcube::Q($meta['author']);
	$license_link = $meta['license-url'] ? html::a(array('href' => $meta['license-url'], 'target' => '_blank', 'tabindex' => '-1'), rcube::Q($meta['license'])) : rcube::Q($meta['license']);
	}

	$skinnames[] = mb_strtolower($skinname);
	$blocks['skin']['options'][$skin]['content'] = html::label(array('class' => 'skinselection'),
	html::span('skinitem', $input->show($config['skin'], array('value' => $skin, 'id' => $field_id.$skin))) .
	html::span('skinitem', html::img(array('src' => $thumbnail, 'class' => 'skinthumbnail', 'alt' => $skin, 'width' => 64, 'height' => 64))) .
	html::span('skinitem', html::span('skinname', rcube::Q($skinname)) . html::br() .
	html::span('skinauthor', $author_link ? 'by ' . $author_link : '') . html::br() .
	html::span('skinlicense', $license_link ? $RCMAIL->gettext('license').': ' . $license_link : ''))
	);
	}
	array_multisort($blocks['skin']['options'], SORT_ASC, SORT_STRING, $skinnames);
	}
	}

	// standard_windows option decides if new windows should be
	// opened as popups or standard windows (which can be handled by browsers as tabs)
	if (!isset($no_override['standard_windows'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_standard_windows';
	$checkbox = new html_checkbox(array('name' => '_standard_windows', 'id' => $field_id, 'value' => 1));

	$blocks['browser']['options']['standard_windows'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('standardwindows'))),
	'content' => $checkbox->show($config['standard_windows']?1:0),
	);
	}

	if ($current) {
	$product_name = $RCMAIL->config->get('product_name', 'Roundcube Webmail');
	$RCMAIL->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');",
	rcmail_output::JS_OBJECT_NAME, rcube::JQ($product_name)), 'docready');
	}

	$blocks['browser']['options']['mailtoprotohandler'] = array(
	'content' => html::a(array(
	'href' => '#',
	'id' => 'mailtoprotohandler'
	),
	rcube::Q($RCMAIL->gettext('mailtoprotohandler'))) .
	html::span('mailtoprotohandler-status', ''),
	);

	break;

	// Mailbox view (mail screen)
	case 'mailbox':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'new_message' => array('name' => rcube::Q($RCMAIL->gettext('newmessage'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	// show config parameter for preview pane
	if (!isset($no_override['preview_pane'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_preview';
	$input = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1,
	'onchange' => "$('#rcmfd_preview_pane_mark_read').prop('disabled', !this.checked)"));

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

	// show config parameter for preview pane auto mark as read delay
	if (!isset($no_override['preview_pane_mark_read'])) {
	if (!$current) {
	continue 2;
	}

	// apply default if config option is not set at all
	$config['preview_pane_mark_read'] = $RCMAIL->config->get('preview_pane_mark_read', 0);

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

	$select->add($RCMAIL->gettext('never'), '-1');
	$select->add($RCMAIL->gettext('immediately'), 0);

	foreach (array(5, 10, 20, 30) as $sec) {
	$label = $RCMAIL->gettext(array('name' => 'afternseconds', 'vars' => array('n' => $sec)));
	$select->add($label, $sec);
	}

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

	if (!isset($no_override['mdn_requests'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_mdn_requests';
	$select = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
	$select->add($RCMAIL->gettext('askuser'), 0);
	$select->add($RCMAIL->gettext('autosend'), 1);
	$select->add($RCMAIL->gettext('autosendknown'), 3);
	$select->add($RCMAIL->gettext('autosendknownignore'), 4);
	$select->add($RCMAIL->gettext('ignore'), 2);

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

	if (!isset($no_override['autoexpand_threads'])) {
	if (!$current) {
	continue 2;
	}

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

	if ($supported) {
	$field_id = 'rcmfd_autoexpand_threads';
	$select = new html_select(array('name' => '_autoexpand_threads', 'id' => $field_id));
	$select->add($RCMAIL->gettext('never'), 0);
	$select->add($RCMAIL->gettext('do_expand'), 1);
	$select->add($RCMAIL->gettext('expand_only_unread'), 2);

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

	// show page size selection
	if (!isset($no_override['mail_pagesize'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_mail_pagesize';
	$input = new html_inputfield(array('name' => '_mail_pagesize', 'id' => $field_id, 'size' => 5));
	$size = intval($config['mail_pagesize'] ? $config['mail_pagesize'] : $config['pagesize']);

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

	if (!isset($no_override['check_all_folders'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_check_all_folders';
	$input = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));

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

	// Message viewing
	case 'mailview':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	// show checkbox to open message view in new window
	if (!isset($no_override['message_extwin'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_message_extwin';
	$input = new html_checkbox(array('name' => '_message_extwin', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['message_extwin'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('showinextwin'))),
	'content' => $input->show($config['message_extwin']?1:0),
	);
	}

	// show checkbox to show email instead of name
	if (!isset($no_override['message_show_email'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_message_show_email';
	$input = new html_checkbox(array('name' => '_message_show_email', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['message_show_email'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('showemail'))),
	'content' => $input->show($config['message_show_email']?1:0),
	);
	}

	// show checkbox for HTML/plaintext messages
	if (!isset($no_override['prefer_html'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_htmlmsg';
	$input = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
	'onchange' => "$('#rcmfd_show_images').prop('disabled', !this.checked).val(0)"));

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

	if (!isset($no_override['default_charset'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_default_charset';

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

	if (!isset($no_override['show_images'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_show_images';
	$input = new html_select(array('name' => '_show_images', 'id' => $field_id,
	'disabled' => !$config['prefer_html']));

	$input->add($RCMAIL->gettext('never'), 0);
	$input->add($RCMAIL->gettext('fromknownsenders'), 1);
	$input->add($RCMAIL->gettext('always'), 2);

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

	if (!isset($no_override['inline_images'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_inline_images';
	$input = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));

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

	// "display after delete" checkbox
	if (!isset($no_override['display_next'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_displaynext';
	$input = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));

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

	// Mail composition
	case 'compose':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'sig' => array('name' => rcube::Q($RCMAIL->gettext('signatureoptions'))),
	'spellcheck' => array('name' => rcube::Q($RCMAIL->gettext('spellcheckoptions'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	// show checkbox to compose messages in a new window
	if (!isset($no_override['compose_extwin'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfdcompose_extwin';
	$input = new html_checkbox(array('name' => '_compose_extwin', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['compose_extwin'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('composeextwin'))),
	'content' => $input->show($config['compose_extwin']?1:0),
	);
	}

	if (!isset($no_override['htmleditor'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_htmleditor';
	$select = new html_select(array('name' => '_htmleditor', 'id' => $field_id));

	$select->add($RCMAIL->gettext('never'), 0);
	$select->add($RCMAIL->gettext('always'), 1);
	$select->add($RCMAIL->gettext('htmlonreply'), 2);
	$select->add($RCMAIL->gettext('htmlonreplyandforward'), 3);

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

	if (!isset($no_override['draft_autosave'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_autosave';
	$select = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));

	$select->add($RCMAIL->gettext('never'), 0);
	foreach (array(1, 3, 5, 10) as $i => $min) {
	$label = $RCMAIL->gettext(array('name' => 'everynminutes', 'vars' => array('n' => $min)));
	$select->add($label, $min*60);
	}

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

	if (!isset($no_override['mime_param_folding'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_param_folding';
	$select = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));

	$select->add($RCMAIL->gettext('2231folding'), 0);
	$select->add($RCMAIL->gettext('miscfolding'), 1);
	$select->add($RCMAIL->gettext('2047folding'), 2);

	$blocks['advanced']['options']['mime_param_folding'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('mimeparamfolding'))),
	'content' => $select->show($config['mime_param_folding']),
	);
	}

	if (!isset($no_override['force_7bit'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_force_7bit';
	$input = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));

	$blocks['advanced']['options']['force_7bit'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('force7bit'))),
	'content' => $input->show($config['force_7bit']?1:0),
	);
	}

	if (!isset($no_override['mdn_default'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_mdn_default';
	$input = new html_checkbox(array('name' => '_mdn_default', 'id' => $field_id, 'value' => 1));

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

	if (!isset($no_override['dsn_default'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_dsn_default';
	$input = new html_checkbox(array('name' => '_dsn_default', 'id' => $field_id, 'value' => 1));

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

	if (!isset($no_override['reply_same_folder'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_reply_same_folder';
	$input = new html_checkbox(array('name' => '_reply_same_folder', 'id' => $field_id, 'value' => 1));

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

	if (!isset($no_override['reply_mode'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_reply_mode';
	$select = new html_select(array('name' => '_reply_mode', 'id' => $field_id));

	$select->add($RCMAIL->gettext('replyempty'), -1);
	$select->add($RCMAIL->gettext('replybottomposting'), 0);
	$select->add($RCMAIL->gettext('replytopposting'), 1);

	$blocks['main']['options']['reply_mode'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('whenreplying'))),
	'content' => $select->show(intval($config['reply_mode'])),
	);
	}

	if (!isset($no_override['spellcheck_before_send']) && $config['enable_spellcheck']) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_spellcheck_before_send';
	$input = new html_checkbox(array('name' => '_spellcheck_before_send', 'id' => $field_id, 'value' => 1));

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

	if ($config['enable_spellcheck']) {
	if (!$current) {
	continue 2;
	}

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

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

	if (!isset($no_override['show_sig'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_show_sig';
	$select = new html_select(array('name' => '_show_sig', 'id' => $field_id));

	$select->add($RCMAIL->gettext('never'), 0);
	$select->add($RCMAIL->gettext('always'), 1);
	$select->add($RCMAIL->gettext('newmessageonly'), 2);
	$select->add($RCMAIL->gettext('replyandforwardonly'), 3);

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

	if (!isset($no_override['strip_existing_sig'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_strip_existing_sig';
	$input = new html_checkbox(array('name' => '_strip_existing_sig', 'id' => $field_id, 'value' => 1));

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

	if (!isset($no_override['forward_attachment'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_forward_attachment';
	$select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id));

	$select->add($RCMAIL->gettext('inline'), 0);
	$select->add($RCMAIL->gettext('asattachment'), 1);

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

	if (!isset($no_override['default_font']) \|\| !isset($no_override['default_font_size'])) {
	if (!$current) {
	continue 2;
	}

	// Default font size
	$field_id = 'rcmfd_default_font_size';
	$select_default_font_size = new html_select(array('name' => '_default_font_size', 'id' => $field_id));

	$fontsizes = array('', '8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
	foreach ($fontsizes as $size) {
	$select_default_font_size->add($size, $size);
	}

	// Default font
	$field_id = 'rcmfd_default_font';
	$select_default_font = new html_select(array('name' => '_default_font', 'id' => $field_id));
	$select_default_font->add('', '');

	$fonts = rcmail::font_defs();
	foreach ($fonts as $fname => $font) {
	$select_default_font->add($fname, $fname);
	}

	$blocks['main']['options']['default_font'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('defaultfont'))),
	'content' => $select_default_font->show($RCMAIL->config->get('default_font', 1)) .
	$select_default_font_size->show($RCMAIL->config->get('default_font_size', 1))
	);
	}

	if (!isset($no_override['reply_all_mode'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_reply_all_mode';
	$select = new html_select(array('name' => '_reply_all_mode', 'id' => $field_id));

	$select->add($RCMAIL->gettext('replyalldefault'), 0);
	$select->add($RCMAIL->gettext('replyalllist'), 1);

	$blocks['main']['options']['reply_all_mode'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('replyallmode'))),
	'content' => $select->show(intval($config['reply_all_mode'])),
	);
	}

	break;

	// Addressbook config
	case 'addressbook':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	if (!isset($no_override['default_addressbook'])
	&& (!$current \|\| ($books = $RCMAIL->get_address_sources(true, true)))
	) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_default_addressbook';
	$select = new html_select(array('name' => '_default_addressbook', 'id' => $field_id));

	foreach ($books as $book) {
	$select->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
	}

	$blocks['main']['options']['default_addressbook'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('defaultabook'))),
	'content' => $select->show($config['default_addressbook']),
	);
	}

	// show addressbook listing mode selection
	if (!isset($no_override['addressbook_name_listing'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_addressbook_name_listing';
	$select = new html_select(array('name' => '_addressbook_name_listing', 'id' => $field_id));

	$select->add($RCMAIL->gettext('name'), 0);
	$select->add($RCMAIL->gettext('firstname') . ' ' . $RCMAIL->gettext('surname'), 1);
	$select->add($RCMAIL->gettext('surname') . ' ' . $RCMAIL->gettext('firstname'), 2);
	$select->add($RCMAIL->gettext('surname') . ', ' . $RCMAIL->gettext('firstname'), 3);

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

	// show addressbook sort column
	if (!isset($no_override['addressbook_sort_col'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_addressbook_sort_col';
	$select = new html_select(array('name' => '_addressbook_sort_col', 'id' => $field_id));

	$select->add($RCMAIL->gettext('name'), 'name');
	$select->add($RCMAIL->gettext('firstname'), 'firstname');
	$select->add($RCMAIL->gettext('surname'), 'surname');

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

	// show addressbook page size selection
	if (!isset($no_override['addressbook_pagesize'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_addressbook_pagesize';
	$input = new html_inputfield(array('name' => '_addressbook_pagesize', 'id' => $field_id, 'size' => 5));
	$size = intval($config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize']);

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

	if (!isset($no_override['autocomplete_single'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_autocomplete_single';
	$checkbox = new html_checkbox(array('name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1));

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

	// Special IMAP folders
	case 'folders':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	if (!isset($no_override['show_real_foldernames'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'show_real_foldernames';
	$input = new html_checkbox(array('name' => '_show_real_foldernames', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['show_real_foldernames'] = array(
	'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('show_real_foldernames'))),
	'content' => $input->show($config['show_real_foldernames']?1:0),
	);
	}

	// Configure special folders
	$set = array('drafts_mbox', 'sent_mbox', 'junk_mbox', 'trash_mbox');
	if ($current && count(array_intersect($no_override, $set)) < 4) {
	$select = $RCMAIL->folder_selector(array(
	'noselection' => '---',
	'realnames' => true,
	'maxlength' => 30,
	'folder_filter' => 'mail',
	'folder_rights' => 'w',
	));

	// #1486114, #1488279, #1489219
	$onchange = "if ($(this).val() == 'INBOX') $(this).val('')";
	}

	if (!isset($no_override['drafts_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['drafts_mbox'] = array(
	'title' => rcube::Q($RCMAIL->gettext('drafts')),
	'content' => $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox", 'onchange' => $onchange)),
	);
	}

	if (!isset($no_override['sent_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['sent_mbox'] = array(
	'title' => rcube::Q($RCMAIL->gettext('sent')),
	'content' => $select->show($config['sent_mbox'], array('name' => "_sent_mbox", 'onchange' => '')),
	);
	}

	if (!isset($no_override['junk_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['junk_mbox'] = array(
	'title' => rcube::Q($RCMAIL->gettext('junk')),
	'content' => $select->show($config['junk_mbox'], array('name' => "_junk_mbox", 'onchange' => $onchange)),
	);
	}

	if (!isset($no_override['trash_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['trash_mbox'] = array(
	'title' => rcube::Q($RCMAIL->gettext('trash')),
	'content' => $select->show($config['trash_mbox'], array('name' => "_trash_mbox", 'onchange' => $onchange)),
	);
	}
	break;

	// Server settings
	case 'server':
	$blocks = array(
	'main' => array('name' => rcube::Q($RCMAIL->gettext('mainoptions'))),
	'maintenance' => array('name' => rcube::Q($RCMAIL->gettext('maintenance'))),
	'advanced' => array('name' => rcube::Q($RCMAIL->gettext('advancedoptions'))),
	);

	if (!isset($no_override['read_when_deleted'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_read_deleted';
	$input = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));

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

	if (!isset($no_override['flag_for_deletion'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_flag_for_deletion';
	$input = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));

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

	// don't show deleted messages
	if (!isset($no_override['skip_deleted'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_skip_deleted';
	$input = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));

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

	if (!isset($no_override['delete_always'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_delete_always';
	$input = new html_checkbox(array('name' => '_delete_always', 'id' => $field_id, 'value' => 1));

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

	if (!isset($no_override['delete_junk'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_delete_junk';
	$input = new html_checkbox(array('name' => '_delete_junk', 'id' => $field_id, 'value' => 1));

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

	// Trash purging on logout
	if (!isset($no_override['logout_purge'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_logout_purge';
	$input = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));

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

	// INBOX compacting on logout
	if (!isset($no_override['logout_expunge'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_logout_expunge';
	$input = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));

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

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

	$advanced_prefs = (array) $RCMAIL->config->get('advanced_prefs');

	// create output
	foreach ($data['blocks'] as $key => $block) {
	if (!empty($block['content']) \|\| !empty($block['options'])) {
	$found = true;
	}
	// move some options to the 'advanced' block as configured by admin
	if ($key != 'advanced') {
	foreach ($advanced_prefs as $opt) {
	if ($block['options'][$opt]) {
	$data['blocks']['advanced']['options'][$opt] = $block['options'][$opt];
	unset($data['blocks'][$key]['options'][$opt]);
	}
	}
	}
	}

	// move 'advanced' block to the end of the list
	if (!empty($data['blocks']['advanced'])) {
	$adv = $data['blocks']['advanced'];
	unset($data['blocks']['advanced']);
	$data['blocks']['advanced'] = $adv;
	}

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

	$data = $RCMAIL->plugins->exec_hook('preferences_section_header',
	array('section' => $sect['id'], 'header' => '', 'current' => $current));

	if(!empty($data['header'])) {
	$sections[$idx]['header'] = $data['header'];
	}

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


	function rcmail_get_skins()
	{
	$path = RCUBE_INSTALL_PATH . 'skins';
	$skins = array();
	$dir = opendir($path);

	if (!$dir) {
	return false;
	}

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

	closedir($dir);

	return $skins;
	}


	function rcmail_folder_options($mailbox)
	{
	global $RCMAIL;

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

	return $options;
	}

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

	$protect_folders = $RCMAIL->config->get('protect_default_folders');
	$storage = $RCMAIL->get_storage();
	$delimiter = $storage->get_hierarchy_delimiter();
	$name_utf8 = rcube_charset::convert($name, 'UTF7-IMAP');
	$protected = $protect_folders && $storage->is_special_folder($name);

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

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

	/**
	* Render the list of settings sections (AKA tabs)
	*/
	function rcmail_settings_tabs($attrib)
	{
	global $RCMAIL, $OUTPUT;

	// add default attributes
	$attrib += array('tagname' => 'span', 'idprefix' => 'settingstab', 'selclass' => 'selected');

	$default_actions = array(
	array('command' => 'preferences', 'type' => 'link', 'label' => 'preferences', 'title' => 'editpreferences'),
	array('command' => 'folders', 'type' => 'link', 'label' => 'folders', 'title' => 'managefolders'),
	array('command' => 'identities', 'type' => 'link', 'label' => 'identities', 'title' => 'manageidentities'),
	- array('command' => 'responses', 'type' => 'link', 'label' => 'responses', 'title' => 'editresponses'),
	+ array('command' => 'responses', 'type' => 'link', 'label' => 'responses', 'title' => 'manageresponses'),
	);

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

	$attrib = $plugin['attrib'];
	$tagname = $attrib['tagname'];
	$tabs = array();

	foreach ($plugin['actions'] as $k => $action) {
	if (!$action['command'] && !$action['href'] && $action['action']) {
	$action['href'] = $RCMAIL->url(array('_action' => $action['action']));
	}

	$button = $OUTPUT->button($action);
	$attr = $attrib;

	$cmd = $action['action'] ? $action['action'] : $action['command'];
	$id = $action['id'] ? $action['id'] : $cmd;

	if (!empty($id)) {
	$attr['id'] = preg_replace('/[^a-z0-9]/i', '', $attrib['idprefix'] . $id);
	}

	$classnames = array($attrib['class']);
	if (!empty($action['class'])) {
	$classnames[] = $action['class'];
	}
	else if (!empty($cmd)) {
	$classnames[] = $cmd;
	}
	if ($RCMAIL->action == $cmd) {
	$classnames[] = $attrib['selclass'];
	}

	$attr['class'] = join(' ', $classnames);
	$tabs[] = html::tag($tagname, $attr, $button, html::$common_attrib);
	}

	return join('', $tabs);
	}
	diff --git a/skins/classic/templates/addressbook.html b/skins/classic/templates/addressbook.html
	index 98658f28b..53995860d 100644
	--- a/skins/classic/templates/addressbook.html
	+++ b/skins/classic/templates/addressbook.html
	@@ -1,127 +1,127 @@
	<!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" />
	<script type="text/javascript" src="/splitter.js"></script>
	<script type="text/javascript" src="/functions.js"></script>
	<style type="text/css">
	#addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
	#contacts-box { left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px; }
	#directorylistbox { width: <roundcube:exp expression="!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd-5 : 195" />px; }
	#addressscreen { left: <roundcube:exp expression="!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd+5 : 205" />px; }
	</style>

	</head>
	<body>

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

	<div id="abooktoolbar">
	<roundcube:button command="add" type="link" class="buttonPas addcontact" classAct="button addcontact" classSel="button addcontactSel" title="newcontact" content=" " />
	<roundcube:button command="compose" type="link" class="buttonPas compose" classAct="button compose" classSel="button composeSel" title="composeto" content=" " />
	<roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletecontact" content=" " />
	<span class="separator"> </span>
	<roundcube:button command="import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="importcontacts" content=" " />
	<span class="dropbutton">
	<roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="exportvcards" content=" " />
	<span id="exportmenulink" onclick="rcmail_ui.show_popup('exportmenu');return false"></span>
	</span>
	<roundcube:button command="advanced-search" type="link" class="buttonPas search" classAct="button search" classSel="button searchSel" title="advsearch" content=" " />
	<roundcube:container name="toolbar" id="abooktoolbar" />
	</div>

	<div id="quicksearchbar">
	<roundcube:button name="searchmenulink" id="searchmenulink" image="/images/icons/glass_roll.png" onclick="rcmail_ui.show_popup('searchmenu');return false" title="searchmod" width="16" height="16" />
	<roundcube:object name="searchform" id="quicksearchbox" />
	<roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" />
	</div>

	<div id="exportmenu" class="popupmenu">
	<ul>
	<li><roundcube:button command="export" label="exportall" prop="sub" classAct="exportalllink active" class="exportalllink" /></li>
	<li><roundcube:button command="export-selected" label="exportsel" prop="sub" classAct="exportsellink active" class="exportsellink" /></li>
	</ul>
	</div>

	<div id="searchmenu" class="popupmenu">
	<ul class="toolbarmenu">
	<li><label><input type="checkbox" name="s_mods[]" value="name" id="s_mod_name" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="name" /></span></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="firstname" id="s_mod_firstname" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="firstname" /></span></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="surname" id="s_mod_surname" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="surname" /></span></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="email" id="s_mod_email" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="email" /></span></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="*" id="s_mod_all" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="allfields" /></span></label></li>
	</ul>
	</div>

	<div id="mainscreen">

	<div id="directorylistbox">
	<div id="directorylist-title" class="boxtitle"><roundcube:label name="groups" /></div>
	<div id="directorylist-content" class="boxlistcontent">
	<roundcube:object name="directorylist" id="directorylist" class="treelist" />
	</div>
	<div id="directorylist-footer" class="boxfooter">
	- <roundcube:button command="group-create" type="link" title="newcontactgroup" class="buttonPas addgroup" classAct="button addgroup" content=" " />
	+ <roundcube:button command="group-create" type="link" title="newgroup" class="buttonPas addgroup" classAct="button addgroup" content=" " />
	<roundcube:button name="groupmenulink" id="groupmenulink" type="link" title="moreactions" class="button groupactions" onclick="rcmail_ui.show_popup('groupmenu');return false" content=" " />
	</div>
	</div>

	<div id="addressscreen">

	<div id="addresslist">
	<roundcube:object name="addresslisttitle" label="contacts" tag="div" class="boxtitle" />
	<div class="boxlistcontent">
	<roundcube:object name="addresslist" id="contacts-table" class="records-table" cellspacing="0" summary="Contacts list" noheader="true" />
	</div>
	<div class="boxfooter">
	<div id="abookcountbar" class="pagenav">
	<roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstpage" content=" " />
	<roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previouspage" content=" " />
	<roundcube:object name="recordsCountDisplay" style="padding:0 .5em; float:left" />
	<roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextpage" content=" " />
	<roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastpage" content=" " />
	</div>
	</div>
	</div>

	<script type="text/javascript">
	var addrviewsplit = new rcube_splitter({id:'addressviewsplitter', p1: 'addresslist', p2: 'contacts-box', orientation: 'v', relative: true, start: 250});
	rcmail.add_onload('addrviewsplit.init()');

	var addrviewsplitd = new rcube_splitter({id:'addressviewsplitterd', p1: 'directorylistbox', p2: 'addressscreen', orientation: 'v', relative: true, start: 200});
	rcmail.add_onload('addrviewsplitd.init()');
	</script>

	<div id="contacts-box">
	<roundcube:object name="addressframe" id="contact-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
	</div>

	</div>
	</div>

	<div id="groupoptionsmenu" class="popupmenu">
	<ul>
	<li><roundcube:button command="group-rename" label="grouprename" classAct="active" /></li>
	<li><roundcube:button command="group-delete" label="groupdelete" classAct="active" /></li>
	<li><roundcube:button command="group-remove-selected" label="groupremoveselected" classAct="active" /></li>
	<li class="separator_above"><roundcube:button command="search-create" label="searchsave" classAct="active" /></li>
	<li><roundcube:button command="search-delete" label="searchdelete" classAct="active" /></li>
	<roundcube:container name="groupoptions" id="groupoptionsmenu" />
	</ul>
	</div>

	<div id="dragmenu" class="popupmenu">
	<ul>
	<li><roundcube:button command="move" onclick="return rcmail.drag_menu_action('move')" label="move" classAct="active" /></li>
	<li><roundcube:button command="copy" onclick="return rcmail.drag_menu_action('copy')" label="copy" classAct="active" /></li>
	</ul>
	</div>

	<script type="text/javascript">
	rcube_init_mail_ui();
	</script>

	</body>
	</html>
	diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html
	index 4705600c7..19b22bc69 100644
	--- a/skins/classic/templates/compose.html
	+++ b/skins/classic/templates/compose.html
	@@ -1,221 +1,221 @@
	<!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="productname" /> :: <roundcube:label name="compose" /></title>
	<roundcube:include file="/includes/links.html" />
	<roundcube:if condition="config:enable_spellcheck" />
	<link rel="stylesheet" type="text/css" href="/googiespell.css" />
	<roundcube:endif />
	<script type="text/javascript" src="/functions.js"></script>
	<script type="text/javascript" src="/splitter.js"></script>
	<style type="text/css">
	#compose-contacts { width: <roundcube:exp expression="!empty(cookie:composesplitterv1) ? cookie:composesplitterv1-5 : 195" />px; }
	#compose-container { left: <roundcube:exp expression="!empty(cookie:composesplitterv1) ? cookie:composesplitterv1+5 : 205" />px; }
	</style>
	</head>
	<roundcube:if condition="env:extwin" />
	<body class="extwin">
	<roundcube:object name="message" id="message" />
	<roundcube:else />
	<body>
	<roundcube:include file="/includes/taskbar.html" />
	<roundcube:include file="/includes/header.html" />
	<roundcube:endif />

	<div id="messagetoolbar">
	<roundcube:if condition="env:extwin" />
	<roundcube:button command="close" type="link" class="button back" classAct="button back" classSel="button backSel" title="close" content=" " />
	<roundcube:else />
	<roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
	<roundcube:endif />
	<roundcube:button command="send" type="link" class="buttonPas send" classAct="button send" classSel="button sendSel" title="sendmessage" content=" " />
	<roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attachSel" title="addattachment" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
	<roundcube:button command="insert-sig" type="link" class="buttonPas insertsig" classAct="button insertsig" classSel="button insertsigSel" title="insertsignature" content=" " />
	<roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " />
	<roundcube:if condition="config:enable_spellcheck" />
	<span class="dropbutton">
	<roundcube:button command="spellcheck" type="link" class="buttonPas spellcheck" classAct="button spellcheck" classSel="button spellcheckSel" title="checkspelling" content=" " />
	<span id="spellmenulink" onclick="rcmail_ui.show_popup('spellmenu');return false"></span>
	</span>
	<roundcube:endif />
	<a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="rcmail_ui.show_popup('responsesmenu');return false"> </a>
	<roundcube:container name="toolbar" id="compose-toolbar" />
	<roundcube:button name="messageoptions" id="composemenulink" type="link" class="button messagemenu" title="messageoptions" onclick="rcmail_ui.show_popup('composemenu', true);return false" content=" " />
	</div>

	<roundcube:form name="form" method="post">

	<div id="mainscreen">

	<div id="compose-contacts">
	<div class="boxtitle"><roundcube:label name="contacts" /></div>
	<div class="boxlistcontent">
	<div class="searchbox">
	<img id="searchmenulink" src="/images/icons/glass.png" width="16" height="16" />
	<roundcube:object name="searchform" id="quicksearchbox" form="true" tabindex="13" />
	<roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" />
	</div>
	<roundcube:object name="addressbooks" id="directorylist" />
	<roundcube:object name="addresslist" id="contacts-table" class="records-table" cellspacing="0" noheader="true" />
	</div>
	<div class="boxfooter">
	<div id="abookactions" class="pagenav">
	<roundcube:button command="add-recipient" prop="to" type="link" title="to" class="button disabled" classAct="button" content="To &raquo;" />
	<roundcube:button command="add-recipient" prop="cc" type="link" title="cc" class="button disabled" classAct="button" content="Cc &raquo;" />
	<roundcube:button command="add-recipient" prop="bcc" type="link" title="bcc" class="button disabled" classAct="button" content="Bcc &raquo;" />
	</div>
	<div id="abookcountbar" class="pagenav">
	<roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstpage" content=" " />
	<roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previouspage" content=" " />
	<span style="float:left"> </span>
	<roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextpage" content=" " />
	<roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastpage" content=" " />
	</div>
	</div>
	</div>

	<script type="text/javascript">
	var composesplitv1 = new rcube_splitter({id:'composesplitterv1', p1: 'compose-contacts', p2: 'compose-container', orientation: 'v', relative: true, start: 200});
	rcmail.add_onload('composesplitv1.init()');
	</script>

	<div id="compose-container">
	<div id="compose-headers-div" style="width: 100%;">
	<table border="0" cellspacing="0" cellpadding="1" id="compose-headers">
	<tr>
	<td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
	<td class="editfield formlinks">
	<roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" />
	<a href="#identities" onclick="return rcmail.command('identities')"><roundcube:label name="editidents" /></a>
	<roundcube:button command="extwin" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="openextwinlink" condition="!env:extwin" />
	</td>
	</tr><tr>
	<td class="title top"><label for="_to"><roundcube:label name="to" /></label></td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="2" tabindex="2" /></td>
	</tr><tr id="compose-cc">
	<td class="title top">
	<a href="#cc" onclick="return rcmail_ui.hide_header_form('cc');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
	<label for="_cc"><roundcube:label name="cc" /></label>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="2" tabindex="3" /></td>
	</tr><tr id="compose-bcc">
	<td class="title top">
	<a href="#bcc" onclick="return rcmail_ui.hide_header_form('bcc');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
	<label for="_bcc"><roundcube:label name="bcc" /></label>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="2" tabindex="4" /></td>
	</tr><tr id="compose-replyto">
	<td class="title top">
	<a href="#replyto" onclick="return rcmail_ui.hide_header_form('replyto');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
	<label for="_replyto"><roundcube:label name="replyto" /></label>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td>
	</tr><tr id="compose-followupto">
	<td class="title top">
	<a href="#followupto" onclick="return rcmail_ui.hide_header_form('followupto');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
	<label for="_followupto"><roundcube:label name="followupto" /></label>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="followupto" form="form" id="_followupto" size="70" tabindex="7" /></td>
	</tr><tr>
	<td></td>
	<td class="formlinks">
	<a href="#cc" onclick="return rcmail_ui.show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a>
	<span class="separator">\|</span>
	<a href="#bcc" onclick="return rcmail_ui.show_header_form('bcc')" id="bcc-link"><roundcube:label name="addbcc" /></a>
	<span class="separator">\|</span>
	<a href="#reply-to" onclick="return rcmail_ui.show_header_form('replyto')" id="replyto-link"><roundcube:label name="addreplyto" /></a>
	<span class="separator">\|</span>
	<a href="#followup-to" onclick="return rcmail_ui.show_header_form('followupto')" id="followupto-link"><roundcube:label name="addfollowupto" /></a>
	</td>
	</tr><tr>
	<td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
	<td class="editfield"><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="8" /></td>
	</tr>
	</table>
	</div>
	<div id="compose-div">
	<div id="compose-body-div">
	<div class="boxlistcontent" style="overflow: hidden; top: 0">
	<roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="9" />
	</div>
	<div class="boxfooter">
	<div id="compose-buttons">
	<roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="10" />
	<roundcube:button type="input" command="list" class="button" label="cancel" tabindex="11" />
	</div>
	<div id="compose-editorfooter" class="pagenav">
	<roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
	<span>
	<label><roundcube:label name="editortype" /></label>
	<roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" />
	</span>
	<roundcube:endif />
	</div>
	</div>
	</div>
	<script type="text/javascript">
	var composesplitv2 = new rcube_splitter({id:'composesplitterv2', p1: 'compose-body-div', p2: 'compose-attachments', orientation: 'v', relative: true, start: $('#compose-headers-div').width() - 175});
	rcmail.add_onload('composesplitv2.init()');
	</script>
	<div id="compose-attachments">
	<div class="boxtitle"><roundcube:label name="attachments" /></div>
	<div class="boxlistcontent">
	<roundcube:object name="composeAttachmentList" id="attachmentslist" loadingIcon="/images/display/loading_blue.gif" />
	</div>
	<div class="boxfooter">
	<roundcube:button name="uploadmenulink" id="uploadmenulink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
	</div>
	</div>
	<roundcube:object name="fileDropArea" id="compose-attachments" />
	</div>
	</div>

	</div>

	<div id="composeoptionsmenu" class="popupmenu">
	<table>
	<tr>
	<td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td>
	<td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td>
	</tr>
	<roundcube:if condition="config:smtp_server != ''" />
	<tr>
	<td><label for="rcmcomposedsn"><roundcube:label name="dsn" />:</label></td>
	<td><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /></td>
	</tr>
	<roundcube:endif />
	<tr>
	<td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td>
	<td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td>
	</tr>
	<roundcube:if condition="!config:no_save_sent_messages" />
	<tr>
	<td><label><roundcube:label name="savesentmessagein" />:</label></td>
	<td><roundcube:object name="storetarget" maxlength="30" /></td>
	</tr>
	<roundcube:endif />
	</table>
	</div>

	<div id="responsesmenu" class="popupmenu">
	<ul id="textresponsesmenu">
	<li><label class="comment"><roundcube:label name="insertresponse" /></label></li>
	<roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
	<li><label class="comment"><roundcube:label name="manageresponses" /></label></li>
	- <li><roundcube:button command="save-response" type="link" label="savenewresponse" classAct="active" unselectable="on" /></li>
	+ <li><roundcube:button command="save-response" type="link" label="newresponse" classAct="active" unselectable="on" /></li>
	<li><roundcube:button command="responses" type="link" label="editresponses" classAct="active" /></li>
	</ul>
	</div>

	<div id="spellmenu" class="popupmenu selectable"></div>

	</form>

	<roundcube:object name="composeAttachmentForm" id="attachment-form" attachmentFieldSize="40" class="popupmenu" />

	<script type="text/javascript">
	rcube_init_mail_ui();
	</script>

	</body>
	</html>
	diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
	index e1101e648..0ce036850 100644
	--- a/skins/larry/templates/addressbook.html
	+++ b/skins/larry/templates/addressbook.html
	@@ -1,141 +1,141 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	</head>
	<body class="noscroll">

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

	<div id="mainscreen">

	<h1 class="voice"><roundcube:label name="addressbook" /></h1>

	<!-- toolbar -->
	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
	<div id="addressbooktoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
	<roundcube:button command="import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="importcontacts" />
	<span class="dropbutton">
	<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="export" title="exportvcards" />
	<a href="#export" class="dropbuttontip" id="exportmenulink" onclick="return UI.toggle_popup('exportmenu',event)" aria-haspopup="true" aria-expanded="false" aria-owns="exportmenu-menu" tabindex="0"><roundcube:label name="arialabelcontactexportoptions" /></a>
	</span>

	<span class="spacer"></span>
	<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
	<roundcube:button command="advanced-search" type="link" class="button search disabled" classAct="button search" classSel="button search pressed" label="advanced" title="advsearch" />
	<roundcube:container name="toolbar" id="addressbooktoolbar" />

	<div id="exportmenu" class="popupmenu" aria-hidden="true">
	<h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="arialabelcontactexportoptions" /></h3>
	<ul id="exportmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-exportmenu">
	<li role="menuitem"><roundcube:button command="export" label="exportall" prop="sub" class="exportalllink" classAct="exportalllink active" /></li>
	<li role="menuitem"><roundcube:button command="export-selected" label="exportsel" prop="sub" class="exportsellink" classAct="exportsellink active" /></li>
	</ul>
	</div>

	</div>

	<!-- search box -->
	<div id="quicksearchbar" class="searchbox" role="search" aria-labelledby="aria-label-searchform">
	<h2 id="aria-label-searchform" class="voice"><roundcube:label name="arialabelcontactsearchform" /></h2>
	<label for="quicksearchbox" class="voice"><roundcube:label name="arialabelquicksearchbox" /></label>
	<roundcube:object name="searchform" id="quicksearchbox" />
	<roundcube:button command="menu-open" prop="searchmenu" id="searchmenulink" class="iconbutton searchoptions" title="searchmod" label="options" aria-haspopup="true" aria-expanded="false" aria-owns="searchmenu-menu" />
	<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />

	<div id="searchmenu" class="popupmenu" data-editable="true">
	<h3 id="aria-label-searchmenu" class="voice"><roundcube:label name="searchmod" /></h3>
	<ul class="toolbarmenu" id="searchmenu-menu" role="menu" aria-labelledby="aria-label-searchmenu">
	<li role="menuitem"><label><input type="checkbox" name="s_mods[]" value="name" id="s_mod_name" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="name" /></span></label></li>
	<li role="menuitem"><label><input type="checkbox" name="s_mods[]" value="firstname" id="s_mod_firstname" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="firstname" /></span></label></li>
	<li role="menuitem"><label><input type="checkbox" name="s_mods[]" value="surname" id="s_mod_surname" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="surname" /></span></label></li>
	<li role="menuitem"><label><input type="checkbox" name="s_mods[]" value="email" id="s_mod_email" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="email" /></span></label></li>
	<li role="menuitem"><label><input type="checkbox" name="s_mods[]" value="*" id="s_mod_all" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="allfields" /></span></label></li>
	</ul>
	</div>
	</div>

	<div id="mainscreencontent">

	<div id="addressview-left">

	<!-- sources/groups list -->
	<div id="directorylistbox" class="uibox listbox" role="navigation" aria-labelledby="directorylist-header">
	<h2 id="directorylist-header" class="boxtitle"><roundcube:label name="groups" /></h2>
	<div id="directorylist-content" class="scroller withfooter">
	<roundcube:object name="directorylist" id="directorylist" class="treelist listing iconized" />
	</div>
	<div id="directorylist-footer" class="boxfooter">
	- <roundcube:button command="group-create" type="link" title="newcontactgroup" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="newcontactgroup" /><roundcube:button name="groupoptions" id="groupoptionslink" type="link" title="moreactions" class="listbutton groupactions" onclick="return UI.toggle_popup('groupoptions',event)" innerClass="inner" label="arialabelabookgroupoptions" aria-haspopup="true" aria-expanded="false" aria-owns="groupoptionsmenu" />
	+ <roundcube:button command="group-create" type="link" title="newgroup" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="addgroup" /><roundcube:button name="groupoptions" id="groupoptionslink" type="link" title="moreactions" class="listbutton groupactions" onclick="return UI.toggle_popup('groupoptions',event)" innerClass="inner" label="arialabelabookgroupoptions" aria-haspopup="true" aria-expanded="false" aria-owns="groupoptionsmenu" />
	</div>
	</div>

	<div id="groupoptions" class="popupmenu" aria-hidden="true">
	<h3 id="aria-label-groupoptions" class="voice"><roundcube:label name="arialabelabookgroupoptions" /></h3>
	<ul id="groupoptionsmenu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-groupoptions">
	<li role="menuitem"><roundcube:button command="group-rename" label="grouprename" classAct="active" /></li>
	<li role="menuitem"><roundcube:button command="group-delete" label="groupdelete" classAct="active" /></li>
	<li role="menuitem"><roundcube:button command="search-create" label="searchsave" classAct="active" /></li>
	<li role="menuitem"><roundcube:button command="search-delete" label="searchdelete" classAct="active" /></li>
	<roundcube:container name="groupoptions" id="groupoptionsmenu" />
	</ul>
	</div>

	</div><!-- end addressview-left -->

	<div id="addressview-right" role="main" aria-labelledby="aria-label-contactslist">

	<!-- contacts list -->
	<div id="addresslist" class="uibox listbox">
	<roundcube:object name="addresslisttitle" label="contacts" tag="h2" class="boxtitle" id="aria-label-contactslist" />
	<div class="scroller withfooter">
	<roundcube:object name="addresslist" id="contacts-table" class="listing iconized" noheader="true" role="listbox" />
	</div>
	<div class="boxpagenav">
	<roundcube:button command="firstpage" type="link" class="icon firstpage disabled" classAct="icon firstpage" title="firstpage" label="first" />
	<roundcube:button command="previouspage" type="link" class="icon prevpage disabled" classAct="icon prevpage" title="previouspage" label="previous" />
	<roundcube:button command="nextpage" type="link" class="icon nextpage disabled" classAct="icon nextpage" title="nextpage" label="next" />
	<roundcube:button command="lastpage" type="link" class="icon lastpage disabled" classAct="icon lastpage" title="lastpage" label="last" />
	</div>
	<div class="boxfooter">
	- <roundcube:button command="add" type="link" title="newcontact" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="newcontact" /><roundcube:button command="delete" type="link" title="deletecontact" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" label="deletecontact" /><roundcube:button command="group-remove-selected" type="link" title="groupremoveselected" class="listbutton removegroup disabled" classAct="listbutton removegroup" innerClass="inner" label="groupremoveselected" />
	+ <roundcube:button command="add" type="link" title="newcontact" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="addcontact" /><roundcube:button command="delete" type="link" title="deletecontact" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" label="deletecontact" /><roundcube:button command="group-remove-selected" type="link" title="groupremoveselected" class="listbutton removegroup disabled" classAct="listbutton removegroup" innerClass="inner" label="groupremoveselected" />
	<span class="countdisplay" aria-live="polite" aria-relevant="text">
	<span class="voice"><roundcube:label name="contacts" /></span>
	<roundcube:object name="recordsCountDisplay" label="fromtoshort" />
	</span>
	</div>
	</div>

	<div class="voice" role="note">
	<h3><roundcube:label name="helplistnavigation" /></h3>
	<pre>
	<roundcube:label name="helplistkeyboardnavigation" />
	<roundcube:label name="helplistkeyboardnavcontacts" />
	</pre>
	</div>


	<div id="contacts-box" class="uibox">
	<div class="iframebox">
	<roundcube:object name="addressframe" id="contact-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" title="contactproperties" />
	</div>
	</div>

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

	</div><!-- end mainscreencontent -->

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

	<div id="dragcontactmenu" class="popupmenu" aria-hidden="true">
	<ul class="toolbarmenu" role="menu">
	<li role="menuitem"><roundcube:button command="move" onclick="return rcmail.drag_menu_action('move')" label="move" classAct="active" /></li>
	<li role="menuitem"><roundcube:button command="copy" onclick="return rcmail.drag_menu_action('copy')" label="copy" classAct="active" /></li>
	</ul>
	</div>

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

	</body>
	</html>
	diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
	index 98ef2963c..83a47913e 100644
	--- a/skins/larry/templates/compose.html
	+++ b/skins/larry/templates/compose.html
	@@ -1,223 +1,223 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	<roundcube:if condition="config:enable_spellcheck" />
	<link rel="stylesheet" type="text/css" href="/googiespell.css" />
	<roundcube:endif />
	</head>
	<roundcube:if condition="env:extwin" /><body class="extwin"><roundcube:else /><body><roundcube:endif />

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

	<div id="mainscreen">

	<h1 class="voice"><roundcube:object name="pagetitle" /></h1>

	<!-- toolbar -->
	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
	<div id="messagetoolbar" class="toolbar fullwidth" role="toolbar" aria-labelledby="aria-label-toolbar">
	<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" label="cancel" condition="!env:extwin" tabindex="2" />
	<roundcube:button command="close" type="link" class="button close disabled" classAct="button close" label="cancel" condition="env:extwin" tabindex="2" />
	<span class="spacer"></span>
	<roundcube:button command="send" type="link" class="button send disabled" classAct="button send" label="send" title="sendmessage" tabindex="2" />
	<roundcube:button command="savedraft" type="link" class="button savedraft disabled" classAct="button savedraft" label="save" title="savemessage" tabindex="2" />
	<span class="spacer"></span>
	<roundcube:if condition="config:enable_spellcheck" />
	<span class="dropbutton">
	<roundcube:button command="spellcheck" type="link" class="button spellcheck disabled" classAct="button spellcheck" classSel="button spellcheck pressed" label="spellcheck" title="checkspelling" tabindex="2" />
	<a href="#languages" class="dropbuttontip" id="spellmenulink" onclick="UI.toggle_popup('spellmenu',event);return false" aria-haspopup="true" aria-expanded="false" tabindex="2">Select Spell Language</a>
	</span>
	<roundcube:endif />
	<roundcube:button name="addattachment" type="link" class="button attach" label="attach" title="addattachment" onclick="UI.show_uploadform(event);return false" aria-haspopup="true" aria-expanded="false"tabindex="2" />
	<roundcube:button command="insert-sig" type="link" class="button insertsig disabled" classAct="button insertsig" label="signature" title="insertsignature" tabindex="2" />
	<a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="UI.toggle_popup('responsesmenu',event);return false" tabindex="2" aria-haspopup="true" aria-expanded="false" aria-owns="textresponsesmenu"><roundcube:label name="responses" /></a>
	<roundcube:container name="toolbar" id="compose-toolbar" />
	</div>

	<div id="mainscreencontent">

	<div id="composeview-left">

	<!-- inline address book -->
	<div id="compose-contacts" class="uibox listbox" role="region" aria-labelledby="aria-label-composecontacts">
	<h2 id="aria-label-composecontacts" class="boxtitle"><roundcube:label name="contacts" /></h2>
	<div class="listsearchbox" role="search" aria-labelledby="aria-label-composequicksearch">
	<h3 id="aria-label-composequicksearch" class="voice"><roundcube:label name="arialabelcontactquicksearch" /></h3>
	<div class="searchbox">
	<label for="contactsearchbox" class="voice"><roundcube:label name="arialabelcontactsearchbox" /></label>
	<roundcube:object name="searchform" id="contactsearchbox" />
	<a id="searchmenulink" class="iconbutton searchicon"> </a>
	<roundcube:button command="reset-search" class="iconbutton reset" title="resetsearch" content=" " />
	</div>
	</div>
	<roundcube:object name="addressbooks" id="directorylist" class="treelist listing" summary="ariasummarycomposecontacts" />
	<div class="scroller withfooter" tabindex="-1">
	<roundcube:object name="addresslist" id="contacts-table" class="listing iconized" noheader="true" role="listbox" />
	</div>
	<div class="boxfooter">
	<roundcube:button command="add-recipient" prop="to" type="link" title="to" class="listbutton addto disabled" classAct="listbutton addto" innerClass="inner" content="To+" /><roundcube:button command="add-recipient" prop="cc" type="link" title="cc" class="listbutton addcc disabled" classAct="listbutton addcc" innerClass="inner" content="Cc+" /><roundcube:button command="add-recipient" prop="bcc" type="link" title="bcc" class="listbutton addbcc disabled" classAct="listbutton addbcc" innerClass="inner" content="Bcc+" />
	</div>
	<div class="boxpagenav">
	<roundcube:button command="firstpage" type="link" class="icon firstpage disabled" classAct="icon firstpage" title="firstpage" label="first" />
	<roundcube:button command="previouspage" type="link" class="icon prevpage disabled" classAct="icon prevpage" title="previouspage" label="previous" />
	<roundcube:button command="nextpage" type="link" class="icon nextpage disabled" classAct="icon nextpage" title="nextpage" label="next" />
	<roundcube:button command="lastpage" type="link" class="icon lastpage disabled" classAct="icon lastpage" title="lastpage" label="last" />
	</div>
	</div>

	</div>

	<div id="composeview-right" role="main">

	<roundcube:form name="form" method="post" id="compose-content" class="uibox">

	<!-- message headers -->
	<div id="composeheaders" role="region" aria-labelledby="aria-label-composeheaders">
	<h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabelmessageheaders" /></h2>

	<a href="#options" id="composeoptionstoggle" class="moreheaderstoggle" title="<roundcube:label name='togglecomposeoptions' />" aria-exapnded="false"><span class="iconlink"></span></a>

	<table class="headers-table compose-headers">
	<tbody>
	<tr>
	<td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
	<td class="editfield">
	<roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" />
	<a href="#identities" onclick="return rcmail.command('identities')" class="iconlink edit" tabindex="0"><roundcube:label name="editidents" /></a>
	</td>
	</tr><tr>
	<td class="title top"><label for="_to"><roundcube:label name="to" /></label></td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="1" tabindex="1" aria-required="true" /></td>
	</tr><tr id="compose-cc">
	<td class="title top">
	<label for="_cc"><roundcube:label name="cc" /></label>
	<a href="#cc" onclick="return UI.hide_header_row('cc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" tabindex="3"><roundcube:label name="delete" /> <roundcube:label name="cc" /></a>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="1" tabindex="1" /></td>
	</tr><tr id="compose-bcc">
	<td class="title top">
	<label for="_bcc"><roundcube:label name="bcc" /></label>
	<a href="#bcc" onclick="return UI.hide_header_row('bcc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" tabindex="3"><roundcube:label name="delete" /> <roundcube:label name="bcc" /></a>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="1" tabindex="1" /></td>
	</tr><tr id="compose-replyto">
	<td class="title top">
	<label for="_replyto"><roundcube:label name="replyto" /></label>
	<a href="#replyto" onclick="return UI.hide_header_row('replyto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" tabindex="3"><roundcube:label name="delete" /> <roundcube:label name="replyto" /></a>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="1" /></td>
	</tr><tr id="compose-followupto">
	<td class="title top">
	<label for="_followupto"><roundcube:label name="followupto" /></label>
	<a href="#followupto" onclick="return UI.hide_header_row('followupto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" tabindex="3"><roundcube:label name="delete" /> <roundcube:label name="followupto" /></a>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="followupto" form="form" id="_followupto" size="70" tabindex="1" /></td>
	</tr><tr>
	<td></td>
	<td class="formlinks">
	<a href="#cc" onclick="return UI.show_header_row('cc')" id="cc-link" class="iconlink add" tabindex="3"><roundcube:label name="addcc" /></a>
	<a href="#bcc" onclick="return UI.show_header_row('bcc')" id="bcc-link" class="iconlink add" tabindex="3"><roundcube:label name="addbcc" /></a>
	<a href="#reply-to" onclick="return UI.show_header_row('replyto')" id="replyto-link" class="iconlink add" tabindex="3"><roundcube:label name="addreplyto" /></a>
	<a href="#followup-to" onclick="return UI.show_header_row('followupto')" id="followupto-link" class="iconlink add" tabindex="3"><roundcube:label name="addfollowupto" /></a>
	</td>
	</tr><tr>
	<td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
	<td class="editfield"><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="1" /></td>
	</tr>
	</tbody>
	</table>

	<div id="composebuttons" class="formbuttons">
	<roundcube:button command="extwin" type="link" class="button extwin" classSel="button extwin pressed" innerClass="icon" title="openinextwin" label="openinextwin" condition="!env:extwin" />
	</div>

	<!-- (collapsable) message options -->
	<div id="composeoptions" role="region" aria-labelledby="aria-label-composeoptions">
	<h2 id="aria-label-composeoptions" class="voice"><roundcube:label name="arialabelcomposeoptions" /></h2>
	<roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
	<span class="composeoption">
	<label><roundcube:label name="editortype" />
	<roundcube:object name="editorSelector" editorid="composebody" tabindex="4" /></label>
	</span>
	<roundcube:endif />
	<span class="composeoption">
	<label for="rcmcomposepriority"><roundcube:label name="priority" />
	<roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" tabindex="4" /></label>
	</span>
	<span class="composeoption">
	<label><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" tabindex="4" /> <roundcube:label name="returnreceipt" /></label>
	</span>
	<roundcube:if condition="config:smtp_server != ''" />
	<span class="composeoption">
	<label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" tabindex="4" /> <roundcube:label name="dsn" /></label>
	</span>
	<roundcube:endif />
	<roundcube:if condition="!config:no_save_sent_messages" />
	<span class="composeoption">
	<label><roundcube:label name="savesentmessagein" /> <roundcube:object name="storetarget" maxlength="30" style="max-width:12em" tabindex="4" /></label>
	</span>
	<roundcube:endif />
	<roundcube:container name="composeoptions" id="composeoptions" />
	</div>

	</div>

	<!-- message compose body -->
	<div id="composeview-bottom">
	<div id="composebodycontainer">
	<label for="composebody" class="voice"><roundcube:label name="arialabelmessagebody" /></label>
	<roundcube:object name="composeBody" id="composebody" form="form" cols="70" rows="20" tabindex="1" />
	</div>
	<div id="compose-attachments" class="rightcol" role="region" aria-labelledby="aria-label-composeattachments">
	<h2 id="aria-label-composeattachments" class="voice"><roundcube:label name="attachments" /></h2>
	<div style="text-align:center; margin-bottom:20px">
	<roundcube:button name="addattachment" type="input" class="button" classSel="button pressed" label="addattachment" onclick="UI.show_uploadform(event);return false" tabindex="1" />
	</div>
	<roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" />
	<roundcube:object name="fileDropArea" id="compose-attachments" />
	</div>
	<!--
	<div id="composeformbuttons" class="footerleft formbuttons floating">
	<roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="11" />
	<roundcube:button type="input" command="savedraft" class="button" label="savemessage" tabindex="12" />
	<roundcube:button type="input" command="list" class="button" label="cancel" tabindex="13" />
	</div>
	-->
	</div>

	</form>

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

	</div><!-- end mainscreencontent -->

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

	<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='addattachment' />" aria-hidden="true">
	<h2 id="aria-label-uploaddialog" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h2>
	<roundcube:object name="composeAttachmentForm" id="uploadform" buttons="no" />
	<div class="formbuttons">
	<roundcube:button command="send-attachment" type="input" class="button mainaction" label="upload" />
	<roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />
	</div>
	</div>

	<div id="spellmenu" class="popupmenu" aria-hidden="true"></div>

	<div id="responsesmenu" class="popupmenu" aria-hidden="true">
	<h3 id="aria-label-responsesmenu" class="voice"><roundcube:label name="arialabelresponsesmenu" /></h3>
	<ul class="toolbarmenu" id="textresponsesmenu" role="menu" aria-labelledby="aria-label-responsesmenu">
	<li role="separator" class="separator" id=""><label><roundcube:label name="insertresponse" /></label></li>
	<roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
	<li role="separator" class="separator"><label><roundcube:label name="manageresponses" /></label></li>
	- <li role="menuitem"><roundcube:button command="save-response" type="link" label="savenewresponse" classAct="active" unselectable="on" /></li>
	+ <li role="menuitem"><roundcube:button command="save-response" type="link" label="newresponse" classAct="active" unselectable="on" /></li>
	<li role="menuitem"><roundcube:button command="responses" type="link" label="editresponses" classAct="active" /></li>
	</ul>
	</div>

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

	</body>
	</html>
	diff --git a/skins/larry/templates/contactedit.html b/skins/larry/templates/contactedit.html
	index b7aafed31..da7953eae 100644
	--- a/skins/larry/templates/contactedit.html
	+++ b/skins/larry/templates/contactedit.html
	@@ -1,57 +1,54 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	</head>
	<body class="iframe">

	-<h1 class="boxtitle">
	- <roundcube:if condition="env:action=='add'" /><roundcube:label name="addcontact" />
	- <roundcube:else /><roundcube:label name="editcontact" />
	-<roundcube:endif /></h1>
	+<h1 class="boxtitle"><roundcube:object name="steptitle" /></h1>

	<roundcube:form name="editform" method="post" id="contact-details" class="boxcontent">
	<roundcube:if condition="strlen(env:sourcename)" />
	<div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" condition="env:action!='add'" /><roundcube:object name="sourceselector" id="sourceselect" condition="env:action=='add'" /></div>
	<roundcube:endif />

	<fieldset id="contactphoto">
	<legend class="voice"><roundcube:label name="contactphoto" /></legend>
	<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
	<roundcube:if condition="env:photocol" />
	<roundcube:object name="fileDropArea" id="contactpic" />
	<div class="formlinks">
	<roundcube:button command="upload-photo" id="uploadformlink" type="link" label="replacephoto" class="iconlink upload disabled" classAct="iconlink upload active" onclick="UI.show_uploadform();return false" condition="env:photocol" /><br/>
	<roundcube:button command="delete-photo" type="link" label="delete" class="iconlink delete disabled" classAct="iconlink delete active" condition="env:photocol" />
	</div>
	<roundcube:endif />
	</fieldset>

	<roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" />
	<br style="clear:both" />

	<div id="contacttabs" class="tabbed">
	<roundcube:object name="contacteditform" size="40" textareacols="60" form="editform" />
	</div>

	</form>

	<div class="footerleft formbuttons">
	<roundcube:button command="save" type="input" class="button mainaction" label="save" />
	<roundcube:button command="show" type="input" class="button" label="cancel" condition="env:action=='edit'" />
	<roundcube:button name="cancel" type="input" class="button" label="cancel" onclick="history.back()" condition="env:action=='add'" />
	</div>

	<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='uploadphoto' />">
	<roundcube:object name="photoUploadForm" id="upload-form" size="30" buttons="no" />
	<div class="formbuttons">
	<roundcube:button command="upload-photo" type="input" class="button mainaction" label="upload" />
	<roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />
	</div>
	</div>

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

	</body>
	</html>
	diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html
	index 91f7f8f71..5878155c6 100644
	--- a/skins/larry/templates/identities.html
	+++ b/skins/larry/templates/identities.html
	@@ -1,42 +1,42 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	</head>
	<body class="noscroll">

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

	<div id="mainscreen" class="offset">

	<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="identities" /></h1>

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

	<div id="settings-right" role="main" aria-labelledby="aria-label-identitieslist">

	<div id="identitieslist" class="uibox listbox">
	<h2 class="boxtitle" id="aria-label-identitieslist"><roundcube:label name="identities" /></h2>
	<div class="scroller withfooter">
	<roundcube:object name="identitiesList" id="identities-table" class="listing" noheader="true" editIcon="" role="listbox" />
	</div>
	<div class="boxfooter">
	-<roundcube:button command="add" type="link" title="newidentity" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="newidentity" condition="config:identities_level:0<2" /><roundcube:button command="delete" type="link" title="delete" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" label="delete" condition="config:identities_level:0<2" />
	+<roundcube:button command="add" type="link" title="newidentity" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="addidentity" condition="config:identities_level:0<2" /><roundcube:button command="delete" type="link" title="delete" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" label="delete" condition="config:identities_level:0<2" />
	</div>
	</div>

	<div id="identity-details" class="uibox contentbox">
	<div class="iframebox">
	<roundcube:object name="identityframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" title="arialabelidentityeditfrom" />
	</div>
	</div>

	</div>

	</div>

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

	</body>
	</html>
	diff --git a/skins/larry/templates/responses.html b/skins/larry/templates/responses.html
	index 503ed2177..538a025f0 100644
	--- a/skins/larry/templates/responses.html
	+++ b/skins/larry/templates/responses.html
	@@ -1,42 +1,42 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	</head>
	<body class="noscroll">

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

	<div id="mainscreen" class="offset">

	<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="identities" /></h1>

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

	<div id="settings-right" role="main" aria-labelledby="aria-label-responseslist">

	<div id="identitieslist" class="uibox listbox">
	<h2 class="boxtitle" id="aria-label-responseslist"><roundcube:label name="responses" /></h2>
	<div class="scroller withfooter">
	<roundcube:object name="responsesList" id="identities-table" class="listing" cellspacing="0" noheader="true" role="listbox" />
	</div>
	<div class="boxfooter">
	-<roundcube:button command="add" type="link" title="savenewresponse" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="savenewresponse" /><roundcube:button command="delete" type="link" title="delete" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" label="delete" />
	+<roundcube:button command="add" type="link" title="newresponse" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="addresponse" /><roundcube:button command="delete" type="link" title="delete" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" label="delete" />
	</div>
	</div>

	<div id="identity-details" class="uibox contentbox">
	<div class="iframebox">
	<roundcube:object name="responseframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" title="arialabelresonseeditfrom" />
	</div>
	</div>

	</div>

	</div>

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

	</body>
	</html>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 12:54 AM (1 h, 41 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 165298
Default Alt Text: (161 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions