am 262fa01f: Merge "Move the FolderItem outside to a separate class." into jb-ub-mail-ur9

* commit '262fa01f19d625c45c72f9c55c60ab97c1d391e9':
  Move the FolderItem outside to a separate class.