diff --git a/skins/classic/includes/links.html b/skins/classic/includes/links.html
index d1de13514..7366546cb 100644
--- a/skins/classic/includes/links.html
+++ b/skins/classic/includes/links.html
@@ -1,5 +1,6 @@
 <link rel="index" href="$__comm_path" />
 <roundcube:object name="meta" />
+<roundcube:object name="links" />
 <link rel="stylesheet" type="text/css" href="/common.css" />
 <roundcube:if condition="in_array(env:task, array('mail', 'addressbook', 'settings'))" />
 <link rel="stylesheet" type="text/css" href="/<roundcube:var name="env:task" />.css" />
@@ -7,4 +8,3 @@
 <roundcube:if condition="browser:safari" />
 <link rel="stylesheet" type="text/css" href="/safari.css" />
 <roundcube:endif />
-<roundcube:object name="links" />
\ No newline at end of file
diff --git a/skins/elastic/templates/includes/layout.html b/skins/elastic/templates/includes/layout.html
index e71b691b3..a11a6b5b1 100644
--- a/skins/elastic/templates/includes/layout.html
+++ b/skins/elastic/templates/includes/layout.html
@@ -16,6 +16,7 @@
 <head>
 	<title><roundcube:object name="pagetitle" /></title>
 	<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">
@@ -25,7 +26,6 @@
 		<link rel="stylesheet" href="/styles/styles.css">
 		<roundcube:link rel="stylesheet" href="/styles/print.css" condition="env:action == 'print'" />
 	<roundcube:endif />
-	<roundcube:object name="links" />
 </head>
 <body class="task-<roundcube:exp expression="env:error_task ?: env:task ?: 'error'">">
 	<roundcube:if condition="!env:framed || env:extwin" />
diff --git a/skins/larry/includes/links.html b/skins/larry/includes/links.html
index a28e89b3c..d8cd557dc 100644
--- a/skins/larry/includes/links.html
+++ b/skins/larry/includes/links.html
@@ -1,10 +1,10 @@
 <meta name="viewport" content="" id="viewport" />
 <roundcube:object name="meta" />
+<roundcube:object name="links" />
 <link rel="stylesheet" type="text/css" href="/styles.css" />
 <roundcube:if condition="in_array(env:task, array('mail','addressbook','settings'))" />
 <link rel="stylesheet" type="text/css" href="/<roundcube:var name="env:task" />.css" />
 <roundcube:endif />
-<roundcube:object name="links" />
 <script type="text/javascript" src="/ui.js"></script>
 <roundcube:add_label name="errortitle" />
 <roundcube:add_label name="toggleadvancedoptions" />
