overhaul email fields