diff --git a/src/postorius/static/postorius/js/held_messages.js b/src/postorius/static/postorius/js/held_messages.js
index 9f7aaec..88e7d03 100644
--- a/src/postorius/static/postorius/js/held_messages.js
+++ b/src/postorius/static/postorius/js/held_messages.js
@@ -8,6 +8,7 @@
       url: rest_url + msgid,
       success: function(data) {
         $('#msg-title').html(data.subject);
+        $('.modal-footer form input[name="msgid"]').attr('value', msgid);
         $('#held-stripped-message').html(data.stripped_msg.replace(/\n/g, "<br />"));
         $('#held-full-message').html(data.msg.replace(/\n/g, "<br />"));
         $('#held-messages-modal').modal('show');
diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html
index 5543b11..651416b 100644
--- a/src/postorius/templates/postorius/lists/held_messages.html
+++ b/src/postorius/templates/postorius/lists/held_messages.html
@@ -23,11 +23,13 @@
             <table class="table table-bordered table-striped">
               <thead>
                 <tr>
-                  <td colspan="5">{% trans 'Perform action on selected messages' %}</td>
-                  <td>
-                    <input type="submit" class="btn btn-xs btn-success" name="accept" value="{% trans 'Accept' %}" />
-                    <input type="submit" class="btn btn-xs btn-warning" name="reject" value="{% trans 'Reject' %}" />
-                    <input type="submit" class="btn btn-xs btn-danger" name="discard" value="{% trans 'Discard' %}" />
+                  <td colspan="5">
+                    <div class="col-md-8">{% trans 'Perform action on selected messages' %}</div>
+                    <div class="col-md-4 text-right">
+                    <input type="submit" class="btn btn-sm btn-success" name="accept" value="{% trans 'Accept' %}" />
+                    <input type="submit" class="btn btn-sm btn-warning" name="reject" value="{% trans 'Reject' %}" />
+                    <input type="submit" class="btn btn-sm btn-danger" name="discard" value="{% trans 'Discard' %}" />
+                    </div>
                   </td>
                 </tr>
                 <tr>
@@ -36,14 +38,14 @@
                   <th>{% trans 'Sender' %}</th>
                   <th>{% trans 'Reason' %}</th>
                   <th>{% trans 'Hold Date' %}</th>
-                  <th></th>
                 </tr>
               </thead>
               <tbody>
                 {% 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>
+                    <td><a href="#" class="show-modal-btn" data-msgid="{{ msg.request_id }}">{{ msg.subject }}</a>
+</td>
                     <td>{{ msg.sender }}</td>
                     <td>
                       {% if msg.reasons %}
@@ -55,12 +57,6 @@
                       {% endif %}
                     </td>
                     <td>{{ msg.hold_date }}</td>
-                    <td>
-                      <a href="#" class="btn btn-xs btn-info show-modal-btn" data-msgid="{{ msg.request_id }}">{% trans 'View' %}</a>
-                      <a href="{% url 'accept_held_message' list.list_id msg.request_id %}" class="btn btn-xs btn-success">{% trans 'Accept' %}</a>
-                      <a href="{% url 'reject_held_message' list.list_id msg.request_id %}" class="btn btn-xs btn-warning">{% trans 'Reject' %}</a>
-                      <a href="{% url 'discard_held_message' list.list_id msg.request_id %}" class="btn btn-xs btn-danger">{% trans 'Discard' %}</a>
-                    </td>
                   </tr>
                 {% endfor %}
               </tbody>
@@ -82,10 +78,21 @@
                   <div class="hidden" id="held-full-message"></div>
               </div>
               <div class="modal-footer">
-                <button class="btn dismiss-modal" data-dismiss="modal" aria-hidden="true">Close</button>
-                <button type="button" class="btn btn-info pull-right" id="toggle-full-message" data-toggle="button" aria-pressed="false" autocomplete="off">
-                  {% trans 'View Full Message' %}
-                </button>
+                <div class="col-md-6 text-left">
+                  <form action="{% url 'moderate_held_message' list.list_id %}" method="post">
+                    {% csrf_token %}
+                    <input type="hidden" name="msgid" />
+                    <input type="submit" class="btn btn-success" name="accept" value="{% trans 'Accept' %}" />
+                    <input type="submit" class="btn btn-warning" name="reject" value="{% trans 'Reject' %}" />
+                    <input type="submit" class="btn btn-danger" name="discard" value="{% trans 'Discard' %}" />
+                  </form>
+                </div>
+                <div class="col-md-6"> 
+                    <button class="btn dismiss-modal" data-dismiss="modal" aria-hidden="true">Close</button>
+                    <button type="button" class="btn btn-info pull-right" id="toggle-full-message" data-toggle="button" aria-pressed="false" autocomplete="off">
+                      {% trans 'View Full Message' %}
+                    </button>
+                </div>
               </div>
             </div>
           </div>
diff --git a/src/postorius/urls.py b/src/postorius/urls.py
index 0b7bf66..b386bcc 100644
--- a/src/postorius/urls.py
+++ b/src/postorius/urls.py
@@ -51,16 +51,10 @@
     url(r'^mass_removal/$', list_views.ListMassRemovalView.as_view(),
         name='mass_removal'),
     url(r'^delete$', list_views.list_delete, name='list_delete'),
-    url(r'^held_messages/(?P<msg_id>[^/]+)/accept$',
-        list_views.accept_held_message, name='accept_held_message'),
-    url(r'^held_messages/(?P<msg_id>[^/]+)/discard$',
-        list_views.discard_held_message, name='discard_held_message'),
-    url(r'^held_messages/(?P<msg_id>[^/]+)/defer$',
-        list_views.defer_held_message, name='defer_held_message'),
-    url(r'^held_messages/(?P<msg_id>[^/]+)/reject$',
-        list_views.reject_held_message, name='reject_held_message'),
     url(r'^held_messages$', list_views.list_moderation,
         name='list_held_messages'),
+    url(r'^held_messages/moderate$', list_views.moderate_held_message,
+        name='moderate_held_message'),
     url(r'^bans/$', list_views.list_bans, name='list_bans'),
     url(r'^header-matches/$', list_views.list_header_matches,
         name='list_header_matches'),
@@ -106,6 +100,8 @@
     url(r'^users/address_activation/(?P<activation_key>[A-Za-z0-9]+)/$',
         user_views.address_activation_link,
         name='address_activation_link'),
-    url(r'^api/list/(?P<list_id>[^/]+)/held_message/$', rest_views.get_held_message, name='uncomplete_rest_held_message'),
-    url(r'^api/list/(?P<list_id>[^/]+)/held_message/(?P<held_id>\d+)/$', rest_views.get_held_message, name='rest_held_message'),
+    url(r'^api/list/(?P<list_id>[^/]+)/held_message/$',
+        rest_views.get_held_message, name='uncomplete_rest_held_message'),
+    url(r'^api/list/(?P<list_id>[^/]+)/held_message/(?P<held_id>\d+)/$',
+        rest_views.get_held_message, name='rest_held_message'),
 ]
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index 6851acd..ec6a659 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -421,6 +421,28 @@
 
 
 @login_required
+@list_moderator_required
+def moderate_held_message(request, list_id):
+    if request.method != 'POST':
+        return HttpReponseNotAllowed(['POST',])
+    msg_id = request.POST['msgid']
+    try:
+        mailing_list = List.objects.get_or_404(fqdn_listname=list_id)
+        if 'accept' in request.POST:
+            mailing_list.accept_message(msg_id)
+            messages.success(request, _('The message was accepted'))
+        elif 'reject' in request.POST:
+            mailing_list.reject_message(msg_id)
+            messages.success(request, _('The message was rejected'))
+        elif 'discard' in request.POST:
+            mailing_list.discard_message(msg_id)
+            messages.success(request, _('The message was discarded'))
+    except MailmanApiError:
+        return utils.render_api_error(request)
+
+    return redirect('list_held_messages', list_id)
+
+@login_required
 @list_owner_required
 def csv_view(request, list_id):
     """Export all the subscriber in csv
@@ -544,74 +566,6 @@
 
 @login_required
 @list_moderator_required
-def accept_held_message(request, list_id, msg_id):
-    """Accepts a held message.
-    """
-    try:
-        the_list = List.objects.get_or_404(fqdn_listname=list_id)
-        the_list.accept_message(msg_id)
-    except MailmanApiError:
-        return utils.render_api_error(request)
-    except HTTPError as e:
-        messages.error(request, e.msg)
-        return redirect('list_held_messages', the_list.list_id)
-    messages.success(request, _('The message has been accepted.'))
-    return redirect('list_held_messages', the_list.list_id)
-
-
-@login_required
-@list_moderator_required
-def discard_held_message(request, list_id, msg_id):
-    """Discards a held message.
-    """
-    try:
-        the_list = List.objects.get_or_404(fqdn_listname=list_id)
-        the_list.discard_message(msg_id)
-    except MailmanApiError:
-        return utils.render_api_error(request)
-    except HTTPError as e:
-        messages.error(request, e.msg)
-        return redirect('list_held_messages', the_list.list_id)
-    messages.success(request, _('The message has been discarded.'))
-    return redirect('list_held_messages', the_list.list_id)
-
-
-@login_required
-@list_moderator_required
-def defer_held_message(request, list_id, msg_id):
-    """Defers a held message for a later decision.
-    """
-    try:
-        the_list = List.objects.get_or_404(fqdn_listname=list_id)
-        the_list.defer_message(msg_id)
-    except MailmanApiError:
-        return utils.render_api_error(request)
-    except HTTPError as e:
-        messages.error(request, e.msg)
-        return redirect('list_held_messages', the_list.list_id)
-    messages.success(request, _('The message has been deferred.'))
-    return redirect('list_held_messages', the_list.list_id)
-
-
-@login_required
-@list_moderator_required
-def reject_held_message(request, list_id, msg_id):
-    """Rejects a held message.
-    """
-    try:
-        the_list = List.objects.get_or_404(fqdn_listname=list_id)
-        the_list.reject_message(msg_id)
-    except MailmanApiError:
-        return utils.render_api_error(request)
-    except HTTPError as e:
-        messages.error(request, e.msg)
-        return redirect('list_held_messages', the_list.list_id)
-    messages.success(request, _('The message has been rejected.'))
-    return redirect('list_held_messages', the_list.list_id)
-
-
-@login_required
-@list_moderator_required
 def list_subscription_requests(request, list_id):
     """Shows a list of held messages.
     """