Revert "Fix segfault in mail folder (SF: 3007493)"