Added Folders and Compose Message