diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index d00b1cb..a752534 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -18,11 +18,9 @@
     {% if user.is_authenticated %}
     {% if userSubscribed %}
     {% trans "You are subscribed to this list with your address:" %}
-    {% for address in subscribed_address %}
-    {{ address }}
-    {% endfor %}
+    <em>{{ subscribed_address }}</em>
     <br/>
-    <a href="{% url 'list_unsubscribe' list.list_id user.email %}" class="btn btn-danger">{% trans "Unsubscribe" %}</a>
+    <a href="{% url 'list_unsubscribe' list.list_id user.email %}" class="btn btn-danger">{% trans "Unsubscribe" %} {{ subscribed_address }}</a>
     {% else %}
     <h2>{% trans 'Subscribe to this list' %}</h2>
     <form action="{% url 'list_subscribe' list.list_id %}" method="post" class="list_subscribe"> {% csrf_token %}
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index c31f5b9..34a18ea 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -183,7 +183,7 @@
             # The user does not have a mailman user associated with it.
             user_emails = [request.user.email]
         userSubscribed = False
-        subscribed_address = []
+        subscribed_address = None
         for address in user_emails:
             try:
                 userMember = self.mailing_list.get_member(address)
@@ -191,7 +191,7 @@
                 pass
             else:
                 userSubscribed = True
-                subscribed_address.append(address)
+                subscribed_address = address
         return render_to_response(
             'postorius/lists/summary.html',
             {'list': self.mailing_list,
@@ -215,8 +215,8 @@
                 email = request.POST.get('email')
                 self.mailing_list.subscribe(email)
                 messages.success(
-                    request, 'You are subscribed to %s.' %
-                    self.mailing_list.fqdn_listname)
+                    request, 'You are subscribed to %s using your %s address' %
+                    (self.mailing_list.fqdn_listname, email))
             else:
                 messages.error(request, 'Something went wrong. '
                                'Please try again.')