diff --git a/src/postorius/auth/decorators.py b/src/postorius/auth/decorators.py
index fed0033..80f39dc 100644
--- a/src/postorius/auth/decorators.py
+++ b/src/postorius/auth/decorators.py
@@ -88,7 +88,12 @@
                 user.email not in mlist.owners:
             raise PermissionDenied
         else:
-            user.is_list_moderator = True
+            if user.email in mlist.moderators and \
+                    user.email not in mlist.owners:
+                user.is_list_moderator = True
+            else:
+                user.is_list_moderator = True
+                user.is_list_owner = True
             return fn(*args, **kwargs)
     return wrapper
 
diff --git a/src/postorius/templates/postorius/menu/list_nav.html b/src/postorius/templates/postorius/menu/list_nav.html
index 4429e17..0205616 100644
--- a/src/postorius/templates/postorius/menu/list_nav.html
+++ b/src/postorius/templates/postorius/menu/list_nav.html
@@ -9,7 +9,7 @@
         {% if user.is_superuser or user.is_list_owner %}
             <li class="mm_nav_item"><a class="{% nav_active_class current 'list_members' %}" href="{% url 'list_members' list.list_id %}">{% trans "Members" %}</a></li>
         {% endif %}
-        {% if user.is_superuser or user.is_list_moderator %}
+        {% if user.is_superuser or user.is_list_owner or user.is_list_moderator %}
             <li class="mm_nav_item"><a class="{% nav_active_class current 'list_held_messages' %}" href="{% url 'list_held_messages' list.list_id %}">{% trans "Held Messages" %}</a></li>
         {% endif %}
         {% if user.is_superuser or user.is_list_owner %}