application/imap-service.js

@@ -201,15 +201,17 @@ class ImapService extends EventEmitter {
 	 */
 	async deleteOldMails(deleteMailsBefore) {
 		let uids = []
-		//fetch mails from date +1day (calculated in MS) to avoid wasting resources and to fix imaps missing time-awareness
-		if (helper.moreThanOneDay(moment() + 24 * 60 * 60 * 1000, deleteMailsBefore)) {
+		if (helper.moreThanOneDay(moment(), deleteMailsBefore)) {
 			uids = await this._searchWithoutFetch([
 				['!DELETED'],
 				['BEFORE', deleteMailsBefore]
 			])
 		} else {
+			//fetch mails from date -1day (calculated in MS) to avoid wasting resources
+			deleteMailsBefore = new Date(moment() - 24 * 60 * 60 * 1000)
 			uids = await this._searchWithoutFetch([
 				['!DELETED'],
+				['BEFORE', deleteMailsBefore]
 			])
 		}
 
@@ -218,8 +220,8 @@ class ImapService extends EventEmitter {
 		}
 
 		const DeleteOlderThan = helper.purgeTimeStamp()
-		const uidsWithHeaders = await this._getMailHeaders(uids)
 
+		const uidsWithHeaders = await this._getMailHeaders(uids)
 		uidsWithHeaders.forEach(mail => {
 			if (mail['attributes'].date > DeleteOlderThan || this.config.email.examples.uids.includes(parseInt(mail['attributes'].uid))) {
 				uids = uids.filter(uid => uid !== mail['attributes'].uid)
@@ -345,7 +347,6 @@ class ImapService extends EventEmitter {
 
 	async _getMailHeaders(uids) {
 		const fetchOptions = {
-			envelope: true,
 			bodies: ['HEADER.FIELDS (FROM TO SUBJECT DATE)'],
 			struct: false
 		}

domain/mail-repository.js

@@ -27,11 +27,7 @@ class MailRepository {
 	}
 
 	add(to, mailSummary) {
-		if (to !== undefined) {
-			this.mailSummaries.set(to.toLowerCase(), mailSummary)
-		} else {
-			debug('IMAP reported no recipient for mail, ignoring', mailSummary)
-		}
+		this.mailSummaries.set(to.toLowerCase(), mailSummary)
 	}
 
 	removeUid(uid, address) {