From 3ebac0167bf20104fb7a2a55934765117760264c Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 18 Aug 2014 09:53:18 +0200
Subject: [PATCH] Only add zen-mode text labels in compose step

---
 skins/larry/includes/footer.html   |  2 --
 skins/larry/templates/compose.html | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/skins/larry/includes/footer.html b/skins/larry/includes/footer.html
index 0f00d1fae..6cd3e62d1 100644
--- a/skins/larry/includes/footer.html
+++ b/skins/larry/includes/footer.html
@@ -7,8 +7,6 @@ var UI = new rcube_mail_ui();
 $(document).ready(function(){
 	UI.set('errortitle', '<roundcube:label name="errortitle" quoting="javascript" />');
 	UI.set('toggleoptions', '<roundcube:label name="toggleadvancedoptions" quoting="javascript" />');
-	UI.set('exitfullscreen', '<roundcube:label name="exitfullscreen" quoting="javascript" />');
-	UI.set('switchtheme', '<roundcube:label name="switchtheme" quoting="javascript" />');
 	UI.init();
 });
 
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index dfac0e4ca..511987539 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -219,9 +219,17 @@
 	</ul>
 </div>
 
+<roundcube:include file="/includes/footer.html" />
+
 <script type="text/javascript" src="/zen-form.js"></script>
+<script type="text/javascript">
 
-<roundcube:include file="/includes/footer.html" />
+$(document).ready(function() {
+	UI.set('exitfullscreen', '<roundcube:label name="exitfullscreen" quoting="javascript" />');
+	UI.set('switchtheme', '<roundcube:label name="switchtheme" quoting="javascript" />');
+});
+
+</script>
 
 </body>
 </html>