diff --git a/skins/elastic/templates/about.html b/skins/elastic/templates/about.html
index 5d0126372..53d4e5d12 100644
--- a/skins/elastic/templates/about.html
+++ b/skins/elastic/templates/about.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <roundcube:object name="aboutcontent" />
 
@@ -17,4 +17,4 @@
 	</div>
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/addressbook.html b/skins/elastic/templates/addressbook.html
index 3bfa176ac..d92fc1474 100644
--- a/skins/elastic/templates/addressbook.html
+++ b/skins/elastic/templates/addressbook.html
@@ -1,5 +1,5 @@
-<roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" />
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
 
 <h1 class="voice"><roundcube:label name="addressbook" /></h1>
 
@@ -138,4 +138,4 @@
 	</ul>
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html
index e4ee7918f..383ea4a4a 100644
--- a/skins/elastic/templates/compose.html
+++ b/skins/elastic/templates/compose.html
@@ -1,5 +1,5 @@
-<roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" condition="!env:extwin && !env:framed" />
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" condition="!env:extwin && !env:framed" />
 
 <h1 class="voice"><roundcube:object name="pagetitle" /></h1>
 
@@ -86,50 +86,50 @@
 			<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-1 col-form-label"><roundcube:label name="from" /></label>
-					<div class="input-group col-11">
+					<label for="_from" class="col-2 col-form-label"><roundcube:label name="from" /></label>
+					<div class="input-group col-10">
 						<roundcube:object name="composeHeaders" part="from" id="_from" form="form" tabindex="1" class="form-control" />
 						<a href="#identities" onclick="return rcmail.command('identities')" class="input-group-addon icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a>
 					</div>
 				</div>
 				<div id="compose_to" class="form-group row">
-					<label for="_to" class="col-1 col-form-label"><roundcube:label name="to" /></label>
-					<div class="input-group col-11">
+					<label for="_to" class="col-2 col-form-label"><roundcube:label name="to" /></label>
+					<div class="input-group col-10">
 						<roundcube:object name="composeHeaders" part="to" id="_to" form="form"  tabindex="1" aria-required="true" data-recipient-input="true" />
 						<a href="#add-header" data-popup="headers-menu" class="input-group-addon icon add" title="<roundcube:label name="addheader" />" tabindex="1"><span class="inner"><roundcube:label name="addheader" /></span></a>
 					</div>
 				</div>
 				<div id="compose_cc" class="hidden form-group row">
-					<label for="_cc" class="col-1 col-form-label"><roundcube:label name="cc" /></label>
-					<div class="input-group col-11">
+					<label for="_cc" class="col-2 col-form-label"><roundcube:label name="cc" /></label>
+					<div class="input-group col-10">
 						<roundcube:object name="composeHeaders" part="cc" id="_cc" form="form" tabindex="1" data-recipient-input="true" />
 						<a href="#delete" onclick="$('#_cc').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
 					</div>
 				</div>
 				<div id="compose_bcc" class="hidden form-group row">
-					<label for="_bcc" class="col-1 col-form-label"><roundcube:label name="bcc" /></label>
-					<div class="input-group col-11">
+					<label for="_bcc" class="col-2 col-form-label"><roundcube:label name="bcc" /></label>
+					<div class="input-group col-10">
 						<roundcube:object name="composeHeaders" part="bcc" id="_bcc" form="form" tabindex="1" data-recipient-input="true" />
 						<a href="#delete" onclick="$('#_bcc').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
 					</div>
 				</div>
 				<div id="compose_replyto" class="hidden form-group row">
-					<label for="_replyto" class="col-1 col-form-label"><roundcube:label name="replyto" /></label>
-					<div class="input-group col-11">
+					<label for="_replyto" class="col-2 col-form-label"><roundcube:label name="replyto" /></label>
+					<div class="input-group col-10">
 						<roundcube:object name="composeHeaders" part="replyto" id="_replyto" form="form" tabindex="1" data-recipient-input="true" />
 						<a href="#delete" onclick="$('#_replyto').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
 					</div>
 				</div>
 				<div id="compose_followupto" class="hidden form-group row">
-					<label for="_followupto" class="col-1 col-form-label"><roundcube:label name="followupto" /></label>
-					<div class="input-group col-11">
+					<label for="_followupto" class="col-2 col-form-label"><roundcube:label name="followupto" /></label>
+					<div class="input-group col-10">
 						<roundcube:object name="composeHeaders" part="followupto" id="_followupto" form="form" tabindex="1" data-recipient-input="true" />
 						<a href="#delete" onclick="$('#_followupto').val('').change()" class="input-group-addon icon cancel" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
 					</div>
 				</div>
 				<div id="compose_subject" class="form-group row">
-					<label for="compose-subject" class="col-1 col-form-label"><roundcube:label name="subject" /></label>
-					<roundcube:object name="composeSubject" id="_subject" form="form" tabindex="1" class="col-11 form-control" />
+					<label for="compose-subject" class="col-2 col-form-label"><roundcube:label name="subject" /></label>
+					<roundcube:object name="composeSubject" id="_subject" form="form" tabindex="1" class="col-10 form-control" />
 				</div>
 			</div>
 		</div>
@@ -216,4 +216,4 @@
 	</ul>
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/contact.html b/skins/elastic/templates/contact.html
index 51700cbad..0b23c15ca 100644
--- a/skins/elastic/templates/contact.html
+++ b/skins/elastic/templates/contact.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <h1 class="voice"><roundcube:label name="contactproperties" /></h1>
 
@@ -23,4 +23,4 @@
 	<roundcube:endif />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/contactedit.html b/skins/elastic/templates/contactedit.html
index bbc1d563a..793407e95 100644
--- a/skins/elastic/templates/contactedit.html
+++ b/skins/elastic/templates/contactedit.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <h1 class="voice"><roundcube:object name="steptitle" /></h1>
 
@@ -38,4 +38,4 @@
 
 <roundcube:object name="photoUploadForm" id="upload-form" mode="smart" />
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/contactimport.html b/skins/elastic/templates/contactimport.html
index d61d3cb2c..ff322882b 100644
--- a/skins/elastic/templates/contactimport.html
+++ b/skins/elastic/templates/contactimport.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="importcontacts" /></h1>
 
@@ -6,4 +6,4 @@
 	<roundcube:object name="importstep" class="propform" />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/contactprint.html b/skins/elastic/templates/contactprint.html
index 19e355ce2..1ecdfc402 100644
--- a/skins/elastic/templates/contactprint.html
+++ b/skins/elastic/templates/contactprint.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <div id="content" class="content" role="main">
 	<div id="contact-details">
@@ -11,4 +11,4 @@
 	</div>
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/contactsearch.html b/skins/elastic/templates/contactsearch.html
index cf517e870..f2d95b76d 100644
--- a/skins/elastic/templates/contactsearch.html
+++ b/skins/elastic/templates/contactsearch.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <h1 class="voice"><roundcube:label name="addressbook" /> : <roundcube:label name="advsearch" /></h1>
 
@@ -6,4 +6,4 @@
 	<roundcube:object name="searchform" id="advsearchform" class="tabbed" size=30 />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/error.html b/skins/elastic/templates/error.html
index 9d1dd0170..a5b52236c 100644
--- a/skins/elastic/templates/error.html
+++ b/skins/elastic/templates/error.html
@@ -1,7 +1,7 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <roundcube:if condition="!env:framed && !env:extwin" />
-	<roundcube:include file="/includes/menu.html" />
+	<roundcube:include file="includes/menu.html" />
 	<div id="content" class="content selected" role="main">
 		<div class="header">
 			<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
@@ -15,4 +15,4 @@ $__page_content
 
 	</div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/folderedit.html b/skins/elastic/templates/folderedit.html
index 083a7f866..b51cd4faf 100644
--- a/skins/elastic/templates/folderedit.html
+++ b/skins/elastic/templates/folderedit.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <h1 class="voice"><roundcube:label name="folderproperties" /></h1>
 
@@ -10,4 +10,4 @@
 	<roundcube:button command="save" class="primary button save" label="save" />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/folders.html b/skins/elastic/templates/folders.html
index a8fb1456e..c74d2135a 100644
--- a/skins/elastic/templates/folders.html
+++ b/skins/elastic/templates/folders.html
@@ -1,6 +1,6 @@
-<roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" />
-<roundcube:include file="/includes/settings-menu.html" />
+<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="folders" /></h1>
 
@@ -54,4 +54,4 @@
 	<roundcube:object name="folderfilter" id="folderlist-filter" class="listing" noheader="true" />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/identities.html b/skins/elastic/templates/identities.html
index e9415f9ca..913b47162 100644
--- a/skins/elastic/templates/identities.html
+++ b/skins/elastic/templates/identities.html
@@ -1,6 +1,6 @@
-<roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" />
-<roundcube:include file="/includes/settings-menu.html" />
+<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>
 
@@ -36,4 +36,4 @@
 	<roundcube:object name="identityframe" id="preferences-frame" src="/watermark.html" title="arialabelidentityeditfrom" />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/identityedit.html b/skins/elastic/templates/identityedit.html
index b75953391..08fad404d 100644
--- a/skins/elastic/templates/identityedit.html
+++ b/skins/elastic/templates/identityedit.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <h1 class="voice"><roundcube:object name="steptitle" /></h1>
 
@@ -10,4 +10,4 @@
 	<roundcube:button command="save" class="primary icon save" label="save" condition="!env:readonly" />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/includes/footer.html b/skins/elastic/templates/includes/footer.html
similarity index 100%
rename from skins/elastic/includes/footer.html
rename to skins/elastic/templates/includes/footer.html
diff --git a/skins/elastic/includes/layout.html b/skins/elastic/templates/includes/layout.html
similarity index 100%
rename from skins/elastic/includes/layout.html
rename to skins/elastic/templates/includes/layout.html
diff --git a/skins/elastic/includes/mail-menu.html b/skins/elastic/templates/includes/mail-menu.html
similarity index 100%
rename from skins/elastic/includes/mail-menu.html
rename to skins/elastic/templates/includes/mail-menu.html
diff --git a/skins/elastic/includes/menu.html b/skins/elastic/templates/includes/menu.html
similarity index 100%
rename from skins/elastic/includes/menu.html
rename to skins/elastic/templates/includes/menu.html
diff --git a/skins/elastic/includes/settings-menu.html b/skins/elastic/templates/includes/settings-menu.html
similarity index 100%
rename from skins/elastic/includes/settings-menu.html
rename to skins/elastic/templates/includes/settings-menu.html
diff --git a/skins/elastic/templates/login.html b/skins/elastic/templates/login.html
index bc4919032..f520e24ea 100644
--- a/skins/elastic/templates/login.html
+++ b/skins/elastic/templates/login.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <h1 class="voice"><roundcube:object name="productname" /> <roundcube:label name="login" /></h1>
 
@@ -19,4 +19,4 @@
 	<p class="noscriptwarning"><roundcube:label name="noscriptwarning" /></p>
 </noscript>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html
index 4012ea666..e8b6f1a65 100644
--- a/skins/elastic/templates/mail.html
+++ b/skins/elastic/templates/mail.html
@@ -1,5 +1,5 @@
-<roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" />
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
 
 <h1 class="voice"><roundcube:label name="mail" /></h1>
 
@@ -90,7 +90,7 @@
 	<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" />
+		<roundcube:include file="includes/mail-menu.html" />
 	</div>
 	<h2 id="aria-label-mailpreviewframe" class="voice"><roundcube:label name="arialabelmailpreviewframe" /></h2>
 	<roundcube:object name="messagecontentframe"
@@ -195,4 +195,4 @@
 
 <roundcube:object name="messageimportform" id="uploadform" mode="smart" />
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/message.html b/skins/elastic/templates/message.html
index e11cb7482..3681791cb 100644
--- a/skins/elastic/templates/message.html
+++ b/skins/elastic/templates/message.html
@@ -1,5 +1,5 @@
-<roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" condition="!env:framed && !env:extwin" />
+<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" />
 
@@ -11,7 +11,7 @@
 		<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" />
+			<roundcube:include file="includes/mail-menu.html" />
 		</div>
 	<roundcube:endif />
 	<div class="content" role="main">
@@ -53,4 +53,4 @@
 	</ul>
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/messageerror.html b/skins/elastic/templates/messageerror.html
index 087538287..dc73817c2 100644
--- a/skins/elastic/templates/messageerror.html
+++ b/skins/elastic/templates/messageerror.html
@@ -1,5 +1,5 @@
-<roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" condition="!env:framed && !env:extwin" />
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" condition="!env:framed && !env:extwin" />
 
 <h1 class="voice"><roundcube:label name="messageopenerror" /></h1>
 
@@ -13,4 +13,4 @@
 	<div class="watermark"></div>
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/messagepart.html b/skins/elastic/templates/messagepart.html
index c6ccf2e57..8d30c1b10 100644
--- a/skins/elastic/templates/messagepart.html
+++ b/skins/elastic/templates/messagepart.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <h1 class="voice"><roundcube:label name="attachment" />: <roundcube:var name="env:filename" /></h1>
 
@@ -84,4 +84,4 @@
 	</div>
 <roundcube:endif />
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/messageprint.html b/skins/elastic/templates/messageprint.html
index 08f61cf19..31dae4587 100644
--- a/skins/elastic/templates/messageprint.html
+++ b/skins/elastic/templates/messageprint.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <div id="content" class="content" role="main">
 	<div id="printmessageframe">
@@ -8,4 +8,4 @@
 	</div>
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/plugin.html b/skins/elastic/templates/plugin.html
index fdddee972..24c4e4bf6 100644
--- a/skins/elastic/templates/plugin.html
+++ b/skins/elastic/templates/plugin.html
@@ -1,6 +1,6 @@
-<roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" />
-<roundcube:include file="/includes/settings-menu.html" condition="env:task == 'settings'" />
+<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="content" class="content selected" role="main">
 	<div class="header">
@@ -12,4 +12,4 @@
 
 <roundcube:object name="plugin.footer" />
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/responseedit.html b/skins/elastic/templates/responseedit.html
index 47bca0a65..7830f864f 100644
--- a/skins/elastic/templates/responseedit.html
+++ b/skins/elastic/templates/responseedit.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <h1 class="voice"><roundcube:object name="steptitle" /></h1>
 
@@ -10,4 +10,4 @@
 	<roundcube:button command="save" class="primary button save" label="save" condition="!env:readonly" />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/responses.html b/skins/elastic/templates/responses.html
index 2e0961aba..d39b0471e 100644
--- a/skins/elastic/templates/responses.html
+++ b/skins/elastic/templates/responses.html
@@ -1,6 +1,6 @@
-<roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" />
-<roundcube:include file="/includes/settings-menu.html" />
+<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="responses" /></h1>
 
@@ -36,4 +36,4 @@
 	<roundcube:object name="responseframe" id="preferences-frame" src="/watermark.html" title="arialabelresonseeditfrom" />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/settings.html b/skins/elastic/templates/settings.html
index e3635cdd3..f1fc7980d 100644
--- a/skins/elastic/templates/settings.html
+++ b/skins/elastic/templates/settings.html
@@ -1,6 +1,6 @@
-<roundcube:include file="/includes/layout.html" />
-<roundcube:include file="/includes/menu.html" />
-<roundcube:include file="/includes/settings-menu.html" />
+<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="preferences" /></h1>
 
@@ -24,4 +24,4 @@
 	<roundcube:object name="prefsframe" id="preferences-frame" src="/watermark.html" title="arialabelpreferencesform" />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/templates/settingsedit.html b/skins/elastic/templates/settingsedit.html
index 20ad69b68..64a297c7b 100644
--- a/skins/elastic/templates/settingsedit.html
+++ b/skins/elastic/templates/settingsedit.html
@@ -1,4 +1,4 @@
-<roundcube:include file="/includes/layout.html" />
+<roundcube:include file="includes/layout.html" />
 
 <h1 class="voice"><roundcube:object name="sectionname" /></h1>
 
@@ -10,4 +10,4 @@
 	<roundcube:button command="save" class="primary button save" label="save" />
 </div>
 
-<roundcube:include file="/includes/footer.html" />
+<roundcube:include file="includes/footer.html" />