fixed recipientAvatars rewrite