diff --git a/src/postorius/forms.py b/src/postorius/forms.py
index f4919a2..d8722ba 100644
--- a/src/postorius/forms.py
+++ b/src/postorius/forms.py
@@ -191,11 +191,13 @@
     """Form fields to join an existing list.
     """
 
-    email = forms.ChoiceField(label=_('Your email address'),
+    email = forms.ChoiceField(
+                label=_('Your email address'),
                 validators=[validate_email],
                 widget=forms.Select(),
-                error_messages={'required': _('Please enter an email address.'),
-                                'invalid': _('Please enter a valid email address.')})
+                error_messages={
+                    'required': _('Please enter an email address.'),
+                    'invalid': _('Please enter a valid email address.')})
 
     display_name = forms.CharField(label=_('Your name (optional)'),
                                    required=False)
@@ -236,8 +238,10 @@
         help_text=_('Open: Subscriptions are added automatically\n'
                     'Confirm: Subscribers need to confirm the subscription '
                     'using an email sent to them\n'
-                    'Moderate: Moderators will have to authorize each subscription manually.\n'
-                    'Confirm then Moderate: First subscribers have to confirm, then a moderator '
+                    'Moderate: Moderators will have to authorize '
+                    'each subscription manually.\n'
+                    'Confirm then Moderate: First subscribers have to confirm,'
+                    ' then a moderator '
                     'needs to authorize.'))
 
 
@@ -347,7 +351,8 @@
     """
     digest_size_threshold = forms.DecimalField(
         label=_('Digest size threshold'),
-        help_text=_('How big in Kb should a digest be before it gets sent out?'))
+        help_text=_('How big in Kb should a digest be before '
+                    'it gets sent out?'))
 
 
 class AlterMessagesForm(ListSettingsForm):
@@ -360,16 +365,16 @@
         widget=forms.RadioSelect,
         required=False,
         label=_('Filter content'),
-        help_text=_('Should Mailman filter the content of list traffic according '
-                    'to the settings below?'))
+        help_text=_('Should Mailman filter the content of list traffic '
+                    'according to the settings below?'))
     collapse_alternatives = forms.TypedChoiceField(
         coerce=lambda x: x == 'True',
         choices=((True, _('Yes')), (False, _('No'))),
         widget=forms.RadioSelect,
         required=False,
         label=_('Collapse alternatives'),
-        help_text=_('Should Mailman collapse multipart/alternative to its first '
-                    'part content?'))
+        help_text=_('Should Mailman collapse multipart/alternative to '
+                    'its first part content?'))
     convert_html_to_plaintext = forms.TypedChoiceField(
         coerce=lambda x: x == 'True',
         choices=((True, _('Yes')), (False, _('No'))),
@@ -377,15 +382,17 @@
         required=False,
         label=_('Convert html to plaintext'),
         help_text=_('Should Mailman convert text/html parts to plain text? '
-                   'This conversion happens after MIME attachments have been stripped.'))
+                    'This conversion happens after MIME attachments '
+                    'have been stripped.'))
     anonymous_list = forms.TypedChoiceField(
         coerce=lambda x: x == 'True',
         choices=((True, _('Yes')), (False, _('No'))),
         widget=forms.RadioSelect,
         required=False,
         label=_('Anonymous list'),
-        help_text=_('Hide the sender of a message, replacing it with the list address '
-                   '(Removes From, Sender and Reply-To fields)'))
+        help_text=_('Hide the sender of a message, '
+                    'replacing it with the list address '
+                    '(Removes From, Sender and Reply-To fields)'))
     include_rfc2369_headers = forms.TypedChoiceField(
         coerce=lambda x: x == 'True',
         choices=((True, _('Yes')), (False, _('No'))),
@@ -489,7 +496,8 @@
         choices=autorespond_choices,
         widget=forms.RadioSelect,
         label=_('Autorespond to list owner'),
-        help_text=_('Should Mailman send an auto-response to emails sent to the -owner address?'))
+        help_text=_('Should Mailman send an auto-response to '
+                    'emails sent to the -owner address?'))
     autoresponse_owner_text = forms.CharField(
         label=_('Autoresponse owner text'),
         widget=forms.Textarea(),
@@ -499,7 +507,8 @@
         choices=autorespond_choices,
         widget=forms.RadioSelect,
         label=_('Autorespond postings'),
-        help_text=_('Should Mailman send an auto-response to mailing list posters?'))
+        help_text=_('Should Mailman send an auto-response to '
+                    'mailing list posters?'))
     autoresponse_postings_text = forms.CharField(
         label=_('Autoresponse postings text'),
         widget=forms.Textarea(),
@@ -560,7 +569,8 @@
         widget=forms.RadioSelect(choices=((True, _('Yes')), (False, _('No')))),
         required=False,
         label=_('Notify admin of membership changes'),
-        help_text=_('Should administrator get notices of subscribes and unsubscribes?'))
+        help_text=_('Should administrator get notices of '
+                    'subscribes and unsubscribes?'))
 
 
 class ListIdentityForm(ListSettingsForm):
@@ -572,7 +582,8 @@
         choices=((True, _('Yes')), (False, _('No'))),
         widget=forms.RadioSelect,
         label=_('Show list on index page'),
-        help_text=_('Choose whether to include this list on the list of all lists'))
+        help_text=_('Choose whether to include this list '
+                    'on the list of all lists'))
     description = forms.CharField(
         label=_('Description'),
         help_text=_(
@@ -655,10 +666,8 @@
 class ListHeaderMatchForm(forms.Form):
     """Edit a list's header match."""
 
-    HM_ACTION_CHOICES = [
-            (None, _("Default antispam action")) ] + [
-            a for a in ACTION_CHOICES if a[0] != 'defer'
-            ]
+    HM_ACTION_CHOICES = [(None, _("Default antispam action"))] + \
+                        [a for a in ACTION_CHOICES if a[0] != 'defer']
 
     header = forms.CharField(
         label=_('Header'),
@@ -675,17 +684,18 @@
     action = forms.ChoiceField(
         label=_('Action'),
         error_messages={'invalid': _('Please enter a valid action.')},
-        #widget=forms.RadioSelect(),
         required=False,
         choices=HM_ACTION_CHOICES,
         help_text=_('Action to take when a header matches')
         )
 
+
 class ListHeaderMatchFormset(forms.BaseFormSet):
     def clean(self):
         """Checks that no two header matches have the same order."""
         if any(self.errors):
-            # Don't bother validating the formset unless each form is valid on its own
+            # Don't bother validating the formset unless
+            # each form is valid on its own
             return
         orders = []
         for form in self.forms:
@@ -694,7 +704,8 @@
             except KeyError:
                 continue
             if order in orders:
-                raise forms.ValidationError("Header matches must have distinct orders.")
+                raise forms.ValidationError('Header matches must have'
+                                            ' distinct orders.')
             orders.append(order)
 
 
@@ -814,14 +825,15 @@
 
         # Check if the address belongs to someone else
         if User.objects.filter(email=email).exists():
-            raise forms.ValidationError(_('This email is in use.'
-                                          'Please choose another or contact the administrator'),
-                                          'error')
+            raise forms.ValidationError(
+                    _('This email is in use. Please choose another or contact'
+                      ' the administrator'), 'error')
 
         # Check if the email is attached to a user in Mailman
         try:
             utils.get_client().get_user(email)
-            raise forms.ValidationError(_('This email already belongs to a user'), 'error')
+            raise forms.ValidationError(
+                    _('This email already belongs to a user'), 'error')
         except HTTPError:
             pass
         return email
diff --git a/src/postorius/migrations/0001_initial.py b/src/postorius/migrations/0001_initial.py
index 9cca4b1..fdffe48 100644
--- a/src/postorius/migrations/0001_initial.py
+++ b/src/postorius/migrations/0001_initial.py
@@ -15,7 +15,8 @@
         migrations.CreateModel(
             name='AddressConfirmationProfile',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(verbose_name='ID', serialize=False,
+                                        auto_created=True, primary_key=True)),
                 ('email', models.EmailField(max_length=254)),
                 ('activation_key', models.CharField(max_length=40)),
                 ('created', models.DateTimeField()),
diff --git a/src/postorius/models.py b/src/postorius/models.py
index 5d7f690..f57403c 100644
--- a/src/postorius/models.py
+++ b/src/postorius/models.py
@@ -257,7 +257,8 @@
 
         The following settings are recognized:
 
-            >>> EMAIL_CONFIRMATION_TEMPLATE = 'postorius/user/address_confirmation_message.txt'
+            >>> EMAIL_CONFIRMATION_TEMPLATE = \
+                    'postorius/user/address_confirmation_message.txt'
             >>> EMAIL_CONFIRMATION_FROM = 'postmaster@list.org'
             >>> EMAIL_CONFIRMATION_SUBJECT = 'Confirmation needed'
 
@@ -274,14 +275,14 @@
         # Detect the right template path, either from the param,
         # the setting or the default
         if not template_path:
-            template_path = getattr(settings,
-                                    'EMAIL_CONFIRMATION_TEMPLATE',
-                                    'postorius/user/address_confirmation_message.txt')
+            template_path = getattr(
+                    settings, 'EMAIL_CONFIRMATION_TEMPLATE',
+                    'postorius/user/address_confirmation_message.txt')
         # Create a template context (if there is none) containing
         # the activation_link and the host_url.
         if not template_context:
             template_context = {'activation_link': activation_link,
-                    'host_url': request.build_absolute_uri("/")}
+                                'host_url': request.build_absolute_uri("/")}
         email_subject = getattr(
             settings, 'EMAIL_CONFIRMATION_SUBJECT', u'Confirmation needed')
         try:
@@ -295,6 +296,7 @@
             except AttributeError:
                 raise ImproperlyConfigured
 
-        send_mail(email_subject, render_to_string(template_path, template_context),
+        send_mail(email_subject,
+                  render_to_string(template_path, template_context),
                   sender_address,
                   [self.email])
diff --git a/src/postorius/templatetags/bootstrap_tags.py b/src/postorius/templatetags/bootstrap_tags.py
index a09e545..1bfcb88 100644
--- a/src/postorius/templatetags/bootstrap_tags.py
+++ b/src/postorius/templatetags/bootstrap_tags.py
@@ -32,8 +32,10 @@
     return field.field.widget.__class__.__name__
 
 
-@register.inclusion_tag('postorius/lib/form-horizontal.html', takes_context=True)
-def render_form_horizontal(context, form, size_left=2, size_right=8, button=None):
+@register.inclusion_tag('postorius/lib/form-horizontal.html',
+                        takes_context=True)
+def render_form_horizontal(context, form, size_left=2, size_right=8,
+                           button=None):
     return dict(
         form=form,
         size_left=size_left,
diff --git a/src/postorius/tests/mailman_api_tests/test_address_activation.py b/src/postorius/tests/mailman_api_tests/test_address_activation.py
index 7b88944..15552cb 100644
--- a/src/postorius/tests/mailman_api_tests/test_address_activation.py
+++ b/src/postorius/tests/mailman_api_tests/test_address_activation.py
@@ -37,14 +37,16 @@
     def setUp(self):
         super(TestAddressActivationForm, self).setUp()
         # Create a user and profile.
-        self.user = User.objects.create_user('testuser', 'les@example.org', 'testpass')
-        self.profile = AddressConfirmationProfile.objects.create(email='les2@example.org',
-                                                                         user=self.user)
-        self.expired = AddressConfirmationProfile.objects.create(email='expired@example.org',
-                                                                         user=self.user)
+        self.user = User.objects.create_user(
+                'testuser', 'les@example.org', 'testpass')
+        self.profile = AddressConfirmationProfile.objects.create(
+                email='les2@example.org', user=self.user)
+        self.expired = AddressConfirmationProfile.objects.create(
+                email='expired@example.org', user=self.user)
         self.expired.created -= timedelta(weeks=100)
         self.expired.save()
-        self.mm_user = self.mm_client.create_user('subscribed@example.org', 'password')
+        self.mm_user = self.mm_client.create_user(
+                'subscribed@example.org', 'password')
 
     def tearDown(self):
         self.profile.delete()
@@ -87,8 +89,8 @@
         self.user = User.objects.create_user(
             username=u'ler_mm', email=u'ler@mailman.mostdesirable.org',
             password=u'pwd')
-        self.profile = AddressConfirmationProfile.objects.create(email=u'les@example.org',
-                                                                 user=self.user)
+        self.profile = AddressConfirmationProfile.objects.create(
+                email=u'les@example.org', user=self.user)
         # Create a test request object
         self.request = RequestFactory().get('/')
 
@@ -166,7 +168,8 @@
             username='ler', email=u'ler@example.org',
             password='pwd')
         self.mm_user = self.mm_client.create_user('ler@example.org', None)
-        self.profile = AddressConfirmationProfile.objects.create(email=u'les@example.org', user=self.user)
+        self.profile = AddressConfirmationProfile.objects.create(
+                email=u'les@example.org', user=self.user)
         self.profile.save()
 
     def tearDown(self):
diff --git a/src/postorius/tests/mailman_api_tests/test_domain_new.py b/src/postorius/tests/mailman_api_tests/test_domain_new.py
index af5a020..5db2fca 100644
--- a/src/postorius/tests/mailman_api_tests/test_domain_new.py
+++ b/src/postorius/tests/mailman_api_tests/test_domain_new.py
@@ -54,14 +54,15 @@
         post_data = {'mail_host': 'example.com',
                      'web_host': 'http://example.com',
                      'description': 'A new Domain.'}
-        response = self.client.post(reverse('domain_new'), post_data, follow=True)
+        response = self.client.post(reverse('domain_new'), post_data,
+                                    follow=True)
 
         self.assertContains(response, 'New Domain registered')
         self.assertRedirects(response, reverse('domain_index'))
 
-        a_new_domain  = self.mm_client.get_domain('example.com')
+        a_new_domain = self.mm_client.get_domain('example.com')
         self.assertEqual(a_new_domain.mail_host, u'example.com')
         self.assertEqual(a_new_domain.base_url, u'http://example.com')
         self.assertEqual(a_new_domain.owners[0]['user_id'],
-                self.mm_client.get_user('su@example.com').user_id)
+                         self.mm_client.get_user('su@example.com').user_id)
         a_new_domain.delete()
diff --git a/src/postorius/tests/mailman_api_tests/test_list_bans.py b/src/postorius/tests/mailman_api_tests/test_list_bans.py
index ef90ec8..9d5bdb7 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_bans.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_bans.py
@@ -64,12 +64,12 @@
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         self.assertTrue('addban_form' in response.context)
-        self.assertContains(response,
-            '<input class="form-control" id="id_email" name="email" '
-            'type="text" />')
-        self.assertContains(response,
-            '<button class="btn btn-primary" type="submit" name="add">'
-            'Ban email</button>')
+        self.assertContains(
+                response, '<input class="form-control" id="id_email" '
+                          'name="email" type="text" />')
+        self.assertContains(
+                response, '<button class="btn btn-primary" type="submit" '
+                          'name="add">Ban email</button>')
 
     def test_context_contains_delete_forms(self):
         banned = ['banned{}@example.com'.format(i) for i in range(1, 10)]
@@ -78,11 +78,12 @@
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         for ban in banned:
-            self.assertContains(response,
-                '<input type="hidden" name="email" value="%s" />' % ban)
-        self.assertContains(response,
-            '<button class="btn btn-danger btn-xs" type="submit" name="del"',
-            count=9)
+            self.assertContains(
+                    response, '<input type="hidden" name="email" value="%s" />'
+                    % ban)
+        self.assertContains(
+                response, '<button class="btn btn-danger btn-xs" '
+                          'type="submit" name="del"', count=9)
 
     def test_add_ban(self):
         response = self.client.post(self.url, {
diff --git a/src/postorius/tests/mailman_api_tests/test_list_members.py b/src/postorius/tests/mailman_api_tests/test_list_members.py
index 22e2d01..615b89e 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_members.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_members.py
@@ -58,26 +58,26 @@
 
     def test_page_not_accessible_for_unprivileged_users(self):
         self.client.login(username='testuser', password='testpass')
-        response = self.client.get(reverse('list_members',
-                                           args=('foo@example.com', 'subscriber',)))
+        response = self.client.get(reverse(
+            'list_members', args=('foo@example.com', 'subscriber',)))
         self.assertEqual(response.status_code, 403)
 
     def test_not_accessible_for_moderator(self):
         self.client.login(username='testmoderator', password='testpass')
-        response = self.client.get(reverse('list_members',
-                                           args=('foo@example.com', 'subscriber',)))
+        response = self.client.get(reverse(
+            'list_members', args=('foo@example.com', 'subscriber',)))
         self.assertEqual(response.status_code, 403)
 
     def test_page_accessible_for_superuser(self):
         self.client.login(username='testsu', password='testpass')
-        response = self.client.get(reverse('list_members',
-                                           args=('foo@example.com', 'subscriber',)))
+        response = self.client.get(reverse(
+            'list_members', args=('foo@example.com', 'subscriber',)))
         self.assertEqual(response.status_code, 200)
 
     def test_page_accessible_for_owner(self):
         self.client.login(username='testowner', password='testpass')
-        response = self.client.get(reverse('list_members',
-                                           args=('foo@example.com', 'subscriber',)))
+        response = self.client.get(reverse(
+            'list_members', args=('foo@example.com', 'subscriber',)))
         self.assertEqual(response.status_code, 200)
 
 
@@ -199,10 +199,12 @@
 
     def test_show_members_page(self):
         self.client.login(username='testsu', password='testpass')
-        member_1 = self.foo_list.subscribe('member-1@example.com',
-            pre_verified=True, pre_confirmed=True, pre_approved=True)
-        member_2 = self.foo_list.subscribe('member-2@example.com',
-            pre_verified=True, pre_confirmed=True, pre_approved=True)
+        member_1 = self.foo_list.subscribe(
+                'member-1@example.com', pre_verified=True, pre_confirmed=True,
+                pre_approved=True)
+        member_2 = self.foo_list.subscribe(
+                'member-2@example.com', pre_verified=True, pre_confirmed=True,
+                pre_approved=True)
         response = self.client.get(reverse(
             'list_members', args=['foo@example.com', 'subscriber']))
         self.assertEqual(response.status_code, 200)
@@ -213,10 +215,12 @@
 
     def test_search_members_1(self):
         self.client.login(username='testsu', password='testpass')
-        member_1 = self.foo_list.subscribe('member-1@example.com',
-            pre_verified=True, pre_confirmed=True, pre_approved=True)
-        member_2 = self.foo_list.subscribe('member-2@example.com',
-            pre_verified=True, pre_confirmed=True, pre_approved=True)
+        member_1 = self.foo_list.subscribe(
+                'member-1@example.com', pre_verified=True, pre_confirmed=True,
+                pre_approved=True)
+        member_2 = self.foo_list.subscribe(
+                'member-2@example.com', pre_verified=True, pre_confirmed=True,
+                pre_approved=True)
         response = self.client.get(reverse(
             'list_members', args=['foo@example.com', 'subscriber']),
             {'q': 'example.com'})
diff --git a/src/postorius/tests/mailman_api_tests/test_list_settings.py b/src/postorius/tests/mailman_api_tests/test_list_settings.py
index 63525f4..b0c145f 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_settings.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_settings.py
@@ -57,34 +57,39 @@
 
     def test_page_not_accessible_if_not_logged_in(self):
         for section_name in SETTINGS_FORMS:
-            url = reverse('list_settings', args=('foo.example.com', section_name))
+            url = reverse('list_settings', args=('foo.example.com',
+                                                 section_name))
             self.assertRedirectsToLogin(url)
 
     def test_page_not_accessible_for_unprivileged_users(self):
         self.client.login(username='testuser', password='testpass')
         for section_name in SETTINGS_FORMS:
-            url = reverse('list_settings', args=('foo.example.com', section_name))
+            url = reverse('list_settings', args=('foo.example.com',
+                                                 section_name))
             response = self.client.get(url)
             self.assertEqual(response.status_code, 403)
 
     def test_not_accessible_for_moderator(self):
         self.client.login(username='testmoderator', password='testpass')
         for section_name in SETTINGS_FORMS:
-            url = reverse('list_settings', args=('foo.example.com', section_name))
+            url = reverse('list_settings', args=('foo.example.com',
+                                                 section_name))
             response = self.client.get(url)
             self.assertEqual(response.status_code, 403)
 
     def test_page_accessible_for_owner(self):
         self.client.login(username='testowner', password='testpass')
         for section_name in SETTINGS_FORMS:
-            url = reverse('list_settings', args=('foo.example.com', section_name))
+            url = reverse('list_settings', args=('foo.example.com',
+                                                 section_name))
             response = self.client.get(url)
             self.assertEqual(response.status_code, 200)
 
     def test_page_accessible_for_superuser(self):
         self.client.login(username='testsu', password='testpass')
         for section_name in SETTINGS_FORMS:
-            url = reverse('list_settings', args=('foo@example.com', section_name))
+            url = reverse('list_settings', args=('foo@example.com',
+                                                 section_name))
             response = self.client.get(url)
             self.assertEqual(response.status_code, 200)
 
@@ -105,18 +110,20 @@
 
     def test_archivers(self):
         self.assertEqual(dict(self.foo_list.archivers),
-            {'mhonarc': True, 'prototype': True, 'mail-archive': True})
+                         {'mhonarc': True, 'prototype': True,
+                          'mail-archive': True})
         self.client.login(username='testsu', password='testpass')
         url = reverse('list_settings', args=('foo.example.com', 'archiving'))
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context["form"].initial['archivers'],
                          ['mail-archive', 'mhonarc', 'prototype'])
-        response = self.client.post(url,
-            {'archive_policy': 'public', 'archivers': ['prototype']})
+        response = self.client.post(
+                url, {'archive_policy': 'public', 'archivers': ['prototype']})
         self.assertRedirects(response, url)
         self.assertHasSuccessMessage(response)
         # Get a new list object to avoid caching
         m_list = List.objects.get(fqdn_listname='foo.example.com')
         self.assertEqual(dict(m_list.archivers),
-            {'mhonarc': False, 'prototype': True, 'mail-archive': False})
+                         {'mhonarc': False, 'prototype': True,
+                          'mail-archive': False})
diff --git a/src/postorius/tests/mailman_api_tests/test_list_summary.py b/src/postorius/tests/mailman_api_tests/test_list_summary.py
index 3234a50..e993ec2 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_summary.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_summary.py
@@ -133,21 +133,24 @@
         self.assertNotContains(response, 'Delete list</a>')
 
     def test_metrics_not_displayed_to_anonymous(self):
-        response = self.client.get(reverse('list_summary', args=('foo@example.com',)))
+        response = self.client.get(reverse('list_summary',
+                                           args=('foo@example.com',)))
         self.assertNotContains(response, 'List metrics')
 
     def test_list_metrics_not_displayed_to_moderator(self):
         mlist = self.mm_client.get_list('foo@example.com')
         mlist.add_moderator('test@example.com')
         self.client.login(username='testuser', password='testpass')
-        response = self.client.get(reverse('list_summary', args=('foo@example.com',)))
+        response = self.client.get(reverse('list_summary',
+                                           args=('foo@example.com',)))
         self.assertNotContains(response, 'List metrics')
 
     def test_list_metrics_displayed_to_owner(self):
         mlist = self.mm_client.get_list('foo@example.com')
         mlist.add_owner('test@example.com')
         self.client.login(username='testuser', password='testpass')
-        response = self.client.get(reverse('list_summary', args=('foo@example.com',)))
+        response = self.client.get(reverse('list_summary',
+                                           args=('foo@example.com',)))
         self.assertContains(response, 'List metrics')
 
     def test_list_metrics_displayed_to_superuser(self):
diff --git a/src/postorius/tests/mailman_api_tests/test_models.py b/src/postorius/tests/mailman_api_tests/test_models.py
index ccd4ba5..f9dd260 100644
--- a/src/postorius/tests/mailman_api_tests/test_models.py
+++ b/src/postorius/tests/mailman_api_tests/test_models.py
@@ -44,12 +44,14 @@
 
     def test_mailman_user_not_created_when_flag_is_off(self):
         with self.settings(AUTOCREATE_MAILMAN_USER=False):
-            User.objects.create_user('testuser', 'test@example.com', 'testpass')
+            User.objects.create_user('testuser', 'test@example.com',
+                                     'testpass')
             with self.assertRaises(HTTPError):
                 self.mm_client.get_user('test@example.com')
 
     def test_mailman_user_created_when_flag_is_on(self):
         with self.settings(AUTOCREATE_MAILMAN_USER=True):
-            User.objects.create_user('testuser', 'test@example.com', 'testpass')
+            User.objects.create_user('testuser', 'test@example.com',
+                                     'testpass')
             user = self.mm_client.get_user('test@example.com')
             self.assertEqual(str(user.addresses[0]), 'test@example.com')
diff --git a/src/postorius/tests/mailman_api_tests/test_profile.py b/src/postorius/tests/mailman_api_tests/test_profile.py
index 6abe87e..2f8ff3c 100644
--- a/src/postorius/tests/mailman_api_tests/test_profile.py
+++ b/src/postorius/tests/mailman_api_tests/test_profile.py
@@ -50,24 +50,27 @@
     def test_view_contains_form(self):
         # The view context should contain a form.
         response = self.client.get(reverse('user_profile'))
-        self.assertContains(response, 'You can add other addresses to your profile')
+        self.assertContains(response,
+                            'You can add other addresses to your profile')
 
     def test_post_invalid_form_shows_error_msg(self):
         # Entering an invalid email address should render an error message.
-        response = self.client.post(reverse('user_profile'), {
-                                    'email': 'invalid_email',
-                                    'user_email': self.user.email})
+        response = self.client.post(reverse('user_profile'),
+                                    {'email': 'invalid_email',
+                                     'user_email': self.user.email})
         self.assertContains(response, 'Enter a valid email address.')
 
     @patch.object(AddressConfirmationProfile, 'send_confirmation_link')
     def test_post_valid_form_shows_success_message(
             self, mock_send_confirmation_link):
         # Entering a valid email should render the activation_sent template.
-        response = self.client.post(reverse('user_profile'), {
-                                    'email': 'new_address@example.org',
-                                    'user_email': self.user.email}, follow=True)
+        response = self.client.post(reverse('user_profile'),
+                                    {'email': 'new_address@example.org',
+                                     'user_email': self.user.email},
+                                    follow=True)
         self.assertEqual(mock_send_confirmation_link.call_count, 1)
-        self.assertContains(response, 'Please follow the instructions sent via email to confirm the address')
+        self.assertContains(response, 'Please follow the instructions sent '
+                                      'via email to confirm the address')
 
     @patch.object(AddressConfirmationProfile, 'send_confirmation_link')
     def test_post_valid_form_redirects_on_success(
@@ -80,11 +83,12 @@
         self.assertRedirects(response, reverse('user_profile'))
 
     @patch.object(AddressConfirmationProfile, 'send_confirmation_link',
-                         side_effect=SMTPException())
+                  side_effect=SMTPException())
     def test_post_form_with_smtp_exception(self, mock_send_confirmation_link):
         # If a smtp exception occurs display error
         response = self.client.post(reverse('user_profile'), {
             'email': 'new_address@example.org',
             'user_email': self.user.email}, follow=True)
         self.assertEqual(mock_send_confirmation_link.call_count, 1)
-        self.assertContains(response, 'Currently emails can not be added, please try again later')
+        self.assertContains(response, 'Currently emails can not be added, '
+                                      'please try again later')
diff --git a/src/postorius/tests/mailman_api_tests/test_subscriptions.py b/src/postorius/tests/mailman_api_tests/test_subscriptions.py
index d2780a7..a3bce6d 100644
--- a/src/postorius/tests/mailman_api_tests/test_subscriptions.py
+++ b/src/postorius/tests/mailman_api_tests/test_subscriptions.py
@@ -66,8 +66,9 @@
             {'email': 'test@example.com'})
         self.assertEqual(len(self.open_list.members), 1)
         self.assertEqual(len(self.open_list.requests), 0)
-        self.assertRedirects(response,
-            reverse('list_summary', args=('open_list.example.com', )))
+        self.assertRedirects(
+                response, reverse('list_summary',
+                                  args=('open_list.example.com', )))
         self.assertHasSuccessMessage(response)
 
     def test_secondary_open(self):
@@ -78,8 +79,9 @@
             {'email': 'fritz@example.org'})
         self.assertEqual(len(self.open_list.members), 1)
         self.assertEqual(len(self.open_list.requests), 0)
-        self.assertRedirects(response,
-            reverse('list_summary', args=('open_list.example.com', )))
+        self.assertRedirects(
+                response, reverse('list_summary',
+                                  args=('open_list.example.com', )))
         self.assertHasSuccessMessage(response)
 
     def test_unknown_address(self):
@@ -90,8 +92,9 @@
             {'email': 'unknown@example.org'})
         self.assertEqual(len(self.open_list.members), 0)
         self.assertEqual(len(self.open_list.requests), 0)
-        self.assertRedirects(response,
-            reverse('list_summary', args=('open_list.example.com', )))
+        self.assertRedirects(
+                response, reverse('list_summary',
+                                  args=('open_list.example.com', )))
         self.assertHasErrorMessage(response)
 
     def test_subscribe_mod(self):
@@ -102,8 +105,9 @@
             {'email': 'test@example.com'})
         self.assertEqual(len(self.mod_list.members), 0)
         self.assertEqual(len(self.mod_list.requests), 1)
-        self.assertRedirects(response,
-            reverse('list_summary', args=('moderate_subs.example.com', )))
+        self.assertRedirects(
+                response, reverse('list_summary',
+                                  args=('moderate_subs.example.com', )))
         self.assertHasSuccessMessage(response)
 
     def test_secondary_mod(self):
@@ -114,8 +118,9 @@
             {'email': 'fritz@example.org'})
         self.assertEqual(len(self.mod_list.members), 0)
         self.assertEqual(len(self.mod_list.requests), 1)
-        self.assertRedirects(response,
-            reverse('list_summary', args=('moderate_subs.example.com', )))
+        self.assertRedirects(
+                response, reverse('list_summary',
+                                  args=('moderate_subs.example.com', )))
         self.assertHasSuccessMessage(response)
 
     def test_subscribe_mod_then_open(self):
@@ -140,11 +145,12 @@
         self.client.logout()
         self.client.login(username='testowner', password='pwd')
         accept_url = reverse(
-            'handle_subscription_request', args=['moderate_subs.example.com',
-            self.mod_list.requests[0]['token'], 'accept'])
+                'handle_subscription_request',
+                args=['moderate_subs.example.com',
+                      self.mod_list.requests[0]['token'], 'accept'])
         response = self.client.get(accept_url)
-        self.assertRedirects(
-            response, reverse('list_subscription_requests',
-            args=['moderate_subs.example.com']))
+        self.assertRedirects(response,
+                             reverse('list_subscription_requests',
+                                     args=['moderate_subs.example.com']))
         message = self.assertHasSuccessMessage(response)
         self.assertIn('Already subscribed', message)
diff --git a/src/postorius/tests/mailman_api_tests/test_user.py b/src/postorius/tests/mailman_api_tests/test_user.py
index 35e56ba..adda5d9 100644
--- a/src/postorius/tests/mailman_api_tests/test_user.py
+++ b/src/postorius/tests/mailman_api_tests/test_user.py
@@ -72,8 +72,8 @@
         # those preferences are unset, they must be excluded from the POST
         # data.
         self.client.login(username='user', password='testpass')
-        self.foo_list.subscribe(self.user.email,
-            pre_verified=True, pre_confirmed=True, pre_approved=True)
+        self.foo_list.subscribe(self.user.email, pre_verified=True,
+                                pre_confirmed=True, pre_approved=True)
         prefs_with_none = (
             'receive_own_postings', 'acknowledge_posts',
             'hide_address', 'receive_list_copy',
@@ -95,11 +95,12 @@
                     reverse('user_mailmansettings'),
                     reverse('user_list_options', args=[self.foo_list.list_id]),
                     ):
-                response = self.client.post(url,
-                    dict((pref, None) for pref in prefs_with_none))
+                response = self.client.post(
+                        url, dict((pref, None) for pref in prefs_with_none))
                 self.assertEqual(response.status_code, 302)
             # Formsets
-            for url in ('user_address_preferences', 'user_subscription_preferences'):
+            for url in ('user_address_preferences',
+                        'user_subscription_preferences'):
                 url = reverse(url)
                 post_data = dict(
                     ('form-0-%s' % pref, None)
@@ -119,7 +120,8 @@
         user = User.objects.create_user(
             'old-user', 'old-user@example.com', 'testpass')
         self.client.login(username='old-user', password='testpass')
-        self.assertRaises(Mailman404Error, MailmanUser.objects.get, address=user.email)
+        self.assertRaises(Mailman404Error, MailmanUser.objects.get,
+                          address=user.email)
         response = self.client.get(reverse('user_subscriptions'))
         self.assertEqual(response.status_code, 200)
         # The Mailman user must have been created
diff --git a/src/postorius/tests/test_auth_decorators.py b/src/postorius/tests/test_auth_decorators.py
index a697d09..c91c50f 100644
--- a/src/postorius/tests/test_auth_decorators.py
+++ b/src/postorius/tests/test_auth_decorators.py
@@ -118,8 +118,8 @@
     def test_not_authenticated(self, mock_get_list):
         """Should raise PermissionDenied if user is not authenticated."""
         mock_get_list.return_value = self.mock_list
-        request = self.request_factory.get('/lists/foolist.example.org/'
-                                           'settings/')
+        request = self.request_factory.get(
+                '/lists/foolist.example.org/settings/')
         request.user = AnonymousUser()
         self.assertRaises(PermissionDenied, dummy_function_mod_req, request,
                           list_id='foolist.example.org')
@@ -128,13 +128,12 @@
     def test_superuser(self, mock_get_list):
         """Should call the dummy method, if user is superuser."""
         mock_get_list.return_value = self.mock_list
-        request = self.request_factory.get('/lists/foolist.example.org/'
-                                           'settings/')
-        request.user = User.objects.create_superuser('su2', 'su@sodo.org',
-                                                     'pwd')
-        return_value = dummy_function_mod_req(request,
-                                              list_id=
-                                              'foolist.example.org')
+        request = self.request_factory.get(
+                '/lists/foolist.example.org/settings/')
+        request.user = User.objects.create_superuser(
+                'su2', 'su@sodo.org', 'pwd')
+        return_value = dummy_function_mod_req(
+                request, list_id='foolist.example.org')
         self.assertEqual(return_value, True)
 
     @patch.object(Client, 'get_list')
@@ -144,10 +143,10 @@
         self.mock_list.moderators = ['geddy@rush.it']
         mock_get_list.return_value = self.mock_list
         # prepare request
-        request = self.request_factory.get('/lists/foolist.example.org/'
-                                           'settings/')
-        request.user = User.objects.create_user('les cl2', 'les@primus.org',
-                                                'pwd')
+        request = self.request_factory.get(
+                '/lists/foolist.example.org/settings/')
+        request.user = User.objects.create_user(
+                'les cl2', 'les@primus.org', 'pwd')
         self.assertRaises(PermissionDenied, dummy_function_mod_req, request,
                           list_id='foolist.example.org')
 
@@ -158,13 +157,12 @@
         self.mock_list.owners = ['les@primus.org']
         mock_get_list.return_value = self.mock_list
         # prepare request
-        request = self.request_factory.get('/lists/foolist.example.org/'
-                                           'settings/')
-        request.user = User.objects.create_user('les cl3', 'les@primus.org',
-                                                'pwd')
-        return_value = dummy_function_mod_req(request,
-                                              list_id=
-                                              'foolist.example.org')
+        request = self.request_factory.get(
+                '/lists/foolist.example.org/settings/')
+        request.user = User.objects.create_user(
+                'les cl3', 'les@primus.org', 'pwd')
+        return_value = dummy_function_mod_req(
+                request, list_id='foolist.example.org')
         self.assertEqual(return_value, True)
 
     @patch.object(Client, 'get_list')
@@ -174,11 +172,10 @@
         self.mock_list.moderators = ['les@primus.org']
         mock_get_list.return_value = self.mock_list
         # prepare request
-        request = self.request_factory.get('/lists/foolist.example.org/'
-                                           'settings/')
-        request.user = User.objects.create_user('les cl4', 'les@primus.org',
-                                                'pwd')
-        return_value = dummy_function_mod_req(request,
-                                              list_id=
-                                              'foolist.example.org')
+        request = self.request_factory.get(
+                '/lists/foolist.example.org/settings/')
+        request.user = User.objects.create_user(
+                'les cl4', 'les@primus.org', 'pwd')
+        return_value = dummy_function_mod_req(
+                request, list_id='foolist.example.org')
         self.assertEqual(return_value, True)
diff --git a/src/postorius/tests/test_forms.py b/src/postorius/tests/test_forms.py
index 0a14ed7..e71e4da 100644
--- a/src/postorius/tests/test_forms.py
+++ b/src/postorius/tests/test_forms.py
@@ -16,8 +16,8 @@
 # Postorius.  If not, see <http://www.gnu.org/licenses/>.
 from django.test import TestCase
 
-from postorius.forms import (ListNew,
-    UserPreferences, DomainNew, ListSubscribe, ChangeSubscriptionForm)
+from postorius.forms import (ListNew, UserPreferences, DomainNew,
+                             ListSubscribe, ChangeSubscriptionForm)
 
 
 class UserPreferencesTest(TestCase):
@@ -56,34 +56,30 @@
 class ListSubscribeTest(TestCase):
     def test_subscribe_works(self):
         user_emails = ['someone@example.com']
-        form = ListSubscribe(user_emails, {
-            'email' : 'someone@example.com',
-            'display_name' : 'Someone',
-        })
+        form = ListSubscribe(user_emails,
+                             {'email': 'someone@example.com',
+                              'display_name': 'Someone'})
         self.assertTrue(form.is_valid())
 
-
     def test_subscribe_fails(self):
         user_emails = ['someone@example.com']
-        form = ListSubscribe(user_emails, {
-            'email' : 'notaemail',
-            'display_name' : 'Someone',
-        })
+        form = ListSubscribe(user_emails,
+                             {'email': 'notaemail',
+                              'display_name': 'Someone'})
         self.assertFalse(form.is_valid())
 
     def test_subscribe_validates_email(self):
         user_emails = ['something']
-        form = ListSubscribe(user_emails, {
-            'email' : 'something',
-            'display_name' : 'Someone',
-        })
+        form = ListSubscribe(user_emails,
+                             {'email': 'something',
+                              'display_name': 'Someone'})
         self.assertFalse(form.is_valid())
 
+
 class ChangeSubscriptionTest(TestCase):
     def test_subscription_changes_only_to_user_addresses(self):
         user_emails = ['one@example.com', 'two@example.com']
-        form = ChangeSubscriptionForm(user_emails,
-                                      {'email': 'abcd@d.com'})
+        form = ChangeSubscriptionForm(user_emails, {'email': 'abcd@d.com'})
         self.assertFalse(form.is_valid())
 
     def test_subscription_works(self):
diff --git a/src/postorius/tests/utils.py b/src/postorius/tests/utils.py
index 1551cc9..d00ed34 100644
--- a/src/postorius/tests/utils.py
+++ b/src/postorius/tests/utils.py
@@ -133,5 +133,5 @@
 
     def assertRedirectsToLogin(self, url):
         response = self.client.get(url)
-        self.assertRedirects(response,
-            '{}?next={}'.format(reverse(settings.LOGIN_URL), quote(url)))
+        self.assertRedirects(response, '{}?next={}'.format(
+                    reverse(settings.LOGIN_URL), quote(url)))
diff --git a/src/postorius/urls.py b/src/postorius/urls.py
index 429a2b9..4b03305 100644
--- a/src/postorius/urls.py
+++ b/src/postorius/urls.py
@@ -29,33 +29,46 @@
     url(r'^csv_view/$', list_views.csv_view, name='csv_view'),
     url(r'^members/options/(?P<email>[^/]+)/$', list_views.list_member_options,
         name='list_member_options'),
-    url(r'^members/(?P<role>\w+)/$', list_views.list_members_view, name='list_members'),
-    url(r'^$', list_views.ListSummaryView.as_view(), name='list_summary'),
-    url(r'^subscribe$', list_views.ListSubscribeView.as_view(), name='list_subscribe'),
+    url(r'^members/(?P<role>\w+)/$', list_views.list_members_view,
+        name='list_members'),
+    url(r'^$', list_views.ListSummaryView.as_view(),
+        name='list_summary'),
+    url(r'^subscribe$', list_views.ListSubscribeView.as_view(),
+        name='list_subscribe'),
     url(r'^change_subscription$', list_views.ChangeSubscriptionView.as_view(),
         name='change_subscription'),
-    url(r'^unsubscribe/$', list_views.ListUnsubscribeView.as_view(), name='list_unsubscribe'),
+    url(r'^unsubscribe/$', list_views.ListUnsubscribeView.as_view(),
+        name='list_unsubscribe'),
     url(r'^subscription_requests$', list_views.list_subscription_requests,
         name='list_subscription_requests'),
-    url(r'^handle_subscription_request/(?P<request_id>[^/]+)/(?P<action>[accept|reject|discard|defer]+)$',
-        list_views.handle_subscription_request, name='handle_subscription_request'),
-    url(r'^mass_subscribe/$', list_views.list_mass_subscribe, name='mass_subscribe'),
-    url(r'^mass_removal/$', list_views.ListMassRemovalView.as_view(), name='mass_removal'),
+    url(r'^handle_subscription_request/(?P<request_id>[^/]+)/'
+        '(?P<action>[accept|reject|discard|defer]+)$',
+        list_views.handle_subscription_request,
+        name='handle_subscription_request'),
+    url(r'^mass_subscribe/$', list_views.list_mass_subscribe,
+        name='mass_subscribe'),
+    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/(?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'^bans/$', list_views.list_bans, name='list_bans'),
-    url(r'^header-matches/$', list_views.list_header_matches, name='list_header_matches'),
-    url(r'^remove/(?P<role>[^/]+)/(?P<address>[^/]+)', list_views.remove_role, name='remove_role'),
-    url(r'^settings/(?P<visible_section>[^/]+)?$', list_views.list_settings, name='list_settings'),
-    url(r'^unsubscribe_all$', list_views.remove_all_subscribers, name='unsubscribe_all'),
+    url(r'^header-matches/$', list_views.list_header_matches,
+        name='list_header_matches'),
+    url(r'^remove/(?P<role>[^/]+)/(?P<address>[^/]+)', list_views.remove_role,
+        name='remove_role'),
+    url(r'^settings/(?P<visible_section>[^/]+)?$', list_views.list_settings,
+        name='list_settings'),
+    url(r'^unsubscribe_all$', list_views.remove_all_subscribers,
+        name='unsubscribe_all'),
 ]
 
 urlpatterns = [
@@ -66,20 +79,24 @@
     url(r'^accounts/profile/$', user_views.user_profile, name='user_profile'),
     url(r'^accounts/subscriptions/$', user_views.user_subscriptions,
         name='user_subscriptions'),
-    url(r'^accounts/per-address-preferences/$', user_views.UserAddressPreferencesView.as_view(),
+    url(r'^accounts/per-address-preferences/$',
+        user_views.UserAddressPreferencesView.as_view(),
         name='user_address_preferences'),
     # if this URL changes, update Mailman's Member.options_url
     url(r'^accounts/per-subscription-preferences/$',
         user_views.UserSubscriptionPreferencesView.as_view(),
         name='user_subscription_preferences'),
-    url(r'^accounts/mailmansettings/$', user_views.UserMailmanSettingsView.as_view(),
+    url(r'^accounts/mailmansettings/$',
+        user_views.UserMailmanSettingsView.as_view(),
         name='user_mailmansettings'),
-    url(r'^accounts/list-options/(?P<list_id>[^/]+)/$', user_views.user_list_options,
+    url(r'^accounts/list-options/(?P<list_id>[^/]+)/$',
+        user_views.user_list_options,
         name='user_list_options'),
     # /domains/
     url(r'^domains/$', domain_views.domain_index, name='domain_index'),
     url(r'^domains/new/$', domain_views.domain_new, name='domain_new'),
-    url(r'^domains/(?P<domain>[^/]+)/delete$', domain_views.domain_delete, name='domain_delete'),
+    url(r'^domains/(?P<domain>[^/]+)/delete$', domain_views.domain_delete,
+        name='domain_delete'),
     # /lists/
     url(r'^lists/$', list_views.list_index, name='list_index'),
     url(r'^lists/new/$', list_views.list_new, name='list_new'),
diff --git a/src/postorius/utils.py b/src/postorius/utils.py
index a9711fb..b393568 100644
--- a/src/postorius/utils.py
+++ b/src/postorius/utils.py
@@ -38,8 +38,8 @@
     Use if MailmanApiError is catched.
     """
     return render(request, 'postorius/errors/generic.html',
-        {'error': _('Mailman REST API not available. Please start Mailman core.')})
-
+                  {'error': _('Mailman REST API not available. '
+                              'Please start Mailman core.')})
 
 
 class MailmanPaginator(Paginator):
@@ -106,7 +106,7 @@
                              if address.verified_on is not None]
     except (MailmanApiError, Mailman404Error, AttributeError) as e:
         # MailmanApiError: No connection to Mailman
-        # Mailman404Error: The user does not have a mailman user associated with it.
+        # Mailman404Error: The user does not have a mailman user associated
         # AttributeError: Anonymous user
         logger.warning("Mailman error while setting other emails for %s: %r",
                        user.email, e)
diff --git a/src/postorius/views/domain.py b/src/postorius/views/domain.py
index 5a14e56..dc57986 100644
--- a/src/postorius/views/domain.py
+++ b/src/postorius/views/domain.py
@@ -38,7 +38,8 @@
         existing_domains = Domain.objects.all()
     except MailmanApiError:
         return utils.render_api_error(request)
-    return render(request, 'postorius/domain/index.html', {'domains': existing_domains})
+    return render(request, 'postorius/domain/index.html',
+                  {'domains': existing_domains})
 
 
 @login_required
@@ -63,7 +64,8 @@
             return redirect("domain_index")
     else:
         form = DomainNew()
-    return render(request, 'postorius/domain/new.html', {'form': form, 'message': message})
+    return render(request, 'postorius/domain/new.html',
+                  {'form': form, 'message': message})
 
 
 @login_required
@@ -79,10 +81,9 @@
                              _('The domain %s has been deleted.' % domain))
             return redirect("domain_index")
         except HTTPError as e:
-            messages.error(request, _('The domain could not be deleted:'
-                                      ' %s' % e.msg))
+            messages.error(request,
+                           _('The domain could not be deleted: %s' % e.msg))
             return redirect("domain_index")
-    submit_url = reverse('domain_delete',
-                         kwargs={'domain': domain})
+    submit_url = reverse('domain_delete', kwargs={'domain': domain})
     return render(request, 'postorius/domain/confirm_delete.html',
-            {'domain': domain, 'submit_url': submit_url})
+                  {'domain': domain, 'submit_url': submit_url})
diff --git a/src/postorius/views/generic.py b/src/postorius/views/generic.py
index 4645abc..8fe6cec 100644
--- a/src/postorius/views/generic.py
+++ b/src/postorius/views/generic.py
@@ -19,7 +19,8 @@
 
 from django.views.generic import TemplateView
 
-from postorius.models import List, MailmanUser, MailmanApiError, Mailman404Error
+from postorius.models import (List, MailmanUser, MailmanApiError,
+                              Mailman404Error)
 from postorius import utils
 from postorius.auth.utils import set_user_access_props
 
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index 21a6a98..573e07e 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -22,8 +22,7 @@
 from django.http import HttpResponse
 
 from django.contrib import messages
-from django.contrib.auth.decorators import (login_required,
-                                            user_passes_test)
+from django.contrib.auth.decorators import login_required, user_passes_test
 from django.core.urlresolvers import reverse
 from django.forms import formset_factory
 from django.shortcuts import render, redirect
@@ -68,16 +67,20 @@
                 members = form.cleaned_data['choices']
                 for member in members:
                     mailing_list.unsubscribe(member)
-                messages.success(request, _('The selected members have been unsubscribed'))
+                messages.success(request, _('The selected members'
+                                            ' have been unsubscribed'))
                 return redirect('list_members', list_id, role)
         else:
             member_form = MemberForm(request.POST)
             if member_form.is_valid():
                 try:
-                    getattr(mailing_list, 'add_%s' % role)(member_form.cleaned_data['email'])
+                    getattr(mailing_list, 'add_%s' % role)(
+                            member_form.cleaned_data['email'])
                     messages.success(
-                        request, _('%(email)s has been added with the role %(role)s.')
-                        % {'email': member_form.cleaned_data['email'], 'role': role})
+                            request, _('%(email)s has been added'
+                                       ' with the role %(role)s')
+                            % {'email': member_form.cleaned_data['email'],
+                               'role': role})
                     return redirect('list_members', list_id, role)
                 except HTTPError as e:
                     messages.error(request, _(e.msg))
@@ -141,7 +144,7 @@
             if preferences_form.is_valid():
                 if not preferences_form.has_changed():
                     messages.info(request,
-                        _("No change to the member's preferences."))
+                                  _("No change to the member's preferences."))
                     return redirect('list_member_options', list_id, email)
                 for key in preferences_form.fields.keys():
                     member_prefs[key] = preferences_form.cleaned_data[key]
@@ -150,8 +153,8 @@
                 except HTTPError as e:
                     messages.error(request, e.msg)
                 else:
-                    messages.success(request,
-                        _("The member's preferences have been updated."))
+                    messages.success(request, _("The member's preferences have"
+                                                " been updated."))
                     return redirect('list_member_options', list_id, email)
         elif request.POST.get("formname") == 'moderation':
             preferences_form = UserPreferences(initial=member_prefs)
@@ -160,7 +163,7 @@
             if moderation_form.is_valid():
                 if not moderation_form.has_changed():
                     messages.info(request,
-                        _("No change to the member's moderation."))
+                                  _("No change to the member's moderation."))
                     return redirect('list_member_options', list_id, email)
                 for key in moderation_form.fields.keys():
                     setattr(mm_member, key, moderation_form.cleaned_data[key])
@@ -169,8 +172,8 @@
                 except HTTPError as e:
                     messages.error(request, e.msg)
                 else:
-                    messages.success(request,
-                        _("The member's moderation settings have been updated."))
+                    messages.success(request, _("The member's moderation "
+                                                "settings have been updated."))
                     return redirect('list_member_options', list_id, email)
     else:
         preferences_form = UserPreferences(initial=member_prefs)
@@ -232,9 +235,11 @@
                 else:
                     self.mailing_list.unsubscribe(old_email)
                     self.mailing_list.subscribe(email)
-                    messages.success(request, _('Subscription changed to %s') % email)
+                    messages.success(request,
+                                     _('Subscription changed to %s') % email)
             else:
-                messages.error(request, _('Something went wrong. Please try again.'))
+                messages.error(request,
+                               _('Something went wrong. Please try again.'))
         except MailmanApiError:
             return utils.render_api_error(request)
         except HTTPError as e:
@@ -260,16 +265,19 @@
                 email = request.POST.get('email')
                 response = self.mailing_list.subscribe(
                     email, pre_verified=True, pre_confirmed=True)
-                if type(response) == dict and response.get('token_owner') == \
-                        'moderator':
+                if (type(response) == dict and
+                        response.get('token_owner') == 'moderator'):
                     messages.success(
-                        request, _('Your subscription request has been submitted and is '
-                        'waiting for moderator approval.'))
+                        request, _('Your subscription request has been'
+                                   ' submitted and is waiting for moderator'
+                                   ' approval.'))
                 else:
-                    messages.success(request, _('You are subscribed to %s.') %
+                    messages.success(request,
+                                     _('You are subscribed to %s.') %
                                      self.mailing_list.fqdn_listname)
             else:
-                messages.error(request, _('Something went wrong. Please try again.'))
+                messages.error(request,
+                               _('Something went wrong. Please try again.'))
         except MailmanApiError:
             return utils.render_api_error(request)
         except HTTPError as e:
@@ -286,7 +294,8 @@
         email = request.POST['email']
         try:
             self.mailing_list.unsubscribe(email)
-            messages.success(request, _('%s has been unsubscribed from this list.') % email)
+            messages.success(request, _('%s has been unsubscribed'
+                                        ' from this list.') % email)
         except MailmanApiError:
             return utils.render_api_error(request)
         except ValueError as e:
@@ -304,17 +313,21 @@
             for email in form.cleaned_data['emails']:
                 try:
                     validate_email(email)
-                    mailing_list.subscribe(
-                        address=email, pre_verified=True, pre_confirmed=True, pre_approved=True)
-                    messages.success(request,
-                                     _('The address %(address)s has been subscribed to %(list)s.') %
-                                     {'address':email, 'list': mailing_list.fqdn_listname})
+                    mailing_list.subscribe(address=email, pre_verified=True,
+                                           pre_confirmed=True,
+                                           pre_approved=True)
+                    messages.success(
+                            request, _('The address %(address)s has been'
+                                       ' subscribed to %(list)s.') %
+                            {'address': email,
+                             'list': mailing_list.fqdn_listname})
                 except MailmanApiError:
                     return utils.render_api_error(request)
                 except HTTPError as e:
                     messages.error(request, e)
                 except ValidationError:
-                    messages.error(request, _('The email address %s is not valid.') % email)
+                    messages.error(request, _('The email address %s'
+                                              ' is not valid.') % email)
     else:
         form = ListMassSubscription()
     return render(request, 'postorius/lists/mass_subscribe.html',
@@ -344,15 +357,18 @@
                 try:
                     validate_email(email)
                     self.mailing_list.unsubscribe(email.lower())
-                    messages.success(request,
-                                    _('The address %(address)s has been unsubscribed from %(list)s.') %
-                                     {'email': email, 'list': self.mailing_list.fqdn_listname})
+                    messages.success(
+                            request, _('The address %(address)s has been'
+                                       ' unsubscribed from %(list)s.') %
+                            {'email': email,
+                             'list': self.mailing_list.fqdn_listname})
                 except MailmanApiError:
                     return utils.render_api_error(request)
                 except (HTTPError, ValueError) as e:
                     messages.error(request, e)
                 except ValidationError:
-                    messages.error(request, _('The email address %s is not valid.') % email)
+                    messages.error(request, _('The email address %s'
+                                              ' is not valid.') % email)
         return redirect('mass_removal', self.mailing_list.list_id)
 
 
@@ -372,13 +388,16 @@
             try:
                 if 'accept' in request.POST:
                     _perform_action(message_ids, mailing_list.accept_message)
-                    messages.success(request, _('The selected messages were accepted'))
+                    messages.success(request,
+                                     _('The selected messages were accepted'))
                 elif 'reject' in request.POST:
                     _perform_action(message_ids, mailing_list.reject_message)
-                    messages.success(request, _('The selected messages were rejected'))
+                    messages.success(request,
+                                     _('The selected messages were rejected'))
                 elif 'discard' in request.POST:
                     _perform_action(message_ids, mailing_list.discard_message)
-                    messages.success(request, _('The selected messages were discarded'))
+                    messages.success(request,
+                                     _('The selected messages were discarded'))
             except MailmanApiError:
                 return utils.render_api_error(request)
             except HTTPError:
@@ -428,8 +447,7 @@
         return utils.render_api_error(request)
     choosable_domains = [("", _("Choose a Domain"))]
     for domain in domains:
-        choosable_domains.append((domain.mail_host,
-                                  domain.mail_host))
+        choosable_domains.append((domain.mail_host, domain.mail_host))
     return choosable_domains
 
 
@@ -467,7 +485,8 @@
                                 list_id=mailing_list.list_id)
             # TODO catch correct Error class:
             except HTTPError as e:
-                return render(request, 'postorius/errors/generic.html', {'error': e})
+                return render(request, 'postorius/errors/generic.html',
+                              {'error': e})
     else:
         choosable_domains = _get_choosable_domains(request)
         form = ListNew(choosable_domains,
@@ -493,9 +512,10 @@
         return utils.render_api_error(request)
     choosable_domains = _get_choosable_domains(request)
     return render(request, template,
-            {'count_options': [10, 25, 50, 100, 200], 'error': error,
-            'lists': utils.paginate(request, lists, count=request.GET.get('count', 10)),
-            'domain_count': len(choosable_domains)})
+                  {'count_options': [10, 25, 50, 100, 200], 'error': error,
+                   'lists': utils.paginate(request, lists,
+                                           count=request.GET.get('count', 10)),
+                   'domain_count': len(choosable_domains)})
 
 
 @login_required
@@ -515,7 +535,8 @@
                              kwargs={'list_id': list_id})
         cancel_url = reverse('list_index',)
         return render(request, 'postorius/lists/confirm_delete.html',
-                {'submit_url': submit_url, 'cancel_url': cancel_url, 'list': the_list})
+                      {'submit_url': submit_url, 'cancel_url': cancel_url,
+                       'list': the_list})
 
 
 @login_required
@@ -595,7 +616,8 @@
         m_list = List.objects.get_or_404(fqdn_listname=list_id)
     except MailmanApiError:
         return utils.render_api_error(request)
-    return render(request, 'postorius/lists/subscription_requests.html',{'list': m_list})
+    return render(request, 'postorius/lists/subscription_requests.html',
+                  {'list': m_list})
 
 
 @login_required
@@ -624,10 +646,11 @@
     except HTTPError as e:
         if e.code == 409:
             messages.success(request,
-                _('The request was already moderated: %s') % e.reason)
+                             _('The request was already moderated: %s')
+                             % e.reason)
         else:
-            messages.error(request,
-                _('The request could not be moderated: %s') % e.reason)
+            messages.error(request, _('The request could not be moderated: %s')
+                           % e.reason)
     return redirect('list_subscription_requests', m_list.list_id)
 
 
@@ -718,8 +741,8 @@
     roster = getattr(the_list, '{}s'.format(role))
     if address not in roster:
         messages.error(request,
-            _('The user %(email)s is not in the %(role)s group')
-            % {'email': address, 'role': role})
+                       _('The user %(email)s is not in the %(role)s group')
+                       % {'email': address, 'role': role})
         return redirect('list_members', the_list.list_id, role)
 
     if role == 'owner':
@@ -740,15 +763,16 @@
         except MailmanApiError:
             return utils.render_api_error(request)
         except HTTPError as e:
-            messages.error(
-                request, _('The user could not be removed: %(msg)s')
-                % {'msg': e.msg})
+            messages.error(request, _('The user could not be removed: %(msg)s')
+                           % {'msg': e.msg})
             return redirect('list_members', the_list.list_id, role)
-        messages.success(request, _('The user %(address)s has been removed from the %(role)s group.')
+        messages.success(request, _('The user %(address)s has been removed'
+                                    ' from the %(role)s group.')
                          % {'address': address, 'role': role})
         return redirect_on_success
     return render(request, template,
-            {'role': role, 'address': address, 'list_id': the_list.list_id})
+                  {'role': role, 'address': address,
+                   'list_id': the_list.list_id})
 
 
 @login_required
@@ -760,18 +784,21 @@
     try:
         mlist = List.objects.get_or_404(fqdn_listname=list_id)
         if len(mlist.members) == 0:
-            messages.error(request, _('No member is subscribed to the list currently.'))
+            messages.error(request,
+                           _('No member is subscribed to the list currently.'))
             return redirect('mass_removal', mlist.list_id)
         if request.method == 'POST':
             try:
                 for names in mlist.members:
                     mlist.unsubscribe(names.email)
-                messages.success(request, _('All members have been unsubscribed from the list.'))
+                messages.success(request, _('All members have been'
+                                            ' unsubscribed from the list.'))
                 return redirect('list_members', mlist.list_id)
             except Exception as e:
                 messages.error(request, e)
-        return render(request, 'postorius/lists/confirm_removeall_subscribers.html',
-                {'list': mlist})
+        return render(request,
+                      'postorius/lists/confirm_removeall_subscribers.html',
+                      {'list': mlist})
     except MailmanApiError:
         return utils.render_api_error(request)
 
@@ -793,9 +820,7 @@
             if addban_form.is_valid():
                 try:
                     ban_list.add(addban_form.cleaned_data['email'])
-                    messages.success(
-                        request, _('The email {} has been banned.'.format(
-                        addban_form.cleaned_data['email'])))
+                    messages.success(request, _('The email {} has been banned.'.format(addban_form.cleaned_data['email'])))
                 except HTTPError as e:
                     messages.error(
                         request, _('An error occured: %s') % e.reason)
@@ -805,9 +830,7 @@
         elif 'del' in request.POST:
             try:
                 ban_list.remove(request.POST['email'])
-                messages.success(
-                    request, _('The email {} has been un-banned.'.format(
-                    request.POST['email'])))
+                messages.success(request, _('The email {} has been un-banned'.format(request.POST['email'])))
             except HTTPError as e:
                 messages.error(request, _('An error occured: %s') % e.reason)
             except ValueError as e:
@@ -815,10 +838,8 @@
             return redirect('list_bans', list_id)
     else:
         addban_form = ListAddBanForm()
-    return render(request, 'postorius/lists/bans.html', {
-         'list': m_list,
-         'addban_form': addban_form,
-         })
+    return render(request, 'postorius/lists/bans.html',
+                  {'list': m_list, 'addban_form': addban_form})
 
 
 @login_required
@@ -869,8 +890,8 @@
                 messages.error(
                     request, _('An error occured: %s') % e.reason)
             if not errors:
-                messages.success(request,
-                    _('The header matches were successfully modified.'))
+                messages.success(request, _('The header matches were'
+                                            ' successfully modified.'))
             return redirect('list_header_matches', list_id)
     else:
         formset = HeaderMatchFormset(initial=initial_data)
diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py
index c9dedf6..82e97e1 100644
--- a/src/postorius/views/user.py
+++ b/src/postorius/views/user.py
@@ -63,7 +63,8 @@
                         # value.
                         preferences[key] = form.cleaned_data[key]
                 preferences.save()
-                messages.success(request, _('Your preferences have been updated.'))
+                messages.success(request,
+                                 _('Your preferences have been updated.'))
             else:
                 messages.error(request, _('Something went wrong.'))
         except MailmanApiError:
@@ -75,12 +76,13 @@
     @method_decorator(login_required)
     def get(self, request):
         try:
-            mm_user = MailmanUser.objects.get_or_create_from_django(request.user)
+            mm_user = MailmanUser.objects.get_or_create_from_django(
+                    request.user)
         except MailmanApiError:
             return utils.render_api_error(request)
         settingsform = UserPreferences(initial=mm_user.preferences)
         return render(request, 'postorius/user/mailman_settings.html',
-                {'mm_user': mm_user, 'settingsform': settingsform})
+                      {'mm_user': mm_user, 'settingsform': settingsform})
 
 
 class UserAddressPreferencesView(MailmanUserView):
@@ -97,12 +99,13 @@
                     preferences = address.preferences
                     for key in form.fields.keys():
                         if form.cleaned_data[key] is not None:
-                            # None: nothing set yet. Remember to remove this test
-                            # when Mailman accepts None as a "reset to default"
-                            # value.
+                            # None: nothing set yet. Remember to remove this
+                            # test when Mailman accepts None as a
+                            # "reset to default" value.
                             preferences[key] = form.cleaned_data[key]
                     preferences.save()
-                messages.success(request, _('Your preferences have been updated.'))
+                messages.success(request,
+                                 _('Your preferences have been updated.'))
             else:
                 messages.error(request, _('Something went wrong.'))
         except MailmanApiError:
@@ -125,10 +128,12 @@
         except MailmanApiError:
             return utils.render_api_error(request)
         except Mailman404Error:
-            return render(request, 'postorius/user/address_preferences.html', {'nolists': 'true'})
+            return render(request, 'postorius/user/address_preferences.html',
+                          {'nolists': 'true'})
         return render(request, 'postorius/user/address_preferences.html',
-                {'mm_user': mm_user, 'addresses': addresses, 'helperform': helperform,
-                 'formset': formset, 'zipped_data': zipped_data})
+                      {'mm_user': mm_user, 'addresses': addresses,
+                       'helperform': helperform, 'formset': formset,
+                       'zipped_data': zipped_data})
 
 
 @login_required
@@ -155,16 +160,17 @@
                     preferences[key] = form.cleaned_data[key]
             preferences.save()
             messages.success(request, _('Your preferences have been updated.'))
-            return redirect("user_list_options", list_id)
+            return redirect('user_list_options', list_id)
         else:
             messages.error(request, _('Something went wrong.'))
     else:
         form = UserPreferences(initial=subscription.preferences)
     user_emails = [request.user.email] + request.user.other_emails
-    subscription_form = ChangeSubscriptionForm(user_emails, initial={'email': subscription.email})
+    subscription_form = ChangeSubscriptionForm(
+            user_emails, initial={'email': subscription.email})
     return render(request, 'postorius/user/list_options.html',
-            {'form': form, 'list': mlist,
-             'change_subscription_form': subscription_form})
+                  {'form': form, 'list': mlist,
+                   'change_subscription_form': subscription_form})
 
 
 class UserSubscriptionPreferencesView(MailmanUserView):
@@ -181,12 +187,13 @@
                     preferences = subscription.preferences
                     for key in form.cleaned_data.keys():
                         if form.cleaned_data[key] is not None:
-                            # None: nothing set yet. Remember to remove this test
-                            # when Mailman accepts None as a "reset to default"
-                            # value.
+                            # None: nothing set yet. Remember to remove this
+                            # test when Mailman accepts None as a
+                            # "reset to default" value.
                             preferences[key] = form.cleaned_data[key]
                     preferences.save()
-                messages.success(request, _('Your preferences have been updated.'))
+                messages.success(request,
+                                 _('Your preferences have been updated.'))
             else:
                 messages.error(request, _('Something went wrong.'))
         except MailmanApiError:
@@ -208,10 +215,11 @@
         except MailmanApiError:
             return utils.render_api_error(request)
         except Mailman404Error:
-            return render(request, 'postorius/user/subscription_preferences.html',
-                    {'nolists': 'true'})
+            return render(request,
+                          'postorius/user/subscription_preferences.html',
+                          {'nolists': 'true'})
         return render(request, 'postorius/user/subscription_preferences.html',
-                {'zipped_data': zipped_data, 'formset': formset})
+                      {'zipped_data': zipped_data, 'formset': formset})
 
 
 @login_required
@@ -224,7 +232,7 @@
         return utils.render_api_error(request)
     memberships = [m for m in mm_user.subscriptions if m.role == 'member']
     return render(request, 'postorius/user/subscriptions.html',
-        {'memberships': memberships})
+                  {'memberships': memberships})
 
 
 @login_required()
@@ -237,27 +245,29 @@
     if request.method == 'POST':
         form = AddressActivationForm(request.POST)
         if form.is_valid():
-            profile, created = AddressConfirmationProfile.objects.update_or_create(
-                email=form.cleaned_data['email'], user=request.user, defaults={
-                'activation_key': uuid.uuid4().hex})
+            profile, c = AddressConfirmationProfile.objects.update_or_create(
+                email=form.cleaned_data['email'], user=request.user,
+                defaults={'activation_key': uuid.uuid4().hex})
             try:
                 profile.send_confirmation_link(request)
                 messages.success(request,
-                        _('Please follow the instructions sent via email to confirm the address'))
+                                 _('Please follow the instructions sent via'
+                                   ' email to confirm the address'))
                 return redirect('user_profile')
-            except (SMTPException, socket_error) as serr:
-                if not isinstance(serr, SMTPException) and serr.errno != errno.ECONNREFUSED:
-                    raise serr
+            except (SMTPException, socket_error) as e:
+                if (not isinstance(e, SMTPException) and
+                        e.errno != errno.ECONNREFUSED):
+                    raise e
                 profile.delete()
-                messages.error(request,
-                        _('Currently emails can not be added, please try again later'))
+                messages.error(request, _('Currently emails can not be added,'
+                                          ' please try again later'))
     else:
-        form = AddressActivationForm(initial={'user_email': request.user.email})
+        form = AddressActivationForm(
+                initial={'user_email': request.user.email})
     return render(request, 'postorius/user/profile.html',
                   {'mm_user': mm_user, 'form': form})
 
 
-
 @login_required()
 def address_activation_link(request, activation_key):
     """
@@ -273,12 +283,15 @@
                 reverse(settings.LOGIN_URL), request.path))
         if not profile.is_expired:
             # Add the address to the user record in Mailman.
-            logger.info("Adding address %s to %s", profile.email, request.user.email)
+            logger.info('Adding address %s to %s', profile.email,
+                        request.user.email)
             try:
                 try:
-                    mailman_user = MailmanUser.objects.get(address=request.user.email)
+                    mailman_user = MailmanUser.objects.get(
+                            address=request.user.email)
                 except Mailman404Error:
-                    mailman_user = MailmanUser.objects.create(request.user.email, '')
+                    mailman_user = MailmanUser.objects.create(
+                            request.user.email, '')
                 mm_address = mailman_user.add_address(profile.email)
                 # The address has just been verified.
                 mm_address.verify()
@@ -289,9 +302,11 @@
             if hasattr(request.user, 'other_emails'):
                 del request.user.other_emails
             utils.set_other_emails(request.user)
-            messages.success(request, _('The email address has been activated!'))
+            messages.success(request,
+                             _('The email address has been activated!'))
         else:
-            messages.error(request, _('The activation link has expired, please add the email again!'))
+            messages.error(request, _('The activation link has expired,'
+                                      ' please add the email again!'))
         profile.delete()
     except AddressConfirmationProfile.DoesNotExist:
         messages.error(request, _('The activation link is invalid'))