[TECH SUPPORT] LPS-49600 Message-ID is not unique

Hi Sergio,

I have added two additional commits for this LPS so I send these changes to you instead of Brian. If they look good please forward them to Brian.

Thanks,
Ákos

/cc @lipusz