message feature and folder cleanup