Errors in messages plugin

Hi again!

I'm having a problem with my messages plugin. When I use the version packaged with 1.7.1 I get a php error about an unqualified elgg_get_friendly_time error. When I use the user plugin version messages_1_5_2 I get a token error instead. At this point I've had to take mail down completely. Can anyone help?! :)