Merge "Copy emailcommon to email2"