diff --git a/plugins/kolab_notes/localization/en_US.inc b/plugins/kolab_notes/localization/en_US.inc
index 1dffc7aa..d5833e7a 100644
--- a/plugins/kolab_notes/localization/en_US.inc
+++ b/plugins/kolab_notes/localization/en_US.inc
@@ -1,69 +1,70 @@
 <?php
 
 /**
  * Localizations for the Kolab Folders plugin
  *
  * Copyright (C) 2015, Kolab Systems AG
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
  */
 
 $labels = array();
 $labels['navtitle'] = 'Notes';
 $labels['tags'] = 'Tags';
 $labels['lists'] = 'Notebooks';
 $labels['notes'] = 'Notes';
 $labels['create'] = 'New Note';
 $labels['createnote'] = 'Create a new note';
 $labels['send'] = 'Send';
 $labels['sendnote'] = 'Send note by email';
 $labels['newnote'] = 'New Note';
 $labels['notags'] = 'No tags';
 $labels['removetag'] = 'Remove tag';
 $labels['created'] = 'Created';
 $labels['changed'] = 'Last Modified';
 $labels['title'] = 'Title';
 $labels['now'] = 'Now';
 $labels['sortby'] = 'Sort by';
 $labels['newnotebook'] = 'Create a new notebook';
 $labels['addnotebook'] = 'Add notebook';
-$labels['editlist'] = 'Edit Notebook';
+$labels['deletelist'] = 'Delete notebook';
+$labels['editlist'] = 'Edit/Share notebook';
 $labels['listname'] = 'Name';
 $labels['tabsharing'] = 'Sharing';
 $labels['discard'] = 'Discard';
 $labels['abort'] = 'Abort';
 $labels['unsavedchanges'] = 'Unsaved Changes!';
 $labels['appendnote'] = 'Add a Note';
 $labels['editnote'] = 'Edit Note';
 $labels['savein'] = 'Save in';
 $labels['foldersubscribe'] = 'List permanently';
 $labels['findnotebooks'] = 'Find notebooks...';
 $labels['findnotes'] = 'Find notes';
 $labels['listsearchresults'] = 'Additional notebooks';
 $labels['nrnotebooksfound'] = '$nr notebooks found';
 $labels['nonotebooksfound'] = 'No notebooks found';
 $labels['removelist'] = 'Remove from list';
 $labels['removelink'] = 'Remove email reference';
 $labels['listactions'] = 'Notebooks list actions';
 
 $labels['savingdata'] = 'Saving data...';
 $labels['recordnotfound'] = 'Record not found';
 $labels['norecordsfound'] = 'No notes found';
 $labels['nochanges'] = 'No changes to be saved';
 $labels['entertitle'] = 'Please enter a title for this note!';
 $labels['deletenotesconfirm'] = 'Do you really want to delete the selected notes?';
 $labels['deletenotebookconfirm'] = 'Do you really want to delete this notebook with all its notes? This action cannot be undone.';
 $labels['discardunsavedchanges'] = 'The current note has not yet been saved. Discard the changes?';
 $labels['invalidlistproperties'] = 'Invalid notebook properties! Please set a valid name.';
 $labels['entertitle'] = 'Please enter a title for this note!';
 $labels['aclnorights'] = 'You do not have administrator rights for this notebook.';
 
 $labels['arialabelnoteslist'] = 'List of notes';
 $labels['arialabelnotesearchform'] = 'Notes search form';
 $labels['arialabelnotesquicksearchbox'] = 'Notes search input';
 $labels['arialabelnotessortmenu'] = 'Notes list sorting options';
 $labels['arialabelnotesoptionsmenu'] = 'Notebook actions menu';
 $labels['arialabelnotebookform'] = 'Notebook properties';
 $labels['arialabelmessagereferences'] = 'Linked email messages';
 $labels['arialabelfoldersearchform'] = 'Notebooks search form';
 $labels['arialabelnoteform'] = 'Note edit form';
diff --git a/plugins/kolab_notes/skins/elastic/templates/notes.html b/plugins/kolab_notes/skins/elastic/templates/notes.html
index 0d194053..20dc2976 100644
--- a/plugins/kolab_notes/skins/elastic/templates/notes.html
+++ b/plugins/kolab_notes/skins/elastic/templates/notes.html
@@ -1,151 +1,151 @@
 <roundcube:include file="includes/layout.html" />
 <roundcube:include file="includes/menu.html" />
 
 <h1 class="voice"><roundcube:label name="kolab_notes.navtitle" /></h1>
 
 <!-- notebooks 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-notebooks" class="header-title"><roundcube:label name="kolab_notes.lists" /></span>
 		<roundcube:button name="notebookactionsmenu" id="notesoptionsmenulink" type="link"
 			title="kolab_notes.listactions" class="button icon sidebar-menu" data-popup="notebookactions-menu"
 			innerClass="inner" label="actions" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="notebooksearch" wrapper="searchbar toolbar"
 		ariatag="h2" label="foldersearchform" label-domain="kolab_notes" buttontitle="findnotebooks" />
 	<div id="notebooks-content" class="scroller">
 		<roundcube:object name="plugin.notebooks" id="notebooks" class="listing treelist iconized" />
 	</div>
 </div>
 
 <!-- notes list -->
 <div class="list listbox selected" aria-labelledby="aria-label-noteslist">
 	<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="kolab_notes.notebooks" /></span></a>
 		<span id="aria-label-noteslist" class="header-title"><roundcube:label name="kolab_notes.notes" /></span>
 		<div id="listcontrols" class="toolbar" role="toolbar">
 			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
 				label="options" innerClass="inner" onclick="return kolab_notes_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="notesearchform" label-domain="kolab_notes" buttontitle="kolab_notes.findnotes" ariatag="h2" />
 	<div class="scroller">
 		<h2 id="aria-label-noteslist" class="voice"><roundcube:label name="kolab_notes.notes" /></h2>
 		<roundcube:object name="plugin.listing" id="kolabnoteslist"
 			class="listing" summary="kolab_notes.arialabelnoteslist"
 			role="listbox" data-list="noteslist"
 			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="createnote" />
 	</div>
 </div>
 
 <!-- note 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="notestoolbar" class="toolbar">
 			<roundcube:button command="createnote" type="link"
 				class="button create disabled" classAct="button create"
 				label="create" title="kolab_notes.createnote" innerclass="inner" data-fab="true" />
 			<roundcube:button command="print" type="link" data-hidden="small"
 				class="button print disabled" classAct="button print"
 				label="print" title="print" innerClass="inner" />
 			<roundcube:button command="delete" type="link"
 				class="button delete disabled" classAct="button delete"
 				title="delete" label="delete" innerClass="inner" />
 			<span class="spacer"></span>
 			<roundcube:button command="sendnote" type="link"
 				class="button send disabled" classAct="button send"
 				label="kolab_notes.send" title="kolab_notes.sendnote" innerClass="inner" />
 			<roundcube:container name="toolbar" id="notestoolbar" />
 			<roundcube:if condition="config:kolab_bonnie_api" />
 				<roundcube:button command="history" type="link"
 					class="button history note-history disabled" classAct="button history note-history"
 					label="libkolab.objectchangelog" title="libkolab.showhistory" innerClass="inner" />
 			<roundcube:endif />
 		</div>
 	</div>
 	<!-- note content frame -->
 	<h2 id="aria-label-noteform" class="voice"><roundcube:label name="kolab_notes.arialabelnoteform" /></h2>
 	<div class="content scroller watermark" role="main" aria-labelledby="aria-label-noteform">
 		<div id="notedetailsbox" class="formcontent">
 			<roundcube:object name="plugin.notetitle" id="notedetailstitle" class="notetitle" />
 			<roundcube:object name="plugin.editform" id="noteform" class="noteform" />
 			<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
 			<h3 id="aria-label-messagereferences" class="voice"><roundcube:label name="kolab_notes.arialabelmessagereferences" /></h3>
 			<div id="notereferences" class="notereferences" role="region" aria-labelledby="aria-label-messagereferences">
 				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
 			</div>
 			<roundcube:container name="notedetailview" id="notedetailsbox" />
 		</div>
 		<div class="formbuttons">
 			<roundcube:button command="save" class="btn btn-primary submit" label="save" id="btn-save-note" />
 		</div>
 	</div>
 </div>
 
 <!-- popups and dialogs -->
 <roundcube:if condition="config:kolab_bonnie_api" />
 <div id="notehistory" class="popupmenu" aria-hidden="true">
 	<roundcube:object name="plugin.object_changelog_table" class="records-table changelog-table" />
 	<div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
 </div>
 
 <div id="notediff" class="popupmenu" aria-hidden="true">
 	<h2 class="note-title">Note Title</h2>
 	<h2 class="note-title-new diff-text-new"></h2>
 	<div class="form-section note-tags">
 		<span class="diff-text-old"></span> &#8674; <span class="diff-text-new"></span>
 	</div>
 	<div class="form-section note-description">
 		<div class="diff-text-diff" style="white-space:pre-wrap"></div>
 		<div class="diff-text-old"></div>
 		<div class="diff-text-new"></div>
 	</div>
 	<div class="form-section notereferences">
 		<div class="diff-text-old"></div>
 		<div class="diff-text-new"></div>
 	</div>
 </div>
 <roundcube:endif />
 
 <div id="notebookactions-menu" class="popupmenu">
 	<h3 id="aria-label-actionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotesoptionsmenu" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-actionsmenu">
 		<roundcube:button type="link-menuitem" command="list-create" label="kolab_notes.addnotebook" 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="kolab_notes.editlist" class="edit disabled" classAct="edit active" />
+		<roundcube:button type="link-menuitem" command="list-delete" label="kolab_notes.deletelist" class="delete disabled" classAct="delete active" />
 		<roundcube:button type="link-menuitem" command="list-remove" label="kolab_notes.removelist" class="remove disabled" classAct="remove active" />
 		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
 	</ul>
 </div>
 
 <div id="options-menu" class="popupmenu propform" role="menu" aria-labelledby="aria-label-optionsmenu">
 	<h3 id="aria-label-optionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotessortmenu" /></h3>
 	<div class="form-group row">
 		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
 		<div class="col-sm-8">
 			<select id="listoptions-sortcol" name="sort_col" class="form-control">
 				<option value="changed"><roundcube:label name="kolab_notes.changed" /></option>
 				<option value="title"><roundcube:label name="kolab_notes.title" /></option>
 			</select>
 		</div>
 	</div>
 	<div class="form-group row">
 		<label for="listoptions-sortord" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
 		<div class="col-sm-8">
 			<select id="listoptions-sortord" name="sort_ord" class="form-control" disabled>
 				<option value="ASC"><roundcube:label name="asc" /></option>
 				<option value="DESC"><roundcube:label name="desc" /></option>
 			</select>
 		</div>
 	</div>
 </div>
 
 <roundcube:include file="includes/footer.html" />