diff --git a/lib/pleroma/user/email_list.ex b/lib/pleroma/user/email_list.ex
index d2a24f6ab..3b5719805 100644
--- a/lib/pleroma/user/email_list.ex
+++ b/lib/pleroma/user/email_list.ex
@@ -11,7 +11,7 @@ defmodule Pleroma.User.EmailList do
   alias Pleroma.Repo
   alias Pleroma.User
 
-  @header_row ["Email Address"]
+  @header_row ["Email Address", "Nickname"]
 
   defp query(:subscribers) do
     User.Query.build(%{
@@ -43,7 +43,9 @@ defmodule Pleroma.User.EmailList do
     |> build_csv()
   end
 
-  defp build_row(%User{email: email}), do: [email]
+  defp build_row(%User{email: email, nickname: nickname}) do
+    [email, nickname]
+  end
 
   defp build_csv(lines) do
     [@header_row | lines]
diff --git a/test/pleroma/user/email_list_test.exs b/test/pleroma/user/email_list_test.exs
index 3522bc4fb..ceb9aaa2e 100644
--- a/test/pleroma/user/email_list_test.exs
+++ b/test/pleroma/user/email_list_test.exs
@@ -16,10 +16,10 @@ defmodule Pleroma.User.EmailListTest do
     insert(:user, accepts_email_list: false)
 
     expected = """
-    Email Address\r
-    #{user1.email}\r
-    #{user2.email}\r
-    #{user3.email}\r
+    Email Address,Nickname\r
+    #{user1.email},#{user1.nickname}\r
+    #{user2.email},#{user2.nickname}\r
+    #{user3.email},#{user3.nickname}\r
     """
 
     assert EmailList.generate_csv(:subscribers) == expected
@@ -32,9 +32,9 @@ defmodule Pleroma.User.EmailListTest do
     insert(:user, accepts_email_list: true)
 
     expected = """
-    Email Address\r
-    #{user1.email}\r
-    #{user2.email}\r
+    Email Address,Nickname\r
+    #{user1.email},#{user1.nickname}\r
+    #{user2.email},#{user2.nickname}\r
     """
 
     assert EmailList.generate_csv(:unsubscribers) == expected