Fix email threads#175

cooper-grc wants to merge 2 commits into

mainbeam-cloud/airstore:mainfrom

cg/email-threadsbeam-cloud/airstore:cg/email-threadsCopy head branch name to clipboard