diff --git a/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html b/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
index cc9632d..eae6752 100644
--- a/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
+++ b/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
@@ -91,12 +91,24 @@
           <tr>
             <td>{{ domain.domain }}</td>
             {% if domain.domain.maildomain %}
-            <td>{{ domain.domain.maildomain.mailaddresses|join:", " }}</td>
+            <td>
+              {% with maildomain=domain.domain.maildomain %}
+              {% for mailaddress in maildomain.mailaddresses %}{% spaceless %}
+              <a href="{% url 'edit_mailaddress' package=hostingpackage.id domain=maildomain.domain pk=mailaddress.id %}" title="{% trans "Edit mail address targets" %}">{{ mailaddress }}</a>
+              <a href="{% url 'delete_mailaddress' package=hostingpackage.id domain=maildomain.domain pk=mailaddress.id %}" title="{% trans "Delete mail address" %}"><i class="glyphicon glyphicon-trash"></i></a>
+              {% endspaceless %}{% if not forloop.last %}, {% endif %}
+              {% endfor %}
+              {% endwith %}
+            </td>
             {% else %}
             <td class="text-info">{% trans "None" %}</td>
             {% endif %}
             <td></td>
-            <td></td>
+            <td>
+              {% with maildomain=domain.domain.maildomain %}
+              <a href="{% url 'add_mailaddress' package=hostingpackage.id domain=maildomain.domain %}" title="{% trans "Add mail address" %}"><i class="fa fa-envelope"></i></a>
+              {% endwith %}
+            </td>
           </tr>
           {% endfor %}
         </tbody>