Revert 89ccbcb..d4a4259

This rolls back to commit 89ccbcb6d9a5bd0537e6b187672f608381a0d7e6.
Fix problem with inbox stats