Also try harder to send a relevant In-Reply-To and References header back
to the client with the email message.