Email handling updates.