diff --git a/Mailnag/backends/imap.py b/Mailnag/backends/imap.py
index 20c34d6..4d08a62 100644
--- a/Mailnag/backends/imap.py
+++ b/Mailnag/backends/imap.py
@@ -2,10 +2,7 @@
 #
 # imap.py
 #
-# Copyright 2011 - 2016 Patrick Ulbrich <zulu99@gmx.net>
 # Copyright 2016 Timo Kankare <timo.kankare@iki.fi>
-# Copyright 2016 Thomas Haider <t.haider@deprecate.de>
-# Copyright 2011 Ralf Hersel <ralf.hersel@gmx.net>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Mailnag/backends/pop3.py b/Mailnag/backends/pop3.py
index 89e7d16..f8f1e6d 100644
--- a/Mailnag/backends/pop3.py
+++ b/Mailnag/backends/pop3.py
@@ -2,10 +2,7 @@
 #
 # imap.py
 #
-# Copyright 2011 - 2016 Patrick Ulbrich <zulu99@gmx.net>
 # Copyright 2016 Timo Kankare <timo.kankare@iki.fi>
-# Copyright 2016 Thomas Haider <t.haider@deprecate.de>
-# Copyright 2011 Ralf Hersel <ralf.hersel@gmx.net>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Mailnag/common/accounts.py b/Mailnag/common/accounts.py
index 2033044..2ae468e 100644
--- a/Mailnag/common/accounts.py
+++ b/Mailnag/common/accounts.py
@@ -5,6 +5,7 @@
 #
 # Copyright 2011 - 2016 Patrick Ulbrich <zulu99@gmx.net>
 # Copyright 2016 Thomas Haider <t.haider@deprecate.de>
+# Copyright 2016 Timo Kankare <timo.kankare@iki.fi>
 # Copyright 2011 Ralf Hersel <ralf.hersel@gmx.net>
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/Mailnag/configuration/accountdialog.py b/Mailnag/configuration/accountdialog.py
index 6a83f79..c8bc21b 100644
--- a/Mailnag/configuration/accountdialog.py
+++ b/Mailnag/configuration/accountdialog.py
@@ -4,6 +4,7 @@
 # accountdialog.py
 #
 # Copyright 2011 - 2016 Patrick Ulbrich <zulu99@gmx.net>
+# Copyright 2016 Timo Kankare <timo.kankare@iki.fi>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Mailnag/daemon/idlers.py b/Mailnag/daemon/idlers.py
index 3f11b4e..bb3bbc7 100644
--- a/Mailnag/daemon/idlers.py
+++ b/Mailnag/daemon/idlers.py
@@ -4,6 +4,7 @@
 # idlers.py
 #
 # Copyright 2011 - 2016 Patrick Ulbrich <zulu99@gmx.net>
+# Copyright 2016 Timo Kankare <timo.kankare@iki.fi>
 # Copyright 2011 Leighton Earl <leighton.earl@gmx.com>
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/Mailnag/daemon/mailnagdaemon.py b/Mailnag/daemon/mailnagdaemon.py
index e78691a..58a3f82 100644
--- a/Mailnag/daemon/mailnagdaemon.py
+++ b/Mailnag/daemon/mailnagdaemon.py
@@ -3,6 +3,7 @@
 #
 # mailnagdaemon.py
 #
+# Copyright 2016 Timo Kankare <timo.kankare@iki.fi>
 # Copyright 2014, 2015 Patrick Ulbrich <zulu99@gmx.net>
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/Mailnag/daemon/mails.py b/Mailnag/daemon/mails.py
index dc36b5b..4054757 100644
--- a/Mailnag/daemon/mails.py
+++ b/Mailnag/daemon/mails.py
@@ -4,6 +4,7 @@
 # mails.py
 #
 # Copyright 2011 - 2016 Patrick Ulbrich <zulu99@gmx.net>
+# Copyright 2016 Timo Kankare <timo.kankare@iki.fi>
 # Copyright 2011 Leighton Earl <leighton.earl@gmx.com>
 # Copyright 2011 Ralf Hersel <ralf.hersel@gmx.net>
 #