maildir bug fixed, allowed maildir to be started and stopped repeatly

Fixes #2475
Merge branch 'maildir_bug' of git://github.com/jbotto/buildbot