Took two changes. One fencepost error in index.c, and one changed behaviour that the Cassandane tests were testing for the buggy behaviour (don't clean up while mailbox selected) which is now fixed. Fingers crossed! -- Bron Gondwana brong at fastmail.fm