Adds a much better mail folder syste,