am e6b8e2fa: Better previews.

Merge commit 'e6b8e2fa73b5b2e8e3adfa9ea1b4ca9659e10686' into eclair-mr2

* commit 'e6b8e2fa73b5b2e8e3adfa9ea1b4ca9659e10686':
  Better previews.