4 files changed, 2 insertions, 10 deletions
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index 99c2c8efb..b2ed21029 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -31,7 +31,5 @@
 <roundcube:object name="addressframe" id="contact-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
 </div>
 
-<roundcube:include file="/includes/taskbar.html" />
-
 </body>
 </html>
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 5fd5e7397..5774b78fa 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -112,7 +112,5 @@ function rcmail_toggle_display(id)
 </div>
 -->
 
-<roundcube:include file="/includes/taskbar.html" />
-
 </body>
 </html>
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 631f46d59..56d0df66f 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -45,7 +45,5 @@
 <roundcube:button command="select-none" label="none" classAct="active" />
 </div>
 
-<roundcube:include file="/includes/taskbar.html" />
-
 </body>
 </html>
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 5eafb59ae..3c276d0d1 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -16,7 +16,7 @@
 <roundcube:button command="delete" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
 <roundcube:button command="print" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
 <roundcube:button command="viewsource" imageAct="/images/buttons/source_act.png" imagePas="/images/buttons/source_pas.png" width="32" height="32" title="viewsource" />
-<roundcube:object name="mailboxlist" type="select" noSelection="moveto" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" />
+<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" />
 </div>
 
 <div id="messagecountbar">
@@ -26,7 +26,7 @@
 </div>
 
 <div id="mailboxlist-header"><roundcube:label name="mailboxlist" /></div>
-<div id="mailboxlist-container"><roundcube:object name="mailboxlist" id="mailboxlist" /></div>
+<div id="mailboxlist-container"><roundcube:object name="mailboxlist" id="mailboxlist" maxlength="16" /></div>
 
 <div id="messageframe">
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" />
@@ -35,7 +35,5 @@
 <roundcube:object name="messageBody" id="messagebody" showImages="true" />
 </div>
 
-<roundcube:include file="/includes/taskbar.html" />
-
 </body>
 </html>