#237 Better wrapping on long activity items

@seanh This is the new pull request that replaces #388