[REM] It's seems mail subscription has been fixed in master so ugly fix