From 74e987c94de2342cb89fbc250e653cdea0273c19 Mon Sep 17 00:00:00 2001
From: Timo Kankare <timo.kankare@iki.fi>
Date: Sat, 5 May 2018 15:24:43 +0300
Subject: [PATCH] Changed MailCollector._get_id() not to use server and user
 attributes of Account class, because not every account has those defined.
 Instead Account.get_id() is used.

---
 Mailnag/daemon/mails.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mailnag/daemon/mails.py b/Mailnag/daemon/mails.py
index e3f89f4..4f18ae3 100644
--- a/Mailnag/daemon/mails.py
+++ b/Mailnag/daemon/mails.py
@@ -4,7 +4,7 @@
 # mails.py
 #
 # Copyright 2011 - 2016 Patrick Ulbrich <zulu99@gmx.net>
-# Copyright 2016 Timo Kankare <timo.kankare@iki.fi>
+# Copyright 2016, 2018 Timo Kankare <timo.kankare@iki.fi>
 # Copyright 2011 Leighton Earl <leighton.earl@gmx.com>
 # Copyright 2011 Ralf Hersel <ralf.hersel@gmx.net>
 #
@@ -194,7 +194,7 @@ class MailCollector:
 			# subject but *no datetime* will have the same hash id, 
 			# i.e. only the first mail is notified. 
 			# (Should happen very rarely).
-			id = hashlib.md5((acc.server + folder + acc.user + 
+			id = hashlib.md5((acc.get_id() + folder +
 				sender[1] + subject + str(datetime))
 				.encode('utf-8')).hexdigest()