Changed email rules for gateway mode