improved smtp rules