fixed translation key and timeline avatars disappearing
Merge remote-tracking branch 'upstream/havoc' into havoc
Merge pull request #702 from jnarron/havoc

Fixed translation key and status avatar disappearing after favoriting in timeline