am 82599a08: Merge "Return of the message-level stars." into ub-gmail-ur14-dev

* commit '82599a0844d5d8d20c4eb09a42f53fab211a58ba':
  Return of the message-level stars.