Fixes display and (de)activation of email storages (Closes #1477).