4 files changed, 12 insertions, 5 deletions
diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index 6da96f3cc..0ee45d735 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -134,7 +134,9 @@ rcube_webmail.prototype.acl_mode_switch = function(elem)
 // ACL table initialization
 rcube_webmail.prototype.acl_list_init = function()
 {
-    $('#acl-switch')[this.env.acl_advanced ? 'addClass' : 'removeClass']('selected');
+    var method = this.env.acl_advanced ? 'addClass' : 'removeClass';
+    $('#acl-switch')[method]('selected');
+    $(this.gui_objects.acltable)[method]('advanced');
 
     this.acl_list = new rcube_list_widget(this.gui_objects.acltable,
         {multiselect:true, draggable:false, keyboard:true, toggleselect:true});
diff --git a/plugins/acl/localization/en_US.inc b/plugins/acl/localization/en_US.inc
index 390a08b02..ce665768a 100644
--- a/plugins/acl/localization/en_US.inc
+++ b/plugins/acl/localization/en_US.inc
@@ -19,7 +19,7 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
-$labels['advanced'] = 'advanced mode';
+$labels['advanced'] = 'Advanced mode';
 $labels['newuser'] = 'Add entry';
 $labels['editperms'] = 'Edit permissions';
 $labels['actions'] = 'Access right actions...';
diff --git a/plugins/acl/skins/larry/acl.css b/plugins/acl/skins/larry/acl.css
index 9c7429418..b16369907 100644
--- a/plugins/acl/skins/larry/acl.css
+++ b/plugins/acl/skins/larry/acl.css
@@ -38,19 +38,25 @@
   border-left: #BBD3DA dotted 1px;
   font-size: 11px;
   font-weight: bold;
+  width: auto;
 }
 
 #acltable tbody td
 {
   border-bottom: #DDDDDD 1px solid;
   text-align: center;
-  padding: 2px;
+  height: 16px;
   cursor: default;
 }
 
 #acltable thead td.user
 {
   border-left: none;
+  width: 30%;
+}
+
+#acltable.advanced thead td.user {
+	width: 25%;
 }
 
 #acltable tbody td.user
@@ -60,7 +66,6 @@
   text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
   border-left: none;
-  width: 50px;
 }
 
 #acltable tbody td.partial
diff --git a/plugins/acl/skins/larry/templates/table.html b/plugins/acl/skins/larry/templates/table.html
index c7c546371..c0b8329c6 100644
--- a/plugins/acl/skins/larry/templates/table.html
+++ b/plugins/acl/skins/larry/templates/table.html
@@ -12,7 +12,7 @@
         <li><roundcube:button command="acl-edit" label="edit" class="icon" classAct="icon active" innerclass="icon edit" /></li>
         <li><roundcube:button command="acl-delete" label="delete" class="icon" classAct="icon active" innerclass="icon delete" /></li>
         <roundcube:if condition="!in_array('acl_advanced_mode', (array)config:dont_override)" />
-            <li><roundcube:button name="acl-switch" id="acl-switch" label="acl.advanced" onclick="rcmail.command('acl-mode-switch')" class="active" /></li>
+            <li><roundcube:button name="acl-switch" id="acl-switch" label="acl.advanced" onclick="rcmail.command('acl-mode-switch');return false" class="active" /></li>
         <roundcube:endif />
     </ul>
 </div>