Merge pull request #1024 from plntyk/bogofilter_fixes