Merge branch 'SMTPUTF8_1516'. Bug 1516