am 55c8c3e0: Merge "Fixup the width of the subject when folders are present." into jb-ub-mail-ur8

* commit '55c8c3e064a28fb1c3c2699ce559f75f68bd95ee':
  Fixup the width of the subject when folders are present.