diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89f7fc5..92c31b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Fixed
 - Shutdown hang in retention scanner
+- Add Message Cap to status page
 
 ## [1.1.0-rc1] - 2016-03-04
 ### Added
diff --git a/themes/bootstrap/templates/root/status.html b/themes/bootstrap/templates/root/status.html
index 81d5d92..c39d185 100644
--- a/themes/bootstrap/templates/root/status.html
+++ b/themes/bootstrap/templates/root/status.html
@@ -54,7 +54,17 @@ $(document).ready(
       <div class="row">
         <div class="col-sm-3 col-xs-7"><b>No-Store Domain:</b></div>
         <div class="col-sm-8 col-xs-5">
-          <span>{{ or .noStoreDomain .noStoreDomain "Not Configured"}}</span>
+          {{with .smtpConfig}}
+          <span>{{or .DomainNoStore .DomainNoStore "Not Configured"}}</span>
+          {{end}}
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-sm-3 col-xs-7"><b>Message Cap:</b></div>
+        <div class="col-sm-8 col-xs-5">
+          {{with .dataStoreConfig}}
+          <span>{{.MailboxMsgCap}} messages per mailbox</span>
+          {{end}}
         </div>
       </div>
     </table>
@@ -151,8 +161,8 @@ $(document).ready(
     <table class="metrics">
       <div class="row">
         <div class="col-sm-3 col-xs-7"><b>Retention Period:</b></div>
-        <div class="col-sm-3 col-xs-5">
-          {{if .retentionMinutes}}
+        <div class="col-sm-8 col-xs-5">
+          {{if .dataStoreConfig.RetentionMinutes}}
           <span id="m-retentionPeriod">.</span>
           {{else}}
           Disabled
@@ -161,8 +171,8 @@ $(document).ready(
       </div>
       <div class="row">
         <div class="col-sm-3 col-xs-7"><b>Retention Scan:</b></div>
-        <div class="col-sm-3 col-xs-5">
-          {{if .retentionMinutes}}
+        <div class="col-sm-8 col-xs-5">
+          {{if .dataStoreConfig.RetentionMinutes}}
           Completed <span id="m-retentionScanCompleted">.</span> ago
           {{else}}
           Disabled
diff --git a/webui/root_controller.go b/webui/root_controller.go
index 85492f4..3f70d7c 100644
--- a/webui/root_controller.go
+++ b/webui/root_controller.go
@@ -32,13 +32,13 @@ func RootStatus(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (e
 	webListener := fmt.Sprintf("%s:%d", config.GetWebConfig().IP4address.String(),
 		config.GetWebConfig().IP4port)
 	return httpd.RenderTemplate("root/status.html", w, map[string]interface{}{
-		"ctx":              ctx,
-		"version":          config.Version,
-		"buildDate":        config.BuildDate,
-		"retentionMinutes": config.GetDataStoreConfig().RetentionMinutes,
-		"smtpListener":     smtpListener,
-		"pop3Listener":     pop3Listener,
-		"webListener":      webListener,
-		"noStoreDomain":    config.GetSMTPConfig().DomainNoStore,
+		"ctx":             ctx,
+		"version":         config.Version,
+		"buildDate":       config.BuildDate,
+		"smtpListener":    smtpListener,
+		"pop3Listener":    pop3Listener,
+		"webListener":     webListener,
+		"smtpConfig":      config.GetSMTPConfig(),
+		"dataStoreConfig": config.GetDataStoreConfig(),
 	})
 }