diff --git a/core/css/styles.css b/core/css/styles.css
index 7e41e90412777674ed551b2c2a6f3547f5c8246d..08ffaa72e1018023985b5b4acc02a9d88433b752 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -736,9 +736,16 @@ code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono
 	font-weight: normal;
 	white-space: nowrap;
 	border-bottom-left-radius: 3px;
-	border-top-left-radius: 3px; }
+	border-top-left-radius: 3px;
+	min-width: 1%;
+	max-width: 100%;
+}
 #quotatext {padding:.6em 1em;}
 
+#quota div.quota-warning {
+	background-color: #fc4;
+}
+
 .pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; }
 .pager li { display:inline-block; }
 
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 661c242ea6bf2f11ee41f66ebd9b3c6481603382..c1fb20dce05187b13864c2938bff95925ab67a55 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -34,7 +34,8 @@
 
 
 <div id="quota" class="section">
-	<div style="width:<?php p($_['usage_relative']);?>%;">
+	<div style="width:<?php p($_['usage_relative']);?>%"
+		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="quotatext">
 			<?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>',
 			array($_['usage'], $_['total_space'])));?>