Enhance Email extension