diff --git a/app/views/emails/_list.html.erb b/app/views/emails/_list.html.erb
index 93dae40..da47d41 100644
--- a/app/views/emails/_list.html.erb
+++ b/app/views/emails/_list.html.erb
@@ -9,31 +9,8 @@
   </thead>
 
   <tbody>
-    <% @emails.each do |email| %>
-      <tr>
-        <td><%= email.date %></td>
-        <td><%= email.subject %></td>
-        <td>
-          <% email.organisations.each do |organisation| %>
-            <span class="email_attribute_organisation"><%= organisation %></span>
-          <% end if email.organisations %>
-          <% 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 %>
-          <% if email.junk? %>
-            <span class="email_attribute_junk">junk</span>
-          <% end %>
-        </td>
-        <td><%= link_to 'Show', email, "data-turbo-frame": "_top" %></td>
-        <td><%= link_to 'Edit', edit_email_path(email), "data-turbo-frame": "_top" %></td>
-        <td><%= link_to 'Destroy', email, method: :delete, data: { confirm: 'Are you sure?' }, "data-turbo-frame": "_top" %></td>
-      </tr>
+    <% emails.each do |email| %>
+      <%= render partial: "list_row", object: email, as: :email %>
     <% end %>
   </tbody>
 </table>
diff --git a/app/views/emails/_list_row.html.erb b/app/views/emails/_list_row.html.erb
new file mode 100644
index 0000000..60fa4ea
--- /dev/null
+++ b/app/views/emails/_list_row.html.erb
@@ -0,0 +1,24 @@
+<tr>
+  <td><%= email.date %></td>
+  <td><%= email.subject %></td>
+  <td>
+    <% email.organisations.each do |organisation| %>
+      <span class="email_attribute_organisation"><%= organisation %></span>
+    <% end if email.organisations %>
+    <% 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 %>
+    <% if email.junk? %>
+      <span class="email_attribute_junk">junk</span>
+    <% end %>
+  </td>
+  <td><%= link_to 'Show', email, "data-turbo-frame": "_top" %></td>
+  <td><%= link_to 'Edit', edit_email_path(email), "data-turbo-frame": "_top" %></td>
+  <td><%= link_to 'Destroy', email, method: :delete, data: { confirm: 'Are you sure?' }, "data-turbo-frame": "_top" %></td>
+</tr>
diff --git a/app/views/emails/index.html.erb b/app/views/emails/index.html.erb
index 8a1c6e1..ec2f1c4 100644
--- a/app/views/emails/index.html.erb
+++ b/app/views/emails/index.html.erb
@@ -3,5 +3,5 @@
 <h1>Emails</h1>
 
 <%= turbo_frame_tag "emails" do %>
-  <%= render partial: "list", object: @emails %>
+  <%= render partial: "list", object: @emails, as: :emails %>
 <% end %>