diff --git a/src/admin/bundles/bundles-list.html b/src/admin/bundles/bundles-list.html
index 165a616..33dc173 100644
--- a/src/admin/bundles/bundles-list.html
+++ b/src/admin/bundles/bundles-list.html
@@ -20,4 +20,5 @@ <h4 >{{bundle.name}}</h4>
             </div>
         </nav>
     </motech-list-item>
+    <div class="alert">{{'admin.bundles.emptyBundlesList' | translate}}</div>
 </motech-list>
\ No newline at end of file
diff --git a/src/admin/messages/messages.html b/src/admin/messages/messages.html
index 00a99be..01bd261 100644
--- a/src/admin/messages/messages.html
+++ b/src/admin/messages/messages.html
@@ -7,11 +7,6 @@
             <button class="icon-filter motech-sidebar-button" type="button">{{'admin.messages.filters' | translate}}</button>
         </div>
     </motech-list-header>
-    <motech-list-body>
-        <div class="alert alert-info" ng-show="messages.length < 1">
-            <span><p>{{'admin.messages.empty' | translate}}</p></span>
-        </div>
-    </motech-list-body>
     <motech-list-item ng-repeat="message in pagedItems[currentPage]">
         <fieldset class="form-inline">
             <div class="form-group">
@@ -28,6 +23,7 @@
             </div>
         </fieldset>
     </motech-list-item>
+    <div class="alert">{{'admin.messages.emptyMessagesList' | translate}}</div>
     <motech-list-footer>
         <uib-pagination total-items="messages" ng-model="currentPage" ng-change="setCurrentPage(currentPage)"></uib-pagination>
     </motech-list-footer>
diff --git a/src/admin/messages/settings.html b/src/admin/messages/settings.html
index 6f373c4..ebff257 100644
--- a/src/admin/messages/settings.html
+++ b/src/admin/messages/settings.html
@@ -37,6 +37,7 @@ <h5 class="text-plain inside">{{'admin.messages.notifications.header' | translat
             </div>
         </fieldset>
     </motech-list-item>
+    <div class="alert">{{'admin.messages.emptyRecipientList' | translate}}</div>
     <motech-list-footer>
         <div class="button-group">
             <button class="button-add" ng-click="newRule()">{{'admin.messages.notifications.newRecipient' | translate}}</button>
diff --git a/src/email/logs.html b/src/email/logs.html
index 32eeb0b..f02522f 100644
--- a/src/email/logs.html
+++ b/src/email/logs.html
@@ -17,6 +17,7 @@
             <p class="alert alert-warning" ng-if="!log.message">No message</p>
         </motech-list-collapsible>
     </motech-list-item>
+    <div class="alert">{{'email.logging.emptyLogsList' | translate}}</div>
     <motech-list-footer>
         <uib-pagination total-items="totalItems" ng-model="currentPage" ng-change="changePageTo(currentPage)"></uib-pagination>
     </motech-list-footer>