Merge "Fixed email ext plugin name"