My branch of the EmailExt Plugin