Motion text truncation redux

Fixes #305.

This is a rebased, completed version of #309.