diff --git a/apimail/api/views.py b/apimail/api/views.py
index 38f41bf159b40a1d8ea3b90e7038e5fc88243bfa..8085605efb1fcb8c09347c3efbaa7e038407b9c0 100644
--- a/apimail/api/views.py
+++ b/apimail/api/views.py
@@ -18,6 +18,7 @@ from rest_framework.response import Response
 from rest_framework import filters, status
 
 from ..models import (
+    EmailAccount,
     AttachmentFile,
     ComposedMessage,
     Event,
@@ -38,6 +39,7 @@ from .serializers import (
 
 class EmailAccountListAPIView(ListAPIView):
     permission_classes = (IsAdminUser,)
+    queryset = EmailAccount.objects.all()
     serializer_class = EmailAccountSerializer
 
 
diff --git a/apimail/managers.py b/apimail/managers.py
index 24d1a087b0a78d1cf508fb6d4f470fc91869dce1..f37512358243889b5e0b9a992ac4740d665663e0 100644
--- a/apimail/managers.py
+++ b/apimail/managers.py
@@ -36,7 +36,7 @@ class StoredMessageQuerySet(models.QuerySet):
         """
         if not user.is_authenticated:
             return self.none()
-        elif user.is_superuser or user.is_staff:
+        elif (user.is_superuser or user.is_staff) and email is None:
             return self
 
         # Filter based on account accesses