diff --git a/.pylintrc b/.pylintrc
index 275ec9f187b45438d80eb93423c126409c103a28..d92404814c4863283a465f41f6f51f5960846a53 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -203,7 +203,7 @@ ignore-docstrings=yes
 ignore-imports=no
 
 # Minimum lines number of a similarity.
-min-similarity-lines=4
+min-similarity-lines=6
 
 
 [TYPECHECK]
diff --git a/uffd/mail/models.py b/uffd/mail/models.py
index dd8d810b0798213b389c169a56468763eee8a850..3110f33d0775d0f0cb5ec95fd89c07de8d57531c 100644
--- a/uffd/mail/models.py
+++ b/uffd/mail/models.py
@@ -1,15 +1,13 @@
-import secrets
-
-from ldap3 import MODIFY_REPLACE, MODIFY_DELETE, MODIFY_ADD, HASHED_SALTED_SHA512
+from ldap3 import MODIFY_REPLACE
 from flask import current_app
 
 from uffd import ldap
 
 class Mail():
-	def __init__(self, uid=None, destinations=[], receivers=[], dn=None):
+	def __init__(self, uid=None, destinations=None, receivers=None, dn=None):
 		self.uid = uid
-		self.receivers = receivers
-		self.destinations = destinations
+		self.receivers = receivers if receivers else []
+		self.destinations = destinations if destinations else []
 		self.dn = dn
 
 	@classmethod
@@ -47,4 +45,3 @@ class Mail():
 				}
 			result = conn.modify(self.dn, attributes)
 		return result
-
diff --git a/uffd/mail/views.py b/uffd/mail/views.py
index 8ad6410db22014ecd5d6e879ab8bae33b4533bf5..eeafb095dfc87a8990c230a3225b9ea7b521fae6 100644
--- a/uffd/mail/views.py
+++ b/uffd/mail/views.py
@@ -26,7 +26,6 @@ def index():
 	mails = []
 	for i in conn.entries:
 		mails.append(Mail.from_ldap(i))
-	print(mails)
 	return render_template('mail_list.html', mails=mails)
 
 @bp.route("/<uid>")
@@ -57,8 +56,8 @@ def update(uid=False):
 
 	if is_newmail:
 		mail.uid = request.form.get('mail-uid')
-	mail.receivers = request.form.get('mail-receivers', '').splitlines();
-	mail.destinations = request.form.get('mail-destinations', '').splitlines();
+	mail.receivers = request.form.get('mail-receivers', '').splitlines()
+	mail.destinations = request.form.get('mail-destinations', '').splitlines()
 
 	if mail.to_ldap(new=is_newmail):
 		flash('Mail mapping updated.')