fix #2606 time: 3h
test #2607 time: 2h
Merge branch 'master' of https://github.com/Eforcers/inbox-cleaner