FIX: performance regression on activity streams
Merge pull request #1331 from ZogStriP/fix-avatars-on-activity-stream

FIX: performance regression on activity streams