diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html
index 924c052..d6450a8 100644
--- a/src/postorius/templates/postorius/lists/held_messages.html
+++ b/src/postorius/templates/postorius/lists/held_messages.html
@@ -9,7 +9,7 @@
 
 {% block main %}
   {% list_nav 'list_held_messages' 'Held Messages' %}
-  {% if list.held|length > 0 %}
+  {% if held_messages|length > 0 %}
     <form method="post">
       {% if form.choices.errors %}
         {% for error in form.choices.errors %}
@@ -37,7 +37,7 @@
         </tr>
       </thead>
       <tbody>
-        {% for msg in list.held %}
+        {% for msg in held_messages %}
         <tr>
           <td><input type="checkbox" id="id_choices_{{ forloop.counter0 }}" class="message-checkbox" name="choices" value="{{ msg.request_id }}"/></td>
           <td>{{ msg.subject }}</td>
@@ -70,6 +70,9 @@
       </tbody>
     </table>
     </form>
+
+    {% include 'postorius/_pagination.html' with page=held_messages %}
+
   {% else %}
     <p>{% trans 'There are currently no held messages.' %}</p>
   {% endif %}
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index c8fe250..de97723 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -395,9 +395,23 @@
 
     @method_decorator(list_moderator_required)
     def get(self, request, *args, **kwargs):
-        return render_to_response('postorius/lists/held_messages.html',
-                                  {'list': self.mailing_list, 'form':HeldMessagesModerationForm()},
-                                  context_instance=RequestContext(request))
+        # Paginate
+        paginator = Paginator(self.mailing_list.held, 20) # Show 20 messages per page
+        page = request.GET.get('page')
+        try:
+            held_messages = paginator.page(page)
+        except PageNotAnInteger:
+            # If page is not an integer, deliver first page.
+            held_messages = paginator.page(1)
+        except EmptyPage:
+            # If page is out of range (e.g. 9999), deliver last page of results.
+            held_messages = paginator.page(paginator.num_pages)
+        return render_to_response(
+            'postorius/lists/held_messages.html', {
+                'list': self.mailing_list,
+                'held_messages': held_messages,
+                'form':HeldMessagesModerationForm()
+            }, context_instance=RequestContext(request))
 
     @method_decorator(list_moderator_required)
     def post(self, request, *args, **kwargs):