diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index e0d05a1..d233b14 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -24,6 +24,8 @@
 from django.core.urlresolvers import reverse
 from django.shortcuts import render_to_response, redirect
 from django.template import RequestContext
+from django.core.validators import validate_email
+from django.core.exceptions import ValidationError
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext as _
 from urllib2 import HTTPError
@@ -249,25 +251,22 @@
         else:
             emails = request.POST["emails"].splitlines()
             for email in emails:
-                parts = email.split('@')
-                if len(parts) != 2 or '.' not in parts[1]:
+                try:
+                    validate_email(email)
+                    self.mailing_list.subscribe(address=email)
+                    messages.success(request,
+                                   'The address %s has been subscribed to %s.' %
+                                    (email, self.mailing_list.fqdn_listname))
+                except MailmanApiError:
+                    return utils.render_api_error(request)
+                except HTTPError, e:
+                    messages.error(request, e)
+                except ValidationError:
                     messages.error(request,
                                    'The email address %s is not valid.' %
                                    email)
-                else:
-                    try:
-                        self.mailing_list.subscribe(address=email)
-                        messages.success(
-                            request,
-                            'The address %s has been subscribed to %s.' %
-                            (email, self.mailing_list.fqdn_listname))
-                    except MailmanApiError:
-                        return utils.render_api_error(request)
-                    except HTTPError, e:
-                        messages.error(request, e)
         return redirect('mass_subscribe', self.mailing_list.list_id)
 
-
 def _get_choosable_domains(request):
     try:
         domains = Domain.objects.all()