Put the stars and envelopes on the same line. This isn't the ideal,

because I don't like the stars moving around depending on whether
there is an envelope, but at least the overall list layout is a bit
improved (and more compact when using small fonts).