Merge "Added email-ext plugin"