diff --git a/plugins/tasklist/localization/en_US.inc b/plugins/tasklist/localization/en_US.inc
index 5223f377..b49e1289 100644
--- a/plugins/tasklist/localization/en_US.inc
+++ b/plugins/tasklist/localization/en_US.inc
@@ -1,224 +1,225 @@
 <?php
 
 /**
  * Localizations for the Kolab Tasks plugin
  *
  * Copyright (C) 2014, Kolab Systems AG
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
 
 $labels = array();
 $labels['navtitle'] = 'Tasks';
 $labels['lists'] = 'Tasklists';
 $labels['list'] = 'Tasklist';
 $labels['tags'] = 'Tags';
 $labels['export'] = 'Export';
 $labels['exporttitle'] = 'Export to iCalendar';
 $labels['exportattachments'] = 'With attachments';
 $labels['currentview'] = 'current view';
 $labels['tasklistsubscribe'] = 'List permanently';
 $labels['listsearchresults'] = 'Available Tasklists';
 $labels['findlists'] = 'Find tasklists...';
 $labels['findtasks'] = 'Find tasks...';
 $labels['searchterms'] = 'Search terms';
 $labels['notasklistsfound'] = 'No tasklists found';
 $labels['nrtasklistsfound'] = '$nr tasklists found';
 $labels['removelist'] = 'Remove from list';
 $labels['showcaldavurl'] = 'Show CalDAV URL';
 $labels['caldavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> client application (e.g. Evolution or Mozilla Thunderbird) to synchronize this specific tasklist with your computer or mobile device.';
 
 $labels['newtask'] = 'New Task';
 $labels['createtask'] = 'Create Task <Enter>';
 $labels['createnewtask'] = 'Create new Task (e.g. Saturday, Mow the lawn)';
 $labels['createfrommail'] = 'Save as task';
 $labels['printtitle'] = 'Print tasks';
 $labels['printdescriptions'] = 'Print descriptions';
 $labels['mark'] = 'Mark';
 $labels['unmark'] = 'Unmark';
 $labels['edit'] = 'Edit';
 $labels['delete'] = 'Delete';
 $labels['title'] = 'Title';
 $labels['description'] = 'Description';
 $labels['datetime'] = 'Due';
 $labels['duetime'] = 'Due time';
 $labels['start'] = 'Start';
 $labels['starttime'] = 'Start time';
 $labels['alarms'] = 'Reminder';
 $labels['repeat'] = 'Repeat';
 $labels['links'] = 'Reference';
 $labels['status'] = 'Status';
 $labels['status-needs-action'] = 'Needs action';
 $labels['status-in-process'] = 'In process';
 $labels['status-completed'] = 'Completed';
 $labels['status-cancelled'] = 'Cancelled';
 $labels['assignedto'] = 'Assigned to';
 $labels['created'] = 'Created';
 $labels['changed'] = 'Last Modified';
 $labels['taskoptions'] = 'Options';
 
 $labels['all'] = 'All';
 $labels['flagged'] = 'Flagged';
 $labels['complete'] = 'Complete';
 $labels['completeness'] = 'Progress';
 $labels['overdue'] = 'Overdue';
 $labels['today'] = 'Today';
 $labels['tomorrow'] = 'Tomorrow';
 $labels['next7days'] = 'Next 7 days';
 $labels['later'] = 'Later';
 $labels['assigned'] = 'Assigned';
 $labels['assignedtitle'] = 'Tasks you assigned to others';
 $labels['mytasks'] = 'My tasks';
 $labels['mytaskstitle'] = 'Tasks assigned to you';
 $labels['nodate'] = 'no date';
 $labels['removetag'] = 'Remove';
 $labels['removelink'] = 'Remove email reference';
 $labels['auto'] = 'Auto';
 
 $labels['taskdetails'] = 'Task details';
 $labels['newtask'] = 'New Task';
 $labels['edittask'] = 'Edit Task';
 $labels['save'] = 'Save';
 $labels['cancel'] = 'Cancel';
 $labels['saveandnotify'] = 'Save and Notify';
 $labels['addsubtask'] = 'Add subtask';
 $labels['deletetask'] = 'Delete task';
 $labels['deletethisonly'] = 'Delete this task only';
 $labels['deletewithchilds'] = 'Delete with all subtasks';
 $labels['taskactions'] = 'Task options...';
 
 $labels['tabsummary'] = 'Summary';
 $labels['tabrecurrence'] = 'Recurrence';
 $labels['tabassignments'] = 'Assignments';
 $labels['tabattachments'] = 'Attachments';
 $labels['tabsharing'] = 'Sharing';
 
-$labels['editlist'] = 'Edit list';
+$labels['editlist'] = 'Edit/Share list';
+$labels['deletelist'] = 'Delete list';
 $labels['createlist'] = 'Add list';
 $labels['listactions'] = 'List options...';
 $labels['listname'] = 'Name';
 $labels['showalarms'] = 'Show reminders';
 $labels['import'] = 'Import';
 $labels['importtasks'] = 'Import Tasks';
 $labels['viewactions'] = 'View actions';
 $labels['focusview'] = 'View only this list';
 $labels['activate'] = 'Activate';
 
 // date words
 $labels['on'] = 'on';
 $labels['at'] = 'at';
 $labels['this'] = 'this';
 $labels['next'] = 'next';
 $labels['yes'] = 'yes';
 
 // messages
 $labels['savingdata'] = 'Saving data...';
 $labels['errorsaving'] = 'Failed to save data.';
 $labels['notasksfound'] = 'No tasks found for the given criteria';
 $labels['invalidstartduedates'] = 'Start date must not be greater than due date.';
 $labels['invalidstartduetimes'] = 'Start and due dates must either both or none specify a time.';
 $labels['recurrencerequiresdate'] = 'Recurring tasks require either a start or due date.';
 $labels['deletetasktconfirm'] = 'Do you really want to delete this task?';
 $labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
 $labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';
 $labels['deletelistconfirmrecursive'] = 'Do you really want to delete this list with all its sub-lists and tasks?';
 $labels['aclnorights'] = 'You do not have administrator rights on this task list.';
 $labels['changetaskconfirm'] = 'Update task';
 $labels['changeconfirmnotifications'] = 'Do you want to notify the attendees about the modification?';
 $labels['partstatupdatenotification'] = 'Do you want to notify the organizer about the status change?';
 
 // (hidden) titles and labels for accessibility annotations
 $labels['quickaddinput'] = 'New task date and title';
 $labels['arialabelquickaddbox'] = 'Quick add new task';
 $labels['arialabelsearchform'] = 'Task search form';
 $labels['arialabelquicksearchbox'] = 'Task search input';
 $labels['arialabellistsearchform'] = 'Tasklists search form';
 $labels['arialabeltaskselector'] = 'List mode';
 $labels['arialabeltasklisting'] = 'Tasks listing';
 $labels['arialabelsortmenu'] = 'Tasks sorting options';
 $labels['arialabeltasklistform'] = 'Tasks list properties';
 $labels['arialabeltaskform'] = 'Task editing form';
 
 // attendees
 $labels['attendee'] = 'Assignee';
 $labels['role'] = 'Role';
 $labels['availability'] = 'Avail.';
 $labels['confirmstate'] = 'Status';
 $labels['addattendee'] = 'Add assignee';
 $labels['roleorganizer'] = 'Organizer';
 $labels['rolerequired'] = 'Required';
 $labels['roleoptional'] = 'Optional';
 $labels['rolechair'] = 'Chair';
 $labels['rolenonparticipant'] = 'Observer';
 $labels['sendinvitations'] = 'Send invitations';
 $labels['sendnotifications'] = 'Notify assignees about modifications';
 $labels['sendcancellation'] = 'Notify assignees about task cancellation';
 $labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
 $labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\n\$description\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
 $labels['itipupdatesubject'] = '"$title" has been updated';
 $labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
 $labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with the updated task details which you can import to your tasks application.";
 $labels['itipcancelsubject'] = '"$title" has been cancelled';
 $labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nThe task has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated task details.";
 $labels['saveintasklist'] = 'save in ';
 
 // history dialog
 $labels['taskhistory'] = 'History';
 $labels['objectchangelog'] = 'Change History';
 $labels['objectdiff'] = 'Changes from $rev1 to $rev2';
 $labels['objectnotfound'] = 'Failed to load task data';
 $labels['objectchangelognotavailable'] = 'Change history is not available for this task';
 $labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
 $labels['revisionrestoreconfirm'] = 'Do you really want to restore revision $rev of this task? This will replace the current task with the old version.';
 $labels['objectrestoresuccess'] = 'Revision $rev successfully restored';
 $labels['objectrestoreerror'] = 'Failed to restore the old revision';
 
 // invitation handling (overrides labels from libcalendaring)
 $labels['itipobjectnotfound'] = 'The task referred by this message was not found in your tasks list.';
 
 $labels['itipmailbodyaccepted'] = "\$sender has accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender has tentatively accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender has declined the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
 $labels['itipmailbodycancel'] = "\$sender has rejected your assignment to the following task:\n\n*\$title*\n\nDue: \$date";
 $labels['itipmailbodyin-process'] = "\$sender has set the status of the following task to in-process:\n\n*\$title*\n\nDue: \$date";
 $labels['itipmailbodycompleted'] = "\$sender has completed the following task:\n\n*\$title*\n\nDue: \$date";
 $labels['itipmailbodydelegated'] = "\$sender has delegated the following task:\n\n*\$title*\n\nDue: \$date";
 $labels['itipmailbodydelegatedto'] = "\$sender has delegated the following task to you:\n\n*\$title*\n\nDue: \$date";
 
 $labels['attendeeaccepted'] = 'Assignee has accepted';
 $labels['attendeetentative'] = 'Assignee has tentatively accepted';
 $labels['attendeedeclined'] = 'Assignee has declined';
 $labels['attendeedelegated'] = 'Assignee has delegated to $delegatedto';
 $labels['attendeein-process'] = 'Assignee is in-process';
 $labels['attendeecompleted'] = 'Assignee has completed';
 
 $labels['acceptinvitation'] = 'Do you accept this assignment?';
 $labels['itipdeclinetask'] = 'Decline your assignment to this task to the organizer';
 $labels['declinedeleteconfirm'] = 'Do you also want to delete this declined task from your tasks list?';
 $labels['itipcomment'] = 'Invitation/notification comment';
 $labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to assignees';
 $labels['itipsendsuccess'] = 'Notification sent to assignees';
 $labels['errornotifying'] = 'Failed to send notifications to task assignees';
 $labels['removefromcalendar'] = 'Remove from my tasks';
 $labels['delegateinvitation'] = 'Delegate assignment';
 
 $labels['importtext'] = 'You can upload tasks in <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a> format (.ics).';
 $labels['andnmore'] = '$nr more...';
 $labels['savetotasklist'] = 'Save to tasks';
 $labels['comment'] = 'Comment';
 $labels['rsvpcomment'] = 'Comment';
 $labels['errorimportingtask'] = 'Failed to import task(s)';
 $labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
 $labels['importsuccess'] = 'Successfully imported $nr tasks';
 $labels['importnone'] = 'No tasks found to be imported';
 $labels['importerror'] = 'An error occured while importing';
 $labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
 $labels['nowritetasklistfound'] = 'No tasklist found to save the task';
 $labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
 $labels['updatedsuccessfully'] = 'The task was successfully updated in \'$list\'';
 $labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
 $labels['itipresponseerror'] = 'Failed to send the response to this task assignment';
 $labels['itipinvalidrequest'] = 'This invitation is no longer valid';
 $labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
 $labels['successremoval'] = 'The task has been deleted successfully.';
 $labels['invalidlistproperties'] = 'Invalid list properties! Please set a valid name.';
diff --git a/plugins/tasklist/skins/elastic/templates/mainview.html b/plugins/tasklist/skins/elastic/templates/mainview.html
index aea44e5f..9845fd77 100644
--- a/plugins/tasklist/skins/elastic/templates/mainview.html
+++ b/plugins/tasklist/skins/elastic/templates/mainview.html
@@ -1,332 +1,332 @@
 <roundcube:include file="includes/layout.html" />
 <roundcube:include file="includes/menu.html" />
 
 <h1 class="voice"><roundcube:label name="tasklist.navtitle" /></h1>
 
 <!-- task folders list -->
 <div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-notebooks">
 	<div class="header">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-tasklists" class="header-title"><roundcube:label name="tasklist.lists" /></span>
 		<roundcube:button name="tasklistactionsmenu" id="tasklistoptionsmenulink" type="link"
 			title="tasklist.listactions" class="button icon sidebar-menu" data-popup="tasklistactions-menu"
 			innerClass="inner" label="actions" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="tasklistsearch" wrapper="searchbar toolbar"
 		ariatag="h2" label="foldersearchform" label-domain="tasklist" buttontitle="findlists" />
 	<div id="tasklists-content" class="scroller">
 		<roundcube:object name="plugin.tasklists" id="tasklists" class="treelist listing iconized" />
 	</div>
 </div>
 
 <!-- tasks list -->
 <div class="list listbox selected" aria-labelledby="aria-label-taskslist">
 	<div class="header">
 		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="tasklist.lists" /></span></a>
 		<span id="aria-label-taskslist" class="header-title"><roundcube:label name="tasklist.navtitle" /></span>
 		<div id="listcontrols" class="toolbar" role="toolbar">
 			<a href="#threads" class="button threads active" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><span class="inner"><roundcube:label name="threads" /></span></a>
 			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
 				label="options" innerClass="inner" onclick="tasklist_options_menu()" />
 		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 	</div>
 	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
 		label="tasksearchform" label-domain="tasklist" buttontitle="tasklist.findtasks" ariatag="h2" />
 	<div class="pagenav pagenav-list toolbar" onclick="UI.switch_nav_list(this)">
 		<a class="button icon expand"><span class="inner"></span></a>
 		<span id="taskselector-name" class="pagenav-text"><roundcube:label name="tasklist.all" /></span>
 	</div>
 	<div id="taskselector-content" class="navlist scroller" aria-labelledby="aria-label-taskselector">
 		<h2 class="voice" id="aria-label-taskselector"><roundcube:label name="tasklist.arialabeltaskselector" /></h2>
 		<ul id="taskselector" class="listing" role="listbox" aria-controls="tasklist">
 			<li class="all selected" role="radio" aria-checked="true" aria-labelledby="aria-radio-all"><a href="#all" id="aria-radio-all"><roundcube:label name="tasklist.all" /></a></li>
 			<li class="overdue inactive" role="radio" aria-checked="false" aria-labelledby="aria-radio-overdue"><a href="#overdue" id="aria-radio-overdue"><roundcube:label name="tasklist.overdue" /><span class="count"></span></a></li>
 			<li class="today" role="radio" aria-checked="false" aria-labelledby="aria-radio-today"><a href="#today" id="aria-radio-today"><roundcube:label name="tasklist.today" /><span class="count"></span></a></li>
 			<li class="tomorrow" role="radio" aria-checked="false" aria-labelledby="aria-radio-tomorrow"><a href="#tomorrow" id="aria-radio-tomorrow"><roundcube:label name="tasklist.tomorrow" /><span class="count"></span></a></li>
 			<roundcube:if condition="env:tasklist_driver != 'kolab'" />
 			<li class="week" role="radio" aria-checked="false" aria-labelledby="aria-radio-week"><a href="#week" id="aria-radio-week"><roundcube:label name="tasklist.next7days" /></a></li>
 			<roundcube:endif />
 			<li class="later" role="radio" aria-checked="false" aria-labelledby="aria-radio-later"><a href="#later" id="aria-radio-later"><roundcube:label name="tasklist.later" /><span class="count"></span></a></li>
 			<li class="nodate" role="radio" aria-checked="false" aria-labelledby="aria-radio-nodate"><a href="#nodate" id="aria-radio-nodate"><roundcube:label name="tasklist.nodate" ucfirst="true" /></a></li>
 			<li class="flagged" role="radio" aria-checked="false" aria-labelledby="aria-radio-flagged"><a href="#flagged" id="aria-radio-flagged"><roundcube:label name="tasklist.flagged" /></a></li>
 			<roundcube:if condition="env:tasklist_driver == 'kolab'" />
 			<li class="mytasks" role="radio" aria-checked="false" aria-labelledby="aria-radio-mytasks"><a href="#mytasks" id="aria-radio-mytasks" title="<roundcube:label name='tasklist.mytaskstitle'/>"><roundcube:label name="tasklist.mytasks" /></a></li>
 			<li class="assigned" role="radio" aria-checked="false" aria-labelledby="aria-radio-assigned"><a href="#assigned" id="aria-radio-assigned" title="<roundcube:label name='tasklist.assignedtitle'/>"><roundcube:label name="tasklist.assigned" /></a></li>
 			<roundcube:endif />
 			<li class="complete" role="radio" aria-checked="false" aria-labelledby="aria-radio-complete"><a href="#complete" id="aria-radio-complete"><roundcube:label name="tasklist.complete" /><span class="count"></span></a></li>
 		</ul>
 	</div>
 	<div class="scroller">
 		<h2 id="aria-label-taskslist" class="voice"><roundcube:label name="tasklist.navtitle" /></h2>
 		<roundcube:object name="plugin.tasks" id="tasklist" role="tree"
 			class="listing" role="listbox" data-list="tasklist"
 			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="newtask" />
 	</div>
 </div>
 
 <!-- task details frame -->
 <div class="content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
 		<div id="taskstoolbar" class="toolbar">
 			<roundcube:button command="newtask" type="link"
 				class="button create disabled" classAct="button create"
 				label="create" title="tasklist.newtask" innerClass="inner" data-fab="true" />
 			<roundcube:button command="print" type="link" data-hidden="small"
 				class="button print disabled" classAct="button print"
 				label="print" title="tasklist.printtitle" innerClass="inner" />
 			<roundcube:button command="delete-task" type="link"
 				label="delete" title="tasklist.deletetask"
 				class="button delete disabled" classAct="button delete" innerclass="inner" />
 			<span class="spacer"></span>
 			<roundcube:if condition="config:kolab_bonnie_api" />
 				<roundcube:button command="task-history" type="link"
 					class="button history task-history disabled" classAct="button history task-history"
 					label="tasklist.taskhistory" title="libkolab.showhistory" innerClass="inner" />
 			<roundcube:endif />
 			<roundcube:button command="import" type="link"
 				class="button import disabled" classAct="button import"
 				label="import" title="tasklist.importtasks" innerClass="inner" />
 			<roundcube:button command="export" type="link"
 				class="button export disabled" classAct="button export"
 				label="tasklist.export" title="tasklist.exporttitle" innerClass="inner" />
 			<roundcube:container name="toolbar" id="taskstoolbar" />
 		</div>
 	</div>
 	<!-- task content frame -->
 	<h2 id="aria-label-taskform" class="voice"><roundcube:label name="tasklist.arialabeltaskform" /></h2>
 	<div class="content scroller watermark" role="main" aria-labelledby="aria-label-taskform">
 		<roundcube:include file="/templates/taskedit.html" />
 		<div id="taskshow" class="hidden formcontent propform text-only" data-nodialog="true">
 			<div id="event-status-badge"><span></span></div>
 			<div id="task-parent-title" class="task-parent-title"></div>
 			<h2 id="task-title" class="task-title"></h2>
 			<div id="task-description" class="task-description"></div>
 			<div id="task-attendees" class="form-group row task-attendees">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.assignedto" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-tags" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.tags" /></label>
 				<span class="task-text tagedit col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-start" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.start" /></label>
 				<span class="col-sm-8 form-control-plaintext"><span class="task-text"></span> <span id="task-starttime"></span></span>
 			</div>
 			<div id="task-date" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.datetime" /></label>
 				<span class="col-sm-8 form-control-plaintext"><span class="task-text"></span> <span id="task-time"></span></span>
 			</div>
 			<div id="task-recurrence" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.repeat" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-alarm" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.alarms" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-organizer" class="form-group row task-attendees">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.roleorganizer" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-list" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.list" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-completeness" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.complete" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-status" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.status" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-links" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.links" /></label>
 				<span class="task-text col-sm-8"></span>
 			</div>
 			<div id="task-attachments" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="attachments" /></label>
 				<div class="task-text col-sm-8"></div>
 			</div>
 			<div id="task-created" class="form-group row faded">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.created" /></label>
 				<span class="task-text task-created col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-changed" class="form-group row faded">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.changed" /></label>
 				<span class="task-text task-changed col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-rsvp-comment" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.rsvpcomment" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="tasklist-invitebox invitebox boxinformation" style="display:none" />
 		</div>
 		<div class="formbuttons">
 			<roundcube:button command="save-task" label="save"
 				class="btn btn-primary submit disabled" classAct="btn btn-primary submit" innerCLass="inner" />
 			<roundcube:button command="edit-task" label="edit"
 				class="btn btn-primary edit disabled" classAct="btn btn-primary edit" innerclass="inner" />
 			<roundcube:button command="add-child-task" label="tasklist.addsubtask"
 				class="create btn btn-secondary disabled" classAct="create btn btn-secondary" innerclass="inner" />
 		</div>
 	</div>
 </div>
 
 <roundcube:if condition="env:tasklist_driver == 'kolab' && config:kolab_bonnie_api" />
 <div id="taskhistory" class="popupmenu" aria-hidden="true">
 	<roundcube:object name="plugin.object_changelog_table" class="changelog-table" />
 	<div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
 </div>
 
 <div id="taskdiff" class="popupmenu" aria-hidden="true">
 	<div class="form-group row task-parent-title">
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span> &raquo;
 	</div>
 	<h2 class="task-title">Task Title</h2>
 	<h2 class="task-title-new task-text-new"></h2>
 	<div class="form-group row task-description">
 		<label><roundcube:label name="calendar.description" /></label>
 		<div class="task-text-diff" style="white-space:pre-wrap"></div>
 		<div class="task-text-old"></div>
 		<div class="task-text-new"></div>
 	</div>
 	<div class="form-group row task-flagged">
 		<label><roundcube:label name="tasklist.flagged" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-start">
 		<label><roundcube:label name="tasklist.start" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-date">
 		<label><roundcube:label name="tasklist.datetime" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-recurrence">
 		<label><roundcube:label name="tasklist.repeat" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-alarms">
 		<label><roundcube:label name="tasklist.alarms" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-attendees">
 		<label><roundcube:label name="tasklist.assignedto" /><span class="index"></span></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-complete">
 		<label><roundcube:label name="tasklist.complete" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-status">
 		<label><roundcube:label name="tasklist.status" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-links">
 		<label><roundcube:label name="tasklist.links" /><span class="index"></span></label>
 		<span class="task-text"></span>
 	</div>
 	<div class="form-group row task-attachments">
 		<label><roundcube:label name="attachments" /><span class="index"></span></label>
 		<div class="task-text-old"></div>
 		<div class="task-text-new"></div>
 	</div>
 </div>
 <roundcube:endif />
 
 <div id="tasklistactions-menu" class="popupmenu">
 	<h3 id="aria-label-tasklistoptions" class="voice"><roundcube:label name="tasklist.listactions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-tasklistoptions">
 		<roundcube:button type="link-menuitem" command="list-create" label="tasklist.createlist" class="create disabled" classAct="create active" />
-		<roundcube:button type="link-menuitem" command="list-edit" label="edit" class="edit disabled" classAct="edit active" />
-		<roundcube:button type="link-menuitem" command="list-delete" label="delete" class="delete disabled" classAct="delete active" />
+		<roundcube:button type="link-menuitem" command="list-edit" label="tasklist.editlist" class="edit disabled" classAct="edit active" />
+		<roundcube:button type="link-menuitem" command="list-delete" label="tasklist.deletelist" class="delete disabled" classAct="delete active" />
 		<roundcube:if condition="env:tasklist_driver == 'kolab'" />
 			<roundcube:button type="link-menuitem" command="list-remove" label="tasklist.removelist" class="remove disabled" classAct="remove active" />
 		<roundcube:endif />
 		<roundcube:if condition="config:calendar_caldav_url" />
 			<roundcube:button type="link-menuitem" command="list-showurl" label="tasklist.showcaldavurl" class="showurl disabled" classAct="showurl active" />
 		<roundcube:endif />
 		<roundcube:if condition="env:tasklist_driver == 'kolab'" />
 			<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
 		<roundcube:endif />
 	</ul>
 </div>
 
 <div id="listoptions-menu" class="popupmenu propform">
 	<h3 id="aria-label-taskviewsortmenu" class="voice"><roundcube:label name="tasklist.arialabelsortmenu" /></h3>
 	<div class="form-group row">
 		<label for="options-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
 		<div class="col-sm-8">
 			<select id="options-sortcol" class="form-control">
 				<option value="auto"><roundcube:label name="tasklist.auto" /></option>
 				<option value="datetime"><roundcube:label name="tasklist.datetime" /></option>
 				<option value="startdatetime"><roundcube:label name="tasklist.start" /></option>
 				<option value="flagged"><roundcube:label name="tasklist.flagged" /></option>
 				<option value="complete"><roundcube:label name="tasklist.completeness" /></option>
 				<option value="changed"><roundcube:label name="tasklist.changed" /></option>
 			</select>
 		</div>
 	</div>
 	<div class="form-group row">
 		<label for="options-ord" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
 		<div class="col-sm-8">
 			<select id="options-ord" class="form-control">
 				<option value="asc"><roundcube:label name="sortasc" /></option>
 				<option value="desc"><roundcube:label name="sortdesc" /></option>
 			</select>
 		</div>
 	</div>
 	<roundcube:add_label name="listoptionstitle" />
 </div>
 
 <div id="threadselect-menu" class="popupmenu">
 	<h3 id="aria-label-threadselectmenu" class="voice"><roundcube:label name="tasklist.viewactions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-threadselectmenu">
 		<roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all" classAct="expand all active" />
 		<roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none" classAct="expand none active" />
 	</ul>
 </div>
 
 <div id="tasklistform" class="popupmenu formcontent">
 	<roundcube:label name="loading" />
 	<roundcube:container name="tasklistform" id="tasklistform" />
 </div>
 
 <div id="tasksimport" class="popupmenu formcontent">
 	<roundcube:object name="plugin.tasks_import_form" id="tasks-import-form" />
 </div>
 
 <div id="tasksexport" class="popupmenu formcontent">
 	<roundcube:object name="plugin.tasks_export_form" id="tasks-export-form" />
 </div>
 
 <script>
 rcmail.addEventListener('tasks-insertrow', function(o) {
     UI.pretty_checkbox($(o.div).find('input'));
 });
 
 $('#taskselector a').on('click', function() {
     var node = $(this).clone();
     node.find('span').remove();
     $('#taskselector-name').text(node.text());
 });
 </script>
 
 <roundcube:include file="includes/footer.html" />