4 files changed, 18 insertions, 13 deletions
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 04caad409..8737a422f 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -934,16 +934,6 @@ div.message-part blockquote blockquote blockquote {
 	border: 0;
 }
 
-#quotadisplay {
-	left: 6px;
-	font-size: 12px;
-	font-weight: bold;
-	text-shadow: 0px 1px 1px #fff;
-	padding-left: 30px;
-	height: 18px;
-	background: url(images/quota.png) -100px 0 no-repeat;
-}
-
 /*** message composition ***/
 
 #composeview-left {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 268b55dd5..f2d05a96a 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1475,6 +1475,18 @@ select.decorated option {
 }
 
 
+/*** quota indicator ***/
+
+#quotadisplay {
+	left: 6px;
+	font-size: 12px;
+	font-weight: bold;
+	text-shadow: 0px 1px 1px #fff;
+	padding-left: 30px;
+	height: 18px;
+	background: url(images/quota.png) -100px 0 no-repeat;
+}
+
 /*** popup menus ***/
 
 .popupmenu,
@@ -1922,5 +1934,3 @@ fieldset.tab {
 	padding: 0;
 	margin-left: 0;
 }
-
-
diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index e7238f304..54616be51 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -21,6 +21,9 @@
 </div>
 <div class="boxfooter">
 	<roundcube:button command="create-folder" type="link" title="createfolder" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="listbutton groupactions" onclick="UI.show_popup('mailboxmenu');return false" innerClass="inner" content="&#9881;" />
+	<roundcube:if condition="env:quota" />
+		<roundcube:object name="quotaDisplay" id="quotadisplay" class="countdisplay" display="text" />
+	<roundcube:endif />
 </div>
 </div>
 
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index d7ef9ae0c..8a66a8cc4 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -134,6 +134,8 @@ function rcube_mail_ui()
       if (rcmail.env.action == 'folders') {
         new rcube_splitter({ id:'folderviewsplitter', p1:'#folderslist', p2:'#folder-details',
           orientation:'v', relative:true, start:305, min:150, size:12 }).init();
+
+        rcmail.addEventListener('setquota', update_quota);
       }
       else if (rcmail.env.action == 'identities') {
         new rcube_splitter({ id:'identviewsplitter', p1:'#identitieslist', p2:'#identity-details',
@@ -337,7 +339,7 @@ function rcube_mail_ui()
     else {
       $('#googie_edit_layer').height(h+'px');
     }
-    
+
     var abooks = $('#directorylist');
     $('#compose-contacts .scroller').css('top', abooks.position().top + abooks.outerHeight());
   }