[2.1] Always send a message id in emails

[jdarwood007]

Google is requiring all emails to contain a valid Message-ID. See: https://support.google.com/mail/answer/81126

This should land in .5 as it could cause emails to be rejected/marked spam.

SMF 3.0 is in #7882