Common code of filtering email has been moved from modules templates to main template.