suport changing mail destination, take 2