Merge pull request #702 from jnarron/havoc

Fixed translation key and status avatar disappearing after favoriting in timeline