diff --git a/src/postorius/templates/postorius/user_address_activation_link.html b/src/postorius/templates/postorius/user_address_activation_link.html
deleted file mode 100644
index b493058..0000000
--- a/src/postorius/templates/postorius/user_address_activation_link.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends postorius_base_template %}
-{% load url from future %}
-{% load i18n %}
-
-{% block main %}
-{% endblock main %}
diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py
index 4c9d826..672adf5 100644
--- a/src/postorius/views/user.py
+++ b/src/postorius/views/user.py
@@ -378,7 +378,12 @@
             activation_key=activation_key)
         if not profile.is_expired:
             _add_address(request, profile.user.email, profile.email)
-    except profile.DoesNotExist:
-        pass
-    return render_to_response('postorius/user_address_activation_link.html',
-        {}, context_instance=RequestContext(request))
+            profile.delete()
+            messages.success(request, _('The email address has been activated!'))
+        else:
+            profile.delete()
+            messages.error(request, _('The activation link has expired, please add the email again!'))
+            return redirect('address_activation')
+    except AddressConfirmationProfile.DoesNotExist:
+        messages.error(request, _('The activation link is invalid'))
+    return redirect('list_index')