Index emailmessage on folder_name and account
Merge branch 'release/0.2.31'