Email delivery improvements