Make the mail received callback more robust and add support for ml
Add changes file