am 65801c0f: Merge "Virtual folders are valid folders, don\'t kick back to the inbox when we\'re viewing them" into jb-ub-mail-ur10

* commit '65801c0f3841ef88d3ab683f692e8fcc8d010719':
  Virtual folders are valid folders, don't kick back to the inbox when we're viewing them