Merge "Revert "email: add support for Server Name Indication (SNI)""