Merge "Add rawFolders column to conversation."