Motion text truncation redux

Fixes #305.

This is a rebased, completed version of #309.
Yep, there's also this #326 . Do you want to add that now and just merge and I'll add it when I come round to that?