Edited schema for folders/emails