From 62a1908ba30a6e0a1236dfa4f24a57dd85d7be9d Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sat, 26 Feb 2022 07:43:08 +0100 Subject: ayatanawebmail/application.py: Fetch X-GM-THRID for GMail accounts only --- ayatanawebmail/application.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ayatanawebmail/application.py b/ayatanawebmail/application.py index 5d53eb7..e62fa30 100755 --- a/ayatanawebmail/application.py +++ b/ayatanawebmail/application.py @@ -870,7 +870,7 @@ class AyatanaWebmail(object): thread_id = '' msg = None - try: + if any(s in oConnection.strHost for s in ['gmail', 'google']):: typ, msg_data = oConnection.oImap.uid('FETCH', m, '(X-GM-THRID BODY.PEEK[HEADER.FIELDS (DATE SUBJECT FROM MESSAGE-ID)])') @@ -881,7 +881,7 @@ class AyatanaWebmail(object): thread_id = '%x' % int(m_reThrid.search(lstField[0]).group(1)) break - except imaplib.IMAP4.error: + else: typ, msg_data = oConnection.oImap.uid('FETCH', m, '(BODY.PEEK[HEADER.FIELDS (DATE SUBJECT FROM MESSAGE-ID)])') -- cgit v1.2.3