email management fixes