Added smtp changes