diff --git a/orchestra/contrib/musician/urls.py b/orchestra/contrib/musician/urls.py
index 0114719e..50ea0161 100644
--- a/orchestra/contrib/musician/urls.py
+++ b/orchestra/contrib/musician/urls.py
@@ -27,7 +27,7 @@ urlpatterns = [
     path('bills/<int:pk>/download/', views.BillDownloadView.as_view(), name='bill-download'),
     path('profile/', views.ProfileView.as_view(), name='profile'),
     path('profile/setLang/<code>', views.profile_set_language, name='profile-set-lang'),
-    path('address/', views.MailView.as_view(), name='address-list'),
+    path('address/', views.AddressListView.as_view(), name='address-list'),
     path('address/new/', views.MailCreateView.as_view(), name='address-create'),
     path('address/<int:pk>/', views.MailUpdateView.as_view(), name='address-update'),
     path('address/<int:pk>/delete/', views.AddressDeleteView.as_view(), name='address-delete'),
diff --git a/orchestra/contrib/musician/views.py b/orchestra/contrib/musician/views.py
index b15fa2a3..a89fd0fb 100644
--- a/orchestra/contrib/musician/views.py
+++ b/orchestra/contrib/musician/views.py
@@ -240,7 +240,7 @@ class BillDownloadView(CustomContextMixin, UserTokenRequiredMixin, View):
             return HttpResponse(bill.html or bill.render())
 
 
-class MailView(ServiceListView):
+class AddressListView(ServiceListView):
     service_class = AddressService
     model = Address
     template_name = "musician/addresses.html"
@@ -249,6 +249,11 @@ class MailView(ServiceListView):
         'title': _('Mail addresses'),
     }
 
+    def get_queryset(self):
+        qs = super().get_queryset()
+        qs = qs.order_by("domain", "name")
+        return qs
+
     def get_queryfilter(self):
         """Retrieve query params (if any) to filter queryset"""
         domain_id = self.request.GET.get('domain')