Started adding expiry-based folder structures to stored message bodies so that we can prune them. Tidied up tests.