diff --git a/lib/filter-handler.js b/lib/filter-handler.js index 50a1e5e2..92c6b0ed 100644 --- a/lib/filter-handler.js +++ b/lib/filter-handler.js @@ -403,6 +403,7 @@ class FilterHandler { let received = [].concat((prepared.mimeTree.parsedHeader && prepared.mimeTree.parsedHeader.received) || []); if (received.length) { let receivedData = parseReceived(received[0]); + if (!receivedData.has('id') && received.length > 1) { receivedData = parseReceived(received[1]); } @@ -412,7 +413,7 @@ class FilterHandler { } if (receivedData.has('id')) { - messageOpts.meta.id = receivedData.get('id'); + messageOpts.meta.queueId = receivedData.get('id'); } if (receivedData.has('from')) {