Fix for outgoing emails