diff --git a/templates/about.html b/templates/about.html
deleted file mode 100644
index 78f5388..0000000
--- a/templates/about.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:label name="about" /></h1>
-
-<div class="frame-content">
-	<roundcube:object name="aboutcontent" />
-	<h2 class="sysname">Roundcube Webmail <roundcube:object name="version" /></h2>
-	<p class="copyright"><roundcube:object name="copyright" /></p>
-	<p class="license"><roundcube:object name="license" /></p>
-	<div class="readtext">
-		<h3><roundcube:label name="installedplugins" /></h3>
-		<roundcube:object name="pluginlist" id="pluginlist" class="records-table" />
-	</div>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/addressbook.html b/templates/addressbook.html
deleted file mode 100644
index 3845f42..0000000
--- a/templates/addressbook.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-<roundcube:include file="includes/menu.html" />
-
-<h1 class="voice"><roundcube:label name="addressbook" /></h1>
-
-<!-- sources/groups list -->
-<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="directorylist-header">
-	<div class="header">
-		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
-		<span id="directorylist-header" class="header-title"><roundcube:label name="groups" /></span>
-		<roundcube:button name="groupoptions" type="link" title="arialabelabookgroupoptions" label="actions"
-			class="button icon sidebar-menu" innerClass="inner" data-popup="groupoptions-menu" />
-	</div>
-	<div class="scroller">
-		<roundcube:object name="directorylist" id="directorylist" class="treelist listing iconized" />
-		<h3 class="voice"><roundcube:label name="savedsearches" /></h3>
-		<roundcube:object name="savedsearchlist" id="savedsearchlist" class="treelist listing iconized" />
-	</div>
-</div>
-
-<!-- contacts list -->
-<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-contactslist">
-	<div class="header">
-		<a class="button icon task-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="groups" /></span></a>
-		<roundcube:object name="addresslisttitle" label="contacts" tag="span" class="header-title" />
-		<div class="toolbar menu" role="toolbar">
-			<a href="#select" class="button select disabled" data-popup="listselect-menu" data-toggle-button="list-toggle-button" title="<roundcube:label name="select" />"><span class="inner"><roundcube:label name="select" /></span></a>
-			<roundcube:container name="listcontrols" id="listcontrols" />
-		</div>
-		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
-	</div>
-	<roundcube:object name="searchform" id="searchform" wrapper="searchbar menu"
-		label="contactsearchform" buttontitle="findcontacts" options="searchmenu" ariatag="h2" />
-	<div id="searchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu">
-		<h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod" /></h3>
-		<div class="formcontent">
-			<ul class="proplist">
-				<li><label><input type="checkbox" name="s_mods[]" value="name" /><roundcube:label name="name" /></label></li>
-				<li><label><input type="checkbox" name="s_mods[]" value="firstname" /><roundcube:label name="firstname" /></label></li>
-				<li><label><input type="checkbox" name="s_mods[]" value="surname" /><roundcube:label name="surname" /></label></li>
-				<li><label><input type="checkbox" name="s_mods[]" value="email" /><roundcube:label name="email" /></label></li>
-				<li><label><input type="checkbox" name="s_mods[]" value="*" /><roundcube:label name="allfields" /></label></li>
-			</ul>
-		</div>
-		<div class="formbuttons">
-			<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
-		</div>
-	</div>
-	<div class="scroller">
-		<h2 id="aria-label-contactslist" class="voice"><roundcube:label name="contacts" /></h2>
-		<roundcube:object name="addresslist" id="contacts-table" class="listing iconized contactlist"
-			noheader="true" role="listbox" data-list="contact_list"
-			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="add" />
-	</div>
-	<roundcube:include file="includes/pagenav.html" />
-</div>
-
-<!-- contact details frame -->
-<div id="layout-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="addressbooktoolbar" class="toolbar menu">
-			<roundcube:button command="add" type="link" class="create disabled" classAct="create"
-				label="create" title="newcontact" innerclass="inner" data-fab="true" />
-			<roundcube:button command="print" type="link" data-hidden="small"
-				class="print disabled" classAct="print"
-				label="print" title="printcontact" innerclass="inner" />
-			<roundcube:button command="delete" type="link" class="delete disabled" classAct="delete"
-				label="delete" title="deletecontact" innerClass="inner" />
-			<span class="spacer"></span>
-			<roundcube:button command="advanced-search" type="link" class="search disabled" classAct="search"
-				label="search" title="advsearch" innerclass="inner" />
-			<roundcube:container name="toolbar" id="addressbooktoolbar" />
-			<roundcube:button command="import" type="link" class="import disabled" classAct="import"
-				label="import" title="importcontacts" innerclass="inner" />
-			<span class="dropbutton">
-				<roundcube:button command="export" type="link" class="export disabled" classAct="export"
-					label="export" title="exportvcards" innerclass="inner" />
-				<a href="#export" class="dropdown" data-popup="export-menu">
-					<span class="inner"><roundcube:label name="arialabelcontactexportoptions" /></span>
-				</a>
-			</span>
-			<roundcube:button name="contactmenulink" id="contactmenulink" type="link"
-				class="more" label="more" title="moreactions"
-				data-popup="contact-menu" innerclass="inner" />
-		</div>
-	</div>
-	<h2 id="aria-label-contact-frame" class="voice"><roundcube:label name="contactproperties" /></h2>
-	<div class="iframe-wrapper">
-		<roundcube:object name="contentframe" id="contact-frame" src="env:blankpage" title="contactproperties"
-			aria-labelledby="aria-label-contact-frame" />
-	</div>
-</div>
-
-<!-- popup menus -->
-<div id="export-menu" class="popupmenu">
-	<h3 id="aria-label-export-menu" class="voice"><roundcube:label name="arialabelcontactexportoptions" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-export-menu">
-		<roundcube:button type="link-menuitem" command="export" label="exportall" prop="sub" class="export all disabled" classAct="export all active" />
-		<roundcube:button type="link-menuitem" command="export-selected" label="exportsel" prop="sub" class="export select disabled" classAct="export select active" />
-	</ul>
-</div>
-
-<div id="groupoptions-menu" class="popupmenu">
-	<h3 id="aria-label-groupoptions-menu" class="voice"><roundcube:label name="arialabelabookgroupoptions" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-groupoptions-menu">
-		<roundcube:button type="link-menuitem" command="group-create" title="newgroup" label="addgroup" class="create disabled" classAct="create active" />
-		<roundcube:button type="link-menuitem" command="group-rename" label="grouprename" class="group rename disabled" classAct="group rename active" />
-		<roundcube:button type="link-menuitem" command="group-delete" label="groupdelete" class="group delete disabled" classAct="group delete active" />
-		<roundcube:button type="link-menuitem" command="search-create" label="searchsave" class="search disabled" classAct="search active" />
-		<roundcube:button type="link-menuitem" command="search-delete" label="searchdelete" class="search delete disabled" classAct="search delete active" />
-		<roundcube:container name="groupoptions" id="groupoptionsmenu" />
-	</ul>
-</div>
-
-<div id="listselect-menu" class="popupmenu">
-	<h3 id="aria-label-listselect-menu" class="voice"><roundcube:label name="arialabellistselectmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-listselect-menu">
-		<roundcube:button type="link-menuitem" label="selection" class="selection" classAct="selection active"
-			name="list-toggle-button" id="list-toggle-button" onclick="UI.toggle_list_selection(this, 'contacts-table')" />
-		<roundcube:button command="select-all" type="link-menuitem" prop="page" label="currpage" class="select page disabled" classAct="select page active" />
-		<roundcube:button command="select-all" type="link-menuitem" prop="invert" label="invert" class="select invert disabled" classAct="select invert active" />
-		<roundcube:button command="select-none" type="link-menuitem" label="none" class="select none disabled" classAct="select none active" />
-	</ul>
-</div>
-
-<div id="dragcontact-menu" class="popupmenu">
-	<h3 id="aria-label-dragcontact-menu" class="voice"><roundcube:label name="arialabeldropactionmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-dragcontact-menu">
-		<roundcube:button type="link-menuitem" command="move" onclick="return rcmail.drag_menu_action('move')" label="move" class="disabled" classAct="active" />
-		<roundcube:button type="link-menuitem" command="copy" onclick="return rcmail.drag_menu_action('copy')" label="copy" class="disabled" classAct="active" />
-	</ul>
-</div>
-
-<div id="contact-menu" class="popupmenu">
-	<h3 id="aria-label-contact-menu" class="voice"><roundcube:label name="arialabelmorecontactactions" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-contact-menu">
-		<roundcube:if condition="env:qrcode" />
-		<roundcube:button type="link-menuitem" command="qrcode" label="qrcode" class="qrcode disabled" classAct="qrcode active" />
-		<roundcube:endif />
-		<roundcube:button type="link-menuitem" command="group-assign-selected" label="groupassign" class="assigngroup disabled" classAct="assigngroup active" innerclass="folder-selector-link"  aria-haspopup="true" />
-		<roundcube:button type="link-menuitem" command="group-remove-selected" label="groupremove" class="removegroup disabled" classAct="removegroup active" />
-		<roundcube:if condition="env:contact_move_enabled" />
-		<roundcube:button type="link-menuitem" command="move" label="moveto" class="move disabled" classAct="move active" innerclass="folder-selector-link" aria-haspopup="true" />
-		<roundcube:endif />
-		<roundcube:if condition="env:contact_copy_enabled" />
-		<roundcube:button type="link-menuitem" command="copy" label="copyto" class="copy disabled" classAct="copy active" innerclass="folder-selector-link" aria-haspopup="true" />
-		<roundcube:endif />
-		<roundcube:container name="contactmenu" id="contact-menu" />
-	</ul>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/bounce.html b/templates/bounce.html
deleted file mode 100644
index f9fbf02..0000000
--- a/templates/bounce.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:label name="bouncemsg" /></h1>
-
-<div class="formcontent">
-	<roundcube:object name="bounceObjects" id="bounce-objects" class="mb-3" />
-	<roundcube:object name="composeFormHead" role="main" />
-	<div id="bounceheaders" role="region" aria-labelledby="aria-label-composeheaders">
-		<h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabelmessageheaders" /></h2>
-		<div class="compose-headers">
-			<div id="compose_from" class="form-group row">
-				<label for="_from" class="col-2 col-form-label"><roundcube:label name="from" /></label>
-				<div class="col-10">
-					<div class="input-group">
-						<roundcube:object name="composeHeaders" part="from" id="_from" form="form" tabindex="1" class="form-control" />
-						<span class="input-group-append">
-							<a href="#identities" onclick="return rcmail.command('switch-task', 'settings/identities')" class="input-group-text icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a>
-					</div>
-				</div>
-			</div>
-			<div id="compose_to" class="form-group row">
-				<label for="_to" class="col-2 col-form-label"><roundcube:label name="to" /></label>
-				<div class="col-10">
-					<div class="input-group">
-						<roundcube:object name="composeHeaders" part="to" id="_to" form="form" tabindex="1" aria-required="true" data-recipient-input="true" />
-						<span class="input-group-append">
-							<a href="#add-header" data-popup="headers-menu" class="input-group-text icon add" title="<roundcube:label name="addheader" />" tabindex="1"><span class="inner"><roundcube:label name="addheader" /></span></a>
-						</span>
-					</div>
-				</div>
-			</div>
-			<div id="compose_cc" class="hidden form-group row">
-				<label for="_cc" class="col-2 col-form-label"><roundcube:label name="cc" /></label>
-				<div class="col-10">
-					<div class="input-group">
-						<roundcube:object name="composeHeaders" part="cc" id="_cc" form="form" tabindex="1" data-recipient-input="true" />
-						<span class="input-group-append">
-							<a href="#delete" onclick="UI.header_reset('_cc')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
-						</span>
-					</div>
-				</div>
-			</div>
-			<div id="compose_bcc" class="hidden form-group row">
-				<label for="_bcc" class="col-2 col-form-label"><roundcube:label name="bcc" /></label>
-				<div class="col-10">
-					<div class="input-group">
-						<roundcube:object name="composeHeaders" part="bcc" id="_bcc" form="form" tabindex="1" data-recipient-input="true" />
-						<span class="input-group-append">
-							<a href="#delete" onclick="UI.header_reset('_bcc')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
-						</span>
-					</div>
-				</div>
-			</div>
-		</div>
-		<roundcube:if condition="!config:no_save_sent_messages" />
-		<div class="form-group row">
-			<label for="compose-store-target" class="col-form-label col-6"><roundcube:label name="savesentmessagein" /></label>
-			<div class="col-6">
-				<roundcube:object name="storetarget" id="compose-store-target" noform="true" tabindex="2" class="form-control" />
-			</div>
-		</div>
-		<roundcube:endif />
-	</form>
-</div>
-
-<div id="headers-menu" class="popupmenu" data-popup-init="headersmenu">
-	<h3 id="aria-label-headersmenu" class="voice"><roundcube:label name="arialabelheadersmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-headersmenu">
-		<li role="menuitem"><a data-target="cc" href="#" role="button" tabindex="-1" class="recipient active"><roundcube:label name="cc" /></a></li>
-		<li role="menuitem"><a data-target="bcc" href="#" role="button" tabindex="-1" class="recipient active"><roundcube:label name="bcc" /></a></li>
-	</ul>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/compose.html b/templates/compose.html
deleted file mode 100644
index 0f7cad8..0000000
--- a/templates/compose.html
+++ /dev/null
@@ -1,286 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-<roundcube:include file="includes/menu.html" condition="!env:extwin && !env:framed" />
-<roundcube:add_label name="recipientsadded" />
-<roundcube:add_label name="nocontactselected" />
-<roundcube:add_label name="recipient" />
-<roundcube:add_label name="insert" />
-<roundcube:add_label name="insertcontact" />
-<roundcube:add_label name="recipientedit" />
-
-<h1 class="voice"><roundcube:label name="compose" /></h1>
-
-<!-- compose options and attachments list -->
-<div id="layout-sidebar" class="listbox sidebar-right">
-	<div class="header">
-		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
-		<span class="header-title all-sizes"><roundcube:label name="optionsandattachments" /></span>
-	</div>
-	<div class="scroller">
-		<!-- attachments -->
-		<div id="compose-attachments" class="file-upload" role="region" aria-labelledby="aria-label-compose-attachments">
-			<h2 id="aria-label-compose-attachments" class="voice"><roundcube:label name="attachments" /></h2>
-			<div class="upload-form">
-				<roundcube:object name="composeAttachmentForm" mode="hint" />
-				<button type="button" class="btn btn-secondary attach" tabindex="2" onclick="rcmail.upload_input('uploadform')"><roundcube:label name="addattachment" /></button>
-			</div>
-			<roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" tabindex="2" />
-			<roundcube:object name="fileDropArea" id="compose-attachments" />
-		</div>
-		<!-- compose options -->
-		<div id="compose-options" class="formcontent" role="region" aria-labelledby="aria-label-composeoptions">
-			<h2 id="aria-label-composeoptions" class="voice"><roundcube:label name="arialabelcomposeoptions" /></h2>
-			<roundcube:container name="composeoptions" id="compose-options" />
-			<roundcube:if condition="!in_array('mdn_default', (array)config:dont_override)" />
-			<div class="form-group row form-check">
-				<label for="compose-mdn" class="col-form-label col-6"><roundcube:label name="returnreceipt" /></label>
-				<div class="col-6 form-check">
-					<roundcube:object name="mdnCheckBox" id="compose-mdn" noform="true" tabindex="2" class="form-check-input" />
-				</div>
-			</div>
-			<roundcube:endif />
-			<roundcube:if condition="!in_array('dsn_default', (array)config:dont_override)" />
-			<div class="form-group row form-check">
-				<label for="compose-dsn" class="col-form-label col-6"><roundcube:label name="dsn" /></label>
-				<div class="col-6 form-check">
-					<roundcube:object name="dsnCheckBox" id="compose-dsn" noform="true" tabindex="2" class="form-check-input" />
-				</div>
-			</div>
-			<roundcube:endif />
-			<div class="form-group row form-check">
-				<label for="compose-keep-formatting" class="col-form-label col-6"><roundcube:label name="keepformatting" /></label>
-				<div class="col-6 form-check">
-					<roundcube:object name="keepFormattingCheckBox" id="compose-keep-formatting" noform="true" tabindex="2" class="form-check-input" />
-				</div>
-			</div>
-			<div class="form-group row">
-				<label for="compose-priority" class="col-form-label col-6"><roundcube:label name="priority" /></label>
-				<div class="col-6">
-					<roundcube:object name="prioritySelector" id="compose-priority" noform="true" tabindex="2" class="custom-select" />
-				</div>
-			</div>
-			<roundcube:if condition="!config:no_save_sent_messages" />
-			<div class="form-group row">
-				<label for="compose-store-target" class="col-form-label col-6"><roundcube:label name="savesentmessagein" /></label>
-				<div class="col-6">
-					<roundcube:object name="storetarget" id="compose-store-target" noform="true" tabindex="2" class="custom-select" />
-				</div>
-			</div>
-			<roundcube:endif />
-		</div>
-	</div>
-</div>
-
-<div id="layout-content" class="listbox selected" role="main">
-	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
-	<div class="header">
-		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
-		<span class="header-title"><roundcube:label name="compose" /></span>
-		<div id="composestatusbar" class="position-absolute"></div>
-		<!-- toolbar -->
-		<div id="messagetoolbar" class="toolbar menu" role="toolbar" aria-labelledby="aria-label-toolbar">
-			<a class="options" href="#options" onclick="UI.show_sidebar()" data-hidden="big">
-				<span class="inner"><roundcube:label name="optionsandattachments"></span>
-			</a>
-			<roundcube:button command="savedraft" type="link" class="save draft disabled" classAct="save draft"
-				label="save" title="savemessage" tabindex="2" innerclass="inner" data-content-button="true" />
-			<span class="spacer"></span>
-			<roundcube:button name="addattachment" type="link" class="attach"
-				label="attach" title="addattachment" data-hidden="small"
-				onclick="if (!$(this).is('.disabled')) rcmail.upload_input('uploadform')"
-				aria-haspopup="true" aria-expanded="false" tabindex="2" innerclass="inner" />
-			<roundcube:button command="insert-sig" type="link" class="signature disabled" classAct="signature"
-				label="signature" title="insertsignature" tabindex="2" innerclass="inner" />
-			<a href="#responses" class="responses" label="responses" title="<roundcube:label name='insertresponse' />" unselectable="on" tabindex="2" data-popup="responses-menu">
-				<span class="inner"><roundcube:label name="responses" /></span>
-			</a>
-			<roundcube:if condition="!empty(env:spell_langs)" />
-			<span class="dropbutton">
-				<roundcube:button command="spellcheck" type="link" class="spellcheck disabled"
-					classAct="spellcheck" classSel="button spellcheck pressed"
-					label="spellcheck" title="checkspelling" tabindex="2" innerclass="inner" />
-				<a href="#languages" class="dropdown" tabindex="2" data-popup="spell-menu">
-					<span class="inner"><roundcube:label name="language" /></span>
-				</a>
-			</span>
-			<roundcube:endif />
-			<span class="dropbutton" style="display:none">
-				<roundcube:button command="compose-encrypted" type="link" class="encrypt disabled"
-					classAct="encrypt" classSel="encrypt selected" innerclass="inner"
-					label="encrypt" title="encryptmessagemailvelope" tabindex="2" />
-				<a href="#encryption" id="encryption-menu-button" class="dropdown" tabindex="2" data-popup="encryption-menu">
-					<span class="inner"><roundcube:label name="encryptmessagemailvelope" /></span>
-				</a>
-			</span>
-			<roundcube:container name="toolbar" id="compose-toolbar" />
-		</div>
-	</div>
-	<div id="compose-content" class="formcontainer content">
-		<roundcube:object name="composeFormHead" role="main" class="formcontent scroller" />
-		<roundcube:object name="composeObjects" id="compose-objects" class="mb-3" />
-		<!-- message headers -->
-		<div id="compose-headers" role="region" aria-labelledby="aria-label-composeheaders">
-			<h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabelmessageheaders" /></h2>
-			<div class="compose-headers">
-				<div id="compose_from" class="form-group row">
-					<label for="_from" class="col-2 col-form-label"><roundcube:label name="from" /></label>
-					<div class="col-10">
-						<div class="input-group">
-							<roundcube:object name="composeHeaders" part="from" id="_from" form="form" tabindex="1" class="form-control" />
-							<span class="input-group-append">
-								<a href="#identities" onclick="return rcmail.command('switch-task', 'settings/identities')" class="input-group-text icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a>
-							</span>
-						</div>
-					</div>
-				</div>
-				<div id="compose_to" class="form-group row">
-					<label for="_to" class="col-2 col-form-label"><roundcube:label name="to" /></label>
-					<div class="col-10">
-						<div class="input-group">
-							<roundcube:object name="composeHeaders" part="to" id="_to" form="form" tabindex="1" aria-required="true" data-recipient-input="true" />
-							<span class="input-group-append">
-								<a href="#add-contact" onclick="UI.recipient_selector('to')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
-							</span>
-							<span class="input-group-append">
-								<a href="#add-header" data-popup="headers-menu" class="input-group-text icon add" title="<roundcube:label name="addheader" />" tabindex="1"><span class="inner"><roundcube:label name="addheader" /></span></a>
-							</span>
-						</div>
-					</div>
-				</div>
-				<div id="compose_cc" class="hidden form-group row">
-					<label for="_cc" class="col-2 col-form-label"><roundcube:label name="cc" /></label>
-					<div class="col-10">
-						<div class="input-group">
-							<roundcube:object name="composeHeaders" part="cc" id="_cc" form="form" tabindex="1" data-recipient-input="true" />
-							<span class="input-group-append">
-								<a href="#add-contact" onclick="UI.recipient_selector('cc')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
-							</span>
-							<span class="input-group-append">
-								<a href="#delete" onclick="UI.header_reset('_cc')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
-							</span>
-						</div>
-					</div>
-				</div>
-				<div id="compose_bcc" class="hidden form-group row">
-					<label for="_bcc" class="col-2 col-form-label"><roundcube:label name="bcc" /></label>
-					<div class="col-10">
-						<div class="input-group">
-							<roundcube:object name="composeHeaders" part="bcc" id="_bcc" form="form" tabindex="1" data-recipient-input="true" />
-							<span class="input-group-append">
-								<a href="#add-contact" onclick="UI.recipient_selector('bcc')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
-							</span>
-							<span class="input-group-append">
-								<a href="#delete" onclick="UI.header_reset('_bcc')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
-							</span>
-						</div>
-					</div>
-				</div>
-				<div id="compose_replyto" class="hidden form-group row">
-					<label for="_replyto" class="col-2 col-form-label"><roundcube:label name="replyto" /></label>
-					<div class="col-10">
-						<div class="input-group">
-							<roundcube:object name="composeHeaders" part="replyto" id="_replyto" form="form" tabindex="1" data-recipient-input="true" />
-							<span class="input-group-append">
-								<a href="#add-contact" onclick="UI.recipient_selector('replyto')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
-							</span>
-							<span class="input-group-append">
-								<a href="#delete" onclick="UI.header_reset('_replyto')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
-							</span>
-						</div>
-					</div>
-				</div>
-				<div id="compose_followupto" class="hidden form-group row">
-					<label for="_followupto" class="col-2 col-form-label"><roundcube:label name="followupto" /></label>
-					<div class="col-10">
-						<div class="input-group">
-							<roundcube:object name="composeHeaders" part="followupto" id="_followupto" form="form" tabindex="1" data-recipient-input="true" />
-							<span class="input-group-append">
-								<a href="#add-contact" onclick="UI.recipient_selector('followupto')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
-							</span>
-							<span class="input-group-append">
-								<a href="#delete" onclick="UI.header_reset('_followupto')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
-							</span>
-						</div>
-					</div>
-				</div>
-				<div id="compose_subject" class="form-group row">
-					<label for="compose-subject" class="col-2 col-form-label"><roundcube:label name="subject" /></label>
-					<div class="col-10">
-						<roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="1" class="form-control" />
-					</div>
-				</div>
-			</div>
-		</div>
-		<!-- message compose body -->
-		<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" class="form-control" tabindex="1" />
-			<roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
-			<roundcube:object name="editorSelector" id="editor-selector" editorid="composebody" noform="true" class="hidden" />
-			<roundcube:endif />
-		</div>
-		</form>
-		<div class="formbuttons">
-			<roundcube:button command="send" class="btn btn-primary send" label="send" tabindex="1" data-content-button="true" />
-			<div class="float-right">
-				<roundcube:button command="extwin" type="link" label="openinextwin" data-hidden="small" class="button icon btn btn-link extwin" data-tabindex="1" condition="!env:extwin" />
-			</div>
-		</div>
-	</div>
-</div>
-
-<roundcube:object name="composeAttachmentForm" id="uploadform" mode="smart" />
-
-<div id="spell-menu" class="popupmenu" data-popup-init="spellmenu"></div>
-
-<div id="headers-menu" class="popupmenu" data-popup-init="headersmenu">
-	<h3 id="aria-label-headersmenu" class="voice"><roundcube:label name="arialabelheadersmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-headersmenu">
-		<li role="menuitem"><a data-target="cc" href="#" role="button" tabindex="-1" class="recipient active"><roundcube:label name="cc" /></a></li>
-		<li role="menuitem"><a data-target="bcc" href="#" role="button" tabindex="-1" class="recipient active"><roundcube:label name="bcc" /></a></li>
-		<li role="menuitem"><a data-target="replyto" href="#" role="button" tabindex="-1" class="recipient active"><roundcube:label name="replyto" /></a></li>
-		<li role="menuitem"><a data-target="followupto" href="#" role="button" tabindex="-1" class="recipient active"><roundcube:label name="followupto" /></a></li>
-	</ul>
-</div>
-
-<div id="responses-menu" class="popupmenu">
-	<h3 id="aria-label-responsesmenu" class="voice"><roundcube:label name="arialabelresponsesmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-responsesmenu">
-		<li role="separator" class="separator"><label><roundcube:label name="insertresponse" /></label></li>
-		<roundcube:object name="responseslist" id="responseslist" tagname="ul" class="rounded-0" itemclass="active" list-placeholder="noresponsesavailable" />
-		<li role="separator" class="separator"><label><roundcube:label name="manageresponses" /></label></li>
-		<roundcube:button name="responses" type="link-menuitem" label="editresponses" class="edit responses active" onclick="return rcmail.command('switch-task', 'settings/responses')" />
-	</ul>
-</div>
-
-<div id="attachmentmenu" class="popupmenu">
-	<h3 id="aria-label-attachmentmenu" class="voice"><roundcube:label name="arialabelattachmentmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-attachmentmenu">
-		<roundcube:button command="open-attachment" id="attachmenuopen" type="link-menuitem" label="open" class="extwin disabled" classAct="extwin active" />
-		<roundcube:button command="download-attachment" id="attachmenudownload" type="link-menuitem" label="download" class="download disabled" classAct="download active" />
-		<roundcube:button command="rename-attachment" id="attachmenurename" type="link-menuitem" label="rename" class="rename disabled" classAct="rename active" />
-		<roundcube:container name="attachmentmenu" id="attachmentoptionsmenu" />
-	</ul>
-</div>
-
-<div id="encryption-menu" class="popupmenu">
-	<ul class="menu listing" role="menu">
-		<roundcube:button command="compose-encrypted" type="link-menuitem" label="encryptmessage" class="encrypt disabled" classAct="encrypt active" />
-		<roundcube:button command="compose-encrypted-signed" type="link-menuitem" label="encryptandsign" class="encrypt sign disabled" classAct="encrypt sign active" />
-	</ul>
-</div>
-
-<div id="recipient-dialog" class="popupmenu" role="region" aria-labelledby="aria-label-composecontacts">
-	<div class="listbox">
-		<roundcube:object name="searchform" id="searchform" wrapper="searchbar menu"
-			label="contactsearchform" buttontitle="findcontacts" ariatag="h2" class="no-bs" />
-		<div class="scroller" tabindex="-1">
-			<roundcube:object name="addressbooks" id="directorylist" class="treelist listing iconized"
-				summary="ariasummarycomposecontacts" />
-			<roundcube:object name="addresslist" id="contacts-table" class="listing iconized contactlist"
-				noheader="true" role="listbox" data-list="contact_list" data-list-select-replace="#recipient-dialog .pagenav-text" />
-		</div>
-		<roundcube:include file="includes/pagenav.html" />
-	</div>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/contact.html b/templates/contact.html
deleted file mode 100644
index 3df09b8..0000000
--- a/templates/contact.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:label name="contactproperties" /></h1>
-
-<div class="formcontent">
-	<div class="contact-header">
-		<div id="contactphoto" class="contact-photo">
-			<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.svg"
-				placeholderGroup="/images/contactgroup.svg" bg-color="transparent" />
-		</div>
-		<roundcube:object name="contacthead" id="contacthead" class="contact-head readonly" with-source="true" />
-	</div>
-	<div id="contacttabs" class="tabbed">
-		<roundcube:object name="contactdetails" fieldset-class="propform grouped readonly"
-			short-legend-labels="true" />
-	</div>
-</div>
-
-<div class="formbuttons">
-	<roundcube:button command="edit" class="btn btn-primary edit" label="edit" condition="!ENV:readonly" />
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/contactedit.html b/templates/contactedit.html
deleted file mode 100644
index 3842208..0000000
--- a/templates/contactedit.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:object name="steptitle" /></h1>
-
-<roundcube:form name="editform" method="post" id="contact-details" class="formcontent">
-	<div class="contact-header">
-		<fieldset id="contactphoto" class="contact-photo">
-			<legend class="voice"><roundcube:label name="contactphoto" /></legend>
-			<roundcube:object name="contactphoto" id="contactpic" class="image-upload" placeholder="/images/contactpic.svg" />
-			<roundcube:if condition="env:photocol" />
-				<roundcube:object name="fileDropArea" id="contactpic" />
-			<roundcube:endif />
-		</fieldset>
-		<roundcube:object name="contactedithead" id="contacthead" form="editform"
-			class="propform contact-head" use-labels="true" with-source="true" />
-	</div>
-	<div id="contacttabs" class="tabbed">
-		<roundcube:object name="contacteditform" textareacols="60" form="editform"
-			fieldset-class="propform grouped" compact-form="true" short-legend-labels="true" />
-	</div>
-</form>
-
-<div class="formbuttons">
-	<roundcube:button command="save" class="btn btn-primary submit" label="save" />
-</div>
-
-<roundcube:object name="photoUploadForm" id="upload-form" mode="smart" />
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/contactimport.html b/templates/contactimport.html
deleted file mode 100644
index b7f30ee..0000000
--- a/templates/contactimport.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="importcontacts" /></h1>
-
-<div class="formcontent">
-	<roundcube:object name="importstep" class="propform" table-header-class="form-group row d-none d-sm-flex" table-col-source-class="col-sm-4" table-col-destination-class="col-sm-8" />
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/contactprint.html b/templates/contactprint.html
deleted file mode 100644
index ffa16b5..0000000
--- a/templates/contactprint.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<roundcube:object name="logo" id="logo" alt="Logo" logo-type="print" logo-match="template" class="float-sm-right" />
-
-<div class="print-content formcontent" role="main">
-	<div class="contact-header">
-		<div id="contactphoto" class="contact-photo">
-			<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.svg"
-				placeholderGroup="/images/contactgroup.svg" />
-		</div>
-		<roundcube:object name="contacthead" id="contacthead" class="contact-head readonly" with-source="true" />
-	</div>
-	<div id="contacttabs">
-		<roundcube:object name="contactdetails" fieldset-class="propform grouped readonly"
-			short-legend-labels="true" />
-	</div>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/contactsearch.html b/templates/contactsearch.html
deleted file mode 100644
index 86de93d..0000000
--- a/templates/contactsearch.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="advsearch" /></h1>
-
-<div class="formcontent">
-	<roundcube:object name="searchform" id="advsearchform" class="tabbed propform" short-legend-labels="true" />
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/dialog.html b/templates/dialog.html
deleted file mode 100644
index 5f03e89..0000000
--- a/templates/dialog.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<div class="frame-content <roundcube:var name="env:dialog_class" />">
-	<roundcube:object name="dialogcontent" />
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/error.html b/templates/error.html
deleted file mode 100644
index ea92028..0000000
--- a/templates/error.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<roundcube:if condition="!env:framed && !env:extwin" />
-	<roundcube:include file="includes/menu.html" />
-	<div id="layout-content" class="selected" role="main">
-		<div class="header">
-			<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
-			<span class="header-title"></span>
-		</div>
-		<div class="frame-content scroller">
-<roundcube:else />
-	<div id="layout-content" class="selected" role="main">
-		<div class="frame-content scroller">
-<roundcube:endif />
-
-$__page_content
-
-		</div>
-	</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/folderedit.html b/templates/folderedit.html
deleted file mode 100644
index e2c55f0..0000000
--- a/templates/folderedit.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:label name="folderproperties" /></h1>
-
-<div class="formcontent">
-	<roundcube:object name="folderdetails" class="propform" />
-</div>
-
-<div class="formbuttons">
-	<roundcube:button command="save" class="btn btn-primary submit" label="save" />
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/folders.html b/templates/folders.html
deleted file mode 100644
index 2230e50..0000000
--- a/templates/folders.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-<roundcube:include file="includes/menu.html" />
-<roundcube:include file="includes/settings-menu.html" />
-
-<h1 class="voice"><roundcube:label name="folders" /></h1>
-
-<!-- folders list -->
-<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-folderslist">
-	<div class="header">
-		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
-		<span id="aria-label-folderslist" class="header-title"><roundcube:label name="folders" /></span>
-		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
-	</div>
-	<roundcube:object name="searchform" id="foldersearch" wrapper="searchbar menu" ariatag="h2"
-		label="foldersearchform" buttontitle="findfolders" options="foldersearchmenu" />
-	<div id="foldersearchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu" aria-controls="subscription-table">
-		<h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod" /></h3>
-		<div class="formcontent">
-			<roundcube:object name="folderfilter" id="folderlist-filter" noheader="true" noevent="true" />
-		</div>
-		<div class="formbuttons">
-			<button type="button" class="btn btn-primary icon search" onclick="rcmail.folder_filter($('#folderlist-filter').val())"><roundcube:label name="search" /></button>
-		</div>
-	</div>
-	<div class="scroller" tabindex="-1">
-		<roundcube:object name="foldersubscription" id="subscription-table"
-			class="treelist listing folderlist iconized" role="listbox" data-list="subscription_list"
-			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="folder-create" />
-	</div>
-	<div class="footer small">
-		<roundcube:if condition="env:quota" />
-			<div id="quotadisplay" class="quota-widget">
-				<span class="voice"><roundcube:label name="quota"></span>
-				<roundcube:object name="quotaDisplay" class="count" display="text" />
-			</div>
-		<roundcube:endif />
-	</div>
-</div>
-
-<!-- folder info frame -->
-<div id="layout-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="folderstoolbar" class="toolbar menu">
-			<roundcube:button command="create-folder" type="link" class="create disabled" classAct="create"
-				label="create" title="createfolder" innerClass="inner" data-fab="true" />
-			<roundcube:button command="delete-folder" type="link" class="delete disabled" classAct="delete"
-				label="delete" title="delete" innerclass="inner" />
-			<roundcube:button command="purge" type="link" class="purge disabled" classAct="purge"
-				label="empty" title="empty" innerclass="inner" />
-		</div>
-	</div>
-	<div class="iframe-wrapper">
-		<roundcube:object name="contentframe" id="preferences-frame" src="env:blankpage" />
-	</div>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/identities.html b/templates/identities.html
deleted file mode 100644
index c59478a..0000000
--- a/templates/identities.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-<roundcube:include file="includes/menu.html" />
-<roundcube:include file="includes/settings-menu.html" />
-
-<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="identities" /></h1>
-
-<!-- responses list -->
-<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-identitieslist">
-	<div class="header">
-		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
-		<span id="aria-label-identitieslist" class="header-title"><roundcube:label name="identities" /></span>
-		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
-	</div>
-	<div class="scroller">
-		<roundcube:object name="identitieslist" id="identities-table" class="listing"
-			noheader="true" role="listbox" data-list="identity_list"
-			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="add" />
-	</div>
-	<div class="footer"></div>
-</div>
-
-<!-- response details frame -->
-<div id="layout-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="identitiestoolbar" class="toolbar menu">
-			<roundcube:button command="add" type="link" class="create disabled" classAct="create"
-				label="create" title="newidentity" innerClass="inner" 
-				condition="config:identities_level:0<2" data-fab="true" />
-			<roundcube:button command="delete" type="link" class="delete disabled" classAct="delete"
-				label="delete" title="delete" innerClass="inner"
-				condition="config:identities_level:0<2" />
-		</div>
-	</div>
-	<div class="iframe-wrapper">
-		<roundcube:object name="contentframe" id="preferences-frame" src="env:blankpage" title="arialabelidentityeditfrom" />
-	</div>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/identityedit.html b/templates/identityedit.html
deleted file mode 100644
index 7ffff15..0000000
--- a/templates/identityedit.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:object name="steptitle" /></h1>
-
-<div class="formcontent">
-	<roundcube:object name="identityform" class="propform" size="40" textareacols="40" textarearows="6" />
-</div>
-
-<div class="formbuttons">
-	<roundcube:button command="save" class="btn btn-primary submit" label="save" condition="!env:readonly" />
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/includes/footer.html b/templates/includes/footer.html
deleted file mode 100644
index ec64cbc..0000000
--- a/templates/includes/footer.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<roundcube:if condition="!env:framed || env:extwin" />
-</div>
-<roundcube:if condition="config:support_url" />
-<a href="<roundcube:var name='config:support_url' />" target="_blank" id="supportlink" class="hidden"><roundcube:label name="support" /></a>
-<roundcube:endif />
-<roundcube:endif />
-
-<roundcube:object name="message" id="messagestack" />
-
-<script src="/deps/bootstrap.bundle.min.js"></script>
-<script src="/ui.js"></script>
-
-</body>
-</html>
diff --git a/templates/includes/layout.html b/templates/includes/layout.html
deleted file mode 100644
index 90a8374..0000000
--- a/templates/includes/layout.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<roundcube:add_label name="back" />
-<roundcube:add_label name="errortitle" />
-<roundcube:add_label name="options" />
-<roundcube:add_label name="plaintoggle" />
-<roundcube:add_label name="htmltoggle" />
-<roundcube:add_label name="previous" />
-<roundcube:add_label name="next" />
-<roundcube:add_label name="select" />
-<roundcube:add_label name="close" />
-<roundcube:add_label name="browse" />
-<roundcube:add_label name="choosefile" />
-<roundcube:add_label name="choosefiles" />
-<roundcube:object name="doctype" value="html5" />
-<roundcube:if condition="!env:framed || env:extwin" />
-<html>
-<roundcube:else />
-<html class="iframe">
-<roundcube:endif />
-<head>
-	<roundcube:object name="meta" />
-	<roundcube:object name="links" />
-	<link rel="stylesheet" href="/deps/bootstrap.min.css">
-	<roundcube:if condition="config:devel_mode" />
-		<link rel="stylesheet/less" href="/styles/styles.less">
-		<roundcube:link rel="stylesheet/less" href="/styles/print.less" condition="env:action == 'print'" />
-		<script src="/deps/less.min.js" data-env="development"></script>
-	<roundcube:else />
-		<link rel="stylesheet" href="/styles/styles.css">
-		<roundcube:link rel="stylesheet" href="/styles/print.css" condition="env:action == 'print'" />
-	<roundcube:endif />
-	<roundcube:if condition="env:action != 'print' && !config:devel_mode && config:dark_mode_support" />
-		<script>
-		try {
-			if (document.cookie.indexOf('colorMode=dark') > -1
-				|| (document.cookie.indexOf('colorMode=light') === -1 && window.matchMedia('(prefers-color-scheme: dark)').matches)
-			) {
-				document.documentElement.className += ' dark-mode';
-			}
-		} catch (e) { }
-		</script>
-	<roundcube:endif />
-</head>
-<body class="task-<roundcube:exp expression="env:error_task ?: env:task ?: 'error'"> action-<roundcube:exp expression="asciiwords(env:action, true, '-') ?: 'none'">">
-	<roundcube:if condition="!env:framed || env:extwin" />
-		<div id="<roundcube:exp expression="env:action == 'print' ? 'print-' : ''">layout">
-	<roundcube:endif />
diff --git a/templates/includes/mail-menu.html b/templates/includes/mail-menu.html
deleted file mode 100644
index b50d781..0000000
--- a/templates/includes/mail-menu.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<roundcube:add_label name="viewsource" />
-<div id="mailtoolbar" class="toolbar menu" role="toolbar">
-	<roundcube:button command="compose" type="link" class="compose hidden"
-		label="compose" title="writenewmessage" innerclass="inner" />
-	<roundcube:button command="reply" type="link" class="reply disabled" classAct="reply"
-		label="reply" title="replytomessage" innerclass="inner" data-content-button="true" />
-	<span class="dropbutton">
-		<roundcube:button command="reply-all" type="link" class="reply-all disabled" classAct="reply-all"
-			label="replyall" title="replytoallmessage" innerclass="inner" />
-		<a href="#reply-all" id="replyallmenulink" class="dropdown" data-popup="replyall-menu" tabindex="0">
-			<span class="inner"><roundcube:label name="arialabelreplyalloptions" /></span>
-		</a>
-	</span>
-	<span class="dropbutton">
-		<roundcube:button command="forward" type="link" class="forward disabled" classAct="forward"
-			label="forward" title="forwardmessage" innerclass="inner" />
-		<a href="#forward" id="forwardmenulink" class="dropdown" data-popup="forward-menu" tabindex="0">
-			<span class="inner"><roundcube:label name="arialabelforwardingoptions" /></span>
-		</a>
-	</span>
-	<span class="spacer"></span>
-	<roundcube:button command="delete" type="link" class="delete disabled" classAct="delete"
-		label="delete" title="deletemessage" innerclass="inner" />
-	<roundcube:if condition="template:name == 'message'" />
-		<roundcube:button command="print" type="link" class="print disabled" classAct="print"
-			label="print" title="printmessage" innerclass="inner" data-hidden="small"  />
-	<roundcube:endif />
-	<roundcube:container name="toolbar" id="mailtoolbar" />
-	<roundcube:button name="markmenulink" id="markmessagemenulink" type="link" class="markmessage"
-		label="mark" title="markmessages" data-popup="markmessage-menu" innerclass="inner" />
-	<roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="more"
-		label="more" title="moreactions" data-popup="message-menu" innerclass="inner" />
-	<roundcube:if condition="template:name == 'message'" />
-		<span class="spacer"></span>
-		<roundcube:button command="previousmessage" type="link" class="prev disabled" classAct="prev"
-			innerclass="inner" label="previous" title="previousmessage" data-hidden="small" />
-		<roundcube:button command="nextmessage" type="link" class="next disabled" classAct="next"
-			innerclass="inner" label="next" title="nextmessage" data-hidden="small" />
-	<roundcube:endif />
-</div>
-
-<div id="forward-menu" class="popupmenu">
-	<h3 id="aria-label-forward-menu" class="voice"><roundcube:label name="arialabelforwardingoptions" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-forward-menu">
-		<roundcube:button type="link-menuitem" command="forward-inline" label="forwardinline" prop="sub" class="forward inline disabled" classAct="forward inline active" />
-		<roundcube:button type="link-menuitem" command="forward-attachment" label="forwardattachment" prop="sub" class="forward attachment disabled" classAct="forward attachment active" />
-		<roundcube:button type="link-menuitem" command="bounce" label="bouncemsg" class="forward bounce disabled" classAct="forward bounce active" />
-		<roundcube:container name="forwardmenu" id="forward-menu" />
-	</ul>
-</div>
-
-<div id="replyall-menu" class="popupmenu">
-	<h3 id="aria-label-replyall-menu" class="voice"><roundcube:label name="arialabelreplyalloptions" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-replyall-menu">
-		<roundcube:button type="link-menuitem" command="reply-all" label="replyall" prop="sub" class="reply all disabled" classAct="reply all active" />
-		<roundcube:button type="link-menuitem" command="reply-list" label="replylist" prop="sub" class="reply list disabled" classAct="reply list active" />
-		<roundcube:container name="replyallmenu" id="replyall-menu" />
-	</ul>
-</div>
-
-<div id="message-menu" class="popupmenu">
-	<h3 id="aria-label-message-menu" class="voice"><roundcube:label name="arialabelmoremessageactions" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-message-menu">
-		<roundcube:button type="link-menuitem" command="print" label="printmessage" class="print disabled" classAct="print active" data-hidden="small"/>
-		<roundcube:if condition="template:name != 'message'" />
-			<roundcube:button type="link-menuitem" command="import-messages" label="import" class="import disabled" classAct="import active"
-				name="messageimport" onclick="UI.import_dialog()" />
-		<roundcube:endif />
-		<roundcube:button type="link-menuitem" command="download" label="export" class="download disabled" classAct="download active" />
-		<roundcube:button type="link-menuitem" command="edit" prop="new" label="editasnew" class="edit asnew disabled" classAct="edit asnew active" />
-		<roundcube:button type="link-menuitem" command="viewsource" label="viewsource" class="source disabled" classAct="source active" />
-		<roundcube:button type="link-menuitem" command="move" label="moveto" class="move disabled" classAct="move active" innerclass="folder-selector-link" aria-haspopup="true" />
-		<roundcube:button type="link-menuitem" command="copy" label="copyto" class="copy disabled" classAct="copy active" innerclass="folder-selector-link" aria-haspopup="true" />
-		<roundcube:button type="link-menuitem" command="open" label="openinextwin" target="_blank" class="extwin disabled" classAct="extwin active" data-hidden="small" />
-		<roundcube:container name="messagemenu" id="message-menu" />
-	</ul>
-</div>
-
-<div id="markmessage-menu" class="popupmenu">
-	<h3 id="aria-label-markmessage-menu" class="voice"><roundcube:label name="arialabelmarkmessagesas" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-markmessage-menu">
-		<roundcube:button type="link-menuitem" command="mark" prop="read" label="markread" classAct="read active" class="read disabled" />
-		<roundcube:button type="link-menuitem" command="mark" prop="unread" label="markunread" classAct="unread active" class="unread disabled" />
-		<roundcube:button type="link-menuitem" command="mark" prop="flagged" label="markflagged" classAct="flag active" class="flag disabled" />
-		<roundcube:button type="link-menuitem" command="mark" prop="unflagged" label="markunflagged" classAct="unflag active" class="unflag disabled" />
-		<roundcube:if condition="config:flag_for_deletion && !config:skip_deleted" />
-		<roundcube:button type="link-menuitem" command="mark" prop="undelete" label="markundeleted" classAct="undo active" class="undo disabled" />
-		<roundcube:endif />
-		<roundcube:container name="markmenu" id="markmessage-menu" />
-	</ul>
-</div>
-
-<roundcube:if condition="template:name != 'message'" />
-	<roundcube:object name="messageimportform" id="uploadform" class="popupmenu formcontent" buttons="no" />
-<roundcube:endif />
diff --git a/templates/includes/menu.html b/templates/includes/menu.html
deleted file mode 100644
index 50e5d5c..0000000
--- a/templates/includes/menu.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div id="layout-menu">
-	<h2 id="aria-label-tasknav" class="voice"><roundcube:label name="arialabeltasknav" /></h2>
-	<div class="popover-header">
-		<roundcube:object name="logo" src="/images/logo.png" id="logo" alt="Logo" />
-		<a class="button icon cancel"><span class="inner"><roundcube:label name="close" /></span></a>
-	</div>
-	<div id="taskmenu" class="menu toolbar" role="navigation" aria-labelledby="aria-label-tasknav">
-		<span class="action-buttons">
-			<roundcube:if condition="env:action == 'compose' and env:task == 'mail'" />
-				<roundcube:button command="compose" type="link" class="compose selected"
-					label="compose" title="writenewmessage" innerclass="inner" />
-			<roundcube:else />
-				<roundcube:button command="compose" type="link" class="compose"
-					label="compose" title="writenewmessage" innerclass="inner"
-					data-fab="true" data-fab-task="mail" data-fab-action="none" />
-			<roundcube:endif />
-		</span>
-		<roundcube:if condition="env:action == 'compose' and env:task == 'mail'" />
-			<roundcube:button command="mail" label="mail" type="link" innerClass="inner"
-				class="mail" />
-		<roundcube:else />
-			<roundcube:button command="mail" label="mail" type="link" innerClass="inner"
-				class="mail" classSel="mail selected" />
-		<roundcube:endif />
-		<roundcube:button command="addressbook" label="contacts" type="link" innerClass="inner"
-			class="contacts" classSel="contacts selected" />
-		<roundcube:container name="taskbar" id="taskmenu" />
-		<roundcube:button command="settings" label="settings" type="link" innerClass="inner"
-			class="settings" classSel="settings selected" />
-		<span class="special-buttons">
-			<roundcube:if condition="config:dark_mode_support" />
-				<roundcube:add_label name="darkmode" />
-				<roundcube:add_label name="lightmode" />
-				<roundcube:button name="theme" label="darkmode" type="link" innerClass="inner" class="theme dark" />
-			<roundcube:endif />
-			<roundcube:button name="about" label="about" type="link"
-				class="about" innerClass="inner" onclick="UI.about_dialog(this)" />
-			<roundcube:button command="logout" label="logout" type="link"
-				class="logout" innerClass="inner" />
-		</span>
-	</div>
-</div>
diff --git a/templates/includes/pagenav.html b/templates/includes/pagenav.html
deleted file mode 100644
index e03a811..0000000
--- a/templates/includes/pagenav.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="pagenav menu footer small" role="toolbar" aria-label="<roundcube:label name="arialabellistnav" />">
-	<roundcube:button command="firstpage" type="link" class="firstpage disabled" classAct="firstpage"
-		title="firstpage" label="first" innerclass="inner" />
-	<roundcube:button command="previouspage" type="link" class="prevpage disabled" classAct="prevpage"
-		title="previouspage" label="previous" innerclass="inner" />
-	<roundcube:if condition="template:name == 'mail'" />
-		<roundcube:object name="messageCountDisplay" class="pagenav-text" aria-live="polite" aria-relevant="text" />
-		<input class="form-control" type="text" size="3" disabled title="<roundcube:label name="currpage" />" />
-	<roundcube:elseif condition="template:name == 'addressbook'" />
-		<span class="pagenav-text" aria-live="polite" aria-relevant="text">
-			<roundcube:object name="recordsCountDisplay" label="fromtoshort" />
-		</span>
-	<roundcube:else />
-		<span class="pagenav-text" aria-live="polite" aria-relevant="text">&nbsp;</span>
-	<roundcube:endif />
-	<roundcube:button command="nextpage" type="link" class="nextpage disabled" classAct="nextpage"
-		title="nextpage" label="next" innerclass="inner" />
-	<roundcube:button command="lastpage" type="link" class="lastpage disabled" classAct="lastpage"
-		title="lastpage" label="last" innerclass="inner" />
-</div>
diff --git a/templates/includes/settings-menu.html b/templates/includes/settings-menu.html
deleted file mode 100644
index c7b364c..0000000
--- a/templates/includes/settings-menu.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="layout-sidebar" class="listbox<roundcube:exp expression="!request:_action ? ' selected' : ''"/>" role="navigation" aria-labelledby="aria-label-settingstabs">
-	<div class="header">
-		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
-		<span id="aria-label-settingstabs" class="header-title"><roundcube:label name="settings" /></span>
-	</div>
-	<div class="scroller">
-		<ul id="settings-menu" class="listing iconized settings-default-icon<roundcube:exp expression="!request:_action ? ' selection-large-only' : ''"/>">
-			<roundcube:object name="settingstabs" class="listitem" tagname="li" />
-			<roundcube:container name="tabs" id="settings-menu" />
-		</ul>
-	</div>
-</div>
diff --git a/templates/login.html b/templates/login.html
deleted file mode 100644
index c363fd9..0000000
--- a/templates/login.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:object name="productname" /> <roundcube:label name="login" /></h1>
-
-<div id="layout-content" class="selected no-navbar" role="main">
-	<roundcube:object name="logo" src="/images/logo.png" id="logo" alt="Logo" />
-	<roundcube:form id="login-form" name="login-form" method="post" class="propform">
-	<roundcube:object name="loginform" form="login-form" size="40" submit=true class="form-control" />
-		<div id="login-footer" role="contentinfo">
-			<roundcube:object name="productname" condition="config:display_product_info &gt; 0" />
-			<roundcube:object name="version" condition="config:display_product_info == 2" />
-			<roundcube:if condition="config:support_url" />
-				&nbsp;&bull;&nbsp; <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a>
-			<roundcube:endif />
-			<roundcube:container name="loginfooter" id="login-footer" />
-		</div>
-	</form>
-</div>
-
-<noscript>
-	<p class="noscriptwarning"><roundcube:label name="noscriptwarning" /></p>
-</noscript>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/mail.html b/templates/mail.html
deleted file mode 100644
index 79696e8..0000000
--- a/templates/mail.html
+++ /dev/null
@@ -1,220 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-<roundcube:include file="includes/menu.html" />
-
-<h1 class="voice"><roundcube:label name="mail" /></h1>
-
-<!-- folders list -->
-<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="aria-label-folderlist">
-	<div class="header">
-		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
-		<span class="header-title username"><roundcube:object name="username" /></span>
-		<roundcube:button name="folderactions" type="link" title="folderactions" label="actions"
-			class="button icon sidebar-menu" innerclass="inner" data-popup="mailboxoptions-menu" />
-	</div>
-	<h2 id="aria-label-folderlist" class="voice"><roundcube:label name="arialabelfolderlist" /></h2>
-	<div id="folderlist-content" class="scroller">
-		<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing folderlist" folder_filter="mail" unreadwrap="%s" />
-	</div>
-	<div class="footer small">
-		<roundcube:if condition="env:quota" />
-			<div id="quotadisplay" class="quota-widget">
-				<span class="voice"><roundcube:label name="quota"></span>
-				<roundcube:object name="quotaDisplay" class="count" display="text" />
-			</div>
-		<roundcube:endif />
-	</div>
-</div>
-
-<!-- messages list -->
-<div id="layout-list" class="listbox selected">
-	<div id="messagelist-header" class="header">
-		<a class="button icon task-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="mailboxlist" /></span></a>
-		<span class="header-title"></span>
-		<div class="toolbar menu" role="toolbar">
-			<a href="#select" class="select disabled" data-popup="listselect-menu" data-toggle-button="list-toggle-button" title="<roundcube:label name="select" />"><span class="inner"><roundcube:label name="select" /></span></a>
-			<roundcube:if condition="env:threads" />
-				<a href="#threads" class="threads disabled" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><span class="inner"><roundcube:label name="threads" /></span></a>
-			<roundcube:endif />
-			<roundcube:object name="listmenulink" class="options active" label="options" innerclass="inner" />
-			<roundcube:container name="listcontrols" id="listcontrols" />
-		</div>
-		<roundcube:button command="checkmail" type="link" class="button icon toolbar-button refresh"
-			label="refresh" title="checkmail" innerclass="inner" />
-		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
-	</div>
-	<roundcube:add_label name="showunread" />
-	<roundcube:object name="searchform" id="mailsearchform" wrapper="searchbar menu"
-		label="mailquicksearchbox" buttontitle="findmail" options="searchmenu" ariatag="h2" />
-	<div id="searchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu" aria-controls="messagelist">
-		<h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod" /></h3>
-		<div class="formcontent">
-			<ul class="proplist">
-				<li><label><input type="checkbox" name="s_mods[]" value="subject" /><roundcube:label name="subject" /></label></li>
-				<li class="with-sublist">
-					<label><input type="checkbox" name="s_mods[]" value="sender" /><roundcube:label name="sender" /></label>
-					<a class="button icon dropdown" role="button" href="#" title="<roundcube:label name="details" />"></a>
-					<ul class="proplist d-none">
-						<li><label><input type="checkbox" name="s_mods[]" value="from" /><roundcube:label name="from" /></label></li>
-						<li><label><input type="checkbox" name="s_mods[]" value="replyto" /><roundcube:label name="replyto" /></label></li>
-						<li><label><input type="checkbox" name="s_mods[]" value="followupto" /><roundcube:label name="followupto" /></label></li>
-					</ul>
-				</li>
-				<li class="with-sublist">
-					<label><input type="checkbox" name="s_mods[]" value="recipient" /><roundcube:label name="recipient" /></label>
-					<a class="button icon dropdown" role="button" href="#" title="<roundcube:label name="details" />"></a>
-					<ul class="proplist d-none">
-						<li><label><input type="checkbox" name="s_mods[]" value="to" /><roundcube:label name="to" /></label></li>
-						<li><label><input type="checkbox" name="s_mods[]" value="cc" /><roundcube:label name="cc" /></label></li>
-						<li><label><input type="checkbox" name="s_mods[]" value="bcc" /><roundcube:label name="bcc" /></label></li>
-					</ul>
-				</li>
-				<li><label><input type="checkbox" name="s_mods[]" value="body" /><roundcube:label name="body" /></label></li>
-				<li><label><input type="checkbox" name="s_mods[]" value="text" /><roundcube:label name="msgtext" /></label></li>
-			</ul>
-			<div class="input-group">
-				<div class="input-group-prepend">
-					<label for="searchfilter" class="input-group-text"><roundcube:label name="type" /></label>
-				</div>
-				<roundcube:object name="searchfilter" id="searchfilter" noevent="true" class="custom-select" />
-			</div>
-			<div class="input-group">
-				<div class="input-group-prepend">
-					<label for="s_interval" class="input-group-text"><roundcube:label name="date" /></label>
-				</div>
-				<roundcube:object name="searchinterval" id="s_interval" class="custom-select" />
-			</div>
-			<div class="input-group">
-				<div class="input-group-prepend">
-					<label for="s_scope" class="input-group-text"><roundcube:label name="searchscope" /></label>
-				</div>
-				<select name="s_scope" id="s_scope" class="custom-select">
-					<option value="base"><roundcube:label name="currentfolder" /></option>
-					<option value="sub"><roundcube:label name="subfolders" /></option>
-					<option value="all"><roundcube:label name="allfolders" /></option>
-				</select>
-			</div>
-		</div>
-		<div class="formbuttons">
-			<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
-		</div>
-	</div>
-	<div id="messagelist-content" class="scroller" tabindex="-1">
-		<h2 id="aria-label-messagelist" class="voice"><roundcube:label name="arialabelmessagelist" /></h2>
-		<roundcube:object name="messages" id="messagelist" class="listing messagelist sortheader fixedheader"
-			aria-labelledby="aria-label-messagelist" data-list="message_list" data-label-msg="listempty"
-		/>
-	</div>
-	<roundcube:include file="includes/pagenav.html" />
-</div>
-
-<!-- message preview -->
-<div id="layout-content">
-	<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>
-		<roundcube:include file="includes/mail-menu.html" />
-	</div>
-	<h2 id="aria-label-mailpreviewframe" class="voice"><roundcube:label name="arialabelmailpreviewframe" /></h2>
-	<div class="iframe-wrapper">
-		<roundcube:object name="contentframe"
-			id="messagecontframe"
-			aria-labelledby="aria-label-mailpreviewframe"
-			src="env:blankpage"
-			title="arialabelmailpreviewframe"
-		/>
-	</div>
-</div>
-
-<!-- popup menus -->
-
-<div id="dragmessage-menu" class="popupmenu">
-	<h3 id="aria-label-dragmessage-menu" class="voice"><roundcube:label name="arialabeldropactionmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-dragmessage-menu">
-		<roundcube:button command="move" type="link-menuitem" onclick="return rcmail.drag_menu_action('move')" label="move" class="disabled" classAct="active" />
-		<roundcube:button command="copy" type="link-menuitem" onclick="return rcmail.drag_menu_action('copy')" label="copy" class="disabled" classAct="active" />
-	</ul>
-</div>
-
-<div id="mailboxoptions-menu" class="popupmenu">
-	<h3 id="aria-label-mailboxoptions-menu" class="voice"><roundcube:label name="arialabelmailboxmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-mailboxoptions-menu">
-		<roundcube:button command="expunge" type="link-menuitem" label="compact" class="expunge disabled" classAct="expunge active" />
-		<roundcube:button command="purge" type="link-menuitem" label="empty" class="purge disabled" classAct="purge active" />
-		<roundcube:button command="mark-all-read" type="link-menuitem" label="markallread" class="read disabled" classAct="read active" />
-		<roundcube:button command="folders" task="settings" type="link-menuitem" label="managefolders" class="folders disabled" classAct="folders active" />
-		<roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
-	</ul>
-</div>
-
-<div id="listselect-menu" class="popupmenu">
-	<h3 id="aria-label-listselect-menu" class="voice"><roundcube:label name="arialabellistselectmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-listselect-menu">
-		<roundcube:button type="link-menuitem" label="selection" class="selection disabled" classAct="selection active"
-			name="list-toggle-button" id="list-toggle-button" onclick="UI.toggle_list_selection(this, 'messagelist')" />
-		<roundcube:button command="select-all" type="link-menuitem" label="all" class="select all disabled" classAct="select all active" />
-		<roundcube:button command="select-all" type="link-menuitem" prop="page" label="currpage" class="select page disabled" classAct="select page active" />
-		<roundcube:button command="select-all" type="link-menuitem" prop="unread" label="unread" class="select unread disabled" classAct="select unread active" />
-		<roundcube:button command="select-all" type="link-menuitem" prop="flagged" label="flagged" class="select flagged disabled" classAct="select flagged active" />
-		<roundcube:button command="select-all" type="link-menuitem" prop="invert" label="invert" class="select invert disabled" classAct="select invert active" />
-		<roundcube:button command="select-none" type="link-menuitem" label="none" class="select none disabled" classAct="select none active" />
-	</ul>
-</div>
-
-<div id="threadselect-menu" class="popupmenu">
-	<h3 id="aria-label-threadselectmenu" class="voice"><roundcube:label name="arialabelthreadselectmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-threadselectmenu">
-		<roundcube:button command="expand-unread" type="link-menuitem" label="expand-unread" class="expand unread disabled" classAct="expand unread active" />
-		<roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all disabled" classAct="expand all active" />
-		<roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none disabled" classAct="expand none active" />
-	</ul>
-</div>
-
-<div id="listoptions-menu" class="popupmenu propform" role="dialog" aria-labelledby="aria-label-listoptions">
-	<h3 id="aria-label-listoptions" class="voice"><roundcube:label name="arialabelmessagelistoptions" /></h3>
-	<roundcube:if condition="!in_array('message_sort_col', (array)config:dont_override)" />
-	<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">
-				<option value=""><roundcube:label name="nonesort" /></option>
-				<option value="arrival"><roundcube:label name="arrival" /></option>
-				<option value="date"><roundcube:label name="sentdate" /></option>
-				<option value="subject"><roundcube:label name="subject" /></option>
-				<option value="fromto"><roundcube:label name="fromto" /></option>
-				<option value="from"><roundcube:label name="from" /></option>
-				<option value="to"><roundcube:label name="to" /></option>
-				<option value="cc"><roundcube:label name="cc" /></option>
-				<option value="size"><roundcube:label name="size" /></option>
-			</select>
-		</div>
-	</div>
-	<roundcube:endif />
-	<roundcube:if condition="!in_array('message_sort_order', (array)config:dont_override)" />
-	<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">
-				<option value="ASC"><roundcube:label name="asc" /></option>
-				<option value="DESC"><roundcube:label name="desc" /></option>
-			</select>
-		</div>
-	</div>
-	<roundcube:endif />
-	<roundcube:if condition="env:threads" />
-	<div class="form-group row">
-		<label for="listoptions-threads" class="col-form-label col-sm-4"><roundcube:label name="lmode" /></label>
-		<div class="col-sm-8">
-			<select id="listoptions-threads" name="mode">
-				<option value="list"><roundcube:label name="list" /></option>
-				<option value="threads"><roundcube:label name="threads" /></option>
-			</select>
-		</div>
-	</div>
-	<roundcube:endif />
-	<roundcube:container name="listoptions" id="listoptionsmenu" />
-	<roundcube:add_label name="listoptionstitle" />
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/message.html b/templates/message.html
deleted file mode 100644
index 572d59f..0000000
--- a/templates/message.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-<roundcube:include file="includes/menu.html" condition="!env:framed && !env:extwin" />
-
-<roundcube:object name="mailboxlist" folder_filter="mail" type="js" />
-
-<h1 class="voice"><roundcube:label name="arialabelmailpreviewframe" /></h1>
-
-<div id="layout-content" class="selected">
-	<roundcube:if condition="!env:framed" />
-		<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>
-			<roundcube:include file="includes/mail-menu.html" />
-		</div>
-	<roundcube:endif />
-	<div class="content frame-content" role="main">
-		<div id="message-header">
-			<h2 class="subject">
-				<span class="voice"><roundcube:label name="subject" />: </span>
-				<roundcube:object name="messageHeaders" valueOf="subject" />
-				<roundcube:if condition="!env:message_context && !env:extwin">
-					<roundcube:button command="extwin" type="link" class="extwin" innerClass="inner"
-						label="openinextwin" title="openinextwin" data-hidden="small" />
-				<roundcube:endif />
-			</h2>
-			<div class="header">
-				<roundcube:object name="contactphoto" class="contactphoto" placeholder="/images/contactpic.svg" bg-color="transparent" />
-				<div class="header-content">
-					<roundcube:object name="messageSummary" class="header-summary" addicon="virtual" />
-					<roundcube:object name="messageHeaders" class="header-headers" addicon="virtual" exclude="subject" max="10" />
-					<div class="header-links">
-						<roundcube:add_label name="details" />
-						<roundcube:add_label name="summary" />
-						<a href="#headers" class="headers-summary" onclick="return UI.headers_show(true)"></a>
-						<a href="#all-headers" class="headers-all" onclick="return UI.headers_dialog()"><roundcube:label name="headers" /></a>
-						<roundcube:add_label name="arialabelmessageheaders" />
-						<roundcube:if condition="env:optional_format=='text'" />
-							<roundcube:button command="change-format" prop="text" type="link" class="plain" innerClass="inner"
-								title="changeformattext" label="plaintoggle" />
-						<roundcube:elseif condition="env:optional_format=='html'" />
-							<roundcube:button command="change-format" prop="html" type="link" class="html" innerClass="inner"
-								title="changeformathtml" label="htmltoggle" />
-						<roundcube:endif />
-						<roundcube:container name="headerlinks" id="header-links" />
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="message-content">
-			<div class="leftcol" role="region" aria-labelledby="aria-label-messageattachments">
-				<h2 id="aria-label-messageattachments" class="voice"><roundcube:label name="attachments" /></h2>
-				<roundcube:object name="messageAttachments" id="attachment-list" class="attachmentslist" />
-			</div>
-			<div class="rightcol" role="region" aria-labelledby="aria-label-messagebody">
-				<h2 id="aria-label-messagebody" class="voice"><roundcube:label name="arialabelmessagebody" /></h2>
-				<roundcube:object name="messageObjects" id="message-objects" />
-				<roundcube:object name="messageBody" id="messagebody" headertableclass="headers-table" />
-			</div>
-		</div>
-	</div>
-</div>
-
-<!-- popup menus -->
-<div id="attachmentmenu" class="popupmenu">
-	<h3 id="aria-label-attachmentmenu" class="voice"><roundcube:label name="arialabelattachmentmenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-attachmentmenu">
-		<roundcube:button command="open-attachment" type="link-menuitem" id="attachmenuopen" label="open" class="extwin disabled" classAct="extwin active" />
-		<roundcube:button command="download-attachment" type="link-menuitem" id="attachmenudownload" label="download" class="download disabled" classAct="download active" />
-		<roundcube:container name="attachmentmenu" id="attachmentmenu" />
-	</ul>
-</div>
-
-<div id="mailto-menu" class="popupmenu">
-	<h3 id="aria-label-mailtomenu" class="voice"><roundcube:label name="arialabelmailtomenu" /></h3>
-	<ul class="menu listing" role="menu" aria-labelledby="aria-label-mailtomenu">
-		<roundcube:button name="addtoaddressbook" type="link-menuitem" label="addtoaddressbook" class="addressbook" classAct="addressbook active" />
-		<roundcube:button name="composeto" type="link-menuitem" label="composeto" class="compose" classAct="compose active" />
-		<roundcube:container name="mailtomenu" id="mailto-menu" />
-	</ul>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/messagepart.html b/templates/messagepart.html
deleted file mode 100644
index cbdd005..0000000
--- a/templates/messagepart.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:var name="env:filename" /></h1>
-
-<div id="layout-content" class="selected">
-	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
-	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
-		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
-		<div id="messagetoolbar" class="toolbar menu">
-			<roundcube:button type="link" name="info" label="properties" title="properties"
-				class="info" innerclass="inner" onclick="UI.props_dialog()" />
-			<roundcube:button command="download" type="link" label="download" title="download"
-				class="download disabled" classAct="download" innerclass="inner" />
-			<roundcube:button command="print" type="link" label="print" title="print"
-				class="print disabled" classAct="print" innerclass="inner" data-hidden="small" />
-			<roundcube:container name="toolbar" id="messagetoolbar" />
-			<roundcube:if condition="env:is_message" />
-				<span class="spacer"></span>
-				<roundcube:button command="reply" type="link" class="reply disabled" classAct="reply"
-					label="reply" title="replytomessage" innerclass="inner" />
-				<span class="dropbutton">
-					<roundcube:button command="reply-all" type="link" class="reply-all disabled" classAct="reply-all"
-						label="replyall" title="replytoallmessage" innerclass="inner" />
-					<a href="#reply-all" id="replyallmenulink" class="dropdown" data-popup="replyall-menu" tabindex="0">
-						<span class="inner"><roundcube:label name="arialabelreplyalloptions" /></span>
-					</a>
-				</span>
-				<span class="dropbutton">
-					<roundcube:button command="forward" type="link" class="forward disabled" classAct="forward"
-						label="forward" title="forwardmessage" innerclass="inner" />
-					<a href="#forward" id="forwardmenulink" class="dropdown" data-popup="forward-menu" tabindex="0">
-						<span class="inner"><roundcube:label name="arialabelforwardingoptions" /></span>
-					</a>
-				</span>
-				<span class="spacer"></span>
-				<roundcube:button name="messagemenulink" id="messagemenulink" type="link"
-					class="more" label="more" title="moreactions" data-popup="message-menu"
-					innerclass="inner" data-hidden="small" />
-			<roundcube:endif />
-			<roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
-				<span class="spacer"></span>
-				<roundcube:button command="image-scale" type="link" prop="+" data-hidden="small"
-					class="zoomin disabled" classAct="zoomin"
-					label="zoomin" title="increaseimage" innerclass="inner" />
-				<roundcube:button command="image-scale" type="link" prop="-" data-hidden="small"
-					class="zoomout disabled" classAct="zoomout"
-					label="zoomout" title="decreaseimage" innerclass="inner" />
-				<roundcube:button command="image-rotate" type="link" data-hidden="small"
-					class="rotate disabled" classAct="rotate"
-					label="rotate" title="rotateimage" innerclass="inner" />
-			<roundcube:endif />
-		</div>
-	</div>
-	<h2 id="aria-label-messagepart" class="voice"><roundcube:label name="arialabelattachmentpreview" /></h2>
-	<div class="iframe-wrapper">
-		<roundcube:object name="messagePartFrame" id="messagepartframe" title="arialabelattachmentpreview"
-			role="main" aria-labelledby="aria-label-messagepart" />
-	</div>
-<roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
-	<div id="image-tools" class="image-tools" data-hidden="big">
-		<h3 id="aria-label-imagetools" class="voice"><roundcube:label name="arialabelimagetools" /></h3>
-		<div class="toolbar menu" role="menu" aria-labelledby="aria-label-imagetools">
-			<roundcube:button command="image-scale" type="link" prop="+"
-				class="zoomin disabled" classAct="zoomin"
-				label="zoomin" title="increaseimage" innerclass="inner" />
-			<roundcube:button command="image-scale" type="link" prop="-"
-				class="zoomout disabled" classAct="zoomout"
-				label="zoomout" title="decreaseimage" innerclass="inner" />
-			<roundcube:button command="image-rotate" type="link"
-				class="rotate disabled" classAct="rotate"
-				label="rotate" title="rotateimage" innerclass="inner" />
-		</div>
-		<a href="#" class="button icon tools" onclick="$(this).attr('title', $(this).data('label-' + ($('#image-tools').toggleClass('open').is('.open') ? 'hide' : 'show')))"
-			data-label-show="<roundcube:label name="showtools" />" data-label-hide="<roundcube:label name="hidetools" />" title="<roundcube:label name="showtools" />">
-			<span class="inner"><roundcube:label name="showtools" /></span>
-		</a>
-	</div>
-<roundcube:endif />
-</div>
-
-<roundcube:if condition="env:is_message" />
-	<div id="forward-menu" class="popupmenu">
-		<h3 id="aria-label-forwardmenu" class="voice"><roundcube:label name="arialabelforwardingoptions" /></h3>
-		<ul class="menu listing" role="menu" aria-labelledby="aria-label-forwardmenu">
-			<roundcube:button type="link-menuitem" command="forward-inline" label="forwardinline" prop="sub" classAct="forward inline active" class="forward disabled" />
-			<roundcube:button type="link-menuitem" command="forward-attachment" label="forwardattachment" prop="sub" classAct="forward attachment active" class="forward attachment disabled" />
-			<roundcube:container name="forwardmenu" id="forward-menu" />
-		</ul>
-	</div>
-
-	<div id="replyall-menu" class="popupmenu">
-		<h3 id="aria-label-replyallmenu" class="voice"><roundcube:label name="arialabelreplyalloptions" /></h3>
-		<ul class="menu listing" role="menu" aria-labelledby="aria-label-replyallmenu">
-			<roundcube:button type="link-menuitem" command="reply-all" label="replyall" prop="sub" class="reply all disabled" classAct="reply all active" />
-			<roundcube:button type="link-menuitem" command="reply-list" label="replylist" prop="sub" class="reply list disabled" classAct="reply list active" />
-			<roundcube:container name="replyallmenu" id="replyall-menu" />
-		</ul>
-	</div>
-
-	<div id="message-menu" class="popupmenu">
-		<h3 id="aria-label-messagemenu" class="voice"><roundcube:label name="arialabelmoremessageactions" /></h3>
-		<ul class="menu listing" role="menu" aria-labelledby="aria-label-messagemenu">
-			<roundcube:button type="link-menuitem" command="edit" prop="new" label="editasnew" class="edit asnew disabled" classAct="edit asnew active" />
-			<roundcube:button type="link-menuitem" command="viewsource" label="viewsource" class="source disabled" classAct="source active" />
-			<roundcube:container name="messagemenu" id="message-menu" />
-		</ul>
-	</div>
-<roundcube:endif />
-
-<roundcube:add_label name="properties" />
-<div id="properties-menu" class="popupmenu" role="dialog" aria-labelledby="aria-label-contentinfo">
-	<h3 id="aria-label-contentinfo" class="voice"><roundcube:label name="properties" /></h3>
-	<div class="scroller">
-		<roundcube:object name="messagePartControls" class="listing props-table" role="contentinfo"
-			aria-labelledby="aria-label-contentinfo" />
-	</div>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/messageprint.html b/templates/messageprint.html
deleted file mode 100644
index 7764d3f..0000000
--- a/templates/messageprint.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<roundcube:object name="logo" id="logo" alt="Logo" logo-type="print" logo-match="template" class="float-sm-right" />
-
-<div class="print-content" role="main">
-	<div id="message-header">
-		<h2 class="subject">
-			<roundcube:object name="messageHeaders" valueOf="subject" />
-		</h2>
-		<div class="header">
-			<roundcube:object name="contactphoto" class="contactphoto" placeholder="/images/contactpic.svg" />
-			<div class="header-content details-view">
-				<roundcube:object name="messageHeaders" class="header-headers" addicon="virtual" exclude="subject" max="10" />
-			</div>
-		</div>
-	</div>
-	<div id="message-content">
-		<div role="region">
-			<roundcube:object name="messageAttachments" id="attachment-list" class="attachmentslist" />
-		</div>
-		<div role="region">
-			<roundcube:object name="messageBody" id="messagebody" headertableclass="headers-table" />
-		</div>
-	</div>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/plugin.html b/templates/plugin.html
deleted file mode 100644
index 48a796b..0000000
--- a/templates/plugin.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-<roundcube:include file="includes/menu.html" />
-<roundcube:include file="includes/settings-menu.html" condition="env:task == 'settings'" />
-
-<div id="layout-content" class="selected" role="main">
-	<div class="header">
-		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
-		<span class="header-title"></span>
-	</div>
-	<roundcube:object name="plugin.body" />
-</div>
-
-<roundcube:object name="plugin.footer" />
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/responseedit.html b/templates/responseedit.html
deleted file mode 100644
index e00bda9..0000000
--- a/templates/responseedit.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:object name="steptitle" /></h1>
-
-<div class="formcontent">
-	<roundcube:object name="responseform" class="propform" size="60" textareacols="60" textarearows="18" />
-</div>
-
-<div class="formbuttons">
-	<roundcube:button command="save" class="btn btn-primary submit" label="save" condition="!env:readonly" />
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/responses.html b/templates/responses.html
deleted file mode 100644
index 347c556..0000000
--- a/templates/responses.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-<roundcube:include file="includes/menu.html" />
-<roundcube:include file="includes/settings-menu.html" />
-
-<h1 class="voice"><roundcube:label name="responses" /></h1>
-
-<!-- responses list -->
-<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-responseslist">
-	<div class="header">
-		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
-		<span id="aria-label-responseslist" class="header-title"><roundcube:label name="responses" /></span>
-		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
-	</div>
-	<div class="scroller">
-		<roundcube:object name="responseslist" id="responses-table" class="listing"
-			noheader="true" role="listbox" data-list="responses_list"
-			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="add" />
-	</div>
-	<div class="footer"></div>
-</div>
-
-<!-- response details frame -->
-<div id="layout-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="responsestoolbar" class="toolbar menu">
-			<roundcube:button command="add" type="link" class="create disabled" classAct="create"
-				label="create" title="newresponse" innerClass="inner" data-fab="true" />
-			<roundcube:button command="delete" type="link" class="delete disabled" classAct="delete"
-				label="delete" title="delete" innerClass="inner" />
-		</div>
-	</div>
-	<div class="iframe-wrapper">
-		<roundcube:object name="contentframe" id="preferences-frame" src="env:blankpage" title="arialabelresponseeditfrom" />
-	</div>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/settings.html b/templates/settings.html
deleted file mode 100644
index 6b0c44e..0000000
--- a/templates/settings.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-<roundcube:include file="includes/menu.html" />
-<roundcube:include file="includes/settings-menu.html" />
-
-<h1 class="voice"><roundcube:label name="preferences" /></h1>
-
-<div id="layout-list" class="listbox<roundcube:exp expression="!request:_action ? '' : ' selected'"/>" aria-labelledby="aria-label-prefsection">
-	<div class="header">
-		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
-		<span id="aria-label-prefsection" class="header-title"><roundcube:label name="preferences" /></span>
-	</div>
-	<div class="scroller">
-		<roundcube:object name="sectionslist" id="sections-table" class="listing iconized settings-default-icon"
-			noheader="true" role="listbox" data-list="sections_list" />
-	</div>
-</div>
-
-<div id="layout-content" role="main">
-	<div class="header">
-		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
-		<span class="header-title"></span>
-	</div>
-	<div class="iframe-wrapper">
-		<roundcube:object name="contentframe" id="preferences-frame" src="env:blankpage" title="arialabelpreferencesform" />
-	</div>
-</div>
-
-<roundcube:include file="includes/footer.html" />
diff --git a/templates/settingsedit.html b/templates/settingsedit.html
deleted file mode 100644
index d80e7aa..0000000
--- a/templates/settingsedit.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<roundcube:include file="includes/layout.html" />
-
-<h1 class="voice"><roundcube:object name="sectionname" /></h1>
-
-<div class="formcontent">
-	<roundcube:object name="userprefs" form="form" class="propform cols-sm-6-6" />
-</div>
-
-<div class="formbuttons">
-	<roundcube:button command="save" class="btn btn-primary submit" label="save" />
-</div>
-
-<roundcube:include file="includes/footer.html" />