10 files changed, 108 insertions, 66 deletions
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index 0c3b1425a..af561c37b 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -796,24 +796,25 @@ function iframe_events()
 // Abbreviate mailbox names to fit width of the container
 function rcube_render_mailboxlist()
 {
-  var list = $('#mailboxlist > li a, #mailboxlist ul:visible > li a');
+  var list = $('#mailboxlist > li > a, #mailboxlist ul:visible > li > a');
 
   // it's too slow with really big number of folders, especially on IE
-  if (list.length > (bw.ie ? 25 : 100))
+  if (list.length > (bw.ie && bw.vendver < 9 ? 40 : 100))
     return;
 
-  list.each(function(){
+  list.each(function() {
     var elem = $(this),
       text = elem.data('text');
 
     if (!text) {
-      text = elem.text().replace(/\s+\(.+$/, '');
+      text = elem.text().replace(/\s+\([0-9]+\)$/, '');
       elem.data('text', text);
     }
+
     if (text.length < 6)
       return;
 
-    var abbrev = fit_string_to_size(text, elem, elem.width() - elem.children('span.unreadcount').width());
+    var abbrev = fit_string_to_size(text, elem, elem.width() - elem.children('span.unreadcount').width() - 16);
     if (abbrev != text)
       elem.attr('title', text);
     elem.contents().filter(function(){ return (this.nodeType == 3); }).get(0).data = abbrev;
@@ -823,19 +824,23 @@ function rcube_render_mailboxlist()
 // inspired by https://gist.github.com/24261/7fdb113f1e26111bd78c0c6fe515f6c0bf418af5
 function fit_string_to_size(str, elem, len)
 {
-  var w, span, result = str, ellip = '...';
+  var w, span, $span, result = str, ellip = '...';
 
   if (!rcmail.env.tmp_span) {
     // it should be appended to elem to use the same css style
     // but for performance reasons we'll append it to body (once)
-    span = $('<b>').css({visibility: 'hidden', padding: '0px'})
+    span = $('<b>').css({visibility: 'hidden', padding: '0px',
+      'font-family': elem.css('font-family'),
+      'font-size': elem.css('font-size')})
       .appendTo($('body', document)).get(0);
     rcmail.env.tmp_span = span;
   }
   else {
     span = rcmail.env.tmp_span;
   }
-  span.innerHTML = result;
+
+  $span = $(span);
+  $span.text(result);
 
   // on first run, check if string fits into the length already.
   w = span.offsetWidth;
@@ -848,7 +853,7 @@ function fit_string_to_size(str, elem, len)
     while (true) {
       offLeft = mid - cut;
       offRight = mid + cut;
-      span.innerHTML = str.substring(0,offLeft) + ellip + str.substring(offRight);
+      $span.text(str.substring(0,offLeft) + ellip + str.substring(offRight));
 
       // break loop if string fits size
       if (offLeft < 3 || span.offsetWidth)
@@ -935,8 +940,8 @@ function percent_indicator(obj, data)
 
 // Optional parameters used by TinyMCE
 var rcmail_editor_settings = {
-  skin : "default", // "default", "o2k7"
-  skin_variant : "" // "", "silver", "black"
+  skin: "default", // "default", "o2k7"
+  skin_variant: "" // "", "silver", "black"
 };
 
 var rcmail_ui;
@@ -947,49 +952,52 @@ function rcube_init_mail_ui()
   rcube_event.add_listener({ object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
   rcube_event.add_listener({ object:rcmail_ui, method:'body_keydown', event:'keydown' });
 
-  if (rcmail.env.quota_content)
-    update_quota(rcmail.env.quota_content);
-  rcmail.addEventListener('setquota', update_quota);
-
-  $('iframe').load(iframe_events)
-    .contents().mouseup(function(e){rcmail_ui.body_mouseup(e)});
-
-  if (rcmail.env.task == 'mail') {
-    rcmail.addEventListener('enable-command', 'enable_command', rcmail_ui);
-    rcmail.addEventListener('menu-open', 'menu_open', rcmail_ui);
-    rcmail.addEventListener('menu-save', 'menu_save', rcmail_ui);
-    rcmail.addEventListener('aftersend-attachment', 'uploadmenu', rcmail_ui);
-    rcmail.addEventListener('aftertoggle-editor', 'resize_compose_body_ev', rcmail_ui);
-    rcmail.gui_object('dragmenu', 'dragmenu');
-
-    if (rcmail.gui_objects.mailboxlist) {
-      rcmail.addEventListener('responseaftermark', rcube_render_mailboxlist);
-      rcmail.addEventListener('responseaftergetunread', rcube_render_mailboxlist);
-      rcmail.addEventListener('responseaftercheck-recent', rcube_render_mailboxlist);
-      rcmail.addEventListener('aftercollapse-folder', rcube_render_mailboxlist);
-      rcmail.addEventListener('afterimport-messages', function(){ rcmail_ui.show_popup('uploadform', false); });
-
-      new rcmail_scroller('#mailboxlist-content', '#mailboxlist-title', '#mailboxlist-footer');
-    }
+  rcmail.addEventListener('init', function() {
+    if (rcmail.env.quota_content)
+      update_quota(rcmail.env.quota_content);
+    rcmail.addEventListener('setquota', update_quota);
+
+    $('iframe').load(iframe_events)
+      .contents().mouseup(function(e){rcmail_ui.body_mouseup(e)});
+
+    if (rcmail.env.task == 'mail') {
+      rcmail.addEventListener('enable-command', 'enable_command', rcmail_ui);
+      rcmail.addEventListener('menu-open', 'menu_open', rcmail_ui);
+      rcmail.addEventListener('menu-save', 'menu_save', rcmail_ui);
+      rcmail.addEventListener('aftersend-attachment', 'uploadmenu', rcmail_ui);
+      rcmail.addEventListener('aftertoggle-editor', 'resize_compose_body_ev', rcmail_ui);
+      rcmail.gui_object('dragmenu', 'dragmenu');
+
+      if (rcmail.gui_objects.mailboxlist) {
+        rcmail.treelist.addEventListener('expand', rcube_render_mailboxlist);
+        rcmail.addEventListener('responseaftermark', rcube_render_mailboxlist);
+        rcmail.addEventListener('responseaftergetunread', rcube_render_mailboxlist);
+        rcmail.addEventListener('responseaftercheck-recent', rcube_render_mailboxlist);
+        rcmail.addEventListener('responseafterrefresh', rcube_render_mailboxlist);
+        rcmail.addEventListener('afterimport-messages', function(){ rcmail_ui.show_popup('uploadform', false); });
+
+        new rcmail_scroller('#mailboxlist-content', '#mailboxlist-title', '#mailboxlist-footer');
+      }
 
-    if (rcmail.env.action == 'compose')
-      rcmail_ui.init_compose_form();
-    else if (rcmail.env.action == 'show' || rcmail.env.action == 'preview')
-      // add menu link for each attachment
-      $('#attachment-list > li[id^="attach"]').each(function() {
-        $(this).append($('<a class="drop">').click(function() { rcmail_ui.show_attachmentmenu(this); }));
-      });
-  }
-  else if (rcmail.env.task == 'addressbook') {
-    rcmail.addEventListener('afterupload-photo', function(){ rcmail_ui.show_popup('uploadform', false); });
+      if (rcmail.env.action == 'compose')
+        rcmail_ui.init_compose_form();
+      else if (rcmail.env.action == 'show' || rcmail.env.action == 'preview')
+        // add menu link for each attachment
+        $('#attachment-list > li[id^="attach"]').each(function() {
+          $(this).append($('<a class="drop">').click(function() { rcmail_ui.show_attachmentmenu(this); }));
+        });
+    }
+    else if (rcmail.env.task == 'addressbook') {
+      rcmail.addEventListener('afterupload-photo', function(){ rcmail_ui.show_popup('uploadform', false); });
 
-    if (rcmail.gui_objects.folderlist)
-      new rcmail_scroller('#directorylist-content', '#directorylist-title', '#directorylist-footer');
+      if (rcmail.gui_objects.folderlist)
+       new rcmail_scroller('#directorylist-content', '#directorylist-title', '#directorylist-footer');
 
-    rcmail.gui_object('dragmenu', 'dragmenu');
-  }
-  else if (rcmail.env.task == 'settings') {
-    if (rcmail.gui_objects.subscriptionlist)
-      new rcmail_scroller('#folderlist-content', '#folderlist-title', '#folderlist-footer');
-  }
+      rcmail.gui_object('dragmenu', 'dragmenu');
+    }
+    else if (rcmail.env.task == 'settings') {
+      if (rcmail.gui_objects.subscriptionlist)
+        new rcmail_scroller('#folderlist-content', '#folderlist-title', '#folderlist-footer');
+    }
+  });
 }
diff --git a/skins/classic/templates/addressbook.html b/skins/classic/templates/addressbook.html
index 9bd684866..429b83438 100644
--- a/skins/classic/templates/addressbook.html
+++ b/skins/classic/templates/addressbook.html
@@ -17,7 +17,7 @@
 </style>
 
 </head>
-<body onload="rcube_init_mail_ui()">
+<body>
 
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
@@ -123,5 +123,9 @@
   </ul>
 </div>
 
+<script type="text/javascript">
+rcube_init_mail_ui();
+</script>
+
 </body>
 </html>
diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html
index 5b0b47924..660f354cd 100644
--- a/skins/classic/templates/compose.html
+++ b/skins/classic/templates/compose.html
@@ -16,10 +16,10 @@
 </style>
 </head>
 <roundcube:if condition="env:extwin" />
-<body class="extwin" onload="rcube_init_mail_ui()">
+<body class="extwin">
 <roundcube:object name="message" id="message" />
 <roundcube:else />
-<body onload="rcube_init_mail_ui()">
+<body>
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 <roundcube:endif />
@@ -197,5 +197,9 @@
 
 <roundcube:object name="composeAttachmentForm" id="attachment-form" attachmentFieldSize="40" class="popupmenu" />
 
+<script type="text/javascript">
+rcube_init_mail_ui();
+</script>
+
 </body>
 </html>
diff --git a/skins/classic/templates/contactadd.html b/skins/classic/templates/contactadd.html
index 05cc8aa82..86bca46ea 100644
--- a/skins/classic/templates/contactadd.html
+++ b/skins/classic/templates/contactadd.html
@@ -5,7 +5,7 @@
 <roundcube:include file="/includes/links.html" />
 <script type="text/javascript" src="/functions.js"></script>
 </head>
-<body class="iframe" onload="rcube_init_mail_ui()">
+<body class="iframe">
 
 <div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div>
 <div id="contact-details" class="boxcontent">
@@ -35,7 +35,10 @@
 <roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" />
 <roundcube:object name="fileDropArea" id="contactpic" />
 
-<script type="text/javascript">rcube_init_tabs('contacttabs')</script>
+<script type="text/javascript">
+rcube_init_tabs('contacttabs');
+rcube_init_mail_ui();
+</script>
 
 </body>
 </html>
diff --git a/skins/classic/templates/contactedit.html b/skins/classic/templates/contactedit.html
index db8599ac6..8ab801d05 100644
--- a/skins/classic/templates/contactedit.html
+++ b/skins/classic/templates/contactedit.html
@@ -5,7 +5,7 @@
 <roundcube:include file="/includes/links.html" />
 <script type="text/javascript" src="/functions.js"></script>
 </head>
-<body class="iframe" onload="rcube_init_mail_ui()">
+<body class="iframe">
 
 <div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div>
 <div id="contact-details" class="boxcontent">
@@ -35,7 +35,10 @@
 <roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" />
 <roundcube:object name="fileDropArea" id="contactpic" />
 
-<script type="text/javascript">rcube_init_tabs('contacttabs')</script>
+<script type="text/javascript">
+rcube_init_tabs('contacttabs');
+rcube_init_mail_ui();
+</script>
 
 </body>
 </html>
diff --git a/skins/classic/templates/folders.html b/skins/classic/templates/folders.html
index 1ae8809ec..f86be092b 100644
--- a/skins/classic/templates/folders.html
+++ b/skins/classic/templates/folders.html
@@ -12,7 +12,7 @@
 }
 </style>
 </head>
-<body onload="rcube_init_mail_ui()">
+<body>
 
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
@@ -58,5 +58,9 @@
   </ul>
 </div>
 
+<script type="text/javascript">
+rcube_init_mail_ui();
+</script>
+
 </body>
 </html>
diff --git a/skins/classic/templates/mail.html b/skins/classic/templates/mail.html
index 353597620..4c29509b3 100644
--- a/skins/classic/templates/mail.html
+++ b/skins/classic/templates/mail.html
@@ -18,7 +18,7 @@
 }
 </style>
 </head>
-<body onload="rcube_init_mail_ui()">
+<body>
 
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
@@ -207,5 +207,9 @@
 
 <roundcube:object name="messageimportform" id="upload-form" attachmentFieldSize="40" class="popupmenu" />
 
+<script type="text/javascript">
+rcube_init_mail_ui();
+</script>
+
 </body>
 </html>
diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html
index 11e58c711..757c0a635 100644
--- a/skins/classic/templates/message.html
+++ b/skins/classic/templates/message.html
@@ -13,10 +13,10 @@
 </style>
 </head>
 <roundcube:if condition="env:extwin" />
-<body class="extwin" onload="rcube_init_mail_ui()">
+<body class="extwin">
 <roundcube:object name="message" id="message" />
 <roundcube:else />
-<body onload="rcube_init_mail_ui()">
+<body>
 
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
@@ -81,5 +81,9 @@
   </ul>
 </div>
 
+<script type="text/javascript">
+rcube_init_mail_ui();
+</script>
+
 </body>
 </html>
diff --git a/skins/classic/templates/messageerror.html b/skins/classic/templates/messageerror.html
index d02508942..eb8c7e058 100644
--- a/skins/classic/templates/messageerror.html
+++ b/skins/classic/templates/messageerror.html
@@ -27,7 +27,7 @@
 </style>
 </head>
 
-<body onload="rcube_init_mail_ui()">
+<body>
 
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
@@ -61,6 +61,10 @@
     rcmail.add_onload('mailviewsplitv.init()');
 </script>
 
+<script type="text/javascript">
+rcube_init_mail_ui();
+</script>
+
 </body>
 <roundcube:endif />
 
diff --git a/skins/classic/templates/messagepreview.html b/skins/classic/templates/messagepreview.html
index 80dbe381a..b42a06342 100644
--- a/skins/classic/templates/messagepreview.html
+++ b/skins/classic/templates/messagepreview.html
@@ -6,7 +6,7 @@
 <script type="text/javascript" src="/splitter.js"></script>
 <script type="text/javascript" src="/functions.js"></script>
 </head>
-<body class="iframe" onload="rcube_init_mail_ui()">
+<body class="iframe">
 
 <div class="messageheaderbox">
   <div id="messagelinks">
@@ -34,5 +34,9 @@
   </ul>
 </div>
 
+<script type="text/javascript">
+rcube_init_mail_ui();
+</script>
+
 </body>
 </html>