diff --git a/offlineimap/head/offlineimap/folder/IMAP.py b/offlineimap/head/offlineimap/folder/IMAP.py index e9451b4..d2e518b 100644 --- a/offlineimap/head/offlineimap/folder/IMAP.py +++ b/offlineimap/head/offlineimap/folder/IMAP.py @@ -89,9 +89,7 @@ class IMAPFolder(BaseFolder): else: uid = long(options['UID']) flags = imaputil.flagsimap2maildir(options['FLAGS']) - # Skip messages already flagged for deletion on the server. - if not 'T' in flags: - self.messagelist[uid] = {'uid': uid, 'flags': flags} + self.messagelist[uid] = {'uid': uid, 'flags': flags} def getmessagelist(self): return self.messagelist diff --git a/offlineimap/head/offlineimap/folder/Maildir.py b/offlineimap/head/offlineimap/folder/Maildir.py index c45d59e..6f2f5d7 100644 --- a/offlineimap/head/offlineimap/folder/Maildir.py +++ b/offlineimap/head/offlineimap/folder/Maildir.py @@ -116,17 +116,9 @@ class MaildirFolder(BaseFolder): if flagmatch: flags = [x for x in flagmatch.group(1)] flags.sort() - if 'T' in flags: - # Message is marked for deletion; just delete it now. - # Otherwise, the T flag will be propogated to the IMAP - # server, and then expunged there, and then deleted here. - # Might as well just delete it now, to help make things - # more robust. - os.unlink(file) - else: - retval[uid] = {'uid': uid, - 'flags': flags, - 'filename': file} + retval[uid] = {'uid': uid, + 'flags': flags, + 'filename': file} return retval def cachemessagelist(self):