Adding missing import.
Merge branch 'master' into feature/resizable_mailbox_list