fixed few issues with outbound email