diff --git a/app/assets/stylesheets/emails.scss b/app/assets/stylesheets/emails.scss
index 0ec8079..3ff9e1d 100644
--- a/app/assets/stylesheets/emails.scss
+++ b/app/assets/stylesheets/emails.scss
@@ -14,6 +14,14 @@
   background-color: orange;
   padding: 1px 2px;
 }
+.email_attribute_cron {
+  background-color: #cdcdcd;
+  padding: 1px 2px;
+}
+.email_attribute_mailing_list {
+  background-color: #99ff00;
+  padding: 1px 2px;
+}
 
 .email_content th {
   text-align: left;
diff --git a/app/views/emails/index.html.erb b/app/views/emails/index.html.erb
index 40e59da..9a76fac 100644
--- a/app/views/emails/index.html.erb
+++ b/app/views/emails/index.html.erb
@@ -7,8 +7,7 @@
     <tr>
       <th>Date</th>
       <th>Subject</th>
-      <th>Clients</th>
-      <th>Servers</th>
+      <th>Metadata</th>
       <th colspan="3"></th>
     </tr>
   </thead>
@@ -22,11 +21,15 @@
           <% email.organisations.each do |organisation| %>
             <span class="email_attribute_organisation"><%= organisation %></span>
           <% end if email.organisations %>
-        </td>
-        <td>
           <% email.servers.each do |server| %>
             <span class="email_attribute_server"><%= server %></span>
           <% end if email.servers %>
+          <% if email.cron? %>
+            <span class="email_attribute_cron">cron</span>
+          <% end %>
+          <% if email.mailing_list? %>
+            <span class="email_attribute_mailing_list">list</span>
+          <% end %>
         </td>
         <td><%= link_to 'Show', email %></td>
         <td><%= link_to 'Edit', edit_email_path(email) %></td>