diff --git a/core/admin/mailu/internal/templates/default.sieve b/core/admin/mailu/internal/templates/default.sieve
index 5e995611..a29e7aba 100644
--- a/core/admin/mailu/internal/templates/default.sieve
+++ b/core/admin/mailu/internal/templates/default.sieve
@@ -19,7 +19,7 @@ if header :index 2 :matches "Received" "from * by * for <*>; *"
 }
 
 {% if user.spam_enabled %}
-if spamtest :percent :value "gt" :comparator "i;ascii-numeric"  "{{ user.spam_threshold }}"
+if spamtest :percent :value "gt" :comparator "i;ascii-numeric" "{{ user.spam_threshold }}"
 {
   setflag "\\seen";
   fileinto :create "Junk";
@@ -32,6 +32,6 @@ if exists "X-Virus" {
   stop;
 }
 
-{% if user.reply_active  %}
+{% if user.reply_active %}
 vacation :days 1 {% if user.displayed_name != "" %}:from "{{ user.displayed_name }} <{{ user.email }}>"{% endif %} :subject "{{ user.reply_subject }}" "{{ user.reply_body }}";
 {% endif %}
diff --git a/core/admin/mailu/manage.py b/core/admin/mailu/manage.py
index 54f4b826..937c9f49 100644
--- a/core/admin/mailu/manage.py
+++ b/core/admin/mailu/manage.py
@@ -119,7 +119,7 @@ def password(localpart, domain_name, password):
     """ Change the password of an user
     """
     email = f'{localpart}@{domain_name}'
-    user   = models.User.query.get(email)
+    user  = models.User.query.get(email)
     if user:
         user.set_password(password)
     else:
diff --git a/core/admin/mailu/sso/__init__.py b/core/admin/mailu/sso/__init__.py
index cc066234..98b5abd0 100644
--- a/core/admin/mailu/sso/__init__.py
+++ b/core/admin/mailu/sso/__init__.py
@@ -1,5 +1,5 @@
 from flask import Blueprint
 
-sso = Blueprint('sso', __name__, static_folder=None ,template_folder='templates')
+sso = Blueprint('sso', __name__, static_folder=None, template_folder='templates')
 
 from mailu.sso.views import *
diff --git a/core/admin/mailu/sso/templates/form_sso.html b/core/admin/mailu/sso/templates/form_sso.html
index efcc95a9..b14e7600 100644
--- a/core/admin/mailu/sso/templates/form_sso.html
+++ b/core/admin/mailu/sso/templates/form_sso.html
@@ -3,9 +3,9 @@
 {%- block content %}
 {%- call macros.card() %}
 <form class="form" method="post" role="form">
-    {{ macros.form_field(form.email) }}
-    {{ macros.form_field(form.pw) }}
-    {{ macros.form_fields( fields, label=False, class="btn btn-default", spacing=False) }}
+  {{ macros.form_field(form.email) }}
+  {{ macros.form_field(form.pw) }}
+  {{ macros.form_fields(fields, label=False, class="btn btn-default", spacing=False) }}
 </form>
 {%- endcall %}
 {%- endblock %}
diff --git a/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po b/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
index 664ff571..09130a7b 100644
--- a/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
+++ b/core/admin/mailu/translations/pl/LC_MESSAGES/messages.po
@@ -551,11 +551,11 @@ msgid ""
 "cache\n"
 "    expires."
 msgstr ""
-"Jeśli nie wiesz, jak skonfigurować rekord <code> MX </code>  dla swojej "
+"Jeśli nie wiesz, jak skonfigurować rekord <code> MX </code> dla swojej "
 "strefy DNS,\n"
 "skontaktuj się z dostawcą DNS lub administratorem. Proszę również "
 "poczekać\n"
-"kilka minut po ustawieniu <code> MX </code> , żeby pamięć podręczna "
+"kilka minut po ustawieniu <code> MX </code>, żeby pamięć podręczna "
 "serwera lokalnego wygasła."
 
 #: mailu/ui/templates/fetch/create.html:4
diff --git a/core/admin/mailu/ui/templates/macros.html b/core/admin/mailu/ui/templates/macros.html
index d18e6584..5143b697 100644
--- a/core/admin/mailu/ui/templates/macros.html
+++ b/core/admin/mailu/ui/templates/macros.html
@@ -58,7 +58,7 @@
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
   {%- for field in form %}
-    {%- if  bootstrap_is_hidden_field(field) %}
+    {%- if bootstrap_is_hidden_field(field) %}
       {{ field() }}
     {%- else %}
       {{ form_field(field) }}
diff --git a/core/admin/migrations/env.py b/core/admin/migrations/env.py
index cdfd2248..3e45bb18 100755
--- a/core/admin/migrations/env.py
+++ b/core/admin/migrations/env.py
@@ -37,7 +37,7 @@ def run_migrations_offline():
 
     This configures the context with just a URL
     and not an Engine, though an Engine is acceptable
-    here as well.  By skipping the Engine creation
+    here as well. By skipping the Engine creation
     we don't even need a DBAPI to be available.
 
     Calls to context.execute() here emit the given string to the
diff --git a/core/dovecot/start.py b/core/dovecot/start.py
index 1845eb93..03bdfa80 100755
--- a/core/dovecot/start.py
+++ b/core/dovecot/start.py
@@ -6,7 +6,7 @@ import multiprocessing
 import logging as log
 import sys
 
-from podop   import run_server
+from podop import run_server
 from socrate import system, conf
 
 log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING"))
diff --git a/core/postfix/start.py b/core/postfix/start.py
index c889dce1..06a097b8 100755
--- a/core/postfix/start.py
+++ b/core/postfix/start.py
@@ -7,7 +7,7 @@ import multiprocessing
 import logging as log
 import sys
 
-from podop   import run_server
+from podop import run_server
 from pwd import getpwnam
 from socrate import system, conf