Apparently we're setting a mail-id header, but not Message-Id which breaks emails threading
We should fix that
Fixed \ó/
Commit b4d070e8 fixes this ticket
Commit ba3c7dc7 fixes this issue
Commit b4d070e8 fixes this issue