diff --git a/app/views/emails/index.html.erb b/app/views/emails/index.html.erb
index ecbc1fb..bd17289 100644
--- a/app/views/emails/index.html.erb
+++ b/app/views/emails/index.html.erb
@@ -5,6 +5,10 @@
 <table>
   <thead>
     <tr>
+      <th>Date</th>
+      <th>Subject</th>
+      <th>Clients</th>
+      <th>Servers</th>
       <th colspan="3"></th>
     </tr>
   </thead>
@@ -14,6 +18,16 @@
       <tr>
         <td><%= email.date %></td>
         <td><%= email.subject %></td>
+        <td>
+          <% email.clients.each do |client| %>
+            <span class="email_attribute_client"><%= client %></span>
+          <% end if email.clients %>
+        </td>
+        <td>
+          <% email.servers.each do |server| %>
+            <span class="email_attribute_server"><%= server %></span>
+          <% end if email.servers %>
+        </td>
         <td><%= link_to 'Show', email %></td>
         <td><%= link_to 'Edit', edit_email_path(email) %></td>
         <td><%= link_to 'Destroy', email, method: :delete, data: { confirm: 'Are you sure?' } %></td>