diff --git a/panel/ui/vmail/mboxes-add.html b/panel/ui/vmail/mboxes-add.html
index f93c61b..9daa6a0 100644
--- a/panel/ui/vmail/mboxes-add.html
+++ b/panel/ui/vmail/mboxes-add.html
@@ -48,14 +48,13 @@
   </false>
   </check>
 
-  <label for="ratelimit">Rate Limit <small>(emails per hour)</small></label>
   <check if="{{ @NAV.mapping=='vpanel' }}">
+  <label for="ratelimit">Rate Limit <small>(emails per hour)</small></label>
   <true>
   <input id="ratelimit" name="ratelimit" type="text" value="{{ @mbox.ratelimit  }}" required>
   </true>
   <false>
   <input id="ratelimit" name="ratelimit" type="hidden" value="{{ @mbox.ratelimit  }}" required>
-  {{ @mbox.ratelimit  }}
   </false>
   </check>
 
diff --git a/panel/ui/vmail/mboxes-edit.html b/panel/ui/vmail/mboxes-edit.html
index f8dc278..1413842 100644
--- a/panel/ui/vmail/mboxes-edit.html
+++ b/panel/ui/vmail/mboxes-edit.html
@@ -47,14 +47,13 @@
   </false>
   </check>
 
-  <label for="ratelimit">Rate Limit <small>(emails per hour)</small></label>
   <check if="{{ @NAV.mapping=='vpanel' }}">
+  <label for="ratelimit">Rate Limit <small>(emails per hour)</small></label>
   <true>
   <input id="ratelimit" name="ratelimit" type="text" value="{{ @mbox_array.ratelimit  }}" required>
   </true>
   <false>
   <input id="ratelimit" name="ratelimit" type="hidden" value="{{ @mbox_array.ratelimit  }}" required>
-  {{ @mbox_array.ratelimit  }}
   </false>
   </check>
 
diff --git a/panel/ui/vmail/mboxes-mbox.html b/panel/ui/vmail/mboxes-mbox.html
index 927523f..ca04351 100644
--- a/panel/ui/vmail/mboxes-mbox.html
+++ b/panel/ui/vmail/mboxes-mbox.html
@@ -5,7 +5,9 @@
     <th>Account</th>
     <th>Status</th>
     <th>Quota</th>
-    <th>Rate Limit</th>
+    <check if="{{ @NAV.mapping=='vpanel' }}">
+      <th>Rate Limit</th>
+    </check>
     <th>Filtering</th>
     <th>Action</th>
   </tr>
@@ -13,7 +15,9 @@
     <td>{{ @mbox_array.mbox  }}@{{ @mbox_array.domain  }}</td>
     <td>{{ @mbox_array.status  }}</td>
     <td>{{ @mbox_array.quota  }}</td>
-    <td>{{ @mbox_array.ratelimit  }}</td>
+    <check if="{{ @NAV.mapping=='vpanel' }}">
+      <td>{{ @mbox_array.ratelimit  }}</td>
+    </check>
     <td>{{ @mbox_array.filter  }}</td>
     <td><a href="{{@REALM}}/Edit">Edit</a> <a href="{{@REALM}}/Delete">Delete</a></td>
   </tr>